Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts: fs/cifs/export.c
author: Steve French <sfrench@us.ibm.com> 2007-07-18 20:38:57 -0400
committer: Steve French <sfrench@us.ibm.com> 2007-07-18 20:38:57 -0400
commit: 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch)
tree: 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /arch
parent: 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff)
parent: 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff)
1123 files changed, 50614 insertions, 35668 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 79c6e5a244..2a85dc3390 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -327,6 +327,9 @@ config PCI_DOMAINS
        bool
        default y
+config PCI_SYSCALL
+        def_bool PCI
 config ALPHA_CORE_AGP
        bool
        depends on ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL
diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c
index 28c84e55fe..6b07f89a72 100644
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
@@ -207,6 +207,10 @@ iommu_arena_free(struct pci_iommu_arena *arena, long ofs, long n)
                p[i] = 0;
 }
+/* True if the machine supports DAC addressing, and DEV can
+   make use of it given MASK.  */
+static int pci_dac_dma_supported(struct pci_dev *hwdev, u64 mask);
 /* Map a single buffer of the indicated size for PCI DMA in streaming
   mode.  The 32-bit PCI bus mastering address to use is returned.
   Once the device is given the dma address, the device owns this memory
@@ -897,7 +901,7 @@ iommu_unbind(struct pci_iommu_arena *arena, long pg_start, long pg_count)
 /* True if the machine supports DAC addressing, and DEV can
   make use of it given MASK.  */
-int
+static int
 pci_dac_dma_supported(struct pci_dev *dev, u64 mask)
 {
        dma64_addr_t dac_offset = alpha_mv.pci_dac_offset;
@@ -917,32 +921,6 @@ pci_dac_dma_supported(struct pci_dev *dev, u64 mask)
        return ok;
 }
-EXPORT_SYMBOL(pci_dac_dma_supported);
-dma64_addr_t
-pci_dac_page_to_dma(struct pci_dev *pdev, struct page *page,
-                    unsigned long offset, int direction)
-{
-        return (alpha_mv.pci_dac_offset
-                + __pa(page_address(page)) 
-                + (dma64_addr_t) offset);
-}
-EXPORT_SYMBOL(pci_dac_page_to_dma);
-struct page *
-pci_dac_dma_to_page(struct pci_dev *pdev, dma64_addr_t dma_addr)
-{
-        unsigned long paddr = (dma_addr & PAGE_MASK) - alpha_mv.pci_dac_offset;
-        return virt_to_page(__va(paddr));
-}
-EXPORT_SYMBOL(pci_dac_dma_to_page);
-unsigned long
-pci_dac_dma_to_offset(struct pci_dev *pdev, dma64_addr_t dma_addr)
-{
-        return (dma_addr & ~PAGE_MASK);
-}
-EXPORT_SYMBOL(pci_dac_dma_to_offset);
 /* Helper for generic DMA-mapping functions. */
diff --git a/arch/alpha/kernel/ptrace.c b/arch/alpha/kernel/ptrace.c
index 0cd060598f..83a7818422 100644
--- a/arch/alpha/kernel/ptrace.c
+++ b/arch/alpha/kernel/ptrace.c
@@ -315,9 +315,7 @@ do_sys_ptrace(long request, long pid, long addr, long data,
        /* When I and D space are separate, this will have to be fixed.  */
        case PTRACE_POKETEXT: /* write the word at location addr. */
        case PTRACE_POKEDATA:
-                tmp = data;
+                ret = generic_ptrace_pokedata(child, addr, data);
-                copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 1);
-                ret = (copied == sizeof(tmp)) ? 0 : -EIO;
                break;
        case PTRACE_POKEUSR: /* write the specified register */
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index 80cfb758ee..b28731437c 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -65,7 +65,7 @@ enum ipi_message_type {
 };
 /* Set to a secondary's cpuid when it comes online.  */
-static int smp_secondary_alive __initdata = 0;
+static int smp_secondary_alive __devinitdata = 0;
 /* Which cpus ids came online.  */
 cpumask_t cpu_online_map;
@@ -173,7 +173,7 @@ smp_callin(void)
 }
 /* Wait until hwrpb->txrdy is clear for cpu.  Return -1 on timeout.  */
-static int __init
+static int __devinit
 wait_for_txrdy (unsigned long cpumask)
 {
        unsigned long timeout;
@@ -358,7 +358,7 @@ secondary_cpu_start(int cpuid, struct task_struct *idle)
 /*
 * Bring one cpu online.
 */
-static int __init
+static int __devinit
 smp_boot_one_cpu(int cpuid)
 {
        struct task_struct *idle;
diff --git a/arch/alpha/kernel/srmcons.c b/arch/alpha/kernel/srmcons.c
index 930cedc8be..783f4e50c1 100644
--- a/arch/alpha/kernel/srmcons.c
+++ b/arch/alpha/kernel/srmcons.c
@@ -289,7 +289,7 @@ srm_console_device(struct console *co, int *index)
        return srmcons_driver;
 }
-static int __init
+static int
 srm_console_setup(struct console *co, char *options)
 {
        return 0;
diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c
index 0bcb968cb6..922143ea1c 100644
--- a/arch/alpha/kernel/sys_marvel.c
+++ b/arch/alpha/kernel/sys_marvel.c
@@ -420,7 +420,7 @@ marvel_init_pci(void)
                io7_clear_errors(io7);
 }
-static void
+static void __init
 marvel_init_rtc(void)
 {
        init_rtc_irq();
diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c
index 4748e14a28..1dd50d0769 100644
--- a/arch/alpha/kernel/time.c
+++ b/arch/alpha/kernel/time.c
@@ -144,7 +144,7 @@ irqreturn_t timer_interrupt(int irq, void *dev)
        return IRQ_HANDLED;
 }
-void
+void __init
 common_init_rtc(void)
 {
        unsigned char x;
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index d6e665d567..ec0f05e0d8 100644
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -184,6 +184,7 @@ die_if_kernel(char * str, struct pt_regs *regs, long err, unsigned long *r9_15)
 #endif
        printk("%s(%d): %s %ld\n", current->comm, current->pid, str, err);
        dik_show_regs(regs, r9_15);
+        add_taint(TAINT_DIE);
        dik_show_trace((unsigned long *)(regs+1));
        dik_show_code((unsigned int *)regs->pc);
diff --git a/arch/alpha/lib/checksum.c b/arch/alpha/lib/checksum.c
index ab3761c437..8698e0746f 100644
--- a/arch/alpha/lib/checksum.c
+++ b/arch/alpha/lib/checksum.c
@@ -69,6 +69,7 @@ __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
        result = (result & 0xffffffff) + (result >> 32);
        return (__force __wsum)result;
 }
+EXPORT_SYMBOL(csum_tcpudp_nofold);
 /*
 * Do a 64-bit checksum on an arbitrary memory area..
diff --git a/arch/alpha/lib/csum_ipv6_magic.S b/arch/alpha/lib/csum_ipv6_magic.S
index e09748dbf2..2c2acb96de 100644
--- a/arch/alpha/lib/csum_ipv6_magic.S
+++ b/arch/alpha/lib/csum_ipv6_magic.S
@@ -7,6 +7,9 @@
 *                                __u32 len,
 *                                unsigned short proto,
 *                                unsigned int csum);
+ *
+ * Misalignment handling (which costs 16 instructions / 8 cycles)
+ * added by Ivan Kokshaysky <ink@jurassic.park.msu.ru>
 */
        .globl csum_ipv6_magic
@@ -16,37 +19,57 @@
 csum_ipv6_magic:
        .prologue 0
-        ldq     $0,0($16)       # e0    : load src & dst addr words
+        ldq_u   $0,0($16)       # e0    : load src & dst addr words
        zapnot  $20,15,$20      # .. e1 : zero extend incoming csum
        extqh   $18,1,$4        # e0    : byte swap len & proto while we wait
-        ldq     $1,8($16)       # .. e1 :
+        ldq_u   $21,7($16)      # .. e1 : handle misalignment
        extbl   $18,1,$5        # e0    :
-        ldq     $2,0($17)       # .. e1 :
+        ldq_u   $1,8($16)       # .. e1 :
        extbl   $18,2,$6        # e0    :
-        ldq     $3,8($17)       # .. e1 :
+        ldq_u   $22,15($16)     # .. e1 :
        extbl   $18,3,$18       # e0    :
+        ldq_u   $2,0($17)       # .. e1 :
        sra     $4,32,$4        # e0    :
+        ldq_u   $23,7($17)      # .. e1 :
+        extql   $0,$16,$0       # e0    :
+        ldq_u   $3,8($17)       # .. e1 :
+        extqh   $21,$16,$21     # e0    :
+        ldq_u   $24,15($17)     # .. e1 :
        sll     $5,16,$5        # e0    :
+        or      $0,$21,$0       # .. e1 : 1st src word complete
+        extql   $1,$16,$1       # e0    :
        addq    $20,$0,$20      # .. e1 : begin summing the words
-        sll     $6,8,$6         # e0    :
+        extqh   $22,$16,$22     # e0    :
        cmpult  $20,$0,$0       # .. e1 :
-        extwh   $19,7,$7        # e0    :
+        sll     $6,8,$6         # e0    :
-        or      $4,$18,$18      # .. e1 :
+        or      $1,$22,$1       # .. e1 : 2nd src word complete
-        extbl   $19,1,$19       # e0    :
+        extql   $2,$17,$2       # e0    :
+        or      $4,$18,$18      # .. e1 :
+        extqh   $23,$17,$23     # e0    :
        or      $5,$6,$5        # .. e1 :
-        or      $18,$5,$18      # e0    : len complete
-        or      $19,$7,$19      # .. e1 :
-        sll     $19,48,$19      # e0    :
+        extql   $3,$17,$3       # e0    :
+        or      $2,$23,$2       # .. e1 : 1st dst word complete
+        extqh   $24,$17,$24     # e0    :
+        or      $18,$5,$18      # .. e1 : len complete
+        extwh   $19,7,$7        # e0    :
+        or      $3,$24,$3       # .. e1 : 2nd dst word complete
+        extbl   $19,1,$19       # e0    :
        addq    $20,$1,$20      # .. e1 :
-        sra     $19,32,$19      # e0    : proto complete
+        or      $19,$7,$19      # e0    :
        cmpult  $20,$1,$1       # .. e1 :
+        sll     $19,48,$19      # e0    :
+        nop                     # .. e0 :
-        nop                     # e0    :
+        sra     $19,32,$19      # e0    : proto complete
        addq    $20,$2,$20      # .. e1 :
        cmpult  $20,$2,$2       # e0    :
        addq    $20,$3,$20      # .. e1 :
@@ -84,7 +107,7 @@ csum_ipv6_magic:
        extwl   $0,2,$1         # e0    : fold 17-bit value
        zapnot  $0,3,$0         # .. e1 :
        addq    $0,$1,$0        # e0    :
-        not     $0,$0           # e1    : and complement.
+        not     $0,$0           # .. e1 : and complement.
        zapnot  $0,3,$0         # e0    :
        ret                     # .. e1 :
diff --git a/arch/alpha/lib/ev6-csum_ipv6_magic.S b/arch/alpha/lib/ev6-csum_ipv6_magic.S
index de1948a691..fc0bc399f8 100644
--- a/arch/alpha/lib/ev6-csum_ipv6_magic.S
+++ b/arch/alpha/lib/ev6-csum_ipv6_magic.S
@@ -46,6 +46,10 @@
 * add the 3 low ushorts together, generating a uint
 * a final add of the 2 lower ushorts
 * truncating the result.
+ *
+ * Misalignment handling added by Ivan Kokshaysky <ink@jurassic.park.msu.ru>
+ * The cost is 16 instructions (~8 cycles), including two extra loads which
+ * may cause additional delay in rare cases (load-load replay traps).
 */
        .globl csum_ipv6_magic
@@ -55,25 +59,45 @@
 csum_ipv6_magic:
        .prologue 0
-        ldq     $0,0($16)       # L : Latency: 3
+        ldq_u   $0,0($16)       # L : Latency: 3
        inslh   $18,7,$4        # U : 0000000000AABBCC
-        ldq     $1,8($16)       # L : Latency: 3
+        ldq_u   $1,8($16)       # L : Latency: 3
        sll     $19,8,$7        # U : U L U L : 0x00000000 00aabb00
+        and     $16,7,$6        # E : src misalignment
+        ldq_u   $5,15($16)      # L : Latency: 3
        zapnot  $20,15,$20      # U : zero extend incoming csum
-        ldq     $2,0($17)       # L : Latency: 3
+        ldq_u   $2,0($17)       # L : U L U L : Latency: 3
-        sll     $19,24,$19      # U : U L L U : 0x000000aa bb000000
+        extql   $0,$6,$0        # U :
+        extqh   $1,$6,$22       # U :
+        ldq_u   $3,8($17)       # L : Latency: 3
+        sll     $19,24,$19      # U : U U L U : 0x000000aa bb000000
+        cmoveq  $6,$31,$22      # E : src aligned?
+        ldq_u   $23,15($17)     # L : Latency: 3
        inswl   $18,3,$18       # U : 000000CCDD000000
+        addl    $19,$7,$19      # E : U L U L : <sign bits>bbaabb00
-        ldq     $3,8($17)       # L : Latency: 3
+        or      $0,$22,$0       # E : 1st src word complete
-        bis     $18,$4,$18      # E : 000000CCDDAABBCC
+        extql   $1,$6,$1        # U :
-        addl    $19,$7,$19      # E : <sign bits>bbaabb00
+        or      $18,$4,$18      # E : 000000CCDDAABBCC
-        nop                     # E : U L U L
+        extqh   $5,$6,$5        # U : L U L U
+        and     $17,7,$6        # E : dst misalignment
+        extql   $2,$6,$2        # U :
+        or      $1,$5,$1        # E : 2nd src word complete
+        extqh   $3,$6,$22       # U : L U L U :
+        cmoveq  $6,$31,$22      # E : dst aligned?
+        extql   $3,$6,$3        # U :
        addq    $20,$0,$20      # E : begin summing the words
+        extqh   $23,$6,$23      # U : L U L U :
        srl     $18,16,$4       # U : 0000000000CCDDAA
+        or      $2,$22,$2       # E : 1st dst word complete
        zap     $19,0x3,$19     # U : <sign bits>bbaa0000
-        nop                     # E : L U U L
+        or      $3,$23,$3       # E : U L U L : 2nd dst word complete
        cmpult  $20,$0,$0       # E :
        addq    $20,$1,$20      # E :
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 50d9f3e4e0..a44c6da9bf 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -241,6 +241,9 @@ config ARCH_H720X
 config ARCH_IMX
        bool "IMX"
+        select GENERIC_GPIO
+        select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
        help
          Support for Motorola's i.MX family of processors (MX1, MXL).
@@ -308,6 +311,7 @@ config ARCH_L7200
 config ARCH_KS8695
        bool "Micrel/Kendin KS8695"
+        select GENERIC_GPIO
        help
          Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
          System-on-Chip devices.
@@ -384,6 +388,7 @@ config ARCH_DAVINCI
        bool "TI DaVinci"
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
+        select GENERIC_GPIO
        help
          Support for TI's DaVinci platform.
@@ -531,6 +536,9 @@ config PCI
          information about which PCI hardware does work under Linux and which
          doesn't.
+config PCI_SYSCALL
+        def_bool PCI
 # Select the host bridge type
 config PCI_HOST_VIA82C505
        bool
@@ -1034,6 +1042,8 @@ source "drivers/mmc/Kconfig"
 source "drivers/rtc/Kconfig"
+source "drivers/dma/Kconfig"
 endmenu
 source "fs/Kconfig"
diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore
index 171a0853ca..ce1c5ff746 100644
--- a/arch/arm/boot/.gitignore
+++ b/arch/arm/boot/.gitignore
@@ -1,2 +1,5 @@
 Image
 zImage
+xipImage
+bootpImage
+uImage
diff --git a/arch/arm/boot/compressed/.gitignore b/arch/arm/boot/compressed/.gitignore
index aefee20cbf..b15f927a59 100644
--- a/arch/arm/boot/compressed/.gitignore
+++ b/arch/arm/boot/compressed/.gitignore
@@ -1 +1,2 @@
 piggy.gz
+font.c
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index adddc71316..a1f1691b67 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -6,15 +6,13 @@
 HEAD    = head.o
 OBJS    = misc.o
-FONTC   = drivers/video/console/font_acorn_8x8.c
+FONTC   = $(srctree)/drivers/video/console/font_acorn_8x8.c
-FONT = $(addprefix ../../../../drivers/video/console/, font_acorn_8x8.o)
 #
 # Architecture dependencies
 #
 ifeq ($(CONFIG_ARCH_ACORN),y)
-OBJS            += ll_char_wr.o $(FONT)
+OBJS            += ll_char_wr.o font.o
 endif
 ifeq ($(CONFIG_ARCH_SHARK),y)
@@ -73,7 +71,7 @@ endif
 SEDFLAGS        = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
-targets       := vmlinux vmlinux.lds piggy.gz piggy.o $(FONT) \
+targets       := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \
                 head.o misc.o $(OBJS)
 EXTRA_CFLAGS  := -fpic
 EXTRA_AFLAGS  :=
@@ -105,7 +103,10 @@ $(obj)/piggy.gz: $(obj)/../Image FORCE
 $(obj)/piggy.o:  $(obj)/piggy.gz FORCE
-CFLAGS_font_acorn_8x8.o := -Dstatic=
+CFLAGS_font.o := -Dstatic=
+$(obj)/font.c: $(FONTC)
+        $(call cmd,shipped)
 $(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile .config
        @sed "$(SEDFLAGS)" < $< > $@
diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S
index 73c5d9e020..236bbe5783 100644
--- a/arch/arm/boot/compressed/head-xscale.S
+++ b/arch/arm/boot/compressed/head-xscale.S
@@ -41,11 +41,6 @@ __XScale_start:
                mov     r7, #MACH_TYPE_COTULLA_IDP
 #endif
-#ifdef  CONFIG_MACH_GTWX5715
-               mov     r7, #(MACH_TYPE_GTWX5715 & 0xff)
-               orr     r7, r7, #(MACH_TYPE_GTWX5715 & 0xff00)
-#endif
 #ifdef CONFIG_ARCH_IXP2000
                mov     r1, #-1
                mov     r0, #0xd6000000
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 23348e9561..d7fb5ee163 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -436,6 +436,28 @@ __armv4_mmu_cache_on:
                mcr     p15, 0, r0, c8, c7, 0   @ flush I,D TLBs
                mov     pc, r12
+__armv7_mmu_cache_on:
+                mov     r12, lr
+                mrc     p15, 0, r11, c0, c1, 4  @ read ID_MMFR0
+                tst     r11, #0xf               @ VMSA
+                blne    __setup_mmu
+                mov     r0, #0
+                mcr     p15, 0, r0, c7, c10, 4  @ drain write buffer
+                tst     r11, #0xf               @ VMSA
+                mcrne   p15, 0, r0, c8, c7, 0   @ flush I,D TLBs
+                mrc     p15, 0, r0, c1, c0, 0   @ read control reg
+                orr     r0, r0, #0x5000         @ I-cache enable, RR cache replacement
+                orr     r0, r0, #0x003c         @ write buffer
+                orrne   r0, r0, #1              @ MMU enabled
+                movne   r1, #-1
+                mcrne   p15, 0, r3, c2, c0, 0   @ load page table pointer
+                mcrne   p15, 0, r1, c3, c0, 0   @ load domain access control
+                mcr     p15, 0, r0, c1, c0, 0   @ load control register
+                mrc     p15, 0, r0, c1, c0, 0   @ and read it back
+                mov     r0, #0
+                mcr     p15, 0, r0, c7, c5, 4   @ ISB
+                mov     pc, r12
 __arm6_mmu_cache_on:
                mov     r12, lr
                bl      __setup_mmu
@@ -622,11 +644,17 @@ proc_types:
                b       __armv4_mmu_cache_flush
                .word   0x0007b000              @ ARMv6
-                .word   0x0007f000
+                .word   0x000ff000
                b       __armv4_mmu_cache_on
                b       __armv4_mmu_cache_off
                b       __armv6_mmu_cache_flush
+                .word   0x000f0000              @ new CPU Id
+                .word   0x000f0000
+                b       __armv7_mmu_cache_on
+                b       __armv7_mmu_cache_off
+                b       __armv7_mmu_cache_flush
                .word   0                       @ unrecognised type
                .word   0
                mov     pc, lr
@@ -674,6 +702,16 @@ __armv4_mmu_cache_off:
                mcr     p15, 0, r0, c8, c7      @ invalidate whole TLB v4
                mov     pc, lr
+__armv7_mmu_cache_off:
+                mrc     p15, 0, r0, c1, c0
+                bic     r0, r0, #0x000d
+                mcr     p15, 0, r0, c1, c0      @ turn MMU and cache off
+                mov     r12, lr
+                bl      __armv7_mmu_cache_flush
+                mov     r0, #0
+                mcr     p15, 0, r0, c8, c7, 0   @ invalidate whole TLB
+                mov     pc, r12
 __arm6_mmu_cache_off:
                mov     r0, #0x00000030         @ ARM6 control reg.
                b       __armv3_mmu_cache_off
@@ -730,6 +768,59 @@ __armv6_mmu_cache_flush:
                mcr     p15, 0, r1, c7, c10, 4  @ drain WB
                mov     pc, lr
+__armv7_mmu_cache_flush:
+                mrc     p15, 0, r10, c0, c1, 5  @ read ID_MMFR1
+                tst     r10, #0xf << 16         @ hierarchical cache (ARMv7)
+                beq     hierarchical
+                mov     r10, #0
+                mcr     p15, 0, r10, c7, c14, 0 @ clean+invalidate D
+                b       iflush
+hierarchical:
+                stmfd   sp!, {r0-r5, r7, r9-r11}
+                mrc     p15, 1, r0, c0, c0, 1   @ read clidr
+                ands    r3, r0, #0x7000000      @ extract loc from clidr
+                mov     r3, r3, lsr #23         @ left align loc bit field
+                beq     finished                @ if loc is 0, then no need to clean
+                mov     r10, #0                 @ start clean at cache level 0
+loop1:
+                add     r2, r10, r10, lsr #1    @ work out 3x current cache level
+                mov     r1, r0, lsr r2          @ extract cache type bits from clidr
+                and     r1, r1, #7              @ mask of the bits for current cache only
+                cmp     r1, #2                  @ see what cache we have at this level
+                blt     skip                    @ skip if no cache, or just i-cache
+                mcr     p15, 2, r10, c0, c0, 0  @ select current cache level in cssr
+                mcr     p15, 0, r10, c7, c5, 4  @ isb to sych the new cssr&csidr
+                mrc     p15, 1, r1, c0, c0, 0   @ read the new csidr
+                and     r2, r1, #7              @ extract the length of the cache lines
+                add     r2, r2, #4              @ add 4 (line length offset)
+                ldr     r4, =0x3ff
+                ands    r4, r4, r1, lsr #3      @ find maximum number on the way size
+                .word   0xe16f5f14              @ clz r5, r4 - find bit position of way size increment
+                ldr     r7, =0x7fff
+                ands    r7, r7, r1, lsr #13     @ extract max number of the index size
+loop2:
+                mov     r9, r4                  @ create working copy of max way size
+loop3:
+                orr     r11, r10, r9, lsl r5    @ factor way and cache number into r11
+                orr     r11, r11, r7, lsl r2    @ factor index number into r11
+                mcr     p15, 0, r11, c7, c14, 2 @ clean & invalidate by set/way
+                subs    r9, r9, #1              @ decrement the way
+                bge     loop3
+                subs    r7, r7, #1              @ decrement the index
+                bge     loop2
+skip:
+                add     r10, r10, #2            @ increment cache number
+                cmp     r3, r10
+                bgt     loop1
+finished:
+                mov     r10, #0                 @ swith back to cache level 0
+                mcr     p15, 2, r10, c0, c0, 0  @ select current cache level in cssr
+                ldmfd   sp!, {r0-r5, r7, r9-r11}
+iflush:
+                mcr     p15, 0, r10, c7, c5, 0  @ invalidate I+BTB
+                mcr     p15, 0, r10, c7, c10, 4 @ drain WB
+                mov     pc, lr
 __armv4_mmu_cache_flush:
                mov     r2, #64*1024            @ default: 32K dcache size (*2)
                mov     r11, #32                @ default: 32 byte line size
@@ -836,6 +927,7 @@ memdump:	mov	r12, r0
                mov     pc, r10
 #endif
+                .ltorg
 reloc_end:
                .align
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index cfe6f4650b..ae21755872 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -60,6 +60,9 @@ struct locomo {
        unsigned int irq;
        spinlock_t lock;
        void __iomem *base;
+#ifdef CONFIG_PM
+        void *saved_state;
+#endif
 };
 struct locomo_dev_info {
@@ -565,7 +568,7 @@ static int locomo_suspend(struct platform_device *dev, pm_message_t state)
        if (!save)
                return -ENOMEM;
-        dev->dev.power.saved_state = (void *) save;
+        lchip->saved_state = save;
        spin_lock_irqsave(&lchip->lock, flags);
@@ -605,8 +608,8 @@ static int locomo_resume(struct platform_device *dev)
        struct locomo_save_data *save;
        unsigned long r;
        unsigned long flags;
-        
-        save = (struct locomo_save_data *) dev->dev.power.saved_state;
+        save = lchip->saved_state;
        if (!save)
                return 0;
@@ -628,6 +631,8 @@ static int locomo_resume(struct platform_device *dev)
        locomo_writel(0x1, lchip->base + LOCOMO_KEYBOARD + LOCOMO_KCMD);
        spin_unlock_irqrestore(&lchip->lock, flags);
+        lchip->saved_state = NULL;
        kfree(save);
        return 0;
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 798bbfccaf..eb06d0b2cb 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -51,6 +51,9 @@ struct sa1111 {
        int             irq;
        spinlock_t      lock;
        void __iomem    *base;
+#ifdef CONFIG_PM
+        void            *saved_state;
+#endif
 };
 /*
@@ -822,7 +825,7 @@ static int sa1111_suspend(struct platform_device *dev, pm_message_t state)
        save = kmalloc(sizeof(struct sa1111_save_data), GFP_KERNEL);
        if (!save)
                return -ENOMEM;
-        dev->dev.power.saved_state = save;
+        sachip->saved_state = save;
        spin_lock_irqsave(&sachip->lock, flags);
@@ -878,7 +881,7 @@ static int sa1111_resume(struct platform_device *dev)
        unsigned long flags, id;
        void __iomem *base;
-        save = (struct sa1111_save_data *)dev->dev.power.saved_state;
+        save = sachip->saved_state;
        if (!save)
                return 0;
@@ -923,7 +926,7 @@ static int sa1111_resume(struct platform_device *dev)
        spin_unlock_irqrestore(&sachip->lock, flags);
-        dev->dev.power.saved_state = NULL;
+        sachip->saved_state = NULL;
        kfree(save);
        return 0;
@@ -958,8 +961,8 @@ static int sa1111_remove(struct platform_device *pdev)
                platform_set_drvdata(pdev, NULL);
 #ifdef CONFIG_PM
-                kfree(pdev->dev.power.saved_state);
+                kfree(sachip->saved_state);
-                pdev->dev.power.saved_state = NULL;
+                sachip->saved_state = NULL;
 #endif
        }
diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c
index 3bf3a927ae..111a7fa5de 100644
--- a/arch/arm/common/sharpsl_pm.c
+++ b/arch/arm/common/sharpsl_pm.c
@@ -766,9 +766,7 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info)
 }
 static struct pm_ops sharpsl_pm_ops = {
-        .prepare        = pxa_pm_prepare,
        .enter          = corgi_pxa_pm_enter,
-        .finish         = pxa_pm_finish,
        .valid          = pm_valid_only_mem,
 };
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index 19326d7cde..a98d0c933d 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -350,7 +350,7 @@
                CALL(sys_set_robust_list)
                CALL(sys_get_robust_list)
 /* 340 */       CALL(sys_splice)
-                CALL(sys_arm_sync_file_range)
+                CALL(sys_sync_file_range2)
                CALL(sys_tee)
                CALL(sys_vmsplice)
                CALL(sys_move_pages)
diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S
index a52da0ddb4..024a9cf469 100644
--- a/arch/arm/kernel/head-common.S
+++ b/arch/arm/kernel/head-common.S
@@ -20,7 +20,8 @@ __switch_data:
        .long   _end                            @ r7
        .long   processor_id                    @ r4
        .long   __machine_arch_type             @ r5
-        .long   cr_alignment                    @ r6
+        .long   __atags_pointer                 @ r6
+        .long   cr_alignment                    @ r7
        .long   init_thread_union + THREAD_START_SP @ sp
 /*
@@ -29,6 +30,7 @@ __switch_data:
 *
 *  r0  = cp#15 control register
 *  r1  = machine ID
+ *  r2  = atags pointer
 *  r9  = processor ID
 */
        .type   __mmap_switched, %function
@@ -47,11 +49,12 @@ __mmap_switched:
        strcc   fp, [r6],#4
        bcc     1b
-        ldmia   r3, {r4, r5, r6, sp}
+        ldmia   r3, {r4, r5, r6, r7, sp}
        str     r9, [r4]                        @ Save processor ID
        str     r1, [r5]                        @ Save machine type
+        str     r2, [r6]                        @ Save atags pointer
        bic     r4, r0, #CR_A                   @ Clear 'A' bit
-        stmia   r6, {r0, r4}                    @ Save control register values
+        stmia   r7, {r0, r4}                    @ Save control register values
        b       start_kernel
 /*
@@ -215,3 +218,34 @@ ENTRY(lookup_machine_type)
        bl      __lookup_machine_type
        mov     r0, r5
        ldmfd   sp!, {r4 - r6, pc}
+/* Determine validity of the r2 atags pointer.  The heuristic requires
+ * that the pointer be aligned, in the first 16k of physical RAM and
+ * that the ATAG_CORE marker is first and present.  Future revisions
+ * of this function may be more lenient with the physical address and
+ * may also be able to move the ATAGS block if necessary.
+ *
+ * r8  = machinfo
+ *
+ * Returns:
+ *  r2 either valid atags pointer, or zero
+ *  r5, r6 corrupted
+ */
+        .type   __vet_atags, %function
+__vet_atags:
+        tst     r2, #0x3                        @ aligned?
+        bne     1f
+        ldr     r5, [r2, #0]                    @ is first tag ATAG_CORE?
+        subs    r5, r5, #ATAG_CORE_SIZE
+        bne     1f
+        ldr     r5, [r2, #4]
+        ldr     r6, =ATAG_CORE
+        cmp     r5, r6
+        bne     1f
+        mov     pc, lr                          @ atag pointer is ok
+1:      mov     r2, #0
+        mov     pc, lr
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 41f98b4ba2..7898cbc986 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -29,6 +29,10 @@
 #define KERNEL_RAM_VADDR        (PAGE_OFFSET + TEXT_OFFSET)
 #define KERNEL_RAM_PADDR        (PHYS_OFFSET + TEXT_OFFSET)
+#define ATAG_CORE 0x54410001
+#define ATAG_CORE_SIZE ((2*4 + 3*4) >> 2)
 /*
 * swapper_pg_dir is the virtual address of the initial page table.
 * We place the page tables 16K below KERNEL_RAM_VADDR.  Therefore, we must
@@ -61,7 +65,7 @@
 *
 * This is normally called from the decompressor code.  The requirements
 * are: MMU = off, D-cache = off, I-cache = dont care, r0 = 0,
- * r1 = machine nr.
+ * r1 = machine nr, r2 = atags pointer.
 *
 * This code is mostly position independent, so if you link the kernel at
 * 0xc0008000, you call this at __pa(0xc0008000).
@@ -85,6 +89,7 @@ ENTRY(stext)
        bl      __lookup_machine_type           @ r5=machinfo
        movs    r8, r5                          @ invalid machine (r5=0)?
        beq     __error_a                       @ yes, error 'a'
+        bl      __vet_atags
        bl      __create_page_tables
        /*
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 5d6e652359..93b7f8e22d 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -28,6 +28,7 @@
 #include <linux/elfcore.h>
 #include <linux/pm.h>
 #include <linux/tick.h>
+#include <linux/utsname.h>
 #include <asm/leds.h>
 #include <asm/processor.h>
@@ -43,6 +44,10 @@ static const char *processor_modes[] = {
  "UK8_32" , "UK9_32" , "UK10_32", "UND_32" , "UK12_32", "UK13_32", "UK14_32", "SYS_32"
 };
+static const char *isa_modes[] = {
+  "ARM" , "Thumb" , "Jazelle", "ThumbEE"
+};
 extern void setup_mm_for_reboot(char mode);
 static volatile int hlt_counter;
@@ -199,16 +204,19 @@ void machine_restart(char * __unused)
 void __show_regs(struct pt_regs *regs)
 {
-        unsigned long flags = condition_codes(regs);
+        unsigned long flags;
+        char buf[64];
-        printk("CPU: %d\n", smp_processor_id());
+        printk("CPU: %d    %s  (%s %.*s)\n",
+                smp_processor_id(), print_tainted(), init_utsname()->release,
+                (int)strcspn(init_utsname()->version, " "),
+                init_utsname()->version);
        print_symbol("PC is at %s\n", instruction_pointer(regs));
        print_symbol("LR is at %s\n", regs->ARM_lr);
-        printk("pc : [<%08lx>]    lr : [<%08lx>]    %s\n"
+        printk("pc : [<%08lx>]    lr : [<%08lx>]    psr: %08lx\n"
               "sp : %08lx  ip : %08lx  fp : %08lx\n",
-                instruction_pointer(regs),
+                regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
-                regs->ARM_lr, print_tainted(), regs->ARM_sp,
+                regs->ARM_sp, regs->ARM_ip, regs->ARM_fp);
-                regs->ARM_ip, regs->ARM_fp);
        printk("r10: %08lx  r9 : %08lx  r8 : %08lx\n",
                regs->ARM_r10, regs->ARM_r9,
                regs->ARM_r8);
@@ -218,36 +226,39 @@ void __show_regs(struct pt_regs *regs)
        printk("r3 : %08lx  r2 : %08lx  r1 : %08lx  r0 : %08lx\n",
                regs->ARM_r3, regs->ARM_r2,
                regs->ARM_r1, regs->ARM_r0);
-        printk("Flags: %c%c%c%c",
-                flags & PSR_N_BIT ? 'N' : 'n',
+        flags = regs->ARM_cpsr;
-                flags & PSR_Z_BIT ? 'Z' : 'z',
+        buf[0] = flags & PSR_N_BIT ? 'N' : 'n';
-                flags & PSR_C_BIT ? 'C' : 'c',
+        buf[1] = flags & PSR_Z_BIT ? 'Z' : 'z';
-                flags & PSR_V_BIT ? 'V' : 'v');
+        buf[2] = flags & PSR_C_BIT ? 'C' : 'c';
-        printk("  IRQs o%s  FIQs o%s  Mode %s%s  Segment %s\n",
+        buf[3] = flags & PSR_V_BIT ? 'V' : 'v';
-                interrupts_enabled(regs) ? "n" : "ff",
+        buf[4] = '\0';
+        printk("Flags: %s  IRQs o%s  FIQs o%s  Mode %s  ISA %s  Segment %s\n",
+                buf, interrupts_enabled(regs) ? "n" : "ff",
                fast_interrupts_enabled(regs) ? "n" : "ff",
                processor_modes[processor_mode(regs)],
-                thumb_mode(regs) ? " (T)" : "",
+                isa_modes[isa_mode(regs)],
                get_fs() == get_ds() ? "kernel" : "user");
-#if CONFIG_CPU_CP15
+#ifdef CONFIG_CPU_CP15
        {
                unsigned int ctrl;
-                  __asm__ (
-                "       mrc p15, 0, %0, c1, c0\n"
+                buf[0] = '\0';
-                : "=r" (ctrl));
-                printk("Control: %04X\n", ctrl);
-        }
 #ifdef CONFIG_CPU_CP15_MMU
-        {
+                {
-                unsigned int transbase, dac;
+                        unsigned int transbase, dac;
-                  __asm__ (
+                        asm("mrc p15, 0, %0, c2, c0\n\t"
-                "       mrc p15, 0, %0, c2, c0\n"
+                            "mrc p15, 0, %1, c3, c0\n"
-                "       mrc p15, 0, %1, c3, c0\n"
+                            : "=r" (transbase), "=r" (dac));
-                : "=r" (transbase), "=r" (dac));
+                        snprintf(buf, sizeof(buf), "  Table: %08x  DAC: %08x",
-                printk("Table: %08X  DAC: %08X\n",
+                                transbase, dac);
-                        transbase, dac);
+                }
-        }
 #endif
+                asm("mrc p15, 0, %0, c1, c0\n" : "=r" (ctrl));
+                printk("Control: %08x%s\n", ctrl, buf);
+        }
 #endif
 }
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index 6f2f46c2e4..78c9f1a3d4 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -657,7 +657,6 @@ static int ptrace_setcrunchregs(struct task_struct *tsk, void __user *ufp)
 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 {
-        unsigned long tmp;
        int ret;
        switch (request) {
@@ -666,12 +665,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 */
                case PTRACE_PEEKTEXT:
                case PTRACE_PEEKDATA:
-                        ret = access_process_vm(child, addr, &tmp,
+                        ret = generic_ptrace_peekdata(child, addr, data);
-                                                sizeof(unsigned long), 0);
-                        if (ret == sizeof(unsigned long))
-                                ret = put_user(tmp, (unsigned long __user *) data);
-                        else
-                                ret = -EIO;
                        break;
                case PTRACE_PEEKUSR:
@@ -683,12 +677,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 */
                case PTRACE_POKETEXT:
                case PTRACE_POKEDATA:
-                        ret = access_process_vm(child, addr, &data,
+                        ret = generic_ptrace_pokedata(child, addr, data);
-                                                sizeof(unsigned long), 1);
-                        if (ret == sizeof(unsigned long))
-                                ret = 0;
-                        else
-                                ret = -EIO;
                        break;
                case PTRACE_POKEUSR:
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 650eac1bc0..5be2e987b8 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -63,6 +63,8 @@ unsigned int processor_id;
 unsigned int __machine_arch_type;
 EXPORT_SYMBOL(__machine_arch_type);
+unsigned int __atags_pointer __initdata;
 unsigned int system_rev;
 EXPORT_SYMBOL(system_rev);
@@ -780,7 +782,9 @@ void __init setup_arch(char **cmdline_p)
        if (mdesc->soft_reboot)
                reboot_setup("s");
-        if (mdesc->boot_params)
+        if (__atags_pointer)
+                tags = phys_to_virt(__atags_pointer);
+        else if (mdesc->boot_params)
                tags = phys_to_virt(mdesc->boot_params);
        /*
diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c
index 1ca2d5174f..4d25e49a14 100644
--- a/arch/arm/kernel/sys_arm.c
+++ b/arch/arm/kernel/sys_arm.c
@@ -328,16 +328,3 @@ asmlinkage long sys_arm_fadvise64_64(int fd, int advice,
 {
        return sys_fadvise64_64(fd, offset, len, advice);
 }
-/*
- * Yet more syscall fsckage - we can't fit sys_sync_file_range's
- * arguments into the available registers with EABI.  So, let's
- * create an ARM specific syscall for this which has _sane_
- * arguments.  (This incidentally also has an ABI-independent
- * argument layout.)
- */
-asmlinkage long sys_arm_sync_file_range(int fd, unsigned int flags,
-                                        loff_t offset, loff_t nbytes)
-{
-        return sys_sync_file_range(fd, offset, nbytes, flags);
-}
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 10ff36e4e4..f2114bcf09 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -181,9 +181,7 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)
 void dump_stack(void)
 {
-#ifdef CONFIG_DEBUG_ERRORS
        __backtrace();
-#endif
 }
 EXPORT_SYMBOL(dump_stack);
@@ -204,12 +202,24 @@ void show_stack(struct task_struct *tsk, unsigned long *sp)
        barrier();
 }
+#ifdef CONFIG_PREEMPT
+#define S_PREEMPT " PREEMPT"
+#else
+#define S_PREEMPT ""
+#endif
+#ifdef CONFIG_SMP
+#define S_SMP " SMP"
+#else
+#define S_SMP ""
+#endif
 static void __die(const char *str, int err, struct thread_info *thread, struct pt_regs *regs)
 {
        struct task_struct *tsk = thread->task;
        static int die_counter;
-        printk("Internal error: %s: %x [#%d]\n", str, err, ++die_counter);
+        printk("Internal error: %s: %x [#%d]" S_PREEMPT S_SMP "\n",
+               str, err, ++die_counter);
        print_modules();
        __show_regs(regs);
        printk("Process %s (pid: %d, stack limit = 0x%p)\n",
@@ -232,16 +242,23 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
 {
        struct thread_info *thread = current_thread_info();
+        oops_enter();
        console_verbose();
        spin_lock_irq(&die_lock);
        bust_spinlocks(1);
        __die(str, err, thread, regs);
        bust_spinlocks(0);
+        add_taint(TAINT_DIE);
        spin_unlock_irq(&die_lock);
+        if (in_interrupt())
+                panic("Fatal exception in interrupt");
        if (panic_on_oops)
                panic("Fatal exception");
+        oops_exit();
        do_exit(SIGSEGV);
 }
diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c
index e18a41e61f..dde089922e 100644
--- a/arch/arm/mach-at91/board-csb337.c
+++ b/arch/arm/mach-at91/board-csb337.c
@@ -23,6 +23,7 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/i2c.h>
 #include <linux/spi/spi.h>
 #include <linux/mtd/physmap.h>
@@ -83,6 +84,13 @@ static struct at91_udc_data __initdata csb337_udc_data = {
        .pullup_pin     = AT91_PIN_PA24,
 };
+static struct i2c_board_info __initdata csb337_i2c_devices[] = {
+        { I2C_BOARD_INFO("rtc-ds1307", 0x68),
+          .type = "ds1307",
+        },
+};
 static struct at91_cf_data __initdata csb337_cf_data = {
        /*
         * connector P4 on the CSB 337 mates to
@@ -161,6 +169,8 @@ static void __init csb337_board_init(void)
        at91_add_device_udc(&csb337_udc_data);
        /* I2C */
        at91_add_device_i2c();
+        i2c_register_board_info(0, csb337_i2c_devices,
+                        ARRAY_SIZE(csb337_i2c_devices));
        /* Compact Flash */
        at91_set_gpio_input(AT91_PIN_PB22, 1);          /* IOIS16 */
        at91_add_device_cf(&csb337_cf_data);
diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
index 26ca8ab3f6..42e172cb0f 100644
--- a/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
@@ -27,6 +27,11 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 #include <linux/dm9000.h>
+#include <linux/fb.h>
+#include <linux/gpio_keys.h>
+#include <linux/input.h>
+#include <video/atmel_lcdc.h>
 #include <asm/hardware.h>
 #include <asm/setup.h>
@@ -271,6 +276,127 @@ static struct spi_board_info ek_spi_devices[] = {
 };
+/*
+ * LCD Controller
+ */
+#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
+static struct fb_videomode at91_tft_vga_modes[] = {
+        {
+                .name           = "TX09D50VM1CCA @ 60",
+                .refresh        = 60,
+                .xres           = 240,          .yres           = 320,
+                .pixclock       = KHZ2PICOS(4965),
+                .left_margin    = 1,            .right_margin   = 33,
+                .upper_margin   = 1,            .lower_margin   = 0,
+                .hsync_len      = 5,            .vsync_len      = 1,
+                .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+                .vmode          = FB_VMODE_NONINTERLACED,
+        },
+};
+static struct fb_monspecs at91fb_default_monspecs = {
+        .manufacturer   = "HIT",
+        .monitor        = "TX09D50VM1CCA",
+        .modedb         = at91_tft_vga_modes,
+        .modedb_len     = ARRAY_SIZE(at91_tft_vga_modes),
+        .hfmin          = 15000,
+        .hfmax          = 64000,
+        .vfmin          = 50,
+        .vfmax          = 150,
+};
+#define AT91SAM9261_DEFAULT_LCDCON2     (ATMEL_LCDC_MEMOR_LITTLE \
+                                        | ATMEL_LCDC_DISTYPE_TFT    \
+                                        | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE)
+static void at91_lcdc_power_control(int on)
+{
+        if (on)
+                at91_set_gpio_value(AT91_PIN_PA12, 0);  /* power up */
+        else
+                at91_set_gpio_value(AT91_PIN_PA12, 1);  /* power down */
+}
+/* Driver datas */
+static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
+        .default_bpp                    = 16,
+        .default_dmacon                 = ATMEL_LCDC_DMAEN,
+        .default_lcdcon2                = AT91SAM9261_DEFAULT_LCDCON2,
+        .default_monspecs               = &at91fb_default_monspecs,
+        .atmel_lcdfb_power_control      = at91_lcdc_power_control,
+        .guard_time                     = 1,
+};
+#else
+static struct atmel_lcdfb_info __initdata ek_lcdc_data;
+#endif
+/*
+ * GPIO Buttons
+ */
+#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+static struct gpio_keys_button ek_buttons[] = {
+        {
+                .gpio           = AT91_PIN_PA27,
+                .keycode        = BTN_0,
+                .desc           = "Button 0",
+                .active_low     = 1,
+        },
+        {
+                .gpio           = AT91_PIN_PA26,
+                .keycode        = BTN_1,
+                .desc           = "Button 1",
+                .active_low     = 1,
+        },
+        {
+                .gpio           = AT91_PIN_PA25,
+                .keycode        = BTN_2,
+                .desc           = "Button 2",
+                .active_low     = 1,
+        },
+        {
+                .gpio           = AT91_PIN_PA24,
+                .keycode        = BTN_3,
+                .desc           = "Button 3",
+                .active_low     = 1,
+        }
+};
+static struct gpio_keys_platform_data ek_button_data = {
+        .buttons        = ek_buttons,
+        .nbuttons       = ARRAY_SIZE(ek_buttons),
+};
+static struct platform_device ek_button_device = {
+        .name           = "gpio-keys",
+        .id             = -1,
+        .num_resources  = 0,
+        .dev            = {
+                .platform_data  = &ek_button_data,
+        }
+};
+static void __init ek_add_device_buttons(void)
+{
+        at91_set_gpio_input(AT91_PIN_PB27, 0);  /* btn0 */
+        at91_set_deglitch(AT91_PIN_PB27, 1);
+        at91_set_gpio_input(AT91_PIN_PB26, 0);  /* btn1 */
+        at91_set_deglitch(AT91_PIN_PB26, 1);
+        at91_set_gpio_input(AT91_PIN_PB25, 0);  /* btn2 */
+        at91_set_deglitch(AT91_PIN_PB25, 1);
+        at91_set_gpio_input(AT91_PIN_PB24, 0);  /* btn3 */
+        at91_set_deglitch(AT91_PIN_PB24, 1);
+        platform_device_register(&ek_button_device);
+}
+#else
+static void __init ek_add_device_buttons(void) {}
+#endif
 static void __init ek_board_init(void)
 {
        /* Serial */
@@ -296,6 +422,10 @@ static void __init ek_board_init(void)
        /* MMC */
        at91_add_device_mmc(0, &ek_mmc_data);
 #endif
+        /* LCD Controller */
+        at91_add_device_lcdc(&ek_lcdc_data);
+        /* Push Buttons */
+        ek_add_device_buttons();
 }
 MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK")
diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c
index c164c8e58a..2a1cc73390 100644
--- a/arch/arm/mach-at91/board-sam9263ek.c
+++ b/arch/arm/mach-at91/board-sam9263ek.c
@@ -26,6 +26,9 @@
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
+#include <linux/fb.h>
+#include <video/atmel_lcdc.h>
 #include <asm/hardware.h>
 #include <asm/setup.h>
@@ -202,6 +205,65 @@ static struct at91_nand_data __initdata ek_nand_data = {
 /*
+ * LCD Controller
+ */
+#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
+static struct fb_videomode at91_tft_vga_modes[] = {
+        {
+                .name           = "TX09D50VM1CCA @ 60",
+                .refresh        = 60,
+                .xres           = 240,          .yres           = 320,
+                .pixclock       = KHZ2PICOS(4965),
+                .left_margin    = 1,            .right_margin   = 33,
+                .upper_margin   = 1,            .lower_margin   = 0,
+                .hsync_len      = 5,            .vsync_len      = 1,
+                .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+                .vmode          = FB_VMODE_NONINTERLACED,
+        },
+};
+static struct fb_monspecs at91fb_default_monspecs = {
+        .manufacturer   = "HIT",
+        .monitor        = "TX09D70VM1CCA",
+        .modedb         = at91_tft_vga_modes,
+        .modedb_len     = ARRAY_SIZE(at91_tft_vga_modes),
+        .hfmin          = 15000,
+        .hfmax          = 64000,
+        .vfmin          = 50,
+        .vfmax          = 150,
+};
+#define AT91SAM9263_DEFAULT_LCDCON2     (ATMEL_LCDC_MEMOR_LITTLE \
+                                        | ATMEL_LCDC_DISTYPE_TFT    \
+                                        | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE)
+static void at91_lcdc_power_control(int on)
+{
+        if (on)
+                at91_set_gpio_value(AT91_PIN_PD12, 0);  /* power up */
+        else
+                at91_set_gpio_value(AT91_PIN_PD12, 1);  /* power down */
+}
+/* Driver datas */
+static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
+        .default_bpp                    = 16,
+        .default_dmacon                 = ATMEL_LCDC_DMAEN,
+        .default_lcdcon2                = AT91SAM9263_DEFAULT_LCDCON2,
+        .default_monspecs               = &at91fb_default_monspecs,
+        .atmel_lcdfb_power_control      = at91_lcdc_power_control,
+        .guard_time                     = 1,
+};
+#else
+static struct atmel_lcdfb_info __initdata ek_lcdc_data;
+#endif
+/*
 * AC97
 */
 static struct atmel_ac97_data ek_ac97_data = {
@@ -230,6 +292,8 @@ static void __init ek_board_init(void)
        at91_add_device_nand(&ek_nand_data);
        /* I2C */
        at91_add_device_i2c();
+        /* LCD Controller */
+        at91_add_device_lcdc(&ek_lcdc_data);
        /* AC97 */
        at91_add_device_ac97(&ek_ac97_data);
 }
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 47ff676aca..ddf9184d56 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -53,7 +53,7 @@ static suspend_state_t target_state;
 /*
 * Called after processes are frozen, but before we shutdown devices.
 */
-static int at91_pm_prepare(suspend_state_t state)
+static int at91_pm_set_target(suspend_state_t state)
 {
        target_state = state;
        return 0;
@@ -201,7 +201,7 @@ error:
 static struct pm_ops at91_pm_ops ={
        .valid          = at91_pm_valid_state,
-        .prepare        = at91_pm_prepare,
+        .set_target     = at91_pm_set_target,
        .enter          = at91_pm_enter,
 };
diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile
index a8f88cd299..99ac2e5577 100644
--- a/arch/arm/mach-davinci/Makefile
+++ b/arch/arm/mach-davinci/Makefile
@@ -4,7 +4,8 @@
 #
 # Common objects
-obj-y                   := time.o irq.o serial.o io.o id.o psc.o
+obj-y                   := time.o irq.o clock.o serial.o io.o id.o psc.o \
+                           gpio.o mux.o
 # Board specific
 obj-$(CONFIG_MACH_DAVINCI_EVM)  += board-evm.o
diff --git a/arch/arm/mach-davinci/board-evm.c b/arch/arm/mach-davinci/board-evm.c
index 633c12e430..9e4024c496 100644
--- a/arch/arm/mach-davinci/board-evm.c
+++ b/arch/arm/mach-davinci/board-evm.c
@@ -32,6 +32,7 @@
 void __init davinci_psc_init(void);
 void __init davinci_irq_init(void);
 void __init davinci_map_common_io(void);
+void __init davinci_init_common_hw(void);
 /* NOR Flash base address set to CS0 by default */
 #define NOR_FLASH_PHYS 0x02000000
@@ -116,6 +117,7 @@ static __init void davinci_evm_init(void)
 static __init void davinci_evm_irq_init(void)
 {
+        davinci_init_common_hw();
        davinci_irq_init();
 }
diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c
new file mode 100644
index 0000000000..139ceaa35e
--- /dev/null
+++ b/arch/arm/mach-davinci/clock.c
@@ -0,0 +1,323 @@
+/*
+ * TI DaVinci clock config file
+ *
+ * Copyright (C) 2006 Texas Instruments.
+ *
+ * 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.
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/platform_device.h>
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/arch/psc.h>
+#include "clock.h"
+/* PLL/Reset register offsets */
+#define PLLM            0x110
+static LIST_HEAD(clocks);
+static DEFINE_MUTEX(clocks_mutex);
+static DEFINE_SPINLOCK(clockfw_lock);
+static unsigned int commonrate;
+static unsigned int armrate;
+static unsigned int fixedrate = 27000000;       /* 27 MHZ */
+extern void davinci_psc_config(unsigned int domain, unsigned int id, char enable);
+/*
+ * Returns a clock. Note that we first try to use device id on the bus
+ * and clock name. If this fails, we try to use clock name only.
+ */
+struct clk *clk_get(struct device *dev, const char *id)
+{
+        struct clk *p, *clk = ERR_PTR(-ENOENT);
+        int idno;
+        if (dev == NULL || dev->bus != &platform_bus_type)
+                idno = -1;
+        else
+                idno = to_platform_device(dev)->id;
+        mutex_lock(&clocks_mutex);
+        list_for_each_entry(p, &clocks, node) {
+                if (p->id == idno &&
+                    strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
+                        clk = p;
+                        goto found;
+                }
+        }
+        list_for_each_entry(p, &clocks, node) {
+                if (strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
+                        clk = p;
+                        break;
+                }
+        }
+found:
+        mutex_unlock(&clocks_mutex);
+        return clk;
+}
+EXPORT_SYMBOL(clk_get);
+void clk_put(struct clk *clk)
+{
+        if (clk && !IS_ERR(clk))
+                module_put(clk->owner);
+}
+EXPORT_SYMBOL(clk_put);
+static int __clk_enable(struct clk *clk)
+{
+        if (clk->flags & ALWAYS_ENABLED)
+                return 0;
+        davinci_psc_config(DAVINCI_GPSC_ARMDOMAIN, clk->lpsc, 1);
+        return 0;
+}
+static void __clk_disable(struct clk *clk)
+{
+        if (clk->usecount)
+                return;
+        davinci_psc_config(DAVINCI_GPSC_ARMDOMAIN, clk->lpsc, 0);
+}
+int clk_enable(struct clk *clk)
+{
+        unsigned long flags;
+        int ret = 0;
+        if (clk == NULL || IS_ERR(clk))
+                return -EINVAL;
+        if (clk->usecount++ == 0) {
+                spin_lock_irqsave(&clockfw_lock, flags);
+                ret = __clk_enable(clk);
+                spin_unlock_irqrestore(&clockfw_lock, flags);
+        }
+        return ret;
+}
+EXPORT_SYMBOL(clk_enable);
+void clk_disable(struct clk *clk)
+{
+        unsigned long flags;
+        if (clk == NULL || IS_ERR(clk))
+                return;
+        if (clk->usecount > 0 && !(--clk->usecount)) {
+                spin_lock_irqsave(&clockfw_lock, flags);
+                __clk_disable(clk);
+                spin_unlock_irqrestore(&clockfw_lock, flags);
+        }
+}
+EXPORT_SYMBOL(clk_disable);
+unsigned long clk_get_rate(struct clk *clk)
+{
+        if (clk == NULL || IS_ERR(clk))
+                return -EINVAL;
+        return *(clk->rate);
+}
+EXPORT_SYMBOL(clk_get_rate);
+long clk_round_rate(struct clk *clk, unsigned long rate)
+{
+        if (clk == NULL || IS_ERR(clk))
+                return -EINVAL;
+        return *(clk->rate);
+}
+EXPORT_SYMBOL(clk_round_rate);
+int clk_set_rate(struct clk *clk, unsigned long rate)
+{
+        if (clk == NULL || IS_ERR(clk))
+                return -EINVAL;
+        /* changing the clk rate is not supported */
+        return -EINVAL;
+}
+EXPORT_SYMBOL(clk_set_rate);
+int clk_register(struct clk *clk)
+{
+        if (clk == NULL || IS_ERR(clk))
+                return -EINVAL;
+        mutex_lock(&clocks_mutex);
+        list_add(&clk->node, &clocks);
+        mutex_unlock(&clocks_mutex);
+        return 0;
+}
+EXPORT_SYMBOL(clk_register);
+void clk_unregister(struct clk *clk)
+{
+        if (clk == NULL || IS_ERR(clk))
+                return;
+        mutex_lock(&clocks_mutex);
+        list_del(&clk->node);
+        mutex_unlock(&clocks_mutex);
+}
+EXPORT_SYMBOL(clk_unregister);
+static struct clk davinci_clks[] = {
+        {
+                .name = "ARMCLK",
+                .rate = &armrate,
+                .lpsc = -1,
+                .flags = ALWAYS_ENABLED,
+        },
+        {
+                .name = "UART",
+                .rate = &fixedrate,
+                .lpsc = DAVINCI_LPSC_UART0,
+        },
+        {
+                .name = "EMACCLK",
+                .rate = &commonrate,
+                .lpsc = DAVINCI_LPSC_EMAC_WRAPPER,
+        },
+        {
+                .name = "I2CCLK",
+                .rate = &fixedrate,
+                .lpsc = DAVINCI_LPSC_I2C,
+        },
+        {
+                .name = "IDECLK",
+                .rate = &commonrate,
+                .lpsc = DAVINCI_LPSC_ATA,
+        },
+        {
+                .name = "McBSPCLK",
+                .rate = &commonrate,
+                .lpsc = DAVINCI_LPSC_McBSP,
+        },
+        {
+                .name = "MMCSDCLK",
+                .rate = &commonrate,
+                .lpsc = DAVINCI_LPSC_MMC_SD,
+        },
+        {
+                .name = "SPICLK",
+                .rate = &commonrate,
+                .lpsc = DAVINCI_LPSC_SPI,
+        },
+        {
+                .name = "gpio",
+                .rate = &commonrate,
+                .lpsc = DAVINCI_LPSC_GPIO,
+        },
+        {
+                .name = "AEMIFCLK",
+                .rate = &commonrate,
+                .lpsc = DAVINCI_LPSC_AEMIF,
+                .usecount = 1,
+        }
+};
+int __init davinci_clk_init(void)
+{
+        struct clk *clkp;
+        int count = 0;
+        u32 pll_mult;
+        pll_mult = davinci_readl(DAVINCI_PLL_CNTRL0_BASE + PLLM);
+        commonrate = ((pll_mult + 1) * 27000000) / 6;
+        armrate = ((pll_mult + 1) * 27000000) / 2;
+        for (clkp = davinci_clks; count < ARRAY_SIZE(davinci_clks);
+             count++, clkp++) {
+                clk_register(clkp);
+                /* Turn on clocks that have been enabled in the
+                 * table above */
+                if (clkp->usecount)
+                        clk_enable(clkp);
+        }
+        return 0;
+}
+#ifdef CONFIG_PROC_FS
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
+static void *davinci_ck_start(struct seq_file *m, loff_t *pos)
+{
+        return *pos < 1 ? (void *)1 : NULL;
+}
+static void *davinci_ck_next(struct seq_file *m, void *v, loff_t *pos)
+{
+        ++*pos;
+        return NULL;
+}
+static void davinci_ck_stop(struct seq_file *m, void *v)
+{
+}
+static int davinci_ck_show(struct seq_file *m, void *v)
+{
+        struct clk *cp;
+        list_for_each_entry(cp, &clocks, node)
+                seq_printf(m,"%s %d %d\n", cp->name, *(cp->rate), cp->usecount);
+        return 0;
+}
+static struct seq_operations davinci_ck_op = {
+        .start  = davinci_ck_start,
+        .next   = davinci_ck_next,
+        .stop   = davinci_ck_stop,
+        .show   = davinci_ck_show
+};
+static int davinci_ck_open(struct inode *inode, struct file *file)
+{
+        return seq_open(file, &davinci_ck_op);
+}
+static struct file_operations proc_davinci_ck_operations = {
+        .open           = davinci_ck_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = seq_release,
+};
+static int __init davinci_ck_proc_init(void)
+{
+        struct proc_dir_entry *entry;
+        entry = create_proc_entry("davinci_clocks", 0, NULL);
+        if (entry)
+                entry->proc_fops = &proc_davinci_ck_operations;
+        return 0;
+}
+__initcall(davinci_ck_proc_init);
+#endif  /* CONFIG_DEBUG_PROC_FS */
diff --git a/arch/arm/mach-davinci/clock.h b/arch/arm/mach-davinci/clock.h
new file mode 100644
index 0000000000..ed47079a52
--- /dev/null
+++ b/arch/arm/mach-davinci/clock.h
@@ -0,0 +1,33 @@
+/*
+ * TI DaVinci clock definitions
+ *
+ * Copyright (C) 2006 Texas Instruments.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __ARCH_ARM_DAVINCI_CLOCK_H
+#define __ARCH_ARM_DAVINCI_CLOCK_H
+struct clk {
+        struct list_head        node;
+        struct module           *owner;
+        const char              *name;
+        unsigned int            *rate;
+        int                     id;
+        __s8                    usecount;
+        __u8                    flags;
+        __u8                    lpsc;
+};
+/* Clock flags */
+#define RATE_CKCTL              1
+#define RATE_FIXED              2
+#define RATE_PROPAGATES         4
+#define VIRTUAL_CLOCK           8
+#define ALWAYS_ENABLED          16
+#define ENABLE_REG_32BIT        32
+#endif
diff --git a/arch/arm/mach-davinci/gpio.c b/arch/arm/mach-davinci/gpio.c
new file mode 100644
index 0000000000..9c67886e71
--- /dev/null
+++ b/arch/arm/mach-davinci/gpio.c
@@ -0,0 +1,286 @@
+/*
+ * TI DaVinci GPIO Support
+ *
+ * Copyright (c) 2006 David Brownell
+ * Copyright (c) 2007, MontaVista Software, Inc. <source@mvista.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/bitops.h>
+#include <asm/arch/irqs.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/gpio.h>
+#include <asm/mach/irq.h>
+static DEFINE_SPINLOCK(gpio_lock);
+static DECLARE_BITMAP(gpio_in_use, DAVINCI_N_GPIO);
+int gpio_request(unsigned gpio, const char *tag)
+{
+        if (gpio >= DAVINCI_N_GPIO)
+                return -EINVAL;
+        if (test_and_set_bit(gpio, gpio_in_use))
+                return -EBUSY;
+        return 0;
+}
+EXPORT_SYMBOL(gpio_request);
+void gpio_free(unsigned gpio)
+{
+        if (gpio >= DAVINCI_N_GPIO)
+                return;
+        clear_bit(gpio, gpio_in_use);
+}
+EXPORT_SYMBOL(gpio_free);
+/* create a non-inlined version */
+static struct gpio_controller *__iomem gpio2controller(unsigned gpio)
+{
+        return __gpio_to_controller(gpio);
+}
+/*
+ * Assuming the pin is muxed as a gpio output, set its output value.
+ */
+void __gpio_set(unsigned gpio, int value)
+{
+        struct gpio_controller *__iomem g = gpio2controller(gpio);
+        __raw_writel(__gpio_mask(gpio), value ? &g->set_data : &g->clr_data);
+}
+EXPORT_SYMBOL(__gpio_set);
+/*
+ * Read the pin's value (works even if it's set up as output);
+ * returns zero/nonzero.
+ *
+ * Note that changes are synched to the GPIO clock, so reading values back
+ * right after you've set them may give old values.
+ */
+int __gpio_get(unsigned gpio)
+{
+        struct gpio_controller *__iomem g = gpio2controller(gpio);
+        return !!(__gpio_mask(gpio) & __raw_readl(&g->in_data));
+}
+EXPORT_SYMBOL(__gpio_get);
+/*--------------------------------------------------------------------------*/
+/*
+ * board setup code *MUST* set PINMUX0 and PINMUX1 as
+ * needed, and enable the GPIO clock.
+ */
+int gpio_direction_input(unsigned gpio)
+{
+        struct gpio_controller *__iomem g = gpio2controller(gpio);
+        u32 temp;
+        u32 mask;
+        if (!g)
+                return -EINVAL;
+        spin_lock(&gpio_lock);
+        mask = __gpio_mask(gpio);
+        temp = __raw_readl(&g->dir);
+        temp |= mask;
+        __raw_writel(temp, &g->dir);
+        spin_unlock(&gpio_lock);
+        return 0;
+}
+EXPORT_SYMBOL(gpio_direction_input);
+int gpio_direction_output(unsigned gpio, int value)
+{
+        struct gpio_controller *__iomem g = gpio2controller(gpio);
+        u32 temp;
+        u32 mask;
+        if (!g)
+                return -EINVAL;
+        spin_lock(&gpio_lock);
+        mask = __gpio_mask(gpio);
+        temp = __raw_readl(&g->dir);
+        temp &= ~mask;
+        __raw_writel(mask, value ? &g->set_data : &g->clr_data);
+        __raw_writel(temp, &g->dir);
+        spin_unlock(&gpio_lock);
+        return 0;
+}
+EXPORT_SYMBOL(gpio_direction_output);
+/*
+ * We expect irqs will normally be set up as input pins, but they can also be
+ * used as output pins ... which is convenient for testing.
+ *
+ * NOTE:  GPIO0..GPIO7 also have direct INTC hookups, which work in addition
+ * to their GPIOBNK0 irq (but with a bit less overhead).  But we don't have
+ * a good way to hook those up ...
+ *
+ * All those INTC hookups (GPIO0..GPIO7 plus five IRQ banks) can also
+ * serve as EDMA event triggers.
+ */
+static void gpio_irq_disable(unsigned irq)
+{
+        struct gpio_controller *__iomem g = get_irq_chip_data(irq);
+        u32 mask = __gpio_mask(irq_to_gpio(irq));
+        __raw_writel(mask, &g->clr_falling);
+        __raw_writel(mask, &g->clr_rising);
+}
+static void gpio_irq_enable(unsigned irq)
+{
+        struct gpio_controller *__iomem g = get_irq_chip_data(irq);
+        u32 mask = __gpio_mask(irq_to_gpio(irq));
+        if (irq_desc[irq].status & IRQ_TYPE_EDGE_FALLING)
+                __raw_writel(mask, &g->set_falling);
+        if (irq_desc[irq].status & IRQ_TYPE_EDGE_RISING)
+                __raw_writel(mask, &g->set_rising);
+}
+static int gpio_irq_type(unsigned irq, unsigned trigger)
+{
+        struct gpio_controller *__iomem g = get_irq_chip_data(irq);
+        u32 mask = __gpio_mask(irq_to_gpio(irq));
+        if (trigger & ~(IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING))
+                return -EINVAL;
+        irq_desc[irq].status &= ~IRQ_TYPE_SENSE_MASK;
+        irq_desc[irq].status |= trigger;
+        __raw_writel(mask, (trigger & IRQ_TYPE_EDGE_FALLING)
+                     ? &g->set_falling : &g->clr_falling);
+        __raw_writel(mask, (trigger & IRQ_TYPE_EDGE_RISING)
+                     ? &g->set_rising : &g->clr_rising);
+        return 0;
+}
+static struct irq_chip gpio_irqchip = {
+        .name           = "GPIO",
+        .enable         = gpio_irq_enable,
+        .disable        = gpio_irq_disable,
+        .set_type       = gpio_irq_type,
+};
+static void
+gpio_irq_handler(unsigned irq, struct irq_desc *desc)
+{
+        struct gpio_controller *__iomem g = get_irq_chip_data(irq);
+        u32 mask = 0xffff;
+        /* we only care about one bank */
+        if (irq & 1)
+                mask <<= 16;
+        /* temporarily mask (level sensitive) parent IRQ */
+        desc->chip->ack(irq);
+        while (1) {
+                u32             status;
+                struct irq_desc *gpio;
+                int             n;
+                int             res;
+                /* ack any irqs */
+                status = __raw_readl(&g->intstat) & mask;
+                if (!status)
+                        break;
+                __raw_writel(status, &g->intstat);
+                if (irq & 1)
+                        status >>= 16;
+                /* now demux them to the right lowlevel handler */
+                n = (int)get_irq_data(irq);
+                gpio = &irq_desc[n];
+                while (status) {
+                        res = ffs(status);
+                        n += res;
+                        gpio += res;
+                        desc_handle_irq(n - 1, gpio - 1);
+                        status >>= res;
+                }
+        }
+        desc->chip->unmask(irq);
+        /* now it may re-trigger */
+}
+/*
+ * NOTE:  for suspend/resume, probably best to make a sysdev (and class)
+ * with its suspend/resume calls hooking into the results of the set_wake()
+ * calls ... so if no gpios are wakeup events the clock can be disabled,
+ * with outputs left at previously set levels, and so that VDD3P3V.IOPWDN0
+ * can be set appropriately for GPIOV33 pins.
+ */
+static int __init davinci_gpio_irq_setup(void)
+{
+        unsigned        gpio, irq, bank;
+        struct clk      *clk;
+        clk = clk_get(NULL, "gpio");
+        if (IS_ERR(clk)) {
+                printk(KERN_ERR "Error %ld getting gpio clock?\n",
+                       PTR_ERR(clk));
+                return 0;
+        }
+        clk_enable(clk);
+        for (gpio = 0, irq = gpio_to_irq(0), bank = IRQ_GPIOBNK0;
+             gpio < DAVINCI_N_GPIO; bank++) {
+                struct gpio_controller  *__iomem g = gpio2controller(gpio);
+                unsigned                i;
+                __raw_writel(~0, &g->clr_falling);
+                __raw_writel(~0, &g->clr_rising);
+                /* set up all irqs in this bank */
+                set_irq_chained_handler(bank, gpio_irq_handler);
+                set_irq_chip_data(bank, g);
+                set_irq_data(bank, (void *)irq);
+                for (i = 0; i < 16 && gpio < DAVINCI_N_GPIO;
+                     i++, irq++, gpio++) {
+                        set_irq_chip(irq, &gpio_irqchip);
+                        set_irq_chip_data(irq, g);
+                        set_irq_handler(irq, handle_simple_irq);
+                        set_irq_flags(irq, IRQF_VALID);
+                }
+        }
+        /* BINTEN -- per-bank interrupt enable. genirq would also let these
+         * bits be set/cleared dynamically.
+         */
+        __raw_writel(0x1f, (void *__iomem)
+                     IO_ADDRESS(DAVINCI_GPIO_BASE + 0x08));
+        printk(KERN_INFO "DaVinci: %d gpio irqs\n", irq - gpio_to_irq(0));
+        return 0;
+}
+arch_initcall(davinci_gpio_irq_setup);
diff --git a/arch/arm/mach-davinci/io.c b/arch/arm/mach-davinci/io.c
index 87fae6fb6e..47787ff84a 100644
--- a/arch/arm/mach-davinci/io.c
+++ b/arch/arm/mach-davinci/io.c
@@ -17,6 +17,7 @@
 #include <asm/memory.h>
 #include <asm/mach/map.h>
+#include <asm/arch/clock.h>
 extern void davinci_check_revision(void);
@@ -49,3 +50,8 @@ void __init davinci_map_common_io(void)
         */
        davinci_check_revision();
 }
+void __init davinci_init_common_hw(void)
+{
+        davinci_clk_init();
+}
diff --git a/arch/arm/mach-davinci/mux.c b/arch/arm/mach-davinci/mux.c
new file mode 100644
index 0000000000..92d26bd305
--- /dev/null
+++ b/arch/arm/mach-davinci/mux.c
@@ -0,0 +1,41 @@
+/*
+ * DaVinci pin multiplexing configurations
+ *
+ * Author: Vladimir Barinov, MontaVista Software, Inc. <source@mvista.com>
+ *
+ * 2007 (c) MontaVista Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+#include <linux/io.h>
+#include <linux/spinlock.h>
+#include <asm/hardware.h>
+#include <asm/arch/mux.h>
+/* System control register offsets */
+#define PINMUX0         0x00
+#define PINMUX1         0x04
+static DEFINE_SPINLOCK(mux_lock);
+void davinci_mux_peripheral(unsigned int mux, unsigned int enable)
+{
+        u32 pinmux, muxreg = PINMUX0;
+        if (mux >= DAVINCI_MUX_LEVEL2) {
+                muxreg = PINMUX1;
+                mux -= DAVINCI_MUX_LEVEL2;
+        }
+        spin_lock(&mux_lock);
+        pinmux = davinci_readl(DAVINCI_SYSTEM_MODULE_BASE + muxreg);
+        if (enable)
+                pinmux |= (1 << mux);
+        else
+                pinmux &= ~(1 << mux);
+        davinci_writel(pinmux, DAVINCI_SYSTEM_MODULE_BASE + muxreg);
+        spin_unlock(&mux_lock);
+}
diff --git a/arch/arm/mach-davinci/psc.c b/arch/arm/mach-davinci/psc.c
index e1b0050283..1334416559 100644
--- a/arch/arm/mach-davinci/psc.c
+++ b/arch/arm/mach-davinci/psc.c
@@ -25,39 +25,40 @@
 #include <asm/io.h>
 #include <asm/hardware.h>
 #include <asm/arch/psc.h>
+#include <asm/arch/mux.h>
-#define PTCMD        __REG(0x01C41120)
+/* PSC register offsets */
-#define PDSTAT       __REG(0x01C41200)
+#define EPCPR           0x070
-#define PDCTL1       __REG(0x01C41304)
+#define PTCMD           0x120
-#define EPCPR        __REG(0x01C41070)
+#define PTSTAT          0x128
-#define PTSTAT       __REG(0x01C41128)
+#define PDSTAT          0x200
+#define PDCTL1          0x304
+#define MDSTAT          0x800
+#define MDCTL           0xA00
-#define MDSTAT       IO_ADDRESS(0x01C41800)
+/* System control register offsets */
-#define MDCTL        IO_ADDRESS(0x01C41A00)
+#define VDD3P3V_PWDN    0x48
-#define PINMUX0      __REG(0x01c40000)
-#define PINMUX1      __REG(0x01c40004)
-#define VDD3P3V_PWDN __REG(0x01C40048)
 static void davinci_psc_mux(unsigned int id)
 {
        switch (id) {
        case DAVINCI_LPSC_ATA:
-                PINMUX0 |= (1 << 17) | (1 << 16);
+                davinci_mux_peripheral(DAVINCI_MUX_HDIREN, 1);
+                davinci_mux_peripheral(DAVINCI_MUX_ATAEN, 1);
                break;
        case DAVINCI_LPSC_MMC_SD:
                /* VDD power manupulations are done in U-Boot for CPMAC
                 * so applies to MMC as well
                 */
                /*Set up the pull regiter for MMC */
-                VDD3P3V_PWDN = 0x0;
+                davinci_writel(0, DAVINCI_SYSTEM_MODULE_BASE + VDD3P3V_PWDN);
-                PINMUX1 &= (~(1 << 9));
+                davinci_mux_peripheral(DAVINCI_MUX_MSTK, 0);
                break;
        case DAVINCI_LPSC_I2C:
-                PINMUX1 |= (1 << 7);
+                davinci_mux_peripheral(DAVINCI_MUX_I2C, 1);
                break;
        case DAVINCI_LPSC_McBSP:
-                PINMUX1 |= (1 << 10);
+                davinci_mux_peripheral(DAVINCI_MUX_ASP, 1);
                break;
        default:
                break;
@@ -67,33 +68,59 @@ static void davinci_psc_mux(unsigned int id)
 /* Enable or disable a PSC domain */
 void davinci_psc_config(unsigned int domain, unsigned int id, char enable)
 {
-        volatile unsigned int *mdstat = (unsigned int *)((int)MDSTAT + 4 * id);
+        u32 epcpr, ptcmd, ptstat, pdstat, pdctl1, mdstat, mdctl, mdstat_mask;
-        volatile unsigned int *mdctl = (unsigned int *)((int)MDCTL + 4 * id);
        if (id < 0)
                return;
+        mdctl = davinci_readl(DAVINCI_PWR_SLEEP_CNTRL_BASE + MDCTL + 4 * id);
        if (enable)
-                *mdctl |= 0x00000003;   /* Enable Module */
+                mdctl |= 0x00000003;    /* Enable Module */
        else
-                *mdctl &= 0xFFFFFFF2;   /* Disable Module */
+                mdctl &= 0xFFFFFFF2;    /* Disable Module */
+        davinci_writel(mdctl, DAVINCI_PWR_SLEEP_CNTRL_BASE + MDCTL + 4 * id);
+        pdstat = davinci_readl(DAVINCI_PWR_SLEEP_CNTRL_BASE + PDSTAT);
+        if ((pdstat & 0x00000001) == 0) {
+                pdctl1 = davinci_readl(DAVINCI_PWR_SLEEP_CNTRL_BASE + PDCTL1);
+                pdctl1 |= 0x1;
+                davinci_writel(pdctl1, DAVINCI_PWR_SLEEP_CNTRL_BASE + PDCTL1);
+                ptcmd = 1 << domain;
+                davinci_writel(ptcmd, DAVINCI_PWR_SLEEP_CNTRL_BASE + PTCMD);
-        if ((PDSTAT & 0x00000001) == 0) {
+                do {
-                PDCTL1 |= 0x1;
+                        epcpr = davinci_readl(DAVINCI_PWR_SLEEP_CNTRL_BASE +
-                PTCMD = (1 << domain);
+                                              EPCPR);
-                while ((((EPCPR >> domain) & 1) == 0));
+                } while ((((epcpr >> domain) & 1) == 0));
-                PDCTL1 |= 0x100;
+                pdctl1 = davinci_readl(DAVINCI_PWR_SLEEP_CNTRL_BASE + PDCTL1);
-                while (!(((PTSTAT >> domain) & 1) == 0));
+                pdctl1 |= 0x100;
+                davinci_writel(pdctl1, DAVINCI_PWR_SLEEP_CNTRL_BASE + PDCTL1);
+                do {
+                        ptstat = davinci_readl(DAVINCI_PWR_SLEEP_CNTRL_BASE +
+                                               PTSTAT);
+                } while (!(((ptstat >> domain) & 1) == 0));
        } else {
-                PTCMD = (1 << domain);
+                ptcmd = 1 << domain;
-                while (!(((PTSTAT >> domain) & 1) == 0));
+                davinci_writel(ptcmd, DAVINCI_PWR_SLEEP_CNTRL_BASE + PTCMD);
+                do {
+                        ptstat = davinci_readl(DAVINCI_PWR_SLEEP_CNTRL_BASE +
+                                               PTSTAT);
+                } while (!(((ptstat >> domain) & 1) == 0));
        }
        if (enable)
-                while (!((*mdstat & 0x0000001F) == 0x3));
+                mdstat_mask = 0x3;
        else
-                while (!((*mdstat & 0x0000001F) == 0x2));
+                mdstat_mask = 0x2;
+        do {
+                mdstat = davinci_readl(DAVINCI_PWR_SLEEP_CNTRL_BASE +
+                                       MDSTAT + 4 * id);
+        } while (!((mdstat & 0x0000001F) == mdstat_mask));
        if (enable)
                davinci_psc_mux(id);
diff --git a/arch/arm/mach-imx/generic.c b/arch/arm/mach-imx/generic.c
index 1c474cf709..a58b678006 100644
--- a/arch/arm/mach-imx/generic.c
+++ b/arch/arm/mach-imx/generic.c
@@ -28,12 +28,16 @@
 #include <linux/module.h>
 #include <linux/string.h>
+#include <asm/errno.h>
 #include <asm/arch/imxfb.h>
 #include <asm/hardware.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/mach/map.h>
 #include <asm/arch/mmc.h>
+#include <asm/arch/gpio.h>
+unsigned long imx_gpio_alloc_map[(GPIO_PORT_MAX + 1) * 32 / BITS_PER_LONG];
 void imx_gpio_mode(int gpio_mode)
 {
@@ -95,6 +99,120 @@ void imx_gpio_mode(int gpio_mode)
 EXPORT_SYMBOL(imx_gpio_mode);
+int imx_gpio_request(unsigned gpio, const char *label)
+{
+        if(gpio >= (GPIO_PORT_MAX + 1) * 32)
+                printk(KERN_ERR "imx_gpio: Attempt to request nonexistent GPIO %d for \"%s\"\n",
+                        gpio, label ? label : "?");
+                return -EINVAL;
+        if(test_and_set_bit(gpio, imx_gpio_alloc_map)) {
+                printk(KERN_ERR "imx_gpio: GPIO %d already used. Allocation for \"%s\" failed\n",
+                        gpio, label ? label : "?");
+                return -EBUSY;
+        }
+        return 0;
+}
+EXPORT_SYMBOL(imx_gpio_request);
+void imx_gpio_free(unsigned gpio)
+{
+        if(gpio >= (GPIO_PORT_MAX + 1) * 32)
+                return;
+        clear_bit(gpio, imx_gpio_alloc_map);
+}
+EXPORT_SYMBOL(imx_gpio_free);
+int imx_gpio_direction_input(unsigned gpio)
+{
+        imx_gpio_mode(gpio| GPIO_IN);
+        return 0;
+}
+EXPORT_SYMBOL(imx_gpio_direction_input);
+int imx_gpio_direction_output(unsigned gpio, int value)
+{
+        imx_gpio_set_value(gpio, value);
+        imx_gpio_mode(gpio| GPIO_OUT);
+        return 0;
+}
+EXPORT_SYMBOL(imx_gpio_direction_output);
+int imx_gpio_setup_multiple_pins(const int *pin_list, unsigned count,
+                                int alloc_mode, const char *label)
+{
+        const int *p = pin_list;
+        int i;
+        unsigned gpio;
+        unsigned mode;
+        for (i = 0; i < count; i++) {
+                gpio = *p & (GPIO_PIN_MASK | GPIO_PORT_MASK);
+                mode = *p & ~(GPIO_PIN_MASK | GPIO_PORT_MASK);
+                if (gpio >= (GPIO_PORT_MAX + 1) * 32)
+                        goto setup_error;
+                if (alloc_mode & IMX_GPIO_ALLOC_MODE_RELEASE)
+                        imx_gpio_free(gpio);
+                else if (!(alloc_mode & IMX_GPIO_ALLOC_MODE_NO_ALLOC))
+                        if (imx_gpio_request(gpio, label))
+                                if (!(alloc_mode & IMX_GPIO_ALLOC_MODE_TRY_ALLOC))
+                                        goto setup_error;
+                if (!(alloc_mode & (IMX_GPIO_ALLOC_MODE_ALLOC_ONLY |
+                                    IMX_GPIO_ALLOC_MODE_RELEASE)))
+                        imx_gpio_mode(gpio | mode);
+                p++;
+        }
+        return 0;
+setup_error:
+        if(alloc_mode & (IMX_GPIO_ALLOC_MODE_NO_ALLOC |
+                         IMX_GPIO_ALLOC_MODE_TRY_ALLOC))
+                return -EINVAL;
+        while (p != pin_list) {
+                p--;
+                gpio = *p & (GPIO_PIN_MASK | GPIO_PORT_MASK);
+                imx_gpio_free(gpio);
+        }
+        return -EINVAL;
+}
+EXPORT_SYMBOL(imx_gpio_setup_multiple_pins);
+void __imx_gpio_set_value(unsigned gpio, int value)
+{
+        imx_gpio_set_value_inline(gpio, value);
+}
+EXPORT_SYMBOL(__imx_gpio_set_value);
+int imx_gpio_to_irq(unsigned gpio)
+{
+        return IRQ_GPIOA(0) + gpio;
+}
+EXPORT_SYMBOL(imx_gpio_to_irq);
+int imx_irq_to_gpio(unsigned irq)
+{
+        if (irq < IRQ_GPIOA(0))
+                return -EINVAL;
+        return irq - IRQ_GPIOA(0);
+}
+EXPORT_SYMBOL(imx_irq_to_gpio);
 /*
 *  get the system pll clock in Hz
 *
diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c
index 6960a9d042..010f6fa984 100644
--- a/arch/arm/mach-imx/time.c
+++ b/arch/arm/mach-imx/time.c
@@ -3,6 +3,7 @@
 *
 *  Copyright (C) 2000-2001 Deep Blue Solutions
 *  Copyright (C) 2002 Shane Nay (shane@minirl.com)
+ *  Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
@@ -15,6 +16,7 @@
 #include <linux/irq.h>
 #include <linux/time.h>
 #include <linux/clocksource.h>
+#include <linux/clockchips.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
@@ -25,7 +27,8 @@
 /* Use timer 1 as system timer */
 #define TIMER_BASE IMX_TIM1_BASE
-static unsigned long evt_diff;
+static struct clock_event_device clockevent_imx;
+static enum clock_event_mode clockevent_mode = CLOCK_EVT_MODE_UNUSED;
 /*
 * IRQ handler for the timer
@@ -33,25 +36,20 @@ static unsigned long evt_diff;
 static irqreturn_t
 imx_timer_interrupt(int irq, void *dev_id)
 {
+        struct clock_event_device *evt = &clockevent_imx;
        uint32_t tstat;
+        irqreturn_t ret = IRQ_NONE;
        /* clear the interrupt */
        tstat = IMX_TSTAT(TIMER_BASE);
        IMX_TSTAT(TIMER_BASE) = 0;
        if (tstat & TSTAT_COMP) {
-                do {
+                evt->event_handler(evt);
+                ret = IRQ_HANDLED;
-                        write_seqlock(&xtime_lock);
-                        timer_tick();
-                        write_sequnlock(&xtime_lock);
-                        IMX_TCMP(TIMER_BASE) += evt_diff;
-                } while (unlikely((int32_t)(IMX_TCMP(TIMER_BASE)
-                                        - IMX_TCN(TIMER_BASE)) < 0));
        }
-        return IRQ_HANDLED;
+        return ret;
 }
 static struct irqaction imx_timer_irq = {
@@ -70,10 +68,8 @@ static void __init imx_timer_hardware_init(void)
         */
        IMX_TCTL(TIMER_BASE) = 0;
        IMX_TPRER(TIMER_BASE) = 0;
-        IMX_TCMP(TIMER_BASE) = LATCH - 1;
-        IMX_TCTL(TIMER_BASE) = TCTL_FRR | TCTL_CLK_PCLK1 | TCTL_IRQEN | TCTL_TEN;
+        IMX_TCTL(TIMER_BASE) = TCTL_FRR | TCTL_CLK_PCLK1 | TCTL_TEN;
-        evt_diff = LATCH;
 }
 cycle_t imx_get_cycles(void)
@@ -99,11 +95,108 @@ static int __init imx_clocksource_init(void)
        return 0;
 }
+static int imx_set_next_event(unsigned long evt,
+                                  struct clock_event_device *unused)
+{
+        unsigned long tcmp;
+        tcmp = IMX_TCN(TIMER_BASE) + evt;
+        IMX_TCMP(TIMER_BASE) = tcmp;
+        return (int32_t)(tcmp - IMX_TCN(TIMER_BASE)) < 0 ? -ETIME : 0;
+}
+#ifdef DEBUG
+static const char *clock_event_mode_label[]={
+        [CLOCK_EVT_MODE_PERIODIC] = "CLOCK_EVT_MODE_PERIODIC",
+        [CLOCK_EVT_MODE_ONESHOT]  = "CLOCK_EVT_MODE_ONESHOT",
+        [CLOCK_EVT_MODE_SHUTDOWN] = "CLOCK_EVT_MODE_SHUTDOWN",
+        [CLOCK_EVT_MODE_UNUSED]   = "CLOCK_EVT_MODE_UNUSED"
+};
+#endif /*DEBUG*/
+static void imx_set_mode(enum clock_event_mode mode, struct clock_event_device *evt)
+{
+        unsigned long flags;
+        /*
+         * The timer interrupt generation is disabled at least
+         * for enough time to call imx_set_next_event()
+         */
+        local_irq_save(flags);
+        /* Disable interrupt in GPT module */
+        IMX_TCTL(TIMER_BASE) &= ~TCTL_IRQEN;
+        if (mode != clockevent_mode) {
+                /* Set event time into far-far future */
+                IMX_TCMP(TIMER_BASE) = IMX_TCN(TIMER_BASE) - 3;
+                /* Clear pending interrupt */
+                IMX_TSTAT(TIMER_BASE) &= ~TSTAT_COMP;
+        }
+#ifdef DEBUG
+        printk(KERN_INFO "imx_set_mode: changing mode from %s to %s\n",
+                clock_event_mode_label[clockevent_mode], clock_event_mode_label[mode]);
+#endif /*DEBUG*/
+        /* Remember timer mode */
+        clockevent_mode = mode;
+        local_irq_restore(flags);
+        switch (mode) {
+        case CLOCK_EVT_MODE_PERIODIC:
+                printk(KERN_ERR "imx_set_mode: Periodic mode is not supported for i.MX\n");
+                break;
+        case CLOCK_EVT_MODE_ONESHOT:
+                /*
+                 * Do not put overhead of interrupt enable/disable into
+                 * imx_set_next_event(), the core has about 4 minutes
+                 * to call imx_set_next_event() or shutdown clock after
+                 * mode switching
+                 */
+                local_irq_save(flags);
+                IMX_TCTL(TIMER_BASE) |= TCTL_IRQEN;
+                local_irq_restore(flags);
+                break;
+        case CLOCK_EVT_MODE_SHUTDOWN:
+        case CLOCK_EVT_MODE_UNUSED:
+                /* Left event sources disabled, no more interrupts appears */
+                break;
+        }
+}
+static struct clock_event_device clockevent_imx = {
+        .name           = "imx_timer1",
+        .features       = CLOCK_EVT_FEAT_ONESHOT,
+        .shift          = 32,
+        .set_mode       = imx_set_mode,
+        .set_next_event = imx_set_next_event,
+        .rating         = 200,
+};
+static int __init imx_clockevent_init(void)
+{
+        clockevent_imx.mult = div_sc(imx_get_perclk1(), NSEC_PER_SEC,
+                                        clockevent_imx.shift);
+        clockevent_imx.max_delta_ns =
+                clockevent_delta2ns(0xfffffffe, &clockevent_imx);
+        clockevent_imx.min_delta_ns =
+                clockevent_delta2ns(0xf, &clockevent_imx);
+        clockevent_imx.cpumask = cpumask_of_cpu(0);
+        clockevents_register_device(&clockevent_imx);
+        return 0;
+}
 static void __init imx_timer_init(void)
 {
        imx_timer_hardware_init();
        imx_clocksource_init();
+        imx_clockevent_init();
        /*
         * Make irqs happen for the system timer
         */
diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c
index bc4871553f..bfe0c87e33 100644
--- a/arch/arm/mach-iop13xx/setup.c
+++ b/arch/arm/mach-iop13xx/setup.c
@@ -25,6 +25,7 @@
 #include <asm/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
+#include <asm/hardware/iop_adma.h>
 #define IOP13XX_UART_XTAL 33334000
 #define IOP13XX_SETUP_DEBUG 0
@@ -236,19 +237,143 @@ static unsigned long iq8134x_probe_flash_size(void)
 }
 #endif
+/* ADMA Channels */
+static struct resource iop13xx_adma_0_resources[] = {
+        [0] = {
+                .start = IOP13XX_ADMA_PHYS_BASE(0),
+                .end = IOP13XX_ADMA_UPPER_PA(0),
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_IOP13XX_ADMA0_EOT,
+                .end = IRQ_IOP13XX_ADMA0_EOT,
+                .flags = IORESOURCE_IRQ
+        },
+        [2] = {
+                .start = IRQ_IOP13XX_ADMA0_EOC,
+                .end = IRQ_IOP13XX_ADMA0_EOC,
+                .flags = IORESOURCE_IRQ
+        },
+        [3] = {
+                .start = IRQ_IOP13XX_ADMA0_ERR,
+                .end = IRQ_IOP13XX_ADMA0_ERR,
+                .flags = IORESOURCE_IRQ
+        }
+};
+static struct resource iop13xx_adma_1_resources[] = {
+        [0] = {
+                .start = IOP13XX_ADMA_PHYS_BASE(1),
+                .end = IOP13XX_ADMA_UPPER_PA(1),
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_IOP13XX_ADMA1_EOT,
+                .end = IRQ_IOP13XX_ADMA1_EOT,
+                .flags = IORESOURCE_IRQ
+        },
+        [2] = {
+                .start = IRQ_IOP13XX_ADMA1_EOC,
+                .end = IRQ_IOP13XX_ADMA1_EOC,
+                .flags = IORESOURCE_IRQ
+        },
+        [3] = {
+                .start = IRQ_IOP13XX_ADMA1_ERR,
+                .end = IRQ_IOP13XX_ADMA1_ERR,
+                .flags = IORESOURCE_IRQ
+        }
+};
+static struct resource iop13xx_adma_2_resources[] = {
+        [0] = {
+                .start = IOP13XX_ADMA_PHYS_BASE(2),
+                .end = IOP13XX_ADMA_UPPER_PA(2),
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_IOP13XX_ADMA2_EOT,
+                .end = IRQ_IOP13XX_ADMA2_EOT,
+                .flags = IORESOURCE_IRQ
+        },
+        [2] = {
+                .start = IRQ_IOP13XX_ADMA2_EOC,
+                .end = IRQ_IOP13XX_ADMA2_EOC,
+                .flags = IORESOURCE_IRQ
+        },
+        [3] = {
+                .start = IRQ_IOP13XX_ADMA2_ERR,
+                .end = IRQ_IOP13XX_ADMA2_ERR,
+                .flags = IORESOURCE_IRQ
+        }
+};
+static u64 iop13xx_adma_dmamask = DMA_64BIT_MASK;
+static struct iop_adma_platform_data iop13xx_adma_0_data = {
+        .hw_id = 0,
+        .pool_size = PAGE_SIZE,
+};
+static struct iop_adma_platform_data iop13xx_adma_1_data = {
+        .hw_id = 1,
+        .pool_size = PAGE_SIZE,
+};
+static struct iop_adma_platform_data iop13xx_adma_2_data = {
+        .hw_id = 2,
+        .pool_size = PAGE_SIZE,
+};
+/* The ids are fixed up later in iop13xx_platform_init */
+static struct platform_device iop13xx_adma_0_channel = {
+        .name = "iop-adma",
+        .id = 0,
+        .num_resources = 4,
+        .resource = iop13xx_adma_0_resources,
+        .dev = {
+                .dma_mask = &iop13xx_adma_dmamask,
+                .coherent_dma_mask = DMA_64BIT_MASK,
+                .platform_data = (void *) &iop13xx_adma_0_data,
+        },
+};
+static struct platform_device iop13xx_adma_1_channel = {
+        .name = "iop-adma",
+        .id = 0,
+        .num_resources = 4,
+        .resource = iop13xx_adma_1_resources,
+        .dev = {
+                .dma_mask = &iop13xx_adma_dmamask,
+                .coherent_dma_mask = DMA_64BIT_MASK,
+                .platform_data = (void *) &iop13xx_adma_1_data,
+        },
+};
+static struct platform_device iop13xx_adma_2_channel = {
+        .name = "iop-adma",
+        .id = 0,
+        .num_resources = 4,
+        .resource = iop13xx_adma_2_resources,
+        .dev = {
+                .dma_mask = &iop13xx_adma_dmamask,
+                .coherent_dma_mask = DMA_64BIT_MASK,
+                .platform_data = (void *) &iop13xx_adma_2_data,
+        },
+};
 void __init iop13xx_map_io(void)
 {
        /* Initialize the Static Page Table maps */
        iotable_init(iop13xx_std_desc, ARRAY_SIZE(iop13xx_std_desc));
 }
-static int init_uart = 0;
+static int init_uart;
-static int init_i2c = 0;
+static int init_i2c;
+static int init_adma;
 void __init iop13xx_platform_init(void)
 {
        int i;
-        u32 uart_idx, i2c_idx, plat_idx;
+        u32 uart_idx, i2c_idx, adma_idx, plat_idx;
        struct platform_device *iop13xx_devices[IQ81340_MAX_PLAT_DEVICES];
        /* set the bases so we can read the device id */
@@ -294,6 +419,12 @@ void __init iop13xx_platform_init(void)
                }
        }
+        if (init_adma == IOP13XX_INIT_ADMA_DEFAULT) {
+                init_adma |= IOP13XX_INIT_ADMA_0;
+                init_adma |= IOP13XX_INIT_ADMA_1;
+                init_adma |= IOP13XX_INIT_ADMA_2;
+        }
        plat_idx = 0;
        uart_idx = 0;
        i2c_idx = 0;
@@ -332,6 +463,56 @@ void __init iop13xx_platform_init(void)
                }
        }
+        /* initialize adma channel ids and capabilities */
+        adma_idx = 0;
+        for (i = 0; i < IQ81340_NUM_ADMA; i++) {
+                struct iop_adma_platform_data *plat_data;
+                if ((init_adma & (1 << i)) && IOP13XX_SETUP_DEBUG)
+                        printk(KERN_INFO
+                                "Adding adma%d to platform device list\n", i);
+                switch (init_adma & (1 << i)) {
+                case IOP13XX_INIT_ADMA_0:
+                        iop13xx_adma_0_channel.id = adma_idx++;
+                        iop13xx_devices[plat_idx++] = &iop13xx_adma_0_channel;
+                        plat_data = &iop13xx_adma_0_data;
+                        dma_cap_set(DMA_MEMCPY, plat_data->cap_mask);
+                        dma_cap_set(DMA_XOR, plat_data->cap_mask);
+                        dma_cap_set(DMA_DUAL_XOR, plat_data->cap_mask);
+                        dma_cap_set(DMA_ZERO_SUM, plat_data->cap_mask);
+                        dma_cap_set(DMA_MEMSET, plat_data->cap_mask);
+                        dma_cap_set(DMA_MEMCPY_CRC32C, plat_data->cap_mask);
+                        dma_cap_set(DMA_INTERRUPT, plat_data->cap_mask);
+                        break;
+                case IOP13XX_INIT_ADMA_1:
+                        iop13xx_adma_1_channel.id = adma_idx++;
+                        iop13xx_devices[plat_idx++] = &iop13xx_adma_1_channel;
+                        plat_data = &iop13xx_adma_1_data;
+                        dma_cap_set(DMA_MEMCPY, plat_data->cap_mask);
+                        dma_cap_set(DMA_XOR, plat_data->cap_mask);
+                        dma_cap_set(DMA_DUAL_XOR, plat_data->cap_mask);
+                        dma_cap_set(DMA_ZERO_SUM, plat_data->cap_mask);
+                        dma_cap_set(DMA_MEMSET, plat_data->cap_mask);
+                        dma_cap_set(DMA_MEMCPY_CRC32C, plat_data->cap_mask);
+                        dma_cap_set(DMA_INTERRUPT, plat_data->cap_mask);
+                        break;
+                case IOP13XX_INIT_ADMA_2:
+                        iop13xx_adma_2_channel.id = adma_idx++;
+                        iop13xx_devices[plat_idx++] = &iop13xx_adma_2_channel;
+                        plat_data = &iop13xx_adma_2_data;
+                        dma_cap_set(DMA_MEMCPY, plat_data->cap_mask);
+                        dma_cap_set(DMA_XOR, plat_data->cap_mask);
+                        dma_cap_set(DMA_DUAL_XOR, plat_data->cap_mask);
+                        dma_cap_set(DMA_ZERO_SUM, plat_data->cap_mask);
+                        dma_cap_set(DMA_MEMSET, plat_data->cap_mask);
+                        dma_cap_set(DMA_MEMCPY_CRC32C, plat_data->cap_mask);
+                        dma_cap_set(DMA_INTERRUPT, plat_data->cap_mask);
+                        dma_cap_set(DMA_PQ_XOR, plat_data->cap_mask);
+                        dma_cap_set(DMA_PQ_UPDATE, plat_data->cap_mask);
+                        dma_cap_set(DMA_PQ_ZERO_SUM, plat_data->cap_mask);
+                        break;
+                }
+        }
 #ifdef CONFIG_MTD_PHYSMAP
        iq8134x_flash_resource.end = iq8134x_flash_resource.start +
                                iq8134x_probe_flash_size() - 1;
@@ -399,5 +580,35 @@ static int __init iop13xx_init_i2c_setup(char *str)
        return 1;
 }
+static int __init iop13xx_init_adma_setup(char *str)
+{
+        if (str)        {
+                while (*str != '\0') {
+                        switch (*str) {
+                        case '0':
+                                init_adma |= IOP13XX_INIT_ADMA_0;
+                                break;
+                        case '1':
+                                init_adma |= IOP13XX_INIT_ADMA_1;
+                                break;
+                        case '2':
+                                init_adma |= IOP13XX_INIT_ADMA_2;
+                                break;
+                        case ',':
+                        case '=':
+                                break;
+                        default:
+                                PRINTK("\"iop13xx_init_adma\" malformed"
+                                            " at character: \'%c\'", *str);
+                                *(str + 1) = '\0';
+                                init_adma = IOP13XX_INIT_ADMA_DEFAULT;
+                        }
+                        str++;
+                }
+        }
+        return 1;
+}
+__setup("iop13xx_init_adma", iop13xx_init_adma_setup);
 __setup("iop13xx_init_uart", iop13xx_init_uart_setup);
 __setup("iop13xx_init_i2c", iop13xx_init_i2c_setup);
diff --git a/arch/arm/mach-iop13xx/tpmi.c b/arch/arm/mach-iop13xx/tpmi.c
index d3dc278213..2476347ea6 100644
--- a/arch/arm/mach-iop13xx/tpmi.c
+++ b/arch/arm/mach-iop13xx/tpmi.c
@@ -29,13 +29,15 @@
 #define IOP13XX_TPMI_MMR(dev)   IOP13XX_REG_ADDR32_PHYS(0x48000 + (dev << 12))
 #define IOP13XX_TPMI_MEM(dev)   IOP13XX_REG_ADDR32_PHYS(0x60000 + (dev << 13))
 #define IOP13XX_TPMI_CTRL(dev)  IOP13XX_REG_ADDR32_PHYS(0x50000 + (dev << 10))
+#define IOP13XX_TPMI_IOP_CTRL(dev) (IOP13XX_TPMI_CTRL(dev) + 0x2000)
 #define IOP13XX_TPMI_MMR_SIZE       (SZ_4K - 1)
 #define IOP13XX_TPMI_MEM_SIZE       (255)
 #define IOP13XX_TPMI_MEM_CTRL       (SZ_1K - 1)
 #define IOP13XX_TPMI_RESOURCE_MMR  0
 #define IOP13XX_TPMI_RESOURCE_MEM  1
 #define IOP13XX_TPMI_RESOURCE_CTRL 2
-#define IOP13XX_TPMI_RESOURCE_IRQ  3
+#define IOP13XX_TPMI_RESOURCE_IOP_CTRL 3
+#define IOP13XX_TPMI_RESOURCE_IRQ  4
 static struct resource iop13xx_tpmi_0_resources[] = {
        [IOP13XX_TPMI_RESOURCE_MMR] = {
@@ -53,6 +55,11 @@ static struct resource iop13xx_tpmi_0_resources[] = {
                .end = IOP13XX_TPMI_CTRL(0) + IOP13XX_TPMI_MEM_CTRL,
                .flags = IORESOURCE_MEM,
        },
+        [IOP13XX_TPMI_RESOURCE_IOP_CTRL] = {
+                .start = IOP13XX_TPMI_IOP_CTRL(0),
+                .end = IOP13XX_TPMI_IOP_CTRL(0) + IOP13XX_TPMI_MEM_CTRL,
+                .flags = IORESOURCE_MEM,
+        },
        [IOP13XX_TPMI_RESOURCE_IRQ] = {
                .start = IRQ_IOP13XX_TPMI0_OUT,
                .end = IRQ_IOP13XX_TPMI0_OUT,
@@ -76,6 +83,11 @@ static struct resource iop13xx_tpmi_1_resources[] = {
                .end = IOP13XX_TPMI_CTRL(1) + IOP13XX_TPMI_MEM_CTRL,
                .flags = IORESOURCE_MEM,
        },
+        [IOP13XX_TPMI_RESOURCE_IOP_CTRL] = {
+                .start = IOP13XX_TPMI_IOP_CTRL(1),
+                .end = IOP13XX_TPMI_IOP_CTRL(1) + IOP13XX_TPMI_MEM_CTRL,
+                .flags = IORESOURCE_MEM,
+        },
        [IOP13XX_TPMI_RESOURCE_IRQ] = {
                .start = IRQ_IOP13XX_TPMI1_OUT,
                .end = IRQ_IOP13XX_TPMI1_OUT,
@@ -99,6 +111,11 @@ static struct resource iop13xx_tpmi_2_resources[] = {
                .end = IOP13XX_TPMI_CTRL(2) + IOP13XX_TPMI_MEM_CTRL,
                .flags = IORESOURCE_MEM,
        },
+        [IOP13XX_TPMI_RESOURCE_IOP_CTRL] = {
+                .start = IOP13XX_TPMI_IOP_CTRL(2),
+                .end = IOP13XX_TPMI_IOP_CTRL(2) + IOP13XX_TPMI_MEM_CTRL,
+                .flags = IORESOURCE_MEM,
+        },
        [IOP13XX_TPMI_RESOURCE_IRQ] = {
                .start = IRQ_IOP13XX_TPMI2_OUT,
                .end = IRQ_IOP13XX_TPMI2_OUT,
@@ -122,6 +139,11 @@ static struct resource iop13xx_tpmi_3_resources[] = {
                .end = IOP13XX_TPMI_CTRL(3) + IOP13XX_TPMI_MEM_CTRL,
                .flags = IORESOURCE_MEM,
        },
+        [IOP13XX_TPMI_RESOURCE_IOP_CTRL] = {
+                .start = IOP13XX_TPMI_IOP_CTRL(3),
+                .end = IOP13XX_TPMI_IOP_CTRL(3) + IOP13XX_TPMI_MEM_CTRL,
+                .flags = IORESOURCE_MEM,
+        },
        [IOP13XX_TPMI_RESOURCE_IRQ] = {
                .start = IRQ_IOP13XX_TPMI3_OUT,
                .end = IRQ_IOP13XX_TPMI3_OUT,
@@ -133,7 +155,7 @@ u64 iop13xx_tpmi_mask = DMA_64BIT_MASK;
 static struct platform_device iop13xx_tpmi_0_device = {
        .name = "iop-tpmi",
        .id = 0,
-        .num_resources = 4,
+        .num_resources = ARRAY_SIZE(iop13xx_tpmi_0_resources),
        .resource = iop13xx_tpmi_0_resources,
        .dev = {
                .dma_mask          = &iop13xx_tpmi_mask,
@@ -144,7 +166,7 @@ static struct platform_device iop13xx_tpmi_0_device = {
 static struct platform_device iop13xx_tpmi_1_device = {
        .name = "iop-tpmi",
        .id = 1,
-        .num_resources = 4,
+        .num_resources = ARRAY_SIZE(iop13xx_tpmi_1_resources),
        .resource = iop13xx_tpmi_1_resources,
        .dev = {
                .dma_mask          = &iop13xx_tpmi_mask,
@@ -155,7 +177,7 @@ static struct platform_device iop13xx_tpmi_1_device = {
 static struct platform_device iop13xx_tpmi_2_device = {
        .name = "iop-tpmi",
        .id = 2,
-        .num_resources = 4,
+        .num_resources = ARRAY_SIZE(iop13xx_tpmi_2_resources),
        .resource = iop13xx_tpmi_2_resources,
        .dev = {
                .dma_mask          = &iop13xx_tpmi_mask,
@@ -166,7 +188,7 @@ static struct platform_device iop13xx_tpmi_2_device = {
 static struct platform_device iop13xx_tpmi_3_device = {
        .name = "iop-tpmi",
        .id = 3,
-        .num_resources = 4,
+        .num_resources = ARRAY_SIZE(iop13xx_tpmi_3_resources),
        .resource = iop13xx_tpmi_3_resources,
        .dev = {
                .dma_mask          = &iop13xx_tpmi_mask,
diff --git a/arch/arm/mach-iop32x/glantank.c b/arch/arm/mach-iop32x/glantank.c
index 5776fd8841..2b086ab266 100644
--- a/arch/arm/mach-iop32x/glantank.c
+++ b/arch/arm/mach-iop32x/glantank.c
@@ -180,6 +180,8 @@ static void __init glantank_init_machine(void)
        platform_device_register(&iop3xx_i2c1_device);
        platform_device_register(&glantank_flash_device);
        platform_device_register(&glantank_serial_device);
+        platform_device_register(&iop3xx_dma_0_channel);
+        platform_device_register(&iop3xx_dma_1_channel);
        pm_power_off = glantank_power_off;
 }
diff --git a/arch/arm/mach-iop32x/iq31244.c b/arch/arm/mach-iop32x/iq31244.c
index d4eefbea1f..98cfa1cd6b 100644
--- a/arch/arm/mach-iop32x/iq31244.c
+++ b/arch/arm/mach-iop32x/iq31244.c
@@ -298,9 +298,14 @@ static void __init iq31244_init_machine(void)
        platform_device_register(&iop3xx_i2c1_device);
        platform_device_register(&iq31244_flash_device);
        platform_device_register(&iq31244_serial_device);
+        platform_device_register(&iop3xx_dma_0_channel);
+        platform_device_register(&iop3xx_dma_1_channel);
        if (is_ep80219())
                pm_power_off = ep80219_power_off;
+        if (!is_80219())
+                platform_device_register(&iop3xx_aau_channel);
 }
 static int __init force_ep80219_setup(char *str)
diff --git a/arch/arm/mach-iop32x/iq80321.c b/arch/arm/mach-iop32x/iq80321.c
index 8d9f49164a..18ad29f213 100644
--- a/arch/arm/mach-iop32x/iq80321.c
+++ b/arch/arm/mach-iop32x/iq80321.c
@@ -181,6 +181,9 @@ static void __init iq80321_init_machine(void)
        platform_device_register(&iop3xx_i2c1_device);
        platform_device_register(&iq80321_flash_device);
        platform_device_register(&iq80321_serial_device);
+        platform_device_register(&iop3xx_dma_0_channel);
+        platform_device_register(&iop3xx_dma_1_channel);
+        platform_device_register(&iop3xx_aau_channel);
 }
 MACHINE_START(IQ80321, "Intel IQ80321")
diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c
index d55005d647..1873bd8cd1 100644
--- a/arch/arm/mach-iop32x/n2100.c
+++ b/arch/arm/mach-iop32x/n2100.c
@@ -25,6 +25,7 @@
 #include <linux/serial_core.h>
 #include <linux/serial_8250.h>
 #include <linux/mtd/physmap.h>
+#include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
 #include <asm/hardware.h>
@@ -199,6 +200,12 @@ static struct platform_device n2100_serial_device = {
        .resource       = &n2100_uart_resource,
 };
+static struct i2c_board_info __initdata n2100_i2c_devices[] = {
+        {
+                I2C_BOARD_INFO("rtc-rs5c372", 0x32),
+                .type = "rs5c372b",
+        },
+};
 /*
 * Pull PCA9532 GPIO #8 low to power off the machine.
@@ -245,6 +252,11 @@ static void __init n2100_init_machine(void)
        platform_device_register(&iop3xx_i2c0_device);
        platform_device_register(&n2100_flash_device);
        platform_device_register(&n2100_serial_device);
+        platform_device_register(&iop3xx_dma_0_channel);
+        platform_device_register(&iop3xx_dma_1_channel);
+        i2c_register_board_info(0, n2100_i2c_devices,
+                ARRAY_SIZE(n2100_i2c_devices));
        pm_power_off = n2100_power_off;
diff --git a/arch/arm/mach-iop33x/iq80331.c b/arch/arm/mach-iop33x/iq80331.c
index 2b06318068..433188ebff 100644
--- a/arch/arm/mach-iop33x/iq80331.c
+++ b/arch/arm/mach-iop33x/iq80331.c
@@ -136,6 +136,9 @@ static void __init iq80331_init_machine(void)
        platform_device_register(&iop33x_uart0_device);
        platform_device_register(&iop33x_uart1_device);
        platform_device_register(&iq80331_flash_device);
+        platform_device_register(&iop3xx_dma_0_channel);
+        platform_device_register(&iop3xx_dma_1_channel);
+        platform_device_register(&iop3xx_aau_channel);
 }
 MACHINE_START(IQ80331, "Intel IQ80331")
diff --git a/arch/arm/mach-iop33x/iq80332.c b/arch/arm/mach-iop33x/iq80332.c
index 7889ce3cb0..416c09564c 100644
--- a/arch/arm/mach-iop33x/iq80332.c
+++ b/arch/arm/mach-iop33x/iq80332.c
@@ -136,6 +136,9 @@ static void __init iq80332_init_machine(void)
        platform_device_register(&iop33x_uart0_device);
        platform_device_register(&iop33x_uart1_device);
        platform_device_register(&iq80332_flash_device);
+        platform_device_register(&iop3xx_dma_0_channel);
+        platform_device_register(&iop3xx_dma_1_channel);
+        platform_device_register(&iop3xx_aau_channel);
 }
 MACHINE_START(IQ80332, "Intel IQ80332")
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
index 060909870b..61b2dfcb89 100644
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
@@ -41,6 +41,22 @@ config ARCH_ADI_COYOTE
          Engineering Coyote Gateway Reference Platform. For more
          information on this platform, see <file:Documentation/arm/IXP4xx>.
+config MACH_GATEWAY7001
+        bool "Gateway 7001"
+        select PCI
+        help
+          Say 'Y' here if you want your kernel to support Gateway's
+          7001 Access Point. For more information on this platform,
+          see http://openwrt.org
+config MACH_WG302V2
+        bool "Netgear WG302 v2 / WAG302 v2"
+        select PCI
+        help
+          Say 'Y' here if you want your kernel to support Netgear's
+          WG302 v2 or WAG302 v2 Access Points. For more information
+          on this platform, see http://openwrt.org
 config ARCH_IXDP425
        bool "IXDP425"
        help
diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile
index 3b87c47e06..77e00ade55 100644
--- a/arch/arm/mach-ixp4xx/Makefile
+++ b/arch/arm/mach-ixp4xx/Makefile
@@ -13,6 +13,8 @@ obj-pci-$(CONFIG_MACH_GTWX5715)		+= gtwx5715-pci.o
 obj-pci-$(CONFIG_MACH_NSLU2)            += nslu2-pci.o
 obj-pci-$(CONFIG_MACH_NAS100D)          += nas100d-pci.o
 obj-pci-$(CONFIG_MACH_DSMG600)          += dsmg600-pci.o
+obj-pci-$(CONFIG_MACH_GATEWAY7001)      += gateway7001-pci.o
+obj-pci-$(CONFIG_MACH_WG302V2)          += wg302v2-pci.o
 obj-y   += common.o
@@ -24,5 +26,7 @@ obj-$(CONFIG_MACH_GTWX5715)	+= gtwx5715-setup.o
 obj-$(CONFIG_MACH_NSLU2)        += nslu2-setup.o nslu2-power.o
 obj-$(CONFIG_MACH_NAS100D)      += nas100d-setup.o nas100d-power.o
 obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o dsmg600-power.o
+obj-$(CONFIG_MACH_GATEWAY7001)  += gateway7001-setup.o
+obj-$(CONFIG_MACH_WG302V2)      += wg302v2-setup.o
 obj-$(CONFIG_PCI)               += $(obj-pci-$(CONFIG_PCI)) common-pci.o
diff --git a/arch/arm/mach-ixp4xx/gateway7001-pci.c b/arch/arm/mach-ixp4xx/gateway7001-pci.c
new file mode 100644
index 0000000000..6abf568322
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/gateway7001-pci.c
@@ -0,0 +1,63 @@
+/*
+ * arch/arch/mach-ixp4xx/gateway7001-pci.c
+ *
+ * PCI setup routines for Gateway 7001
+ *
+ * Copyright (C) 2007 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * based on coyote-pci.c:
+ *      Copyright (C) 2002 Jungo Software Technologies.
+ *      Copyright (C) 2003 MontaVista Softwrae, Inc.
+ *
+ * Maintainer: Imre Kaloz <kaloz@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <asm/mach-types.h>
+#include <asm/hardware.h>
+#include <asm/mach/pci.h>
+void __init gateway7001_pci_preinit(void)
+{
+        set_irq_type(IRQ_IXP4XX_GPIO10, IRQT_LOW);
+        set_irq_type(IRQ_IXP4XX_GPIO11, IRQT_LOW);
+        ixp4xx_pci_preinit();
+}
+static int __init gateway7001_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+        if (slot == 1)
+                return IRQ_IXP4XX_GPIO11;
+        else if (slot == 2)
+                return IRQ_IXP4XX_GPIO10;
+        else return -1;
+}
+struct hw_pci gateway7001_pci __initdata = {
+        .nr_controllers = 1,
+        .preinit =        gateway7001_pci_preinit,
+        .swizzle =        pci_std_swizzle,
+        .setup =          ixp4xx_setup,
+        .scan =           ixp4xx_scan_bus,
+        .map_irq =        gateway7001_map_irq,
+};
+int __init gateway7001_pci_init(void)
+{
+        if (machine_is_gateway7001())
+                pci_common_init(&gateway7001_pci);
+        return 0;
+}
+subsys_initcall(gateway7001_pci_init);
diff --git a/arch/arm/mach-ixp4xx/gateway7001-setup.c b/arch/arm/mach-ixp4xx/gateway7001-setup.c
new file mode 100644
index 0000000000..37876832e1
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/gateway7001-setup.c
@@ -0,0 +1,108 @@
+/*
+ * arch/arm/mach-ixp4xx/gateway7001-setup.c
+ *
+ * Board setup for the Gateway 7001 board
+ *
+ * Copyright (C) 2007 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * based on coyote-setup.c:
+ *      Copyright (C) 2003-2005 MontaVista Software, Inc.
+ *
+ * Author: Imre Kaloz <Kaloz@openwrt.org>
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/serial.h>
+#include <linux/tty.h>
+#include <linux/serial_8250.h>
+#include <linux/slab.h>
+#include <asm/types.h>
+#include <asm/setup.h>
+#include <asm/memory.h>
+#include <asm/hardware.h>
+#include <asm/irq.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/flash.h>
+static struct flash_platform_data gateway7001_flash_data = {
+        .map_name       = "cfi_probe",
+        .width          = 2,
+};
+static struct resource gateway7001_flash_resource = {
+        .flags          = IORESOURCE_MEM,
+};
+static struct platform_device gateway7001_flash = {
+        .name           = "IXP4XX-Flash",
+        .id             = 0,
+        .dev            = {
+                .platform_data = &gateway7001_flash_data,
+        },
+        .num_resources  = 1,
+        .resource       = &gateway7001_flash_resource,
+};
+static struct resource gateway7001_uart_resource = {
+        .start  = IXP4XX_UART2_BASE_PHYS,
+        .end    = IXP4XX_UART2_BASE_PHYS + 0x0fff,
+        .flags  = IORESOURCE_MEM,
+};
+static struct plat_serial8250_port gateway7001_uart_data[] = {
+        {
+                .mapbase        = IXP4XX_UART2_BASE_PHYS,
+                .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
+                .irq            = IRQ_IXP4XX_UART2,
+                .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
+                .iotype         = UPIO_MEM,
+                .regshift       = 2,
+                .uartclk        = IXP4XX_UART_XTAL,
+        },
+        { },
+};
+static struct platform_device gateway7001_uart = {
+        .name           = "serial8250",
+        .id             = PLAT8250_DEV_PLATFORM,
+        .dev                    = {
+                .platform_data  = gateway7001_uart_data,
+        },
+        .num_resources  = 1,
+        .resource       = &gateway7001_uart_resource,
+};
+static struct platform_device *gateway7001_devices[] __initdata = {
+        &gateway7001_flash,
+        &gateway7001_uart
+};
+static void __init gateway7001_init(void)
+{
+        ixp4xx_sys_init();
+        gateway7001_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
+        gateway7001_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
+        *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
+        *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
+        platform_add_devices(gateway7001_devices, ARRAY_SIZE(gateway7001_devices));
+}
+#ifdef CONFIG_MACH_GATEWAY7001
+MACHINE_START(GATEWAY7001, "Gateway 7001 AP")
+        /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
+        .map_io         = ixp4xx_map_io,
+        .init_irq       = ixp4xx_init_irq,
+        .timer          = &ixp4xx_timer,
+        .boot_params    = 0x0100,
+        .init_machine   = gateway7001_init,
+MACHINE_END
+#endif
diff --git a/arch/arm/mach-ixp4xx/gtwx5715-pci.c b/arch/arm/mach-ixp4xx/gtwx5715-pci.c
index a66484b63d..0d5a424558 100644
--- a/arch/arm/mach-ixp4xx/gtwx5715-pci.c
+++ b/arch/arm/mach-ixp4xx/gtwx5715-pci.c
@@ -25,17 +25,13 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/irq.h>
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
-#include <asm/irq.h>
 #include <asm/arch/gtwx5715.h>
 #include <asm/mach/pci.h>
-extern void ixp4xx_pci_preinit(void);
-extern int ixp4xx_setup(int nr, struct pci_sys_data *sys);
-extern struct pci_bus *ixp4xx_scan_bus(int nr, struct pci_sys_data *sys);
 /*
 * The exact GPIO pins and IRQs are defined in arch-ixp4xx/gtwx5715.h
 * Slot 0 isn't actually populated with a card connector but
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index ec4f07950e..d5008d8fc9 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -15,6 +15,10 @@
 #include <linux/tty.h>
 #include <linux/serial_8250.h>
 #include <linux/slab.h>
+#include <linux/io.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
 #include <asm/types.h>
 #include <asm/setup.h>
@@ -24,6 +28,7 @@
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
+#include <asm/delay.h>
 static struct flash_platform_data ixdp425_flash_data = {
        .map_name       = "cfi_probe",
@@ -44,6 +49,77 @@ static struct platform_device ixdp425_flash = {
        .resource       = &ixdp425_flash_resource,
 };
+#if defined(CONFIG_MTD_NAND_PLATFORM) || \
+    defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
+#ifdef CONFIG_MTD_PARTITIONS
+const char *part_probes[] = { "cmdlinepart", NULL };
+static struct mtd_partition ixdp425_partitions[] = {
+        {
+                .name   = "ixp400 NAND FS 0",
+                .offset = 0,
+                .size   = SZ_8M
+        }, {
+                .name   = "ixp400 NAND FS 1",
+                .offset = MTDPART_OFS_APPEND,
+                .size   = MTDPART_SIZ_FULL
+        },
+};
+#endif
+static void
+ixdp425_flash_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
+{
+        struct nand_chip *this = mtd->priv;
+        int offset = (int)this->priv;
+        if (ctrl & NAND_CTRL_CHANGE) {
+                if (ctrl & NAND_NCE) {
+                        gpio_line_set(IXDP425_NAND_NCE_PIN, IXP4XX_GPIO_LOW);
+                        udelay(5);
+                } else
+                        gpio_line_set(IXDP425_NAND_NCE_PIN, IXP4XX_GPIO_HIGH);
+                offset = (ctrl & NAND_CLE) ? IXDP425_NAND_CMD_BYTE : 0;
+                offset |= (ctrl & NAND_ALE) ? IXDP425_NAND_ADDR_BYTE : 0;
+                this->priv = (void *)offset;
+        }
+        if (cmd != NAND_CMD_NONE)
+                writeb(cmd, this->IO_ADDR_W + offset);
+}
+static struct platform_nand_data ixdp425_flash_nand_data = {
+        .chip = {
+                .chip_delay             = 30,
+                .options                = NAND_NO_AUTOINCR,
+#ifdef CONFIG_MTD_PARTITIONS
+                .part_probe_types       = part_probes,
+                .partitions             = ixdp425_partitions,
+                .nr_partitions          = ARRAY_SIZE(ixdp425_partitions),
+#endif
+        },
+        .ctrl = {
+                .cmd_ctrl               = ixdp425_flash_nand_cmd_ctrl
+        }
+};
+static struct resource ixdp425_flash_nand_resource = {
+        .flags          = IORESOURCE_MEM,
+};
+static struct platform_device ixdp425_flash_nand = {
+        .name           = "gen_nand",
+        .id             = -1,
+        .dev            = {
+                .platform_data = &ixdp425_flash_nand_data,
+        },
+        .num_resources  = 1,
+        .resource       = &ixdp425_flash_nand_resource,
+};
+#endif  /* CONFIG_MTD_NAND_PLATFORM */
 static struct ixp4xx_i2c_pins ixdp425_i2c_gpio_pins = {
        .sda_pin        = IXDP425_SDA_PIN,
        .scl_pin        = IXDP425_SCL_PIN,
@@ -104,6 +180,10 @@ static struct platform_device ixdp425_uart = {
 static struct platform_device *ixdp425_devices[] __initdata = {
        &ixdp425_i2c_controller,
        &ixdp425_flash,
+#if defined(CONFIG_MTD_NAND_PLATFORM) || \
+    defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
+        &ixdp425_flash_nand,
+#endif
        &ixdp425_uart
 };
@@ -115,6 +195,22 @@ static void __init ixdp425_init(void)
        ixdp425_flash_resource.end =
                IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
+#if defined(CONFIG_MTD_NAND_PLATFORM) || \
+    defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
+        ixdp425_flash_nand_resource.start = IXP4XX_EXP_BUS_BASE(3),
+        ixdp425_flash_nand_resource.end   = IXP4XX_EXP_BUS_BASE(3) + 0x10 - 1;
+        gpio_line_config(IXDP425_NAND_NCE_PIN, IXP4XX_GPIO_OUT);
+        /* Configure expansion bus for NAND Flash */
+        *IXP4XX_EXP_CS3 = IXP4XX_EXP_BUS_CS_EN |
+                          IXP4XX_EXP_BUS_STROBE_T(1) |  /* extend by 1 clock */
+                          IXP4XX_EXP_BUS_CYCLES(0) |    /* Intel cycles */
+                          IXP4XX_EXP_BUS_SIZE(0) |      /* 512bytes addr space*/
+                          IXP4XX_EXP_BUS_WR_EN |
+                          IXP4XX_EXP_BUS_BYTE_EN;       /* 8 bit data bus */
+#endif
        if (cpu_is_ixp43x()) {
                ixdp425_uart.num_resources = 1;
                ixdp425_uart_data[1].flags = 0;
diff --git a/arch/arm/mach-ixp4xx/wg302v2-pci.c b/arch/arm/mach-ixp4xx/wg302v2-pci.c
new file mode 100644
index 0000000000..6588f2c758
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/wg302v2-pci.c
@@ -0,0 +1,63 @@
+/*
+ * arch/arch/mach-ixp4xx/wg302v2-pci.c
+ *
+ * PCI setup routines for the Netgear WG302 v2 and WAG302 v2
+ *
+ * Copyright (C) 2007 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * based on coyote-pci.c:
+ *      Copyright (C) 2002 Jungo Software Technologies.
+ *      Copyright (C) 2003 MontaVista Software, Inc.
+ *
+ * Maintainer: Imre Kaloz <kaloz@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <asm/mach-types.h>
+#include <asm/hardware.h>
+#include <asm/mach/pci.h>
+void __init wg302v2_pci_preinit(void)
+{
+        set_irq_type(IRQ_IXP4XX_GPIO8, IRQT_LOW);
+        set_irq_type(IRQ_IXP4XX_GPIO9, IRQT_LOW);
+        ixp4xx_pci_preinit();
+}
+static int __init wg302v2_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+        if (slot == 1)
+                return IRQ_IXP4XX_GPIO8;
+        else if (slot == 2)
+                return IRQ_IXP4XX_GPIO9;
+        else return -1;
+}
+struct hw_pci wg302v2_pci __initdata = {
+        .nr_controllers = 1,
+        .preinit =        wg302v2_pci_preinit,
+        .swizzle =        pci_std_swizzle,
+        .setup =          ixp4xx_setup,
+        .scan =           ixp4xx_scan_bus,
+        .map_irq =        wg302v2_map_irq,
+};
+int __init wg302v2_pci_init(void)
+{
+        if (machine_is_wg302v2())
+                pci_common_init(&wg302v2_pci);
+        return 0;
+}
+subsys_initcall(wg302v2_pci_init);
diff --git a/arch/arm/mach-ixp4xx/wg302v2-setup.c b/arch/arm/mach-ixp4xx/wg302v2-setup.c
new file mode 100644
index 0000000000..f7e09ad804
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/wg302v2-setup.c
@@ -0,0 +1,109 @@
+/*
+ * arch/arm/mach-ixp4xx/wg302-setup.c
+ *
+ * Board setup for the Netgear WG302 v2 and WAG302 v2
+ *
+ * Copyright (C) 2007 Imre Kaloz <Kaloz@openwrt.org>
+ *
+ * based on coyote-setup.c:
+ *      Copyright (C) 2003-2005 MontaVista Software, Inc.
+ *
+ * Author: Imre Kaloz <kaloz@openwrt.org>
+ *
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/serial.h>
+#include <linux/tty.h>
+#include <linux/serial_8250.h>
+#include <linux/slab.h>
+#include <asm/types.h>
+#include <asm/setup.h>
+#include <asm/memory.h>
+#include <asm/hardware.h>
+#include <asm/irq.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/flash.h>
+static struct flash_platform_data wg302v2_flash_data = {
+        .map_name       = "cfi_probe",
+        .width          = 2,
+};
+static struct resource wg302v2_flash_resource = {
+        .flags          = IORESOURCE_MEM,
+};
+static struct platform_device wg302v2_flash = {
+        .name           = "IXP4XX-Flash",
+        .id             = 0,
+        .dev            = {
+                .platform_data = &wg302v2_flash_data,
+        },
+        .num_resources  = 1,
+        .resource       = &wg302v2_flash_resource,
+};
+static struct resource wg302v2_uart_resource = {
+        .start  = IXP4XX_UART2_BASE_PHYS,
+        .end    = IXP4XX_UART2_BASE_PHYS + 0x0fff,
+        .flags  = IORESOURCE_MEM,
+};
+static struct plat_serial8250_port wg302v2_uart_data[] = {
+        {
+                .mapbase        = IXP4XX_UART2_BASE_PHYS,
+                .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
+                .irq            = IRQ_IXP4XX_UART2,
+                .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
+                .iotype         = UPIO_MEM,
+                .regshift       = 2,
+                .uartclk        = IXP4XX_UART_XTAL,
+        },
+        { },
+};
+static struct platform_device wg302v2_uart = {
+        .name           = "serial8250",
+        .id             = PLAT8250_DEV_PLATFORM,
+        .dev                    = {
+                .platform_data  = wg302v2_uart_data,
+        },
+        .num_resources  = 1,
+        .resource       = &wg302v2_uart_resource,
+};
+static struct platform_device *wg302v2_devices[] __initdata = {
+        &wg302v2_flash,
+        &wg302v2_uart,
+};
+static void __init wg302v2_init(void)
+{
+        ixp4xx_sys_init();
+        wg302v2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
+        wg302v2_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
+        *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
+        *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
+        platform_add_devices(wg302v2_devices, ARRAY_SIZE(wg302v2_devices));
+}
+#ifdef CONFIG_MACH_WG302V2
+MACHINE_START(WG302V2, "Netgear WG302 v2 / WAG302 v2")
+        /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
+        .map_io         = ixp4xx_map_io,
+        .init_irq       = ixp4xx_init_irq,
+        .timer          = &ixp4xx_timer,
+        .boot_params    = 0x0100,
+        .init_machine   = wg302v2_init,
+MACHINE_END
+#endif
diff --git a/arch/arm/mach-ks8695/Makefile b/arch/arm/mach-ks8695/Makefile
index 56b7d33733..2a07a281fa 100644
--- a/arch/arm/mach-ks8695/Makefile
+++ b/arch/arm/mach-ks8695/Makefile
@@ -3,7 +3,7 @@
 # Makefile for KS8695 architecture support
 #
-obj-y                           := cpu.o irq.o time.o devices.o
+obj-y                           := cpu.o irq.o time.o gpio.o devices.o
 obj-m                           :=
 obj-n                           :=
 obj-                            :=
diff --git a/arch/arm/mach-ks8695/gpio.c b/arch/arm/mach-ks8695/gpio.c
new file mode 100644
index 0000000000..b1aa3cb3d4
--- /dev/null
+++ b/arch/arm/mach-ks8695/gpio.c
@@ -0,0 +1,218 @@
+/*
+ * arch/arm/mach-ks8695/gpio.c
+ *
+ * Copyright (C) 2006 Andrew Victor
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <asm/io.h>
+#include <asm/hardware.h>
+#include <asm/mach/irq.h>
+#include <asm/arch/regs-gpio.h>
+#include <asm/arch/gpio.h>
+/*
+ * Configure a GPIO line for either GPIO function, or its internal
+ * function (Interrupt, Timer, etc).
+ */
+static void __init_or_module ks8695_gpio_mode(unsigned int pin, short gpio)
+{
+        unsigned int enable[] = { IOPC_IOEINT0EN, IOPC_IOEINT1EN, IOPC_IOEINT2EN, IOPC_IOEINT3EN, IOPC_IOTIM0EN, IOPC_IOTIM1EN };
+        unsigned long x, flags;
+        if (pin > KS8695_GPIO_5)        /* only GPIO 0..5 have internal functions */
+                return;
+        local_irq_save(flags);
+        x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPC);
+        if (gpio)                       /* GPIO: set bit to 0 */
+                x &= ~enable[pin];
+        else                            /* Internal function: set bit to 1 */
+                x |= enable[pin];
+        __raw_writel(x, KS8695_GPIO_VA + KS8695_IOPC);
+        local_irq_restore(flags);
+}
+static unsigned short gpio_irq[] = { KS8695_IRQ_EXTERN0, KS8695_IRQ_EXTERN1, KS8695_IRQ_EXTERN2, KS8695_IRQ_EXTERN3 };
+/*
+ * Configure GPIO pin as external interrupt source.
+ */
+int __init_or_module ks8695_gpio_interrupt(unsigned int pin, unsigned int type)
+{
+        unsigned long x, flags;
+        if (pin > KS8695_GPIO_3)        /* only GPIO 0..3 can generate IRQ */
+                return -EINVAL;
+        local_irq_save(flags);
+        /* set pin as input */
+        x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPM);
+        x &= ~IOPM_(pin);
+        __raw_writel(x, KS8695_GPIO_VA + KS8695_IOPM);
+        local_irq_restore(flags);
+        /* Set IRQ triggering type */
+        set_irq_type(gpio_irq[pin], type);
+        /* enable interrupt mode */
+        ks8695_gpio_mode(pin, 0);
+        return 0;
+}
+EXPORT_SYMBOL(ks8695_gpio_interrupt);
+/* .... Generic GPIO interface .............................................. */
+/*
+ * Configure the GPIO line as an input.
+ */
+int __init_or_module gpio_direction_input(unsigned int pin)
+{
+        unsigned long x, flags;
+        if (pin > KS8695_GPIO_15)
+                return -EINVAL;
+        /* set pin to GPIO mode */
+        ks8695_gpio_mode(pin, 1);
+        local_irq_save(flags);
+        /* set pin as input */
+        x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPM);
+        x &= ~IOPM_(pin);
+        __raw_writel(x, KS8695_GPIO_VA + KS8695_IOPM);
+        local_irq_restore(flags);
+        return 0;
+}
+EXPORT_SYMBOL(gpio_direction_input);
+/*
+ * Configure the GPIO line as an output, with default state.
+ */
+int __init_or_module gpio_direction_output(unsigned int pin, unsigned int state)
+{
+        unsigned long x, flags;
+        if (pin > KS8695_GPIO_15)
+                return -EINVAL;
+        /* set pin to GPIO mode */
+        ks8695_gpio_mode(pin, 1);
+        local_irq_save(flags);
+        /* set line state */
+        x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPD);
+        if (state)
+                x |= (1 << pin);
+        else
+                x &= ~(1 << pin);
+        __raw_writel(x, KS8695_GPIO_VA + KS8695_IOPD);
+        /* set pin as output */
+        x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPM);
+        x |= IOPM_(pin);
+        __raw_writel(x, KS8695_GPIO_VA + KS8695_IOPM);
+        local_irq_restore(flags);
+        return 0;
+}
+EXPORT_SYMBOL(gpio_direction_output);
+/*
+ * Set the state of an output GPIO line.
+ */
+void gpio_set_value(unsigned int pin, unsigned int state)
+{
+        unsigned long x, flags;
+        if (pin > KS8695_GPIO_15)
+                return;
+        local_irq_save(flags);
+        /* set output line state */
+        x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPD);
+        if (state)
+                x |= (1 << pin);
+        else
+                x &= ~(1 << pin);
+        __raw_writel(x, KS8695_GPIO_VA + KS8695_IOPD);
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL(gpio_set_value);
+/*
+ * Read the state of a GPIO line.
+ */
+int gpio_get_value(unsigned int pin)
+{
+        unsigned long x;
+        if (pin > KS8695_GPIO_15)
+                return -EINVAL;
+        x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPD);
+        return (x & (1 << pin)) != 0;
+}
+EXPORT_SYMBOL(gpio_get_value);
+/*
+ * Map GPIO line to IRQ number.
+ */
+int gpio_to_irq(unsigned int pin)
+{
+        if (pin > KS8695_GPIO_3)        /* only GPIO 0..3 can generate IRQ */
+                return -EINVAL;
+        return gpio_irq[pin];
+}
+EXPORT_SYMBOL(gpio_to_irq);
+/*
+ * Map IRQ number to GPIO line.
+ */
+int irq_to_gpio(unsigned int irq)
+{
+        if ((irq < KS8695_IRQ_EXTERN0) || (irq > KS8695_IRQ_EXTERN3))
+                return -EINVAL;
+        return (irq - KS8695_IRQ_EXTERN0);
+}
+EXPORT_SYMBOL(irq_to_gpio);
diff --git a/arch/arm/mach-pxa/clock.c b/arch/arm/mach-pxa/clock.c
index 8f7c90a059..34a31caa6f 100644
--- a/arch/arm/mach-pxa/clock.c
+++ b/arch/arm/mach-pxa/clock.c
@@ -12,7 +12,6 @@
 #include <asm/arch/pxa-regs.h>
 #include <asm/hardware.h>
-#include <asm/semaphore.h>
 struct clk {
        struct list_head        node;
@@ -25,21 +24,21 @@ struct clk {
 };
 static LIST_HEAD(clocks);
-static DECLARE_MUTEX(clocks_sem);
+static DEFINE_MUTEX(clocks_mutex);
 static DEFINE_SPINLOCK(clocks_lock);
 struct clk *clk_get(struct device *dev, const char *id)
 {
        struct clk *p, *clk = ERR_PTR(-ENOENT);
-        down(&clocks_sem);
+        mutex_lock(&clocks_mutex);
        list_for_each_entry(p, &clocks, node) {
                if (strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
                        clk = p;
                        break;
                }
        }
-        up(&clocks_sem);
+        mutex_unlock(&clocks_mutex);
        return clk;
 }
@@ -101,18 +100,18 @@ static struct clk clk_gpio27 = {
 int clk_register(struct clk *clk)
 {
-        down(&clocks_sem);
+        mutex_lock(&clocks_mutex);
        list_add(&clk->node, &clocks);
-        up(&clocks_sem);
+        mutex_unlock(&clocks_mutex);
        return 0;
 }
 EXPORT_SYMBOL(clk_register);
 void clk_unregister(struct clk *clk)
 {
-        down(&clocks_sem);
+        mutex_lock(&clocks_mutex);
        list_del(&clk->node);
-        up(&clocks_sem);
+        mutex_unlock(&clocks_mutex);
 }
 EXPORT_SYMBOL(clk_unregister);
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index a1a900d166..aab27297b3 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -44,6 +44,7 @@
 #include <asm/hardware/scoop.h>
 #include "generic.h"
+#include "devices.h"
 #include "sharpsl.h"
@@ -368,7 +369,7 @@ MACHINE_START(CORGI, "SHARP Corgi")
        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
        .fixup          = fixup_corgi,
        .map_io         = pxa_map_io,
-        .init_irq       = pxa_init_irq,
+        .init_irq       = pxa25x_init_irq,
        .init_machine   = corgi_init,
        .timer          = &pxa_timer,
 MACHINE_END
@@ -380,7 +381,7 @@ MACHINE_START(SHEPHERD, "SHARP Shepherd")
        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
        .fixup          = fixup_corgi,
        .map_io         = pxa_map_io,
-        .init_irq       = pxa_init_irq,
+        .init_irq       = pxa25x_init_irq,
        .init_machine   = corgi_init,
        .timer          = &pxa_timer,
 MACHINE_END
@@ -392,7 +393,7 @@ MACHINE_START(HUSKY, "SHARP Husky")
        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
        .fixup          = fixup_corgi,
        .map_io         = pxa_map_io,
-        .init_irq       = pxa_init_irq,
+        .init_irq       = pxa25x_init_irq,
        .init_machine   = corgi_init,
        .timer          = &pxa_timer,
 MACHINE_END
diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h
new file mode 100644
index 0000000000..9a6faff8e5
--- /dev/null
+++ b/arch/arm/mach-pxa/devices.h
@@ -0,0 +1,11 @@
+extern struct platform_device pxamci_device;
+extern struct platform_device pxaudc_device;
+extern struct platform_device pxafb_device;
+extern struct platform_device ffuart_device;
+extern struct platform_device btuart_device;
+extern struct platform_device stuart_device;
+extern struct platform_device hwuart_device;
+extern struct platform_device pxai2c_device;
+extern struct platform_device pxai2s_device;
+extern struct platform_device pxaficp_device;
+extern struct platform_device pxartc_device;
diff --git a/arch/arm/mach-pxa/dma.c b/arch/arm/mach-pxa/dma.c
index 4440babe7b..93c4f31f12 100644
--- a/arch/arm/mach-pxa/dma.c
+++ b/arch/arm/mach-pxa/dma.c
@@ -25,12 +25,15 @@
 #include <asm/arch/pxa-regs.h>
-static struct dma_channel {
+struct dma_channel {
        char *name;
+        pxa_dma_prio prio;
        void (*irq_handler)(int, void *);
        void *data;
-} dma_channels[PXA_DMA_CHANNELS];
+};
+static struct dma_channel *dma_channels;
+static int num_dma_channels;
 int pxa_request_dma (char *name, pxa_dma_prio prio,
                         void (*irq_handler)(int, void *),
@@ -47,8 +50,9 @@ int pxa_request_dma (char *name, pxa_dma_prio prio,
        do {
                /* try grabbing a DMA channel with the requested priority */
-                pxa_for_each_dma_prio (i, prio) {
+                for (i = 0; i < num_dma_channels; i++) {
-                        if (!dma_channels[i].name) {
+                        if ((dma_channels[i].prio == prio) &&
+                            !dma_channels[i].name) {
                                found = 1;
                                break;
                        }
@@ -91,7 +95,7 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
 {
        int i, dint = DINT;
-        for (i = 0; i < PXA_DMA_CHANNELS; i++) {
+        for (i = 0; i < num_dma_channels; i++) {
                if (dint & (1 << i)) {
                        struct dma_channel *channel = &dma_channels[i];
                        if (channel->name && channel->irq_handler) {
@@ -109,18 +113,32 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
-static int __init pxa_dma_init (void)
+int __init pxa_init_dma(int num_ch)
 {
-        int ret;
+        int i, ret;
-        ret = request_irq (IRQ_DMA, dma_irq_handler, 0, "DMA", NULL);
+        dma_channels = kzalloc(sizeof(struct dma_channel) * num_ch, GFP_KERNEL);
-        if (ret)
+        if (dma_channels == NULL)
+                return -ENOMEM;
+        ret = request_irq(IRQ_DMA, dma_irq_handler, IRQF_DISABLED, "DMA", NULL);
+        if (ret) {
                printk (KERN_CRIT "Wow!  Can't register IRQ for DMA\n");
-        return ret;
+                kfree(dma_channels);
-}
+                return ret;
+        }
-arch_initcall(pxa_dma_init);
+        /* dma channel priorities on pxa2xx processors:
+         * ch 0 - 3,  16 - 19  <--> (0) DMA_PRIO_HIGH
+         * ch 4 - 7,  20 - 23  <--> (1) DMA_PRIO_MEDIUM
+         * ch 8 - 15, 24 - 31  <--> (2) DMA_PRIO_LOW
+         */
+        for (i = 0; i < num_ch; i++)
+                dma_channels[i].prio = min((i & 0xf) >> 2, DMA_PRIO_LOW);
+        num_dma_channels = num_ch;
+        return 0;
+}
 EXPORT_SYMBOL(pxa_request_dma);
 EXPORT_SYMBOL(pxa_free_dma);
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index 64b08b744f..296539b635 100644
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -43,6 +43,7 @@
 #include <asm/arch/irda.h>
 #include <asm/arch/i2c.h>
+#include "devices.h"
 #include "generic.h"
 /*
@@ -242,7 +243,7 @@ static struct resource pxamci_resources[] = {
 static u64 pxamci_dmamask = 0xffffffffUL;
-static struct platform_device pxamci_device = {
+struct platform_device pxamci_device = {
        .name           = "pxa2xx-mci",
        .id             = -1,
        .dev            = {
@@ -281,7 +282,7 @@ static struct resource pxa2xx_udc_resources[] = {
 static u64 udc_dma_mask = ~(u32)0;
-static struct platform_device udc_device = {
+struct platform_device pxaudc_device = {
        .name           = "pxa2xx-udc",
        .id             = -1,
        .resource       = pxa2xx_udc_resources,
@@ -307,7 +308,7 @@ static struct resource pxafb_resources[] = {
 static u64 fb_dma_mask = ~(u64)0;
-static struct platform_device pxafb_device = {
+struct platform_device pxafb_device = {
        .name           = "pxa2xx-fb",
        .id             = -1,
        .dev            = {
@@ -328,24 +329,24 @@ void __init set_pxa_fb_parent(struct device *parent_dev)
        pxafb_device.dev.parent = parent_dev;
 }
-static struct platform_device ffuart_device = {
+struct platform_device ffuart_device = {
        .name           = "pxa2xx-uart",
        .id             = 0,
 };
-static struct platform_device btuart_device = {
+struct platform_device btuart_device = {
        .name           = "pxa2xx-uart",
        .id             = 1,
 };
-static struct platform_device stuart_device = {
+struct platform_device stuart_device = {
        .name           = "pxa2xx-uart",
        .id             = 2,
 };
-static struct platform_device hwuart_device = {
+struct platform_device hwuart_device = {
        .name           = "pxa2xx-uart",
        .id             = 3,
 };
-static struct resource i2c_resources[] = {
+static struct resource pxai2c_resources[] = {
        {
                .start  = 0x40301680,
                .end    = 0x403016a3,
@@ -357,40 +358,19 @@ static struct resource i2c_resources[] = {
        },
 };
-static struct platform_device i2c_device = {
+struct platform_device pxai2c_device = {
        .name           = "pxa2xx-i2c",
        .id             = 0,
-        .resource       = i2c_resources,
+        .resource       = pxai2c_resources,
-        .num_resources  = ARRAY_SIZE(i2c_resources),
+        .num_resources  = ARRAY_SIZE(pxai2c_resources),
 };
-#ifdef CONFIG_PXA27x
-static struct resource i2c_power_resources[] = {
-        {
-                .start  = 0x40f00180,
-                .end    = 0x40f001a3,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_PWRI2C,
-                .end    = IRQ_PWRI2C,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-static struct platform_device i2c_power_device = {
-        .name           = "pxa2xx-i2c",
-        .id             = 1,
-        .resource       = i2c_power_resources,
-        .num_resources  = ARRAY_SIZE(i2c_resources),
-};
-#endif
 void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info)
 {
-        i2c_device.dev.platform_data = info;
+        pxai2c_device.dev.platform_data = info;
 }
-static struct resource i2s_resources[] = {
+static struct resource pxai2s_resources[] = {
        {
                .start  = 0x40400000,
                .end    = 0x40400083,
@@ -402,16 +382,16 @@ static struct resource i2s_resources[] = {
        },
 };
-static struct platform_device i2s_device = {
+struct platform_device pxai2s_device = {
        .name           = "pxa2xx-i2s",
        .id             = -1,
-        .resource       = i2s_resources,
+        .resource       = pxai2s_resources,
-        .num_resources  = ARRAY_SIZE(i2s_resources),
+        .num_resources  = ARRAY_SIZE(pxai2s_resources),
 };
 static u64 pxaficp_dmamask = ~(u32)0;
-static struct platform_device pxaficp_device = {
+struct platform_device pxaficp_device = {
        .name           = "pxa2xx-ir",
        .id             = -1,
        .dev            = {
@@ -425,42 +405,7 @@ void __init pxa_set_ficp_info(struct pxaficp_platform_data *info)
        pxaficp_device.dev.platform_data = info;
 }
-static struct platform_device pxartc_device = {
+struct platform_device pxartc_device = {
        .name           = "sa1100-rtc",
        .id             = -1,
 };
-static struct platform_device *devices[] __initdata = {
-        &pxamci_device,
-        &udc_device,
-        &pxafb_device,
-        &ffuart_device,
-        &btuart_device,
-        &stuart_device,
-        &pxaficp_device,
-        &i2c_device,
-#ifdef CONFIG_PXA27x
-        &i2c_power_device,
-#endif
-        &i2s_device,
-        &pxartc_device,
-};
-static int __init pxa_init(void)
-{
-        int cpuid, ret;
-        ret = platform_add_devices(devices, ARRAY_SIZE(devices));
-        if (ret)
-                return ret;
-        /* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */
-        cpuid = read_cpuid(CPUID_ID);
-        if (((cpuid >> 4) & 0xfff) == 0x2d0 ||
-            ((cpuid >> 4) & 0xfff) == 0x290)
-                ret = platform_device_register(&hwuart_device);
-        return ret;
-}
-subsys_initcall(pxa_init);
diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h
index e54a8dd63c..91ab2ad8b3 100644
--- a/arch/arm/mach-pxa/generic.h
+++ b/arch/arm/mach-pxa/generic.h
@@ -12,8 +12,12 @@
 struct sys_timer;
 extern struct sys_timer pxa_timer;
+extern void __init pxa_init_irq_low(void);
+extern void __init pxa_init_irq_high(void);
+extern void __init pxa_init_irq_gpio(int gpio_nr);
+extern void __init pxa25x_init_irq(void);
+extern void __init pxa27x_init_irq(void);
 extern void __init pxa_map_io(void);
-extern void __init pxa_init_irq(void);
 extern unsigned int get_clk_frequency_khz(int info);
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
index 64df44043a..465108da28 100644
--- a/arch/arm/mach-pxa/idp.c
+++ b/arch/arm/mach-pxa/idp.c
@@ -38,6 +38,7 @@
 #include <asm/arch/mmc.h>
 #include "generic.h"
+#include "devices.h"
 /* TODO:
 * - add pxa2xx_audio_ops_t device structure
@@ -152,7 +153,7 @@ static void __init idp_init(void)
 static void __init idp_init_irq(void)
 {
-        pxa_init_irq();
+        pxa25x_init_irq();
        set_irq_type(TOUCH_PANEL_IRQ, TOUCH_PANEL_IRQ_EDGE);
 }
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index 4619d5fe60..4b867b0789 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -30,12 +30,12 @@
 static void pxa_mask_low_irq(unsigned int irq)
 {
-        ICMR &= ~(1 << (irq + PXA_IRQ_SKIP));
+        ICMR &= ~(1 << irq);
 }
 static void pxa_unmask_low_irq(unsigned int irq)
 {
-        ICMR |= (1 << (irq + PXA_IRQ_SKIP));
+        ICMR |= (1 << irq);
 }
 static int pxa_set_wake(unsigned int irq, unsigned int on)
@@ -67,7 +67,27 @@ static struct irq_chip pxa_internal_chip_low = {
        .set_wake       = pxa_set_wake,
 };
-#if PXA_INTERNAL_IRQS > 32
+void __init pxa_init_irq_low(void)
+{
+        int irq;
+        /* disable all IRQs */
+        ICMR = 0;
+        /* all IRQs are IRQ, not FIQ */
+        ICLR = 0;
+        /* only unmasked interrupts kick us out of idle */
+        ICCR = 1;
+        for (irq = PXA_IRQ(0); irq <= PXA_IRQ(31); irq++) {
+                set_irq_chip(irq, &pxa_internal_chip_low);
+                set_irq_handler(irq, handle_level_irq);
+                set_irq_flags(irq, IRQF_VALID);
+        }
+}
+#ifdef CONFIG_PXA27x
 /*
 * This is for the second set of internal IRQs as found on the PXA27x.
@@ -75,12 +95,12 @@ static struct irq_chip pxa_internal_chip_low = {
 static void pxa_mask_high_irq(unsigned int irq)
 {
-        ICMR2 &= ~(1 << (irq - 32 + PXA_IRQ_SKIP));
+        ICMR2 &= ~(1 << (irq - 32));
 }
 static void pxa_unmask_high_irq(unsigned int irq)
 {
-        ICMR2 |= (1 << (irq - 32 + PXA_IRQ_SKIP));
+        ICMR2 |= (1 << (irq - 32));
 }
 static struct irq_chip pxa_internal_chip_high = {
@@ -90,6 +110,19 @@ static struct irq_chip pxa_internal_chip_high = {
        .unmask         = pxa_unmask_high_irq,
 };
+void __init pxa_init_irq_high(void)
+{
+        int irq;
+        ICMR2 = 0;
+        ICLR2 = 0;
+        for (irq = PXA_IRQ(32); irq < PXA_IRQ(64); irq++) {
+                set_irq_chip(irq, &pxa_internal_chip_high);
+                set_irq_handler(irq, handle_level_irq);
+                set_irq_flags(irq, IRQF_VALID);
+        }
+}
 #endif
 /* Note that if an input/irq line ever gets changed to an output during
@@ -217,7 +250,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)
        do {
                loop = 0;
-                mask = GEDR0 & ~3;
+                mask = GEDR0 & GPIO_IRQ_mask[0] & ~3;
                if (mask) {
                        GEDR0 = mask;
                        irq = IRQ_GPIO(2);
@@ -233,7 +266,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)
                        loop = 1;
                }
-                mask = GEDR1;
+                mask = GEDR1 & GPIO_IRQ_mask[1];
                if (mask) {
                        GEDR1 = mask;
                        irq = IRQ_GPIO(32);
@@ -248,7 +281,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)
                        loop = 1;
                }
-                mask = GEDR2;
+                mask = GEDR2 & GPIO_IRQ_mask[2];
                if (mask) {
                        GEDR2 = mask;
                        irq = IRQ_GPIO(64);
@@ -263,8 +296,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)
                        loop = 1;
                }
-#if PXA_LAST_GPIO >= 96
+                mask = GEDR3 & GPIO_IRQ_mask[3];
-                mask = GEDR3;
                if (mask) {
                        GEDR3 = mask;
                        irq = IRQ_GPIO(96);
@@ -278,7 +310,6 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)
                        } while (mask);
                        loop = 1;
                }
-#endif
        } while (loop);
 }
@@ -314,64 +345,27 @@ static struct irq_chip pxa_muxed_gpio_chip = {
        .set_wake       = pxa_set_gpio_wake,
 };
+void __init pxa_init_irq_gpio(int gpio_nr)
-void __init pxa_init_irq(void)
 {
-        int irq;
+        int irq, i;
-        /* disable all IRQs */
-        ICMR = 0;
-        /* all IRQs are IRQ, not FIQ */
-        ICLR = 0;
        /* clear all GPIO edge detects */
-        GFER0 = 0;
+        for (i = 0; i < gpio_nr; i += 32) {
-        GFER1 = 0;
+                GFER(i) = 0;
-        GFER2 = 0;
+                GRER(i) = 0;
-        GRER0 = 0;
+                GEDR(i) = GEDR(i);
-        GRER1 = 0;
+        }
-        GRER2 = 0;
-        GEDR0 = GEDR0;
-        GEDR1 = GEDR1;
-        GEDR2 = GEDR2;
-#ifdef CONFIG_PXA27x
-        /* And similarly for the extra regs on the PXA27x */
-        ICMR2 = 0;
-        ICLR2 = 0;
-        GFER3 = 0;
-        GRER3 = 0;
-        GEDR3 = GEDR3;
-#endif
-        /* only unmasked interrupts kick us out of idle */
-        ICCR = 1;
        /* GPIO 0 and 1 must have their mask bit always set */
        GPIO_IRQ_mask[0] = 3;
-        for (irq = PXA_IRQ(PXA_IRQ_SKIP); irq <= PXA_IRQ(31); irq++) {
-                set_irq_chip(irq, &pxa_internal_chip_low);
-                set_irq_handler(irq, handle_level_irq);
-                set_irq_flags(irq, IRQF_VALID);
-        }
-#if PXA_INTERNAL_IRQS > 32
-        for (irq = PXA_IRQ(32); irq < PXA_IRQ(PXA_INTERNAL_IRQS); irq++) {
-                set_irq_chip(irq, &pxa_internal_chip_high);
-                set_irq_handler(irq, handle_level_irq);
-                set_irq_flags(irq, IRQF_VALID);
-        }
-#endif
        for (irq = IRQ_GPIO0; irq <= IRQ_GPIO1; irq++) {
                set_irq_chip(irq, &pxa_low_gpio_chip);
                set_irq_handler(irq, handle_edge_irq);
                set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
        }
-        for (irq = IRQ_GPIO(2); irq <= IRQ_GPIO(PXA_LAST_GPIO); irq++) {
+        for (irq = IRQ_GPIO(2); irq <= IRQ_GPIO(gpio_nr); irq++) {
                set_irq_chip(irq, &pxa_muxed_gpio_chip);
                set_irq_handler(irq, handle_edge_irq);
                set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c
index e3097664ff..26116440a7 100644
--- a/arch/arm/mach-pxa/lpd270.c
+++ b/arch/arm/mach-pxa/lpd270.c
@@ -46,6 +46,7 @@
 #include <asm/arch/ohci.h>
 #include "generic.h"
+#include "devices.h"
 static unsigned int lpd270_irq_enabled;
@@ -97,7 +98,7 @@ static void __init lpd270_init_irq(void)
 {
        int irq;
-        pxa_init_irq();
+        pxa27x_init_irq();
        __raw_writew(0, LPD270_INT_MASK);
        __raw_writew(0, LPD270_INT_STATUS);
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 6377b2e29f..e70048fd00 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -48,6 +48,7 @@
 #include <asm/arch/mmc.h>
 #include "generic.h"
+#include "devices.h"
 #define LUB_MISC_WR             __LUB_REG(LUBBOCK_FPGA_PHYS + 0x080)
@@ -103,7 +104,7 @@ static void __init lubbock_init_irq(void)
 {
        int irq;
-        pxa_init_irq();
+        pxa25x_init_irq();
        /* setup extra lubbock irqs */
        for (irq = LUBBOCK_IRQ(0); irq <= LUBBOCK_LAST_IRQ; irq++) {
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index ed99a81b98..b02c79c7e6 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -46,6 +46,7 @@
 #include <asm/arch/ohci.h>
 #include "generic.h"
+#include "devices.h"
 static unsigned long mainstone_irq_enabled;
@@ -89,7 +90,7 @@ static void __init mainstone_init_irq(void)
 {
        int irq;
-        pxa_init_irq();
+        pxa27x_init_irq();
        /* setup extra Mainstone irqs */
        for(irq = MAINSTONE_IRQ(0); irq <= MAINSTONE_IRQ(15); irq++) {
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
index 6bf15ae738..e66dbc26ad 100644
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
@@ -77,7 +77,6 @@ int pxa_pm_enter(suspend_state_t state)
 {
        unsigned long sleep_save[SLEEP_SAVE_SIZE];
        unsigned long checksum = 0;
-        struct timespec delta, rtc;
        int i;
        extern void pxa_cpu_pm_enter(suspend_state_t state);
@@ -87,11 +86,6 @@ int pxa_pm_enter(suspend_state_t state)
                iwmmxt_task_disable(NULL);
 #endif
-        /* preserve current time */
-        rtc.tv_sec = RCNR;
-        rtc.tv_nsec = 0;
-        save_time_delta(&delta, &rtc);
        SAVE(GPLR0); SAVE(GPLR1); SAVE(GPLR2);
        SAVE(GPDR0); SAVE(GPDR1); SAVE(GPDR2);
        SAVE(GRER0); SAVE(GRER1); SAVE(GRER2);
@@ -183,10 +177,6 @@ int pxa_pm_enter(suspend_state_t state)
        RESTORE(PSTR);
-        /* restore current time */
-        rtc.tv_sec = RCNR;
-        restore_time_delta(&delta, &rtc);
 #ifdef DEBUG
        printk(KERN_DEBUG "*** made it back from resume\n");
 #endif
@@ -200,40 +190,3 @@ unsigned long sleep_phys_sp(void *sp)
 {
        return virt_to_phys(sp);
 }
-/*
- * Called after processes are frozen, but before we shut down devices.
- */
-int pxa_pm_prepare(suspend_state_t state)
-{
-        extern int pxa_cpu_pm_prepare(suspend_state_t state);
-        return pxa_cpu_pm_prepare(state);
-}
-EXPORT_SYMBOL_GPL(pxa_pm_prepare);
-/*
- * Called after devices are re-setup, but before processes are thawed.
- */
-int pxa_pm_finish(suspend_state_t state)
-{
-        return 0;
-}
-EXPORT_SYMBOL_GPL(pxa_pm_finish);
-static struct pm_ops pxa_pm_ops = {
-        .prepare        = pxa_pm_prepare,
-        .enter          = pxa_pm_enter,
-        .finish         = pxa_pm_finish,
-        .valid          = pm_valid_only_mem,
-};
-static int __init pxa_pm_init(void)
-{
-        pm_set_ops(&pxa_pm_ops);
-        return 0;
-}
-device_initcall(pxa_pm_init);
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index 34fb80b370..655668d4d0 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -45,6 +45,7 @@
 #include <asm/mach/sharpsl_param.h>
 #include "generic.h"
+#include "devices.h"
 #include "sharpsl.h"
 static struct resource poodle_scoop_resources[] = {
@@ -412,7 +413,7 @@ MACHINE_START(POODLE, "SHARP Poodle")
        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
        .fixup          = fixup_poodle,
        .map_io         = pxa_map_io,
-        .init_irq       = pxa_init_irq,
+        .init_irq       = pxa25x_init_irq,
        .timer          = &pxa_timer,
        .init_machine   = poodle_init,
 MACHINE_END
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index c1f21739bf..f36ca44833 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -19,12 +19,17 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/platform_device.h>
 #include <linux/pm.h>
 #include <asm/hardware.h>
+#include <asm/arch/irqs.h>
 #include <asm/arch/pxa-regs.h>
+#include <asm/arch/pm.h>
+#include <asm/arch/dma.h>
 #include "generic.h"
+#include "devices.h"
 /*
 * Various clock factors driven by the CCCR register.
@@ -105,18 +110,6 @@ EXPORT_SYMBOL(get_lcdclk_frequency_10khz);
 #ifdef CONFIG_PM
-int pxa_cpu_pm_prepare(suspend_state_t state)
-{
-        switch (state) {
-        case PM_SUSPEND_MEM:
-                break;
-        default:
-                return -EINVAL;
-        }
-        return 0;
-}
 void pxa_cpu_pm_enter(suspend_state_t state)
 {
        extern void pxa_cpu_suspend(unsigned int);
@@ -133,4 +126,49 @@ void pxa_cpu_pm_enter(suspend_state_t state)
        }
 }
+static struct pm_ops pxa25x_pm_ops = {
+        .enter          = pxa_pm_enter,
+        .valid          = pm_valid_only_mem,
+};
+#endif
+void __init pxa25x_init_irq(void)
+{
+        pxa_init_irq_low();
+        pxa_init_irq_gpio(85);
+}
+static struct platform_device *pxa25x_devices[] __initdata = {
+        &pxamci_device,
+        &pxaudc_device,
+        &pxafb_device,
+        &ffuart_device,
+        &btuart_device,
+        &stuart_device,
+        &pxai2c_device,
+        &pxai2s_device,
+        &pxaficp_device,
+        &pxartc_device,
+};
+static int __init pxa25x_init(void)
+{
+        int ret = 0;
+        if (cpu_is_pxa21x() || cpu_is_pxa25x()) {
+                if ((ret = pxa_init_dma(16)))
+                        return ret;
+#ifdef CONFIG_PM
+                pm_set_ops(&pxa25x_pm_ops);
 #endif
+                ret = platform_add_devices(pxa25x_devices,
+                                           ARRAY_SIZE(pxa25x_devices));
+        }
+        /* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */
+        if (cpu_is_pxa25x())
+                ret = platform_device_register(&hwuart_device);
+        return ret;
+}
+subsys_initcall(pxa25x_init);
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index c64bab49ef..aa5bb02c89 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -19,10 +19,14 @@
 #include <asm/hardware.h>
 #include <asm/irq.h>
+#include <asm/arch/irqs.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/ohci.h>
+#include <asm/arch/pm.h>
+#include <asm/arch/dma.h>
 #include "generic.h"
+#include "devices.h"
 /* Crystal clock: 13MHz */
 #define BASE_CLK        13000000
@@ -122,17 +126,6 @@ EXPORT_SYMBOL(get_lcdclk_frequency_10khz);
 #ifdef CONFIG_PM
-int pxa_cpu_pm_prepare(suspend_state_t state)
-{
-        switch (state) {
-        case PM_SUSPEND_MEM:
-        case PM_SUSPEND_STANDBY:
-                return 0;
-        default:
-                return -EINVAL;
-        }
-}
 void pxa_cpu_pm_enter(suspend_state_t state)
 {
        extern void pxa_cpu_standby(void);
@@ -140,9 +133,9 @@ void pxa_cpu_pm_enter(suspend_state_t state)
        extern void pxa_cpu_resume(void);
        if (state == PM_SUSPEND_STANDBY)
-                CKEN = CKEN_MEMC | CKEN_OSTIMER | CKEN_LCD | CKEN_PWM0;
+                CKEN = (1 << CKEN_MEMC) | (1 << CKEN_OSTIMER) | (1 << CKEN_LCD) | (1 << CKEN_PWM0);
        else
-                CKEN = CKEN_MEMC | CKEN_OSTIMER;
+                CKEN = (1 << CKEN_MEMC) | (1 << CKEN_OSTIMER);
        /* ensure voltage-change sequencer not initiated, which hangs */
        PCFR &= ~PCFR_FVC;
@@ -162,6 +155,15 @@ void pxa_cpu_pm_enter(suspend_state_t state)
        }
 }
+static int pxa27x_pm_valid(suspend_state_t state)
+{
+        return state == PM_SUSPEND_MEM || state == PM_SUSPEND_STANDBY;
+}
+static struct pm_ops pxa27x_pm_ops = {
+        .enter          = pxa_pm_enter,
+        .valid          = pxa27x_pm_valid,
+};
 #endif
 /*
@@ -183,7 +185,7 @@ static struct resource pxa27x_ohci_resources[] = {
        },
 };
-static struct platform_device ohci_device = {
+static struct platform_device pxaohci_device = {
        .name           = "pxa27x-ohci",
        .id             = -1,
        .dev            = {
@@ -196,16 +198,62 @@ static struct platform_device ohci_device = {
 void __init pxa_set_ohci_info(struct pxaohci_platform_data *info)
 {
-        ohci_device.dev.platform_data = info;
+        pxaohci_device.dev.platform_data = info;
 }
+static struct resource i2c_power_resources[] = {
+        {
+                .start  = 0x40f00180,
+                .end    = 0x40f001a3,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .start  = IRQ_PWRI2C,
+                .end    = IRQ_PWRI2C,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static struct platform_device pxai2c_power_device = {
+        .name           = "pxa2xx-i2c",
+        .id             = 1,
+        .resource       = i2c_power_resources,
+        .num_resources  = ARRAY_SIZE(i2c_power_resources),
+};
 static struct platform_device *devices[] __initdata = {
-        &ohci_device,
+        &pxamci_device,
+        &pxaudc_device,
+        &pxafb_device,
+        &ffuart_device,
+        &btuart_device,
+        &stuart_device,
+        &pxai2c_device,
+        &pxai2c_power_device,
+        &pxai2s_device,
+        &pxaficp_device,
+        &pxartc_device,
+        &pxaohci_device,
 };
+void __init pxa27x_init_irq(void)
+{
+        pxa_init_irq_low();
+        pxa_init_irq_high();
+        pxa_init_irq_gpio(128);
+}
 static int __init pxa27x_init(void)
 {
-        return platform_add_devices(devices, ARRAY_SIZE(devices));
+        int ret = 0;
+        if (cpu_is_pxa27x()) {
+                if ((ret = pxa_init_dma(32)))
+                        return ret;
+#ifdef CONFIG_PM
+                pm_set_ops(&pxa27x_pm_ops);
+#endif
+                ret = platform_add_devices(devices, ARRAY_SIZE(devices));
+        }
+        return ret;
 }
 subsys_initcall(pxa27x_init);
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 3cbac63bed..bae47e145d 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -48,6 +48,7 @@
 #include <asm/hardware/scoop.h>
 #include "generic.h"
+#include "devices.h"
 #include "sharpsl.h"
 /*
@@ -560,7 +561,7 @@ MACHINE_START(SPITZ, "SHARP Spitz")
        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
        .fixup          = fixup_spitz,
        .map_io         = pxa_map_io,
-        .init_irq       = pxa_init_irq,
+        .init_irq       = pxa27x_init_irq,
        .init_machine   = spitz_init,
        .timer          = &pxa_timer,
 MACHINE_END
@@ -572,7 +573,7 @@ MACHINE_START(BORZOI, "SHARP Borzoi")
        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
        .fixup          = fixup_spitz,
        .map_io         = pxa_map_io,
-        .init_irq       = pxa_init_irq,
+        .init_irq       = pxa27x_init_irq,
        .init_machine   = spitz_init,
        .timer          = &pxa_timer,
 MACHINE_END
@@ -584,7 +585,7 @@ MACHINE_START(AKITA, "SHARP Akita")
        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
        .fixup          = fixup_spitz,
        .map_io         = pxa_map_io,
-        .init_irq       = pxa_init_irq,
+        .init_irq       = pxa27x_init_irq,
        .init_machine   = akita_init,
        .timer          = &pxa_timer,
 MACHINE_END
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c
index 5248abe334..6f91fd2d06 100644
--- a/arch/arm/mach-pxa/time.c
+++ b/arch/arm/mach-pxa/time.c
@@ -30,11 +30,6 @@
 #include <asm/arch/pxa-regs.h>
-static inline unsigned long pxa_get_rtc_time(void)
-{
-        return RCNR;
-}
 static int pxa_set_rtc(void)
 {
        unsigned long current_time = xtime.tv_sec;
@@ -122,10 +117,6 @@ static void __init pxa_timer_init(void)
        set_rtc = pxa_set_rtc;
-        tv.tv_nsec = 0;
-        tv.tv_sec = pxa_get_rtc_time();
-        do_settimeofday(&tv);
        OIER = 0;               /* disable any timer interrupts */
        OSSR = 0xf;             /* clear status on all timers */
        setup_irq(IRQ_OST0, &pxa_timer_irq);
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 72738771fb..240fd04208 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -42,7 +42,7 @@
 #include <asm/mach/sharpsl_param.h>
 #include "generic.h"
+#include "devices.h"
 /*
 * SCOOP Device
@@ -332,7 +332,7 @@ MACHINE_START(TOSA, "SHARP Tosa")
        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
        .fixup          = fixup_tosa,
        .map_io         = pxa_map_io,
-        .init_irq       = pxa_init_irq,
+        .init_irq       = pxa25x_init_irq,
        .init_machine   = tosa_init,
        .timer          = &pxa_timer,
 MACHINE_END
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index 28c79bd0a3..e4ba43bdf8 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -49,6 +49,7 @@
 #include <asm/arch/ohci.h>
 #include "generic.h"
+#include "devices.h"
 /********************************************************************************************
 * ONBOARD FLASH
@@ -503,7 +504,7 @@ MACHINE_START(TRIZEPS4, "Keith und Koep Trizeps IV module")
        .boot_params    = TRIZEPS4_SDRAM_BASE + 0x100,
        .init_machine   = trizeps4_init,
        .map_io         = trizeps4_map_io,
-        .init_irq       = pxa_init_irq,
+        .init_irq       = pxa27x_init_irq,
        .timer          = &pxa_timer,
 MACHINE_END
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index f01de807b7..8b52ea95d4 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -20,6 +20,8 @@
 #include <linux/platform_device.h>
 #include <linux/dm9000.h>
+#include <net/ax88796.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
@@ -409,6 +411,61 @@ static struct s3c2410_platform_i2c bast_i2c_info = {
        .max_freq       = 130*1000,
 };
+/* Asix AX88796 10/100 ethernet controller */
+static struct ax_plat_data bast_asix_platdata = {
+        .flags          = AXFLG_MAC_FROMDEV,
+        .wordlength     = 2,
+        .dcr_val        = 0x48,
+        .rcr_val        = 0x40,
+};
+static struct resource bast_asix_resource[] = {
+        [0] = {
+                .start = S3C2410_CS5 + BAST_PA_ASIXNET,
+                .end   = S3C2410_CS5 + BAST_PA_ASIXNET + (0x18 * 0x20) - 1,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = S3C2410_CS5 + BAST_PA_ASIXNET + (0x1f * 0x20),
+                .end   = S3C2410_CS5 + BAST_PA_ASIXNET + (0x1f * 0x20),
+                .flags = IORESOURCE_MEM,
+        },
+        [2] = {
+                .start = IRQ_ASIX,
+                .end   = IRQ_ASIX,
+                .flags = IORESOURCE_IRQ
+        }
+};
+static struct platform_device bast_device_asix = {
+        .name           = "ax88796",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(bast_asix_resource),
+        .resource       = bast_asix_resource,
+        .dev            = {
+                .platform_data = &bast_asix_platdata
+        }
+};
+/* Asix AX88796 10/100 ethernet controller parallel port */
+static struct resource bast_asixpp_resource[] = {
+        [0] = {
+                .start = S3C2410_CS5 + BAST_PA_ASIXNET + (0x18 * 0x20),
+                .end   = S3C2410_CS5 + BAST_PA_ASIXNET + (0x1b * 0x20) - 1,
+                .flags = IORESOURCE_MEM,
+        }
+};
+static struct platform_device bast_device_axpp = {
+        .name           = "ax88796-pp",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(bast_asixpp_resource),
+        .resource       = bast_asixpp_resource,
+};
+/* LCD/VGA controller */
 static struct s3c2410fb_mach_info __initdata bast_lcd_info = {
        .width          = 640,
@@ -453,6 +510,8 @@ static struct platform_device *bast_devices[] __initdata = {
        &s3c_device_nand,
        &bast_device_nor,
        &bast_device_dm9k,
+        &bast_device_asix,
+        &bast_device_axpp,
        &bast_sio,
 };
diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c
index bff7ddd06a..29c163d300 100644
--- a/arch/arm/mach-s3c2440/mach-anubis.c
+++ b/arch/arm/mach-s3c2440/mach-anubis.c
@@ -18,6 +18,9 @@
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
+#include <linux/sm501.h>
+#include <linux/sm501-regs.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
@@ -42,6 +45,8 @@
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
+#include <net/ax88796.h>
 #include <asm/plat-s3c24xx/clock.h>
 #include <asm/plat-s3c24xx/devs.h>
 #include <asm/plat-s3c24xx/cpu.h>
@@ -153,6 +158,29 @@ static struct mtd_partition anubis_default_nand_part[] = {
        }
 };
+static struct mtd_partition anubis_default_nand_part_large[] = {
+        [0] = {
+                .name   = "Boot Agent",
+                .size   = SZ_128K,
+                .offset = 0,
+        },
+        [1] = {
+                .name   = "/boot",
+                .size   = SZ_4M - SZ_128K,
+                .offset = SZ_128K,
+        },
+        [2] = {
+                .name   = "user1",
+                .offset = SZ_4M,
+                .size   = SZ_32M - SZ_4M,
+        },
+        [3] = {
+                .name   = "user2",
+                .offset = SZ_32M,
+                .size   = MTDPART_SIZ_FULL,
+        }
+};
 /* the Anubis has 3 selectable slots for nand-flash, the two
 * on-board chip areas, as well as the external slot.
 *
@@ -260,6 +288,104 @@ static struct platform_device anubis_device_ide1 = {
        .resource       = anubis_ide1_resource,
 };
+/* Asix AX88796 10/100 ethernet controller */
+static struct ax_plat_data anubis_asix_platdata = {
+        .flags          = AXFLG_MAC_FROMDEV,
+        .wordlength     = 2,
+        .dcr_val        = 0x48,
+        .rcr_val        = 0x40,
+};
+static struct resource anubis_asix_resource[] = {
+        [0] = {
+                .start = S3C2410_CS5,
+                .end   = S3C2410_CS5 + (0x20 * 0x20) -1,
+                .flags = IORESOURCE_MEM
+        },
+        [1] = {
+                .start = IRQ_ASIX,
+                .end   = IRQ_ASIX,
+                .flags = IORESOURCE_IRQ
+        }
+};
+static struct platform_device anubis_device_asix = {
+        .name           = "ax88796",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(anubis_asix_resource),
+        .resource       = anubis_asix_resource,
+        .dev            = {
+                .platform_data = &anubis_asix_platdata,
+        }
+};
+/* SM501 */
+static struct resource anubis_sm501_resource[] = {
+        [0] = {
+                .start  = S3C2410_CS2,
+                .end    = S3C2410_CS2 + SZ_8M,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = S3C2410_CS2 + SZ_64M - SZ_2M,
+                .end    = S3C2410_CS2 + SZ_64M - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [2] = {
+                .start  = IRQ_EINT0,
+                .end    = IRQ_EINT0,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static struct sm501_initdata anubis_sm501_initdata = {
+        .gpio_high      = {
+                .set    = 0x3F000000,           /* 24bit panel */
+                .mask   = 0x0,
+        },
+        .misc_timing    = {
+                .set    = 0x010100,             /* SDRAM timing */
+                .mask   = 0x1F1F00,
+        },
+        .misc_control   = {
+                .set    = SM501_MISC_PNL_24BIT,
+                .mask   = 0,
+        },
+        /* set the SDRAM and bus clocks */
+        .mclk           = 72 * MHZ,
+        .m1xclk         = 144 * MHZ,
+};
+static struct sm501_platdata_gpio_i2c anubis_sm501_gpio_i2c[] = {
+        [0] = {
+                .pin_scl        = 44,
+                .pin_sda        = 45,
+        },
+        [1] = {
+                .pin_scl        = 40,
+                .pin_sda        = 41,
+        },
+};
+static struct sm501_platdata anubis_sm501_platdata = {
+        .init           = &anubis_sm501_initdata,
+        .gpio_i2c       = anubis_sm501_gpio_i2c,
+        .gpio_i2c_nr    = ARRAY_SIZE(anubis_sm501_gpio_i2c),
+};
+static struct platform_device anubis_device_sm501 = {
+        .name           = "sm501",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(anubis_sm501_resource),
+        .resource       = anubis_sm501_resource,
+        .dev            = {
+                .platform_data = &anubis_sm501_platdata,
+        },
+};
 /* Standard Anubis devices */
 static struct platform_device *anubis_devices[] __initdata = {
@@ -271,6 +397,8 @@ static struct platform_device *anubis_devices[] __initdata = {
        &s3c_device_nand,
        &anubis_device_ide0,
        &anubis_device_ide1,
+        &anubis_device_asix,
+        &anubis_device_sm501,
 };
 static struct clk *anubis_clocks[] = {
@@ -304,8 +432,17 @@ static void __init anubis_map_io(void)
        s3c24xx_init_clocks(0);
        s3c24xx_init_uarts(anubis_uartcfgs, ARRAY_SIZE(anubis_uartcfgs));
-        /* ensure that the GPIO is setup */
+        /* check for the newer revision boards with large page nand */
-        s3c2410_gpio_setpin(S3C2410_GPA0, 1);
+        if ((__raw_readb(ANUBIS_VA_IDREG) & ANUBIS_IDREG_REVMASK) >= 4) {
+                printk(KERN_INFO "ANUBIS-B detected (revision %d)\n",
+                       __raw_readb(ANUBIS_VA_IDREG) & ANUBIS_IDREG_REVMASK);
+                anubis_nand_sets[0].partitions = anubis_default_nand_part_large;
+                anubis_nand_sets[0].nr_partitions = ARRAY_SIZE(anubis_default_nand_part_large);
+        } else {
+                /* ensure that the GPIO is setup */
+                s3c2410_gpio_setpin(S3C2410_GPA0, 1);
+        }
 }
 static void __init anubis_init(void)
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c
index 15811601f0..89f4c9c577 100644
--- a/arch/arm/mach-s3c2440/mach-osiris.c
+++ b/arch/arm/mach-s3c2440/mach-osiris.c
@@ -166,6 +166,29 @@ static struct mtd_partition osiris_default_nand_part[] = {
        }
 };
+static struct mtd_partition osiris_default_nand_part_large[] = {
+        [0] = {
+                .name   = "Boot Agent",
+                .size   = SZ_128K,
+                .offset = 0,
+        },
+        [1] = {
+                .name   = "/boot",
+                .size   = SZ_4M - SZ_128K,
+                .offset = SZ_128K,
+        },
+        [2] = {
+                .name   = "user1",
+                .offset = SZ_4M,
+                .size   = SZ_32M - SZ_4M,
+        },
+        [3] = {
+                .name   = "user2",
+                .offset = SZ_32M,
+                .size   = MTDPART_SIZ_FULL,
+        }
+};
 /* the Osiris has 3 selectable slots for nand-flash, the two
 * on-board chip areas, as well as the external slot.
 *
@@ -322,14 +345,23 @@ static void __init osiris_map_io(void)
        s3c24xx_init_clocks(0);
        s3c24xx_init_uarts(osiris_uartcfgs, ARRAY_SIZE(osiris_uartcfgs));
+        /* check for the newer revision boards with large page nand */
+        if ((__raw_readb(OSIRIS_VA_IDREG) & OSIRIS_ID_REVMASK) >= 4) {
+                printk(KERN_INFO "OSIRIS-B detected (revision %d)\n",
+                       __raw_readb(OSIRIS_VA_IDREG) & OSIRIS_ID_REVMASK);
+                osiris_nand_sets[0].partitions = osiris_default_nand_part_large;
+                osiris_nand_sets[0].nr_partitions = ARRAY_SIZE(osiris_default_nand_part_large);
+        } else {
+                /* write-protect line to the NAND */
+                s3c2410_gpio_setpin(S3C2410_GPA0, 1);
+        }
        /* fix bus configuration (nBE settings wrong on ABLE pre v2.20) */
        local_irq_save(flags);
        __raw_writel(__raw_readl(S3C2410_BWSCON) | S3C2410_BWSCON_ST1 | S3C2410_BWSCON_ST2 | S3C2410_BWSCON_ST3 | S3C2410_BWSCON_ST4 | S3C2410_BWSCON_ST5, S3C2410_BWSCON);
        local_irq_restore(flags);
-        /* write-protect line to the NAND */
-        s3c2410_gpio_setpin(S3C2410_GPA0, 1);
 }
 static void __init osiris_init(void)
diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c
index 4cbf9468f6..3a0a1ee254 100644
--- a/arch/arm/mach-sa1100/neponset.c
+++ b/arch/arm/mach-sa1100/neponset.c
@@ -185,28 +185,21 @@ static int __devinit neponset_probe(struct platform_device *dev)
 /*
 * LDM power management.
 */
+static unsigned int neponset_saved_state;
 static int neponset_suspend(struct platform_device *dev, pm_message_t state)
 {
        /*
         * Save state.
         */
-        if (!dev->dev.power.saved_state)
+        neponset_saved_state = NCR_0;
-                dev->dev.power.saved_state = kmalloc(sizeof(unsigned int), GFP_KERNEL);
-        if (!dev->dev.power.saved_state)
-                return -ENOMEM;
-        *(unsigned int *)dev->dev.power.saved_state = NCR_0;
        return 0;
 }
 static int neponset_resume(struct platform_device *dev)
 {
-        if (dev->dev.power.saved_state) {
+        NCR_0 = neponset_saved_state;
-                NCR_0 = *(unsigned int *)dev->dev.power.saved_state;
-                kfree(dev->dev.power.saved_state);
-                dev->dev.power.saved_state = NULL;
-        }
        return 0;
 }
diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c
index d674cf3431..01a37d3c07 100644
--- a/arch/arm/mach-sa1100/pm.c
+++ b/arch/arm/mach-sa1100/pm.c
@@ -57,12 +57,7 @@ enum {	SLEEP_SAVE_SP = 0,
 static int sa11x0_pm_enter(suspend_state_t state)
 {
        unsigned long gpio, sleep_save[SLEEP_SAVE_SIZE];
-        struct timespec delta, rtc;
-        /* preserve current time */
-        rtc.tv_sec = RCNR;
-        rtc.tv_nsec = 0;
-        save_time_delta(&delta, &rtc);
        gpio = GPLR;
        /* save vital registers */
@@ -119,10 +114,6 @@ static int sa11x0_pm_enter(suspend_state_t state)
         */
        PSSR = PSSR_PH;
-        /* restore current time */
-        rtc.tv_sec = RCNR;
-        restore_time_delta(&delta, &rtc);
        return 0;
 }
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
index 29cb0c1604..fdf7b016e7 100644
--- a/arch/arm/mach-sa1100/time.c
+++ b/arch/arm/mach-sa1100/time.c
@@ -21,25 +21,6 @@
 #define RTC_DEF_DIVIDER         (32768 - 1)
 #define RTC_DEF_TRIM            0
-static unsigned long __init sa1100_get_rtc_time(void)
-{
-        /*
-         * According to the manual we should be able to let RTTR be zero
-         * and then a default divisor for a 32.768KHz clock is used.
-         * Apparently this doesn't work, at least for my SA1110 rev 5.
-         * If the clock divider is uninitialized then reset it to the
-         * default value to get the 1Hz clock.
-         */
-        if (RTTR == 0) {
-                RTTR = RTC_DEF_DIVIDER + (RTC_DEF_TRIM << 16);
-                printk(KERN_WARNING "Warning: uninitialized Real Time Clock\n");
-                /* The current RTC value probably doesn't make sense either */
-                RCNR = 0;
-                return 0;
-        }
-        return RCNR;
-}
 static int sa1100_set_rtc(void)
 {
        unsigned long current_time = xtime.tv_sec;
@@ -117,15 +98,10 @@ static struct irqaction sa1100_timer_irq = {
 static void __init sa1100_timer_init(void)
 {
-        struct timespec tv;
        unsigned long flags;
        set_rtc = sa1100_set_rtc;
-        tv.tv_nsec = 0;
-        tv.tv_sec = sa1100_get_rtc_time();
-        do_settimeofday(&tv);
        OIER = 0;               /* disable any timer interrupts */
        OSSR = 0xf;             /* clear status on all timers */
        setup_irq(IRQ_OST0, &sa1100_timer_irq);
diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c
index ba58223f12..ca82901594 100644
--- a/arch/arm/mach-versatile/pci.c
+++ b/arch/arm/mach-versatile/pci.c
@@ -117,7 +117,10 @@ static int versatile_read_config(struct pci_bus *bus, unsigned int devfn, int wh
        } else {
                switch (size) {
                case 1:
-                        v = __raw_readb(addr);
+                        v = __raw_readl(addr);
+                        if (where & 2) v >>= 16;
+                        if (where & 1) v >>= 8;
+                        v &= 0xff;
                        break;
                case 2:
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index f3ade18862..75952779ce 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -280,7 +280,10 @@ __arm_ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size,
        if (!type)
                return NULL;
-        size = PAGE_ALIGN(size);
+        /*
+         * Page align the mapping size, taking account of any offset.
+         */
+        size = PAGE_ALIGN(offset + size);
        area = get_vm_area(size, VM_IOREMAP);
        if (!area)
@@ -325,11 +328,6 @@ __arm_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype)
        if (!size || last_addr < phys_addr)
                return NULL;
-        /*
-         * Page align the mapping size
-         */
-        size = PAGE_ALIGN(last_addr + 1) - phys_addr;
        return __arm_ioremap_pfn(pfn, offset, size, mtype);
 }
 EXPORT_SYMBOL(__arm_ioremap);
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 02e050ae59..3b5e47dc0c 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -527,9 +527,9 @@ void __init create_mapping(struct map_desc *md)
                return;
        }
-        addr = md->virtual;
+        addr = md->virtual & PAGE_MASK;
        phys = (unsigned long)__pfn_to_phys(md->pfn);
-        length = PAGE_ALIGN(md->length);
+        length = PAGE_ALIGN(md->length + (md->virtual & ~PAGE_MASK));
        if (type->prot_l1 == 0 && ((addr | phys | length) & ~SECTION_MASK)) {
                printk(KERN_WARNING "BUG: map for 0x%08lx at 0x%08lx can not "
diff --git a/arch/arm/plat-iop/Makefile b/arch/arm/plat-iop/Makefile
index 4d2b1da3cd..36bff03259 100644
--- a/arch/arm/plat-iop/Makefile
+++ b/arch/arm/plat-iop/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_ARCH_IOP32X) += setup.o
 obj-$(CONFIG_ARCH_IOP32X) += time.o
 obj-$(CONFIG_ARCH_IOP32X) += io.o
 obj-$(CONFIG_ARCH_IOP32X) += cp6.o
+obj-$(CONFIG_ARCH_IOP32X) += adma.o
 # IOP33X
 obj-$(CONFIG_ARCH_IOP33X) += gpio.o
@@ -21,6 +22,7 @@ obj-$(CONFIG_ARCH_IOP33X) += setup.o
 obj-$(CONFIG_ARCH_IOP33X) += time.o
 obj-$(CONFIG_ARCH_IOP33X) += io.o
 obj-$(CONFIG_ARCH_IOP33X) += cp6.o
+obj-$(CONFIG_ARCH_IOP33X) += adma.o
 # IOP13XX
 obj-$(CONFIG_ARCH_IOP13XX) += cp6.o
diff --git a/arch/arm/plat-iop/adma.c b/arch/arm/plat-iop/adma.c
new file mode 100644
index 0000000000..53c5e9a52e
--- /dev/null
+++ b/arch/arm/plat-iop/adma.c
@@ -0,0 +1,209 @@
+/*
+ * platform device definitions for the iop3xx dma/xor engines
+ * Copyright © 2006, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#include <linux/platform_device.h>
+#include <asm/hardware/iop3xx.h>
+#include <linux/dma-mapping.h>
+#include <asm/arch/adma.h>
+#include <asm/hardware/iop_adma.h>
+#ifdef CONFIG_ARCH_IOP32X
+#define IRQ_DMA0_EOT IRQ_IOP32X_DMA0_EOT
+#define IRQ_DMA0_EOC IRQ_IOP32X_DMA0_EOC
+#define IRQ_DMA0_ERR IRQ_IOP32X_DMA0_ERR
+#define IRQ_DMA1_EOT IRQ_IOP32X_DMA1_EOT
+#define IRQ_DMA1_EOC IRQ_IOP32X_DMA1_EOC
+#define IRQ_DMA1_ERR IRQ_IOP32X_DMA1_ERR
+#define IRQ_AA_EOT IRQ_IOP32X_AA_EOT
+#define IRQ_AA_EOC IRQ_IOP32X_AA_EOC
+#define IRQ_AA_ERR IRQ_IOP32X_AA_ERR
+#endif
+#ifdef CONFIG_ARCH_IOP33X
+#define IRQ_DMA0_EOT IRQ_IOP33X_DMA0_EOT
+#define IRQ_DMA0_EOC IRQ_IOP33X_DMA0_EOC
+#define IRQ_DMA0_ERR IRQ_IOP33X_DMA0_ERR
+#define IRQ_DMA1_EOT IRQ_IOP33X_DMA1_EOT
+#define IRQ_DMA1_EOC IRQ_IOP33X_DMA1_EOC
+#define IRQ_DMA1_ERR IRQ_IOP33X_DMA1_ERR
+#define IRQ_AA_EOT IRQ_IOP33X_AA_EOT
+#define IRQ_AA_EOC IRQ_IOP33X_AA_EOC
+#define IRQ_AA_ERR IRQ_IOP33X_AA_ERR
+#endif
+/* AAU and DMA Channels */
+static struct resource iop3xx_dma_0_resources[] = {
+        [0] = {
+                .start = IOP3XX_DMA_PHYS_BASE(0),
+                .end = IOP3XX_DMA_UPPER_PA(0),
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_DMA0_EOT,
+                .end = IRQ_DMA0_EOT,
+                .flags = IORESOURCE_IRQ
+        },
+        [2] = {
+                .start = IRQ_DMA0_EOC,
+                .end = IRQ_DMA0_EOC,
+                .flags = IORESOURCE_IRQ
+        },
+        [3] = {
+                .start = IRQ_DMA0_ERR,
+                .end = IRQ_DMA0_ERR,
+                .flags = IORESOURCE_IRQ
+        }
+};
+static struct resource iop3xx_dma_1_resources[] = {
+        [0] = {
+                .start = IOP3XX_DMA_PHYS_BASE(1),
+                .end = IOP3XX_DMA_UPPER_PA(1),
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_DMA1_EOT,
+                .end = IRQ_DMA1_EOT,
+                .flags = IORESOURCE_IRQ
+        },
+        [2] = {
+                .start = IRQ_DMA1_EOC,
+                .end = IRQ_DMA1_EOC,
+                .flags = IORESOURCE_IRQ
+        },
+        [3] = {
+                .start = IRQ_DMA1_ERR,
+                .end = IRQ_DMA1_ERR,
+                .flags = IORESOURCE_IRQ
+        }
+};
+static struct resource iop3xx_aau_resources[] = {
+        [0] = {
+                .start = IOP3XX_AAU_PHYS_BASE,
+                .end = IOP3XX_AAU_UPPER_PA,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_AA_EOT,
+                .end = IRQ_AA_EOT,
+                .flags = IORESOURCE_IRQ
+        },
+        [2] = {
+                .start = IRQ_AA_EOC,
+                .end = IRQ_AA_EOC,
+                .flags = IORESOURCE_IRQ
+        },
+        [3] = {
+                .start = IRQ_AA_ERR,
+                .end = IRQ_AA_ERR,
+                .flags = IORESOURCE_IRQ
+        }
+};
+static u64 iop3xx_adma_dmamask = DMA_32BIT_MASK;
+static struct iop_adma_platform_data iop3xx_dma_0_data = {
+        .hw_id = DMA0_ID,
+        .pool_size = PAGE_SIZE,
+};
+static struct iop_adma_platform_data iop3xx_dma_1_data = {
+        .hw_id = DMA1_ID,
+        .pool_size = PAGE_SIZE,
+};
+static struct iop_adma_platform_data iop3xx_aau_data = {
+        .hw_id = AAU_ID,
+        .pool_size = 3 * PAGE_SIZE,
+};
+struct platform_device iop3xx_dma_0_channel = {
+        .name = "iop-adma",
+        .id = 0,
+        .num_resources = 4,
+        .resource = iop3xx_dma_0_resources,
+        .dev = {
+                .dma_mask = &iop3xx_adma_dmamask,
+                .coherent_dma_mask = DMA_64BIT_MASK,
+                .platform_data = (void *) &iop3xx_dma_0_data,
+        },
+};
+struct platform_device iop3xx_dma_1_channel = {
+        .name = "iop-adma",
+        .id = 1,
+        .num_resources = 4,
+        .resource = iop3xx_dma_1_resources,
+        .dev = {
+                .dma_mask = &iop3xx_adma_dmamask,
+                .coherent_dma_mask = DMA_64BIT_MASK,
+                .platform_data = (void *) &iop3xx_dma_1_data,
+        },
+};
+struct platform_device iop3xx_aau_channel = {
+        .name = "iop-adma",
+        .id = 2,
+        .num_resources = 4,
+        .resource = iop3xx_aau_resources,
+        .dev = {
+                .dma_mask = &iop3xx_adma_dmamask,
+                .coherent_dma_mask = DMA_64BIT_MASK,
+                .platform_data = (void *) &iop3xx_aau_data,
+        },
+};
+static int __init iop3xx_adma_cap_init(void)
+{
+        #ifdef CONFIG_ARCH_IOP32X /* the 32x DMA does not perform CRC32C */
+        dma_cap_set(DMA_MEMCPY, iop3xx_dma_0_data.cap_mask);
+        dma_cap_set(DMA_INTERRUPT, iop3xx_dma_0_data.cap_mask);
+        #else
+        dma_cap_set(DMA_MEMCPY, iop3xx_dma_0_data.cap_mask);
+        dma_cap_set(DMA_MEMCPY_CRC32C, iop3xx_dma_0_data.cap_mask);
+        dma_cap_set(DMA_INTERRUPT, iop3xx_dma_0_data.cap_mask);
+        #endif
+        #ifdef CONFIG_ARCH_IOP32X /* the 32x DMA does not perform CRC32C */
+        dma_cap_set(DMA_MEMCPY, iop3xx_dma_1_data.cap_mask);
+        dma_cap_set(DMA_INTERRUPT, iop3xx_dma_1_data.cap_mask);
+        #else
+        dma_cap_set(DMA_MEMCPY, iop3xx_dma_1_data.cap_mask);
+        dma_cap_set(DMA_MEMCPY_CRC32C, iop3xx_dma_1_data.cap_mask);
+        dma_cap_set(DMA_INTERRUPT, iop3xx_dma_1_data.cap_mask);
+        #endif
+        #ifdef CONFIG_ARCH_IOP32X /* the 32x AAU does not perform zero sum */
+        dma_cap_set(DMA_XOR, iop3xx_aau_data.cap_mask);
+        dma_cap_set(DMA_MEMSET, iop3xx_aau_data.cap_mask);
+        dma_cap_set(DMA_INTERRUPT, iop3xx_aau_data.cap_mask);
+        #else
+        dma_cap_set(DMA_XOR, iop3xx_aau_data.cap_mask);
+        dma_cap_set(DMA_ZERO_SUM, iop3xx_aau_data.cap_mask);
+        dma_cap_set(DMA_MEMSET, iop3xx_aau_data.cap_mask);
+        dma_cap_set(DMA_INTERRUPT, iop3xx_aau_data.cap_mask);
+        #endif
+        return 0;
+}
+arch_initcall(iop3xx_adma_cap_init);
diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig
index 20688bc13e..9044f33299 100644
--- a/arch/arm26/Kconfig
+++ b/arch/arm26/Kconfig
@@ -17,6 +17,9 @@ config MMU
        bool
        default y
+config NO_DMA
+        def_bool y
 config ARCH_ACORN
        bool
        default y
diff --git a/arch/arm26/defconfig b/arch/arm26/defconfig
index c4a89703c3..2b7d44bf49 100644
--- a/arch/arm26/defconfig
+++ b/arch/arm26/defconfig
@@ -248,7 +248,6 @@ CONFIG_I2C_CHARDEV=y
 # CONFIG_JBD_DEBUG is not set
 # CONFIG_FAT_FS is not set
 # CONFIG_MSDOS_FS is not set
-# CONFIG_UMSDOS_FS is not set
 # CONFIG_VFAT_FS is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS_FS is not set
diff --git a/arch/arm26/kernel/ptrace.c b/arch/arm26/kernel/ptrace.c
index 4169279567..0fefb86970 100644
--- a/arch/arm26/kernel/ptrace.c
+++ b/arch/arm26/kernel/ptrace.c
@@ -531,7 +531,6 @@ static int ptrace_setfpregs(struct task_struct *tsk, void *ufp)
 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 {
-        unsigned long tmp;
        int ret;
        switch (request) {
@@ -540,12 +539,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 */
                case PTRACE_PEEKTEXT:
                case PTRACE_PEEKDATA:
-                        ret = access_process_vm(child, addr, &tmp,
+                        ret = generic_ptrace_peekdata(child, addr, data);
-                                                sizeof(unsigned long), 0);
-                        if (ret == sizeof(unsigned long))
-                                ret = put_user(tmp, (unsigned long *) data);
-                        else
-                                ret = -EIO;
                        break;
                case PTRACE_PEEKUSR:
@@ -557,12 +551,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 */
                case PTRACE_POKETEXT:
                case PTRACE_POKEDATA:
-                        ret = access_process_vm(child, addr, &data,
+                        ret = generic_ptrace_pokedata(child, addr, data);
-                                                sizeof(unsigned long), 1);
-                        if (ret == sizeof(unsigned long))
-                                ret = 0;
-                        else
-                                ret = -EIO;
                        break;
                case PTRACE_POKEUSR:
diff --git a/arch/arm26/kernel/traps.c b/arch/arm26/kernel/traps.c
index d594fb59e9..2911e2eae8 100644
--- a/arch/arm26/kernel/traps.c
+++ b/arch/arm26/kernel/traps.c
@@ -185,6 +185,7 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
        printk("Internal error: %s: %x\n", str, err);
        printk("CPU: %d\n", smp_processor_id());
        show_regs(regs);
+        add_taint(TAINT_DIE);
        printk("Process %s (pid: %d, stack limit = 0x%p)\n",
                current->comm, current->pid, end_of_stack(tsk));
diff --git a/arch/arm26/mm/init.c b/arch/arm26/mm/init.c
index 562fac12eb..36e7ee3f83 100644
--- a/arch/arm26/mm/init.c
+++ b/arch/arm26/mm/init.c
@@ -33,9 +33,6 @@
 #include <asm/map.h>
-#define TABLE_SIZE      PTRS_PER_PTE * sizeof(pte_t))
 struct mmu_gather mmu_gathers[NR_CPUS];
 extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 3ec7658687..d12346aaa8 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -113,6 +113,10 @@ config BOARD_ATNGW100
        bool "ATNGW100 Network Gateway"
 endchoice
+if BOARD_ATSTK1000
+source "arch/avr32/boards/atstk1000/Kconfig"
+endif
 choice
        prompt "Boot loader type"
        default LOADER_U_BOOT
@@ -185,6 +189,27 @@ config CMDLINE
 endmenu
+menu "Power managment options"
+menu "CPU Frequency scaling"
+source "drivers/cpufreq/Kconfig"
+config CPU_FREQ_AT32AP
+        bool "CPU frequency driver for AT32AP"
+        depends on CPU_FREQ && PLATFORM_AT32AP
+        default n
+        help
+          This enables the CPU frequency driver for AT32AP processors.
+          For details, take a look in <file:Documentation/cpu-freq>.
+          If in doubt, say N.
+endmenu
+endmenu
 menu "Bus options"
 config PCI
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
index 9bc37d4f66..6c4dc0a00e 100644
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@ -94,9 +94,6 @@ static void __init set_hw_addr(struct platform_device *pdev)
        clk_put(pclk);
 }
-struct platform_device *at32_usart_map[1];
-unsigned int at32_nr_usarts = 1;
 void __init setup_board(void)
 {
        at32_map_usart(1, 0);   /* USART 1: /dev/ttyS0, DB9 */
diff --git a/arch/avr32/boards/atstk1000/Kconfig b/arch/avr32/boards/atstk1000/Kconfig
new file mode 100644
index 0000000000..71bc7d364f
--- /dev/null
+++ b/arch/avr32/boards/atstk1000/Kconfig
@@ -0,0 +1,53 @@
+# STK1000 customization
+if BOARD_ATSTK1002
+config BOARD_ATSTK1002_CUSTOM
+        bool "Non-default STK-1002 jumper settings"
+        help
+          You will normally leave the jumpers on the CPU card at their
+          default settings.  If you need to use certain peripherals,
+          you will need to change some of those jumpers.
+if BOARD_ATSTK1002_CUSTOM
+config BOARD_ATSTK1002_SW1_CUSTOM
+        bool "SW1: use SSC1 (not SPI0)"
+        help
+          This also prevents using the external DAC as an audio interface,
+          and means you can't initialize the on-board QVGA display.
+config BOARD_ATSTK1002_SW2_CUSTOM
+        bool "SW2: use IRDA or TIMER0 (not UART-A, MMC/SD, and PS2-A)"
+        help
+          If you change this you'll want an updated boot loader putting
+          the console on UART-C not UART-A.
+config BOARD_ATSTK1002_SW3_CUSTOM
+        bool "SW3: use TIMER1 (not SSC0 and GCLK)"
+        help
+          This also prevents using the external DAC as an audio interface.
+config BOARD_ATSTK1002_SW4_CUSTOM
+        bool "SW4: use ISI/Camera (not GPIOs, SPI1, and PS2-B)"
+        help
+          To use the camera interface you'll need a custom card (on the
+          PCI-format connector) connect a video sensor.
+config BOARD_ATSTK1002_SW5_CUSTOM
+        bool "SW5: use MACB1 (not LCDC)"
+config BOARD_ATSTK1002_SW6_CUSTOM
+        bool "SW6: more GPIOs (not MACB0)"
+endif   # custom
+config BOARD_ATSTK1002_SPI1
+        bool "Configure SPI1 controller"
+        depends on !BOARD_ATSTK1002_SW4_CUSTOM
+        help
+          All the signals for the second SPI controller are available on
+          GPIO lines and accessed through the J1 jumper block.  Say "y"
+          here to configure that SPI controller.
+endif   # stk 1002
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index e253e86a1a..cb93eabb9c 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -27,15 +27,27 @@
 #include "atstk1000.h"
-#define SW2_DEFAULT             /* MMCI and UART_A available */
 struct eth_addr {
        u8 addr[6];
 };
 static struct eth_addr __initdata hw_addr[2];
-static struct eth_platform_data __initdata eth_data[2];
+static struct eth_platform_data __initdata eth_data[2] = {
+        {
+                /*
+                 * The MDIO pullups on STK1000 are a bit too weak for
+                 * the autodetection to work properly, so we have to
+                 * mask out everything but the correct address.
+                 */
+                .phy_mask       = ~(1U << 16),
+        },
+        {
+                .phy_mask       = ~(1U << 17),
+        },
+};
+#ifndef CONFIG_BOARD_ATSTK1002_SW1_CUSTOM
 static struct spi_board_info spi0_board_info[] __initdata = {
        {
                /* QVGA display */
@@ -45,6 +57,13 @@ static struct spi_board_info spi0_board_info[] __initdata = {
                .mode           = SPI_MODE_3,
        },
 };
+#endif
+#ifdef CONFIG_BOARD_ATSTK1002_SPI1
+static struct spi_board_info spi1_board_info[] __initdata = { {
+        /* patch in custom entries here */
+} };
+#endif
 /*
 * The next two functions should go away as the boot loader is
@@ -103,10 +122,10 @@ static void __init set_hw_addr(struct platform_device *pdev)
 void __init setup_board(void)
 {
-#ifdef  SW2_DEFAULT
+#ifdef  CONFIG_BOARD_ATSTK1002_SW2_CUSTOM
-        at32_map_usart(1, 0);   /* USART 1/A: /dev/ttyS0, DB9 */
-#else
        at32_map_usart(0, 1);   /* USART 0/B: /dev/ttyS1, IRDA */
+#else
+        at32_map_usart(1, 0);   /* USART 1/A: /dev/ttyS0, DB9 */
 #endif
        /* USART 2/unused: expansion connector */
        at32_map_usart(3, 2);   /* USART 3/C: /dev/ttyS2, DB9 */
@@ -140,18 +159,31 @@ static int __init atstk1002_init(void)
        at32_add_system_devices();
-#ifdef  SW2_DEFAULT
+#ifdef  CONFIG_BOARD_ATSTK1002_SW2_CUSTOM
-        at32_add_device_usart(0);
-#else
        at32_add_device_usart(1);
+#else
+        at32_add_device_usart(0);
 #endif
        at32_add_device_usart(2);
+#ifndef CONFIG_BOARD_ATSTK1002_SW6_CUSTOM
        set_hw_addr(at32_add_device_eth(0, &eth_data[0]));
+#endif
+#ifndef CONFIG_BOARD_ATSTK1002_SW1_CUSTOM
        at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));
+#endif
+#ifdef CONFIG_BOARD_ATSTK1002_SPI1
+        at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));
+#endif
+#ifdef CONFIG_BOARD_ATSTK1002_SW5_CUSTOM
+        set_hw_addr(at32_add_device_eth(1, &eth_data[1]));
+#else
        at32_add_device_lcdc(0, &atstk1000_lcdc_data,
                             fbmem_start, fbmem_size);
+#endif
+#ifndef CONFIG_BOARD_ATSTK1002_SW3_CUSTOM
+        at32_add_device_ssc(0, ATMEL_SSC_TX);
+#endif
        return 0;
 }
diff --git a/arch/avr32/configs/atngw100_defconfig b/arch/avr32/configs/atngw100_defconfig
index c254ffcfa4..49493ad3b5 100644
--- a/arch/avr32/configs/atngw100_defconfig
+++ b/arch/avr32/configs/atngw100_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc6
+# Linux kernel version: 2.6.22-rc5
-# Thu Apr 12 16:35:07 2007
+# Sat Jun 23 15:40:05 2007
 #
 CONFIG_AVR32=y
 CONFIG_GENERIC_GPIO=y
@@ -40,6 +40,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -57,14 +58,20 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 # CONFIG_BASE_FULL is not set
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=1
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -148,6 +155,7 @@ CONFIG_CMDLINE=""
 #
 # Bus options
 #
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -168,7 +176,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
@@ -212,14 +219,11 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-#
-# IP: Virtual Server Configuration
-#
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
 CONFIG_INET6_AH=y
 CONFIG_INET6_ESP=y
 CONFIG_INET6_IPCOMP=y
@@ -242,8 +246,6 @@ CONFIG_NETFILTER=y
 #
 # CONFIG_NETFILTER_NETLINK is not set
 CONFIG_NF_CONNTRACK_ENABLED=m
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
@@ -357,20 +359,8 @@ CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_RAW=m
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -397,7 +387,16 @@ CONFIG_NET_CLS_ROUTE=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -417,10 +416,6 @@ CONFIG_STANDALONE=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -464,7 +459,6 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 #
 # Mapping drivers for chip access
@@ -492,16 +486,13 @@ CONFIG_MTD_DATAFLASH=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
 #
-# OneNAND Flash Device Drivers
+# UBI - Unsorted block images
 #
-# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_UBI is not set
 #
 # Parallel port support
@@ -530,10 +521,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # Misc devices
 #
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -542,10 +530,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -554,19 +538,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_MD is not set
 #
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-#
-# IEEE 1394 (FireWire) support
-#
-#
-# I2O device support
-#
-#
 # Network device support
 #
 CONFIG_NETDEVICES=y
@@ -574,10 +545,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 #
@@ -586,27 +553,14 @@ CONFIG_TUN=m
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_MACB=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
 #
-# Ethernet (1000 Mbit)
+# Wireless LAN
-#
-#
-# Ethernet (10000 Mbit)
-#
-#
-# Token Ring devices
-#
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
@@ -671,15 +625,10 @@ CONFIG_UNIX98_PTYS=y
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
 # CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
@@ -687,10 +636,6 @@ CONFIG_UNIX98_PTYS=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -710,17 +655,13 @@ CONFIG_SPI_ATMEL=y
 # SPI Protocol Masters
 #
 # CONFIG_SPI_AT25 is not set
+# CONFIG_SPI_SPIDEV is not set
 #
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 # CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multifunction device drivers
@@ -731,16 +672,19 @@ CONFIG_SPI_ATMEL=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 #
@@ -763,10 +707,6 @@ CONFIG_SPI_ATMEL=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -809,14 +749,6 @@ CONFIG_SPI_ATMEL=y
 #
 #
-# Auxiliary Display support
-#
-#
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -911,6 +843,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
@@ -993,11 +926,9 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
@@ -1044,6 +975,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
@@ -1072,6 +1004,7 @@ CONFIG_CRYPTO_DEFLATE=y
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
@@ -1083,3 +1016,4 @@ CONFIG_TEXTSEARCH_FSM=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig
index 77dace9d54..3b977fdbaa 100644
--- a/arch/avr32/configs/atstk1002_defconfig
+++ b/arch/avr32/configs/atstk1002_defconfig
@@ -1,9 +1,10 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-rc6
+# Linux kernel version: 2.6.22-rc5
-# Fri Jan 26 13:12:59 2007
+# Sat Jun 23 15:32:08 2007
 #
 CONFIG_AVR32=y
+CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -13,6 +14,7 @@ CONFIG_GENERIC_TIME=y
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_BUG=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 #
@@ -30,19 +32,22 @@ CONFIG_LOCALVERSION=""
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
+# CONFIG_TASK_XACCT is not set
 # CONFIG_UTS_NS is not set
 CONFIG_AUDIT=y
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_TASK_XACCT is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
 # CONFIG_SYSCTL_SYSCALL is not set
@@ -55,14 +60,20 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 # CONFIG_BASE_FULL is not set
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=1
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -105,7 +116,15 @@ CONFIG_PLATFORM_AT32AP=y
 CONFIG_CPU_AT32AP7000=y
 CONFIG_BOARD_ATSTK1002=y
 CONFIG_BOARD_ATSTK1000=y
+# CONFIG_BOARD_ATNGW100 is not set
 CONFIG_LOADER_U_BOOT=y
+#
+# Atmel AVR32 AP options
+#
+# CONFIG_AP7000_32_BIT_SMC is not set
+CONFIG_AP7000_16_BIT_SMC=y
+# CONFIG_AP7000_8_BIT_SMC is not set
 CONFIG_LOAD_ADDRESS=0x10000000
 CONFIG_ENTRY_ADDRESS=0x90000000
 CONFIG_PHYS_OFFSET=0x10000000
@@ -127,6 +146,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
 # CONFIG_OWNERSHIP_TRACE is not set
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
@@ -138,6 +158,7 @@ CONFIG_CMDLINE=""
 #
 # Bus options
 #
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -158,7 +179,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
@@ -194,20 +214,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -233,7 +241,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -246,16 +263,13 @@ CONFIG_STANDALONE=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_FW_LOADER is not set
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 #
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -299,7 +313,6 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 #
 # Mapping drivers for chip access
@@ -325,16 +338,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
 #
-# OneNAND Flash Device Drivers
+# UBI - Unsorted block images
 #
-# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_UBI is not set
 #
 # Parallel port support
@@ -344,6 +354,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -356,18 +367,13 @@ CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
-# CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -376,10 +382,6 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -388,19 +390,6 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_MD is not set
 #
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-#
-# IEEE 1394 (FireWire) support
-#
-#
-# I2O device support
-#
-#
 # Network device support
 #
 CONFIG_NETDEVICES=y
@@ -408,10 +397,6 @@ CONFIG_DUMMY=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 #
@@ -420,27 +405,14 @@ CONFIG_TUN=m
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_MACB=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
 #
-# Ethernet (1000 Mbit)
+# Wireless LAN
-#
-#
-# Ethernet (10000 Mbit)
-#
-#
-# Token Ring devices
-#
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
@@ -505,15 +477,10 @@ CONFIG_UNIX98_PTYS=y
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
 # CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
@@ -521,10 +488,6 @@ CONFIG_UNIX98_PTYS=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -537,29 +500,31 @@ CONFIG_UNIX98_PTYS=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
+# CONFIG_HWMON is not set
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
+# CONFIG_MFD_SM501 is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
 # Sound
@@ -581,10 +546,6 @@ CONFIG_UNIX98_PTYS=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -627,10 +588,6 @@ CONFIG_UNIX98_PTYS=y
 #
 #
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -712,8 +669,20 @@ CONFIG_JFFS2_RTIME=y
 #
 # Network File Systems
 #
-# CONFIG_NFS_FS is not set
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_CIFS is not set
 # CONFIG_NCP_FS is not set
@@ -787,15 +756,14 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -806,6 +774,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_FRAME_POINTER=y
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
 # CONFIG_KPROBES is not set
 #
@@ -825,10 +794,13 @@ CONFIG_FORCED_INLINING=y
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/avr32/kernel/ptrace.c b/arch/avr32/kernel/ptrace.c
index 3c36c2d161..39060cbeb2 100644
--- a/arch/avr32/kernel/ptrace.c
+++ b/arch/avr32/kernel/ptrace.c
@@ -153,7 +153,6 @@ static int ptrace_setregs(struct task_struct *tsk, const void __user *uregs)
 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 {
-        unsigned long tmp;
        int ret;
        pr_debug("arch_ptrace(%ld, %d, %#lx, %#lx)\n",
@@ -166,11 +165,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        /* Read the word at location addr in the child process */
        case PTRACE_PEEKTEXT:
        case PTRACE_PEEKDATA:
-                ret = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
+                ret = generic_ptrace_peekdata(child, addr, data);
-                if (ret == sizeof(tmp))
-                        ret = put_user(tmp, (unsigned long __user *)data);
-                else
-                        ret = -EIO;
                break;
        case PTRACE_PEEKUSR:
@@ -181,11 +176,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        /* Write the word in data at location addr */
        case PTRACE_POKETEXT:
        case PTRACE_POKEDATA:
-                ret = access_process_vm(child, addr, &data, sizeof(data), 1);
+                ret = generic_ptrace_pokedata(child, addr, data);
-                if (ret == sizeof(data))
-                        ret = 0;
-                else
-                        ret = -EIO;
                break;
        case PTRACE_POKEUSR:
diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c
index b279d66acf..d08b0bc6b2 100644
--- a/arch/avr32/kernel/setup.c
+++ b/arch/avr32/kernel/setup.c
@@ -313,7 +313,7 @@ __tagtable(ATAG_MEM, parse_tag_mem);
 static int __init parse_tag_rdimg(struct tag *tag)
 {
-#ifdef CONFIG_INITRD
+#ifdef CONFIG_BLK_DEV_INITRD
        struct tag_mem_range *mem = &tag->u.mem_range;
        int ret;
@@ -323,7 +323,7 @@ static int __init parse_tag_rdimg(struct tag *tag)
                return 0;
        }
-        ret = add_reserved_region(mem->start, mem->start + mem->size - 1,
+        ret = add_reserved_region(mem->addr, mem->addr + mem->size - 1,
                                  "initrd");
        if (ret) {
                printk(KERN_WARNING
diff --git a/arch/avr32/kernel/traps.c b/arch/avr32/kernel/traps.c
index 86d107511d..9a73ce7eb5 100644
--- a/arch/avr32/kernel/traps.c
+++ b/arch/avr32/kernel/traps.c
@@ -56,6 +56,7 @@ void NORET_TYPE die(const char *str, struct pt_regs *regs, long err)
        show_regs_log_lvl(regs, KERN_EMERG);
        show_stack_log_lvl(current, regs->sp, regs, KERN_EMERG);
        bust_spinlocks(0);
+        add_taint(TAINT_DIE);
        spin_unlock_irq(&die_lock);
        if (in_interrupt())
@@ -184,7 +185,7 @@ asmlinkage void do_illegal_opcode(unsigned long ecr, struct pt_regs *regs)
        if (!user_mode(regs) && (ecr == ECR_ILLEGAL_OPCODE)) {
                enum bug_trap_type type;
-                type = report_bug(regs->pc);
+                type = report_bug(regs->pc, regs);
                switch (type) {
                case BUG_TRAP_TYPE_NONE:
                        break;
diff --git a/arch/avr32/mach-at32ap/Makefile b/arch/avr32/mach-at32ap/Makefile
index f1d395724a..a8b445046e 100644
--- a/arch/avr32/mach-at32ap/Makefile
+++ b/arch/avr32/mach-at32ap/Makefile
@@ -1,3 +1,4 @@
 obj-y                           += at32ap.o clock.o intc.o extint.o pio.o hsmc.o
 obj-$(CONFIG_CPU_AT32AP7000)    += at32ap7000.o
 obj-$(CONFIG_CPU_AT32AP7000)    += time-tc.o
+obj-$(CONFIG_CPU_FREQ_AT32AP)   += cpufreq.o
diff --git a/arch/avr32/mach-at32ap/at32ap.c b/arch/avr32/mach-at32ap/at32ap.c
index 90f207e8e9..7c4987f328 100644
--- a/arch/avr32/mach-at32ap/at32ap.c
+++ b/arch/avr32/mach-at32ap/at32ap.c
@@ -11,41 +11,10 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <asm/io.h>
 #include <asm/arch/init.h>
-#include <asm/arch/sm.h>
-struct at32_sm system_manager;
-static int __init at32_sm_init(void)
-{
-        struct resource *regs;
-        struct at32_sm *sm = &system_manager;
-        int ret = -ENXIO;
-        regs = platform_get_resource(&at32_sm_device, IORESOURCE_MEM, 0);
-        if (!regs)
-                goto fail;
-        spin_lock_init(&sm->lock);
-        sm->pdev = &at32_sm_device;
-        ret = -ENOMEM;
-        sm->regs = ioremap(regs->start, regs->end - regs->start + 1);
-        if (!sm->regs)
-                goto fail;
-        return 0;
-fail:
-        printk(KERN_ERR "Failed to initialize System Manager: %d\n", ret);
-        return ret;
-}
 void __init setup_platform(void)
 {
-        at32_sm_init();
        at32_clock_init();
        at32_portmux_init();
 }
diff --git a/arch/avr32/mach-at32ap/at32ap7000.c b/arch/avr32/mach-at32ap/at32ap7000.c
index 1d2bf347a1..64cc5583dd 100644
--- a/arch/avr32/mach-at32ap/at32ap7000.c
+++ b/arch/avr32/mach-at32ap/at32ap7000.c
@@ -9,6 +9,7 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
 #include <linux/spi/spi.h>
 #include <asm/io.h>
@@ -16,14 +17,20 @@
 #include <asm/arch/at32ap7000.h>
 #include <asm/arch/board.h>
 #include <asm/arch/portmux.h>
-#include <asm/arch/sm.h>
 #include <video/atmel_lcdc.h>
 #include "clock.h"
 #include "hmatrix.h"
 #include "pio.h"
-#include "sm.h"
+#include "pm.h"
+/*
+ * We can reduce the code size a bit by using a constant here. Since
+ * this file is completely chip-specific, it's safe to not use
+ * ioremap. Generic drivers should of course never do this.
+ */
+#define AT32_PM_BASE    0xfff00000
 #define PBMEM(base)                                     \
        {                                               \
@@ -45,19 +52,30 @@
                .flags          = IORESOURCE_IRQ,       \
        }
+/* REVISIT these assume *every* device supports DMA, but several
+ * don't ... tc, smc, pio, rtc, watchdog, pwm, ps2, and more.
+ */
 #define DEFINE_DEV(_name, _id)                                  \
+static u64 _name##_id##_dma_mask = DMA_32BIT_MASK;              \
 static struct platform_device _name##_id##_device = {           \
        .name           = #_name,                               \
        .id             = _id,                                  \
+        .dev            = {                                     \
+                .dma_mask = &_name##_id##_dma_mask,             \
+                .coherent_dma_mask = DMA_32BIT_MASK,            \
+        },                                                      \
        .resource       = _name##_id##_resource,                \
        .num_resources  = ARRAY_SIZE(_name##_id##_resource),    \
 }
 #define DEFINE_DEV_DATA(_name, _id)                             \
+static u64 _name##_id##_dma_mask = DMA_32BIT_MASK;              \
 static struct platform_device _name##_id##_device = {           \
        .name           = #_name,                               \
        .id             = _id,                                  \
        .dev            = {                                     \
+                .dma_mask = &_name##_id##_dma_mask,             \
                .platform_data  = &_name##_id##_data,           \
+                .coherent_dma_mask = DMA_32BIT_MASK,            \
        },                                                      \
        .resource       = _name##_id##_resource,                \
        .num_resources  = ARRAY_SIZE(_name##_id##_resource),    \
@@ -76,6 +94,8 @@ static struct clk devname##_##_name = {				\
        .index          = _index,                               \
 }
+static DEFINE_SPINLOCK(pm_lock);
 unsigned long at32ap7000_osc_rates[3] = {
        [0] = 32768,
        /* FIXME: these are ATSTK1002-specific */
@@ -92,11 +112,11 @@ static unsigned long pll_get_rate(struct clk *clk, unsigned long control)
 {
        unsigned long div, mul, rate;
-        if (!(control & SM_BIT(PLLEN)))
+        if (!(control & PM_BIT(PLLEN)))
                return 0;
-        div = SM_BFEXT(PLLDIV, control) + 1;
+        div = PM_BFEXT(PLLDIV, control) + 1;
-        mul = SM_BFEXT(PLLMUL, control) + 1;
+        mul = PM_BFEXT(PLLMUL, control) + 1;
        rate = clk->parent->get_rate(clk->parent);
        rate = (rate + div / 2) / div;
@@ -109,7 +129,7 @@ static unsigned long pll0_get_rate(struct clk *clk)
 {
        u32 control;
-        control = sm_readl(&system_manager, PM_PLL0);
+        control = pm_readl(PLL0);
        return pll_get_rate(clk, control);
 }
@@ -118,7 +138,7 @@ static unsigned long pll1_get_rate(struct clk *clk)
 {
        u32 control;
-        control = sm_readl(&system_manager, PM_PLL1);
+        control = pm_readl(PLL1);
        return pll_get_rate(clk, control);
 }
@@ -175,108 +195,139 @@ static unsigned long bus_clk_get_rate(struct clk *clk, unsigned int shift)
 static void cpu_clk_mode(struct clk *clk, int enabled)
 {
-        struct at32_sm *sm = &system_manager;
        unsigned long flags;
        u32 mask;
-        spin_lock_irqsave(&sm->lock, flags);
+        spin_lock_irqsave(&pm_lock, flags);
-        mask = sm_readl(sm, PM_CPU_MASK);
+        mask = pm_readl(CPU_MASK);
        if (enabled)
                mask |= 1 << clk->index;
        else
                mask &= ~(1 << clk->index);
-        sm_writel(sm, PM_CPU_MASK, mask);
+        pm_writel(CPU_MASK, mask);
-        spin_unlock_irqrestore(&sm->lock, flags);
+        spin_unlock_irqrestore(&pm_lock, flags);
 }
 static unsigned long cpu_clk_get_rate(struct clk *clk)
 {
        unsigned long cksel, shift = 0;
-        cksel = sm_readl(&system_manager, PM_CKSEL);
+        cksel = pm_readl(CKSEL);
-        if (cksel & SM_BIT(CPUDIV))
+        if (cksel & PM_BIT(CPUDIV))
-                shift = SM_BFEXT(CPUSEL, cksel) + 1;
+                shift = PM_BFEXT(CPUSEL, cksel) + 1;
        return bus_clk_get_rate(clk, shift);
 }
+static long cpu_clk_set_rate(struct clk *clk, unsigned long rate, int apply)
+{
+        u32 control;
+        unsigned long parent_rate, child_div, actual_rate, div;
+        parent_rate = clk->parent->get_rate(clk->parent);
+        control = pm_readl(CKSEL);
+        if (control & PM_BIT(HSBDIV))
+                child_div = 1 << (PM_BFEXT(HSBSEL, control) + 1);
+        else
+                child_div = 1;
+        if (rate > 3 * (parent_rate / 4) || child_div == 1) {
+                actual_rate = parent_rate;
+                control &= ~PM_BIT(CPUDIV);
+        } else {
+                unsigned int cpusel;
+                div = (parent_rate + rate / 2) / rate;
+                if (div > child_div)
+                        div = child_div;
+                cpusel = (div > 1) ? (fls(div) - 2) : 0;
+                control = PM_BIT(CPUDIV) | PM_BFINS(CPUSEL, cpusel, control);
+                actual_rate = parent_rate / (1 << (cpusel + 1));
+        }
+        pr_debug("clk %s: new rate %lu (actual rate %lu)\n",
+                        clk->name, rate, actual_rate);
+        if (apply)
+                pm_writel(CKSEL, control);
+        return actual_rate;
+}
 static void hsb_clk_mode(struct clk *clk, int enabled)
 {
-        struct at32_sm *sm = &system_manager;
        unsigned long flags;
        u32 mask;
-        spin_lock_irqsave(&sm->lock, flags);
+        spin_lock_irqsave(&pm_lock, flags);
-        mask = sm_readl(sm, PM_HSB_MASK);
+        mask = pm_readl(HSB_MASK);
        if (enabled)
                mask |= 1 << clk->index;
        else
                mask &= ~(1 << clk->index);
-        sm_writel(sm, PM_HSB_MASK, mask);
+        pm_writel(HSB_MASK, mask);
-        spin_unlock_irqrestore(&sm->lock, flags);
+        spin_unlock_irqrestore(&pm_lock, flags);
 }
 static unsigned long hsb_clk_get_rate(struct clk *clk)
 {
        unsigned long cksel, shift = 0;
-        cksel = sm_readl(&system_manager, PM_CKSEL);
+        cksel = pm_readl(CKSEL);
-        if (cksel & SM_BIT(HSBDIV))
+        if (cksel & PM_BIT(HSBDIV))
-                shift = SM_BFEXT(HSBSEL, cksel) + 1;
+                shift = PM_BFEXT(HSBSEL, cksel) + 1;
        return bus_clk_get_rate(clk, shift);
 }
 static void pba_clk_mode(struct clk *clk, int enabled)
 {
-        struct at32_sm *sm = &system_manager;
        unsigned long flags;
        u32 mask;
-        spin_lock_irqsave(&sm->lock, flags);
+        spin_lock_irqsave(&pm_lock, flags);
-        mask = sm_readl(sm, PM_PBA_MASK);
+        mask = pm_readl(PBA_MASK);
        if (enabled)
                mask |= 1 << clk->index;
        else
                mask &= ~(1 << clk->index);
-        sm_writel(sm, PM_PBA_MASK, mask);
+        pm_writel(PBA_MASK, mask);
-        spin_unlock_irqrestore(&sm->lock, flags);
+        spin_unlock_irqrestore(&pm_lock, flags);
 }
 static unsigned long pba_clk_get_rate(struct clk *clk)
 {
        unsigned long cksel, shift = 0;
-        cksel = sm_readl(&system_manager, PM_CKSEL);
+        cksel = pm_readl(CKSEL);
-        if (cksel & SM_BIT(PBADIV))
+        if (cksel & PM_BIT(PBADIV))
-                shift = SM_BFEXT(PBASEL, cksel) + 1;
+                shift = PM_BFEXT(PBASEL, cksel) + 1;
        return bus_clk_get_rate(clk, shift);
 }
 static void pbb_clk_mode(struct clk *clk, int enabled)
 {
-        struct at32_sm *sm = &system_manager;
        unsigned long flags;
        u32 mask;
-        spin_lock_irqsave(&sm->lock, flags);
+        spin_lock_irqsave(&pm_lock, flags);
-        mask = sm_readl(sm, PM_PBB_MASK);
+        mask = pm_readl(PBB_MASK);
        if (enabled)
                mask |= 1 << clk->index;
        else
                mask &= ~(1 << clk->index);
-        sm_writel(sm, PM_PBB_MASK, mask);
+        pm_writel(PBB_MASK, mask);
-        spin_unlock_irqrestore(&sm->lock, flags);
+        spin_unlock_irqrestore(&pm_lock, flags);
 }
 static unsigned long pbb_clk_get_rate(struct clk *clk)
 {
        unsigned long cksel, shift = 0;
-        cksel = sm_readl(&system_manager, PM_CKSEL);
+        cksel = pm_readl(CKSEL);
-        if (cksel & SM_BIT(PBBDIV))
+        if (cksel & PM_BIT(PBBDIV))
-                shift = SM_BFEXT(PBBSEL, cksel) + 1;
+                shift = PM_BFEXT(PBBSEL, cksel) + 1;
        return bus_clk_get_rate(clk, shift);
 }
@@ -284,6 +335,7 @@ static unsigned long pbb_clk_get_rate(struct clk *clk)
 static struct clk cpu_clk = {
        .name           = "cpu",
        .get_rate       = cpu_clk_get_rate,
+        .set_rate       = cpu_clk_set_rate,
        .users          = 1,
 };
 static struct clk hsb_clk = {
@@ -315,12 +367,12 @@ static void genclk_mode(struct clk *clk, int enabled)
 {
        u32 control;
-        control = sm_readl(&system_manager, PM_GCCTRL + 4 * clk->index);
+        control = pm_readl(GCCTRL(clk->index));
        if (enabled)
-                control |= SM_BIT(CEN);
+                control |= PM_BIT(CEN);
        else
-                control &= ~SM_BIT(CEN);
+                control &= ~PM_BIT(CEN);
-        sm_writel(&system_manager, PM_GCCTRL + 4 * clk->index, control);
+        pm_writel(GCCTRL(clk->index), control);
 }
 static unsigned long genclk_get_rate(struct clk *clk)
@@ -328,9 +380,9 @@ static unsigned long genclk_get_rate(struct clk *clk)
        u32 control;
        unsigned long div = 1;
-        control = sm_readl(&system_manager, PM_GCCTRL + 4 * clk->index);
+        control = pm_readl(GCCTRL(clk->index));
-        if (control & SM_BIT(DIVEN))
+        if (control & PM_BIT(DIVEN))
-                div = 2 * (SM_BFEXT(DIV, control) + 1);
+                div = 2 * (PM_BFEXT(DIV, control) + 1);
        return clk->parent->get_rate(clk->parent) / div;
 }
@@ -341,23 +393,22 @@ static long genclk_set_rate(struct clk *clk, unsigned long rate, int apply)
        unsigned long parent_rate, actual_rate, div;
        parent_rate = clk->parent->get_rate(clk->parent);
-        control = sm_readl(&system_manager, PM_GCCTRL + 4 * clk->index);
+        control = pm_readl(GCCTRL(clk->index));
        if (rate > 3 * parent_rate / 4) {
                actual_rate = parent_rate;
-                control &= ~SM_BIT(DIVEN);
+                control &= ~PM_BIT(DIVEN);
        } else {
                div = (parent_rate + rate) / (2 * rate) - 1;
-                control = SM_BFINS(DIV, div, control) | SM_BIT(DIVEN);
+                control = PM_BFINS(DIV, div, control) | PM_BIT(DIVEN);
                actual_rate = parent_rate / (2 * (div + 1));
        }
-        printk("clk %s: new rate %lu (actual rate %lu)\n",
+        dev_dbg(clk->dev, "clk %s: new rate %lu (actual rate %lu)\n",
-               clk->name, rate, actual_rate);
+                clk->name, rate, actual_rate);
        if (apply)
-                sm_writel(&system_manager, PM_GCCTRL + 4 * clk->index,
+                pm_writel(GCCTRL(clk->index), control);
-                          control);
        return actual_rate;
 }
@@ -366,24 +417,24 @@ int genclk_set_parent(struct clk *clk, struct clk *parent)
 {
        u32 control;
-        printk("clk %s: new parent %s (was %s)\n",
+        dev_dbg(clk->dev, "clk %s: new parent %s (was %s)\n",
-               clk->name, parent->name, clk->parent->name);
+                clk->name, parent->name, clk->parent->name);
-        control = sm_readl(&system_manager, PM_GCCTRL + 4 * clk->index);
+        control = pm_readl(GCCTRL(clk->index));
        if (parent == &osc1 || parent == &pll1)
-                control |= SM_BIT(OSCSEL);
+                control |= PM_BIT(OSCSEL);
        else if (parent == &osc0 || parent == &pll0)
-                control &= ~SM_BIT(OSCSEL);
+                control &= ~PM_BIT(OSCSEL);
        else
                return -EINVAL;
        if (parent == &pll0 || parent == &pll1)
-                control |= SM_BIT(PLLSEL);
+                control |= PM_BIT(PLLSEL);
        else
-                control &= ~SM_BIT(PLLSEL);
+                control &= ~PM_BIT(PLLSEL);
-        sm_writel(&system_manager, PM_GCCTRL + 4 * clk->index, control);
+        pm_writel(GCCTRL(clk->index), control);
        clk->parent = parent;
        return 0;
@@ -396,11 +447,11 @@ static void __init genclk_init_parent(struct clk *clk)
        BUG_ON(clk->index > 7);
-        control = sm_readl(&system_manager, PM_GCCTRL + 4 * clk->index);
+        control = pm_readl(GCCTRL(clk->index));
-        if (control & SM_BIT(OSCSEL))
+        if (control & PM_BIT(OSCSEL))
-                parent = (control & SM_BIT(PLLSEL)) ? &pll1 : &osc1;
+                parent = (control & PM_BIT(PLLSEL)) ? &pll1 : &osc1;
        else
-                parent = (control & SM_BIT(PLLSEL)) ? &pll0 : &osc0;
+                parent = (control & PM_BIT(PLLSEL)) ? &pll0 : &osc0;
        clk->parent = parent;
 }
@@ -408,21 +459,53 @@ static void __init genclk_init_parent(struct clk *clk)
 /* --------------------------------------------------------------------
 *  System peripherals
 * -------------------------------------------------------------------- */
-static struct resource sm_resource[] = {
+static struct resource at32_pm0_resource[] = {
-        PBMEM(0xfff00000),
+        {
-        NAMED_IRQ(19, "eim"),
+                .start  = 0xfff00000,
-        NAMED_IRQ(20, "pm"),
+                .end    = 0xfff0007f,
-        NAMED_IRQ(21, "rtc"),
+                .flags  = IORESOURCE_MEM,
+        },
+        IRQ(20),
 };
-struct platform_device at32_sm_device = {
-        .name           = "sm",
+static struct resource at32ap700x_rtc0_resource[] = {
-        .id             = 0,
+        {
-        .resource       = sm_resource,
+                .start  = 0xfff00080,
-        .num_resources  = ARRAY_SIZE(sm_resource),
+                .end    = 0xfff000af,
+                .flags  = IORESOURCE_MEM,
+        },
+        IRQ(21),
 };
-static struct clk at32_sm_pclk = {
+static struct resource at32_wdt0_resource[] = {
+        {
+                .start  = 0xfff000b0,
+                .end    = 0xfff000bf,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+static struct resource at32_eic0_resource[] = {
+        {
+                .start  = 0xfff00100,
+                .end    = 0xfff0013f,
+                .flags  = IORESOURCE_MEM,
+        },
+        IRQ(19),
+};
+DEFINE_DEV(at32_pm, 0);
+DEFINE_DEV(at32ap700x_rtc, 0);
+DEFINE_DEV(at32_wdt, 0);
+DEFINE_DEV(at32_eic, 0);
+/*
+ * Peripheral clock for PM, RTC, WDT and EIC. PM will ensure that this
+ * is always running.
+ */
+static struct clk at32_pm_pclk = {
        .name           = "pclk",
-        .dev            = &at32_sm_device.dev,
+        .dev            = &at32_pm0_device.dev,
        .parent         = &pbb_clk,
        .mode           = pbb_clk_mode,
        .get_rate       = pbb_clk_get_rate,
@@ -571,10 +654,11 @@ DEV_CLK(mck, pio4, pba, 14);
 void __init at32_add_system_devices(void)
 {
-        system_manager.eim_first_irq = EIM_IRQ_BASE;
+        platform_device_register(&at32_pm0_device);
-        platform_device_register(&at32_sm_device);
        platform_device_register(&at32_intc0_device);
+        platform_device_register(&at32ap700x_rtc0_device);
+        platform_device_register(&at32_wdt0_device);
+        platform_device_register(&at32_eic0_device);
        platform_device_register(&smc0_device);
        platform_device_register(&pdc_device);
@@ -1001,6 +1085,89 @@ err_dup_modedb:
 }
 /* --------------------------------------------------------------------
+ *  SSC
+ * -------------------------------------------------------------------- */
+static struct resource ssc0_resource[] = {
+        PBMEM(0xffe01c00),
+        IRQ(10),
+};
+DEFINE_DEV(ssc, 0);
+DEV_CLK(pclk, ssc0, pba, 7);
+static struct resource ssc1_resource[] = {
+        PBMEM(0xffe02000),
+        IRQ(11),
+};
+DEFINE_DEV(ssc, 1);
+DEV_CLK(pclk, ssc1, pba, 8);
+static struct resource ssc2_resource[] = {
+        PBMEM(0xffe02400),
+        IRQ(12),
+};
+DEFINE_DEV(ssc, 2);
+DEV_CLK(pclk, ssc2, pba, 9);
+struct platform_device *__init
+at32_add_device_ssc(unsigned int id, unsigned int flags)
+{
+        struct platform_device *pdev;
+        switch (id) {
+        case 0:
+                pdev = &ssc0_device;
+                if (flags & ATMEL_SSC_RF)
+                        select_peripheral(PA(21), PERIPH_A, 0); /* RF */
+                if (flags & ATMEL_SSC_RK)
+                        select_peripheral(PA(22), PERIPH_A, 0); /* RK */
+                if (flags & ATMEL_SSC_TK)
+                        select_peripheral(PA(23), PERIPH_A, 0); /* TK */
+                if (flags & ATMEL_SSC_TF)
+                        select_peripheral(PA(24), PERIPH_A, 0); /* TF */
+                if (flags & ATMEL_SSC_TD)
+                        select_peripheral(PA(25), PERIPH_A, 0); /* TD */
+                if (flags & ATMEL_SSC_RD)
+                        select_peripheral(PA(26), PERIPH_A, 0); /* RD */
+                break;
+        case 1:
+                pdev = &ssc1_device;
+                if (flags & ATMEL_SSC_RF)
+                        select_peripheral(PA(0), PERIPH_B, 0);  /* RF */
+                if (flags & ATMEL_SSC_RK)
+                        select_peripheral(PA(1), PERIPH_B, 0);  /* RK */
+                if (flags & ATMEL_SSC_TK)
+                        select_peripheral(PA(2), PERIPH_B, 0);  /* TK */
+                if (flags & ATMEL_SSC_TF)
+                        select_peripheral(PA(3), PERIPH_B, 0);  /* TF */
+                if (flags & ATMEL_SSC_TD)
+                        select_peripheral(PA(4), PERIPH_B, 0);  /* TD */
+                if (flags & ATMEL_SSC_RD)
+                        select_peripheral(PA(5), PERIPH_B, 0);  /* RD */
+                break;
+        case 2:
+                pdev = &ssc2_device;
+                if (flags & ATMEL_SSC_TD)
+                        select_peripheral(PB(13), PERIPH_A, 0); /* TD */
+                if (flags & ATMEL_SSC_RD)
+                        select_peripheral(PB(14), PERIPH_A, 0); /* RD */
+                if (flags & ATMEL_SSC_TK)
+                        select_peripheral(PB(15), PERIPH_A, 0); /* TK */
+                if (flags & ATMEL_SSC_TF)
+                        select_peripheral(PB(16), PERIPH_A, 0); /* TF */
+                if (flags & ATMEL_SSC_RF)
+                        select_peripheral(PB(17), PERIPH_A, 0); /* RF */
+                if (flags & ATMEL_SSC_RK)
+                        select_peripheral(PB(18), PERIPH_A, 0); /* RK */
+                break;
+        default:
+                return NULL;
+        }
+        platform_device_register(pdev);
+        return pdev;
+}
+/* --------------------------------------------------------------------
 *  GCLK
 * -------------------------------------------------------------------- */
 static struct clk gclk0 = {
@@ -1054,7 +1221,7 @@ struct clk *at32_clock_list[] = {
        &hsb_clk,
        &pba_clk,
        &pbb_clk,
-        &at32_sm_pclk,
+        &at32_pm_pclk,
        &at32_intc0_pclk,
        &hmatrix_clk,
        &ebi_clk,
@@ -1082,6 +1249,9 @@ struct clk *at32_clock_list[] = {
        &atmel_spi1_spi_clk,
        &atmel_lcdfb0_hck1,
        &atmel_lcdfb0_pixclk,
+        &ssc0_pclk,
+        &ssc1_pclk,
+        &ssc2_pclk,
        &gclk0,
        &gclk1,
        &gclk2,
@@ -1101,18 +1271,20 @@ void __init at32_portmux_init(void)
 void __init at32_clock_init(void)
 {
-        struct at32_sm *sm = &system_manager;
        u32 cpu_mask = 0, hsb_mask = 0, pba_mask = 0, pbb_mask = 0;
        int i;
-        if (sm_readl(sm, PM_MCCTRL) & SM_BIT(PLLSEL))
+        if (pm_readl(MCCTRL) & PM_BIT(PLLSEL)) {
                main_clock = &pll0;
-        else
+                cpu_clk.parent = &pll0;
+        } else {
                main_clock = &osc0;
+                cpu_clk.parent = &osc0;
+        }
-        if (sm_readl(sm, PM_PLL0) & SM_BIT(PLLOSC))
+        if (pm_readl(PLL0) & PM_BIT(PLLOSC))
                pll0.parent = &osc1;
-        if (sm_readl(sm, PM_PLL1) & SM_BIT(PLLOSC))
+        if (pm_readl(PLL1) & PM_BIT(PLLOSC))
                pll1.parent = &osc1;
        genclk_init_parent(&gclk0);
@@ -1145,8 +1317,8 @@ void __init at32_clock_init(void)
                        pbb_mask |= 1 << clk->index;
        }
-        sm_writel(sm, PM_CPU_MASK, cpu_mask);
+        pm_writel(CPU_MASK, cpu_mask);
-        sm_writel(sm, PM_HSB_MASK, hsb_mask);
+        pm_writel(HSB_MASK, hsb_mask);
-        sm_writel(sm, PM_PBA_MASK, pba_mask);
+        pm_writel(PBA_MASK, pba_mask);
-        sm_writel(sm, PM_PBB_MASK, pbb_mask);
+        pm_writel(PBB_MASK, pbb_mask);
 }
diff --git a/arch/avr32/mach-at32ap/cpufreq.c b/arch/avr32/mach-at32ap/cpufreq.c
new file mode 100644
index 0000000000..235524b791
--- /dev/null
+++ b/arch/avr32/mach-at32ap/cpufreq.c
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2004-2007 Atmel Corporation
+ *
+ * Based on MIPS implementation arch/mips/kernel/time.c
+ *   Copyright 2001 MontaVista Software Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/*#define DEBUG*/
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/cpufreq.h>
+#include <linux/io.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <asm/system.h>
+static struct clk *cpuclk;
+static int at32_verify_speed(struct cpufreq_policy *policy)
+{
+        if (policy->cpu != 0)
+                return -EINVAL;
+        cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
+                        policy->cpuinfo.max_freq);
+        return 0;
+}
+static unsigned int at32_get_speed(unsigned int cpu)
+{
+        /* No SMP support */
+        if (cpu)
+                return 0;
+        return (unsigned int)((clk_get_rate(cpuclk) + 500) / 1000);
+}
+static int at32_set_target(struct cpufreq_policy *policy,
+                          unsigned int target_freq,
+                          unsigned int relation)
+{
+        struct cpufreq_freqs freqs;
+        long freq;
+        /* Convert target_freq from kHz to Hz */
+        freq = clk_round_rate(cpuclk, target_freq * 1000);
+        /* Check if policy->min <= new_freq <= policy->max */
+        if(freq < (policy->min * 1000) || freq > (policy->max * 1000))
+                return -EINVAL;
+        pr_debug("cpufreq: requested frequency %u Hz\n", target_freq * 1000);
+        freqs.old = at32_get_speed(0);
+        freqs.new = (freq + 500) / 1000;
+        freqs.cpu = 0;
+        freqs.flags = 0;
+        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        clk_set_rate(cpuclk, freq);
+        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        pr_debug("cpufreq: set frequency %lu Hz\n", freq);
+        return 0;
+}
+static int __init at32_cpufreq_driver_init(struct cpufreq_policy *policy)
+{
+        if (policy->cpu != 0)
+                return -EINVAL;
+        cpuclk = clk_get(NULL, "cpu");
+        if (IS_ERR(cpuclk)) {
+                pr_debug("cpufreq: could not get CPU clk\n");
+                return PTR_ERR(cpuclk);
+        }
+        policy->cpuinfo.min_freq = (clk_round_rate(cpuclk, 1) + 500) / 1000;
+        policy->cpuinfo.max_freq = (clk_round_rate(cpuclk, ~0UL) + 500) / 1000;
+        policy->cpuinfo.transition_latency = 0;
+        policy->cur = at32_get_speed(0);
+        policy->min = policy->cpuinfo.min_freq;
+        policy->max = policy->cpuinfo.max_freq;
+        policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
+        printk("cpufreq: AT32AP CPU frequency driver\n");
+        return 0;
+}
+static struct cpufreq_driver at32_driver = {
+        .name           = "at32ap",
+        .owner          = THIS_MODULE,
+        .init           = at32_cpufreq_driver_init,
+        .verify         = at32_verify_speed,
+        .target         = at32_set_target,
+        .get            = at32_get_speed,
+        .flags          = CPUFREQ_STICKY,
+};
+static int __init at32_cpufreq_init(void)
+{
+        return cpufreq_register_driver(&at32_driver);
+}
+arch_initcall(at32_cpufreq_init);
diff --git a/arch/avr32/mach-at32ap/extint.c b/arch/avr32/mach-at32ap/extint.c
index 4a60eccfeb..8acd010900 100644
--- a/arch/avr32/mach-at32ap/extint.c
+++ b/arch/avr32/mach-at32ap/extint.c
@@ -17,42 +17,83 @@
 #include <asm/io.h>
-#include <asm/arch/sm.h>
+/* EIC register offsets */
+#define EIC_IER                                 0x0000
-#include "sm.h"
+#define EIC_IDR                                 0x0004
+#define EIC_IMR                                 0x0008
+#define EIC_ISR                                 0x000c
+#define EIC_ICR                                 0x0010
+#define EIC_MODE                                0x0014
+#define EIC_EDGE                                0x0018
+#define EIC_LEVEL                               0x001c
+#define EIC_TEST                                0x0020
+#define EIC_NMIC                                0x0024
+/* Bitfields in TEST */
+#define EIC_TESTEN_OFFSET                       31
+#define EIC_TESTEN_SIZE                         1
+/* Bitfields in NMIC */
+#define EIC_EN_OFFSET                           0
+#define EIC_EN_SIZE                             1
+/* Bit manipulation macros */
+#define EIC_BIT(name)                                   \
+        (1 << EIC_##name##_OFFSET)
+#define EIC_BF(name,value)                              \
+        (((value) & ((1 << EIC_##name##_SIZE) - 1))     \
+         << EIC_##name##_OFFSET)
+#define EIC_BFEXT(name,value)                           \
+        (((value) >> EIC_##name##_OFFSET)               \
+         & ((1 << EIC_##name##_SIZE) - 1))
+#define EIC_BFINS(name,value,old)                       \
+        (((old) & ~(((1 << EIC_##name##_SIZE) - 1)      \
+                    << EIC_##name##_OFFSET))            \
+         | EIC_BF(name,value))
+/* Register access macros */
+#define eic_readl(port,reg)                             \
+        __raw_readl((port)->regs + EIC_##reg)
+#define eic_writel(port,reg,value)                      \
+        __raw_writel((value), (port)->regs + EIC_##reg)
+struct eic {
+        void __iomem *regs;
+        struct irq_chip *chip;
+        unsigned int first_irq;
+};
-static void eim_ack_irq(unsigned int irq)
+static void eic_ack_irq(unsigned int irq)
 {
-        struct at32_sm *sm = get_irq_chip_data(irq);
+        struct eic *eic = get_irq_chip_data(irq);
-        sm_writel(sm, EIM_ICR, 1 << (irq - sm->eim_first_irq));
+        eic_writel(eic, ICR, 1 << (irq - eic->first_irq));
 }
-static void eim_mask_irq(unsigned int irq)
+static void eic_mask_irq(unsigned int irq)
 {
-        struct at32_sm *sm = get_irq_chip_data(irq);
+        struct eic *eic = get_irq_chip_data(irq);
-        sm_writel(sm, EIM_IDR, 1 << (irq - sm->eim_first_irq));
+        eic_writel(eic, IDR, 1 << (irq - eic->first_irq));
 }
-static void eim_mask_ack_irq(unsigned int irq)
+static void eic_mask_ack_irq(unsigned int irq)
 {
-        struct at32_sm *sm = get_irq_chip_data(irq);
+        struct eic *eic = get_irq_chip_data(irq);
-        sm_writel(sm, EIM_ICR, 1 << (irq - sm->eim_first_irq));
+        eic_writel(eic, ICR, 1 << (irq - eic->first_irq));
-        sm_writel(sm, EIM_IDR, 1 << (irq - sm->eim_first_irq));
+        eic_writel(eic, IDR, 1 << (irq - eic->first_irq));
 }
-static void eim_unmask_irq(unsigned int irq)
+static void eic_unmask_irq(unsigned int irq)
 {
-        struct at32_sm *sm = get_irq_chip_data(irq);
+        struct eic *eic = get_irq_chip_data(irq);
-        sm_writel(sm, EIM_IER, 1 << (irq - sm->eim_first_irq));
+        eic_writel(eic, IER, 1 << (irq - eic->first_irq));
 }
-static int eim_set_irq_type(unsigned int irq, unsigned int flow_type)
+static int eic_set_irq_type(unsigned int irq, unsigned int flow_type)
 {
-        struct at32_sm *sm = get_irq_chip_data(irq);
+        struct eic *eic = get_irq_chip_data(irq);
        struct irq_desc *desc;
-        unsigned int i = irq - sm->eim_first_irq;
+        unsigned int i = irq - eic->first_irq;
        u32 mode, edge, level;
-        unsigned long flags;
        int ret = 0;
        flow_type &= IRQ_TYPE_SENSE_MASK;
@@ -60,11 +101,10 @@ static int eim_set_irq_type(unsigned int irq, unsigned int flow_type)
                flow_type = IRQ_TYPE_LEVEL_LOW;
        desc = &irq_desc[irq];
-        spin_lock_irqsave(&sm->lock, flags);
-        mode = sm_readl(sm, EIM_MODE);
+        mode = eic_readl(eic, MODE);
-        edge = sm_readl(sm, EIM_EDGE);
+        edge = eic_readl(eic, EDGE);
-        level = sm_readl(sm, EIM_LEVEL);
+        level = eic_readl(eic, LEVEL);
        switch (flow_type) {
        case IRQ_TYPE_LEVEL_LOW:
@@ -89,9 +129,9 @@ static int eim_set_irq_type(unsigned int irq, unsigned int flow_type)
        }
        if (ret == 0) {
-                sm_writel(sm, EIM_MODE, mode);
+                eic_writel(eic, MODE, mode);
-                sm_writel(sm, EIM_EDGE, edge);
+                eic_writel(eic, EDGE, edge);
-                sm_writel(sm, EIM_LEVEL, level);
+                eic_writel(eic, LEVEL, level);
                if (flow_type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
                        flow_type |= IRQ_LEVEL;
@@ -99,35 +139,33 @@ static int eim_set_irq_type(unsigned int irq, unsigned int flow_type)
                desc->status |= flow_type;
        }
-        spin_unlock_irqrestore(&sm->lock, flags);
        return ret;
 }
-struct irq_chip eim_chip = {
+struct irq_chip eic_chip = {
-        .name           = "eim",
+        .name           = "eic",
-        .ack            = eim_ack_irq,
+        .ack            = eic_ack_irq,
-        .mask           = eim_mask_irq,
+        .mask           = eic_mask_irq,
-        .mask_ack       = eim_mask_ack_irq,
+        .mask_ack       = eic_mask_ack_irq,
-        .unmask         = eim_unmask_irq,
+        .unmask         = eic_unmask_irq,
-        .set_type       = eim_set_irq_type,
+        .set_type       = eic_set_irq_type,
 };
-static void demux_eim_irq(unsigned int irq, struct irq_desc *desc)
+static void demux_eic_irq(unsigned int irq, struct irq_desc *desc)
 {
-        struct at32_sm *sm = desc->handler_data;
+        struct eic *eic = desc->handler_data;
        struct irq_desc *ext_desc;
        unsigned long status, pending;
        unsigned int i, ext_irq;
-        status = sm_readl(sm, EIM_ISR);
+        status = eic_readl(eic, ISR);
-        pending = status & sm_readl(sm, EIM_IMR);
+        pending = status & eic_readl(eic, IMR);
        while (pending) {
                i = fls(pending) - 1;
                pending &= ~(1 << i);
-                ext_irq = i + sm->eim_first_irq;
+                ext_irq = i + eic->first_irq;
                ext_desc = irq_desc + ext_irq;
                if (ext_desc->status & IRQ_LEVEL)
                        handle_level_irq(ext_irq, ext_desc);
@@ -136,51 +174,85 @@ static void demux_eim_irq(unsigned int irq, struct irq_desc *desc)
        }
 }
-static int __init eim_init(void)
+static int __init eic_probe(struct platform_device *pdev)
 {
-        struct at32_sm *sm = &system_manager;
+        struct eic *eic;
+        struct resource *regs;
        unsigned int i;
        unsigned int nr_irqs;
        unsigned int int_irq;
+        int ret;
        u32 pattern;
-        /*
+        regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-         * The EIM is really the same module as SM, so register
+        int_irq = platform_get_irq(pdev, 0);
-         * mapping, etc. has been taken care of already.
+        if (!regs || !int_irq) {
-         */
+                dev_dbg(&pdev->dev, "missing regs and/or irq resource\n");
+                return -ENXIO;
+        }
+        ret = -ENOMEM;
+        eic = kzalloc(sizeof(struct eic), GFP_KERNEL);
+        if (!eic) {
+                dev_dbg(&pdev->dev, "no memory for eic structure\n");
+                goto err_kzalloc;
+        }
+        eic->first_irq = EIM_IRQ_BASE + 32 * pdev->id;
+        eic->regs = ioremap(regs->start, regs->end - regs->start + 1);
+        if (!eic->regs) {
+                dev_dbg(&pdev->dev, "failed to map regs\n");
+                goto err_ioremap;
+        }
        /*
         * Find out how many interrupt lines that are actually
         * implemented in hardware.
         */
-        sm_writel(sm, EIM_IDR, ~0UL);
+        eic_writel(eic, IDR, ~0UL);
-        sm_writel(sm, EIM_MODE, ~0UL);
+        eic_writel(eic, MODE, ~0UL);
-        pattern = sm_readl(sm, EIM_MODE);
+        pattern = eic_readl(eic, MODE);
        nr_irqs = fls(pattern);
        /* Trigger on falling edge unless overridden by driver */
-        sm_writel(sm, EIM_MODE, 0UL);
+        eic_writel(eic, MODE, 0UL);
-        sm_writel(sm, EIM_EDGE, 0UL);
+        eic_writel(eic, EDGE, 0UL);
-        sm->eim_chip = &eim_chip;
+        eic->chip = &eic_chip;
        for (i = 0; i < nr_irqs; i++) {
                /* NOTE the handler we set here is ignored by the demux */
-                set_irq_chip_and_handler(sm->eim_first_irq + i, &eim_chip,
+                set_irq_chip_and_handler(eic->first_irq + i, &eic_chip,
                                         handle_level_irq);
-                set_irq_chip_data(sm->eim_first_irq + i, sm);
+                set_irq_chip_data(eic->first_irq + i, eic);
        }
-        int_irq = platform_get_irq_byname(sm->pdev, "eim");
+        set_irq_chained_handler(int_irq, demux_eic_irq);
+        set_irq_data(int_irq, eic);
-        set_irq_chained_handler(int_irq, demux_eim_irq);
-        set_irq_data(int_irq, sm);
-        printk("EIM: External Interrupt Module at 0x%p, IRQ %u\n",
+        dev_info(&pdev->dev,
-               sm->regs, int_irq);
+                 "External Interrupt Controller at 0x%p, IRQ %u\n",
-        printk("EIM: Handling %u external IRQs, starting with IRQ %u\n",
+                 eic->regs, int_irq);
-               nr_irqs, sm->eim_first_irq);
+        dev_info(&pdev->dev,
+                 "Handling %u external IRQs, starting with IRQ %u\n",
+                 nr_irqs, eic->first_irq);
        return 0;
+err_ioremap:
+        kfree(eic);
+err_kzalloc:
+        return ret;
+}
+static struct platform_driver eic_driver = {
+        .driver = {
+                .name = "at32_eic",
+        },
+};
+static int __init eic_init(void)
+{
+        return platform_driver_probe(&eic_driver, eic_probe);
 }
-arch_initcall(eim_init);
+arch_initcall(eic_init);
diff --git a/arch/avr32/mach-at32ap/pm.h b/arch/avr32/mach-at32ap/pm.h
new file mode 100644
index 0000000000..a1f8aced0a
--- /dev/null
+++ b/arch/avr32/mach-at32ap/pm.h
@@ -0,0 +1,112 @@
+/*
+ * Register definitions for the Power Manager (PM)
+ */
+#ifndef __ARCH_AVR32_MACH_AT32AP_PM_H__
+#define __ARCH_AVR32_MACH_AT32AP_PM_H__
+/* PM register offsets */
+#define PM_MCCTRL                               0x0000
+#define PM_CKSEL                                0x0004
+#define PM_CPU_MASK                             0x0008
+#define PM_HSB_MASK                             0x000c
+#define PM_PBA_MASK                             0x0010
+#define PM_PBB_MASK                             0x0014
+#define PM_PLL0                                 0x0020
+#define PM_PLL1                                 0x0024
+#define PM_IER                                  0x0040
+#define PM_IDR                                  0x0044
+#define PM_IMR                                  0x0048
+#define PM_ISR                                  0x004c
+#define PM_ICR                                  0x0050
+#define PM_GCCTRL(x)                            (0x0060 + 4 * (x))
+#define PM_RCAUSE                               0x00c0
+/* Bitfields in CKSEL */
+#define PM_CPUSEL_OFFSET                        0
+#define PM_CPUSEL_SIZE                          3
+#define PM_CPUDIV_OFFSET                        7
+#define PM_CPUDIV_SIZE                          1
+#define PM_HSBSEL_OFFSET                        8
+#define PM_HSBSEL_SIZE                          3
+#define PM_HSBDIV_OFFSET                        15
+#define PM_HSBDIV_SIZE                          1
+#define PM_PBASEL_OFFSET                        16
+#define PM_PBASEL_SIZE                          3
+#define PM_PBADIV_OFFSET                        23
+#define PM_PBADIV_SIZE                          1
+#define PM_PBBSEL_OFFSET                        24
+#define PM_PBBSEL_SIZE                          3
+#define PM_PBBDIV_OFFSET                        31
+#define PM_PBBDIV_SIZE                          1
+/* Bitfields in PLL0 */
+#define PM_PLLEN_OFFSET                         0
+#define PM_PLLEN_SIZE                           1
+#define PM_PLLOSC_OFFSET                        1
+#define PM_PLLOSC_SIZE                          1
+#define PM_PLLOPT_OFFSET                        2
+#define PM_PLLOPT_SIZE                          3
+#define PM_PLLDIV_OFFSET                        8
+#define PM_PLLDIV_SIZE                          8
+#define PM_PLLMUL_OFFSET                        16
+#define PM_PLLMUL_SIZE                          8
+#define PM_PLLCOUNT_OFFSET                      24
+#define PM_PLLCOUNT_SIZE                        6
+#define PM_PLLTEST_OFFSET                       31
+#define PM_PLLTEST_SIZE                         1
+/* Bitfields in ICR */
+#define PM_LOCK0_OFFSET                         0
+#define PM_LOCK0_SIZE                           1
+#define PM_LOCK1_OFFSET                         1
+#define PM_LOCK1_SIZE                           1
+#define PM_WAKE_OFFSET                          2
+#define PM_WAKE_SIZE                            1
+#define PM_CKRDY_OFFSET                         5
+#define PM_CKRDY_SIZE                           1
+#define PM_MSKRDY_OFFSET                        6
+#define PM_MSKRDY_SIZE                          1
+/* Bitfields in GCCTRL0 */
+#define PM_OSCSEL_OFFSET                        0
+#define PM_OSCSEL_SIZE                          1
+#define PM_PLLSEL_OFFSET                        1
+#define PM_PLLSEL_SIZE                          1
+#define PM_CEN_OFFSET                           2
+#define PM_CEN_SIZE                             1
+#define PM_DIVEN_OFFSET                         4
+#define PM_DIVEN_SIZE                           1
+#define PM_DIV_OFFSET                           8
+#define PM_DIV_SIZE                             8
+/* Bitfields in RCAUSE */
+#define PM_POR_OFFSET                           0
+#define PM_POR_SIZE                             1
+#define PM_EXT_OFFSET                           2
+#define PM_EXT_SIZE                             1
+#define PM_WDT_OFFSET                           3
+#define PM_WDT_SIZE                             1
+#define PM_NTAE_OFFSET                          4
+#define PM_NTAE_SIZE                            1
+/* Bit manipulation macros */
+#define PM_BIT(name)                                    \
+        (1 << PM_##name##_OFFSET)
+#define PM_BF(name,value)                               \
+        (((value) & ((1 << PM_##name##_SIZE) - 1))      \
+         << PM_##name##_OFFSET)
+#define PM_BFEXT(name,value)                            \
+        (((value) >> PM_##name##_OFFSET)                \
+         & ((1 << PM_##name##_SIZE) - 1))
+#define PM_BFINS(name,value,old)\
+        (((old) & ~(((1 << PM_##name##_SIZE) - 1)       \
+                    << PM_##name##_OFFSET))             \
+         | PM_BF(name,value))
+/* Register access macros */
+#define pm_readl(reg)                                                   \
+        __raw_readl((void __iomem *)AT32_PM_BASE + PM_##reg)
+#define pm_writel(reg,value)                                            \
+        __raw_writel((value), (void __iomem *)AT32_PM_BASE + PM_##reg)
+#endif /* __ARCH_AVR32_MACH_AT32AP_PM_H__ */
diff --git a/arch/avr32/mach-at32ap/sm.h b/arch/avr32/mach-at32ap/sm.h
deleted file mode 100644
index cad02b512b..0000000000
--- a/arch/avr32/mach-at32ap/sm.h
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Register definitions for SM
- *
- * System Manager
- */
-#ifndef __ASM_AVR32_SM_H__
-#define __ASM_AVR32_SM_H__
-/* SM register offsets */
-#define SM_PM_MCCTRL                            0x0000
-#define SM_PM_CKSEL                             0x0004
-#define SM_PM_CPU_MASK                          0x0008
-#define SM_PM_HSB_MASK                          0x000c
-#define SM_PM_PBA_MASK                         0x0010
-#define SM_PM_PBB_MASK                         0x0014
-#define SM_PM_PLL0                              0x0020
-#define SM_PM_PLL1                              0x0024
-#define SM_PM_VCTRL                             0x0030
-#define SM_PM_VMREF                             0x0034
-#define SM_PM_VMV                               0x0038
-#define SM_PM_IER                               0x0040
-#define SM_PM_IDR                               0x0044
-#define SM_PM_IMR                               0x0048
-#define SM_PM_ISR                               0x004c
-#define SM_PM_ICR                               0x0050
-#define SM_PM_GCCTRL                            0x0060
-#define SM_RTC_CTRL                             0x0080
-#define SM_RTC_VAL                              0x0084
-#define SM_RTC_TOP                              0x0088
-#define SM_RTC_IER                              0x0090
-#define SM_RTC_IDR                              0x0094
-#define SM_RTC_IMR                              0x0098
-#define SM_RTC_ISR                              0x009c
-#define SM_RTC_ICR                              0x00a0
-#define SM_WDT_CTRL                             0x00b0
-#define SM_WDT_CLR                              0x00b4
-#define SM_WDT_EXT                              0x00b8
-#define SM_RC_RCAUSE                            0x00c0
-#define SM_EIM_IER                              0x0100
-#define SM_EIM_IDR                              0x0104
-#define SM_EIM_IMR                              0x0108
-#define SM_EIM_ISR                              0x010c
-#define SM_EIM_ICR                              0x0110
-#define SM_EIM_MODE                             0x0114
-#define SM_EIM_EDGE                             0x0118
-#define SM_EIM_LEVEL                            0x011c
-#define SM_EIM_TEST                             0x0120
-#define SM_EIM_NMIC                             0x0124
-/* Bitfields in PM_MCCTRL */
-/* Bitfields in PM_CKSEL */
-#define SM_CPUSEL_OFFSET                        0
-#define SM_CPUSEL_SIZE                          3
-#define SM_CPUDIV_OFFSET                        7
-#define SM_CPUDIV_SIZE                          1
-#define SM_HSBSEL_OFFSET                        8
-#define SM_HSBSEL_SIZE                          3
-#define SM_HSBDIV_OFFSET                        15
-#define SM_HSBDIV_SIZE                          1
-#define SM_PBASEL_OFFSET                       16
-#define SM_PBASEL_SIZE                         3
-#define SM_PBADIV_OFFSET                       23
-#define SM_PBADIV_SIZE                         1
-#define SM_PBBSEL_OFFSET                       24
-#define SM_PBBSEL_SIZE                         3
-#define SM_PBBDIV_OFFSET                       31
-#define SM_PBBDIV_SIZE                         1
-/* Bitfields in PM_CPU_MASK */
-/* Bitfields in PM_HSB_MASK */
-/* Bitfields in PM_PBA_MASK */
-/* Bitfields in PM_PBB_MASK */
-/* Bitfields in PM_PLL0 */
-#define SM_PLLEN_OFFSET                         0
-#define SM_PLLEN_SIZE                           1
-#define SM_PLLOSC_OFFSET                        1
-#define SM_PLLOSC_SIZE                          1
-#define SM_PLLOPT_OFFSET                        2
-#define SM_PLLOPT_SIZE                          3
-#define SM_PLLDIV_OFFSET                        8
-#define SM_PLLDIV_SIZE                          8
-#define SM_PLLMUL_OFFSET                        16
-#define SM_PLLMUL_SIZE                          8
-#define SM_PLLCOUNT_OFFSET                      24
-#define SM_PLLCOUNT_SIZE                        6
-#define SM_PLLTEST_OFFSET                       31
-#define SM_PLLTEST_SIZE                         1
-/* Bitfields in PM_PLL1 */
-/* Bitfields in PM_VCTRL */
-#define SM_VAUTO_OFFSET                         0
-#define SM_VAUTO_SIZE                           1
-#define SM_PM_VCTRL_VAL_OFFSET                  8
-#define SM_PM_VCTRL_VAL_SIZE                    7
-/* Bitfields in PM_VMREF */
-#define SM_REFSEL_OFFSET                        0
-#define SM_REFSEL_SIZE                          4
-/* Bitfields in PM_VMV */
-#define SM_PM_VMV_VAL_OFFSET                    0
-#define SM_PM_VMV_VAL_SIZE                      8
-/* Bitfields in PM_IER */
-/* Bitfields in PM_IDR */
-/* Bitfields in PM_IMR */
-/* Bitfields in PM_ISR */
-/* Bitfields in PM_ICR */
-#define SM_LOCK0_OFFSET                         0
-#define SM_LOCK0_SIZE                           1
-#define SM_LOCK1_OFFSET                         1
-#define SM_LOCK1_SIZE                           1
-#define SM_WAKE_OFFSET                          2
-#define SM_WAKE_SIZE                            1
-#define SM_VOK_OFFSET                           3
-#define SM_VOK_SIZE                             1
-#define SM_VMRDY_OFFSET                         4
-#define SM_VMRDY_SIZE                           1
-#define SM_CKRDY_OFFSET                         5
-#define SM_CKRDY_SIZE                           1
-/* Bitfields in PM_GCCTRL */
-#define SM_OSCSEL_OFFSET                        0
-#define SM_OSCSEL_SIZE                          1
-#define SM_PLLSEL_OFFSET                        1
-#define SM_PLLSEL_SIZE                          1
-#define SM_CEN_OFFSET                           2
-#define SM_CEN_SIZE                             1
-#define SM_CPC_OFFSET                           3
-#define SM_CPC_SIZE                             1
-#define SM_DIVEN_OFFSET                         4
-#define SM_DIVEN_SIZE                           1
-#define SM_DIV_OFFSET                           8
-#define SM_DIV_SIZE                             8
-/* Bitfields in RTC_CTRL */
-#define SM_PCLR_OFFSET                          1
-#define SM_PCLR_SIZE                            1
-#define SM_TOPEN_OFFSET                         2
-#define SM_TOPEN_SIZE                           1
-#define SM_CLKEN_OFFSET                         3
-#define SM_CLKEN_SIZE                           1
-#define SM_PSEL_OFFSET                          8
-#define SM_PSEL_SIZE                            16
-/* Bitfields in RTC_VAL */
-#define SM_RTC_VAL_VAL_OFFSET                   0
-#define SM_RTC_VAL_VAL_SIZE                     31
-/* Bitfields in RTC_TOP */
-#define SM_RTC_TOP_VAL_OFFSET                   0
-#define SM_RTC_TOP_VAL_SIZE                     32
-/* Bitfields in RTC_IER */
-/* Bitfields in RTC_IDR */
-/* Bitfields in RTC_IMR */
-/* Bitfields in RTC_ISR */
-/* Bitfields in RTC_ICR */
-#define SM_TOPI_OFFSET                          0
-#define SM_TOPI_SIZE                            1
-/* Bitfields in WDT_CTRL */
-#define SM_KEY_OFFSET                           24
-#define SM_KEY_SIZE                             8
-/* Bitfields in WDT_CLR */
-/* Bitfields in WDT_EXT */
-/* Bitfields in RC_RCAUSE */
-#define SM_POR_OFFSET                           0
-#define SM_POR_SIZE                             1
-#define SM_BOD_OFFSET                           1
-#define SM_BOD_SIZE                             1
-#define SM_EXT_OFFSET                           2
-#define SM_EXT_SIZE                             1
-#define SM_WDT_OFFSET                           3
-#define SM_WDT_SIZE                             1
-#define SM_NTAE_OFFSET                          4
-#define SM_NTAE_SIZE                            1
-#define SM_SERP_OFFSET                          5
-#define SM_SERP_SIZE                            1
-/* Bitfields in EIM_IER */
-/* Bitfields in EIM_IDR */
-/* Bitfields in EIM_IMR */
-/* Bitfields in EIM_ISR */
-/* Bitfields in EIM_ICR */
-/* Bitfields in EIM_MODE */
-/* Bitfields in EIM_EDGE */
-#define SM_INT0_OFFSET                          0
-#define SM_INT0_SIZE                            1
-#define SM_INT1_OFFSET                          1
-#define SM_INT1_SIZE                            1
-#define SM_INT2_OFFSET                          2
-#define SM_INT2_SIZE                            1
-#define SM_INT3_OFFSET                          3
-#define SM_INT3_SIZE                            1
-/* Bitfields in EIM_LEVEL */
-/* Bitfields in EIM_TEST */
-#define SM_TESTEN_OFFSET                        31
-#define SM_TESTEN_SIZE                          1
-/* Bitfields in EIM_NMIC */
-#define SM_EN_OFFSET                            0
-#define SM_EN_SIZE                              1
-/* Bit manipulation macros */
-#define SM_BIT(name)                            (1 << SM_##name##_OFFSET)
-#define SM_BF(name,value)                       (((value) & ((1 << SM_##name##_SIZE) - 1)) << SM_##name##_OFFSET)
-#define SM_BFEXT(name,value)                    (((value) >> SM_##name##_OFFSET) & ((1 << SM_##name##_SIZE) - 1))
-#define SM_BFINS(name,value,old)                (((old) & ~(((1 << SM_##name##_SIZE) - 1) << SM_##name##_OFFSET)) | SM_BF(name,value))
-/* Register access macros */
-#define sm_readl(port,reg)                                      \
-        __raw_readl((port)->regs + SM_##reg)
-#define sm_writel(port,reg,value)                               \
-        __raw_writel((value), (port)->regs + SM_##reg)
-#endif /* __ASM_AVR32_SM_H__ */
diff --git a/arch/avr32/mm/cache.c b/arch/avr32/mm/cache.c
index 8f7b1c3cd0..c1233c615e 100644
--- a/arch/avr32/mm/cache.c
+++ b/arch/avr32/mm/cache.c
@@ -23,7 +23,6 @@
 void invalidate_dcache_region(void *start, size_t size)
 {
        unsigned long v, begin, end, linesz, mask;
-        int flush = 0;
        linesz = boot_cpu_data.dcache.linesz;
        mask = linesz - 1;
@@ -32,24 +31,21 @@ void invalidate_dcache_region(void *start, size_t size)
         * instead of invalidating ... never discard valid data!
         */
        begin = (unsigned long)start;
-        end = begin + size - 1;
+        end = begin + size;
        if (begin & mask) {
                flush_dcache_line(start);
                begin += linesz;
-                flush = 1;
        }
-        if ((end & mask) != mask) {
+        if (end & mask) {
                flush_dcache_line((void *)end);
-                end -= linesz;
+                end &= ~mask;
-                flush = 1;
        }
        /* remaining cachelines only need invalidation */
-        for (v = begin; v <= end; v += linesz)
+        for (v = begin; v < end; v += linesz)
                invalidate_dcache_line((void *)v);
-        if (flush)
+        flush_write_buffer();
-                flush_write_buffer();
 }
 void clean_dcache_region(void *start, size_t size)
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 1fad8560c7..017defaa52 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -71,6 +71,7 @@ config GENERIC_CALIBRATE_DELAY
 config IRQCHIP_DEMUX_GPIO
        bool
+        depends on (BF53x || BF561 || BF54x)
        default y
 source "init/Kconfig"
@@ -114,6 +115,26 @@ config BF537
        help
          BF537 Processor Support.
+config BF542
+        bool "BF542"
+        help
+          BF542 Processor Support.
+config BF544
+        bool "BF544"
+        help
+          BF544 Processor Support.
+config BF548
+        bool "BF548"
+        help
+          BF548 Processor Support.
+config BF549
+        bool "BF549"
+        help
+          BF549 Processor Support.
 config BF561
        bool "BF561"
        help
@@ -125,6 +146,11 @@ choice
        prompt "Silicon Rev"
        default BF_REV_0_2 if BF537
        default BF_REV_0_3 if BF533
+        default BF_REV_0_0 if BF549
+config BF_REV_0_0
+        bool "0.0"
+        depends on (BF549)
 config BF_REV_0_2
        bool "0.2"
@@ -142,8 +168,24 @@ config BF_REV_0_5
        bool "0.5"
        depends on (BF561 || BF533 || BF532 || BF531)
+config BF_REV_ANY
+        bool "any"
+config BF_REV_NONE
+        bool "none"
 endchoice
+config BF53x
+        bool
+        depends on (BF531 || BF532 || BF533 || BF534 || BF536 || BF537)
+        default y
+config BF54x
+        bool
+        depends on (BF542 || BF544 || BF548 || BF549)
+        default y
 config BFIN_DUAL_CORE
        bool
        depends on (BF561)
@@ -192,6 +234,12 @@ config BFIN537_BLUETECHNIX_CM
        help
          CM-BF537 support for EVAL- and DEV-Board.
+config BFIN548_EZKIT
+        bool "BF548-EZKIT"
+        depends on (BF548 || BF549)
+          help
+          BFIN548-EZKIT board Support.
 config BFIN561_BLUETECHNIX_CM
        bool "Bluetechnix CM-BF561"
        depends on (BF561)
@@ -259,6 +307,7 @@ config BFIN_SHARED_FLASH_ENET
 source "arch/blackfin/mach-bf533/Kconfig"
 source "arch/blackfin/mach-bf561/Kconfig"
 source "arch/blackfin/mach-bf537/Kconfig"
+source "arch/blackfin/mach-bf548/Kconfig"
 menu "Board customizations"
@@ -491,7 +540,8 @@ config IP_CHECKSUM_L1
 config CACHELINE_ALIGNED_L1
        bool "Locate cacheline_aligned data to L1 Data Memory"
-        default y
+        default y if !BF54x
+        default n if BF54x
        depends on !BF531
        help
          If enabled cacheline_anligned data is linked
@@ -535,9 +585,17 @@ endchoice
 source "mm/Kconfig"
+config LARGE_ALLOCS
+        bool "Allow allocating large blocks (> 1MB) of memory"
+        help
+          Allow the slab memory allocator to keep chains for very large
+          memory sizes - upto 32MB. You may need this if your system has
+          a lot of RAM, and you need to able to allocate very large
+          contiguous chunks. If unsure, say N.
 config BFIN_DMA_5XX
        bool "Enable DMA Support"
-        depends on (BF533 || BF532 || BF531 || BF537 || BF536 || BF534 || BF561)
+        depends on (BF533 || BF532 || BF531 || BF537 || BF536 || BF534 || BF561 || BF54x)
        default y
        help
          DMA driver for BF5xx.
@@ -680,6 +738,7 @@ config C_AMCKEN
 config C_CDPRIO
        bool "DMA has priority over core for ext. accesses"
+        depends on !BF54x
        default n
 config C_B0PEN
@@ -833,7 +892,7 @@ endchoice
 endmenu
-if (BF537 || BF533)
+if (BF537 || BF533 || BF54x)
 menu "CPU Frequency scaling"
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile
index 75e89c3247..1b75672dfc 100644
--- a/arch/blackfin/Makefile
+++ b/arch/blackfin/Makefile
@@ -24,10 +24,33 @@ machine-$(CONFIG_BF533) := bf533
 machine-$(CONFIG_BF534) := bf537
 machine-$(CONFIG_BF536) := bf537
 machine-$(CONFIG_BF537) := bf537
+machine-$(CONFIG_BF548) := bf548
+machine-$(CONFIG_BF549) := bf548
 machine-$(CONFIG_BF561) := bf561
 MACHINE := $(machine-y)
 export MACHINE
+cpu-$(CONFIG_BF531) := bf531
+cpu-$(CONFIG_BF532) := bf532
+cpu-$(CONFIG_BF533) := bf533
+cpu-$(CONFIG_BF534) := bf534
+cpu-$(CONFIG_BF536) := bf536
+cpu-$(CONFIG_BF537) := bf537
+cpu-$(CONFIG_BF548) := bf548
+cpu-$(CONFIG_BF549) := bf549
+cpu-$(CONFIG_BF561) := bf561
+rev-$(CONFIG_BF_REV_0_0)  := 0.0
+rev-$(CONFIG_BF_REV_0_1)  := 0.1
+rev-$(CONFIG_BF_REV_0_2)  := 0.2
+rev-$(CONFIG_BF_REV_0_3)  := 0.3
+rev-$(CONFIG_BF_REV_0_4)  := 0.4
+rev-$(CONFIG_BF_REV_0_5)  := 0.5
+rev-$(CONFIG_BF_REV_NONE) := none
+rev-$(CONFIG_BF_REV_ANY)  := any
+CFLAGS += -mcpu=$(cpu-y)-$(rev-y)
+AFLAGS += -mcpu=$(cpu-y)-$(rev-y)
 head-y   := arch/$(ARCH)/mach-$(MACHINE)/head.o arch/$(ARCH)/kernel/init_task.o
diff --git a/arch/blackfin/boot/Makefile b/arch/blackfin/boot/Makefile
index 49e8098d4c..8cd33560e8 100644
--- a/arch/blackfin/boot/Makefile
+++ b/arch/blackfin/boot/Makefile
@@ -13,7 +13,8 @@ extra-y += vmlinux.bin vmlinux.gz
 quiet_cmd_uimage = UIMAGE  $@
      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(ARCH) -O linux -T kernel \
-                   -C gzip -a $(CONFIG_BOOT_LOAD) -e $(CONFIG_BOOT_LOAD) -n 'Linux-$(KERNELRELEASE)' \
+                   -C gzip -n 'Linux-$(KERNELRELEASE)' -a $(CONFIG_BOOT_LOAD) \
+                   -e $(shell $(NM) vmlinux | awk '$$NF == "__start" {print $$1}') \
                   -d $< $@
 $(obj)/vmlinux.bin: vmlinux FORCE
diff --git a/arch/blackfin/configs/BF533-EZKIT_defconfig b/arch/blackfin/configs/BF533-EZKIT_defconfig
index 90d58aabe6..1cf1ab28dc 100644
--- a/arch/blackfin/configs/BF533-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF533-EZKIT_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21.3
+# Linux kernel version: 2.6.21.5
 #
 # CONFIG_MMU is not set
 # CONFIG_FPU is not set
@@ -115,17 +115,26 @@ CONFIG_BF533=y
 # CONFIG_BF534 is not set
 # CONFIG_BF536 is not set
 # CONFIG_BF537 is not set
+# CONFIG_BF542 is not set
+# CONFIG_BF544 is not set
+# CONFIG_BF548 is not set
+# CONFIG_BF549 is not set
 # CONFIG_BF561 is not set
+# CONFIG_BF_REV_0_0 is not set
 # CONFIG_BF_REV_0_2 is not set
 CONFIG_BF_REV_0_3=y
 # CONFIG_BF_REV_0_4 is not set
 # CONFIG_BF_REV_0_5 is not set
+# CONFIG_BF_REV_ANY is not set
+# CONFIG_BF_REV_NONE is not set
+CONFIG_BF53x=y
 CONFIG_BFIN_SINGLE_CORE=y
 CONFIG_BFIN533_EZKIT=y
 # CONFIG_BFIN533_STAMP is not set
 # CONFIG_BFIN537_STAMP is not set
 # CONFIG_BFIN533_BLUETECHNIX_CM is not set
 # CONFIG_BFIN537_BLUETECHNIX_CM is not set
+# CONFIG_BFIN548_EZKIT is not set
 # CONFIG_BFIN561_BLUETECHNIX_CM is not set
 # CONFIG_BFIN561_EZKIT is not set
 # CONFIG_BFIN561_TEPLA is not set
@@ -634,6 +643,7 @@ CONFIG_NETDEVICES=y
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_SMC91X=y
+# CONFIG_SMSC911X is not set
 #
 # Ethernet (1000 Mbit)
diff --git a/arch/blackfin/configs/BF533-STAMP_defconfig b/arch/blackfin/configs/BF533-STAMP_defconfig
index fee9189573..64b7f1b3b2 100644
--- a/arch/blackfin/configs/BF533-STAMP_defconfig
+++ b/arch/blackfin/configs/BF533-STAMP_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21.3
+# Linux kernel version: 2.6.21.5
 #
 # CONFIG_MMU is not set
 # CONFIG_FPU is not set
@@ -115,17 +115,26 @@ CONFIG_BF533=y
 # CONFIG_BF534 is not set
 # CONFIG_BF536 is not set
 # CONFIG_BF537 is not set
+# CONFIG_BF542 is not set
+# CONFIG_BF544 is not set
+# CONFIG_BF548 is not set
+# CONFIG_BF549 is not set
 # CONFIG_BF561 is not set
+# CONFIG_BF_REV_0_0 is not set
 # CONFIG_BF_REV_0_2 is not set
 CONFIG_BF_REV_0_3=y
 # CONFIG_BF_REV_0_4 is not set
 # CONFIG_BF_REV_0_5 is not set
+# CONFIG_BF_REV_ANY is not set
+# CONFIG_BF_REV_NONE is not set
+CONFIG_BF53x=y
 CONFIG_BFIN_SINGLE_CORE=y
 # CONFIG_BFIN533_EZKIT is not set
 CONFIG_BFIN533_STAMP=y
 # CONFIG_BFIN537_STAMP is not set
 # CONFIG_BFIN533_BLUETECHNIX_CM is not set
 # CONFIG_BFIN537_BLUETECHNIX_CM is not set
+# CONFIG_BFIN548_EZKIT is not set
 # CONFIG_BFIN561_BLUETECHNIX_CM is not set
 # CONFIG_BFIN561_EZKIT is not set
 # CONFIG_BFIN561_TEPLA is not set
@@ -646,6 +655,7 @@ CONFIG_NETDEVICES=y
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_SMC91X=y
+# CONFIG_SMSC911X is not set
 #
 # Ethernet (1000 Mbit)
@@ -986,9 +996,17 @@ CONFIG_SND_VERBOSE_PROCFS=y
 #
 # ALSA Blackfin devices
 #
-# CONFIG_SND_BLACKFIN_AD1836 is not set
+CONFIG_SND_BLACKFIN_AD1836=m
-# CONFIG_SND_BLACKFIN_AD1981B is not set
+CONFIG_SND_BLACKFIN_AD1836_TDM=y
-# CONFIG_SND_BFIN_AD73311 is not set
+# CONFIG_SND_BLACKFIN_AD1836_I2S is not set
+CONFIG_SND_BLACKFIN_AD1836_MULSUB=y
+# CONFIG_SND_BLACKFIN_AD1836_5P1 is not set
+CONFIG_SND_BLACKFIN_AD1981B=m
+CONFIG_SND_BLACKFIN_SPORT=0
+CONFIG_SND_BLACKFIN_SPI_PFBIT=4
+CONFIG_SND_BFIN_AD73311=m
+CONFIG_SND_BFIN_SPORT=0
+CONFIG_SND_BFIN_AD73311_SE=4
 #
 # SoC audio support
diff --git a/arch/blackfin/configs/BF537-STAMP_defconfig b/arch/blackfin/configs/BF537-STAMP_defconfig
index 37688bb55b..ccf09dc09a 100644
--- a/arch/blackfin/configs/BF537-STAMP_defconfig
+++ b/arch/blackfin/configs/BF537-STAMP_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21.3
+# Linux kernel version: 2.6.21.5
 #
 # CONFIG_MMU is not set
 # CONFIG_FPU is not set
@@ -115,17 +115,26 @@ CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_BF534 is not set
 # CONFIG_BF536 is not set
 CONFIG_BF537=y
+# CONFIG_BF542 is not set
+# CONFIG_BF544 is not set
+# CONFIG_BF548 is not set
+# CONFIG_BF549 is not set
 # CONFIG_BF561 is not set
+# CONFIG_BF_REV_0_0 is not set
 CONFIG_BF_REV_0_2=y
 # CONFIG_BF_REV_0_3 is not set
 # CONFIG_BF_REV_0_4 is not set
 # CONFIG_BF_REV_0_5 is not set
+# CONFIG_BF_REV_ANY is not set
+# CONFIG_BF_REV_NONE is not set
+CONFIG_BF53x=y
 CONFIG_BFIN_SINGLE_CORE=y
 # CONFIG_BFIN533_EZKIT is not set
 # CONFIG_BFIN533_STAMP is not set
 CONFIG_BFIN537_STAMP=y
 # CONFIG_BFIN533_BLUETECHNIX_CM is not set
 # CONFIG_BFIN537_BLUETECHNIX_CM is not set
+# CONFIG_BFIN548_EZKIT is not set
 # CONFIG_BFIN561_BLUETECHNIX_CM is not set
 # CONFIG_BFIN561_EZKIT is not set
 # CONFIG_BFIN561_TEPLA is not set
@@ -664,6 +673,7 @@ CONFIG_BFIN_MAC_USE_L1=y
 CONFIG_BFIN_TX_DESC_NUM=10
 CONFIG_BFIN_RX_DESC_NUM=20
 # CONFIG_BFIN_MAC_RMII is not set
+# CONFIG_SMSC911X is not set
 #
 # Ethernet (1000 Mbit)
@@ -1020,9 +1030,17 @@ CONFIG_SND_VERBOSE_PROCFS=y
 #
 # ALSA Blackfin devices
 #
-# CONFIG_SND_BLACKFIN_AD1836 is not set
+CONFIG_SND_BLACKFIN_AD1836=m
-# CONFIG_SND_BLACKFIN_AD1981B is not set
+CONFIG_SND_BLACKFIN_AD1836_TDM=y
-# CONFIG_SND_BFIN_AD73311 is not set
+# CONFIG_SND_BLACKFIN_AD1836_I2S is not set
+CONFIG_SND_BLACKFIN_AD1836_MULSUB=y
+# CONFIG_SND_BLACKFIN_AD1836_5P1 is not set
+CONFIG_SND_BLACKFIN_AD1981B=m
+CONFIG_SND_BLACKFIN_SPORT=0
+CONFIG_SND_BLACKFIN_SPI_PFBIT=4
+CONFIG_SND_BFIN_AD73311=m
+CONFIG_SND_BFIN_SPORT=0
+CONFIG_SND_BFIN_AD73311_SE=4
 #
 # SoC audio support
diff --git a/arch/blackfin/configs/BF548-EZKIT_defconfig b/arch/blackfin/configs/BF548-EZKIT_defconfig
new file mode 100644
index 0000000000..ac8390fafa
--- /dev/null
+++ b/arch/blackfin/configs/BF548-EZKIT_defconfig
@@ -0,0 +1,1100 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.21.5
+#
+# CONFIG_MMU is not set
+# CONFIG_FPU is not set
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+CONFIG_BLACKFIN=y
+CONFIG_ZONE_DMA=y
+CONFIG_BFIN=y
+CONFIG_SEMAPHORE_SLEEPERS=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+# CONFIG_GENERIC_TIME is not set
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_FORCE_MAX_ZONEORDER=14
+CONFIG_IRQCHIP_DEMUX_GPIO=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3
+# CONFIG_NP2 is not set
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+CONFIG_TINY_SHMEM=y
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+# CONFIG_IOSCHED_DEADLINE is not set
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+#
+# Blackfin Processor Options
+#
+#
+# Processor and Board Settings
+#
+# CONFIG_BF531 is not set
+# CONFIG_BF532 is not set
+# CONFIG_BF533 is not set
+# CONFIG_BF534 is not set
+# CONFIG_BF536 is not set
+# CONFIG_BF537 is not set
+# CONFIG_BF542 is not set
+# CONFIG_BF544 is not set
+# CONFIG_BF548 is not set
+CONFIG_BF549=y
+# CONFIG_BF561 is not set
+CONFIG_BF_REV_0_0=y
+# CONFIG_BF_REV_0_2 is not set
+# CONFIG_BF_REV_0_3 is not set
+# CONFIG_BF_REV_0_4 is not set
+# CONFIG_BF_REV_0_5 is not set
+# CONFIG_BF_REV_ANY is not set
+# CONFIG_BF_REV_NONE is not set
+CONFIG_BF54x=y
+CONFIG_BFIN_SINGLE_CORE=y
+# CONFIG_BFIN533_EZKIT is not set
+# CONFIG_BFIN533_STAMP is not set
+# CONFIG_BFIN537_STAMP is not set
+# CONFIG_BFIN533_BLUETECHNIX_CM is not set
+# CONFIG_BFIN537_BLUETECHNIX_CM is not set
+CONFIG_BFIN548_EZKIT=y
+# CONFIG_BFIN561_BLUETECHNIX_CM is not set
+# CONFIG_BFIN561_EZKIT is not set
+# CONFIG_BFIN561_TEPLA is not set
+# CONFIG_PNAV10 is not set
+# CONFIG_GENERIC_BOARD is not set
+CONFIG_IRQ_PLL_WAKEUP=7
+CONFIG_IRQ_TIMER0=11
+CONFIG_IRQ_TIMER1=11
+CONFIG_IRQ_TIMER2=11
+CONFIG_IRQ_TIMER3=11
+CONFIG_IRQ_TIMER4=11
+CONFIG_IRQ_TIMER5=11
+CONFIG_IRQ_TIMER6=11
+CONFIG_IRQ_TIMER7=11
+CONFIG_IRQ_TIMER8=11
+CONFIG_IRQ_TIMER9=11
+CONFIG_IRQ_TIMER10=11
+CONFIG_IRQ_RTC=8
+CONFIG_IRQ_SPORT0_RX=9
+CONFIG_IRQ_SPORT0_TX=9
+CONFIG_IRQ_SPORT1_RX=9
+CONFIG_IRQ_SPORT1_TX=9
+CONFIG_IRQ_UART0_RX=10
+CONFIG_IRQ_UART0_TX=10
+CONFIG_IRQ_UART1_RX=10
+CONFIG_IRQ_UART1_TX=10
+#
+# BF548 Specific Configuration
+#
+#
+# Interrupt Priority Assignment
+#
+#
+# Priority
+#
+CONFIG_IRQ_DMAC0_ERR=7
+CONFIG_IRQ_EPPI0_ERR=7
+CONFIG_IRQ_SPORT0_ERR=7
+CONFIG_IRQ_SPORT1_ERR=7
+CONFIG_IRQ_SPI0_ERR=7
+CONFIG_IRQ_UART0_ERR=7
+CONFIG_IRQ_EPPI0=8
+CONFIG_IRQ_SPI0=10
+CONFIG_IRQ_PINT0=12
+CONFIG_IRQ_PINT1=12
+CONFIG_IRQ_MDMAS0=13
+CONFIG_IRQ_MDMAS1=13
+CONFIG_IRQ_WATCHDOG=13
+CONFIG_IRQ_DMAC1_ERR=7
+CONFIG_IRQ_SPORT2_ERR=7
+CONFIG_IRQ_SPORT3_ERR=7
+CONFIG_IRQ_MXVR_DATA=7
+CONFIG_IRQ_SPI1_ERR=7
+CONFIG_IRQ_SPI2_ERR=7
+CONFIG_IRQ_UART1_ERR=7
+CONFIG_IRQ_UART2_ERR=7
+CONFIG_IRQ_CAN0_ERR=7
+CONFIG_IRQ_SPORT2_RX=9
+CONFIG_IRQ_SPORT2_TX=9
+CONFIG_IRQ_SPORT3_RX=9
+CONFIG_IRQ_SPORT3_TX=9
+CONFIG_IRQ_EPPI1=9
+CONFIG_IRQ_EPPI2=9
+CONFIG_IRQ_SPI1=10
+CONFIG_IRQ_SPI2=10
+CONFIG_IRQ_ATAPI_RX=10
+CONFIG_IRQ_ATAPI_TX=10
+CONFIG_IRQ_TWI0=11
+CONFIG_IRQ_TWI1=11
+CONFIG_IRQ_CAN0_RX=11
+CONFIG_IRQ_CAN0_TX=11
+CONFIG_IRQ_MDMAS2=13
+CONFIG_IRQ_MDMAS3=13
+CONFIG_IRQ_MXVR_ERR=11
+CONFIG_IRQ_MXVR_MSG=11
+CONFIG_IRQ_MXVR_PKT=11
+CONFIG_IRQ_EPPI1_ERR=7
+CONFIG_IRQ_EPPI2_ERR=7
+CONFIG_IRQ_UART3_ERR=7
+CONFIG_IRQ_HOST_ERR=7
+CONFIG_IRQ_PIXC_ERR=7
+CONFIG_IRQ_NFC_ERR=7
+CONFIG_IRQ_ATAPI_ERR=7
+CONFIG_IRQ_CAN1_ERR=7
+CONFIG_IRQ_HS_DMA_ERR=7
+CONFIG_IRQ_PIXC_IN0=8
+CONFIG_IRQ_PIXC_IN1=8
+CONFIG_IRQ_PIXC_OUT=8
+CONFIG_IRQ_SDH=8
+CONFIG_IRQ_CNT=8
+CONFIG_IRQ_KEY=8
+CONFIG_IRQ_CAN1_RX=11
+CONFIG_IRQ_CAN1_TX=11
+CONFIG_IRQ_SDH_MASK0=11
+CONFIG_IRQ_SDH_MASK1=11
+CONFIG_IRQ_USB_INT0=11
+CONFIG_IRQ_USB_INT1=11
+CONFIG_IRQ_USB_INT2=11
+CONFIG_IRQ_USB_DMA=11
+CONFIG_IRQ_OTPSEC=11
+CONFIG_IRQ_PINT2=11
+CONFIG_IRQ_PINT3=11
+#
+# Board customizations
+#
+# CONFIG_CMDLINE_BOOL is not set
+#
+# Board Setup
+#
+CONFIG_CLKIN_HZ=25000000
+CONFIG_MEM_SIZE=64
+CONFIG_MEM_ADD_WIDTH=10
+CONFIG_BOOT_LOAD=0x1000
+#
+# Blackfin Kernel Optimizations
+#
+#
+# Timer Tick
+#
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+#
+# Memory Optimizations
+#
+CONFIG_I_ENTRY_L1=y
+CONFIG_EXCPT_IRQ_SYSC_L1=y
+CONFIG_DO_IRQ_L1=y
+CONFIG_CORE_TIMER_IRQ_L1=y
+CONFIG_IDLE_L1=y
+CONFIG_SCHEDULE_L1=y
+CONFIG_ARITHMETIC_OPS_L1=y
+CONFIG_ACCESS_OK_L1=y
+CONFIG_MEMSET_L1=y
+CONFIG_MEMCPY_L1=y
+CONFIG_SYS_BFIN_SPINLOCK_L1=y
+# CONFIG_IP_CHECKSUM_L1 is not set
+CONFIG_CACHELINE_ALIGNED_L1=y
+# CONFIG_SYSCALL_TAB_L1 is not set
+# CONFIG_CPLB_SWITCH_TAB_L1 is not set
+CONFIG_RAMKERNEL=y
+# CONFIG_ROMKERNEL is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_LARGE_ALLOCS=y
+CONFIG_BFIN_DMA_5XX=y
+# CONFIG_DMA_UNCACHED_2M is not set
+CONFIG_DMA_UNCACHED_1M=y
+# CONFIG_DMA_UNCACHED_NONE is not set
+#
+# Cache Support
+#
+CONFIG_BLKFIN_CACHE=y
+CONFIG_BLKFIN_DCACHE=y
+# CONFIG_BLKFIN_DCACHE_BANKA is not set
+# CONFIG_BLKFIN_CACHE_LOCK is not set
+# CONFIG_BLKFIN_WB is not set
+CONFIG_BLKFIN_WT=y
+CONFIG_L1_MAX_PIECE=16
+#
+# Clock Settings
+#
+# CONFIG_BFIN_KERNEL_CLOCK is not set
+#
+# Asynchonous Memory Configuration
+#
+#
+# EBIU_AMBCTL Global Control
+#
+CONFIG_C_AMCKEN=y
+CONFIG_C_CDPRIO=y
+# CONFIG_C_AMBEN is not set
+# CONFIG_C_AMBEN_B0 is not set
+# CONFIG_C_AMBEN_B0_B1 is not set
+# CONFIG_C_AMBEN_B0_B1_B2 is not set
+CONFIG_C_AMBEN_ALL=y
+#
+# EBIU_AMBCTL Control
+#
+CONFIG_BANK_0=0x7BB0
+CONFIG_BANK_1=0x7BB0
+CONFIG_BANK_2=0x7BB0
+CONFIG_BANK_3=0x99B3
+#
+# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
+#
+# CONFIG_PCI is not set
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+#
+# PCI Hotplug Support
+#
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF_FDPIC=y
+CONFIG_BINFMT_FLAT=y
+CONFIG_BINFMT_ZFLAT=y
+# CONFIG_BINFMT_SHARED_FLAT is not set
+# CONFIG_BINFMT_MISC is not set
+#
+# Power management options
+#
+# CONFIG_PM is not set
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+#
+# Networking
+#
+CONFIG_NET=y
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETLABEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+#
+# Device Drivers
+#
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+#
+# User Modules And Translation Layers
+#
+# CONFIG_MTD_CHAR is not set
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_RAM=y
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_BF5xx is not set
+CONFIG_MTD_UCLINUX=y
+# CONFIG_MTD_PLATRAM is not set
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+#
+# Plug and Play support
+#
+# CONFIG_PNPACPI is not set
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+#
+# Misc devices
+#
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_NETLINK is not set
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+#
+# IEEE 1394 (FireWire) support
+#
+#
+# I2O device support
+#
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_SMC91X is not set
+# CONFIG_SMSC911X is not set
+#
+# Ethernet (1000 Mbit)
+#
+#
+# Ethernet (10000 Mbit)
+#
+#
+# Token Ring devices
+#
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_UINPUT is not set
+# CONFIG_BF53X_PFBUTTONS is not set
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+#
+# Character devices
+#
+# CONFIG_AD9960 is not set
+# CONFIG_SPI_ADC_BF533 is not set
+# CONFIG_BF5xx_PFLAGS is not set
+# CONFIG_BF5xx_PPIFCD is not set
+# CONFIG_BF5xx_TIMERS is not set
+# CONFIG_BF5xx_PPI is not set
+# CONFIG_BFIN_SPORT is not set
+# CONFIG_BFIN_TIMER_LATENCY is not set
+# CONFIG_BF5xx_FBDMA is not set
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_BFIN=y
+CONFIG_SERIAL_BFIN_CONSOLE=y
+# CONFIG_SERIAL_BFIN_DMA is not set
+CONFIG_SERIAL_BFIN_PIO=y
+# CONFIG_SERIAL_BFIN_UART0 is not set
+CONFIG_SERIAL_BFIN_UART1=y
+# CONFIG_BFIN_UART1_CTSRTS is not set
+# CONFIG_SERIAL_BFIN_UART2 is not set
+# CONFIG_SERIAL_BFIN_UART3 is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_BFIN_SPORT is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+#
+# CAN, the car bus and industrial fieldbus
+#
+# CONFIG_CAN4LINUX is not set
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_GEN_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+#
+# Graphics support
+#
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_FB is not set
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+#
+# HID Devices
+#
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB is not set
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+#
+# LED drivers
+#
+#
+# LED Triggers
+#
+#
+# InfiniBand support
+#
+#
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+#
+#
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+#
+# RTC drivers
+#
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
+CONFIG_RTC_DRV_BFIN=y
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+#
+# DMA Clients
+#
+#
+# DMA Devices
+#
+#
+# Auxiliary Display support
+#
+#
+# Virtualization
+#
+#
+# PBX support
+#
+# CONFIG_PBX is not set
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+# CONFIG_EXT2_FS_POSIX_ACL is not set
+# CONFIG_EXT2_FS_SECURITY is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+# CONFIG_TMPFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_YAFFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+#
+# Network File Systems
+#
+# CONFIG_NFS_FS is not set
+# CONFIG_NFSD is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FRAME_POINTER=y
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_DEBUG_HWERR=y
+# CONFIG_DEBUG_ICACHE_CHECK is not set
+# CONFIG_DEBUG_KERNEL_START is not set
+# CONFIG_DEBUG_SERIAL_EARLY_INIT is not set
+CONFIG_DEBUG_HUNT_FOR_ZERO=y
+# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
+CONFIG_CPLB_INFO=y
+CONFIG_ACCESS_CHECK=y
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+CONFIG_SECURITY=y
+# CONFIG_SECURITY_NETWORK is not set
+CONFIG_SECURITY_CAPABILITIES=y
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
diff --git a/arch/blackfin/configs/BF561-EZKIT_defconfig b/arch/blackfin/configs/BF561-EZKIT_defconfig
index fe4e67deba..51c0b6f977 100644
--- a/arch/blackfin/configs/BF561-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF561-EZKIT_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21.3
+# Linux kernel version: 2.6.21.5
 #
 # CONFIG_MMU is not set
 # CONFIG_FPU is not set
@@ -115,17 +115,25 @@ CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_BF534 is not set
 # CONFIG_BF536 is not set
 # CONFIG_BF537 is not set
+# CONFIG_BF542 is not set
+# CONFIG_BF544 is not set
+# CONFIG_BF548 is not set
+# CONFIG_BF549 is not set
 CONFIG_BF561=y
+# CONFIG_BF_REV_0_0 is not set
 # CONFIG_BF_REV_0_2 is not set
 CONFIG_BF_REV_0_3=y
 # CONFIG_BF_REV_0_4 is not set
 # CONFIG_BF_REV_0_5 is not set
+# CONFIG_BF_REV_ANY is not set
+# CONFIG_BF_REV_NONE is not set
 CONFIG_BFIN_DUAL_CORE=y
 # CONFIG_BFIN533_EZKIT is not set
 # CONFIG_BFIN533_STAMP is not set
 # CONFIG_BFIN537_STAMP is not set
 # CONFIG_BFIN533_BLUETECHNIX_CM is not set
 # CONFIG_BFIN537_BLUETECHNIX_CM is not set
+# CONFIG_BFIN548_EZKIT is not set
 # CONFIG_BFIN561_BLUETECHNIX_CM is not set
 CONFIG_BFIN561_EZKIT=y
 # CONFIG_BFIN561_TEPLA is not set
@@ -673,6 +681,7 @@ CONFIG_NETDEVICES=y
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_SMC91X=y
+# CONFIG_SMSC911X is not set
 #
 # Ethernet (1000 Mbit)
@@ -801,7 +810,6 @@ CONFIG_WATCHDOG=y
 CONFIG_BFIN_WDT=y
 CONFIG_HW_RANDOM=y
 # CONFIG_GEN_RTC is not set
-# CONFIG_BLACKFIN_DPMC is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
diff --git a/arch/blackfin/configs/PNAV-10_defconfig b/arch/blackfin/configs/PNAV-10_defconfig
index a783ff69ac..983ed181c8 100644
--- a/arch/blackfin/configs/PNAV-10_defconfig
+++ b/arch/blackfin/configs/PNAV-10_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21.3
+# Linux kernel version: 2.6.21.5
 #
 # CONFIG_MMU is not set
 # CONFIG_FPU is not set
@@ -114,17 +114,26 @@ CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_BF534 is not set
 # CONFIG_BF536 is not set
 CONFIG_BF537=y
+# CONFIG_BF542 is not set
+# CONFIG_BF544 is not set
+# CONFIG_BF548 is not set
+# CONFIG_BF549 is not set
 # CONFIG_BF561 is not set
+# CONFIG_BF_REV_0_0 is not set
 CONFIG_BF_REV_0_2=y
 # CONFIG_BF_REV_0_3 is not set
 # CONFIG_BF_REV_0_4 is not set
 # CONFIG_BF_REV_0_5 is not set
+# CONFIG_BF_REV_ANY is not set
+# CONFIG_BF_REV_NONE is not set
+CONFIG_BF53x=y
 CONFIG_BFIN_SINGLE_CORE=y
 # CONFIG_BFIN533_EZKIT is not set
 # CONFIG_BFIN533_STAMP is not set
 # CONFIG_BFIN537_STAMP is not set
 # CONFIG_BFIN533_BLUETECHNIX_CM is not set
 # CONFIG_BFIN537_BLUETECHNIX_CM is not set
+# CONFIG_BFIN548_EZKIT is not set
 # CONFIG_BFIN561_BLUETECHNIX_CM is not set
 # CONFIG_BFIN561_EZKIT is not set
 # CONFIG_BFIN561_TEPLA is not set
@@ -598,6 +607,7 @@ CONFIG_BFIN_MAC=y
 CONFIG_BFIN_TX_DESC_NUM=100
 CONFIG_BFIN_RX_DESC_NUM=100
 CONFIG_BFIN_MAC_RMII=y
+# CONFIG_SMSC911X is not set
 #
 # Ethernet (1000 Mbit)
@@ -746,7 +756,6 @@ CONFIG_CAN_BLACKFIN=m
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_GEN_RTC is not set
-CONFIG_BLACKFIN_DPMC=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
diff --git a/arch/blackfin/kernel/Makefile b/arch/blackfin/kernel/Makefile
index f3b7d2f9d4..f429ebc3a9 100644
--- a/arch/blackfin/kernel/Makefile
+++ b/arch/blackfin/kernel/Makefile
@@ -6,9 +6,12 @@ extra-y := init_task.o vmlinux.lds
 obj-y := \
        entry.o process.o bfin_ksyms.o ptrace.o setup.o signal.o \
-        sys_bfin.o time.o traps.o irqchip.o dma-mapping.o bfin_gpio.o \
+        sys_bfin.o time.o traps.o irqchip.o dma-mapping.o flat.o \
-        flat.o
+        fixed_code.o cplbinit.o cacheinit.o
+obj-$(CONFIG_BF53x)                  += bfin_gpio.o
+obj-$(CONFIG_BF561)                  += bfin_gpio.o
 obj-$(CONFIG_MODULES)                += module.o
 obj-$(CONFIG_BFIN_DMA_5XX)           += bfin_dma_5xx.o
 obj-$(CONFIG_DUAL_CORE_TEST_MODULE)  += dualcore_test.o
+obj-$(CONFIG_KGDB)                   += kgdb.o
diff --git a/arch/blackfin/kernel/asm-offsets.c b/arch/blackfin/kernel/asm-offsets.c
index e455f45045..b56b2741cd 100644
--- a/arch/blackfin/kernel/asm-offsets.c
+++ b/arch/blackfin/kernel/asm-offsets.c
@@ -32,11 +32,10 @@
 #include <linux/kernel_stat.h>
 #include <linux/ptrace.h>
 #include <linux/hardirq.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
-#include <asm/thread_info.h>
+#include <linux/thread_info.h>
-#define DEFINE(sym, val) \
+#define DEFINE(sym, val) asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
 int main(void)
 {
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c
index 069a896a8f..7cf02f02a1 100644
--- a/arch/blackfin/kernel/bfin_dma_5xx.c
+++ b/arch/blackfin/kernel/bfin_dma_5xx.c
@@ -34,6 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/param.h>
+#include <asm/blackfin.h>
 #include <asm/dma.h>
 #include <asm/cacheflush.h>
@@ -45,67 +46,6 @@
 ***************************************************************************/
 static struct dma_channel dma_ch[MAX_BLACKFIN_DMA_CHANNEL];
-#if defined (CONFIG_BF561)
-static struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = {
-        (struct dma_register *) DMA1_0_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_1_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_2_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_3_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_4_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_5_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_6_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_7_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_8_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_9_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_10_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_11_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_0_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_1_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_2_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_3_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_4_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_5_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_6_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_7_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_8_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_9_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_10_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_11_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA1_D0_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA1_S0_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA1_D1_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA1_S1_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA2_D0_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA2_S0_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA2_D1_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA2_S1_NEXT_DESC_PTR,
-        (struct dma_register *) IMDMA_D0_NEXT_DESC_PTR,
-        (struct dma_register *) IMDMA_S0_NEXT_DESC_PTR,
-        (struct dma_register *) IMDMA_D1_NEXT_DESC_PTR,
-        (struct dma_register *) IMDMA_S1_NEXT_DESC_PTR,
-};
-#else
-static struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = {
-        (struct dma_register *) DMA0_NEXT_DESC_PTR,
-        (struct dma_register *) DMA1_NEXT_DESC_PTR,
-        (struct dma_register *) DMA2_NEXT_DESC_PTR,
-        (struct dma_register *) DMA3_NEXT_DESC_PTR,
-        (struct dma_register *) DMA4_NEXT_DESC_PTR,
-        (struct dma_register *) DMA5_NEXT_DESC_PTR,
-        (struct dma_register *) DMA6_NEXT_DESC_PTR,
-        (struct dma_register *) DMA7_NEXT_DESC_PTR,
-#if (defined(CONFIG_BF537) || defined(CONFIG_BF534) || defined(CONFIG_BF536))
-        (struct dma_register *) DMA8_NEXT_DESC_PTR,
-        (struct dma_register *) DMA9_NEXT_DESC_PTR,
-        (struct dma_register *) DMA10_NEXT_DESC_PTR,
-        (struct dma_register *) DMA11_NEXT_DESC_PTR,
-#endif
-        (struct dma_register *) MDMA_D0_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA_S0_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA_D1_NEXT_DESC_PTR,
-        (struct dma_register *) MDMA_S1_NEXT_DESC_PTR,
-};
-#endif
 /*------------------------------------------------------------------------------
 *       Set the Buffer Clear bit in the Configuration register of specific DMA
@@ -138,149 +78,6 @@ static int __init blackfin_dma_init(void)
 arch_initcall(blackfin_dma_init);
-/*
- *      Form the channel find the irq number for that channel.
- */
-#if !defined(CONFIG_BF561)
-static int bf533_channel2irq(unsigned int channel)
-{
-        int ret_irq = -1;
-        switch (channel) {
-        case CH_PPI:
-                ret_irq = IRQ_PPI;
-                break;
-#if (defined(CONFIG_BF537) || defined(CONFIG_BF534) || defined(CONFIG_BF536))
-        case CH_EMAC_RX:
-                ret_irq = IRQ_MAC_RX;
-                break;
-        case CH_EMAC_TX:
-                ret_irq = IRQ_MAC_TX;
-                break;
-        case CH_UART1_RX:
-                ret_irq = IRQ_UART1_RX;
-                break;
-        case CH_UART1_TX:
-                ret_irq = IRQ_UART1_TX;
-                break;
-#endif
-        case CH_SPORT0_RX:
-                ret_irq = IRQ_SPORT0_RX;
-                break;
-        case CH_SPORT0_TX:
-                ret_irq = IRQ_SPORT0_TX;
-                break;
-        case CH_SPORT1_RX:
-                ret_irq = IRQ_SPORT1_RX;
-                break;
-        case CH_SPORT1_TX:
-                ret_irq = IRQ_SPORT1_TX;
-                break;
-        case CH_SPI:
-                ret_irq = IRQ_SPI;
-                break;
-        case CH_UART_RX:
-                ret_irq = IRQ_UART_RX;
-                break;
-        case CH_UART_TX:
-                ret_irq = IRQ_UART_TX;
-                break;
-        case CH_MEM_STREAM0_SRC:
-        case CH_MEM_STREAM0_DEST:
-                ret_irq = IRQ_MEM_DMA0;
-                break;
-        case CH_MEM_STREAM1_SRC:
-        case CH_MEM_STREAM1_DEST:
-                ret_irq = IRQ_MEM_DMA1;
-                break;
-        }
-        return ret_irq;
-}
-# define channel2irq(channel) bf533_channel2irq(channel)
-#else
-static int bf561_channel2irq(unsigned int channel)
-{
-        int ret_irq = -1;
-        switch (channel) {
-        case CH_PPI0:
-                ret_irq = IRQ_PPI0;
-                break;
-        case CH_PPI1:
-                ret_irq = IRQ_PPI1;
-                break;
-        case CH_SPORT0_RX:
-                ret_irq = IRQ_SPORT0_RX;
-                break;
-        case CH_SPORT0_TX:
-                ret_irq = IRQ_SPORT0_TX;
-                break;
-        case CH_SPORT1_RX:
-                ret_irq = IRQ_SPORT1_RX;
-                break;
-        case CH_SPORT1_TX:
-                ret_irq = IRQ_SPORT1_TX;
-                break;
-        case CH_SPI:
-                ret_irq = IRQ_SPI;
-                break;
-        case CH_UART_RX:
-                ret_irq = IRQ_UART_RX;
-                break;
-        case CH_UART_TX:
-                ret_irq = IRQ_UART_TX;
-                break;
-        case CH_MEM_STREAM0_SRC:
-        case CH_MEM_STREAM0_DEST:
-                ret_irq = IRQ_MEM_DMA0;
-                break;
-        case CH_MEM_STREAM1_SRC:
-        case CH_MEM_STREAM1_DEST:
-                ret_irq = IRQ_MEM_DMA1;
-                break;
-        case CH_MEM_STREAM2_SRC:
-        case CH_MEM_STREAM2_DEST:
-                ret_irq = IRQ_MEM_DMA2;
-                break;
-        case CH_MEM_STREAM3_SRC:
-        case CH_MEM_STREAM3_DEST:
-                ret_irq = IRQ_MEM_DMA3;
-                break;
-        case CH_IMEM_STREAM0_SRC:
-        case CH_IMEM_STREAM0_DEST:
-                ret_irq = IRQ_IMEM_DMA0;
-                break;
-        case CH_IMEM_STREAM1_SRC:
-        case CH_IMEM_STREAM1_DEST:
-                ret_irq = IRQ_IMEM_DMA1;
-                break;
-        }
-        return ret_irq;
-}
-# define channel2irq(channel) bf561_channel2irq(channel)
-#endif
 /*------------------------------------------------------------------------------
 *      Request the specific DMA channel from the system.
 *-----------------------------------------------------------------------------*/
@@ -535,7 +332,7 @@ set_bfin_dma_config(char direction, char flow_mode,
 }
 EXPORT_SYMBOL(set_bfin_dma_config);
-void set_dma_sg(unsigned int channel, struct dmasg * sg, int nr_sg)
+void set_dma_sg(unsigned int channel, struct dmasg *sg, int nr_sg)
 {
        BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
               && channel < MAX_BLACKFIN_DMA_CHANNEL));
@@ -604,7 +401,7 @@ static void *__dma_memcpy(void *dest, const void *src, size_t size)
        if (size <= 0)
                return NULL;
-        
        local_irq_save(flags);
        if ((unsigned long)src < memory_end)
@@ -748,7 +545,6 @@ void *dma_memcpy(void *dest, const void *src, size_t size)
        addr = __dma_memcpy(dest+bulk, src+bulk, rest);
        return addr;
 }
 EXPORT_SYMBOL(dma_memcpy);
 void *safe_dma_memcpy(void *dest, const void *src, size_t size)
@@ -761,14 +557,13 @@ EXPORT_SYMBOL(safe_dma_memcpy);
 void dma_outsb(void __iomem *addr, const void *buf, unsigned short len)
 {
        unsigned long flags;
-        
        local_irq_save(flags);
-        
-        blackfin_dcache_flush_range((unsigned int)buf,(unsigned int)(buf) + len);
-        bfin_write_MDMA_D0_START_ADDR(addr);
+        blackfin_dcache_flush_range((unsigned int)buf, (unsigned int)(buf) + len);
+        bfin_write_MDMA_D0_START_ADDR(addr);
        bfin_write_MDMA_D0_X_COUNT(len);
        bfin_write_MDMA_D0_X_MODIFY(0);
        bfin_write_MDMA_D0_IRQ_STATUS(DMA_DONE | DMA_ERR);
@@ -796,9 +591,9 @@ EXPORT_SYMBOL(dma_outsb);
 void dma_insb(const void __iomem *addr, void *buf, unsigned short len)
 {
        unsigned long flags;
-                
        local_irq_save(flags);
-        bfin_write_MDMA_D0_START_ADDR(buf);
+        bfin_write_MDMA_D0_START_ADDR(buf);
        bfin_write_MDMA_D0_X_COUNT(len);
        bfin_write_MDMA_D0_X_MODIFY(1);
        bfin_write_MDMA_D0_IRQ_STATUS(DMA_DONE | DMA_ERR);
@@ -827,12 +622,12 @@ EXPORT_SYMBOL(dma_insb);
 void dma_outsw(void __iomem *addr, const void  *buf, unsigned short len)
 {
        unsigned long flags;
-        
        local_irq_save(flags);
-                
-        blackfin_dcache_flush_range((unsigned int)buf,(unsigned int)(buf) + len);
-        bfin_write_MDMA_D0_START_ADDR(addr);
+        blackfin_dcache_flush_range((unsigned int)buf, (unsigned int)(buf) + len);
+        bfin_write_MDMA_D0_START_ADDR(addr);
        bfin_write_MDMA_D0_X_COUNT(len);
        bfin_write_MDMA_D0_X_MODIFY(0);
        bfin_write_MDMA_D0_IRQ_STATUS(DMA_DONE | DMA_ERR);
@@ -859,10 +654,10 @@ EXPORT_SYMBOL(dma_outsw);
 void dma_insw(const void __iomem *addr, void *buf, unsigned short len)
 {
        unsigned long flags;
-                
        local_irq_save(flags);
-        
-        bfin_write_MDMA_D0_START_ADDR(buf);
+        bfin_write_MDMA_D0_START_ADDR(buf);
        bfin_write_MDMA_D0_X_COUNT(len);
        bfin_write_MDMA_D0_X_MODIFY(2);
        bfin_write_MDMA_D0_IRQ_STATUS(DMA_DONE | DMA_ERR);
@@ -891,12 +686,12 @@ EXPORT_SYMBOL(dma_insw);
 void dma_outsl(void __iomem *addr, const void *buf, unsigned short len)
 {
        unsigned long flags;
-        
        local_irq_save(flags);
-        
-        blackfin_dcache_flush_range((unsigned int)buf,(unsigned int)(buf) + len);
-        bfin_write_MDMA_D0_START_ADDR(addr);
+        blackfin_dcache_flush_range((unsigned int)buf, (unsigned int)(buf) + len);
+        bfin_write_MDMA_D0_START_ADDR(addr);
        bfin_write_MDMA_D0_X_COUNT(len);
        bfin_write_MDMA_D0_X_MODIFY(0);
        bfin_write_MDMA_D0_IRQ_STATUS(DMA_DONE | DMA_ERR);
@@ -923,10 +718,10 @@ EXPORT_SYMBOL(dma_outsl);
 void dma_insl(const void __iomem *addr, void *buf, unsigned short len)
 {
        unsigned long flags;
-        
        local_irq_save(flags);
-        
-        bfin_write_MDMA_D0_START_ADDR(buf);
+        bfin_write_MDMA_D0_START_ADDR(buf);
        bfin_write_MDMA_D0_X_COUNT(len);
        bfin_write_MDMA_D0_X_MODIFY(4);
        bfin_write_MDMA_D0_IRQ_STATUS(DMA_DONE | DMA_ERR);
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index bb1f4fb246..bafcfa5214 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -162,7 +162,7 @@ static void port_setup(unsigned short gpio, unsigned short usage)
 static void default_gpio(unsigned short gpio)
 {
-        unsigned short bank,bitmask;
+        unsigned short bank, bitmask;
        bank = gpio_bank(gpio);
        bitmask = gpio_bit(gpio);
@@ -183,7 +183,7 @@ static int __init bfin_gpio_init(void)
        printk(KERN_INFO "Blackfin GPIO Controller\n");
-        for (i = 0; i < MAX_BLACKFIN_GPIOS; i+=GPIO_BANKSIZE)
+        for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE)
                reserved_map[gpio_bank(i)] = 0;
 #if defined(BF537_FAMILY) && (defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE))
@@ -478,7 +478,7 @@ u32 gpio_pm_setup(void)
        u32 sic_iwr = 0;
        u16 bank, mask, i, gpio;
-        for (i = 0; i < MAX_BLACKFIN_GPIOS; i+=GPIO_BANKSIZE) {
+        for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) {
                mask = wakeup_map[gpio_bank(i)];
                bank = gpio_bank(i);
@@ -522,12 +522,11 @@ u32 gpio_pm_setup(void)
                return IWR_ENABLE_ALL;
 }
 void gpio_pm_restore(void)
 {
        u16 bank, mask, i;
-        for (i = 0; i < MAX_BLACKFIN_GPIOS; i+=GPIO_BANKSIZE) {
+        for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) {
                mask = wakeup_map[gpio_bank(i)];
                bank = gpio_bank(i);
@@ -591,7 +590,6 @@ int gpio_request(unsigned short gpio, const char *label)
 }
 EXPORT_SYMBOL(gpio_request);
 void gpio_free(unsigned short gpio)
 {
        unsigned long flags;
@@ -616,7 +614,6 @@ void gpio_free(unsigned short gpio)
 }
 EXPORT_SYMBOL(gpio_free);
 void gpio_direction_input(unsigned short gpio)
 {
        unsigned long flags;
diff --git a/arch/blackfin/kernel/bfin_ksyms.c b/arch/blackfin/kernel/bfin_ksyms.c
index f64ecb638f..70455949cf 100644
--- a/arch/blackfin/kernel/bfin_ksyms.c
+++ b/arch/blackfin/kernel/bfin_ksyms.c
@@ -28,10 +28,11 @@
 */
 #include <linux/module.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
+#include <linux/uaccess.h>
 #include <asm/checksum.h>
 #include <asm/cacheflush.h>
-#include <asm/uaccess.h>
 /* platform dependent support */
diff --git a/arch/blackfin/kernel/cacheinit.c b/arch/blackfin/kernel/cacheinit.c
new file mode 100644
index 0000000000..4d41a40e81
--- /dev/null
+++ b/arch/blackfin/kernel/cacheinit.c
@@ -0,0 +1,66 @@
+/*
+ *               Copyright 2004-2007 Analog Devices Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see the file COPYING, or write
+ * to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/cpu.h>
+#include <asm/cacheflush.h>
+#include <asm/blackfin.h>
+#include <asm/cplbinit.h>
+#if defined(CONFIG_BLKFIN_CACHE)
+void bfin_icache_init(void)
+{
+        unsigned long *table = icplb_table;
+        unsigned long ctrl;
+        int i;
+        for (i = 0; i < MAX_CPLBS; i++) {
+                unsigned long addr = *table++;
+                unsigned long data = *table++;
+                if (addr == (unsigned long)-1)
+                        break;
+                bfin_write32(ICPLB_ADDR0 + i * 4, addr);
+                bfin_write32(ICPLB_DATA0 + i * 4, data);
+        }
+        ctrl = bfin_read_IMEM_CONTROL();
+        ctrl |= IMC | ENICPLB;
+        bfin_write_IMEM_CONTROL(ctrl);
+}
+#endif
+#if defined(CONFIG_BLKFIN_DCACHE)
+void bfin_dcache_init(void)
+{
+        unsigned long *table = dcplb_table;
+        unsigned long ctrl;
+        int i;
+        for (i = 0; i < MAX_CPLBS; i++) {
+                unsigned long addr = *table++;
+                unsigned long data = *table++;
+                if (addr == (unsigned long)-1)
+                        break;
+                bfin_write32(DCPLB_ADDR0 + i * 4, addr);
+                bfin_write32(DCPLB_DATA0 + i * 4, data);
+        }
+        ctrl = bfin_read_DMEM_CONTROL();
+        ctrl |= DMEM_CNTR;
+        bfin_write_DMEM_CONTROL(ctrl);
+}
+#endif
diff --git a/arch/blackfin/kernel/cplbinit.c b/arch/blackfin/kernel/cplbinit.c
new file mode 100644
index 0000000000..bbdb403fcb
--- /dev/null
+++ b/arch/blackfin/kernel/cplbinit.c
@@ -0,0 +1,433 @@
+/*
+ * Blackfin CPLB initialization
+ *
+ *               Copyright 2004-2007 Analog Devices Inc.
+ *
+ * Bugs:         Enter bugs at http://blackfin.uclinux.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see the file COPYING, or write
+ * to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/module.h>
+#include <asm/blackfin.h>
+#include <asm/cplbinit.h>
+u_long icplb_table[MAX_CPLBS+1];
+u_long dcplb_table[MAX_CPLBS+1];
+#ifdef CONFIG_CPLB_SWITCH_TAB_L1
+u_long ipdt_table[MAX_SWITCH_I_CPLBS+1]__attribute__((l1_data));
+u_long dpdt_table[MAX_SWITCH_D_CPLBS+1]__attribute__((l1_data));
+#ifdef CONFIG_CPLB_INFO
+u_long ipdt_swapcount_table[MAX_SWITCH_I_CPLBS]__attribute__((l1_data));
+u_long dpdt_swapcount_table[MAX_SWITCH_D_CPLBS]__attribute__((l1_data));
+#endif /* CONFIG_CPLB_INFO */
+#else
+u_long ipdt_table[MAX_SWITCH_I_CPLBS+1];
+u_long dpdt_table[MAX_SWITCH_D_CPLBS+1];
+#ifdef CONFIG_CPLB_INFO
+u_long ipdt_swapcount_table[MAX_SWITCH_I_CPLBS];
+u_long dpdt_swapcount_table[MAX_SWITCH_D_CPLBS];
+#endif /* CONFIG_CPLB_INFO */
+#endif /*CONFIG_CPLB_SWITCH_TAB_L1*/
+struct s_cplb {
+        struct cplb_tab init_i;
+        struct cplb_tab init_d;
+        struct cplb_tab switch_i;
+        struct cplb_tab switch_d;
+};
+#if defined(CONFIG_BLKFIN_DCACHE) || defined(CONFIG_BLKFIN_CACHE)
+static struct cplb_desc cplb_data[] = {
+        {
+                .start = 0,
+                .end = SIZE_1K,
+                .psize = SIZE_1K,
+                .attr = INITIAL_T | SWITCH_T | I_CPLB | D_CPLB,
+                .i_conf = SDRAM_OOPS,
+                .d_conf = SDRAM_OOPS,
+#if defined(CONFIG_DEBUG_HUNT_FOR_ZERO)
+                .valid = 1,
+#else
+                .valid = 0,
+#endif
+                .name = "ZERO Pointer Saveguard",
+        },
+        {
+                .start = L1_CODE_START,
+                .end = L1_CODE_START + L1_CODE_LENGTH,
+                .psize = SIZE_4M,
+                .attr = INITIAL_T | SWITCH_T | I_CPLB,
+                .i_conf = L1_IMEMORY,
+                .d_conf = 0,
+                .valid = 1,
+                .name = "L1 I-Memory",
+        },
+        {
+                .start = L1_DATA_A_START,
+                .end = L1_DATA_B_START + L1_DATA_B_LENGTH,
+                .psize = SIZE_4M,
+                .attr = INITIAL_T | SWITCH_T | D_CPLB,
+                .i_conf = 0,
+                .d_conf = L1_DMEMORY,
+#if ((L1_DATA_A_LENGTH > 0) || (L1_DATA_B_LENGTH > 0))
+                .valid = 1,
+#else
+                .valid = 0,
+#endif
+                .name = "L1 D-Memory",
+        },
+        {
+                .start = 0,
+                .end = 0,  /* dynamic */
+                .psize = 0,
+                .attr = INITIAL_T | SWITCH_T | I_CPLB | D_CPLB,
+                .i_conf =  SDRAM_IGENERIC,
+                .d_conf =  SDRAM_DGENERIC,
+                .valid = 1,
+                .name = "SDRAM Kernel",
+        },
+        {
+                .start = 0, /* dynamic */
+                .end = 0, /* dynamic */
+                .psize = 0,
+                .attr = INITIAL_T | SWITCH_T | D_CPLB,
+                .i_conf =  SDRAM_IGENERIC,
+                .d_conf =  SDRAM_DNON_CHBL,
+                .valid = 1,
+                .name = "SDRAM RAM MTD",
+        },
+        {
+                .start = 0, /* dynamic */
+                .end = 0,   /* dynamic */
+                .psize = SIZE_1M,
+                .attr = INITIAL_T | SWITCH_T | D_CPLB,
+                .d_conf = SDRAM_DNON_CHBL,
+                .valid = 1,
+                .name = "SDRAM Uncached DMA ZONE",
+        },
+        {
+                .start = 0, /* dynamic */
+                .end = 0, /* dynamic */
+                .psize = 0,
+                .attr = SWITCH_T | D_CPLB,
+                .i_conf = 0, /* dynamic */
+                .d_conf = 0, /* dynamic */
+                .valid = 1,
+                .name = "SDRAM Reserved Memory",
+        },
+        {
+                .start = ASYNC_BANK0_BASE,
+                .end = ASYNC_BANK3_BASE + ASYNC_BANK3_SIZE,
+                .psize = 0,
+                .attr = SWITCH_T | D_CPLB,
+                .d_conf = SDRAM_EBIU,
+                .valid = 1,
+                .name = "ASYNC Memory",
+        },
+        {
+#if defined(CONFIG_BF561)
+                .start = L2_SRAM,
+                .end = L2_SRAM_END,
+                .psize = SIZE_1M,
+                .attr = SWITCH_T | D_CPLB,
+                .i_conf = L2_MEMORY,
+                .d_conf = L2_MEMORY,
+                .valid = 1,
+#else
+                .valid = 0,
+#endif
+                .name = "L2 Memory",
+        }
+};
+static u16 __init lock_kernel_check(u32 start, u32 end)
+{
+        if ((start <= (u32) _stext && end >= (u32) _end)
+            || (start >= (u32) _stext && end <= (u32) _end))
+                return IN_KERNEL;
+        return 0;
+}
+static unsigned short __init
+fill_cplbtab(struct cplb_tab *table,
+             unsigned long start, unsigned long end,
+             unsigned long block_size, unsigned long cplb_data)
+{
+        int i;
+        switch (block_size) {
+        case SIZE_4M:
+                i = 3;
+                break;
+        case SIZE_1M:
+                i = 2;
+                break;
+        case SIZE_4K:
+                i = 1;
+                break;
+        case SIZE_1K:
+        default:
+                i = 0;
+                break;
+        }
+        cplb_data = (cplb_data & ~(3 << 16)) | (i << 16);
+        while ((start < end) && (table->pos < table->size)) {
+                table->tab[table->pos++] = start;
+                if (lock_kernel_check(start, start + block_size) == IN_KERNEL)
+                        table->tab[table->pos++] =
+                            cplb_data | CPLB_LOCK | CPLB_DIRTY;
+                else
+                        table->tab[table->pos++] = cplb_data;
+                start += block_size;
+        }
+        return 0;
+}
+static unsigned short __init
+close_cplbtab(struct cplb_tab *table)
+{
+        while (table->pos < table->size) {
+                table->tab[table->pos++] = 0;
+                table->tab[table->pos++] = 0; /* !CPLB_VALID */
+        }
+        return 0;
+}
+/* helper function */
+static void __fill_code_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end)
+{
+        if (cplb_data[i].psize) {
+                fill_cplbtab(t,
+                                cplb_data[i].start,
+                                cplb_data[i].end,
+                                cplb_data[i].psize,
+                                cplb_data[i].i_conf);
+        } else {
+#if (defined(CONFIG_BLKFIN_CACHE) && defined(ANOMALY_05000263))
+                if (i == SDRAM_KERN) {
+                        fill_cplbtab(t,
+                                        cplb_data[i].start,
+                                        cplb_data[i].end,
+                                        SIZE_4M,
+                                        cplb_data[i].i_conf);
+                } else
+#endif
+                {
+                        fill_cplbtab(t,
+                                        cplb_data[i].start,
+                                        a_start,
+                                        SIZE_1M,
+                                        cplb_data[i].i_conf);
+                        fill_cplbtab(t,
+                                        a_start,
+                                        a_end,
+                                        SIZE_4M,
+                                        cplb_data[i].i_conf);
+                        fill_cplbtab(t, a_end,
+                                        cplb_data[i].end,
+                                        SIZE_1M,
+                                        cplb_data[i].i_conf);
+                }
+        }
+}
+static void __fill_data_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end)
+{
+        if (cplb_data[i].psize) {
+                fill_cplbtab(t,
+                                cplb_data[i].start,
+                                cplb_data[i].end,
+                                cplb_data[i].psize,
+                                cplb_data[i].d_conf);
+        } else {
+                fill_cplbtab(t,
+                                cplb_data[i].start,
+                                a_start, SIZE_1M,
+                                cplb_data[i].d_conf);
+                fill_cplbtab(t, a_start,
+                                a_end, SIZE_4M,
+                                cplb_data[i].d_conf);
+                fill_cplbtab(t, a_end,
+                                cplb_data[i].end,
+                                SIZE_1M,
+                                cplb_data[i].d_conf);
+        }
+}
+void __init generate_cpl_tables(void)
+{
+        u16 i, j, process;
+        u32 a_start, a_end, as, ae, as_1m;
+        struct cplb_tab *t_i = NULL;
+        struct cplb_tab *t_d = NULL;
+        struct s_cplb cplb;
+        cplb.init_i.size = MAX_CPLBS;
+        cplb.init_d.size = MAX_CPLBS;
+        cplb.switch_i.size = MAX_SWITCH_I_CPLBS;
+        cplb.switch_d.size = MAX_SWITCH_D_CPLBS;
+        cplb.init_i.pos = 0;
+        cplb.init_d.pos = 0;
+        cplb.switch_i.pos = 0;
+        cplb.switch_d.pos = 0;
+        cplb.init_i.tab = icplb_table;
+        cplb.init_d.tab = dcplb_table;
+        cplb.switch_i.tab = ipdt_table;
+        cplb.switch_d.tab = dpdt_table;
+        cplb_data[SDRAM_KERN].end = memory_end;
+#ifdef CONFIG_MTD_UCLINUX
+        cplb_data[SDRAM_RAM_MTD].start = memory_mtd_start;
+        cplb_data[SDRAM_RAM_MTD].end = memory_mtd_start + mtd_size;
+        cplb_data[SDRAM_RAM_MTD].valid = mtd_size > 0;
+# if defined(CONFIG_ROMFS_FS)
+        cplb_data[SDRAM_RAM_MTD].attr |= I_CPLB;
+        /*
+         * The ROMFS_FS size is often not multiple of 1MB.
+         * This can cause multiple CPLB sets covering the same memory area.
+         * This will then cause multiple CPLB hit exceptions.
+         * Workaround: We ensure a contiguous memory area by extending the kernel
+         * memory section over the mtd section.
+         * For ROMFS_FS memory must be covered with ICPLBs anyways.
+         * So there is no difference between kernel and mtd memory setup.
+         */
+        cplb_data[SDRAM_KERN].end = memory_mtd_start + mtd_size;;
+        cplb_data[SDRAM_RAM_MTD].valid = 0;
+# endif
+#else
+        cplb_data[SDRAM_RAM_MTD].valid = 0;
+#endif
+        cplb_data[SDRAM_DMAZ].start = _ramend - DMA_UNCACHED_REGION;
+        cplb_data[SDRAM_DMAZ].end = _ramend;
+        cplb_data[RES_MEM].start = _ramend;
+        cplb_data[RES_MEM].end = physical_mem_end;
+        if (reserved_mem_dcache_on)
+                cplb_data[RES_MEM].d_conf = SDRAM_DGENERIC;
+        else
+                cplb_data[RES_MEM].d_conf = SDRAM_DNON_CHBL;
+        if (reserved_mem_icache_on)
+                cplb_data[RES_MEM].i_conf = SDRAM_IGENERIC;
+        else
+                cplb_data[RES_MEM].i_conf = SDRAM_INON_CHBL;
+        for (i = ZERO_P; i <= L2_MEM; i++) {
+                if (!cplb_data[i].valid)
+                        continue;
+                as_1m = cplb_data[i].start % SIZE_1M;
+                /* We need to make sure all sections are properly 1M aligned
+                 * However between Kernel Memory and the Kernel mtd section, depending on the
+                 * rootfs size, there can be overlapping memory areas.
+                 */
+                if (as_1m && i != L1I_MEM && i != L1D_MEM) {
+#ifdef CONFIG_MTD_UCLINUX
+                        if (i == SDRAM_RAM_MTD) {
+                                if ((cplb_data[SDRAM_KERN].end + 1) > cplb_data[SDRAM_RAM_MTD].start)
+                                        cplb_data[SDRAM_RAM_MTD].start = (cplb_data[i].start & (-2*SIZE_1M)) + SIZE_1M;
+                                else
+                                        cplb_data[SDRAM_RAM_MTD].start = (cplb_data[i].start & (-2*SIZE_1M));
+                        } else
+#endif
+                                printk(KERN_WARNING "Unaligned Start of %s at 0x%X\n",
+                                       cplb_data[i].name, cplb_data[i].start);
+                }
+                as = cplb_data[i].start % SIZE_4M;
+                ae = cplb_data[i].end % SIZE_4M;
+                if (as)
+                        a_start = cplb_data[i].start + (SIZE_4M - (as));
+                else
+                        a_start = cplb_data[i].start;
+                a_end = cplb_data[i].end - ae;
+                for (j = INITIAL_T; j <= SWITCH_T; j++) {
+                        switch (j) {
+                        case INITIAL_T:
+                                if (cplb_data[i].attr & INITIAL_T) {
+                                        t_i = &cplb.init_i;
+                                        t_d = &cplb.init_d;
+                                        process = 1;
+                                } else
+                                        process = 0;
+                                break;
+                        case SWITCH_T:
+                                if (cplb_data[i].attr & SWITCH_T) {
+                                        t_i = &cplb.switch_i;
+                                        t_d = &cplb.switch_d;
+                                        process = 1;
+                                } else
+                                        process = 0;
+                                break;
+                        default:
+                                        process = 0;
+                                break;
+                        }
+                        if (!process)
+                                continue;
+                        if (cplb_data[i].attr & I_CPLB)
+                                __fill_code_cplbtab(t_i, i, a_start, a_end);
+                        if (cplb_data[i].attr & D_CPLB)
+                                __fill_data_cplbtab(t_d, i, a_start, a_end);
+                }
+        }
+/* close tables */
+        close_cplbtab(&cplb.init_i);
+        close_cplbtab(&cplb.init_d);
+        cplb.init_i.tab[cplb.init_i.pos] = -1;
+        cplb.init_d.tab[cplb.init_d.pos] = -1;
+        cplb.switch_i.tab[cplb.switch_i.pos] = -1;
+        cplb.switch_d.tab[cplb.switch_d.pos] = -1;
+}
+#endif
diff --git a/arch/blackfin/kernel/dma-mapping.c b/arch/blackfin/kernel/dma-mapping.c
index 539eb24e06..ea48d5b13f 100644
--- a/arch/blackfin/kernel/dma-mapping.c
+++ b/arch/blackfin/kernel/dma-mapping.c
@@ -34,8 +34,8 @@
 #include <linux/spinlock.h>
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
+#include <linux/io.h>
 #include <asm/cacheflush.h>
-#include <asm/io.h>
 #include <asm/bfin-global.h>
 static spinlock_t dma_page_lock;
@@ -159,10 +159,13 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
        BUG_ON(direction == DMA_NONE);
-        for (i = 0; i < nents; i++)
+        for (i = 0; i < nents; i++, sg++) {
-                invalidate_dcache_range(sg_dma_address(&sg[i]),
+                sg->dma_address = page_address(sg->page) + sg->offset;
-                                        sg_dma_address(&sg[i]) +
-                                        sg_dma_len(&sg[i]));
+                invalidate_dcache_range(sg_dma_address(sg),
+                                        sg_dma_address(sg) +
+                                        sg_dma_len(sg));
+        }
        return nents;
 }
diff --git a/arch/blackfin/kernel/dualcore_test.c b/arch/blackfin/kernel/dualcore_test.c
index 8b89c99f9d..0fcba74840 100644
--- a/arch/blackfin/kernel/dualcore_test.c
+++ b/arch/blackfin/kernel/dualcore_test.c
@@ -30,19 +30,19 @@
 #include <linux/init.h>
 #include <linux/module.h>
-static int *testarg = (int*)0xfeb00000;
+static int *testarg = (int *)0xfeb00000;
 static int test_init(void)
 {
        *testarg = 1;
-        printk("Dual core test module inserted: set testarg = [%d]\n @ [%p]\n",
+        printk(KERN_INFO "Dual core test module inserted: set testarg = [%d]\n @ [%p]\n",
               *testarg, testarg);
        return 0;
 }
 static void test_exit(void)
 {
-        printk("Dual core test module removed: testarg = [%d]\n", *testarg);
+        printk(KERN_INFO "Dual core test module removed: testarg = [%d]\n", *testarg);
 }
 module_init(test_init);
diff --git a/arch/blackfin/kernel/fixed_code.S b/arch/blackfin/kernel/fixed_code.S
new file mode 100644
index 0000000000..d8b1ebc709
--- /dev/null
+++ b/arch/blackfin/kernel/fixed_code.S
@@ -0,0 +1,132 @@
+/*
+ * This file contains sequences of code that will be copied to a
+ * fixed location, defined in <asm/atomic_seq.h>.  The interrupt
+ * handlers ensure that these sequences appear to be atomic when
+ * executed from userspace.
+ * These are aligned to 16 bytes, so that we have some space to replace
+ * these sequences with something else (e.g. kernel traps if we ever do
+ * BF561 SMP).
+ */
+#include <linux/linkage.h>
+#include <linux/unistd.h>
+#include <asm/entry.h>
+.text
+ENTRY(_fixed_code_start)
+.align 16
+ENTRY(_sigreturn_stub)
+        P0 = __NR_rt_sigreturn;
+        EXCPT 0;
+        /* Speculative execution paranoia.  */
+0:      JUMP.S 0b;
+ENDPROC (_sigreturn_stub)
+.align 16
+        /*
+         * Atomic swap, 8 bit.
+         * Inputs:      P0: memory address to use
+         *              R1: value to store
+         * Output:      R0: old contents of the memory address, zero extended.
+         */
+ENTRY(_atomic_xchg32)
+        R0 = [P0];
+        [P0] = R1;
+        rts;
+ENDPROC (_atomic_xchg32)
+.align 16
+        /*
+         * Compare and swap, 32 bit.
+         * Inputs:      P0: memory address to use
+         *              R1: compare value
+         *              R2: new value to store
+         * The new value is stored if the contents of the memory
+         * address is equal to the compare value.
+         * Output:      R0: old contents of the memory address.
+         */
+ENTRY(_atomic_cas32)
+        R0 = [P0];
+        CC = R0 == R1;
+        IF !CC JUMP 1f;
+        [P0] = R2;
+1:
+        rts;
+ENDPROC (_atomic_cas32)
+.align 16
+        /*
+         * Atomic add, 32 bit.
+         * Inputs:      P0: memory address to use
+         *              R0: value to add
+         * Outputs:     R0: new contents of the memory address.
+         *              R1: previous contents of the memory address.
+         */
+ENTRY(_atomic_add32)
+        R1 = [P0];
+        R0 = R1 + R0;
+        [P0] = R0;
+        rts;
+ENDPROC (_atomic_add32)
+.align 16
+        /*
+         * Atomic sub, 32 bit.
+         * Inputs:      P0: memory address to use
+         *              R0: value to subtract
+         * Outputs:     R0: new contents of the memory address.
+         *              R1: previous contents of the memory address.
+         */
+ENTRY(_atomic_sub32)
+        R1 = [P0];
+        R0 = R1 - R0;
+        [P0] = R0;
+        rts;
+ENDPROC (_atomic_sub32)
+.align 16
+        /*
+         * Atomic ior, 32 bit.
+         * Inputs:      P0: memory address to use
+         *              R0: value to ior
+         * Outputs:     R0: new contents of the memory address.
+         *              R1: previous contents of the memory address.
+         */
+ENTRY(_atomic_ior32)
+        R1 = [P0];
+        R0 = R1 | R0;
+        [P0] = R0;
+        rts;
+ENDPROC (_atomic_ior32)
+.align 16
+        /*
+         * Atomic ior, 32 bit.
+         * Inputs:      P0: memory address to use
+         *              R0: value to ior
+         * Outputs:     R0: new contents of the memory address.
+         *              R1: previous contents of the memory address.
+         */
+ENTRY(_atomic_and32)
+        R1 = [P0];
+        R0 = R1 & R0;
+        [P0] = R0;
+        rts;
+ENDPROC (_atomic_ior32)
+.align 16
+        /*
+         * Atomic ior, 32 bit.
+         * Inputs:      P0: memory address to use
+         *              R0: value to ior
+         * Outputs:     R0: new contents of the memory address.
+         *              R1: previous contents of the memory address.
+         */
+ENTRY(_atomic_xor32)
+        R1 = [P0];
+        R0 = R1 ^ R0;
+        [P0] = R0;
+        rts;
+ENDPROC (_atomic_ior32)
+ENTRY(_fixed_code_end)
diff --git a/arch/blackfin/kernel/flat.c b/arch/blackfin/kernel/flat.c
index a92587b628..d188b24305 100644
--- a/arch/blackfin/kernel/flat.c
+++ b/arch/blackfin/kernel/flat.c
@@ -36,24 +36,22 @@ unsigned long bfin_get_addr_from_rp(unsigned long *ptr,
        unsigned long val;
        switch (type) {
-                case FLAT_BFIN_RELOC_TYPE_16_BIT:
+        case FLAT_BFIN_RELOC_TYPE_16_BIT:
-                case FLAT_BFIN_RELOC_TYPE_16H_BIT:
+        case FLAT_BFIN_RELOC_TYPE_16H_BIT:
-                        usptr = (unsigned short *)ptr;
+                usptr = (unsigned short *)ptr;
-                        pr_debug("*usptr = %x", get_unaligned(usptr));
+                pr_debug("*usptr = %x", get_unaligned(usptr));
-                        val = get_unaligned(usptr);
+                val = get_unaligned(usptr);
-                        val += *persistent;
+                val += *persistent;
-                        break;
+                break;
-                case FLAT_BFIN_RELOC_TYPE_32_BIT:
+        case FLAT_BFIN_RELOC_TYPE_32_BIT:
-                        pr_debug("*ptr = %lx", get_unaligned(ptr));
+                pr_debug("*ptr = %lx", get_unaligned(ptr));
-                        val = get_unaligned(ptr);
+                val = get_unaligned(ptr);
-                        break;
+                break;
-                default:
+        default:
-                        pr_debug("BINFMT_FLAT: Unknown relocation type %x\n",
+                pr_debug("BINFMT_FLAT: Unknown relocation type %x\n", type);
-                                type);
+                return 0;
-                        return 0;
        }
        /*
@@ -81,21 +79,20 @@ void bfin_put_addr_at_rp(unsigned long *ptr, unsigned long addr,
        int type = (relval >> 26) & 7;
        switch (type) {
-                case FLAT_BFIN_RELOC_TYPE_16_BIT:
+        case FLAT_BFIN_RELOC_TYPE_16_BIT:
-                        put_unaligned(addr, usptr);
+                put_unaligned(addr, usptr);
-                        pr_debug("new value %x at %p", get_unaligned(usptr),
+                pr_debug("new value %x at %p", get_unaligned(usptr), usptr);
-                                usptr);
+                break;
-                        break;
-                case FLAT_BFIN_RELOC_TYPE_16H_BIT:
+        case FLAT_BFIN_RELOC_TYPE_16H_BIT:
-                        put_unaligned(addr >> 16, usptr);
+                put_unaligned(addr >> 16, usptr);
-                        pr_debug("new value %x", get_unaligned(usptr));
+                pr_debug("new value %x", get_unaligned(usptr));
-                        break;
+                break;
-                case FLAT_BFIN_RELOC_TYPE_32_BIT:
+        case FLAT_BFIN_RELOC_TYPE_32_BIT:
-                        put_unaligned(addr, ptr);
+                put_unaligned(addr, ptr);
-                        pr_debug("new ptr =%lx", get_unaligned(ptr));
+                pr_debug("new ptr =%lx", get_unaligned(ptr));
-                        break;
+                break;
        }
 }
 EXPORT_SYMBOL(bfin_put_addr_at_rp);
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c
index 80996a1a94..1fc001c7ab 100644
--- a/arch/blackfin/kernel/irqchip.c
+++ b/arch/blackfin/kernel/irqchip.c
@@ -82,7 +82,7 @@ int show_interrupts(struct seq_file *p, void *v)
                        seq_printf(p, ", %s", action->name);
                seq_putc(p, '\n');
-              unlock:
+ unlock:
                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
        } else if (i == NR_IRQS) {
                seq_printf(p, "Err: %10lu\n", irq_err_count);
diff --git a/arch/blackfin/kernel/kgdb.c b/arch/blackfin/kernel/kgdb.c
new file mode 100644
index 0000000000..a9c15515bf
--- /dev/null
+++ b/arch/blackfin/kernel/kgdb.c
@@ -0,0 +1,421 @@
+/*
+ * File:         arch/blackfin/kernel/kgdb.c
+ * Based on:
+ * Author:       Sonic Zhang
+ *
+ * Created:
+ * Description:
+ *
+ * Rev:          $Id: kgdb_bfin_linux-2.6.x.patch 4934 2007-02-13 09:32:11Z sonicz $
+ *
+ * Modified:
+ *               Copyright 2005-2006 Analog Devices Inc.
+ *
+ * Bugs:         Enter bugs at http://blackfin.uclinux.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see the file COPYING, or write
+ * to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/string.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/smp.h>
+#include <linux/spinlock.h>
+#include <linux/delay.h>
+#include <linux/ptrace.h>               /* for linux pt_regs struct */
+#include <linux/kgdb.h>
+#include <linux/console.h>
+#include <linux/init.h>
+#include <linux/debugger.h>
+#include <linux/errno.h>
+#include <linux/irq.h>
+#include <asm/system.h>
+#include <asm/traps.h>
+#include <asm/blackfin.h>
+/* Put the error code here just in case the user cares.  */
+int gdb_bf533errcode;
+/* Likewise, the vector number here (since GDB only gets the signal
+   number through the usual means, and that's not very specific).  */
+int gdb_bf533vector = -1;
+#if KGDB_MAX_NO_CPUS != 8
+#error change the definition of slavecpulocks
+#endif
+void regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)
+{
+        gdb_regs[BFIN_R0] = regs->r0;
+        gdb_regs[BFIN_R1] = regs->r1;
+        gdb_regs[BFIN_R2] = regs->r2;
+        gdb_regs[BFIN_R3] = regs->r3;
+        gdb_regs[BFIN_R4] = regs->r4;
+        gdb_regs[BFIN_R5] = regs->r5;
+        gdb_regs[BFIN_R6] = regs->r6;
+        gdb_regs[BFIN_R7] = regs->r7;
+        gdb_regs[BFIN_P0] = regs->p0;
+        gdb_regs[BFIN_P1] = regs->p1;
+        gdb_regs[BFIN_P2] = regs->p2;
+        gdb_regs[BFIN_P3] = regs->p3;
+        gdb_regs[BFIN_P4] = regs->p4;
+        gdb_regs[BFIN_P5] = regs->p5;
+        gdb_regs[BFIN_SP] = regs->reserved;
+        gdb_regs[BFIN_FP] = regs->fp;
+        gdb_regs[BFIN_I0] = regs->i0;
+        gdb_regs[BFIN_I1] = regs->i1;
+        gdb_regs[BFIN_I2] = regs->i2;
+        gdb_regs[BFIN_I3] = regs->i3;
+        gdb_regs[BFIN_M0] = regs->m0;
+        gdb_regs[BFIN_M1] = regs->m1;
+        gdb_regs[BFIN_M2] = regs->m2;
+        gdb_regs[BFIN_M3] = regs->m3;
+        gdb_regs[BFIN_B0] = regs->b0;
+        gdb_regs[BFIN_B1] = regs->b1;
+        gdb_regs[BFIN_B2] = regs->b2;
+        gdb_regs[BFIN_B3] = regs->b3;
+        gdb_regs[BFIN_L0] = regs->l0;
+        gdb_regs[BFIN_L1] = regs->l1;
+        gdb_regs[BFIN_L2] = regs->l2;
+        gdb_regs[BFIN_L3] = regs->l3;
+        gdb_regs[BFIN_A0_DOT_X] = regs->a0x;
+        gdb_regs[BFIN_A0_DOT_W] = regs->a0w;
+        gdb_regs[BFIN_A1_DOT_X] = regs->a1x;
+        gdb_regs[BFIN_A1_DOT_W] = regs->a1w;
+        gdb_regs[BFIN_ASTAT] = regs->astat;
+        gdb_regs[BFIN_RETS] = regs->rets;
+        gdb_regs[BFIN_LC0] = regs->lc0;
+        gdb_regs[BFIN_LT0] = regs->lt0;
+        gdb_regs[BFIN_LB0] = regs->lb0;
+        gdb_regs[BFIN_LC1] = regs->lc1;
+        gdb_regs[BFIN_LT1] = regs->lt1;
+        gdb_regs[BFIN_LB1] = regs->lb1;
+        gdb_regs[BFIN_CYCLES] = 0;
+        gdb_regs[BFIN_CYCLES2] = 0;
+        gdb_regs[BFIN_USP] = regs->usp;
+        gdb_regs[BFIN_SEQSTAT] = regs->seqstat;
+        gdb_regs[BFIN_SYSCFG] = regs->syscfg;
+        gdb_regs[BFIN_RETI] = regs->pc;
+        gdb_regs[BFIN_RETX] = regs->retx;
+        gdb_regs[BFIN_RETN] = regs->retn;
+        gdb_regs[BFIN_RETE] = regs->rete;
+        gdb_regs[BFIN_PC] = regs->pc;
+        gdb_regs[BFIN_CC] = 0;
+        gdb_regs[BFIN_EXTRA1] = 0;
+        gdb_regs[BFIN_EXTRA2] = 0;
+        gdb_regs[BFIN_EXTRA3] = 0;
+        gdb_regs[BFIN_IPEND] = regs->ipend;
+}
+/*
+ * Extracts ebp, esp and eip values understandable by gdb from the values
+ * saved by switch_to.
+ * thread.esp points to ebp. flags and ebp are pushed in switch_to hence esp
+ * prior to entering switch_to is 8 greater then the value that is saved.
+ * If switch_to changes, change following code appropriately.
+ */
+void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p)
+{
+        gdb_regs[BFIN_SP] = p->thread.ksp;
+        gdb_regs[BFIN_PC] = p->thread.pc;
+        gdb_regs[BFIN_SEQSTAT] = p->thread.seqstat;
+}
+void gdb_regs_to_regs(unsigned long *gdb_regs, struct pt_regs *regs)
+{
+        regs->r0 = gdb_regs[BFIN_R0];
+        regs->r1 = gdb_regs[BFIN_R1];
+        regs->r2 = gdb_regs[BFIN_R2];
+        regs->r3 = gdb_regs[BFIN_R3];
+        regs->r4 = gdb_regs[BFIN_R4];
+        regs->r5 = gdb_regs[BFIN_R5];
+        regs->r6 = gdb_regs[BFIN_R6];
+        regs->r7 = gdb_regs[BFIN_R7];
+        regs->p0 = gdb_regs[BFIN_P0];
+        regs->p1 = gdb_regs[BFIN_P1];
+        regs->p2 = gdb_regs[BFIN_P2];
+        regs->p3 = gdb_regs[BFIN_P3];
+        regs->p4 = gdb_regs[BFIN_P4];
+        regs->p5 = gdb_regs[BFIN_P5];
+        regs->fp = gdb_regs[BFIN_FP];
+        regs->i0 = gdb_regs[BFIN_I0];
+        regs->i1 = gdb_regs[BFIN_I1];
+        regs->i2 = gdb_regs[BFIN_I2];
+        regs->i3 = gdb_regs[BFIN_I3];
+        regs->m0 = gdb_regs[BFIN_M0];
+        regs->m1 = gdb_regs[BFIN_M1];
+        regs->m2 = gdb_regs[BFIN_M2];
+        regs->m3 = gdb_regs[BFIN_M3];
+        regs->b0 = gdb_regs[BFIN_B0];
+        regs->b1 = gdb_regs[BFIN_B1];
+        regs->b2 = gdb_regs[BFIN_B2];
+        regs->b3 = gdb_regs[BFIN_B3];
+        regs->l0 = gdb_regs[BFIN_L0];
+        regs->l1 = gdb_regs[BFIN_L1];
+        regs->l2 = gdb_regs[BFIN_L2];
+        regs->l3 = gdb_regs[BFIN_L3];
+        regs->a0x = gdb_regs[BFIN_A0_DOT_X];
+        regs->a0w = gdb_regs[BFIN_A0_DOT_W];
+        regs->a1x = gdb_regs[BFIN_A1_DOT_X];
+        regs->a1w = gdb_regs[BFIN_A1_DOT_W];
+        regs->rets = gdb_regs[BFIN_RETS];
+        regs->lc0 = gdb_regs[BFIN_LC0];
+        regs->lt0 = gdb_regs[BFIN_LT0];
+        regs->lb0 = gdb_regs[BFIN_LB0];
+        regs->lc1 = gdb_regs[BFIN_LC1];
+        regs->lt1 = gdb_regs[BFIN_LT1];
+        regs->lb1 = gdb_regs[BFIN_LB1];
+        regs->usp = gdb_regs[BFIN_USP];
+        regs->syscfg = gdb_regs[BFIN_SYSCFG];
+        regs->retx = gdb_regs[BFIN_PC];
+        regs->retn = gdb_regs[BFIN_RETN];
+        regs->rete = gdb_regs[BFIN_RETE];
+        regs->pc = gdb_regs[BFIN_PC];
+#if 0                           /* can't change these */
+        regs->astat = gdb_regs[BFIN_ASTAT];
+        regs->seqstat = gdb_regs[BFIN_SEQSTAT];
+        regs->ipend = gdb_regs[BFIN_IPEND];
+#endif
+}
+struct hw_breakpoint {
+        unsigned int occupied:1;
+        unsigned int skip:1;
+        unsigned int enabled:1;
+        unsigned int type:1;
+        unsigned int dataacc:2;
+        unsigned short count;
+        unsigned int addr;
+} breakinfo[HW_BREAKPOINT_NUM];
+int kgdb_arch_init(void)
+{
+        kgdb_remove_all_hw_break();
+        return 0;
+}
+int kgdb_set_hw_break(unsigned long addr)
+{
+        int breakno;
+        for (breakno = 0; breakno < HW_BREAKPOINT_NUM; breakno++)
+                if (!breakinfo[breakno].occupied) {
+                        breakinfo[breakno].occupied = 1;
+                        breakinfo[breakno].enabled = 1;
+                        breakinfo[breakno].type = 1;
+                        breakinfo[breakno].addr = addr;
+                        return 0;
+                }
+        return -ENOSPC;
+}
+int kgdb_remove_hw_break(unsigned long addr)
+{
+        int breakno;
+        for (breakno = 0; breakno < HW_BREAKPOINT_NUM; breakno++)
+                if (breakinfo[breakno].addr == addr)
+                        memset(&(breakinfo[breakno]), 0, sizeof(struct hw_breakpoint));
+        return 0;
+}
+void kgdb_remove_all_hw_break(void)
+{
+        memset(breakinfo, 0, sizeof(struct hw_breakpoint)*8);
+}
+/*
+void kgdb_show_info(void)
+{
+        printk(KERN_DEBUG "hwd: wpia0=0x%x, wpiacnt0=%d, wpiactl=0x%x, wpstat=0x%x\n",
+                bfin_read_WPIA0(), bfin_read_WPIACNT0(),
+                bfin_read_WPIACTL(), bfin_read_WPSTAT());
+}
+*/
+void kgdb_correct_hw_break(void)
+{
+        int breakno;
+        int correctit;
+        uint32_t wpdactl = bfin_read_WPDACTL();
+        correctit = 0;
+        for (breakno = 0; breakno < HW_BREAKPOINT_NUM; breakno++) {
+                if (breakinfo[breakno].type == 1) {
+                        switch (breakno) {
+                        case 0:
+                                if (breakinfo[breakno].enabled && !(wpdactl & WPIAEN0)) {
+                                        correctit = 1;
+                                        wpdactl &= ~(WPIREN01|EMUSW0);
+                                        wpdactl |= WPIAEN0|WPICNTEN0;
+                                        bfin_write_WPIA0(breakinfo[breakno].addr);
+                                        bfin_write_WPIACNT0(breakinfo[breakno].skip);
+                                } else if (!breakinfo[breakno].enabled && (wpdactl & WPIAEN0)) {
+                                        correctit = 1;
+                                        wpdactl &= ~WPIAEN0;
+                                }
+                                break;
+                        case 1:
+                                if (breakinfo[breakno].enabled && !(wpdactl & WPIAEN1)) {
+                                        correctit = 1;
+                                        wpdactl &= ~(WPIREN01|EMUSW1);
+                                        wpdactl |= WPIAEN1|WPICNTEN1;
+                                        bfin_write_WPIA1(breakinfo[breakno].addr);
+                                        bfin_write_WPIACNT1(breakinfo[breakno].skip);
+                                } else if (!breakinfo[breakno].enabled && (wpdactl & WPIAEN1)) {
+                                        correctit = 1;
+                                        wpdactl &= ~WPIAEN1;
+                                }
+                                break;
+                        case 2:
+                                if (breakinfo[breakno].enabled && !(wpdactl & WPIAEN2)) {
+                                        correctit = 1;
+                                        wpdactl &= ~(WPIREN23|EMUSW2);
+                                        wpdactl |= WPIAEN2|WPICNTEN2;
+                                        bfin_write_WPIA2(breakinfo[breakno].addr);
+                                        bfin_write_WPIACNT2(breakinfo[breakno].skip);
+                                } else if (!breakinfo[breakno].enabled && (wpdactl & WPIAEN2)) {
+                                        correctit = 1;
+                                        wpdactl &= ~WPIAEN2;
+                                }
+                                break;
+                        case 3:
+                                if (breakinfo[breakno].enabled && !(wpdactl & WPIAEN3)) {
+                                        correctit = 1;
+                                        wpdactl &= ~(WPIREN23|EMUSW3);
+                                        wpdactl |= WPIAEN3|WPICNTEN3;
+                                        bfin_write_WPIA3(breakinfo[breakno].addr);
+                                        bfin_write_WPIACNT3(breakinfo[breakno].skip);
+                                } else if (!breakinfo[breakno].enabled && (wpdactl & WPIAEN3)) {
+                                        correctit = 1;
+                                        wpdactl &= ~WPIAEN3;
+                                }
+                                break;
+                        case 4:
+                                if (breakinfo[breakno].enabled && !(wpdactl & WPIAEN4)) {
+                                        correctit = 1;
+                                        wpdactl &= ~(WPIREN45|EMUSW4);
+                                        wpdactl |= WPIAEN4|WPICNTEN4;
+                                        bfin_write_WPIA4(breakinfo[breakno].addr);
+                                        bfin_write_WPIACNT4(breakinfo[breakno].skip);
+                                } else if (!breakinfo[breakno].enabled && (wpdactl & WPIAEN4)) {
+                                        correctit = 1;
+                                        wpdactl &= ~WPIAEN4;
+                                }
+                                break;
+                        case 5:
+                                if (breakinfo[breakno].enabled && !(wpdactl & WPIAEN5)) {
+                                        correctit = 1;
+                                        wpdactl &= ~(WPIREN45|EMUSW5);
+                                        wpdactl |= WPIAEN5|WPICNTEN5;
+                                        bfin_write_WPIA5(breakinfo[breakno].addr);
+                                        bfin_write_WPIACNT5(breakinfo[breakno].skip);
+                                } else if (!breakinfo[breakno].enabled && (wpdactl & WPIAEN5)) {
+                                        correctit = 1;
+                                        wpdactl &= ~WPIAEN5;
+                                }
+                                break;
+                        }
+                }
+        }
+        if (correctit) {
+                wpdactl &= ~WPAND;
+                wpdactl |= WPPWR;
+                /*printk("correct_hw_break: wpdactl=0x%x\n", wpdactl);*/
+                bfin_write_WPDACTL(wpdactl);
+                CSYNC();
+                /*kgdb_show_info();*/
+        }
+}
+void kgdb_disable_hw_debug(struct pt_regs *regs)
+{
+        /* Disable hardware debugging while we are in kgdb */
+        bfin_write_WPIACTL(bfin_read_WPIACTL() & ~0x1);
+        CSYNC();
+}
+void kgdb_post_master_code(struct pt_regs *regs, int eVector, int err_code)
+{
+        /* Master processor is completely in the debugger */
+        gdb_bf533vector = eVector;
+        gdb_bf533errcode = err_code;
+}
+int kgdb_arch_handle_exception(int exceptionVector, int signo,
+                               int err_code, char *remcom_in_buffer,
+                               char *remcom_out_buffer,
+                               struct pt_regs *linux_regs)
+{
+        long addr;
+        long breakno;
+        char *ptr;
+        int newPC;
+        int wp_status;
+        switch (remcom_in_buffer[0]) {
+        case 'c':
+        case 's':
+                if (kgdb_contthread && kgdb_contthread != current) {
+                        strcpy(remcom_out_buffer, "E00");
+                        break;
+                }
+                kgdb_contthread = NULL;
+                /* try to read optional parameter, pc unchanged if no parm */
+                ptr = &remcom_in_buffer[1];
+                if (kgdb_hex2long(&ptr, &addr)) {
+                        linux_regs->retx = addr;
+                }
+                newPC = linux_regs->retx;
+                /* clear the trace bit */
+                linux_regs->syscfg &= 0xfffffffe;
+                /* set the trace bit if we're stepping */
+                if (remcom_in_buffer[0] == 's') {
+                        linux_regs->syscfg |= 0x1;
+                        debugger_step = 1;
+                }
+                wp_status = bfin_read_WPSTAT();
+                CSYNC();
+                if (exceptionVector == VEC_WATCH) {
+                        for (breakno = 0; breakno < 6; ++breakno) {
+                                if (wp_status & (1 << breakno)) {
+                                        breakinfo->skip = 1;
+                                        break;
+                                }
+                        }
+                }
+                kgdb_correct_hw_break();
+                bfin_write_WPSTAT(0);
+                return 0;
+        }                       /* switch */
+        return -1;              /* this means that we do not want to exit from the handler */
+}
+struct kgdb_arch arch_kgdb_ops = {
+        .gdb_bpt_instr = {0xa1},
+        .flags = KGDB_HW_BREAKPOINT,
+};
diff --git a/arch/blackfin/kernel/module.c b/arch/blackfin/kernel/module.c
index 372f756f1a..8b9fe29d03 100644
--- a/arch/blackfin/kernel/module.c
+++ b/arch/blackfin/kernel/module.c
@@ -165,8 +165,8 @@ module_frob_arch_sections(Elf_Ehdr * hdr, Elf_Shdr * sechdrs,
        for (s = sechdrs; s < sechdrs_end; ++s) {
                if ((strcmp(".l1.text", secstrings + s->sh_name) == 0) ||
-                        ((strcmp(".text", secstrings + s->sh_name)==0) &&
+                    ((strcmp(".text", secstrings + s->sh_name) == 0) &&
-                         (hdr->e_flags & FLG_CODE_IN_L1) && (s->sh_size > 0))) {
+                     (hdr->e_flags & FLG_CODE_IN_L1) && (s->sh_size > 0))) {
                        mod->arch.text_l1 = s;
                        dest = l1_inst_sram_alloc(s->sh_size);
                        if (dest == NULL) {
@@ -179,9 +179,9 @@ module_frob_arch_sections(Elf_Ehdr * hdr, Elf_Shdr * sechdrs,
                        s->sh_flags &= ~SHF_ALLOC;
                        s->sh_addr = (unsigned long)dest;
                }
-                if ((strcmp(".l1.data", secstrings + s->sh_name) == 0)||
+                if ((strcmp(".l1.data", secstrings + s->sh_name) == 0) ||
-                        ((strcmp(".data", secstrings + s->sh_name)==0) &&
+                    ((strcmp(".data", secstrings + s->sh_name) == 0) &&
-                         (hdr->e_flags & FLG_DATA_IN_L1) && (s->sh_size > 0))) {
+                     (hdr->e_flags & FLG_DATA_IN_L1) && (s->sh_size > 0))) {
                        mod->arch.data_a_l1 = s;
                        dest = l1_data_sram_alloc(s->sh_size);
                        if (dest == NULL) {
@@ -195,8 +195,8 @@ module_frob_arch_sections(Elf_Ehdr * hdr, Elf_Shdr * sechdrs,
                        s->sh_addr = (unsigned long)dest;
                }
                if (strcmp(".l1.bss", secstrings + s->sh_name) == 0 ||
-                        ((strcmp(".bss", secstrings + s->sh_name)==0) &&
+                    ((strcmp(".bss", secstrings + s->sh_name) == 0) &&
-                         (hdr->e_flags & FLG_DATA_IN_L1) && (s->sh_size > 0))) {
+                     (hdr->e_flags & FLG_DATA_IN_L1) && (s->sh_size > 0))) {
                        mod->arch.bss_a_l1 = s;
                        dest = l1_data_sram_alloc(s->sh_size);
                        if (dest == NULL) {
@@ -326,7 +326,7 @@ apply_relocate_add(Elf_Shdr * sechdrs, const char *strtab,
                        pr_debug("before %x after %x\n", *location16,
                                       (value & 0xffff));
                        tmp = (value & 0xffff);
-                        if((unsigned long)location16 >= L1_CODE_START) {
+                        if ((unsigned long)location16 >= L1_CODE_START) {
                                dma_memcpy(location16, &tmp, 2);
                        } else
                                *location16 = tmp;
@@ -335,7 +335,7 @@ apply_relocate_add(Elf_Shdr * sechdrs, const char *strtab,
                        pr_debug("before %x after %x\n", *location16,
                                       ((value >> 16) & 0xffff));
                        tmp = ((value >> 16) & 0xffff);
-                        if((unsigned long)location16 >= L1_CODE_START) {
+                        if ((unsigned long)location16 >= L1_CODE_START) {
                                dma_memcpy(location16, &tmp, 2);
                        } else
                                *location16 = tmp;
@@ -404,8 +404,8 @@ module_finalize(const Elf_Ehdr * hdr,
                        continue;
                if ((sechdrs[i].sh_type == SHT_RELA) &&
-                    ((strcmp(".rela.l1.text", secstrings + sechdrs[i].sh_name) == 0)||
+                    ((strcmp(".rela.l1.text", secstrings + sechdrs[i].sh_name) == 0) ||
-                        ((strcmp(".rela.text", secstrings + sechdrs[i].sh_name) == 0) &&
+                    ((strcmp(".rela.text", secstrings + sechdrs[i].sh_name) == 0) &&
                         (hdr->e_flags & FLG_CODE_IN_L1)))) {
                        apply_relocate_add((Elf_Shdr *) sechdrs, strtab,
                                           symindex, i, mod);
@@ -417,13 +417,13 @@ module_finalize(const Elf_Ehdr * hdr,
 void module_arch_cleanup(struct module *mod)
 {
        if ((mod->arch.text_l1) && (mod->arch.text_l1->sh_addr))
-                l1_inst_sram_free((void*)mod->arch.text_l1->sh_addr);
+                l1_inst_sram_free((void *)mod->arch.text_l1->sh_addr);
        if ((mod->arch.data_a_l1) && (mod->arch.data_a_l1->sh_addr))
-                l1_data_sram_free((void*)mod->arch.data_a_l1->sh_addr);
+                l1_data_sram_free((void *)mod->arch.data_a_l1->sh_addr);
        if ((mod->arch.bss_a_l1) && (mod->arch.bss_a_l1->sh_addr))
-                l1_data_sram_free((void*)mod->arch.bss_a_l1->sh_addr);
+                l1_data_sram_free((void *)mod->arch.bss_a_l1->sh_addr);
        if ((mod->arch.data_b_l1) && (mod->arch.data_b_l1->sh_addr))
-                l1_data_B_sram_free((void*)mod->arch.data_b_l1->sh_addr);
+                l1_data_B_sram_free((void *)mod->arch.data_b_l1->sh_addr);
        if ((mod->arch.bss_b_l1) && (mod->arch.bss_b_l1->sh_addr))
-                l1_data_B_sram_free((void*)mod->arch.bss_b_l1->sh_addr);
+                l1_data_B_sram_free((void *)mod->arch.bss_b_l1->sh_addr);
 }
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 3eff7439d8..5a51dd6ab2 100644
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
@@ -32,9 +32,10 @@
 #include <linux/unistd.h>
 #include <linux/user.h>
 #include <linux/a.out.h>
+#include <linux/uaccess.h>
 #include <asm/blackfin.h>
-#include <asm/uaccess.h>
+#include <asm/fixed_code.h>
 #define LED_ON  0
 #define LED_OFF 1
@@ -173,8 +174,8 @@ void show_regs(struct pt_regs *regs)
        printk(KERN_NOTICE "R4: %08lx  R5: %08lx  R6: %08lx  R7: %08lx\n",
               regs->r4, regs->r5, regs->r6, regs->r7);
-        if (!(regs->ipend))
+        if (!regs->ipend)
-                printk("USP: %08lx\n", rdusp());
+                printk(KERN_NOTICE "USP: %08lx\n", rdusp());
 }
 /* Fill in the fpu structure for a core dump.  */
@@ -322,7 +323,7 @@ asmlinkage int sys_execve(char *name, char **argv, char **envp)
                goto out;
        error = do_execve(filename, argv, envp, regs);
        putname(filename);
-      out:
+ out:
        unlock_kernel();
        return error;
 }
@@ -350,13 +351,77 @@ unsigned long get_wchan(struct task_struct *p)
        return 0;
 }
+void finish_atomic_sections (struct pt_regs *regs)
+{
+        if (regs->pc < ATOMIC_SEQS_START || regs->pc >= ATOMIC_SEQS_END)
+                return;
+        switch (regs->pc) {
+        case ATOMIC_XCHG32 + 2:
+                put_user(regs->r1, (int *)regs->p0);
+                regs->pc += 2;
+                break;
+        case ATOMIC_CAS32 + 2:
+        case ATOMIC_CAS32 + 4:
+                if (regs->r0 == regs->r1)
+                        put_user(regs->r2, (int *)regs->p0);
+                regs->pc = ATOMIC_CAS32 + 8;
+                break;
+        case ATOMIC_CAS32 + 6:
+                put_user(regs->r2, (int *)regs->p0);
+                regs->pc += 2;
+                break;
+        case ATOMIC_ADD32 + 2:
+                regs->r0 = regs->r1 + regs->r0;
+                /* fall through */
+        case ATOMIC_ADD32 + 4:
+                put_user(regs->r0, (int *)regs->p0);
+                regs->pc = ATOMIC_ADD32 + 6;
+                break;
+        case ATOMIC_SUB32 + 2:
+                regs->r0 = regs->r1 - regs->r0;
+                /* fall through */
+        case ATOMIC_SUB32 + 4:
+                put_user(regs->r0, (int *)regs->p0);
+                regs->pc = ATOMIC_SUB32 + 6;
+                break;
+        case ATOMIC_IOR32 + 2:
+                regs->r0 = regs->r1 | regs->r0;
+                /* fall through */
+        case ATOMIC_IOR32 + 4:
+                put_user(regs->r0, (int *)regs->p0);
+                regs->pc = ATOMIC_IOR32 + 6;
+                break;
+        case ATOMIC_AND32 + 2:
+                regs->r0 = regs->r1 & regs->r0;
+                /* fall through */
+        case ATOMIC_AND32 + 4:
+                put_user(regs->r0, (int *)regs->p0);
+                regs->pc = ATOMIC_AND32 + 6;
+                break;
+        case ATOMIC_XOR32 + 2:
+                regs->r0 = regs->r1 ^ regs->r0;
+                /* fall through */
+        case ATOMIC_XOR32 + 4:
+                put_user(regs->r0, (int *)regs->p0);
+                regs->pc = ATOMIC_XOR32 + 6;
+                break;
+        }
+}
 #if defined(CONFIG_ACCESS_CHECK)
 int _access_ok(unsigned long addr, unsigned long size)
 {
        if (addr > (addr + size))
                return 0;
-        if (segment_eq(get_fs(),KERNEL_DS))
+        if (segment_eq(get_fs(), KERNEL_DS))
                return 1;
 #ifdef CONFIG_MTD_UCLINUX
        if (addr >= memory_start && (addr + size) <= memory_end)
diff --git a/arch/blackfin/kernel/ptrace.c b/arch/blackfin/kernel/ptrace.c
index e718bb4a1e..ed800c7456 100644
--- a/arch/blackfin/kernel/ptrace.c
+++ b/arch/blackfin/kernel/ptrace.c
@@ -36,8 +36,8 @@
 #include <linux/ptrace.h>
 #include <linux/user.h>
 #include <linux/signal.h>
+#include <linux/uaccess.h>
-#include <asm/uaccess.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
@@ -122,7 +122,7 @@ static inline long get_reg(struct task_struct *task, int regno)
 static inline int
 put_reg(struct task_struct *task, int regno, unsigned long data)
 {
-        char * reg_ptr;
+        char *reg_ptr;
        struct pt_regs *regs =
            (struct pt_regs *)((unsigned long)task_stack_page(task) +
@@ -146,7 +146,7 @@ put_reg(struct task_struct *task, int regno, unsigned long data)
                break;
        default:
                if (regno <= 216)
-                        *(long *)(reg_ptr + regno) = data;
+                        *(long *)(reg_ptr + regno) = data;
        }
        return 0;
 }
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 5b9b434c1e..f59dcee7ba 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -42,6 +42,7 @@
 #include <asm/cacheflush.h>
 #include <asm/blackfin.h>
 #include <asm/cplbinit.h>
+#include <asm/fixed_code.h>
 u16 _bfin_swrst;
@@ -63,10 +64,6 @@ EXPORT_SYMBOL(mtd_size);
 char __initdata command_line[COMMAND_LINE_SIZE];
-#if defined(CONFIG_BLKFIN_DCACHE) || defined(CONFIG_BLKFIN_CACHE)
-static void generate_cpl_tables(void);
-#endif
 void __init bf53x_cache_init(void)
 {
 #if defined(CONFIG_BLKFIN_DCACHE) || defined(CONFIG_BLKFIN_CACHE)
@@ -197,6 +194,17 @@ void __init setup_arch(char **cmdline_p)
        /* this give a chance to get printk() working before crash. */
 #endif
+        printk(KERN_INFO "Hardware Trace ");
+        if (bfin_read_TBUFCTL() & 0x1 )
+                printk("Active ");
+        else
+                printk("Off ");
+        if (bfin_read_TBUFCTL() & 0x2)
+                printk("and Enabled\n");
+        else
+        printk("and Disabled\n");
 #if defined(CONFIG_CHR_DEV_FLASH) || defined(CONFIG_BLK_DEV_FLASH)
        /* we need to initialize the Flashrom device here since we might
         * do things with flash early on in the boot
@@ -307,10 +315,20 @@ void __init setup_arch(char **cmdline_p)
        init_leds();
        printk(KERN_INFO "Blackfin support (C) 2004-2007 Analog Devices, Inc.\n");
-        printk(KERN_INFO "Compiled for ADSP-%s Rev 0.%d\n", CPU, bfin_compiled_revid());
+        if (bfin_compiled_revid() == 0xffff)
-        if (bfin_revid() != bfin_compiled_revid())
+                printk(KERN_INFO "Compiled for ADSP-%s Rev any\n", CPU);
-                printk(KERN_ERR "Warning: Compiled for Rev %d, but running on Rev %d\n",
+        else if (bfin_compiled_revid() == -1)
-                       bfin_compiled_revid(), bfin_revid());
+                printk(KERN_INFO "Compiled for ADSP-%s Rev none\n", CPU);
+        else
+                printk(KERN_INFO "Compiled for ADSP-%s Rev 0.%d\n", CPU, bfin_compiled_revid());
+        if (bfin_revid() != bfin_compiled_revid()) {
+                if (bfin_compiled_revid() == -1)
+                        printk(KERN_ERR "Warning: Compiled for Rev none, but running on Rev %d\n",
+                               bfin_revid());
+                else if (bfin_compiled_revid() != 0xffff)
+                        printk(KERN_ERR "Warning: Compiled for Rev %d, but running on Rev %d\n",
+                               bfin_compiled_revid(), bfin_revid());
+        }
        if (bfin_revid() < SUPPORTED_REVID)
                printk(KERN_ERR "Warning: Unsupported Chip Revision ADSP-%s Rev 0.%d detected\n",
                       CPU, bfin_revid());
@@ -344,15 +362,15 @@ void __init setup_arch(char **cmdline_p)
               , _stext, _etext,
               __start_rodata, __end_rodata,
               _sdata, _edata,
-               (void*)&init_thread_union, (void*)((int)(&init_thread_union) + 0x2000),
+               (void *)&init_thread_union, (void *)((int)(&init_thread_union) + 0x2000),
               __init_begin, __init_end,
               __bss_start, __bss_stop,
-               (void*)_ramstart, (void*)memory_end
+               (void *)_ramstart, (void *)memory_end
 #ifdef CONFIG_MTD_UCLINUX
-               , (void*)memory_mtd_start, (void*)(memory_mtd_start + mtd_size)
+               , (void *)memory_mtd_start, (void *)(memory_mtd_start + mtd_size)
 #endif
 #if DMA_UNCACHED_REGION > 0
-               , (void*)(_ramend - DMA_UNCACHED_REGION), (void*)(_ramend)
+               , (void *)(_ramend - DMA_UNCACHED_REGION), (void *)(_ramend)
 #endif
               );
@@ -378,11 +396,11 @@ void __init setup_arch(char **cmdline_p)
        /* check the size of the l1 area */
        l1_length = _etext_l1 - _stext_l1;
        if (l1_length > L1_CODE_LENGTH)
-                panic("L1 memory overflow\n");
+                panic("L1 code memory overflow\n");
        l1_length = _ebss_l1 - _sdata_l1;
        if (l1_length > L1_DATA_A_LENGTH)
-                panic("L1 memory overflow\n");
+                panic("L1 data memory overflow\n");
 #ifdef BF561_FAMILY
        _bfin_swrst = bfin_read_SICA_SWRST();
@@ -390,10 +408,28 @@ void __init setup_arch(char **cmdline_p)
        _bfin_swrst = bfin_read_SWRST();
 #endif
-        bf53x_cache_init();
+        /* Copy atomic sequences to their fixed location, and sanity check that
+           these locations are the ones that we advertise to userspace.  */
+        memcpy((void *)FIXED_CODE_START, &fixed_code_start,
+               FIXED_CODE_END - FIXED_CODE_START);
+        BUG_ON((char *)&sigreturn_stub - (char *)&fixed_code_start
+               != SIGRETURN_STUB - FIXED_CODE_START);
+        BUG_ON((char *)&atomic_xchg32 - (char *)&fixed_code_start
+               != ATOMIC_XCHG32 - FIXED_CODE_START);
+        BUG_ON((char *)&atomic_cas32 - (char *)&fixed_code_start
+               != ATOMIC_CAS32 - FIXED_CODE_START);
+        BUG_ON((char *)&atomic_add32 - (char *)&fixed_code_start
+               != ATOMIC_ADD32 - FIXED_CODE_START);
+        BUG_ON((char *)&atomic_sub32 - (char *)&fixed_code_start
+               != ATOMIC_SUB32 - FIXED_CODE_START);
+        BUG_ON((char *)&atomic_ior32 - (char *)&fixed_code_start
+               != ATOMIC_IOR32 - FIXED_CODE_START);
+        BUG_ON((char *)&atomic_and32 - (char *)&fixed_code_start
+               != ATOMIC_AND32 - FIXED_CODE_START);
+        BUG_ON((char *)&atomic_xor32 - (char *)&fixed_code_start
+               != ATOMIC_XOR32 - FIXED_CODE_START);
-        printk(KERN_INFO "Hardware Trace Enabled\n");
+        bf53x_cache_init();
-        bfin_write_TBUFCTL(0x03);
 }
 static int __init topology_init(void)
@@ -411,286 +447,6 @@ static int __init topology_init(void)
 subsys_initcall(topology_init);
-#if defined(CONFIG_BLKFIN_DCACHE) || defined(CONFIG_BLKFIN_CACHE)
-static u16 __init lock_kernel_check(u32 start, u32 end)
-{
-        if ((start <= (u32) _stext && end >= (u32) _end)
-            || (start >= (u32) _stext && end <= (u32) _end))
-                return IN_KERNEL;
-        return 0;
-}
-static unsigned short __init
-fill_cplbtab(struct cplb_tab *table,
-             unsigned long start, unsigned long end,
-             unsigned long block_size, unsigned long cplb_data)
-{
-        int i;
-        switch (block_size) {
-        case SIZE_4M:
-                i = 3;
-                break;
-        case SIZE_1M:
-                i = 2;
-                break;
-        case SIZE_4K:
-                i = 1;
-                break;
-        case SIZE_1K:
-        default:
-                i = 0;
-                break;
-        }
-        cplb_data = (cplb_data & ~(3 << 16)) | (i << 16);
-        while ((start < end) && (table->pos < table->size)) {
-                table->tab[table->pos++] = start;
-                if (lock_kernel_check(start, start + block_size) == IN_KERNEL)
-                        table->tab[table->pos++] =
-                            cplb_data | CPLB_LOCK | CPLB_DIRTY;
-                else
-                        table->tab[table->pos++] = cplb_data;
-                start += block_size;
-        }
-        return 0;
-}
-static unsigned short __init
-close_cplbtab(struct cplb_tab *table)
-{
-        while (table->pos < table->size) {
-                table->tab[table->pos++] = 0;
-                table->tab[table->pos++] = 0; /* !CPLB_VALID */
-        }
-        return 0;
-}
-/* helper function */
-static void __fill_code_cplbtab(struct cplb_tab *t, int i,
-                                u32 a_start, u32 a_end)
-{
-        if (cplb_data[i].psize) {
-                fill_cplbtab(t,
-                                cplb_data[i].start,
-                                cplb_data[i].end,
-                                cplb_data[i].psize,
-                                cplb_data[i].i_conf);
-        } else {
-#if (defined(CONFIG_BLKFIN_CACHE) && defined(ANOMALY_05000263))
-                if (i == SDRAM_KERN) {
-                        fill_cplbtab(t,
-                                        cplb_data[i].start,
-                                        cplb_data[i].end,
-                                        SIZE_4M,
-                                        cplb_data[i].i_conf);
-                } else {
-#endif
-                        fill_cplbtab(t,
-                                        cplb_data[i].start,
-                                        a_start,
-                                        SIZE_1M,
-                                        cplb_data[i].i_conf);
-                        fill_cplbtab(t,
-                                        a_start,
-                                        a_end,
-                                        SIZE_4M,
-                                        cplb_data[i].i_conf);
-                        fill_cplbtab(t, a_end,
-                                        cplb_data[i].end,
-                                        SIZE_1M,
-                                        cplb_data[i].i_conf);
-                }
-        }
-}
-static void __fill_data_cplbtab(struct cplb_tab *t, int i,
-                                u32 a_start, u32 a_end)
-{
-        if (cplb_data[i].psize) {
-                fill_cplbtab(t,
-                                cplb_data[i].start,
-                                cplb_data[i].end,
-                                cplb_data[i].psize,
-                                cplb_data[i].d_conf);
-        } else {
-                fill_cplbtab(t,
-                                cplb_data[i].start,
-                                a_start, SIZE_1M,
-                                cplb_data[i].d_conf);
-                fill_cplbtab(t, a_start,
-                                a_end, SIZE_4M,
-                                cplb_data[i].d_conf);
-                fill_cplbtab(t, a_end,
-                                cplb_data[i].end,
-                                SIZE_1M,
-                                cplb_data[i].d_conf);
-        }
-}
-static void __init generate_cpl_tables(void)
-{
-        u16 i, j, process;
-        u32 a_start, a_end, as, ae, as_1m;
-        struct cplb_tab *t_i = NULL;
-        struct cplb_tab *t_d = NULL;
-        struct s_cplb cplb;
-        cplb.init_i.size = MAX_CPLBS;
-        cplb.init_d.size = MAX_CPLBS;
-        cplb.switch_i.size = MAX_SWITCH_I_CPLBS;
-        cplb.switch_d.size = MAX_SWITCH_D_CPLBS;
-        cplb.init_i.pos = 0;
-        cplb.init_d.pos = 0;
-        cplb.switch_i.pos = 0;
-        cplb.switch_d.pos = 0;
-        cplb.init_i.tab = icplb_table;
-        cplb.init_d.tab = dcplb_table;
-        cplb.switch_i.tab = ipdt_table;
-        cplb.switch_d.tab = dpdt_table;
-        cplb_data[SDRAM_KERN].end = memory_end;
-#ifdef CONFIG_MTD_UCLINUX
-        cplb_data[SDRAM_RAM_MTD].start = memory_mtd_start;
-        cplb_data[SDRAM_RAM_MTD].end = memory_mtd_start + mtd_size;
-        cplb_data[SDRAM_RAM_MTD].valid = mtd_size > 0;
-# if defined(CONFIG_ROMFS_FS)
-        cplb_data[SDRAM_RAM_MTD].attr |= I_CPLB;
-        /*
-         * The ROMFS_FS size is often not multiple of 1MB.
-         * This can cause multiple CPLB sets covering the same memory area.
-         * This will then cause multiple CPLB hit exceptions.
-         * Workaround: We ensure a contiguous memory area by extending the kernel
-         * memory section over the mtd section.
-         * For ROMFS_FS memory must be covered with ICPLBs anyways.
-         * So there is no difference between kernel and mtd memory setup.
-         */
-        cplb_data[SDRAM_KERN].end = memory_mtd_start + mtd_size;;
-        cplb_data[SDRAM_RAM_MTD].valid = 0;
-# endif
-#else
-        cplb_data[SDRAM_RAM_MTD].valid = 0;
-#endif
-        cplb_data[SDRAM_DMAZ].start = _ramend - DMA_UNCACHED_REGION;
-        cplb_data[SDRAM_DMAZ].end = _ramend;
-        cplb_data[RES_MEM].start = _ramend;
-        cplb_data[RES_MEM].end = physical_mem_end;
-        if (reserved_mem_dcache_on)
-                cplb_data[RES_MEM].d_conf = SDRAM_DGENERIC;
-        else
-                cplb_data[RES_MEM].d_conf = SDRAM_DNON_CHBL;
-        if (reserved_mem_icache_on)
-                cplb_data[RES_MEM].i_conf = SDRAM_IGENERIC;
-        else
-                cplb_data[RES_MEM].i_conf = SDRAM_INON_CHBL;
-        for (i = ZERO_P; i <= L2_MEM; i++) {
-                if (!cplb_data[i].valid)
-                        continue;
-                as_1m = cplb_data[i].start % SIZE_1M;
-                /*
-                 * We need to make sure all sections are properly 1M aligned
-                 * However between Kernel Memory and the Kernel mtd section,
-                 * depending on the rootfs size, there can be overlapping
-                 * memory areas.
-                 */
-                if (as_1m && i != L1I_MEM && i != L1D_MEM) {
-#ifdef CONFIG_MTD_UCLINUX
-                        if (i == SDRAM_RAM_MTD) {
-                                if ((cplb_data[SDRAM_KERN].end + 1) >
-                                                cplb_data[SDRAM_RAM_MTD].start)
-                                        cplb_data[SDRAM_RAM_MTD].start =
-                                                (cplb_data[i].start &
-                                                 (-2*SIZE_1M)) + SIZE_1M;
-                                else
-                                        cplb_data[SDRAM_RAM_MTD].start =
-                                                (cplb_data[i].start &
-                                                 (-2*SIZE_1M));
-                        } else
-#endif
-                                printk(KERN_WARNING
-                                        "Unaligned Start of %s at 0x%X\n",
-                                        cplb_data[i].name, cplb_data[i].start);
-                }
-                as = cplb_data[i].start % SIZE_4M;
-                ae = cplb_data[i].end % SIZE_4M;
-                if (as)
-                        a_start = cplb_data[i].start + (SIZE_4M - (as));
-                else
-                        a_start = cplb_data[i].start;
-                a_end = cplb_data[i].end - ae;
-                for (j = INITIAL_T; j <= SWITCH_T; j++) {
-                        switch (j) {
-                        case INITIAL_T:
-                                if (cplb_data[i].attr & INITIAL_T) {
-                                        t_i = &cplb.init_i;
-                                        t_d = &cplb.init_d;
-                                        process = 1;
-                                } else
-                                        process = 0;
-                                break;
-                        case SWITCH_T:
-                                if (cplb_data[i].attr & SWITCH_T) {
-                                        t_i = &cplb.switch_i;
-                                        t_d = &cplb.switch_d;
-                                        process = 1;
-                                } else
-                                        process = 0;
-                                break;
-                        default:
-                                        process = 0;
-                                break;
-                        }
-                        if (!process)
-                                continue;
-                        if (cplb_data[i].attr & I_CPLB)
-                                __fill_code_cplbtab(t_i, i, a_start, a_end);
-                        if (cplb_data[i].attr & D_CPLB)
-                                __fill_data_cplbtab(t_d, i, a_start, a_end);
-                }
-        }
-/* close tables */
-        close_cplbtab(&cplb.init_i);
-        close_cplbtab(&cplb.init_d);
-        cplb.init_i.tab[cplb.init_i.pos] = -1;
-        cplb.init_d.tab[cplb.init_d.pos] = -1;
-        cplb.switch_i.tab[cplb.switch_i.pos] = -1;
-        cplb.switch_d.tab[cplb.switch_d.pos] = -1;
-}
-#endif
 static u_long get_vco(void)
 {
        u_long msel;
@@ -720,7 +476,6 @@ u_long get_cclk(void)
                return get_vco() / ssel;
        return get_vco() >> csel;
 }
 EXPORT_SYMBOL(get_cclk);
 /* Get the System clock */
@@ -739,7 +494,6 @@ u_long get_sclk(void)
        return get_vco() / ssel;
 }
 EXPORT_SYMBOL(get_sclk);
 /*
@@ -794,23 +548,23 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                seq_printf(m, "D-CACHE:\tOFF\n");
-        switch(bfin_read_DMEM_CONTROL() & (1 << DMC0_P | 1 << DMC1_P)) {
+        switch (bfin_read_DMEM_CONTROL() & (1 << DMC0_P | 1 << DMC1_P)) {
-                case ACACHE_BSRAM:
+        case ACACHE_BSRAM:
-                        seq_printf(m, "DBANK-A:\tCACHE\n" "DBANK-B:\tSRAM\n");
+                seq_printf(m, "DBANK-A:\tCACHE\n" "DBANK-B:\tSRAM\n");
-                        dcache_size = 16;
+                dcache_size = 16;
-                        dsup_banks = 1;
+                dsup_banks = 1;
-                        break;
+                break;
-                case ACACHE_BCACHE:
+        case ACACHE_BCACHE:
-                        seq_printf(m, "DBANK-A:\tCACHE\n" "DBANK-B:\tCACHE\n");
+                seq_printf(m, "DBANK-A:\tCACHE\n" "DBANK-B:\tCACHE\n");
-                        dcache_size = 32;
+                dcache_size = 32;
-                        dsup_banks = 2;
+                dsup_banks = 2;
-                        break;
+                break;
-                case ASRAM_BSRAM:
+        case ASRAM_BSRAM:
-                        seq_printf(m, "DBANK-A:\tSRAM\n" "DBANK-B:\tSRAM\n");
+                seq_printf(m, "DBANK-A:\tSRAM\n" "DBANK-B:\tSRAM\n");
-                        dcache_size = 0;
+                dcache_size = 0;
-                        dsup_banks = 0;
+                dsup_banks = 0;
-                        break;
+                break;
-                default:
+        default:
                break;
        }
diff --git a/arch/blackfin/kernel/signal.c b/arch/blackfin/kernel/signal.c
index 316e65c343..5564c9588a 100644
--- a/arch/blackfin/kernel/signal.c
+++ b/arch/blackfin/kernel/signal.c
@@ -34,8 +34,8 @@
 #include <linux/personality.h>
 #include <linux/binfmts.h>
 #include <linux/freezer.h>
+#include <linux/uaccess.h>
-#include <asm/uaccess.h>
 #include <asm/cacheflush.h>
 #include <asm/ucontext.h>
@@ -124,7 +124,7 @@ asmlinkage int do_rt_sigreturn(unsigned long __unused)
        return r0;
-      badframe:
+ badframe:
        force_sig(SIGSEGV, current);
        return 0;
 }
@@ -239,7 +239,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t * info,
        return 0;
-      give_sigsegv:
+ give_sigsegv:
        if (sig == SIGSEGV)
                ka->sa.sa_handler = SIG_DFL;
        force_sig(SIGSEGV, current);
@@ -263,7 +263,7 @@ handle_restart(struct pt_regs *regs, struct k_sigaction *ka, int has_handler)
                }
                /* fallthrough */
        case -ERESTARTNOINTR:
-              do_restart:
+ do_restart:
                regs->p0 = regs->orig_p0;
                regs->r0 = regs->orig_r0;
                regs->pc -= 2;
@@ -341,7 +341,7 @@ asmlinkage void do_signal(struct pt_regs *regs)
                return;
        }
-no_signal:
+ no_signal:
        /* Did we come from a system call? */
        if (regs->orig_p0 >= 0)
                /* Restart the system call - no handlers present */
diff --git a/arch/blackfin/kernel/sys_bfin.c b/arch/blackfin/kernel/sys_bfin.c
index f436e6743f..f5e1ae3d17 100644
--- a/arch/blackfin/kernel/sys_bfin.c
+++ b/arch/blackfin/kernel/sys_bfin.c
@@ -37,12 +37,12 @@
 #include <linux/syscalls.h>
 #include <linux/mman.h>
 #include <linux/file.h>
+#include <linux/uaccess.h>
+#include <linux/ipc.h>
+#include <linux/unistd.h>
 #include <asm/cacheflush.h>
-#include <asm/uaccess.h>
-#include <asm/ipc.h>
 #include <asm/dma.h>
-#include <asm/unistd.h>
 /*
 * sys_pipe() is the normal C calling standard for creating
@@ -83,7 +83,7 @@ do_mmap2(unsigned long addr, unsigned long len,
        if (file)
                fput(file);
-      out:
+ out:
        return error;
 }
diff --git a/arch/blackfin/kernel/time.c b/arch/blackfin/kernel/time.c
index f578176b6d..beef057bd1 100644
--- a/arch/blackfin/kernel/time.c
+++ b/arch/blackfin/kernel/time.c
@@ -87,7 +87,7 @@ void __init init_leds(void)
 static inline void do_leds(void)
 {
        static unsigned int count = 50;
-        static int flag = 0;
+        static int flag;
        unsigned short tmp = 0;
        if (--count == 0) {
@@ -200,7 +200,7 @@ irqreturn_t timer_interrupt(int irq, void *dummy)__attribute__((l1_text));
 irqreturn_t timer_interrupt(int irq, void *dummy)
 {
        /* last time the cmos clock got updated */
-        static long last_rtc_update = 0;
+        static long last_rtc_update;
        write_seqlock(&xtime_lock);
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index aa660f32d8..3909f5b355 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -27,15 +27,15 @@
 * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/kallsyms.h>
 #include <asm/traps.h>
 #include <asm/cacheflush.h>
 #include <asm/blackfin.h>
-#include <asm/uaccess.h>
 #include <asm/irq_handler.h>
-#include <linux/interrupt.h>
+#include <asm/trace.h>
-#include <linux/module.h>
-#include <linux/kallsyms.h>
 #ifdef CONFIG_KGDB
 # include <linux/debugger.h>
@@ -76,7 +76,7 @@ static int printk_address(unsigned long address)
                if (!modname)
                        modname = delim = "";
                return printk("<0x%p> { %s%s%s%s + 0x%lx }",
-                              (void*)address, delim, modname, delim, symname,
+                              (void *)address, delim, modname, delim, symname,
                              (unsigned long)offset);
        }
@@ -119,7 +119,7 @@ static int printk_address(unsigned long address)
                                write_unlock_irq(&tasklist_lock);
                                return printk("<0x%p> [ %s + 0x%lx ]",
-                                              (void*)address, name, offset);
+                                              (void *)address, name, offset);
                        }
                        vml = vml->next;
@@ -128,19 +128,9 @@ static int printk_address(unsigned long address)
        write_unlock_irq(&tasklist_lock);
        /* we were unable to find this address anywhere */
-        return printk("[<0x%p>]", (void*)address);
+        return printk("[<0x%p>]", (void *)address);
 }
-#define trace_buffer_save(x) \
-        do { \
-                (x) = bfin_read_TBUFCTL(); \
-                bfin_write_TBUFCTL((x) & ~TBUFEN); \
-        } while (0)
-#define trace_buffer_restore(x) \
-        do { \
-                bfin_write_TBUFCTL((x));        \
-        } while (0)
 asmlinkage void trap_c(struct pt_regs *fp)
 {
        int j, sig = 0;
@@ -203,15 +193,14 @@ asmlinkage void trap_c(struct pt_regs *fp)
 #else
        /* 0x02 - User Defined, Caught by default */
 #endif
-        /* 0x03  - Atomic test and set */
+        /* 0x03 - User Defined, userspace stack overflow */
        case VEC_EXCPT03:
                info.si_code = SEGV_STACKFLOW;
                sig = SIGSEGV;
                printk(KERN_EMERG EXC_0x03);
                CHK_DEBUGGER_TRAP();
                break;
-        /* 0x04 - spinlock - handled by _ex_spinlock,
+        /* 0x04 - User Defined, Caught by default */
-                getting here is an error */
        /* 0x05 - User Defined, Caught by default */
        /* 0x06 - User Defined, Caught by default */
        /* 0x07 - User Defined, Caught by default */
@@ -545,30 +534,30 @@ void dump_bfin_regs(struct pt_regs *fp, void *retaddr)
        if (current->mm) {
                printk(KERN_EMERG "TEXT = 0x%p-0x%p  DATA = 0x%p-0x%p\n"
-                       "BSS = 0x%p-0x%p   USER-STACK = 0x%p\n\n",
+                       KERN_EMERG "BSS = 0x%p-0x%p   USER-STACK = 0x%p\n"
-                       (void*)current->mm->start_code,
+                       KERN_EMERG "\n",
-                       (void*)current->mm->end_code,
+                       (void *)current->mm->start_code,
-                       (void*)current->mm->start_data,
+                       (void *)current->mm->end_code,
-                       (void*)current->mm->end_data,
+                       (void *)current->mm->start_data,
-                       (void*)current->mm->end_data,
+                       (void *)current->mm->end_data,
-                       (void*)current->mm->brk,
+                       (void *)current->mm->end_data,
-                       (void*)current->mm->start_stack);
+                       (void *)current->mm->brk,
+                       (void *)current->mm->start_stack);
        }
        printk(KERN_EMERG "return address: [0x%p]; contents of:", retaddr);
-        if (retaddr != 0 && retaddr <= (void*)physical_mem_end
+        if (retaddr != 0 && retaddr <= (void *)physical_mem_end
 #if L1_CODE_LENGTH != 0
            /* FIXME: Copy the code out of L1 Instruction SRAM through dma
               memcpy.  */
-            && !(retaddr >= (void*)L1_CODE_START
+            && !(retaddr >= (void *)L1_CODE_START
-                 && retaddr < (void*)(L1_CODE_START + L1_CODE_LENGTH))
+                 && retaddr < (void *)(L1_CODE_START + L1_CODE_LENGTH))
 #endif
        ) {
                int i = ((unsigned int)retaddr & 0xFFFFFFF0) - 32;
                unsigned short x = 0;
-                for (; i < ((unsigned int)retaddr & 0xFFFFFFF0 ) + 32 ;
+                for (; i < ((unsigned int)retaddr & 0xFFFFFFF0) + 32; i += 2) {
-                        i += 2) {
+                        if (!(i & 0xF))
-                        if ( !(i & 0xF) )
                                printk(KERN_EMERG "\n" KERN_EMERG
                                        "0x%08x: ", i);
@@ -587,7 +576,7 @@ void dump_bfin_regs(struct pt_regs *fp, void *retaddr)
                                        " The rest of this error"
                                        " is meanless\n");
 #endif
-                        if ( i == (unsigned int)retaddr )
+                        if (i == (unsigned int)retaddr)
                                printk("[%04x]", x);
                        else
                                printk(" %04x ", x);
@@ -680,8 +669,8 @@ void panic_cplb_error(int cplb_panic, struct pt_regs *fp)
                break;
        }
-        printk(KERN_EMERG "DCPLB_FAULT_ADDR=%p\n", (void*)bfin_read_DCPLB_FAULT_ADDR());
+        printk(KERN_EMERG "DCPLB_FAULT_ADDR=%p\n", (void *)bfin_read_DCPLB_FAULT_ADDR());
-        printk(KERN_EMERG "ICPLB_FAULT_ADDR=%p\n", (void*)bfin_read_ICPLB_FAULT_ADDR());
+        printk(KERN_EMERG "ICPLB_FAULT_ADDR=%p\n", (void *)bfin_read_ICPLB_FAULT_ADDR());
        dump_bfin_regs(fp, (void *)fp->retx);
        dump_stack();
        panic("Unrecoverable event\n");
diff --git a/arch/blackfin/kernel/vmlinux.lds.S b/arch/blackfin/kernel/vmlinux.lds.S
index 1ef1e36b39..d06f860f47 100644
--- a/arch/blackfin/kernel/vmlinux.lds.S
+++ b/arch/blackfin/kernel/vmlinux.lds.S
@@ -31,6 +31,7 @@
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/mem_map.h>
+#include <asm/page.h>
 OUTPUT_FORMAT("elf32-bfin")
 ENTRY(__start)
@@ -63,8 +64,8 @@ SECTIONS
        .data :
        {
+                . = ALIGN(PAGE_SIZE);
                __sdata = .;
-                . = ALIGN(0x2000);
                *(.data.init_task)
                DATA_DATA
                CONSTRUCTORS
@@ -72,14 +73,14 @@ SECTIONS
                . = ALIGN(32);
                *(.data.cacheline_aligned)
-                . = ALIGN(0x2000);
+                . = ALIGN(PAGE_SIZE);
                __edata = .;
        }
+        . = ALIGN(PAGE_SIZE);
        ___init_begin = .;
        .init :
        {
-                . = ALIGN(4096);
                __sinittext = .;
                *(.init.text)
                __einittext = .;
@@ -152,9 +153,10 @@ SECTIONS
                __ebss_b_l1 = .;
        }
-        ___init_end = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1);
+        . = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1);
+        ___init_end = ALIGN(PAGE_SIZE);
-        .bss LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1) :
+        .bss ___init_end :
        {
                . = ALIGN(4);
                ___bss_start = .;
diff --git a/arch/blackfin/lib/strcmp.c b/arch/blackfin/lib/strcmp.c
index 2ad47c4254..4eeefd8690 100644
--- a/arch/blackfin/lib/strcmp.c
+++ b/arch/blackfin/lib/strcmp.c
@@ -6,6 +6,5 @@
 int strcmp(const char *dest, const char *src)
 {
-                return __inline_strcmp(dest, src);
+        return __inline_strcmp(dest, src);
 }
diff --git a/arch/blackfin/lib/strcpy.c b/arch/blackfin/lib/strcpy.c
index 4dc835a8a1..534589db72 100644
--- a/arch/blackfin/lib/strcpy.c
+++ b/arch/blackfin/lib/strcpy.c
@@ -6,6 +6,5 @@
 char *strcpy(char *dest, const char *src)
 {
-                return __inline_strcpy(dest, src);
+        return __inline_strcpy(dest, src);
 }
diff --git a/arch/blackfin/lib/strncmp.c b/arch/blackfin/lib/strncmp.c
index 947bcfe3f3..d791f120bf 100644
--- a/arch/blackfin/lib/strncmp.c
+++ b/arch/blackfin/lib/strncmp.c
@@ -6,6 +6,5 @@
 int strncmp(const char *cs, const char *ct, size_t count)
 {
-                return __inline_strncmp(cs, ct, count);
+        return __inline_strncmp(cs, ct, count);
 }
diff --git a/arch/blackfin/lib/strncpy.c b/arch/blackfin/lib/strncpy.c
index 77a9b2e950..1fecb5c71f 100644
--- a/arch/blackfin/lib/strncpy.c
+++ b/arch/blackfin/lib/strncpy.c
@@ -6,6 +6,5 @@
 char *strncpy(char *dest, const char *src, size_t n)
 {
-                return __inline_strncpy(dest, src, n);
+        return __inline_strncpy(dest, src, n);
 }
diff --git a/arch/blackfin/mach-bf533/Makefile b/arch/blackfin/mach-bf533/Makefile
index 76d2c2b857..8cce173636 100644
--- a/arch/blackfin/mach-bf533/Makefile
+++ b/arch/blackfin/mach-bf533/Makefile
@@ -4,6 +4,6 @@
 extra-y := head.o
-obj-y := ints-priority.o
+obj-y := ints-priority.o dma.o
-obj-$(CONFIG_CPU_FREQ_BF533) += cpu.o
+obj-$(CONFIG_CPU_FREQ)   += cpu.o
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c
index edd31ce4f8..4545f363e6 100644
--- a/arch/blackfin/mach-bf533/boards/cm_bf533.c
+++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c
@@ -34,7 +34,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb_isp1362.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
 #include <asm/bfin5xx_spi.h>
 /*
@@ -51,11 +51,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
                .size = 0x00020000,
                .offset = 0,
                .mask_flags = MTD_CAP_ROM
-        },{
+        }, {
                .name = "kernel",
                .size = 0xe0000,
                .offset = 0x20000
-        },{
+        }, {
                .name = "file system",
                .size = 0x700000,
                .offset = 0x00100000,
@@ -98,7 +98,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                .platform_data = &bfin_spi_flash_data,
                .controller_data = &spi_flash_chip_info,
                .mode = SPI_MODE_3,
-        },{
+        }, {
                .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */
                .max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */
                .bus_num = 1,               /* Framework bus number */
@@ -145,7 +145,7 @@ static struct resource smc91x_resources[] = {
                .start = 0x20200300,
                .end = 0x20200300 + 16,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PF0,
                .end = IRQ_PF0,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -194,11 +194,11 @@ static struct resource isp1362_hcd_resources[] = {
                .start = 0x20308000,
                .end = 0x20308000,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = 0x20308004,
                .end = 0x20308004,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PF4,
                .end = IRQ_PF4,
                .flags = IORESOURCE_IRQ,
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c
index 0b522d9516..0000b8f123 100644
--- a/arch/blackfin/mach-bf533/boards/ezkit.c
+++ b/arch/blackfin/mach-bf533/boards/ezkit.c
@@ -35,7 +35,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb_isp1362.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
 #include <asm/bfin5xx_spi.h>
 /*
@@ -61,7 +61,7 @@ static struct resource smc91x_resources[] = {
                .start = 0x20310300,
                .end = 0x20310300 + 16,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PF9,
                .end = IRQ_PF9,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -85,11 +85,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
                .size = 0x00020000,
                .offset = 0,
                .mask_flags = MTD_CAP_ROM
-        },{
+        }, {
                .name = "kernel",
                .size = 0xe0000,
                .offset = 0x20000
-        },{
+        }, {
                .name = "file system",
                .size = 0x700000,
                .offset = 0x00100000,
diff --git a/arch/blackfin/mach-bf533/boards/generic_board.c b/arch/blackfin/mach-bf533/boards/generic_board.c
index c0f43ccfbf..9bc1f0d0ab 100644
--- a/arch/blackfin/mach-bf533/boards/generic_board.c
+++ b/arch/blackfin/mach-bf533/boards/generic_board.c
@@ -30,7 +30,7 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
 /*
 * Name the Board for the /proc/cpuinfo
@@ -53,11 +53,11 @@ static struct resource smc91x_resources[] = {
                .start = 0x20300300,
                .end = 0x20300300 + 16,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PROG_INTB,
                .end = IRQ_PROG_INTB,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
-        },{
+        }, {
                /*
                 *  denotes the flag pin and is used directly if
                 *  CONFIG_IRQCHIP_DEMUX_GPIO is defined.
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index 9a472fe158..a9143c4cbd 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -37,7 +37,7 @@
 #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
 #include <linux/usb_isp1362.h>
 #endif
-#include <asm/irq.h>
+#include <linux/irq.h>
 #include <asm/bfin5xx_spi.h>
 /*
@@ -62,7 +62,7 @@ static struct resource smc91x_resources[] = {
                .start = 0x20300300,
                .end = 0x20300300 + 16,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PF7,
                .end = IRQ_PF7,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -83,7 +83,7 @@ static struct resource net2272_bfin_resources[] = {
                .start = 0x20300000,
                .end = 0x20300000 + 0x100,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PF10,
                .end = IRQ_PF10,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -108,11 +108,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
                .size = 0x00020000,
                .offset = 0,
                .mask_flags = MTD_CAP_ROM
-        },{
+        }, {
                .name = "kernel",
                .size = 0xe0000,
                .offset = 0x20000
-        },{
+        }, {
                .name = "file system",
                .size = 0x700000,
                .offset = 0x00100000,
@@ -229,19 +229,19 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #if defined(CONFIG_PBX)
        {
-                .modalias       = "fxs-spi",
+                .modalias = "fxs-spi",
-                .max_speed_hz   = 12500000,     /* max spi clock (SCK) speed in HZ */
+                .max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num        = 1,
+                .bus_num = 1,
-                .chip_select    = 3,
+                .chip_select = 3,
-                .controller_data= &spi_si3xxx_chip_info,
+                .controller_data = &spi_si3xxx_chip_info,
                .mode = SPI_MODE_3,
        },
        {
-                .modalias       = "fxo-spi",
+                .modalias = "fxo-spi",
-                .max_speed_hz   = 12500000,     /* max spi clock (SCK) speed in HZ */
+                .max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num        = 1,
+                .bus_num = 1,
-                .chip_select    = 2,
+                .chip_select = 2,
-                .controller_data= &spi_si3xxx_chip_info,
+                .controller_data = &spi_si3xxx_chip_info,
                .mode = SPI_MODE_3,
        },
 #endif
diff --git a/arch/blackfin/mach-bf533/cpu.c b/arch/blackfin/mach-bf533/cpu.c
index 99547c4c29..6fd9cfd0a3 100644
--- a/arch/blackfin/mach-bf533/cpu.c
+++ b/arch/blackfin/mach-bf533/cpu.c
@@ -79,8 +79,7 @@ static int bf533_target(struct cpufreq_policy *policy,
        int i;
        struct cpufreq_freqs freqs;
-        if (cpufreq_frequency_table_target
+        if (cpufreq_frequency_table_target(policy, bf533_freq_table, target_freq, relation, &index))
-            (policy, bf533_freq_table, target_freq, relation, &index))
                return -EINVAL;
        cclk_mhz = bf533_freq_table[index].frequency;
        vco_mhz = bf533_freq_table[index].index;
diff --git a/arch/blackfin/mach-bf533/dma.c b/arch/blackfin/mach-bf533/dma.c
new file mode 100644
index 0000000000..6c909cf4f7
--- /dev/null
+++ b/arch/blackfin/mach-bf533/dma.c
@@ -0,0 +1,95 @@
+/*
+ * File:         arch/blackfin/mach-bf533/dma.c
+ * Based on:
+ * Author:
+ *
+ * Created:
+ * Description:  This file contains the simple DMA Implementation for Blackfin
+ *
+ * Modified:
+ *               Copyright 2004-2006 Analog Devices Inc.
+ *
+ * Bugs:         Enter bugs at http://blackfin.uclinux.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see the file COPYING, or write
+ * to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <asm/blackfin.h>
+#include <asm/dma.h>
+struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = {
+        (struct dma_register *) DMA0_NEXT_DESC_PTR,
+        (struct dma_register *) DMA1_NEXT_DESC_PTR,
+        (struct dma_register *) DMA2_NEXT_DESC_PTR,
+        (struct dma_register *) DMA3_NEXT_DESC_PTR,
+        (struct dma_register *) DMA4_NEXT_DESC_PTR,
+        (struct dma_register *) DMA5_NEXT_DESC_PTR,
+        (struct dma_register *) DMA6_NEXT_DESC_PTR,
+        (struct dma_register *) DMA7_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA_D0_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA_S0_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA_D1_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA_S1_NEXT_DESC_PTR,
+};
+int channel2irq(unsigned int channel)
+{
+        int ret_irq = -1;
+        switch (channel) {
+        case CH_PPI:
+                ret_irq = IRQ_PPI;
+                break;
+        case CH_SPORT0_RX:
+                ret_irq = IRQ_SPORT0_RX;
+                break;
+        case CH_SPORT0_TX:
+                ret_irq = IRQ_SPORT0_TX;
+                break;
+        case CH_SPORT1_RX:
+                ret_irq = IRQ_SPORT1_RX;
+                break;
+        case CH_SPORT1_TX:
+                ret_irq = IRQ_SPORT1_TX;
+                break;
+        case CH_SPI:
+                ret_irq = IRQ_SPI;
+                break;
+        case CH_UART_RX:
+                ret_irq = IRQ_UART_RX;
+                break;
+        case CH_UART_TX:
+                ret_irq = IRQ_UART_TX;
+                break;
+        case CH_MEM_STREAM0_SRC:
+        case CH_MEM_STREAM0_DEST:
+                ret_irq = IRQ_MEM_DMA0;
+                break;
+        case CH_MEM_STREAM1_SRC:
+        case CH_MEM_STREAM1_DEST:
+                ret_irq = IRQ_MEM_DMA1;
+                break;
+        }
+        return ret_irq;
+}
diff --git a/arch/blackfin/mach-bf533/head.S b/arch/blackfin/mach-bf533/head.S
index 7e2aa8d0f4..7dd0e9c3a9 100644
--- a/arch/blackfin/mach-bf533/head.S
+++ b/arch/blackfin/mach-bf533/head.S
@@ -30,6 +30,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/blackfin.h>
+#include <asm/trace.h>
 #if CONFIG_BFIN_KERNEL_CLOCK
 #include <asm/mach/mem_init.h>
 #endif
@@ -96,6 +97,10 @@ ENTRY(__start)
        M2 = r0;
        M3 = r0;
+        trace_buffer_start(p0,r0);
+        P0 = R1;
+        R0 = R1;
 #if CONFIG_DEBUG_KERNEL_START
 /*
diff --git a/arch/blackfin/mach-bf533/ints-priority.c b/arch/blackfin/mach-bf533/ints-priority.c
index a3e1789167..7d79e0f950 100644
--- a/arch/blackfin/mach-bf533/ints-priority.c
+++ b/arch/blackfin/mach-bf533/ints-priority.c
@@ -28,8 +28,8 @@
 */
 #include <linux/module.h>
+#include <linux/irq.h>
 #include <asm/blackfin.h>
-#include <asm/irq.h>
 void program_IAR(void)
 {
diff --git a/arch/blackfin/mach-bf537/Makefile b/arch/blackfin/mach-bf537/Makefile
index f32d44215b..7e7c9c8ac5 100644
--- a/arch/blackfin/mach-bf537/Makefile
+++ b/arch/blackfin/mach-bf537/Makefile
@@ -4,6 +4,6 @@
 extra-y := head.o
-obj-y := ints-priority.o
+obj-y := ints-priority.o dma.o
 obj-$(CONFIG_CPU_FREQ)   += cpu.o
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c
index 6a60618a78..a8f947b727 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c
@@ -35,7 +35,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb_isp1362.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
 #include <asm/bfin5xx_spi.h>
 /*
@@ -53,11 +53,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
                .size = 0x00020000,
                .offset = 0,
                .mask_flags = MTD_CAP_ROM
-        },{
+        }, {
                .name = "kernel",
                .size = 0xe0000,
                .offset = 0x20000
-        },{
+        }, {
                .name = "file system",
                .size = 0x700000,
                .offset = 0x00100000,
@@ -202,7 +202,7 @@ static struct resource smc91x_resources[] = {
                .start = 0x20200300,
                .end = 0x20200300 + 16,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PF14,
                .end = IRQ_PF14,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -223,11 +223,11 @@ static struct resource isp1362_hcd_resources[] = {
                .start = 0x20308000,
                .end = 0x20308000,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = 0x20308004,
                .end = 0x20308004,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PG15,
                .end = IRQ_PG15,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -262,7 +262,7 @@ static struct resource net2272_bfin_resources[] = {
                .start = 0x20200000,
                .end = 0x20200000 + 0x100,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PF7,
                .end = IRQ_PF7,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -283,7 +283,7 @@ static struct resource bfin_uart_resources[] = {
                .start = 0xFFC00400,
                .end = 0xFFC004FF,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = 0xFFC02000,
                .end = 0xFFC020FF,
                .flags = IORESOURCE_MEM,
diff --git a/arch/blackfin/mach-bf537/boards/eth_mac.c b/arch/blackfin/mach-bf537/boards/eth_mac.c
index e129a08d63..a725cc8a92 100644
--- a/arch/blackfin/mach-bf537/boards/eth_mac.c
+++ b/arch/blackfin/mach-bf537/boards/eth_mac.c
@@ -20,8 +20,7 @@
 #include <linux/module.h>
 #include <asm/blackfin.h>
-#if     defined(CONFIG_GENERIC_BOARD) \
+#if     defined(CONFIG_GENERIC_BOARD) || defined(CONFIG_BFIN537_STAMP)
-        || defined(CONFIG_BFIN537_STAMP)
 /*
 * Currently the MAC address is saved in Flash by U-Boot
@@ -43,7 +42,7 @@ void get_bf537_ether_addr(char *addr)
 */
 void get_bf537_ether_addr(char *addr)
 {
-        printk(KERN_WARNING "%s: No valid Ethernet MAC address found\n",__FILE__);
+        printk(KERN_WARNING "%s: No valid Ethernet MAC address found\n", __FILE__);
 }
 #endif
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c
index fd57e7439e..648d984e98 100644
--- a/arch/blackfin/mach-bf537/boards/generic_board.c
+++ b/arch/blackfin/mach-bf537/boards/generic_board.c
@@ -35,9 +35,9 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb_isp1362.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
-#include <asm/bfin5xx_spi.h>
 #include <linux/usb_sl811.h>
+#include <asm/bfin5xx_spi.h>
 /*
 * Name the Board for the /proc/cpuinfo
@@ -54,19 +54,19 @@ static struct resource bfin_pcmcia_cf_resources[] = {
                .start = 0x20310000, /* IO PORT */
                .end = 0x20312000,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = 0x20311000, /* Attribute Memory */
                .end = 0x20311FFF,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PROG_INTA,
                .end = IRQ_PROG_INTA,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
-        },{
+        }, {
                .start = IRQ_PF4,
                .end = IRQ_PF4,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
-        },{
+        }, {
                .start = 6, /* Card Detect PF6 */
                .end = 6,
                .flags = IORESOURCE_IRQ,
@@ -95,11 +95,11 @@ static struct resource smc91x_resources[] = {
                .start = 0x20300300,
                .end = 0x20300300 + 16,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PROG_INTB,
                .end = IRQ_PROG_INTB,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
-        },{
+        }, {
                /*
                 *  denotes the flag pin and is used directly if
                 *  CONFIG_IRQCHIP_DEMUX_GPIO is defined.
@@ -123,15 +123,15 @@ static struct resource sl811_hcd_resources[] = {
                .start = 0x20340000,
                .end = 0x20340000,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = 0x20340004,
                .end = 0x20340004,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PROG_INTA,
                .end = IRQ_PROG_INTA,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
-        },{
+        }, {
                .start = IRQ_PF0 + CONFIG_USB_SL811_BFIN_GPIO,
                .end = IRQ_PF0 + CONFIG_USB_SL811_BFIN_GPIO,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -179,15 +179,15 @@ static struct resource isp1362_hcd_resources[] = {
                .start = 0x20360000,
                .end = 0x20360000,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = 0x20360004,
                .end = 0x20360004,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PROG_INTA,
                .end = IRQ_PROG_INTA,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
-        },{
+        }, {
                .start = IRQ_PF0 + CONFIG_USB_ISP1362_BFIN_GPIO,
                .end = IRQ_PF0 + CONFIG_USB_ISP1362_BFIN_GPIO,
                .flags = IORESOURCE_IRQ,
@@ -228,7 +228,7 @@ static struct resource net2272_bfin_resources[] = {
                .start = 0x20300000,
                .end = 0x20300000 + 0x100,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PF7,
                .end = IRQ_PF7,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -253,11 +253,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
                .size = 0x00020000,
                .offset = 0,
                .mask_flags = MTD_CAP_ROM
-        },{
+        }, {
                .name = "kernel",
                .size = 0xe0000,
                .offset = 0x20000
-        },{
+        }, {
                .name = "file system",
                .size = 0x700000,
                .offset = 0x00100000,
@@ -375,7 +375,7 @@ static struct resource bfin_uart_resources[] = {
                .start = 0xFFC00400,
                .end = 0xFFC004FF,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = 0xFFC02000,
                .end = 0xFFC020FF,
                .flags = IORESOURCE_MEM,
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index 8aaf76dfce..8806f1230f 100644
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -37,7 +37,7 @@
 #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
 #include <linux/usb_isp1362.h>
 #endif
-#include <asm/irq.h>
+#include <linux/irq.h>
 #include <asm/bfin5xx_spi.h>
 #include <linux/usb_sl811.h>
@@ -58,15 +58,15 @@ static struct resource bfin_pcmcia_cf_resources[] = {
                .start = 0x20310000, /* IO PORT */
                .end = 0x20312000,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = 0x20311000, /* Attribute Memory */
                .end = 0x20311FFF,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PF4,
                .end = IRQ_PF4,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
-        },{
+        }, {
                .start = 6, /* Card Detect PF6 */
                .end = 6,
                .flags = IORESOURCE_IRQ,
@@ -95,7 +95,7 @@ static struct resource smc91x_resources[] = {
                .start = 0x20300300,
                .end = 0x20300300 + 16,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PF7,
                .end = IRQ_PF7,
@@ -116,11 +116,11 @@ static struct resource sl811_hcd_resources[] = {
                .start = 0x20340000,
                .end = 0x20340000,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = 0x20340004,
                .end = 0x20340004,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = CONFIG_USB_SL811_BFIN_IRQ,
                .end = CONFIG_USB_SL811_BFIN_IRQ,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -167,11 +167,11 @@ static struct resource isp1362_hcd_resources[] = {
                .start = 0x20360000,
                .end = 0x20360000,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = 0x20360004,
                .end = 0x20360004,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,
                .end = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -212,7 +212,7 @@ static struct resource net2272_bfin_resources[] = {
                .start = 0x20300000,
                .end = 0x20300000 + 0x100,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PF7,
                .end = IRQ_PF7,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -238,11 +238,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
                .size = 0x00020000,
                .offset = 0,
                .mask_flags = MTD_CAP_ROM
-        },{
+        }, {
                .name = "kernel",
                .size = 0xe0000,
                .offset = 0x20000
-        },{
+        }, {
                .name = "file system",
                .size = 0x700000,
                .offset = 0x00100000,
@@ -294,16 +294,6 @@ static struct bfin5xx_spi_chip spi_mmc_chip_info = {
 };
 #endif
-#if defined(CONFIG_PBX)
-static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {
-        .ctl_reg        = 0x4, /* send zero */
-        .enable_dma     = 0,
-        .bits_per_word  = 8,
-        .cs_change_per_word = 1,
-};
-#endif
 #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
 static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
        .cs_change_per_word = 1,
@@ -392,24 +382,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                .mode = SPI_MODE_3,
        },
 #endif
-#if defined(CONFIG_PBX)
-        {
-                .modalias       = "fxs-spi",
-                .max_speed_hz   = 12500000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num        = 1,
-                .chip_select    = 3,
-                .controller_data= &spi_si3xxx_chip_info,
-                .mode = SPI_MODE_3,
-        },
-        {
-                .modalias       = "fxo-spi",
-                .max_speed_hz   = 12500000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num        = 1,
-                .chip_select    = 2,
-                .controller_data= &spi_si3xxx_chip_info,
-                .mode = SPI_MODE_3,
-        },
-#endif
 #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
 {
        .modalias               = "ad7877",
@@ -451,7 +423,7 @@ static struct resource bfin_uart_resources[] = {
                .start = 0xFFC00400,
                .end = 0xFFC004FF,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = 0xFFC02000,
                .end = 0xFFC020FF,
                .flags = IORESOURCE_MEM,
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 3a29b4d15f..9c43d77565 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -37,12 +37,10 @@
 #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
 #include <linux/usb_isp1362.h>
 #endif
-#include <asm/irq.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
-#include <asm/bfin5xx_spi.h>
 #include <linux/usb_sl811.h>
+#include <asm/bfin5xx_spi.h>
 #include <linux/spi/ad7877.h>
 /*
@@ -85,7 +83,7 @@ static struct platform_device *bfin_isp1761_devices[] = {
 int __init bfin_isp1761_init(void)
 {
-        unsigned int num_devices=ARRAY_SIZE(bfin_isp1761_devices);
+        unsigned int num_devices = ARRAY_SIZE(bfin_isp1761_devices);
        printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);
        set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING);
@@ -107,15 +105,15 @@ static struct resource bfin_pcmcia_cf_resources[] = {
                .start = 0x20310000, /* IO PORT */
                .end = 0x20312000,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = 0x20311000, /* Attribute Memory */
                .end = 0x20311FFF,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PF4,
                .end = IRQ_PF4,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
-        },{
+        }, {
                .start = 6, /* Card Detect PF6 */
                .end = 6,
                .flags = IORESOURCE_IRQ,
@@ -144,7 +142,7 @@ static struct resource smc91x_resources[] = {
                .start = 0x20300300,
                .end = 0x20300300 + 16,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PF7,
                .end = IRQ_PF7,
@@ -159,17 +157,39 @@ static struct platform_device smc91x_device = {
 };
 #endif
+#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)
+static struct resource dm9000_resources[] = {
+        [0] = {
+                .start  = 0x203FB800,
+                .end    = 0x203FB800 + 8,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = IRQ_PF9,
+                .end    = IRQ_PF9,
+                .flags  = (IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE),
+        },
+};
+static struct platform_device dm9000_device = {
+        .name           = "dm9000",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(dm9000_resources),
+        .resource       = dm9000_resources,
+};
+#endif
 #if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE)
 static struct resource sl811_hcd_resources[] = {
        {
                .start = 0x20340000,
                .end = 0x20340000,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = 0x20340004,
                .end = 0x20340004,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = CONFIG_USB_SL811_BFIN_IRQ,
                .end = CONFIG_USB_SL811_BFIN_IRQ,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -216,11 +236,11 @@ static struct resource isp1362_hcd_resources[] = {
                .start = 0x20360000,
                .end = 0x20360000,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = 0x20360004,
                .end = 0x20360004,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,
                .end = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -261,7 +281,7 @@ static struct resource net2272_bfin_resources[] = {
                .start = 0x20300000,
                .end = 0x20300000 + 0x100,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PF7,
                .end = IRQ_PF7,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -287,11 +307,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
                .size = 0x00020000,
                .offset = 0,
                .mask_flags = MTD_CAP_ROM
-        },{
+        }, {
                .name = "kernel",
                .size = 0xe0000,
                .offset = 0x20000
-        },{
+        }, {
                .name = "file system",
                .size = 0x700000,
                .offset = 0x00100000,
@@ -361,7 +381,6 @@ static struct bfin5xx_spi_chip ad5304_chip_info = {
 #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
 static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
-//      .cs_change_per_word = 1,
        .enable_dma = 0,
        .bits_per_word = 16,
 };
@@ -449,19 +468,19 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #endif
 #if defined(CONFIG_PBX)
        {
-                .modalias       = "fxs-spi",
+                .modalias = "fxs-spi",
-                .max_speed_hz   = 12500000,     /* max spi clock (SCK) speed in HZ */
+                .max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num        = 1,
+                .bus_num = 1,
-                .chip_select    = 3,
+                .chip_select = 3,
-                .controller_data= &spi_si3xxx_chip_info,
+                .controller_data = &spi_si3xxx_chip_info,
                .mode = SPI_MODE_3,
        },
        {
-                .modalias       = "fxo-spi",
+                .modalias = "fxo-spi",
-                .max_speed_hz   = 12500000,     /* max spi clock (SCK) speed in HZ */
+                .max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num        = 1,
+                .bus_num = 1,
-                .chip_select    = 2,
+                .chip_select = 2,
-                .controller_data= &spi_si3xxx_chip_info,
+                .controller_data = &spi_si3xxx_chip_info,
                .mode = SPI_MODE_3,
        },
 #endif
@@ -516,7 +535,7 @@ static struct resource bfin_uart_resources[] = {
                .start = 0xFFC00400,
                .end = 0xFFC004FF,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = 0xFFC02000,
                .end = 0xFFC020FF,
                .flags = IORESOURCE_MEM,
@@ -571,6 +590,10 @@ static struct platform_device *stamp_devices[] __initdata = {
        &smc91x_device,
 #endif
+#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)
+        &dm9000_device,
+#endif
 #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
        &bfin_mac_device,
 #endif
diff --git a/arch/blackfin/mach-bf537/dma.c b/arch/blackfin/mach-bf537/dma.c
new file mode 100644
index 0000000000..706cb97b02
--- /dev/null
+++ b/arch/blackfin/mach-bf537/dma.c
@@ -0,0 +1,115 @@
+/*
+ * File:         arch/blackfin/mach-bf537/dma.c
+ * Based on:
+ * Author:
+ *
+ * Created:
+ * Description:  This file contains the simple DMA Implementation for Blackfin
+ *
+ * Modified:
+ *               Copyright 2004-2007 Analog Devices Inc.
+ *
+ * Bugs:         Enter bugs at http://blackfin.uclinux.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see the file COPYING, or write
+ * to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <asm/blackfin.h>
+#include <asm/dma.h>
+struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = {
+        (struct dma_register *) DMA0_NEXT_DESC_PTR,
+        (struct dma_register *) DMA1_NEXT_DESC_PTR,
+        (struct dma_register *) DMA2_NEXT_DESC_PTR,
+        (struct dma_register *) DMA3_NEXT_DESC_PTR,
+        (struct dma_register *) DMA4_NEXT_DESC_PTR,
+        (struct dma_register *) DMA5_NEXT_DESC_PTR,
+        (struct dma_register *) DMA6_NEXT_DESC_PTR,
+        (struct dma_register *) DMA7_NEXT_DESC_PTR,
+        (struct dma_register *) DMA8_NEXT_DESC_PTR,
+        (struct dma_register *) DMA9_NEXT_DESC_PTR,
+        (struct dma_register *) DMA10_NEXT_DESC_PTR,
+        (struct dma_register *) DMA11_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA_D0_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA_S0_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA_D1_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA_S1_NEXT_DESC_PTR,
+};
+int channel2irq(unsigned int channel)
+{
+        int ret_irq = -1;
+        switch (channel) {
+        case CH_PPI:
+                ret_irq = IRQ_PPI;
+                break;
+        case CH_EMAC_RX:
+                ret_irq = IRQ_MAC_RX;
+                break;
+        case CH_EMAC_TX:
+                ret_irq = IRQ_MAC_TX;
+                break;
+        case CH_UART1_RX:
+                ret_irq = IRQ_UART1_RX;
+                break;
+        case CH_UART1_TX:
+                ret_irq = IRQ_UART1_TX;
+                break;
+        case CH_SPORT0_RX:
+                ret_irq = IRQ_SPORT0_RX;
+                break;
+        case CH_SPORT0_TX:
+                ret_irq = IRQ_SPORT0_TX;
+                break;
+        case CH_SPORT1_RX:
+                ret_irq = IRQ_SPORT1_RX;
+                break;
+        case CH_SPORT1_TX:
+                ret_irq = IRQ_SPORT1_TX;
+                break;
+        case CH_SPI:
+                ret_irq = IRQ_SPI;
+                break;
+        case CH_UART_RX:
+                ret_irq = IRQ_UART_RX;
+                break;
+        case CH_UART_TX:
+                ret_irq = IRQ_UART_TX;
+                break;
+        case CH_MEM_STREAM0_SRC:
+        case CH_MEM_STREAM0_DEST:
+                ret_irq = IRQ_MEM_DMA0;
+                break;
+        case CH_MEM_STREAM1_SRC:
+        case CH_MEM_STREAM1_DEST:
+                ret_irq = IRQ_MEM_DMA1;
+                break;
+        }
+        return ret_irq;
+}
diff --git a/arch/blackfin/mach-bf537/head.S b/arch/blackfin/mach-bf537/head.S
index 7d902bbd86..429c8a1019 100644
--- a/arch/blackfin/mach-bf537/head.S
+++ b/arch/blackfin/mach-bf537/head.S
@@ -30,6 +30,8 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/blackfin.h>
+#include <asm/trace.h>
 #if CONFIG_BFIN_KERNEL_CLOCK
 #include <asm/mach/mem_init.h>
 #endif
@@ -93,6 +95,10 @@ ENTRY(__start)
        M2 = r0;
        M3 = r0;
+        trace_buffer_start(p0,r0);
+        P0 = R1;
+        R0 = R1;
        /* Turn off the icache */
        p0.l = (IMEM_CONTROL & 0xFFFF);
        p0.h = (IMEM_CONTROL >> 16);
diff --git a/arch/blackfin/mach-bf537/ints-priority.c b/arch/blackfin/mach-bf537/ints-priority.c
index 2dbf3df465..a8b915f202 100644
--- a/arch/blackfin/mach-bf537/ints-priority.c
+++ b/arch/blackfin/mach-bf537/ints-priority.c
@@ -28,8 +28,8 @@
 */
 #include <linux/module.h>
+#include <linux/irq.h>
 #include <asm/blackfin.h>
-#include <asm/irq.h>
 void program_IAR(void)
 {
diff --git a/arch/blackfin/mach-bf548/Kconfig b/arch/blackfin/mach-bf548/Kconfig
new file mode 100644
index 0000000000..e78b03d56c
--- /dev/null
+++ b/arch/blackfin/mach-bf548/Kconfig
@@ -0,0 +1,316 @@
+if (BF54x)
+menu "BF548 Specific Configuration"
+comment "Interrupt Priority Assignment"
+menu "Priority"
+config IRQ_PLL_WAKEUP
+        int "IRQ_PLL_WAKEUP"
+        default 7
+config IRQ_DMAC0_ERR
+        int "IRQ_DMAC0_ERR"
+        default 7
+config IRQ_EPPI0_ERR
+        int "IRQ_EPPI0_ERR"
+        default 7
+config IRQ_SPORT0_ERR
+        int "IRQ_SPORT0_ERR"
+        default 7
+config IRQ_SPORT1_ERR
+        int "IRQ_SPORT1_ERR"
+        default 7
+config IRQ_SPI0_ERR
+        int "IRQ_SPI0_ERR"
+        default 7
+config IRQ_UART0_ERR
+        int "IRQ_UART0_ERR"
+        default 7
+config IRQ_RTC
+        int "IRQ_RTC"
+        default 8
+config IRQ_EPPI0
+        int "IRQ_EPPI0"
+        default 8
+config IRQ_SPORT0_RX
+        int "IRQ_SPORT0_RX"
+        default 9
+config IRQ_SPORT0_TX
+        int "IRQ_SPORT0_TX"
+        default 9
+config IRQ_SPORT1_RX
+        int "IRQ_SPORT1_RX"
+        default 9
+config IRQ_SPORT1_TX
+        int "IRQ_SPORT1_TX"
+        default 9
+config IRQ_SPI0
+        int "IRQ_SPI0"
+        default 10
+config IRQ_UART0_RX
+        int "IRQ_UART0_RX"
+        default 10
+config IRQ_UART0_TX
+        int "IRQ_UART0_TX"
+        default 10
+config IRQ_TIMER8
+        int "IRQ_TIMER8"
+        default 11
+config IRQ_TIMER9
+        int "IRQ_TIMER9"
+        default 11
+config IRQ_TIMER10
+        int "IRQ_TIMER10"
+        default 11
+config IRQ_PINT0
+        int "IRQ_PINT0"
+        default 12
+config IRQ_PINT1
+        int "IRQ_PINT0"
+        default 12
+config IRQ_MDMAS0
+        int "IRQ_MDMAS0"
+        default 13
+config IRQ_MDMAS1
+        int "IRQ_DMDMAS1"
+        default 13
+config IRQ_WATCHDOG
+        int "IRQ_WATCHDOG"
+        default 13
+config IRQ_DMAC1_ERR
+        int "IRQ_DMAC1_ERR"
+        default 7
+config IRQ_SPORT2_ERR
+        int "IRQ_SPORT2_ERR"
+        default 7
+config IRQ_SPORT3_ERR
+        int "IRQ_SPORT3_ERR"
+        default 7
+config IRQ_MXVR_DATA
+        int "IRQ MXVR Data"
+        default 7
+config IRQ_SPI1_ERR
+        int "IRQ_SPI1_ERR"
+        default 7
+config IRQ_SPI2_ERR
+        int "IRQ_SPI2_ERR"
+        default 7
+config IRQ_UART1_ERR
+        int "IRQ_UART1_ERR"
+        default 7
+config IRQ_UART2_ERR
+        int "IRQ_UART2_ERR"
+        default 7
+config IRQ_CAN0_ERR
+        int "IRQ_CAN0_ERR"
+        default 7
+config IRQ_SPORT2_RX
+        int "IRQ_SPORT2_RX"
+        default 9
+config IRQ_SPORT2_TX
+        int "IRQ_SPORT2_TX"
+        default 9
+config IRQ_SPORT3_RX
+        int "IRQ_SPORT3_RX"
+        default 9
+config IRQ_SPORT3_TX
+        int "IRQ_SPORT3_TX"
+        default 9
+config IRQ_EPPI1
+        int "IRQ_EPPI1"
+        default 9
+config IRQ_EPPI2
+        int "IRQ_EPPI2"
+        default 9
+config IRQ_SPI1
+        int "IRQ_SPI1"
+        default 10
+config IRQ_SPI2
+        int "IRQ_SPI2"
+        default 10
+config IRQ_UART1_RX
+        int "IRQ_UART1_RX"
+        default 10
+config IRQ_UART1_TX
+        int "IRQ_UART1_TX"
+        default 10
+config IRQ_ATAPI_RX
+        int "IRQ_ATAPI_RX"
+        default 10
+config IRQ_ATAPI_TX
+        int "IRQ_ATAPI_TX"
+        default 10
+config IRQ_TWI0
+        int "IRQ_TWI0"
+        default 11
+config IRQ_TWI1
+        int "IRQ_TWI1"
+        default 11
+config IRQ_CAN0_RX
+        int "IRQ_CAN_RX"
+        default 11
+config IRQ_CAN0_TX
+        int "IRQ_CAN_TX"
+        default 11
+config IRQ_MDMAS2
+        int "IRQ_MDMAS2"
+        default 13
+config IRQ_MDMAS3
+        int "IRQ_DMMAS3"
+        default 13
+config IRQ_MXVR_ERR
+        int "IRQ_MXVR_ERR"
+        default 11
+config IRQ_MXVR_MSG
+        int "IRQ_MXVR_MSG"
+        default 11
+config IRQ_MXVR_PKT
+        int "IRQ_MXVR_PKT"
+        default 11
+config IRQ_EPPI1_ERR
+        int "IRQ_EPPI1_ERR"
+        default 7
+config IRQ_EPPI2_ERR
+        int "IRQ_EPPI2_ERR"
+        default 7
+config IRQ_UART3_ERR
+        int "IRQ_UART3_ERR"
+        default 7
+config IRQ_HOST_ERR
+        int "IRQ_HOST_ERR"
+        default 7
+config IRQ_PIXC_ERR
+        int "IRQ_PIXC_ERR"
+        default 7
+config IRQ_NFC_ERR
+        int "IRQ_NFC_ERR"
+        default 7
+config IRQ_ATAPI_ERR
+        int "IRQ_ATAPI_ERR"
+        default 7
+config IRQ_CAN1_ERR
+        int "IRQ_CAN1_ERR"
+        default 7
+config IRQ_HS_DMA_ERR
+        int "IRQ Handshake DMA Status"
+        default 7
+config IRQ_PIXC_IN0
+        int "IRQ PIXC IN0"
+        default 8
+config IRQ_PIXC_IN1
+        int "IRQ PIXC IN1"
+        default 8
+config IRQ_PIXC_OUT
+        int "IRQ PIXC OUT"
+        default 8
+config IRQ_SDH
+        int "IRQ SDH"
+        default 8
+config IRQ_CNT
+        int "IRQ CNT"
+        default 8
+config IRQ_KEY
+        int "IRQ KEY"
+        default 8
+config IRQ_CAN1_RX
+        int "IRQ CAN1 RX"
+        default 11
+config IRQ_CAN1_TX
+        int "IRQ_CAN1_TX"
+        default 11
+config IRQ_SDH_MASK0
+        int "IRQ_SDH_MASK0"
+        default 11
+config IRQ_SDH_MASK1
+        int "IRQ_SDH_MASK1"
+        default 11
+config IRQ_USB_INT0
+        int "IRQ USB INT0"
+        default 11
+config IRQ_USB_INT1
+        int "IRQ USB INT1"
+        default 11
+config IRQ_USB_INT2
+        int "IRQ USB INT2"
+        default 11
+config IRQ_USB_DMA
+        int "IRQ USB DMA"
+        default 11
+config IRQ_OTPSEC
+        int "IRQ OPTSEC"
+        default 11
+config IRQ_TIMER0
+        int "IRQ_TIMER0"
+        default 11
+config IRQ_TIMER1
+        int "IRQ_TIMER1"
+        default 11
+config IRQ_TIMER2
+        int "IRQ_TIMER2"
+        default 11
+config IRQ_TIMER3
+        int "IRQ_TIMER3"
+        default 11
+config IRQ_TIMER4
+        int "IRQ_TIMER4"
+        default 11
+config IRQ_TIMER5
+        int "IRQ_TIMER5"
+        default 11
+config IRQ_TIMER6
+        int "IRQ_TIMER6"
+        default 11
+config IRQ_TIMER7
+        int "IRQ_TIMER7"
+        default 11
+config IRQ_PINT2
+        int "IRQ_PIN2"
+        default 11
+config IRQ_PINT3
+        int "IRQ_PIN3"
+        default 11
+        help
+          Enter the priority numbers between 7-13 ONLY.  Others are Reserved.
+          This applies to all the above.  It is not recommended to assign the
+          highest priority number 7 to UART or any other device.
+endmenu
+comment "Pin Interrupt to Port Assignment"
+menu "Assignment"
+config PINTx_REASSIGN
+        bool "Reprogram PINT Assignment"
+        default n
+        help
+          The interrupt assignment registers controls the pin-to-interrupt
+          assignment in a byte-wide manner. Each option allows you to select
+          a set of pins (High/Low Byte) of an specific Port being mapped
+          to one of the four PIN Interrupts IRQ_PINTx.
+          You shouldn't change any of these unless you know exactly what you're doing.
+          Please consult the Blackfin BF54x Processor Hardware Reference Manual.
+config PINT0_ASSIGN
+        hex "PINT0_ASSIGN"
+        depends on PINTx_REASSIGN
+        default 0x00000101
+config PINT1_ASSIGN
+        hex "PINT1_ASSIGN"
+        depends on PINTx_REASSIGN
+        default 0x01010000
+config PINT2_ASSIGN
+        hex "PINT2_ASSIGN"
+        depends on PINTx_REASSIGN
+        default 0x00000101
+config PINT3_ASSIGN
+        hex "PINT3_ASSIGN"
+        depends on PINTx_REASSIGN
+        default 0x02020303
+endmenu
+endmenu
+endif
diff --git a/arch/blackfin/mach-bf548/Makefile b/arch/blackfin/mach-bf548/Makefile
new file mode 100644
index 0000000000..060ad78ebf
--- /dev/null
+++ b/arch/blackfin/mach-bf548/Makefile
@@ -0,0 +1,9 @@
+#
+# arch/blackfin/mach-bf537/Makefile
+#
+extra-y := head.o
+obj-y := ints-priority.o dma.o gpio.o
+obj-$(CONFIG_CPU_FREQ)   += cpu.o
diff --git a/arch/blackfin/mach-bf548/boards/Makefile b/arch/blackfin/mach-bf548/boards/Makefile
new file mode 100644
index 0000000000..486e07c99a
--- /dev/null
+++ b/arch/blackfin/mach-bf548/boards/Makefile
@@ -0,0 +1,5 @@
+#
+# arch/blackfin/mach-bf548/boards/Makefile
+#
+obj-$(CONFIG_BFIN548_EZKIT)             += ezkit.o led.o
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
new file mode 100644
index 0000000000..96ad95fab1
--- /dev/null
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -0,0 +1,114 @@
+/*
+ * File:         arch/blackfin/mach-bf548/boards/ezkit.c
+ * Based on:     arch/blackfin/mach-bf537/boards/ezkit.c
+ * Author:       Aidan Williams <aidan@nicta.com.au>
+ *
+ * Created:
+ * Description:
+ *
+ * Modified:
+ *               Copyright 2005 National ICT Australia (NICTA)
+ *               Copyright 2004-2007 Analog Devices Inc.
+ *
+ * Bugs:         Enter bugs at http://blackfin.uclinux.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see the file COPYING, or write
+ * to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/flash.h>
+#include <linux/irq.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <asm/bfin5xx_spi.h>
+/*
+ * Name the Board for the /proc/cpuinfo
+ */
+char *bfin_board_name = "ADSP-BF548-EZKIT";
+/*
+ *  Driver needs to know address, irq and flag pin.
+ */
+#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+static struct platform_device rtc_device = {
+        .name = "rtc-bfin",
+        .id   = -1,
+};
+#endif
+#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+static struct resource bfin_uart_resources[] = {
+#ifdef CONFIG_SERIAL_BFIN_UART0
+        {
+                .start = 0xFFC00400,
+                .end = 0xFFC004FF,
+                .flags = IORESOURCE_MEM,
+        },
+#endif
+#ifdef CONFIG_SERIAL_BFIN_UART1
+        {
+                .start = 0xFFC02000,
+                .end = 0xFFC020FF,
+                .flags = IORESOURCE_MEM,
+        },
+#endif
+#ifdef CONFIG_SERIAL_BFIN_UART2
+        {
+                .start = 0xFFC02100,
+                .end = 0xFFC021FF,
+                .flags = IORESOURCE_MEM,
+        },
+#endif
+#ifdef CONFIG_SERIAL_BFIN_UART3
+        {
+                .start = 0xFFC03100,
+                .end = 0xFFC031FF,
+        },
+#endif
+};
+static struct platform_device bfin_uart_device = {
+        .name = "bfin-uart",
+        .id = 1,
+        .num_resources = ARRAY_SIZE(bfin_uart_resources),
+        .resource = bfin_uart_resources,
+};
+#endif
+static struct platform_device *ezkit_devices[] __initdata = {
+#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+        &rtc_device,
+#endif
+#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+        &bfin_uart_device,
+#endif
+};
+static int __init stamp_init(void)
+{
+        printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);
+        platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices));
+        return 0;
+}
+arch_initcall(stamp_init);
diff --git a/arch/blackfin/mach-bf548/boards/led.S b/arch/blackfin/mach-bf548/boards/led.S
new file mode 100644
index 0000000000..f47daf3770
--- /dev/null
+++ b/arch/blackfin/mach-bf548/boards/led.S
@@ -0,0 +1,172 @@
+/****************************************************
+ * LED1 ---- PG6        LED2 ---- PG7               *
+ * LED3 ---- PG8        LED4 ---- PG9               *
+ * LED5 ---- PG10       LED6 ---- PG11              *
+ ****************************************************/
+#include <linux/linkage.h>
+#include <asm/blackfin.h>
+/* All functions in this file save the registers they uses.
+   So there is no need to save any registers before calling them.  */
+        .text;
+/* Initialize LEDs.  */
+ENTRY(_led_init)
+        LINK 0;
+        [--SP] = P0;
+        [--SP] = R0;
+        [--SP] = R1;
+        [--SP] = R2;
+        R1 = (PG6|PG7|PG8|PG9|PG10|PG11)(Z);
+        R2 = ~R1;
+        P0.H = hi(PORTG_FER);
+        P0.L = lo(PORTG_FER);
+        R0 = W[P0](Z);
+        SSYNC;
+        R0 = R0 & R2;
+        W[P0] = R0.L;
+        SSYNC;
+        P0.H = hi(PORTG_DIR_SET);
+        P0.L = lo(PORTG_DIR_SET);
+        W[P0] = R1.L;
+        SSYNC;
+        P0.H = hi(PORTG_INEN);
+        P0.L = lo(PORTG_INEN);
+        R0 = W[P0](Z);
+        SSYNC;
+        R0 = R0 & R2;
+        W[P0] = R0.L;
+        SSYNC;
+        R2 = [SP++];
+        R1 = [SP++];
+        R0 = [SP++];
+        P0 = [SP++];
+        RTS;
+        .size   _led_init, .-_led_init
+/* Set one LED on. Leave other LEDs unchanged.
+   It expects the LED number passed through R0.  */
+ENTRY(_led_on)
+        LINK 0;
+        [--SP] = P0;
+        [--SP] = R1;
+        CALL _led_init;
+        R1 = 1;
+        R0 += 5;
+        R1 <<= R0;
+        P0.H = hi(PORTG_SET);
+        P0.L = lo(PORTG_SET);
+        W[P0] = R1.L;
+        SSYNC;
+        R1 = [SP++];
+        P0 = [SP++];
+        UNLINK;
+        RTS;
+        .size   _led_on, .-_led_on
+/* Set one LED off. Leave other LEDs unchanged.  */
+ENTRY(_led_off)
+        LINK 0;
+        [--SP] = P0;
+        [--SP] = R1;
+        CALL _led_init;
+        R1 = 1;
+        R0 += 5;
+        R1 <<= R0;
+        P0.H = hi(PORTG_CLEAR);
+        P0.L = lo(PORTG_CLEAR);
+        W[P0] = R1.L;
+        SSYNC;
+        R1 = [SP++];
+        P0 = [SP++];
+        UNLINK;
+        RTS;
+        .size   _led_off, .-_led_off
+/* Toggle one LED. Leave other LEDs unchanged.  */
+ENTRY(_led_toggle)
+        LINK 0;
+        [--SP] = P0;
+        [--SP] = R1;
+        CALL _led_init;
+        R1 = 1;
+        R0 += 5;
+        R1 <<= R0;
+        P0.H = hi(PORTG);
+        P0.L = lo(PORTG);
+        R0 = W[P0](Z);
+        SSYNC;
+        R0 = R0 ^ R1;
+        W[P0] = R0.L;
+        SSYNC;
+        R1 = [SP++];
+        P0 = [SP++];
+        UNLINK;
+        RTS;
+        .size   _led_toggle, .-_led_toggle
+/* Display the number using LEDs in binary format.  */
+ENTRY(_led_disp_num)
+        LINK 0;
+        [--SP] = P0;
+        [--SP] = R1;
+        [--SP] = R2;
+        CALL _led_init;
+        R1 = 0x3f(X);
+        R0 = R0 & R1;
+        R2 = 6(X);
+        R0 <<= R2;
+        R1 <<= R2;
+        P0.H = hi(PORTG);
+        P0.L = lo(PORTG);
+        R2 = W[P0](Z);
+        SSYNC;
+        R1 = ~R1;
+        R2 = R2 & R1;
+        R2 = R2 | R0;
+        W[P0] = R2.L;
+        SSYNC;
+        R2 = [SP++];
+        R1 = [SP++];
+        P0 = [SP++];
+        UNLINK;
+        RTS;
+        .size   _led_disp_num, .-_led_disp_num
+/* Toggle the number using LEDs in binary format.  */
+ENTRY(_led_toggle_num)
+        LINK 0;
+        [--SP] = P0;
+        [--SP] = R1;
+        [--SP] = R2;
+        CALL _led_init;
+        R1 = 0x3f(X);
+        R0 = R0 & R1;
+        R1 = 6(X);
+        R0 <<= R1;
+        P0.H = hi(PORTG);
+        P0.L = lo(PORTG);
+        R1 = W[P0](Z);
+        SSYNC;
+        R1 = R1 ^ R0;
+        W[P0] = R1.L;
+        SSYNC;
+        R2 = [SP++];
+        R1 = [SP++];
+        P0 = [SP++];
+        UNLINK;
+        RTS;
+        .size   _led_toggle_num, .-_led_toggle_num
diff --git a/arch/blackfin/mach-bf548/cpu.c b/arch/blackfin/mach-bf548/cpu.c
new file mode 100644
index 0000000000..4298a3ccfb
--- /dev/null
+++ b/arch/blackfin/mach-bf548/cpu.c
@@ -0,0 +1,159 @@
+/*
+ * File:         arch/blackfin/mach-bf548/cpu.c
+ * Based on:
+ * Author:
+ *
+ * Created:
+ * Description:  clock scaling for the bf54x
+ *
+ * Modified:
+ *               Copyright 2004-2007 Analog Devices Inc.
+ *
+ * Bugs:         Enter bugs at http://blackfin.uclinux.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see the file COPYING, or write
+ * to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/cpufreq.h>
+#include <asm/dpmc.h>
+#include <linux/fs.h>
+#include <asm/bfin-global.h>
+/* CONFIG_CLKIN_HZ=25000000 */
+#define VCO5 (CONFIG_CLKIN_HZ*45)
+#define VCO4 (CONFIG_CLKIN_HZ*36)
+#define VCO3 (CONFIG_CLKIN_HZ*27)
+#define VCO2 (CONFIG_CLKIN_HZ*18)
+#define VCO1 (CONFIG_CLKIN_HZ*9)
+#define VCO(x) VCO##x
+#define MFREQ(x) {VCO(x),VCO(x)/4},{VCO(x),VCO(x)/2},{VCO(x),VCO(x)}
+/* frequency */
+static struct cpufreq_frequency_table bf548_freq_table[] = {
+        MFREQ(1),
+        MFREQ(3),
+        {VCO4, VCO4 / 2}, {VCO4, VCO4},
+        MFREQ(5),
+        {0, CPUFREQ_TABLE_END},
+};
+/*
+ * dpmc_fops->ioctl()
+ * static int dpmc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+ */
+static int bf548_getfreq(unsigned int cpu)
+{
+        unsigned long cclk_mhz;
+        /* The driver only support single cpu */
+        if (cpu == 0)
+                dpmc_fops.ioctl(NULL, NULL, IOCTL_GET_CORECLOCK, &cclk_mhz);
+        else
+                cclk_mhz = -1;
+        return cclk_mhz;
+}
+static int bf548_target(struct cpufreq_policy *policy,
+                            unsigned int target_freq, unsigned int relation)
+{
+        unsigned long cclk_mhz;
+        unsigned long vco_mhz;
+        unsigned long flags;
+        unsigned int index;
+        struct cpufreq_freqs freqs;
+        if (cpufreq_frequency_table_target(policy, bf548_freq_table, target_freq, relation, &index))
+                return -EINVAL;
+        cclk_mhz = bf548_freq_table[index].frequency;
+        vco_mhz = bf548_freq_table[index].index;
+        dpmc_fops.ioctl(NULL, NULL, IOCTL_CHANGE_FREQUENCY, &vco_mhz);
+        freqs.old = bf548_getfreq(0);
+        freqs.new = cclk_mhz;
+        freqs.cpu = 0;
+        pr_debug("cclk begin change to cclk %d,vco=%d,index=%d,target=%d,oldfreq=%d\n",
+                 cclk_mhz, vco_mhz, index, target_freq, freqs.old);
+        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        local_irq_save(flags);
+        dpmc_fops.ioctl(NULL, NULL, IOCTL_SET_CCLK, &cclk_mhz);
+        local_irq_restore(flags);
+        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        vco_mhz = get_vco();
+        cclk_mhz = get_cclk();
+        return 0;
+}
+/* make sure that only the "userspace" governor is run -- anything else wouldn't make sense on
+ * this platform, anyway.
+ */
+static int bf548_verify_speed(struct cpufreq_policy *policy)
+{
+        return cpufreq_frequency_table_verify(policy, &bf548_freq_table);
+}
+static int __init __bf548_cpu_init(struct cpufreq_policy *policy)
+{
+        if (policy->cpu != 0)
+                return -EINVAL;
+        policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
+        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
+        /*Now ,only support one cpu */
+        policy->cur = bf548_getfreq(0);
+        cpufreq_frequency_table_get_attr(bf548_freq_table, policy->cpu);
+        return cpufreq_frequency_table_cpuinfo(policy, bf548_freq_table);
+}
+static struct freq_attr *bf548_freq_attr[] = {
+        &cpufreq_freq_attr_scaling_available_freqs,
+        NULL,
+};
+static struct cpufreq_driver bf548_driver = {
+        .verify = bf548_verify_speed,
+        .target = bf548_target,
+        .get = bf548_getfreq,
+        .init = __bf548_cpu_init,
+        .name = "bf548",
+        .owner = THIS_MODULE,
+        .attr = bf548_freq_attr,
+};
+static int __init bf548_cpu_init(void)
+{
+        return cpufreq_register_driver(&bf548_driver);
+}
+static void __exit bf548_cpu_exit(void)
+{
+        cpufreq_unregister_driver(&bf548_driver);
+}
+MODULE_AUTHOR("Mickael Kang");
+MODULE_DESCRIPTION("cpufreq driver for BF548 CPU");
+MODULE_LICENSE("GPL");
+module_init(bf548_cpu_init);
+module_exit(bf548_cpu_exit);
diff --git a/arch/blackfin/mach-bf548/dma.c b/arch/blackfin/mach-bf548/dma.c
new file mode 100644
index 0000000000..a8184113be
--- /dev/null
+++ b/arch/blackfin/mach-bf548/dma.c
@@ -0,0 +1,156 @@
+/*
+ * File:         arch/blackfin/mach-bf561/dma.c
+ * Based on:
+ * Author:
+ *
+ * Created:
+ * Description:  This file contains the simple DMA Implementation for Blackfin
+ *
+ * Modified:
+ *               Copyright 2004-2007 Analog Devices Inc.
+ *
+ * Bugs:         Enter bugs at http://blackfin.uclinux.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see the file COPYING, or write
+ * to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <asm/blackfin.h>
+#include <asm/dma.h>
+ struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = {
+        (struct dma_register *) DMA0_NEXT_DESC_PTR,
+        (struct dma_register *) DMA1_NEXT_DESC_PTR,
+        (struct dma_register *) DMA2_NEXT_DESC_PTR,
+        (struct dma_register *) DMA3_NEXT_DESC_PTR,
+        (struct dma_register *) DMA4_NEXT_DESC_PTR,
+        (struct dma_register *) DMA5_NEXT_DESC_PTR,
+        (struct dma_register *) DMA6_NEXT_DESC_PTR,
+        (struct dma_register *) DMA7_NEXT_DESC_PTR,
+        (struct dma_register *) DMA8_NEXT_DESC_PTR,
+        (struct dma_register *) DMA9_NEXT_DESC_PTR,
+        (struct dma_register *) DMA10_NEXT_DESC_PTR,
+        (struct dma_register *) DMA11_NEXT_DESC_PTR,
+        (struct dma_register *) DMA12_NEXT_DESC_PTR,
+        (struct dma_register *) DMA13_NEXT_DESC_PTR,
+        (struct dma_register *) DMA14_NEXT_DESC_PTR,
+        (struct dma_register *) DMA15_NEXT_DESC_PTR,
+        (struct dma_register *) DMA16_NEXT_DESC_PTR,
+        (struct dma_register *) DMA17_NEXT_DESC_PTR,
+        (struct dma_register *) DMA18_NEXT_DESC_PTR,
+        (struct dma_register *) DMA19_NEXT_DESC_PTR,
+        (struct dma_register *) DMA20_NEXT_DESC_PTR,
+        (struct dma_register *) DMA21_NEXT_DESC_PTR,
+        (struct dma_register *) DMA22_NEXT_DESC_PTR,
+        (struct dma_register *) DMA23_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA_D0_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA_S0_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA_D1_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA_S1_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA_D2_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA_S2_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA_D3_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA_S3_NEXT_DESC_PTR,
+};
+int channel2irq(unsigned int channel)
+{
+        int ret_irq = -1;
+        switch (channel) {
+        case CH_SPORT0_RX:
+                ret_irq = IRQ_SPORT0_RX;
+                break;
+        case CH_SPORT0_TX:
+                ret_irq = IRQ_SPORT0_TX;
+                break;
+        case CH_SPORT1_RX:
+                ret_irq = IRQ_SPORT1_RX;
+                break;
+        case CH_SPORT1_TX:
+                ret_irq = IRQ_SPORT1_TX;
+        case CH_SPI0:
+                ret_irq = IRQ_SPI0;
+                break;
+        case CH_SPI1:
+                ret_irq = IRQ_SPI1;
+                break;
+        case CH_UART0_RX:
+                ret_irq = IRQ_UART_RX;
+                break;
+        case CH_UART0_TX:
+                ret_irq = IRQ_UART_TX;
+                break;
+        case CH_UART1_RX:
+                ret_irq = IRQ_UART_RX;
+                break;
+        case CH_UART1_TX:
+                ret_irq = IRQ_UART_TX;
+                break;
+        case CH_EPPI0:
+                ret_irq = IRQ_EPPI0;
+                break;
+        case CH_EPPI1:
+                ret_irq = IRQ_EPPI1;
+                break;
+        case CH_EPPI2:
+                ret_irq = IRQ_EPPI2;
+                break;
+        case CH_PIXC_IMAGE:
+                ret_irq = IRQ_PIXC_IN0;
+                break;
+        case CH_PIXC_OVERLAY:
+                ret_irq = IRQ_PIXC_IN1;
+                break;
+        case CH_PIXC_OUTPUT:
+                ret_irq = IRQ_PIXC_OUT;
+                break;
+        case CH_SPORT2_RX:
+                ret_irq = IRQ_SPORT2_RX;
+                break;
+        case CH_SPORT2_TX:
+                ret_irq = IRQ_SPORT2_TX;
+                break;
+        case CH_SPORT3_RX:
+                ret_irq = IRQ_SPORT3_RX;
+                break;
+        case CH_SPORT3_TX:
+                ret_irq = IRQ_SPORT3_TX;
+                break;
+        case CH_SDH:
+                ret_irq = IRQ_SDH;
+                break;
+        case CH_SPI2:
+                ret_irq = IRQ_SPI2;
+                break;
+        case CH_MEM_STREAM0_SRC:
+        case CH_MEM_STREAM0_DEST:
+                ret_irq = IRQ_MDMAS0;
+                break;
+        case CH_MEM_STREAM1_SRC:
+        case CH_MEM_STREAM1_DEST:
+                ret_irq = IRQ_MDMAS1;
+                break;
+        case CH_MEM_STREAM2_SRC:
+        case CH_MEM_STREAM2_DEST:
+                ret_irq = IRQ_MDMAS2;
+                break;
+        case CH_MEM_STREAM3_SRC:
+        case CH_MEM_STREAM3_DEST:
+                ret_irq = IRQ_MDMAS3;
+                break;
+        }
+        return ret_irq;
+}
diff --git a/arch/blackfin/mach-bf548/gpio.c b/arch/blackfin/mach-bf548/gpio.c
new file mode 100644
index 0000000000..0da5f0003b
--- /dev/null
+++ b/arch/blackfin/mach-bf548/gpio.c
@@ -0,0 +1,323 @@
+/*
+ * File:         arch/blackfin/mach-bf548/gpio.c
+ * Based on:
+ * Author:       Michael Hennerich (hennerich@blackfin.uclinux.org)
+ *
+ * Created:
+ * Description:  GPIO Abstraction Layer
+ *
+ * Modified:
+ *               Copyright 2007 Analog Devices Inc.
+ *
+ * Bugs:         Enter bugs at http://blackfin.uclinux.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see the file COPYING, or write
+ * to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/module.h>
+#include <linux/err.h>
+#include <asm/blackfin.h>
+#include <asm/gpio.h>
+#include <asm/portmux.h>
+#include <linux/irq.h>
+static struct gpio_port_t *gpio_array[gpio_bank(MAX_BLACKFIN_GPIOS)] = {
+        (struct gpio_port_t *)PORTA_FER,
+        (struct gpio_port_t *)PORTB_FER,
+        (struct gpio_port_t *)PORTC_FER,
+        (struct gpio_port_t *)PORTD_FER,
+        (struct gpio_port_t *)PORTE_FER,
+        (struct gpio_port_t *)PORTF_FER,
+        (struct gpio_port_t *)PORTG_FER,
+        (struct gpio_port_t *)PORTH_FER,
+        (struct gpio_port_t *)PORTI_FER,
+        (struct gpio_port_t *)PORTJ_FER,
+};
+static unsigned short reserved_gpio_map[gpio_bank(MAX_BLACKFIN_GPIOS)];
+static unsigned short reserved_peri_map[gpio_bank(MAX_BLACKFIN_GPIOS)];
+inline int check_gpio(unsigned short gpio)
+{
+        if (gpio == GPIO_PB15 || gpio == GPIO_PC14 || gpio == GPIO_PC15
+            || gpio == GPIO_PH14 || gpio == GPIO_PH15
+            || gpio == GPIO_PJ14 || gpio == GPIO_PJ15
+            || gpio > MAX_BLACKFIN_GPIOS)
+                return -EINVAL;
+        return 0;
+}
+inline void portmux_setup(unsigned short portno, unsigned short function)
+{
+        u32 pmux;
+        pmux = gpio_array[gpio_bank(portno)]->port_mux;
+        pmux &= ~(0x3 << (2 * gpio_sub_n(portno)));
+        pmux |= (function & 0x3) << (2 * gpio_sub_n(portno));
+        gpio_array[gpio_bank(portno)]->port_mux = pmux;
+}
+inline u16 get_portmux(unsigned short portno)
+{
+        u32 pmux;
+        pmux = gpio_array[gpio_bank(portno)]->port_mux;
+        return (pmux >> (2 * gpio_sub_n(portno)) & 0x3);
+}
+static void port_setup(unsigned short gpio, unsigned short usage)
+{
+        if (usage == GPIO_USAGE) {
+                if (gpio_array[gpio_bank(gpio)]->port_fer & gpio_bit(gpio))
+                        printk(KERN_WARNING
+                               "bfin-gpio: Possible Conflict with Peripheral "
+                               "usage and GPIO %d detected!\n", gpio);
+                gpio_array[gpio_bank(gpio)]->port_fer &= ~gpio_bit(gpio);
+        } else
+                gpio_array[gpio_bank(gpio)]->port_fer |= gpio_bit(gpio);
+        SSYNC();
+}
+static int __init bfin_gpio_init(void)
+{
+        printk(KERN_INFO "Blackfin GPIO Controller\n");
+        return 0;
+}
+arch_initcall(bfin_gpio_init);
+int peripheral_request(unsigned short per, const char *label)
+{
+        unsigned long flags;
+        unsigned short ident = P_IDENT(per);
+        if (!(per & P_DEFINED))
+                return -ENODEV;
+        if (check_gpio(ident) < 0)
+                return -EINVAL;
+        local_irq_save(flags);
+        if (unlikely(reserved_gpio_map[gpio_bank(ident)] & gpio_bit(ident))) {
+                printk(KERN_ERR
+                       "%s: Peripheral %d is already reserved as GPIO!\n",
+                       __FUNCTION__, per);
+                dump_stack();
+                local_irq_restore(flags);
+                return -EBUSY;
+        }
+        if (unlikely(reserved_peri_map[gpio_bank(ident)] & gpio_bit(ident))) {
+                u16 funct = get_portmux(ident);
+                if (!((per & P_MAYSHARE) && (funct == P_FUNCT2MUX(per)))) {
+                        printk(KERN_ERR
+                               "%s: Peripheral %d is already reserved!\n",
+                               __FUNCTION__, per);
+                        dump_stack();
+                        local_irq_restore(flags);
+                        return -EBUSY;
+                }
+        }
+        reserved_peri_map[gpio_bank(ident)] |= gpio_bit(ident);
+        portmux_setup(ident, P_FUNCT2MUX(per));
+        port_setup(ident, PERIPHERAL_USAGE);
+        local_irq_restore(flags);
+        return 0;
+}
+EXPORT_SYMBOL(peripheral_request);
+int peripheral_request_list(unsigned short per[], const char *label)
+{
+        u16 cnt;
+        int ret;
+        for (cnt = 0; per[cnt] != 0; cnt++) {
+                ret = peripheral_request(per[cnt], label);
+                if (ret < 0)
+                        return ret;
+        }
+        return 0;
+}
+EXPORT_SYMBOL(peripheral_request_list);
+void peripheral_free(unsigned short per)
+{
+        unsigned long flags;
+        unsigned short ident = P_IDENT(per);
+        if (!(per & P_DEFINED))
+                return;
+        if (check_gpio(ident) < 0)
+                return;
+        local_irq_save(flags);
+        if (unlikely(!(reserved_peri_map[gpio_bank(ident)] & gpio_bit(ident)))) {
+                printk(KERN_ERR "bfin-gpio: Peripheral %d wasn't reserved!\n", per);
+                dump_stack();
+                local_irq_restore(flags);
+                return;
+        }
+        if (!(per & P_MAYSHARE)) {
+                port_setup(ident, GPIO_USAGE);
+        }
+        reserved_peri_map[gpio_bank(ident)] &= ~gpio_bit(ident);
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL(peripheral_free);
+void peripheral_free_list(unsigned short per[])
+{
+        u16 cnt;
+        for (cnt = 0; per[cnt] != 0; cnt++) {
+                peripheral_free(per[cnt]);
+        }
+}
+EXPORT_SYMBOL(peripheral_free_list);
+/***********************************************************
+*
+* FUNCTIONS: Blackfin GPIO Driver
+*
+* INPUTS/OUTPUTS:
+* gpio - GPIO Number between 0 and MAX_BLACKFIN_GPIOS
+*
+*
+* DESCRIPTION: Blackfin GPIO Driver API
+*
+* CAUTION:
+*************************************************************
+* MODIFICATION HISTORY :
+**************************************************************/
+int gpio_request(unsigned short gpio, const char *label)
+{
+        unsigned long flags;
+        if (check_gpio(gpio) < 0)
+                return -EINVAL;
+        local_irq_save(flags);
+        if (unlikely(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
+                printk(KERN_ERR "bfin-gpio: GPIO %d is already reserved!\n", gpio);
+                dump_stack();
+                local_irq_restore(flags);
+                return -EBUSY;
+        }
+        if (unlikely(reserved_peri_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
+                printk(KERN_ERR
+                       "bfin-gpio: GPIO %d is already reserved as Peripheral!\n", gpio);
+                dump_stack();
+                local_irq_restore(flags);
+                return -EBUSY;
+        }
+        reserved_gpio_map[gpio_bank(gpio)] |= gpio_bit(gpio);
+        local_irq_restore(flags);
+        port_setup(gpio, GPIO_USAGE);
+        return 0;
+}
+EXPORT_SYMBOL(gpio_request);
+void gpio_free(unsigned short gpio)
+{
+        unsigned long flags;
+        if (check_gpio(gpio) < 0)
+                return;
+        local_irq_save(flags);
+        if (unlikely(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)))) {
+                printk(KERN_ERR "bfin-gpio: GPIO %d wasn't reserved!\n", gpio);
+                dump_stack();
+                local_irq_restore(flags);
+                return;
+        }
+        reserved_gpio_map[gpio_bank(gpio)] &= ~gpio_bit(gpio);
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL(gpio_free);
+void gpio_direction_input(unsigned short gpio)
+{
+        unsigned long flags;
+        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
+        local_irq_save(flags);
+        gpio_array[gpio_bank(gpio)]->port_dir_clear = gpio_bit(gpio);
+        gpio_array[gpio_bank(gpio)]->port_inen |= gpio_bit(gpio);
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL(gpio_direction_input);
+void gpio_direction_output(unsigned short gpio)
+{
+        unsigned long flags;
+        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
+        local_irq_save(flags);
+        gpio_array[gpio_bank(gpio)]->port_inen &= ~gpio_bit(gpio);
+        gpio_array[gpio_bank(gpio)]->port_dir_set = gpio_bit(gpio);
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL(gpio_direction_output);
+void gpio_set_value(unsigned short gpio, unsigned short arg)
+{
+        if (arg)
+                gpio_array[gpio_bank(gpio)]->port_set = gpio_bit(gpio);
+        else
+                gpio_array[gpio_bank(gpio)]->port_clear = gpio_bit(gpio);
+}
+EXPORT_SYMBOL(gpio_set_value);
+unsigned short gpio_get_value(unsigned short gpio)
+{
+        return (1 & (gpio_array[gpio_bank(gpio)]->port_data >> gpio_sub_n(gpio)));
+}
+EXPORT_SYMBOL(gpio_get_value);
diff --git a/arch/blackfin/mach-bf548/head.S b/arch/blackfin/mach-bf548/head.S
new file mode 100644
index 0000000000..06751ae8b8
--- /dev/null
+++ b/arch/blackfin/mach-bf548/head.S
@@ -0,0 +1,512 @@
+/*
+ * File:         arch/blackfin/mach-bf548/head.S
+ * Based on:     arch/blackfin/mach-bf537/head.S
+ * Author:       Jeff Dionne <jeff@uclinux.org> COPYRIGHT 1998 D. Jeff Dionne
+ *
+ * Created:      1998
+ * Description:  Startup code for Blackfin BF548
+ *
+ * Modified:
+ *               Copyright 2004-2007 Analog Devices Inc.
+ *
+ * Bugs:         Enter bugs at http://blackfin.uclinux.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see the file COPYING, or write
+ * to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/linkage.h>
+#include <asm/blackfin.h>
+#include <asm/trace.h>
+#if CONFIG_BFIN_KERNEL_CLOCK
+#include <asm/mach/mem_init.h>
+#endif
+.global __rambase
+.global __ramstart
+.global __ramend
+.extern ___bss_stop
+.extern ___bss_start
+.extern _bf53x_relocate_l1_mem
+#define INITIAL_STACK   0xFFB01000
+.text
+ENTRY(__start)
+ENTRY(__stext)
+        /* R0: argument of command line string, passed from uboot, save it */
+        R7 = R0;
+        /* Set the SYSCFG register */
+        R0 = 0x36;
+        SYSCFG = R0;   /*Enable Cycle Counter and Nesting Of Interrupts(3rd Bit)*/
+        R0 = 0;
+        /* Clear Out All the data and pointer  Registers*/
+        R1 = R0;
+        R2 = R0;
+        R3 = R0;
+        R4 = R0;
+        R5 = R0;
+        R6 = R0;
+        P0 = R0;
+        P1 = R0;
+        P2 = R0;
+        P3 = R0;
+        P4 = R0;
+        P5 = R0;
+        LC0 = r0;
+        LC1 = r0;
+        L0 = r0;
+        L1 = r0;
+        L2 = r0;
+        L3 = r0;
+        /* Clear Out All the DAG Registers*/
+        B0 = r0;
+        B1 = r0;
+        B2 = r0;
+        B3 = r0;
+        I0 = r0;
+        I1 = r0;
+        I2 = r0;
+        I3 = r0;
+        M0 = r0;
+        M1 = r0;
+        M2 = r0;
+        M3 = r0;
+        trace_buffer_start(p0,r0);
+        P0 = R1;
+        R0 = R1;
+        /* Turn off the icache */
+        p0.l = (IMEM_CONTROL & 0xFFFF);
+        p0.h = (IMEM_CONTROL >> 16);
+        R1 = [p0];
+        R0 = ~ENICPLB;
+        R0 = R0 & R1;
+        [p0] = R0;
+        SSYNC;
+        /* Turn off the dcache */
+        p0.l = (DMEM_CONTROL & 0xFFFF);
+        p0.h = (DMEM_CONTROL >> 16);
+        R1 = [p0];
+        R0 = ~ENDCPLB;
+        R0 = R0 & R1;
+        [p0] = R0;
+        SSYNC;
+        /* Initialize stack pointer */
+        SP.L = LO(INITIAL_STACK);
+        SP.H = HI(INITIAL_STACK);
+        FP = SP;
+        USP = SP;
+        /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */
+        call _bf53x_relocate_l1_mem;
+#if CONFIG_BFIN_KERNEL_CLOCK
+        call _start_dma_code;
+#endif
+        /* Code for initializing Async memory banks */
+        p2.h = hi(EBIU_AMBCTL1);
+        p2.l = lo(EBIU_AMBCTL1);
+        r0.h = hi(AMBCTL1VAL);
+        r0.l = lo(AMBCTL1VAL);
+        [p2] = r0;
+        ssync;
+        p2.h = hi(EBIU_AMBCTL0);
+        p2.l = lo(EBIU_AMBCTL0);
+        r0.h = hi(AMBCTL0VAL);
+        r0.l = lo(AMBCTL0VAL);
+        [p2] = r0;
+        ssync;
+        p2.h = hi(EBIU_AMGCTL);
+        p2.l = lo(EBIU_AMGCTL);
+        r0 = AMGCTLVAL;
+        w[p2] = r0;
+        ssync;
+        /* This section keeps the processor in supervisor mode
+         * during kernel boot.  Switches to user mode at end of boot.
+         * See page 3-9 of Hardware Reference manual for documentation.
+         */
+        /* EVT15 = _real_start */
+        p0.l = lo(EVT15);
+        p0.h = hi(EVT15);
+        p1.l = _real_start;
+        p1.h = _real_start;
+        [p0] = p1;
+        csync;
+        p0.l = lo(IMASK);
+        p0.h = hi(IMASK);
+        p1.l = IMASK_IVG15;
+        p1.h = 0x0;
+        [p0] = p1;
+        csync;
+        raise 15;
+        p0.l = .LWAIT_HERE;
+        p0.h = .LWAIT_HERE;
+        reti = p0;
+#if defined (ANOMALY_05000281)
+        nop;
+        nop;
+        nop;
+#endif
+        rti;
+.LWAIT_HERE:
+        jump .LWAIT_HERE;
+ENTRY(_real_start)
+        [ -- sp ] = reti;
+        p0.l = lo(WDOG_CTL);
+        p0.h = hi(WDOG_CTL);
+        r0 = 0xAD6(z);
+        w[p0] = r0;     /* watchdog off for now */
+        ssync;
+        /* Code update for BSS size == 0
+         * Zero out the bss region.
+         */
+        p1.l = ___bss_start;
+        p1.h = ___bss_start;
+        p2.l = ___bss_stop;
+        p2.h = ___bss_stop;
+        r0 = 0;
+        p2 -= p1;
+        lsetup (.L_clear_bss, .L_clear_bss ) lc0 = p2;
+.L_clear_bss:
+        B[p1++] = r0;
+        /* In case there is a NULL pointer reference
+         * Zero out region before stext
+         */
+        p1.l = 0x0;
+        p1.h = 0x0;
+        r0.l = __stext;
+        r0.h = __stext;
+        r0 = r0 >> 1;
+        p2 = r0;
+        r0 = 0;
+        lsetup (.L_clear_zero, .L_clear_zero ) lc0 = p2;
+.L_clear_zero:
+        W[p1++] = r0;
+        /* pass the uboot arguments to the global value command line */
+        R0 = R7;
+        call _cmdline_init;
+        p1.l = __rambase;
+        p1.h = __rambase;
+        r0.l = __sdata;
+        r0.h = __sdata;
+        [p1] = r0;
+        p1.l = __ramstart;
+        p1.h = __ramstart;
+        p3.l = ___bss_stop;
+        p3.h = ___bss_stop;
+        r1 = p3;
+        [p1] = r1;
+        /*
+         *  load the current thread pointer and stack
+         */
+        r1.l = _init_thread_union;
+        r1.h = _init_thread_union;
+        r2.l = 0x2000;
+        r2.h = 0x0000;
+        r1 = r1 + r2;
+        sp = r1;
+        usp = sp;
+        fp = sp;
+        call _start_kernel;
+.L_exit:
+        jump.s  .L_exit;
+.section .l1.text
+#if CONFIG_BFIN_KERNEL_CLOCK
+ENTRY(_start_dma_code)
+        /* Enable PHY CLK buffer output */
+        p0.h = hi(VR_CTL);
+        p0.l = lo(VR_CTL);
+        r0.l = w[p0];
+        bitset(r0, 14);
+        w[p0] = r0.l;
+        ssync;
+        p0.h = hi(SIC_IWR);
+        p0.l = lo(SIC_IWR);
+        r0.l = 0x1;
+        r0.h = 0x0;
+        [p0] = r0;
+        SSYNC;
+        /*
+         *  Set PLL_CTL
+         *   - [14:09] = MSEL[5:0] : CLKIN / VCO multiplication factors
+         *   - [8]     = BYPASS    : BYPASS the PLL, run CLKIN into CCLK/SCLK
+         *   - [7]     = output delay (add 200ps of delay to mem signals)
+         *   - [6]     = input delay (add 200ps of input delay to mem signals)
+         *   - [5]     = PDWN      : 1=All Clocks off
+         *   - [3]     = STOPCK    : 1=Core Clock off
+         *   - [1]     = PLL_OFF   : 1=Disable Power to PLL
+         *   - [0]     = DF        : 1=Pass CLKIN/2 to PLL / 0=Pass CLKIN to PLL
+         *   all other bits set to zero
+         */
+        p0.h = hi(PLL_LOCKCNT);
+        p0.l = lo(PLL_LOCKCNT);
+        r0 = 0x300(Z);
+        w[p0] = r0.l;
+        ssync;
+        P2.H = hi(EBIU_SDGCTL);
+        P2.L = lo(EBIU_SDGCTL);
+        R0 = [P2];
+        BITSET (R0, 24);
+        [P2] = R0;
+        SSYNC;
+        r0 = CONFIG_VCO_MULT & 63;       /* Load the VCO multiplier         */
+        r0 = r0 << 9;                    /* Shift it over,                  */
+        r1 = CLKIN_HALF;                 /* Do we need to divide CLKIN by 2?*/
+        r0 = r1 | r0;
+        r1 = PLL_BYPASS;                 /* Bypass the PLL?                 */
+        r1 = r1 << 8;                    /* Shift it over                   */
+        r0 = r1 | r0;                    /* add them all together           */
+        p0.h = hi(PLL_CTL);
+        p0.l = lo(PLL_CTL);              /* Load the address                */
+        cli r2;                          /* Disable interrupts              */
+        ssync;
+        w[p0] = r0.l;                    /* Set the value                   */
+        idle;                            /* Wait for the PLL to stablize    */
+        sti r2;                          /* Enable interrupts               */
+.Lcheck_again:
+        p0.h = hi(PLL_STAT);
+        p0.l = lo(PLL_STAT);
+        R0 = W[P0](Z);
+        CC = BITTST(R0,5);
+        if ! CC jump .Lcheck_again;
+        /* Configure SCLK & CCLK Dividers */
+        r0 = (CONFIG_CCLK_ACT_DIV | CONFIG_SCLK_DIV);
+        p0.h = hi(PLL_DIV);
+        p0.l = lo(PLL_DIV);
+        w[p0] = r0.l;
+        ssync;
+        p0.l = lo(EBIU_SDRRC);
+        p0.h = hi(EBIU_SDRRC);
+        r0 = mem_SDRRC;
+        w[p0] = r0.l;
+        ssync;
+        p0.l = (EBIU_SDBCTL & 0xFFFF);
+        p0.h = (EBIU_SDBCTL >> 16);     /* SDRAM Memory Bank Control Register */
+        r0 = mem_SDBCTL;
+        w[p0] = r0.l;
+        ssync;
+        P2.H = hi(EBIU_SDGCTL);
+        P2.L = lo(EBIU_SDGCTL);
+        R0 = [P2];
+        BITCLR (R0, 24);
+        p0.h = hi(EBIU_SDSTAT);
+        p0.l = lo(EBIU_SDSTAT);
+        r2.l = w[p0];
+        cc = bittst(r2,3);
+        if !cc jump .Lskip;
+        NOP;
+        BITSET (R0, 23);
+.Lskip:
+        [P2] = R0;
+        SSYNC;
+        R0.L = lo(mem_SDGCTL);
+        R0.H = hi(mem_SDGCTL);
+        R1 = [p2];
+        R1 = R1 | R0;
+        [P2] = R1;
+        SSYNC;
+        p0.h = hi(SIC_IWR);
+        p0.l = lo(SIC_IWR);
+        r0.l = lo(IWR_ENABLE_ALL);
+        r0.h = hi(IWR_ENABLE_ALL);
+        [p0] = r0;
+        SSYNC;
+        RTS;
+#endif /* CONFIG_BFIN_KERNEL_CLOCK */
+ENTRY(_bfin_reset)
+        /* No more interrupts to be handled*/
+        CLI R6;
+        SSYNC;
+#if defined(CONFIG_MTD_M25P80)
+/*
+ * The following code fix the SPI flash reboot issue,
+ * /CS signal of the chip which is using PF10 return to GPIO mode
+ */
+        p0.h = hi(PORTF_FER);
+        p0.l = lo(PORTF_FER);
+        r0.l = 0x0000;
+        w[p0] = r0.l;
+        SSYNC;
+/* /CS return to high */
+        p0.h = hi(PORTFIO);
+        p0.l = lo(PORTFIO);
+        r0.l = 0xFFFF;
+        w[p0] = r0.l;
+        SSYNC;
+/* Delay some time, This is necessary */
+        r1.h = 0;
+        r1.l = 0x400;
+        p1   = r1;
+        lsetup (_delay_lab1,_delay_lab1_end ) lc1 = p1;
+_delay_lab1:
+        r0.h = 0;
+        r0.l = 0x8000;
+        p0   = r0;
+        lsetup (_delay_lab0,_delay_lab0_end ) lc0 = p0;
+_delay_lab0:
+        nop;
+_delay_lab0_end:
+        nop;
+_delay_lab1_end:
+        nop;
+#endif
+        /* Clear the bits 13-15 in SWRST if they werent cleared */
+        p0.h = hi(SWRST);
+        p0.l = lo(SWRST);
+        csync;
+        r0.l = w[p0];
+        /* Clear the IMASK register */
+        p0.h = hi(IMASK);
+        p0.l = lo(IMASK);
+        r0 = 0x0;
+        [p0] = r0;
+        /* Clear the ILAT register */
+        p0.h = hi(ILAT);
+        p0.l = lo(ILAT);
+        r0 = [p0];
+        [p0] = r0;
+        SSYNC;
+        /* Disable the WDOG TIMER */
+        p0.h = hi(WDOG_CTL);
+        p0.l = lo(WDOG_CTL);
+        r0.l = 0xAD6;
+        w[p0] = r0.l;
+        SSYNC;
+        /* Clear the sticky bit incase it is already set */
+        p0.h = hi(WDOG_CTL);
+        p0.l = lo(WDOG_CTL);
+        r0.l = 0x8AD6;
+        w[p0] = r0.l;
+        SSYNC;
+        /* Program the count value */
+        R0.l = 0x100;
+        R0.h = 0x0;
+        P0.h = hi(WDOG_CNT);
+        P0.l = lo(WDOG_CNT);
+        [P0] = R0;
+        SSYNC;
+        /* Program WDOG_STAT if necessary */
+        P0.h = hi(WDOG_CTL);
+        P0.l = lo(WDOG_CTL);
+        R0 = W[P0](Z);
+        CC = BITTST(R0,1);
+        if !CC JUMP .LWRITESTAT;
+        CC = BITTST(R0,2);
+        if !CC JUMP .LWRITESTAT;
+        JUMP .LSKIP_WRITE;
+.LWRITESTAT:
+        /* When watch dog timer is enabled,
+         * a write to STAT will load the contents of CNT to STAT
+         */
+        R0 = 0x0000(z);
+        P0.h = hi(WDOG_STAT);
+        P0.l = lo(WDOG_STAT)
+        [P0] = R0;
+        SSYNC;
+.LSKIP_WRITE:
+        /* Enable the reset event */
+        P0.h = hi(WDOG_CTL);
+        P0.l = lo(WDOG_CTL);
+        R0 = W[P0](Z);
+        BITCLR(R0,1);
+        BITCLR(R0,2);
+        W[P0] = R0.L;
+        SSYNC;
+        NOP;
+        /* Enable the wdog counter */
+        R0 = W[P0](Z);
+        BITCLR(R0,4);
+        W[P0] = R0.L;
+        SSYNC;
+        IDLE;
+        RTS;
+.data
+/*
+ * Set up the usable of RAM stuff. Size of RAM is determined then
+ * an initial stack set up at the end.
+ */
+.align 4
+__rambase:
+.long   0
+__ramstart:
+.long   0
+__ramend:
+.long   0
diff --git a/arch/blackfin/mach-bf548/ints-priority.c b/arch/blackfin/mach-bf548/ints-priority.c
new file mode 100644
index 0000000000..cb0ebac53c
--- /dev/null
+++ b/arch/blackfin/mach-bf548/ints-priority.c
@@ -0,0 +1,137 @@
+/*
+ * File:         arch/blackfin/mach-bf537/ints-priority.c
+ * Based on:     arch/blackfin/mach-bf533/ints-priority.c
+ * Author:       Michael Hennerich
+ *
+ * Created:
+ * Description:  Set up the interupt priorities
+ *
+ * Modified:
+ *               Copyright 2004-2006 Analog Devices Inc.
+ *
+ * Bugs:         Enter bugs at http://blackfin.uclinux.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see the file COPYING, or write
+ * to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/module.h>
+#include <linux/irq.h>
+#include <asm/blackfin.h>
+void program_IAR(void)
+{
+        /* Program the IAR0 Register with the configured priority */
+        bfin_write_SIC_IAR0(((CONFIG_IRQ_PLL_WAKEUP - 7) << IRQ_PLL_WAKEUP_POS) |
+                            ((CONFIG_IRQ_DMAC0_ERR - 7) << IRQ_DMAC0_ERR_POS) |
+                            ((CONFIG_IRQ_EPPI0_ERR - 7) << IRQ_EPPI0_ERR_POS) |
+                            ((CONFIG_IRQ_SPORT0_ERR - 7) << IRQ_SPORT0_ERR_POS) |
+                            ((CONFIG_IRQ_SPORT1_ERR - 7) << IRQ_SPORT1_ERR_POS) |
+                            ((CONFIG_IRQ_SPI0_ERR - 7) << IRQ_SPI0_ERR_POS) |
+                            ((CONFIG_IRQ_UART0_ERR - 7) << IRQ_UART0_ERR_POS) |
+                            ((CONFIG_IRQ_RTC - 7) << IRQ_RTC_POS));
+        bfin_write_SIC_IAR1(((CONFIG_IRQ_EPPI0 - 7) << IRQ_EPPI0_POS) |
+                            ((CONFIG_IRQ_SPORT0_RX - 7) << IRQ_SPORT0_RX_POS) |
+                            ((CONFIG_IRQ_SPORT0_TX - 7) << IRQ_SPORT0_TX_POS) |
+                            ((CONFIG_IRQ_SPORT1_RX - 7) << IRQ_SPORT1_RX_POS) |
+                            ((CONFIG_IRQ_SPORT1_TX - 7) << IRQ_SPORT1_TX_POS) |
+                            ((CONFIG_IRQ_SPI0 - 7) << IRQ_SPI0_POS) |
+                            ((CONFIG_IRQ_UART0_RX - 7) << IRQ_UART0_RX_POS) |
+                            ((CONFIG_IRQ_UART0_TX - 7) << IRQ_UART0_TX_POS));
+        bfin_write_SIC_IAR2(((CONFIG_IRQ_TIMER8 - 7) << IRQ_TIMER8_POS) |
+                            ((CONFIG_IRQ_TIMER9 - 7) << IRQ_TIMER9_POS) |
+                            ((CONFIG_IRQ_PINT0 - 7) << IRQ_PINT0_POS) |
+                            ((CONFIG_IRQ_PINT1 - 7) << IRQ_PINT1_POS) |
+                            ((CONFIG_IRQ_MDMAS0 - 7) << IRQ_MDMAS0_POS) |
+                            ((CONFIG_IRQ_MDMAS1 - 7) << IRQ_MDMAS1_POS) |
+                            ((CONFIG_IRQ_WATCHDOG - 7) << IRQ_WATCHDOG_POS));
+        bfin_write_SIC_IAR3(((CONFIG_IRQ_DMAC1_ERR - 7) << IRQ_DMAC1_ERR_POS) |
+                            ((CONFIG_IRQ_SPORT2_ERR - 7) << IRQ_SPORT2_ERR_POS) |
+                            ((CONFIG_IRQ_SPORT3_ERR - 7) << IRQ_SPORT3_ERR_POS) |
+                            ((CONFIG_IRQ_MXVR_DATA - 7) << IRQ_MXVR_DATA_POS) |
+                            ((CONFIG_IRQ_SPI1_ERR - 7) << IRQ_SPI1_ERR_POS) |
+                            ((CONFIG_IRQ_SPI2_ERR - 7) << IRQ_SPI2_ERR_POS) |
+                            ((CONFIG_IRQ_UART1_ERR - 7) << IRQ_UART1_ERR_POS) |
+                            ((CONFIG_IRQ_UART2_ERR - 7) << IRQ_UART2_ERR_POS));
+        bfin_write_SIC_IAR4(((CONFIG_IRQ_CAN0_ERR - 7) << IRQ_CAN0_ERR_POS) |
+                            ((CONFIG_IRQ_SPORT2_RX - 7) << IRQ_SPORT2_RX_POS) |
+                            ((CONFIG_IRQ_SPORT2_TX - 7) << IRQ_SPORT2_TX_POS) |
+                            ((CONFIG_IRQ_SPORT3_RX - 7) << IRQ_SPORT3_RX_POS) |
+                            ((CONFIG_IRQ_SPORT3_TX - 7) << IRQ_SPORT3_TX_POS) |
+                            ((CONFIG_IRQ_EPPI1 - 7) << IRQ_EPPI1_POS) |
+                            ((CONFIG_IRQ_EPPI2 - 7) << IRQ_EPPI2_POS) |
+                            ((CONFIG_IRQ_SPI1 - 7) << IRQ_SPI1_POS));
+        bfin_write_SIC_IAR5(((CONFIG_IRQ_SPI2 - 7) << IRQ_SPI2_POS) |
+                            ((CONFIG_IRQ_UART1_RX - 7) << IRQ_UART1_RX_POS) |
+                            ((CONFIG_IRQ_UART1_TX - 7) << IRQ_UART1_TX_POS) |
+                            ((CONFIG_IRQ_ATAPI_RX - 7) << IRQ_ATAPI_RX_POS) |
+                            ((CONFIG_IRQ_ATAPI_TX - 7) << IRQ_ATAPI_TX_POS) |
+                            ((CONFIG_IRQ_TWI0 - 7) << IRQ_TWI0_POS) |
+                            ((CONFIG_IRQ_TWI1 - 7) << IRQ_TWI1_POS) |
+                            ((CONFIG_IRQ_CAN0_RX - 7) << IRQ_CAN0_RX_POS));
+        bfin_write_SIC_IAR6(((CONFIG_IRQ_CAN0_TX - 7) << IRQ_CAN0_TX_POS) |
+                            ((CONFIG_IRQ_MDMAS2 - 7) << IRQ_MDMAS2_POS) |
+                            ((CONFIG_IRQ_MDMAS3 - 7) << IRQ_MDMAS3_POS) |
+                            ((CONFIG_IRQ_MXVR_ERR - 7) << IRQ_MXVR_ERR_POS) |
+                            ((CONFIG_IRQ_MXVR_MSG - 7) << IRQ_MXVR_MSG_POS) |
+                            ((CONFIG_IRQ_MXVR_PKT - 7) << IRQ_MXVR_PKT_POS) |
+                            ((CONFIG_IRQ_EPPI1_ERR - 7) << IRQ_EPPI1_ERR_POS) |
+                            ((CONFIG_IRQ_EPPI2_ERR - 7) << IRQ_EPPI2_ERR_POS));
+        bfin_write_SIC_IAR7(((CONFIG_IRQ_UART3_ERR - 7) << IRQ_UART3_ERR_POS) |
+                            ((CONFIG_IRQ_HOST_ERR - 7) << IRQ_HOST_ERR_POS) |
+                            ((CONFIG_IRQ_PIXC_ERR - 7) << IRQ_PIXC_ERR_POS) |
+                            ((CONFIG_IRQ_NFC_ERR - 7) << IRQ_NFC_ERR_POS) |
+                            ((CONFIG_IRQ_ATAPI_ERR - 7) << IRQ_ATAPI_ERR_POS) |
+                            ((CONFIG_IRQ_CAN1_ERR - 7) << IRQ_CAN1_ERR_POS) |
+                            ((CONFIG_IRQ_HS_DMA_ERR - 7) << IRQ_HS_DMA_ERR_POS));
+        bfin_write_SIC_IAR8(((CONFIG_IRQ_PIXC_IN0 - 7) << IRQ_PIXC_IN1_POS) |
+                            ((CONFIG_IRQ_PIXC_IN1 - 7) << IRQ_PIXC_IN1_POS) |
+                            ((CONFIG_IRQ_PIXC_OUT - 7) << IRQ_PIXC_OUT_POS) |
+                            ((CONFIG_IRQ_SDH - 7) << IRQ_SDH_POS) |
+                            ((CONFIG_IRQ_CNT - 7) << IRQ_CNT_POS) |
+                            ((CONFIG_IRQ_KEY - 7) << IRQ_KEY_POS) |
+                            ((CONFIG_IRQ_CAN1_RX - 7) << IRQ_CAN1_RX_POS) |
+                            ((CONFIG_IRQ_CAN1_TX - 7) << IRQ_CAN1_TX_POS));
+        bfin_write_SIC_IAR9(((CONFIG_IRQ_SDH_MASK0 - 7) << IRQ_SDH_MASK0_POS) |
+                            ((CONFIG_IRQ_SDH_MASK1 - 7) << IRQ_SDH_MASK1_POS) |
+                            ((CONFIG_IRQ_USB_INT0 - 7) << IRQ_USB_INT0_POS) |
+                            ((CONFIG_IRQ_USB_INT1 - 7) << IRQ_USB_INT1_POS) |
+                            ((CONFIG_IRQ_USB_INT2 - 7) << IRQ_USB_INT2_POS) |
+                            ((CONFIG_IRQ_USB_DMA - 7) << IRQ_USB_DMA_POS) |
+                            ((CONFIG_IRQ_OTPSEC - 7) << IRQ_OTPSEC_POS));
+        bfin_write_SIC_IAR10(((CONFIG_IRQ_TIMER0 - 7) << IRQ_TIMER0_POS) |
+                             ((CONFIG_IRQ_TIMER1 - 7) << IRQ_TIMER1_POS));
+        bfin_write_SIC_IAR11(((CONFIG_IRQ_TIMER2 - 7) << IRQ_TIMER2_POS) |
+                             ((CONFIG_IRQ_TIMER3 - 7) << IRQ_TIMER3_POS) |
+                             ((CONFIG_IRQ_TIMER4 - 7) << IRQ_TIMER4_POS) |
+                             ((CONFIG_IRQ_TIMER5 - 7) << IRQ_TIMER5_POS) |
+                             ((CONFIG_IRQ_TIMER6 - 7) << IRQ_TIMER6_POS) |
+                             ((CONFIG_IRQ_TIMER7 - 7) << IRQ_TIMER7_POS) |
+                             ((CONFIG_IRQ_PINT2 - 7) << IRQ_PINT2_POS) |
+                             ((CONFIG_IRQ_PINT3 - 7) << IRQ_PINT3_POS));
+        SSYNC();
+}
diff --git a/arch/blackfin/mach-bf561/Makefile b/arch/blackfin/mach-bf561/Makefile
index 57f475a551..f39235a557 100644
--- a/arch/blackfin/mach-bf561/Makefile
+++ b/arch/blackfin/mach-bf561/Makefile
@@ -4,6 +4,6 @@
 extra-y := head.o
-obj-y := ints-priority.o
+obj-y := ints-priority.o dma.o
 obj-$(CONFIG_BF561_COREB) += coreb.o
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c
index 3dc5c04204..5b2b544529 100644
--- a/arch/blackfin/mach-bf561/boards/cm_bf561.c
+++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c
@@ -34,7 +34,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb_isp1362.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
 #include <asm/bfin5xx_spi.h>
 /*
@@ -52,11 +52,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
                .size = 0x00020000,
                .offset = 0,
                .mask_flags = MTD_CAP_ROM
-        },{
+        }, {
                .name = "kernel",
                .size = 0xe0000,
                .offset = 0x20000
-        },{
+        }, {
                .name = "file system",
                .size = 0x700000,
                .offset = 0x00100000,
@@ -186,7 +186,7 @@ static struct resource smc91x_resources[] = {
                .start = 0x28000300,
                .end = 0x28000300 + 16,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PF0,
                .end = IRQ_PF0,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -206,11 +206,11 @@ static struct resource isp1362_hcd_resources[] = {
                .start = 0x24008000,
                .end = 0x24008000,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = 0x24008004,
                .end = 0x24008004,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PF47,
                .end = IRQ_PF47,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -241,25 +241,25 @@ static struct platform_device isp1362_hcd_device = {
 #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
 static struct resource bfin_uart_resources[] = {
-        {
+        {
-                .start = 0xFFC00400,
+                .start = 0xFFC00400,
-                .end = 0xFFC004FF,
+                .end = 0xFFC004FF,
-                .flags = IORESOURCE_MEM,
+                .flags = IORESOURCE_MEM,
-        },
+        },
 };
 static struct platform_device bfin_uart_device = {
-        .name = "bfin-uart",
+        .name = "bfin-uart",
-        .id = 1,
+        .id = 1,
-        .num_resources = ARRAY_SIZE(bfin_uart_resources),
+        .num_resources = ARRAY_SIZE(bfin_uart_resources),
-        .resource = bfin_uart_resources,
+        .resource = bfin_uart_resources,
 };
 #endif
 static struct platform_device *cm_bf561_devices[] __initdata = {
 #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
-        &bfin_uart_device,
+        &bfin_uart_device,
 #endif
 #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c
index 9720b5c307..724191da20 100644
--- a/arch/blackfin/mach-bf561/boards/ezkit.c
+++ b/arch/blackfin/mach-bf561/boards/ezkit.c
@@ -30,10 +30,9 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
-#include <asm/irq.h>
-#include <asm/bfin5xx_spi.h>
-#include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <asm/bfin5xx_spi.h>
 /*
 * Name the Board for the /proc/cpuinfo
@@ -45,13 +44,13 @@ char *bfin_board_name = "ADDS-BF561-EZKIT";
 #if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
 static struct resource bfin_isp1761_resources[] = {
-        [0] = {
+        {
                .name   = "isp1761-regs",
                .start  = ISP1761_BASE + 0x00000000,
                .end    = ISP1761_BASE + 0x000fffff,
                .flags  = IORESOURCE_MEM,
        },
-        [1] = {
+        {
                .start  = ISP1761_IRQ,
                .end    = ISP1761_IRQ,
                .flags  = IORESOURCE_IRQ,
@@ -71,7 +70,7 @@ static struct platform_device *bfin_isp1761_devices[] = {
 int __init bfin_isp1761_init(void)
 {
-        unsigned int num_devices=ARRAY_SIZE(bfin_isp1761_devices);
+        unsigned int num_devices = ARRAY_SIZE(bfin_isp1761_devices);
        printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);
        set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING);
@@ -98,7 +97,7 @@ static struct resource smc91x_resources[] = {
                .start = 0x2C010300,
                .end = 0x2C010300 + 16,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PF9,
                .end = IRQ_PF9,
@@ -116,18 +115,18 @@ static struct platform_device smc91x_device = {
 #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
 static struct resource bfin_uart_resources[] = {
-        {
+        {
-                .start = 0xFFC00400,
+                .start = 0xFFC00400,
-                .end = 0xFFC004FF,
+                .end = 0xFFC004FF,
-                .flags = IORESOURCE_MEM,
+                .flags = IORESOURCE_MEM,
-        },
+        },
 };
 static struct platform_device bfin_uart_device = {
-        .name = "bfin-uart",
+        .name = "bfin-uart",
-        .id = 1,
+        .id = 1,
-        .num_resources = ARRAY_SIZE(bfin_uart_resources),
+        .num_resources = ARRAY_SIZE(bfin_uart_resources),
-        .resource = bfin_uart_resources,
+        .resource = bfin_uart_resources,
 };
 #endif
@@ -176,7 +175,7 @@ static struct platform_device *ezkit_devices[] __initdata = {
        &spi_bfin_master_device,
 #endif
 #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
-        &bfin_uart_device,
+        &bfin_uart_device,
 #endif
 };
diff --git a/arch/blackfin/mach-bf561/boards/generic_board.c b/arch/blackfin/mach-bf561/boards/generic_board.c
index 585ecdd2f6..4dfea5da67 100644
--- a/arch/blackfin/mach-bf561/boards/generic_board.c
+++ b/arch/blackfin/mach-bf561/boards/generic_board.c
@@ -30,7 +30,7 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
 char *bfin_board_name = "UNKNOWN BOARD";
@@ -43,11 +43,11 @@ static struct resource smc91x_resources[] = {
                .start = 0x2C010300,
                .end = 0x2C010300 + 16,
                .flags = IORESOURCE_MEM,
-        },{
+        }, {
                .start = IRQ_PROG_INTB,
                .end = IRQ_PROG_INTB,
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
-        },{
+        }, {
                /*
                 *  denotes the flag pin and is used directly if
                 *  CONFIG_IRQCHIP_DEMUX_GPIO is defined.
diff --git a/arch/blackfin/mach-bf561/boards/tepla.c b/arch/blackfin/mach-bf561/boards/tepla.c
index db308c7cca..c442eb23db 100644
--- a/arch/blackfin/mach-bf561/boards/tepla.c
+++ b/arch/blackfin/mach-bf561/boards/tepla.c
@@ -14,7 +14,7 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
 char *bfin_board_name = "Tepla-BF561";
@@ -26,11 +26,11 @@ static struct resource smc91x_resources[] = {
                .start  = 0x2C000300,
                .end    = 0x2C000320,
                .flags  = IORESOURCE_MEM,
-        },{
+        }, {
                .start  = IRQ_PROG_INTB,
                .end    = IRQ_PROG_INTB,
                .flags  = IORESOURCE_IRQ|IORESOURCE_IRQ_HIGHLEVEL,
-        },{
+        }, {
                /*
                 *  denotes the flag pin and is used directly if
                 *  CONFIG_IRQCHIP_DEMUX_GPIO is defined.
diff --git a/arch/blackfin/mach-bf561/coreb.c b/arch/blackfin/mach-bf561/coreb.c
index b28582fe08..5d1d21b4c2 100644
--- a/arch/blackfin/mach-bf561/coreb.c
+++ b/arch/blackfin/mach-bf561/coreb.c
@@ -32,8 +32,8 @@
 #include <linux/device.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
+#include <linux/uaccess.h>
 #include <asm/dma.h>
-#include <asm/uaccess.h>
 #define MODULE_VER              "v0.1"
@@ -202,7 +202,7 @@ static int coreb_open(struct inode *inode, struct file *file)
        spin_unlock_irq(&coreb_lock);
        return 0;
-      out_busy:
+ out_busy:
        spin_unlock_irq(&coreb_lock);
        return -EBUSY;
 }
@@ -365,19 +365,19 @@ int __init bf561_coreb_init(void)
        printk(KERN_INFO "BF561 Core B driver %s initialized.\n", MODULE_VER);
        return 0;
-      release_dma_src:
+ release_dma_src:
        free_dma(CH_MEM_STREAM2_SRC);
-      release_dma_dest:
+ release_dma_dest:
        free_dma(CH_MEM_STREAM2_DEST);
-      release_data_a_sram:
+ release_data_a_sram:
        release_mem_region(0xff400000, 0x8000);
-      release_data_b_sram:
+ release_data_b_sram:
        release_mem_region(0xff500000, 0x8000);
-      release_instruction_b_sram:
+ release_instruction_b_sram:
        release_mem_region(0xff610000, 0x4000);
-      release_instruction_a_sram:
+ release_instruction_a_sram:
        release_mem_region(0xff600000, 0x4000);
-      exit:
+ exit:
        return -ENOMEM;
 }
diff --git a/arch/blackfin/mach-bf561/dma.c b/arch/blackfin/mach-bf561/dma.c
new file mode 100644
index 0000000000..89c65bb0be
--- /dev/null
+++ b/arch/blackfin/mach-bf561/dma.c
@@ -0,0 +1,131 @@
+/*
+ * File:         arch/blackfin/mach-bf561/dma.c
+ * Based on:
+ * Author:
+ *
+ * Created:
+ * Description:  This file contains the simple DMA Implementation for Blackfin
+ *
+ * Modified:
+ *               Copyright 2004-2007 Analog Devices Inc.
+ *
+ * Bugs:         Enter bugs at http://blackfin.uclinux.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see the file COPYING, or write
+ * to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <asm/blackfin.h>
+#include <asm/dma.h>
+struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = {
+        (struct dma_register *) DMA1_0_NEXT_DESC_PTR,
+        (struct dma_register *) DMA1_1_NEXT_DESC_PTR,
+        (struct dma_register *) DMA1_2_NEXT_DESC_PTR,
+        (struct dma_register *) DMA1_3_NEXT_DESC_PTR,
+        (struct dma_register *) DMA1_4_NEXT_DESC_PTR,
+        (struct dma_register *) DMA1_5_NEXT_DESC_PTR,
+        (struct dma_register *) DMA1_6_NEXT_DESC_PTR,
+        (struct dma_register *) DMA1_7_NEXT_DESC_PTR,
+        (struct dma_register *) DMA1_8_NEXT_DESC_PTR,
+        (struct dma_register *) DMA1_9_NEXT_DESC_PTR,
+        (struct dma_register *) DMA1_10_NEXT_DESC_PTR,
+        (struct dma_register *) DMA1_11_NEXT_DESC_PTR,
+        (struct dma_register *) DMA2_0_NEXT_DESC_PTR,
+        (struct dma_register *) DMA2_1_NEXT_DESC_PTR,
+        (struct dma_register *) DMA2_2_NEXT_DESC_PTR,
+        (struct dma_register *) DMA2_3_NEXT_DESC_PTR,
+        (struct dma_register *) DMA2_4_NEXT_DESC_PTR,
+        (struct dma_register *) DMA2_5_NEXT_DESC_PTR,
+        (struct dma_register *) DMA2_6_NEXT_DESC_PTR,
+        (struct dma_register *) DMA2_7_NEXT_DESC_PTR,
+        (struct dma_register *) DMA2_8_NEXT_DESC_PTR,
+        (struct dma_register *) DMA2_9_NEXT_DESC_PTR,
+        (struct dma_register *) DMA2_10_NEXT_DESC_PTR,
+        (struct dma_register *) DMA2_11_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA1_D0_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA1_S0_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA1_D1_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA1_S1_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA2_D0_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA2_S0_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA2_D1_NEXT_DESC_PTR,
+        (struct dma_register *) MDMA2_S1_NEXT_DESC_PTR,
+        (struct dma_register *) IMDMA_D0_NEXT_DESC_PTR,
+        (struct dma_register *) IMDMA_S0_NEXT_DESC_PTR,
+        (struct dma_register *) IMDMA_D1_NEXT_DESC_PTR,
+        (struct dma_register *) IMDMA_S1_NEXT_DESC_PTR,
+};
+int channel2irq(unsigned int channel)
+{
+        int ret_irq = -1;
+        switch (channel) {
+        case CH_PPI0:
+                ret_irq = IRQ_PPI0;
+                break;
+        case CH_PPI1:
+                ret_irq = IRQ_PPI1;
+                break;
+        case CH_SPORT0_RX:
+                ret_irq = IRQ_SPORT0_RX;
+                break;
+        case CH_SPORT0_TX:
+                ret_irq = IRQ_SPORT0_TX;
+                break;
+        case CH_SPORT1_RX:
+                ret_irq = IRQ_SPORT1_RX;
+                break;
+        case CH_SPORT1_TX:
+                ret_irq = IRQ_SPORT1_TX;
+                break;
+        case CH_SPI:
+                ret_irq = IRQ_SPI;
+                break;
+        case CH_UART_RX:
+                ret_irq = IRQ_UART_RX;
+                break;
+        case CH_UART_TX:
+                ret_irq = IRQ_UART_TX;
+                break;
+        case CH_MEM_STREAM0_SRC:
+        case CH_MEM_STREAM0_DEST:
+                ret_irq = IRQ_MEM_DMA0;
+                break;
+        case CH_MEM_STREAM1_SRC:
+        case CH_MEM_STREAM1_DEST:
+                ret_irq = IRQ_MEM_DMA1;
+                break;
+        case CH_MEM_STREAM2_SRC:
+        case CH_MEM_STREAM2_DEST:
+                ret_irq = IRQ_MEM_DMA2;
+                break;
+        case CH_MEM_STREAM3_SRC:
+        case CH_MEM_STREAM3_DEST:
+                ret_irq = IRQ_MEM_DMA3;
+                break;
+        case CH_IMEM_STREAM0_SRC:
+        case CH_IMEM_STREAM0_DEST:
+                ret_irq = IRQ_IMEM_DMA0;
+                break;
+        case CH_IMEM_STREAM1_SRC:
+        case CH_IMEM_STREAM1_DEST:
+                ret_irq = IRQ_IMEM_DMA1;
+                break;
+        }
+        return ret_irq;
+}
diff --git a/arch/blackfin/mach-bf561/head.S b/arch/blackfin/mach-bf561/head.S
index 31cbc75c85..2f08bcb2dd 100644
--- a/arch/blackfin/mach-bf561/head.S
+++ b/arch/blackfin/mach-bf561/head.S
@@ -30,6 +30,8 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/blackfin.h>
+#include <asm/trace.h>
 #if CONFIG_BFIN_KERNEL_CLOCK
 #include <asm/mach/mem_init.h>
 #endif
@@ -93,6 +95,10 @@ ENTRY(__start)
        M2 = r0;
        M3 = r0;
+        trace_buffer_start(p0,r0);
+        P0 = R1;
+        R0 = R1;
        /* Turn off the icache */
        p0.l = (IMEM_CONTROL & 0xFFFF);
        p0.h = (IMEM_CONTROL >> 16);
diff --git a/arch/blackfin/mach-bf561/ints-priority.c b/arch/blackfin/mach-bf561/ints-priority.c
index 86e3b0ee93..09b541b0f7 100644
--- a/arch/blackfin/mach-bf561/ints-priority.c
+++ b/arch/blackfin/mach-bf561/ints-priority.c
@@ -28,8 +28,8 @@
 */
 #include <linux/module.h>
+#include <linux/irq.h>
 #include <asm/blackfin.h>
-#include <asm/irq.h>
 void program_IAR(void)
 {
diff --git a/arch/blackfin/mach-common/Makefile b/arch/blackfin/mach-common/Makefile
index d3a49073d1..0279ede703 100644
--- a/arch/blackfin/mach-common/Makefile
+++ b/arch/blackfin/mach-common/Makefile
@@ -4,9 +4,9 @@
 obj-y := \
        cache.o cacheinit.o cplbhdlr.o cplbmgr.o entry.o \
-        interrupt.o lock.o dpmc.o irqpanic.o
+        interrupt.o lock.o irqpanic.o
 obj-$(CONFIG_CPLB_INFO)          += cplbinfo.o
 obj-$(CONFIG_BFIN_SINGLE_CORE)   += ints-priority-sc.o
 obj-$(CONFIG_BFIN_DUAL_CORE)     += ints-priority-dc.o
-obj-$(CONFIG_PM)                 += pm.o
+obj-$(CONFIG_PM)                 += pm.o dpmc.o
diff --git a/arch/blackfin/mach-common/cacheinit.S b/arch/blackfin/mach-common/cacheinit.S
index 7924a90d96..9d475623b7 100644
--- a/arch/blackfin/mach-common/cacheinit.S
+++ b/arch/blackfin/mach-common/cacheinit.S
@@ -38,104 +38,37 @@
 .text
+#ifdef ANOMALY_05000125
 #if defined(CONFIG_BLKFIN_CACHE)
-ENTRY(_bfin_icache_init)
+ENTRY(_bfin_write_IMEM_CONTROL)
-        /* Initialize Instruction CPLBS */
-        I0.L = (ICPLB_ADDR0 & 0xFFFF);
-        I0.H = (ICPLB_ADDR0 >> 16);
-        I1.L = (ICPLB_DATA0 & 0xFFFF);
-        I1.H = (ICPLB_DATA0 >> 16);
-        I2.L = _icplb_table;
-        I2.H = _icplb_table;
-        r1 = -1;        /* end point comparison */
-        r3 = 15;        /* max counter */
-/* read entries from table */
-.Lread_iaddr:
-        R0 = [I2++];
-        CC = R0 == R1;
-        IF CC JUMP .Lidone;
-        [I0++] = R0;
-.Lread_idata:
-        R2 = [I2++];
-        [I1++] = R2;
-        R3 = R3 + R1;
-        CC = R3 == R1;
-        IF !CC JUMP .Lread_iaddr;
-.Lidone:
        /* Enable Instruction Cache */
        P0.l = (IMEM_CONTROL & 0xFFFF);
        P0.h = (IMEM_CONTROL >> 16);
-        R1 = [P0];
-        R0 = (IMC | ENICPLB);
-        R0 = R0 | R1;
        /* Anomaly 05000125 */
-        CLI R2;
+        CLI R1;
        SSYNC;          /* SSYNC required before writing to IMEM_CONTROL. */
        .align 8;
        [P0] = R0;
        SSYNC;
-        STI R2;
+        STI R1;
        RTS;
-ENDPROC(_bfin_icache_init)
+ENDPROC(_bfin_write_IMEM_CONTROL)
 #endif
 #if defined(CONFIG_BLKFIN_DCACHE)
-ENTRY(_bfin_dcache_init)
+ENTRY(_bfin_write_DMEM_CONTROL)
+        CLI R1;
-        /* Initialize Data CPLBS */
-        I0.L = (DCPLB_ADDR0 & 0xFFFF);
-        I0.H = (DCPLB_ADDR0 >> 16);
-        I1.L = (DCPLB_DATA0 & 0xFFFF);
-        I1.H = (DCPLB_DATA0 >> 16);
-        I2.L = _dcplb_table;
-        I2.H = _dcplb_table;
-        R1 = -1;        /* end point comparison */
-        R3 = 15;        /* max counter */
-        /* read entries from table */
-.Lread_daddr:
-        R0 = [I2++];
-        cc = R0 == R1;
-        IF CC JUMP .Lddone;
-        [I0++] = R0;
-.Lread_ddata:
-        R2 = [I2++];
-        [I1++] = R2;
-        R3 = R3 + R1;
-        CC = R3 == R1;
-        IF !CC JUMP .Lread_daddr;
-.Lddone:
-        P0.L = (DMEM_CONTROL & 0xFFFF);
-        P0.H = (DMEM_CONTROL >> 16);
-        R1 = [P0];
-        R0 = DMEM_CNTR;
-        R0 = R0 | R1;
-        /* Anomaly 05000125 */
-        CLI R2;
        SSYNC;          /* SSYNC required before writing to DMEM_CONTROL. */
        .align 8;
        [P0] = R0;
        SSYNC;
-        STI R2;
+        STI R1;
        RTS;
-ENDPROC(_bfin_dcache_init)
+ENDPROC(_bfin_write_DMEM_CONTROL)
+#endif
 #endif
diff --git a/arch/blackfin/mach-common/cplbinfo.c b/arch/blackfin/mach-common/cplbinfo.c
index caa9623e6b..785ca98169 100644
--- a/arch/blackfin/mach-common/cplbinfo.c
+++ b/arch/blackfin/mach-common/cplbinfo.c
@@ -31,11 +31,10 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
+#include <linux/uaccess.h>
 #include <asm/current.h>
-#include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/cplb.h>
 #include <asm/blackfin.h>
@@ -92,8 +91,7 @@ static char *cplb_print_entry(char *buf, int type)
        } else
                buf += sprintf(buf, "Data CPLB entry:\n");
-        buf += sprintf(buf, "Address\t\tData\tSize\tValid\tLocked\tSwapin\
+        buf += sprintf(buf, "Address\t\tData\tSize\tValid\tLocked\tSwapin\n\tiCount\toCount\n");
-\tiCount\toCount\n");
        while (*p_addr != 0xffffffff) {
                entry = cplb_find_entry(cplb_addr, cplb_data, *p_addr, *p_data);
@@ -144,8 +142,7 @@ static int cplbinfo_proc_output(char *buf)
        p = buf;
-        p += sprintf(p,
+        p += sprintf(p, "------------------ CPLB Information ------------------\n\n");
-                     "------------------ CPLB Information ------------------\n\n");
        if (bfin_read_IMEM_CONTROL() & ENICPLB)
                p = cplb_print_entry(p, CPLB_I);
@@ -191,9 +188,9 @@ static int __init cplbinfo_init(void)
 {
        struct proc_dir_entry *entry;
-        if ((entry = create_proc_entry("cplbinfo", 0, NULL)) == NULL) {
+        entry = create_proc_entry("cplbinfo", 0, NULL);
+        if (!entry)
                return -ENOMEM;
-        }
        entry->read_proc = cplbinfo_read_proc;
        entry->write_proc = cplbinfo_write_proc;
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index 40045b1386..d61bba98fb 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
@@ -49,34 +49,15 @@
 #include <linux/linkage.h>
+#include <linux/unistd.h>
 #include <asm/blackfin.h>
-#include <asm/unistd.h>
 #include <asm/errno.h>
 #include <asm/thread_info.h>  /* TIF_NEED_RESCHED */
 #include <asm/asm-offsets.h>
+#include <asm/trace.h>
 #include <asm/mach-common/context.S>
-#ifdef CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE
-        /*
-         * TODO: this should be proper save/restore, but for now
-         * we'll just cheat and use 0x1/0x13
-         */
-# define DEBUG_START_HWTRACE \
-        P5.l = LO(TBUFCTL); \
-        P5.h = HI(TBUFCTL); \
-        R7 = 0x13; \
-        [P5] = R7;
-# define DEBUG_STOP_HWTRACE \
-        P5.l = LO(TBUFCTL); \
-        P5.h = HI(TBUFCTL); \
-        R7 = 0x01; \
-        [P5] = R7;
-#else
-# define DEBUG_START_HWTRACE
-# define DEBUG_STOP_HWTRACE
-#endif
 #ifdef CONFIG_EXCPT_IRQ_SYSC_L1
 .section .l1.text
 #else
@@ -110,25 +91,14 @@ ENTRY(_ex_icplb)
        ASTAT = [sp++];
        SAVE_ALL_SYS
        call __cplb_hdr;
-        DEBUG_START_HWTRACE
+        DEBUG_START_HWTRACE(p5, r7)
        RESTORE_ALL_SYS
        SP = RETN;
        rtx;
 ENDPROC(_ex_icplb)
-ENTRY(_ex_spinlock)
-        /* Transform this into a syscall - twiddle the syscall vector.  */
-        p5.l = lo(EVT15);
-        p5.h = hi(EVT15);
-        r7.l = _spinlock_bh;
-        r7.h = _spinlock_bh;
-        [p5] = r7;
-        csync;
-        /* Fall through.  */
-ENDPROC(_ex_spinlock)
 ENTRY(_ex_syscall)
-        DEBUG_START_HWTRACE
+        DEBUG_START_HWTRACE(p5, r7)
        (R7:6,P5:4) = [sp++];
        ASTAT = [sp++];
        raise 15;               /* invoked by TRAP #0, for sys call */
@@ -136,26 +106,6 @@ ENTRY(_ex_syscall)
        rtx
 ENDPROC(_ex_syscall)
-ENTRY(_spinlock_bh)
-        SAVE_ALL_SYS
-        /* To end up here, vector 15 was changed - so we have to change it
-         * back.
-         */
-        p0.l = lo(EVT15);
-        p0.h = hi(EVT15);
-        p1.l = _evt_system_call;
-        p1.h = _evt_system_call;
-        [p0] = p1;
-        csync;
-        r0 = [sp + PT_R0];
-        sp += -12;
-        call _sys_bfin_spinlock;
-        sp += 12;
-        [SP + PT_R0] = R0;
-        RESTORE_ALL_SYS
-        rti;
-ENDPROC(_spinlock_bh)
 ENTRY(_ex_soft_bp)
        r7 = retx;
        r7 += -2;
@@ -186,7 +136,7 @@ ENTRY(_ex_single_step)
        if !cc jump _ex_trap_c;
 _return_from_exception:
-        DEBUG_START_HWTRACE
+        DEBUG_START_HWTRACE(p5, r7)
 #ifdef ANOMALY_05000257
        R7=LC0;
        LC0=R7;
@@ -208,7 +158,7 @@ ENTRY(_handle_bad_cplb)
         * need to make a CPLB exception look like a normal exception
         */
-        DEBUG_START_HWTRACE
+        DEBUG_START_HWTRACE(p5, r7)
        RESTORE_ALL_SYS
        [--sp] = ASTAT;
        [--sp] = (R7:6, P5:4);
@@ -251,7 +201,7 @@ ENTRY(_ex_trap_c)
        R6 = SEQSTAT;
        [P5] = R6;
-        DEBUG_START_HWTRACE
+        DEBUG_START_HWTRACE(p5, r7)
        (R7:6,P5:4) = [sp++];
        ASTAT = [sp++];
        SP = RETN;
@@ -335,7 +285,7 @@ ENTRY(_trap) /* Exception: 4th entry into system event table(supervisor mode)*/
        /* Try to deal with syscalls quickly.  */
        [--sp] = ASTAT;
        [--sp] = (R7:6, P5:4);
-        DEBUG_STOP_HWTRACE
+        DEBUG_STOP_HWTRACE(p5, r7)
        r7 = SEQSTAT;           /* reason code is in bit 5:0 */
        r6.l = lo(SEQSTAT_EXCAUSE);
        r6.h = hi(SEQSTAT_EXCAUSE);
@@ -741,6 +691,10 @@ _schedule_and_signal_from_int:
        r0 = [p0];
        sti r0;
+        r0 = sp;
+        sp += -12;
+        call _finish_atomic_sections;
+        sp += 12;
        jump.s .Lresume_userspace;
 _schedule_and_signal:
@@ -790,14 +744,14 @@ ENDPROC(_init_exception_buff)
 ALIGN
 _extable:
        /* entry for each EXCAUSE[5:0]
-         * This table bmust be in sync with the table in ./kernel/traps.c
+         * This table must be in sync with the table in ./kernel/traps.c
         * EXCPT instruction can provide 4 bits of EXCAUSE, allowing 16 to be user defined
         */
        .long _ex_syscall;      /* 0x00 - User Defined - Linux Syscall */
        .long _ex_soft_bp       /* 0x01 - User Defined - Software breakpoint */
        .long _ex_trap_c        /* 0x02 - User Defined */
-        .long _ex_trap_c        /* 0x03 - User Defined  - Atomic test and set service */
+        .long _ex_trap_c        /* 0x03 - User Defined - userspace stack overflow */
-        .long _ex_spinlock      /* 0x04 - User Defined */
+        .long _ex_trap_c        /* 0x04 - User Defined */
        .long _ex_trap_c        /* 0x05 - User Defined */
        .long _ex_trap_c        /* 0x06 - User Defined */
        .long _ex_trap_c        /* 0x07 - User Defined */
diff --git a/arch/blackfin/mach-common/interrupt.S b/arch/blackfin/mach-common/interrupt.S
index 8be548e061..203e207091 100644
--- a/arch/blackfin/mach-common/interrupt.S
+++ b/arch/blackfin/mach-common/interrupt.S
@@ -34,6 +34,7 @@
 #include <linux/linkage.h>
 #include <asm/entry.h>
 #include <asm/asm-offsets.h>
+#include <asm/trace.h>
 #include <asm/mach-common/context.S>
@@ -170,10 +171,9 @@ ENTRY(_evt_ivhw)
        r7.l = W[p5];
 1:
 #endif
-        p0.l = lo(TBUFCTL);
-        p0.h = hi(TBUFCTL);
+        trace_buffer_stop(p0, r0);
-        r0 = 1;
-        [p0] = r0;
        r0 = IRQ_HWERR;
        r1 = sp;
diff --git a/arch/blackfin/mach-common/ints-priority-dc.c b/arch/blackfin/mach-common/ints-priority-dc.c
index 80943bbd37..6b9fd03ce8 100644
--- a/arch/blackfin/mach-common/ints-priority-dc.c
+++ b/arch/blackfin/mach-common/ints-priority-dc.c
@@ -183,7 +183,7 @@ static void bf561_gpio_ack_irq(unsigned int irq)
 {
        u16 gpionr = irq - IRQ_PF0;
-        if(gpio_edge_triggered[gpio_bank(gpionr)] & gpio_bit(gpionr)) {
+        if (gpio_edge_triggered[gpio_bank(gpionr)] & gpio_bit(gpionr)) {
                set_gpio_data(gpionr, 0);
                SSYNC();
        }
@@ -193,7 +193,7 @@ static void bf561_gpio_mask_ack_irq(unsigned int irq)
 {
        u16 gpionr = irq - IRQ_PF0;
-        if(gpio_edge_triggered[gpio_bank(gpionr)] & gpio_bit(gpionr)) {
+        if (gpio_edge_triggered[gpio_bank(gpionr)] & gpio_bit(gpionr)) {
                set_gpio_data(gpionr, 0);
                SSYNC();
        }
@@ -222,7 +222,7 @@ static unsigned int bf561_gpio_irq_startup(unsigned int irq)
        if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {
                ret = gpio_request(gpionr, NULL);
-                if(ret)
+                if (ret)
                        return ret;
        }
@@ -262,7 +262,7 @@ static int bf561_gpio_irq_type(unsigned int irq, unsigned int type)
                if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {
                        ret = gpio_request(gpionr, NULL);
-                        if(ret)
+                        if (ret)
                                return ret;
                }
@@ -371,6 +371,9 @@ int __init init_arch_irq(void)
        bfin_write_SICA_IMASK1(SIC_UNMASK_ALL);
        SSYNC();
+        bfin_write_SICA_IWR0(IWR_ENABLE_ALL);
+        bfin_write_SICA_IWR1(IWR_ENABLE_ALL);
        local_irq_disable();
        init_exception_buff();
@@ -393,7 +396,7 @@ int __init init_arch_irq(void)
        bfin_write_EVT15(evt_system_call);
        CSYNC();
-        for (irq = 0; irq < SYS_IRQS; irq++) {
+        for (irq = 0; irq <= SYS_IRQS; irq++) {
                if (irq <= IRQ_CORETMR)
                        set_irq_chip(irq, &bf561_core_irqchip);
                else
diff --git a/arch/blackfin/mach-common/ints-priority-sc.c b/arch/blackfin/mach-common/ints-priority-sc.c
index 2cfc7d5aec..28a878c357 100644
--- a/arch/blackfin/mach-common/ints-priority-sc.c
+++ b/arch/blackfin/mach-common/ints-priority-sc.c
@@ -13,7 +13,7 @@
 *               2002 Arcturus Networks Inc. MaTed <mated@sympatico.ca>
 *               2003 Metrowerks/Motorola
 *               2003 Bas Vermeulen <bas@buyways.nl>
- *               Copyright 2004-2006 Analog Devices Inc.
+ *               Copyright 2004-2007 Analog Devices Inc.
 *
 * Bugs:         Enter bugs at http://blackfin.uclinux.org/
 *
@@ -65,9 +65,9 @@ atomic_t num_spurious;
 struct ivgx {
        /* irq number for request_irq, available in mach-bf533/irq.h */
-        int irqno;
+        unsigned int irqno;
        /* corresponding bit in the SIC_ISR register */
-        int isrflag;
+        unsigned int isrflag;
 } ivg_table[NR_PERI_INTS];
 struct ivg_slice {
@@ -88,17 +88,16 @@ static void __init search_IAR(void)
        for (ivg = 0; ivg <= IVG13 - IVG7; ivg++) {
                int irqn;
-                ivg7_13[ivg].istop = ivg7_13[ivg].ifirst =
+                ivg7_13[ivg].istop = ivg7_13[ivg].ifirst = &ivg_table[irq_pos];
-                    &ivg_table[irq_pos];
                for (irqn = 0; irqn < NR_PERI_INTS; irqn++) {
                        int iar_shift = (irqn & 7) * 4;
                        if (ivg ==
                            (0xf &
-                             bfin_read32((unsigned long *) SIC_IAR0 +
+                             bfin_read32((unsigned long *)SIC_IAR0 +
                                         (irqn >> 3)) >> iar_shift)) {
                                ivg_table[irq_pos].irqno = IVG7 + irqn;
-                                ivg_table[irq_pos].isrflag = 1 << irqn;
+                                ivg_table[irq_pos].isrflag = 1 << (irqn % 32);
                                ivg7_13[ivg].istop++;
                                irq_pos++;
                        }
@@ -141,15 +140,31 @@ static void bfin_core_unmask_irq(unsigned int irq)
 static void bfin_internal_mask_irq(unsigned int irq)
 {
+#ifndef CONFIG_BF54x
        bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() &
                             ~(1 << (irq - (IRQ_CORETMR + 1))));
+#else
+        unsigned mask_bank, mask_bit;
+        mask_bank = (irq - (IRQ_CORETMR + 1)) / 32;
+        mask_bit = (irq - (IRQ_CORETMR + 1)) % 32;
+        bfin_write_SIC_IMASK(mask_bank, bfin_read_SIC_IMASK(mask_bank) &
+                             ~(1 << mask_bit));
+#endif
        SSYNC();
 }
 static void bfin_internal_unmask_irq(unsigned int irq)
 {
+#ifndef CONFIG_BF54x
        bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() |
                             (1 << (irq - (IRQ_CORETMR + 1))));
+#else
+        unsigned mask_bank, mask_bit;
+        mask_bank = (irq - (IRQ_CORETMR + 1)) / 32;
+        mask_bit = (irq - (IRQ_CORETMR + 1)) % 32;
+        bfin_write_SIC_IMASK(mask_bank, bfin_read_SIC_IMASK(mask_bank) |
+                             (1 << mask_bit));
+#endif
        SSYNC();
 }
@@ -206,7 +221,7 @@ static struct irq_chip bfin_generic_error_irqchip = {
 };
 static void bfin_demux_error_irq(unsigned int int_err_irq,
-                                  struct irq_desc *intb_desc)
+                                 struct irq_desc *intb_desc)
 {
        int irq = 0;
@@ -270,8 +285,8 @@ static void bfin_demux_error_irq(unsigned int int_err_irq,
                        }
                        pr_debug("IRQ %d:"
-                                " MASKED PERIPHERAL ERROR INTERRUPT ASSERTED\n",
+                                 " MASKED PERIPHERAL ERROR INTERRUPT ASSERTED\n",
-                                irq);
+                                 irq);
                }
        } else
                printk(KERN_ERR
@@ -279,11 +294,10 @@ static void bfin_demux_error_irq(unsigned int int_err_irq,
                       " INTERRUPT ASSERTED BUT NO SOURCE FOUND\n",
                       __FUNCTION__, __FILE__, __LINE__);
 }
 #endif                          /* BF537_GENERIC_ERROR_INT_DEMUX */
-#ifdef CONFIG_IRQCHIP_DEMUX_GPIO
+#if defined(CONFIG_IRQCHIP_DEMUX_GPIO) && !defined(CONFIG_BF54x)
 static unsigned short gpio_enabled[gpio_bank(MAX_BLACKFIN_GPIOS)];
 static unsigned short gpio_edge_triggered[gpio_bank(MAX_BLACKFIN_GPIOS)];
@@ -361,8 +375,7 @@ static int bfin_gpio_irq_type(unsigned int irq, unsigned int type)
        }
        if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING |
-                    IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))
+                    IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) {
-        {
                if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {
                        ret = gpio_request(gpionr, NULL);
                        if (ret)
@@ -407,7 +420,6 @@ static int bfin_gpio_irq_type(unsigned int irq, unsigned int type)
        return 0;
 }
 static struct irq_chip bfin_gpio_irqchip = {
        .ack = bfin_gpio_ack_irq,
        .mask = bfin_gpio_mask_irq,
@@ -419,20 +431,20 @@ static struct irq_chip bfin_gpio_irqchip = {
 };
 static void bfin_demux_gpio_irq(unsigned int intb_irq,
-                                 struct irq_desc *intb_desc)
+                                struct irq_desc *intb_desc)
 {
        u16 i;
+        struct irq_desc *desc;
-        for (i = 0; i < MAX_BLACKFIN_GPIOS; i+=16) {
+        for (i = 0; i < MAX_BLACKFIN_GPIOS; i += 16) {
                int irq = IRQ_PF0 + i;
                int flag_d = get_gpiop_data(i);
                int mask =
-                        flag_d & (gpio_enabled[gpio_bank(i)] &
+                    flag_d & (gpio_enabled[gpio_bank(i)] & get_gpiop_maska(i));
-                              get_gpiop_maska(i));
                while (mask) {
                        if (mask & 1) {
-                                struct irq_desc *desc = irq_desc + irq;
+                                desc = irq_desc + irq;
                                desc->handle_irq(irq, desc);
                        }
                        irq++;
@@ -441,6 +453,264 @@ static void bfin_demux_gpio_irq(unsigned int intb_irq,
        }
 }
+#else                           /* CONFIG_IRQCHIP_DEMUX_GPIO */
+#define NR_PINT_SYS_IRQS        4
+#define NR_PINT_BITS            32
+#define NR_PINTS                160
+#define IRQ_NOT_AVAIL           0xFF
+#define PINT_2_BANK(x)          ((x) >> 5)
+#define PINT_2_BIT(x)           ((x) & 0x1F)
+#define PINT_BIT(x)             (1 << (PINT_2_BIT(x)))
+static unsigned char irq2pint_lut[NR_PINTS];
+static unsigned char pint2irq_lut[NR_PINT_SYS_IRQS * NR_PINT_BITS];
+struct pin_int_t {
+        unsigned int mask_set;
+        unsigned int mask_clear;
+        unsigned int request;
+        unsigned int assign;
+        unsigned int edge_set;
+        unsigned int edge_clear;
+        unsigned int invert_set;
+        unsigned int invert_clear;
+        unsigned int pinstate;
+        unsigned int latch;
+};
+static struct pin_int_t *pint[NR_PINT_SYS_IRQS] = {
+        (struct pin_int_t *)PINT0_MASK_SET,
+        (struct pin_int_t *)PINT1_MASK_SET,
+        (struct pin_int_t *)PINT2_MASK_SET,
+        (struct pin_int_t *)PINT3_MASK_SET,
+};
+unsigned short get_irq_base(u8 bank, u8 bmap)
+{
+        u16 irq_base;
+        if (bank < 2) {         /*PA-PB */
+                irq_base = IRQ_PA0 + bmap * 16;
+        } else {                /*PC-PJ */
+                irq_base = IRQ_PC0 + bmap * 16;
+        }
+        return irq_base;
+}
+        /* Whenever PINTx_ASSIGN is altered init_pint_lut() must be executed! */
+void init_pint_lut(void)
+{
+        u16 bank, bit, irq_base, bit_pos;
+        u32 pint_assign;
+        u8 bmap;
+        memset(irq2pint_lut, IRQ_NOT_AVAIL, sizeof(irq2pint_lut));
+        for (bank = 0; bank < NR_PINT_SYS_IRQS; bank++) {
+                pint_assign = pint[bank]->assign;
+                for (bit = 0; bit < NR_PINT_BITS; bit++) {
+                        bmap = (pint_assign >> ((bit / 8) * 8)) & 0xFF;
+                        irq_base = get_irq_base(bank, bmap);
+                        irq_base += (bit % 8) + ((bit / 8) & 1 ? 8 : 0);
+                        bit_pos = bit + bank * NR_PINT_BITS;
+                        pint2irq_lut[bit_pos] = irq_base - SYS_IRQS;
+                        irq2pint_lut[irq_base - SYS_IRQS] = bit_pos;
+                }
+        }
+}
+static unsigned short gpio_enabled[gpio_bank(MAX_BLACKFIN_GPIOS)];
+static void bfin_gpio_ack_irq(unsigned int irq)
+{
+        u8 pint_val = irq2pint_lut[irq - SYS_IRQS];
+        pint[PINT_2_BANK(pint_val)]->request = PINT_BIT(pint_val);
+        SSYNC();
+}
+static void bfin_gpio_mask_ack_irq(unsigned int irq)
+{
+        u8 pint_val = irq2pint_lut[irq - SYS_IRQS];
+        u32 pintbit = PINT_BIT(pint_val);
+        u8 bank = PINT_2_BANK(pint_val);
+        pint[bank]->request = pintbit;
+        pint[bank]->mask_clear = pintbit;
+        SSYNC();
+}
+static void bfin_gpio_mask_irq(unsigned int irq)
+{
+        u8 pint_val = irq2pint_lut[irq - SYS_IRQS];
+        pint[PINT_2_BANK(pint_val)]->mask_clear = PINT_BIT(pint_val);
+        SSYNC();
+}
+static void bfin_gpio_unmask_irq(unsigned int irq)
+{
+        u8 pint_val = irq2pint_lut[irq - SYS_IRQS];
+        u32 pintbit = PINT_BIT(pint_val);
+        u8 bank = PINT_2_BANK(pint_val);
+        pint[bank]->request = pintbit;
+        pint[bank]->mask_set = pintbit;
+        SSYNC();
+}
+static unsigned int bfin_gpio_irq_startup(unsigned int irq)
+{
+        unsigned int ret;
+        u16 gpionr = irq - IRQ_PA0;
+        u8 pint_val = irq2pint_lut[irq - SYS_IRQS];
+        if (pint_val == IRQ_NOT_AVAIL)
+                return -ENODEV;
+        if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {
+                ret = gpio_request(gpionr, NULL);
+                if (ret)
+                        return ret;
+        }
+        gpio_enabled[gpio_bank(gpionr)] |= gpio_bit(gpionr);
+        bfin_gpio_unmask_irq(irq);
+        return ret;
+}
+static void bfin_gpio_irq_shutdown(unsigned int irq)
+{
+        bfin_gpio_mask_irq(irq);
+        gpio_free(irq - IRQ_PA0);
+        gpio_enabled[gpio_bank(irq - IRQ_PA0)] &= ~gpio_bit(irq - IRQ_PA0);
+}
+static int bfin_gpio_irq_type(unsigned int irq, unsigned int type)
+{
+        unsigned int ret;
+        u16 gpionr = irq - IRQ_PA0;
+        u8 pint_val = irq2pint_lut[irq - SYS_IRQS];
+        u32 pintbit = PINT_BIT(pint_val);
+        u8 bank = PINT_2_BANK(pint_val);
+        if (pint_val == IRQ_NOT_AVAIL)
+                return -ENODEV;
+        if (type == IRQ_TYPE_PROBE) {
+                /* only probe unenabled GPIO interrupt lines */
+                if (gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))
+                        return 0;
+                type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;
+        }
+        if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING |
+                    IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) {
+                if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {
+                        ret = gpio_request(gpionr, NULL);
+                        if (ret)
+                                return ret;
+                }
+                gpio_enabled[gpio_bank(gpionr)] |= gpio_bit(gpionr);
+        } else {
+                gpio_enabled[gpio_bank(gpionr)] &= ~gpio_bit(gpionr);
+                return 0;
+        }
+        gpio_direction_input(gpionr);
+        if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING)) {
+                pint[bank]->edge_set = pintbit;
+        } else {
+                pint[bank]->edge_clear = pintbit;
+        }
+        if ((type & (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_LEVEL_LOW)))
+                pint[bank]->invert_set = pintbit;       /* low or falling edge denoted by one */
+        else
+                pint[bank]->invert_set = pintbit;       /* high or rising edge denoted by zero */
+        if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING))
+                pint[bank]->invert_set = pintbit;
+        else
+                pint[bank]->invert_set = pintbit;
+        SSYNC();
+        if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING))
+                set_irq_handler(irq, handle_edge_irq);
+        else
+                set_irq_handler(irq, handle_level_irq);
+        return 0;
+}
+static struct irq_chip bfin_gpio_irqchip = {
+        .ack = bfin_gpio_ack_irq,
+        .mask = bfin_gpio_mask_irq,
+        .mask_ack = bfin_gpio_mask_ack_irq,
+        .unmask = bfin_gpio_unmask_irq,
+        .set_type = bfin_gpio_irq_type,
+        .startup = bfin_gpio_irq_startup,
+        .shutdown = bfin_gpio_irq_shutdown
+};
+static void bfin_demux_gpio_irq(unsigned int intb_irq,
+                                struct irq_desc *intb_desc)
+{
+        u8 bank, pint_val;
+        u32 request, irq;
+        struct irq_desc *desc;
+        switch (intb_irq) {
+        case IRQ_PINT0:
+                bank = 0;
+                break;
+        case IRQ_PINT2:
+                bank = 2;
+                break;
+        case IRQ_PINT3:
+                bank = 3;
+                break;
+        case IRQ_PINT1:
+                bank = 1;
+                break;
+        default:
+                return;
+        }
+        pint_val = bank * NR_PINT_BITS;
+        request = pint[bank]->request;
+        while (request) {
+                if (request & 1) {
+                        irq = pint2irq_lut[pint_val] + SYS_IRQS;
+                        desc = irq_desc + irq;
+                        desc->handle_irq(irq, desc);
+                }
+                pint_val++;
+                request >>= 1;
+        }
+}
 #endif                          /* CONFIG_IRQCHIP_DEMUX_GPIO */
 /*
@@ -452,7 +722,18 @@ int __init init_arch_irq(void)
        int irq;
        unsigned long ilat = 0;
        /*  Disable all the peripheral intrs  - page 4-29 HW Ref manual */
+#ifdef CONFIG_BF54x
+        bfin_write_SIC_IMASK0(SIC_UNMASK_ALL);
+        bfin_write_SIC_IMASK1(SIC_UNMASK_ALL);
+        bfin_write_SIC_IMASK2(SIC_UNMASK_ALL);
+        bfin_write_SIC_IWR0(IWR_ENABLE_ALL);
+        bfin_write_SIC_IWR1(IWR_ENABLE_ALL);
+        bfin_write_SIC_IWR2(IWR_ENABLE_ALL);
+#else
        bfin_write_SIC_IMASK(SIC_UNMASK_ALL);
+        bfin_write_SIC_IWR(IWR_ENABLE_ALL);
+#endif
        SSYNC();
        local_irq_disable();
@@ -475,7 +756,18 @@ int __init init_arch_irq(void)
        bfin_write_EVT15(evt_system_call);
        CSYNC();
-        for (irq = 0; irq < SYS_IRQS; irq++) {
+#if defined(CONFIG_IRQCHIP_DEMUX_GPIO) && defined(CONFIG_BF54x)
+#ifdef CONFIG_PINTx_REASSIGN
+        pint[0]->assign = CONFIG_PINT0_ASSIGN;
+        pint[1]->assign = CONFIG_PINT1_ASSIGN;
+        pint[2]->assign = CONFIG_PINT2_ASSIGN;
+        pint[3]->assign = CONFIG_PINT3_ASSIGN;
+#endif
+        /* Whenever PINTx_ASSIGN is altered init_pint_lut() must be executed! */
+        init_pint_lut();
+#endif
+        for (irq = 0; irq <= SYS_IRQS; irq++) {
                if (irq <= IRQ_CORETMR)
                        set_irq_chip(irq, &bfin_core_irqchip);
                else
@@ -484,20 +776,42 @@ int __init init_arch_irq(void)
                if (irq != IRQ_GENERIC_ERROR) {
 #endif
+                        switch (irq) {
 #ifdef CONFIG_IRQCHIP_DEMUX_GPIO
-                        if ((irq != IRQ_PROG_INTA) /*PORT F & G MASK_A Interrupt*/
+#ifndef CONFIG_BF54x
-# if defined(BF537_FAMILY) && !(defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE))
+                        case IRQ_PROG_INTA:
-                                && (irq != IRQ_MAC_RX) /*PORT H MASK_A Interrupt*/
+                                set_irq_chained_handler(irq,
-# endif
+                                                        bfin_demux_gpio_irq);
-                            ) {
+                                break;
+#if defined(BF537_FAMILY) && !(defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE))
+                        case IRQ_MAC_RX:
+                                set_irq_chained_handler(irq,
+                                                        bfin_demux_gpio_irq);
+                                break;
 #endif
-                                set_irq_handler(irq, handle_simple_irq);
+#else
-#ifdef CONFIG_IRQCHIP_DEMUX_GPIO
+                        case IRQ_PINT0:
-                        } else {
                                set_irq_chained_handler(irq,
                                                        bfin_demux_gpio_irq);
-                        }
+                                break;
+                        case IRQ_PINT1:
+                                set_irq_chained_handler(irq,
+                                                        bfin_demux_gpio_irq);
+                                break;
+                        case IRQ_PINT2:
+                                set_irq_chained_handler(irq,
+                                                        bfin_demux_gpio_irq);
+                                break;
+                        case IRQ_PINT3:
+                                set_irq_chained_handler(irq,
+                                                        bfin_demux_gpio_irq);
+                                break;
+#endif                          /*CONFIG_BF54x */
 #endif
+                        default:
+                                set_irq_handler(irq, handle_simple_irq);
+                                break;
+                        }
 #ifdef BF537_GENERIC_ERROR_INT_DEMUX
                } else {
@@ -513,7 +827,11 @@ int __init init_arch_irq(void)
 #endif
 #ifdef CONFIG_IRQCHIP_DEMUX_GPIO
+#ifndef CONFIG_BF54x
        for (irq = IRQ_PF0; irq < NR_IRQS; irq++) {
+#else
+        for (irq = IRQ_PA0; irq < NR_IRQS; irq++) {
+#endif
                set_irq_chip(irq, &bfin_gpio_irqchip);
                /* if configured as edge, then will be changed to do_edge_IRQ */
                set_irq_handler(irq, handle_level_irq);
@@ -526,8 +844,7 @@ int __init init_arch_irq(void)
        bfin_write_ILAT(ilat);
        CSYNC();
-        printk(KERN_INFO
+        printk(KERN_INFO "Configuring Blackfin Priority Driven Interrupts\n");
-               "Configuring Blackfin Priority Driven Interrupts\n");
        /* IMASK=xxx is equivalent to STI xx or irq_flags=xx,
         * local_irq_enable()
         */
@@ -538,14 +855,13 @@ int __init init_arch_irq(void)
        /* Enable interrupts IVG7-15 */
        irq_flags = irq_flags | IMASK_IVG15 |
            IMASK_IVG14 | IMASK_IVG13 | IMASK_IVG12 | IMASK_IVG11 |
-            IMASK_IVG10 | IMASK_IVG9 | IMASK_IVG8 | IMASK_IVG7 |
+            IMASK_IVG10 | IMASK_IVG9 | IMASK_IVG8 | IMASK_IVG7 | IMASK_IVGHW;
-            IMASK_IVGHW;
        return 0;
 }
 #ifdef CONFIG_DO_IRQ_L1
-void do_irq(int vec, struct pt_regs *fp)__attribute__((l1_text));
+void do_irq(int vec, struct pt_regs *fp) __attribute__((l1_text));
 #endif
 void do_irq(int vec, struct pt_regs *fp)
@@ -555,9 +871,25 @@ void do_irq(int vec, struct pt_regs *fp)
        } else {
                struct ivgx *ivg = ivg7_13[vec - IVG7].ifirst;
                struct ivgx *ivg_stop = ivg7_13[vec - IVG7].istop;
-                unsigned long sic_status;
+#ifdef CONFIG_BF54x
+                unsigned long sic_status[3];
                SSYNC();
+                sic_status[0] = bfin_read_SIC_ISR(0) & bfin_read_SIC_IMASK(0);
+                sic_status[1] = bfin_read_SIC_ISR(1) & bfin_read_SIC_IMASK(1);
+                sic_status[2] = bfin_read_SIC_ISR(2) & bfin_read_SIC_IMASK(2);
+                for (;; ivg++) {
+                        if (ivg >= ivg_stop) {
+                                atomic_inc(&num_spurious);
+                                return;
+                        }
+                        if (sic_status[(ivg->irqno - IVG7) / 32] & ivg->isrflag)
+                                break;
+                }
+#else
+                unsigned long sic_status;
+                SSYNC();
                sic_status = bfin_read_SIC_IMASK() & bfin_read_SIC_ISR();
                for (;; ivg++) {
@@ -567,6 +899,7 @@ void do_irq(int vec, struct pt_regs *fp)
                        } else if (sic_status & ivg->isrflag)
                                break;
                }
+#endif
                vec = ivg->irqno;
        }
        asm_do_IRQ(vec, fp);
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
index 150ef5d088..1772d8d2c1 100644
--- a/arch/blackfin/mach-common/pm.c
+++ b/arch/blackfin/mach-common/pm.c
@@ -35,10 +35,10 @@
 #include <linux/pm.h>
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
+#include <linux/io.h>
+#include <linux/irq.h>
-#include <asm/io.h>
 #include <asm/dpmc.h>
-#include <asm/irq.h>
 #include <asm/gpio.h>
 #ifdef CONFIG_PM_WAKEUP_GPIO_POLAR_H
diff --git a/arch/blackfin/mm/blackfin_sram.c b/arch/blackfin/mm/blackfin_sram.c
index 6810792463..16c6169ed0 100644
--- a/arch/blackfin/mm/blackfin_sram.c
+++ b/arch/blackfin/mm/blackfin_sram.c
@@ -87,7 +87,7 @@ void __init l1sram_init(void)
               L1_SCRATCH_LENGTH >> 10);
        memset(&l1_ssram, 0x00, sizeof(l1_ssram));
-        l1_ssram[0].paddr = (void*)L1_SCRATCH_START;
+        l1_ssram[0].paddr = (void *)L1_SCRATCH_START;
        l1_ssram[0].size = L1_SCRATCH_LENGTH;
        l1_ssram[0].flag = SRAM_SLT_FREE;
@@ -126,7 +126,7 @@ void __init l1_inst_sram_init(void)
 {
 #if L1_CODE_LENGTH != 0
        memset(&l1_inst_sram, 0x00, sizeof(l1_inst_sram));
-        l1_inst_sram[0].paddr = (void*)L1_CODE_START + (_etext_l1 - _stext_l1);
+        l1_inst_sram[0].paddr = (void *)L1_CODE_START + (_etext_l1 - _stext_l1);
        l1_inst_sram[0].size = L1_CODE_LENGTH - (_etext_l1 - _stext_l1);
        l1_inst_sram[0].flag = SRAM_SLT_FREE;
diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c
index 570356dbe0..68459cc052 100644
--- a/arch/blackfin/mm/init.c
+++ b/arch/blackfin/mm/init.c
@@ -29,8 +29,8 @@
 #include <linux/swap.h>
 #include <linux/bootmem.h>
+#include <linux/uaccess.h>
 #include <asm/bfin-global.h>
-#include <asm/uaccess.h>
 #include <asm/l1layout.h>
 #include "blackfin_sram.h"
@@ -168,42 +168,31 @@ void __init mem_init(void)
        }
 }
-#ifdef CONFIG_BLK_DEV_INITRD
+static __init void free_init_pages(const char *what, unsigned long begin, unsigned long end)
-void __init free_initrd_mem(unsigned long start, unsigned long end)
 {
-        int pages = 0;
+        unsigned long addr;
-        for (; start < end; start += PAGE_SIZE) {
+        /* next to check that the page we free is not a partial page */
-                ClearPageReserved(virt_to_page(start));
+        for (addr = begin; addr + PAGE_SIZE <= end; addr += PAGE_SIZE) {
-                init_page_count(virt_to_page(start));
+                ClearPageReserved(virt_to_page(addr));
-                free_page(start);
+                init_page_count(virt_to_page(addr));
+                free_page(addr);
                totalram_pages++;
-                pages++;
        }
-        printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
+        printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
+}
+#ifdef CONFIG_BLK_DEV_INITRD
+void __init free_initrd_mem(unsigned long start, unsigned long end)
+{
+        free_init_pages("initrd memory", start, end);
 }
 #endif
 void __init free_initmem(void)
 {
 #ifdef CONFIG_RAMKERNEL
-        unsigned long addr;
+        free_init_pages("unused kernel memory",
-        /*
+                        (unsigned long)(&__init_begin),
-         *      the following code should be cool even if these sections
+                        (unsigned long)(&__init_end));
-         *      are not page aligned.
-         */
-        addr = PAGE_ALIGN((unsigned long)(__init_begin));
-        /* next to check that the page we free is not a partial page */
-        for (; addr + PAGE_SIZE < (unsigned long)(__init_end);
-             addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                free_page(addr);
-                totalram_pages++;
-        }
-        printk(KERN_NOTICE
-               "Freeing unused kernel memory: %ldk freed (0x%x - 0x%x)\n",
-               (addr - PAGE_ALIGN((long)__init_begin)) >> 10,
-               (int)(PAGE_ALIGN((unsigned long)(__init_begin))),
-               (int)(addr - PAGE_SIZE));
 #endif
 }
diff --git a/arch/blackfin/oprofile/common.c b/arch/blackfin/oprofile/common.c
index 009a1700c8..cb8b8d5af3 100644
--- a/arch/blackfin/oprofile/common.c
+++ b/arch/blackfin/oprofile/common.c
@@ -33,12 +33,12 @@
 #include <linux/smp.h>
 #include <linux/errno.h>
 #include <linux/mutex.h>
+#include <linux/ptrace.h>
+#include <linux/irq.h>
+#include <linux/io.h>
-#include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/blackfin.h>
-#include <asm/irq.h>
-#include <asm/io.h>
 #include "op_blackfin.h"
diff --git a/arch/blackfin/oprofile/op_model_bf533.c b/arch/blackfin/oprofile/op_model_bf533.c
index b7a20a006b..872dffe336 100644
--- a/arch/blackfin/oprofile/op_model_bf533.c
+++ b/arch/blackfin/oprofile/op_model_bf533.c
@@ -32,12 +32,12 @@
 #include <linux/init.h>
 #include <linux/smp.h>
 #include <linux/interrupt.h>
-#include <asm/ptrace.h>
+#include <linux/ptrace.h>
+#include <linux/irq.h>
+#include <linux/io.h>
 #include <asm/system.h>
 #include <asm/processor.h>
 #include <asm/blackfin.h>
-#include <asm/irq.h>
-#include <asm/io.h>
 #include "op_blackfin.h"
diff --git a/arch/blackfin/oprofile/timer_int.c b/arch/blackfin/oprofile/timer_int.c
index 8fba16c846..6c6f8606af 100644
--- a/arch/blackfin/oprofile/timer_int.c
+++ b/arch/blackfin/oprofile/timer_int.c
@@ -31,8 +31,7 @@
 #include <linux/smp.h>
 #include <linux/irq.h>
 #include <linux/oprofile.h>
+#include <linux/ptrace.h>
-#include <asm/ptrace.h>
 static void enable_sys_timer0()
 {
diff --git a/arch/cris/arch-v10/defconfig b/arch/cris/arch-v10/defconfig
index 2a3411eaac..710c20ba2b 100644
--- a/arch/cris/arch-v10/defconfig
+++ b/arch/cris/arch-v10/defconfig
@@ -429,7 +429,6 @@ CONFIG_NET_ETHERNET=y
 # CONFIG_BFS_FS is not set
 # CONFIG_FAT_FS is not set
 # CONFIG_MSDOS_FS is not set
-# CONFIG_UMSDOS_FS is not set
 # CONFIG_VFAT_FS is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS_FS is not set
diff --git a/arch/cris/arch-v10/kernel/ptrace.c b/arch/cris/arch-v10/kernel/ptrace.c
index fd2129a045..f4f9db698b 100644
--- a/arch/cris/arch-v10/kernel/ptrace.c
+++ b/arch/cris/arch-v10/kernel/ptrace.c
@@ -83,19 +83,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        switch (request) {
                /* Read word at location address. */ 
                case PTRACE_PEEKTEXT:
-                case PTRACE_PEEKDATA: {
+                case PTRACE_PEEKDATA:
-                        unsigned long tmp;
+                        ret = generic_ptrace_peekdata(child, addr, data);
-                        int copied;
-                        copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
-                        ret = -EIO;
-                        
-                        if (copied != sizeof(tmp))
-                                break;
-                        
-                        ret = put_user(tmp,datap);
                        break;
-                }
                /* Read the word at location address in the USER area. */
                case PTRACE_PEEKUSR: {
@@ -113,12 +103,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                /* Write the word at location address. */
                case PTRACE_POKETEXT:
                case PTRACE_POKEDATA:
-                        ret = 0;
+                        ret = generic_ptrace_pokedata(child, addr, data);
-                        
-                        if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data))
-                                break;
-                        
-                        ret = -EIO;
                        break;
 
                /* Write the word at location address in the USER area. */
diff --git a/arch/cris/arch-v32/drivers/cryptocop.c b/arch/cris/arch-v32/drivers/cryptocop.c
index 1a071f1744..e8914d4016 100644
--- a/arch/cris/arch-v32/drivers/cryptocop.c
+++ b/arch/cris/arch-v32/drivers/cryptocop.c
@@ -267,10 +267,10 @@ static void print_user_dma_lists(struct cryptocop_dma_list_operation *dma_op);
 const struct file_operations cryptocop_fops = {
-        owner: THIS_MODULE,
+        .owner =        THIS_MODULE,
-        open: cryptocop_open,
+        .open =         cryptocop_open,
-        release: cryptocop_release,
+        .release =      cryptocop_release,
-        ioctl: cryptocop_ioctl
+        .ioctl =        cryptocop_ioctl
 };
diff --git a/arch/cris/arch-v32/drivers/i2c.c b/arch/cris/arch-v32/drivers/i2c.c
index 5d6c52737d..e12f6cc6f4 100644
--- a/arch/cris/arch-v32/drivers/i2c.c
+++ b/arch/cris/arch-v32/drivers/i2c.c
@@ -574,10 +574,10 @@ i2c_ioctl(struct inode *inode, struct file *file,
 }
 static const struct file_operations i2c_fops = {
-        owner:    THIS_MODULE,
+        .owner =    THIS_MODULE,
-        ioctl:    i2c_ioctl,
+        .ioctl =    i2c_ioctl,
-        open:     i2c_open,
+        .open =     i2c_open,
-        release:  i2c_release,
+        .release =  i2c_release,
 };
 int __init
diff --git a/arch/cris/arch-v32/drivers/pcf8563.c b/arch/cris/arch-v32/drivers/pcf8563.c
index 24b919b382..fa8d50007e 100644
--- a/arch/cris/arch-v32/drivers/pcf8563.c
+++ b/arch/cris/arch-v32/drivers/pcf8563.c
@@ -51,10 +51,10 @@ int pcf8563_open(struct inode *, struct file *);
 int pcf8563_release(struct inode *, struct file *);
 static const struct file_operations pcf8563_fops = {
-        owner: THIS_MODULE,
+        .owner =        THIS_MODULE,
-        ioctl: pcf8563_ioctl,
+        .ioctl =        pcf8563_ioctl,
-        open: pcf8563_open,
+        .open =         pcf8563_open,
-        release: pcf8563_release,
+        .release =      pcf8563_release,
 };
 unsigned char
diff --git a/arch/cris/arch-v32/kernel/ptrace.c b/arch/cris/arch-v32/kernel/ptrace.c
index d4d57b7413..38ece0cd47 100644
--- a/arch/cris/arch-v32/kernel/ptrace.c
+++ b/arch/cris/arch-v32/kernel/ptrace.c
@@ -146,12 +146,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                /* Write the word at location address. */
                case PTRACE_POKETEXT:
                case PTRACE_POKEDATA:
-                        ret = 0;
+                        ret = generic_ptrace_pokedata(child, addr, data);
-                        if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data))
-                                break;
-                        ret = -EIO;
                        break;
                /* Write the word at location address in the USER area. */
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S
index 43dc08ec75..275673c192 100644
--- a/arch/frv/kernel/entry.S
+++ b/arch/frv/kernel/entry.S
@@ -1492,6 +1492,10 @@ sys_call_table:
        .long sys_move_pages
        .long sys_getcpu
        .long sys_epoll_pwait
+        .long sys_utimensat             /* 320 */
+        .long sys_signalfd
+        .long sys_timerfd
+        .long sys_eventfd
 syscall_table_size = (. - sys_call_table)
diff --git a/arch/frv/kernel/gdb-stub.c b/arch/frv/kernel/gdb-stub.c
index 1e7a101cbf..e89cad1192 100644
--- a/arch/frv/kernel/gdb-stub.c
+++ b/arch/frv/kernel/gdb-stub.c
@@ -647,17 +647,11 @@ void debug_to_serial(const char *p, int n)
 }
 #endif
-#ifdef CONFIG_GDBSTUB_CONSOLE
+#ifdef CONFIG_GDB_CONSOLE
-static kdev_t gdbstub_console_dev(struct console *con)
-{
-        return MKDEV(1,3); /* /dev/null */
-}
 static struct console gdbstub_console = {
        .name   = "gdb",
        .write  = gdbstub_console_write,        /* in break.S */
-        .device = gdbstub_console_dev,
        .flags  = CON_PRINTBUFFER,
        .index  = -1,
 };
@@ -2021,7 +2015,7 @@ void __init gdbstub_init(void)
        ptr = mem2hex(gdbstub_banner, ptr, sizeof(gdbstub_banner) - 1, 0);
        gdbstub_send_packet(output_buffer);
 #endif
-#if defined(CONFIG_GDBSTUB_CONSOLE) && defined(CONFIG_GDBSTUB_IMMEDIATE)
+#if defined(CONFIG_GDB_CONSOLE) && defined(CONFIG_GDBSTUB_IMMEDIATE)
        register_console(&gdbstub_console);
 #endif
@@ -2031,7 +2025,7 @@ void __init gdbstub_init(void)
 /*
 * register the console at a more appropriate time
 */
-#if defined (CONFIG_GDBSTUB_CONSOLE) && !defined(CONFIG_GDBSTUB_IMMEDIATE)
+#if defined (CONFIG_GDB_CONSOLE) && !defined(CONFIG_GDBSTUB_IMMEDIATE)
 static int __init gdbstub_postinit(void)
 {
        printk("registering console\n");
diff --git a/arch/frv/kernel/ptrace.c b/arch/frv/kernel/ptrace.c
index ce88fb95ee..709e9bdc61 100644
--- a/arch/frv/kernel/ptrace.c
+++ b/arch/frv/kernel/ptrace.c
@@ -112,20 +112,12 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        switch (request) {
                /* when I and D space are separate, these will need to be fixed. */
        case PTRACE_PEEKTEXT: /* read word at location addr. */
-        case PTRACE_PEEKDATA: {
+        case PTRACE_PEEKDATA:
-                int copied;
                ret = -EIO;
                if (is_user_addr_valid(child, addr, sizeof(tmp)) < 0)
                        break;
+                ret = generic_ptrace_peekdata(child, addr, data);
-                copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
-                if (copied != sizeof(tmp))
-                        break;
-                ret = put_user(tmp,(unsigned long *) data);
                break;
-        }
                /* read the word at location addr in the USER area. */
        case PTRACE_PEEKUSR: {
@@ -176,9 +168,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                ret = -EIO;
                if (is_user_addr_valid(child, addr, sizeof(tmp)) < 0)
                        break;
-                if (access_process_vm(child, addr, &data, sizeof(data), 1) != sizeof(data))
+                ret = generic_ptrace_pokedata(child, addr, data);
-                        break;
-                ret = 0;
                break;
        case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
index aa3c795d53..a74c08786b 100644
--- a/arch/frv/kernel/setup.c
+++ b/arch/frv/kernel/setup.c
@@ -29,6 +29,7 @@
 #include <linux/serial.h>
 #include <linux/serial_core.h>
 #include <linux/serial_reg.h>
+#include <linux/serial_8250.h>
 #include <asm/setup.h>
 #include <asm/irq.h>
@@ -60,10 +61,6 @@ static void __init setup_linux_memory(void);
 static void __init setup_uclinux_memory(void);
 #endif
-#ifdef CONFIG_CONSOLE
-extern struct consw *conswitchp;
-#endif
 #ifdef CONFIG_MB93090_MB00
 static char __initdata mb93090_banner[] = "FJ/RH FR-V Linux";
 static char __initdata mb93090_version[] = UTS_RELEASE;
@@ -795,13 +792,6 @@ void __init setup_arch(char **cmdline_p)
 #endif
 #endif
-#if defined(CONFIG_CHR_DEV_FLASH) || defined(CONFIG_BLK_DEV_FLASH)
-        /* we need to initialize the Flashrom device here since we might
-         * do things with flash early on in the boot
-         */
-        flash_probe();
-#endif
        /* deal with the command line - RedBoot may have passed one to the kernel */
        memcpy(command_line, boot_command_line, sizeof(command_line));
        *cmdline_p = &command_line[0];
@@ -837,11 +827,6 @@ void __init setup_arch(char **cmdline_p)
 #endif
 #endif
-#ifdef CONFIG_BLK_DEV_BLKMEM
-        ROOT_DEV = MKDEV(BLKMEM_MAJOR,0);
-#endif
-        /*rom_length = (unsigned long)&_flashend - (unsigned long)&_romvec;*/
 #ifdef CONFIG_MMU
        setup_linux_memory();
 #else
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 618dbad696..e35f74e6e5 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -68,6 +68,9 @@ config TIME_LOW_RES
 config NO_IOPORT
        def_bool y
+config NO_DMA
+        def_bool y
 config ISA
        bool
        default y
diff --git a/arch/h8300/Makefile b/arch/h8300/Makefile
index b2d896a7e5..53b5c1edf5 100644
--- a/arch/h8300/Makefile
+++ b/arch/h8300/Makefile
@@ -61,10 +61,11 @@ archmrproper:
 archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
-vmlinux.srec vmlinux.bin: vmlinux
+vmlinux.srec vmlinux.bin zImage: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 define archhelp
-  echo  'vmlinux.bin  - Create raw binary'
+  @echo  'vmlinux.bin  - Create raw binary'
-  echo  'vmlinux.srec - Create srec binary'
+  @echo  'vmlinux.srec - Create srec binary'
+  @echo  'zImage       - Compressed kernel image'
 endef
diff --git a/arch/h8300/boot/compressed/Makefile b/arch/h8300/boot/compressed/Makefile
index 71aac82a8a..d6189e057e 100644
--- a/arch/h8300/boot/compressed/Makefile
+++ b/arch/h8300/boot/compressed/Makefile
@@ -15,10 +15,10 @@ OBJECTS = $(obj)/head.o $(obj)/misc.o
 # in order to suppress error message.
 #
 CONFIG_MEMORY_START     ?= 0x00400000
-CONFIG_BOOT_LINK_OFFSET ?= 0x00400000
+CONFIG_BOOT_LINK_OFFSET ?= 0x00140000
 IMAGE_OFFSET := $(shell printf "0x%08x" $$[$(CONFIG_MEMORY_START)+$(CONFIG_BOOT_LINK_OFFSET)])
-LDFLAGS_vmlinux := -T $(obj)/vmlinux.lds
+LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -estartup $(obj)/vmlinux.lds
 $(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o FORCE
        $(call if_changed,ld)
diff --git a/arch/h8300/boot/compressed/head.S b/arch/h8300/boot/compressed/head.S
index b8e90d12d1..985a81a243 100644
--- a/arch/h8300/boot/compressed/head.S
+++ b/arch/h8300/boot/compressed/head.S
@@ -4,7 +4,7 @@
 *  Copyright (C) 2006 Yoshinori Sato
 */
-.h8300h
+        .h8300h
 #include <linux/linkage.h>
 #define SRAM_START 0xff4000
diff --git a/arch/h8300/boot/compressed/vmlinux.lds b/arch/h8300/boot/compressed/vmlinux.lds
new file mode 100644
index 0000000000..65e2a0d1ae
--- /dev/null
+++ b/arch/h8300/boot/compressed/vmlinux.lds
@@ -0,0 +1,32 @@
+SECTIONS
+{
+        .text :
+        {
+        __stext = . ;
+        __text = .;
+               *(.text.startup)
+               *(.text)
+        __etext = . ;
+        }
+        .rodata :
+        {
+                *(.rodata)
+        }
+        .data :
+        {
+        __sdata = . ;
+        ___data_start = . ;
+                *(.data.*)
+        }
+        .bss :
+        {
+        . = ALIGN(0x4) ;
+        __sbss = . ;
+                *(.bss*)
+        . = ALIGN(0x4) ;
+        __ebss = . ;
+        __end = . ;
+        }
+}
diff --git a/arch/h8300/boot/compressed/vmlinux.scr b/arch/h8300/boot/compressed/vmlinux.scr
new file mode 100644
index 0000000000..a0f6962736
--- /dev/null
+++ b/arch/h8300/boot/compressed/vmlinux.scr
@@ -0,0 +1,9 @@
+SECTIONS
+{
+  .data : {
+        _input_len = .;
+        LONG(_input_data_end - _input_data) _input_data = .;
+        *(.data)
+        _input_data_end = .;
+        }
+}
diff --git a/arch/h8300/kernel/Makefile b/arch/h8300/kernel/Makefile
index ccc1a7fbf9..874f6aefee 100644
--- a/arch/h8300/kernel/Makefile
+++ b/arch/h8300/kernel/Makefile
@@ -6,6 +6,7 @@ extra-y := vmlinux.lds
 obj-y := process.o traps.o ptrace.o irq.o \
         sys_h8300.o time.o semaphore.o signal.o \
-         setup.o gpio.o init_task.o syscalls.o
+         setup.o gpio.o init_task.o syscalls.o \
+         entry.o
 obj-$(CONFIG_MODULES) += module.o h8300_ksyms.o 
diff --git a/arch/h8300/platform/h8s/entry.S b/arch/h8300/kernel/entry.S
index f3d6b8e8f9..ca74316903 100644
--- a/arch/h8300/platform/h8s/entry.S
+++ b/arch/h8300/kernel/entry.S
@@ -1,11 +1,10 @@
 /* -*- mode: asm -*-
 *
- *  linux/arch/h8300/platform/h8s/entry.S
+ *  linux/arch/h8300/platform/h8300h/entry.S
 *
 *  Yoshinori Sato <ysato@users.sourceforge.jp>
+ *  David McCullough <davidm@snapgear.com>
 *
- *      fairly heavy changes to fix syscall args and signal processing
- *      by David McCullough <davidm@snapgear.com>
 */
 /*
@@ -23,13 +22,66 @@
 #include <asm/thread_info.h>
 #include <asm/errno.h>
+#if defined(CONFIG_CPU_H8300H)
+#define USERRET 8
+INTERRUPTS = 64
+        .h8300h
+        .macro  SHLL2 reg
+        shll.l  \reg
+        shll.l  \reg
+        .endm
+        .macro  SHLR2 reg
+        shlr.l  \reg
+        shlr.l  \reg
+        .endm
+        .macro  SAVEREGS
+        mov.l   er0,@-sp
+        mov.l   er1,@-sp
+        mov.l   er2,@-sp
+        mov.l   er3,@-sp
+        .endm
+        .macro  RESTOREREGS
+        mov.l   @sp+,er3
+        mov.l   @sp+,er2
+        .endm
+        .macro  SAVEEXR
+        .endm
+        .macro  RESTOREEXR
+        .endm
+#endif
+#if defined(CONFIG_CPU_H8S)
+#define USERRET 10
+#define USEREXR 8
+INTERRUPTS = 128
        .h8300s
+        .macro  SHLL2 reg
+        shll.l  #2,\reg
+        .endm
+        .macro  SHLR2 reg
+        shlr.l  #2,\reg
+        .endm
+        .macro  SAVEREGS
+        stm.l   er0-er3,@-sp
+        .endm
+        .macro  RESTOREREGS
+        ldm.l   @sp+,er2-er3
+        .endm
+        .macro  SAVEEXR
+        mov.w   @(USEREXR:16,er0),r1
+        mov.w   r1,@(LEXR-LER3:16,sp)           /* copy EXR */
+        .endm
+        .macro  RESTOREEXR
+        mov.w   @(LEXR-LER1:16,sp),r1           /* restore EXR */
+        mov.b   r1l,r1h
+        mov.w   r1,@(USEREXR:16,er0)
+        .endm
+#endif
 /* CPU context save/restore macros. */
-        
        .macro  SAVE_ALL
        mov.l   er0,@-sp
        stc     ccr,r0l                         /* check kernel mode */
        btst    #4,r0l
        bne     5f
@@ -39,42 +91,38 @@
        mov.l   @sp,er0                         /* restore saved er0 */
        orc     #0x10,ccr                       /* switch kernel stack */
        mov.l   @SYMBOL_NAME(sw_ksp),sp
-        sub.l   #(LRET-LORIG),sp                /* allocate LORIG - LRET */ 
+        sub.l   #(LRET-LORIG),sp                /* allocate LORIG - LRET */
-        stm.l   er0-er3,@-sp
+        SAVEREGS
-        mov.l   @SYMBOL_NAME(sw_usp),er0
+        mov.l   @SYMBOL_NAME(sw_usp),er0
-        mov.l   @(10:16,er0),er1                /* copy the RET addr */
+        mov.l   @(USERRET:16,er0),er1           /* copy the RET addr */
-        mov.l   er1,@(LRET-LER3:16,sp)
+        mov.l   er1,@(LRET-LER3:16,sp)
-        mov.w   @(8:16,er0),r1
+        SAVEEXR
-        mov.w   r1,@(LEXR-LER3:16,sp)           /* copy EXR */
-        mov.w   e1,r1                           /* e1 highbyte = ccr */
-        and     #0xef,r1h                       /* mask mode? flag */
-        sub.w   r0,r0
-        mov.b   r1h,r0l
-        mov.w   r0,@(LCCR-LER3:16,sp)           /* copy ccr */
        mov.l   @(LORIG-LER3:16,sp),er0
        mov.l   er0,@(LER0-LER3:16,sp)          /* copy ER0 */
+        mov.w   e1,r1                           /* e1 highbyte = ccr */
+        and     #0xef,r1h                       /* mask mode? flag */
        bra     6f
 5:
        /* kernel mode */
        mov.l   @sp,er0                         /* restore saved er0 */
        subs    #2,sp                           /* set dummy ccr */
-        stm.l   er0-er3,@-sp
+        SAVEREGS
        mov.w   @(LRET-LER3:16,sp),r1           /* copy old ccr */
+6:
        mov.b   r1h,r1l
        mov.b   #0,r1h
-        mov.w   r1,@(LCCR-LER3:16,sp)
+        mov.w   r1,@(LCCR-LER3:16,sp)           /* set ccr */
-6:      
        mov.l   er6,@-sp                        /* syscall arg #6 */
        mov.l   er5,@-sp                        /* syscall arg #5 */
        mov.l   er4,@-sp                        /* syscall arg #4 */
-        .endm
+        .endm                                   /* r1 = ccr */
        .macro  RESTORE_ALL
        mov.l   @sp+,er4
        mov.l   @sp+,er5
        mov.l   @sp+,er6
-        ldm.l   @sp+,er2-er3
+        RESTOREREGS
        mov.w   @(LCCR-LER1:16,sp),r0           /* check kernel mode */
        btst    #4,r0l
        bne     7f
@@ -83,18 +131,16 @@
        mov.l   @SYMBOL_NAME(sw_usp),er0
        mov.l   @(LER0-LER1:16,sp),er1          /* restore ER0 */
        mov.l   er1,@er0
-        mov.w   @(LEXR-LER1:16,sp),r1           /* restore EXR */
+        RESTOREEXR
-        mov.b   r1l,r1h
-        mov.w   r1,@(8:16,er0)
        mov.w   @(LCCR-LER1:16,sp),r1           /* restore the RET addr */
        mov.b   r1l,r1h
        mov.b   @(LRET+1-LER1:16,sp),r1l
        mov.w   r1,e1
        mov.w   @(LRET+2-LER1:16,sp),r1
-        mov.l   er1,@(10:16,er0)
+        mov.l   er1,@(USERRET:16,er0)
        mov.l   @sp+,er1
-        add.l   #(LRET-LER1),sp                 /* remove LORIG - LRET */ 
+        add.l   #(LRET-LER1),sp                 /* remove LORIG - LRET */
        mov.l   sp,@SYMBOL_NAME(sw_ksp)
        andc    #0xef,ccr                       /* switch to user mode */
        mov.l   er0,sp
@@ -108,7 +154,7 @@
        adds    #4,sp                           /* remove the sw created LVEC */
        rte
        .endm
-        
 .globl SYMBOL_NAME(system_call)
 .globl SYMBOL_NAME(ret_from_exception)
 .globl SYMBOL_NAME(ret_from_fork)
@@ -116,16 +162,25 @@
 .globl SYMBOL_NAME(interrupt_redirect_table)
 .globl SYMBOL_NAME(sw_ksp),SYMBOL_NAME(sw_usp)
 .globl SYMBOL_NAME(resume)
-.globl SYMBOL_NAME(trace_break)
 .globl SYMBOL_NAME(interrupt_entry)
-                
+.globl SYMBOL_NAME(trace_break)
-INTERRUPTS = 128
 #if defined(CONFIG_ROMKERNEL)
        .section .int_redirect,"ax"
 SYMBOL_NAME_LABEL(interrupt_redirect_table)
+#if defined(CONFIG_CPU_H8300H)
        .rept   7
        .long   0
        .endr
+#endif
+#if defined(CONFIG_CPU_H8S)
+        .rept   5
+        .long   0
+        .endr
+        jmp     @SYMBOL_NAME(trace_break)
+        .long   0
+#endif
        jsr     @SYMBOL_NAME(interrupt_entry)   /* NMI */
        jmp     @SYMBOL_NAME(system_call)       /* TRAPA #0 (System call) */
        .long   0
@@ -141,20 +196,20 @@ SYMBOL_NAME_LABEL(interrupt_redirect_table)
 SYMBOL_NAME_LABEL(interrupt_redirect_table)
        .space  4
 #endif
-        
        .section .text
        .align  2
 SYMBOL_NAME_LABEL(interrupt_entry)
        SAVE_ALL
-        mov.w   @(LCCR,sp),r0
+        mov.l   sp,er0
-        btst    #4,r0l
+        add.l   #LVEC,er0
+        btst    #4,r1l
        bne     1f
+        /* user LVEC */
        mov.l   @SYMBOL_NAME(sw_usp),er0
-        mov.l   @(4:16,er0),er0
+        adds    #4,er0
-        bra     2f
 1:
-        mov.l   @(LVEC:16,sp),er0
+        mov.l   @er0,er0                        /* LVEC address */
-2:
 #if defined(CONFIG_ROMKERNEL)
        sub.l   #SYMBOL_NAME(interrupt_redirect_table),er0
 #endif
@@ -162,69 +217,62 @@ SYMBOL_NAME_LABEL(interrupt_entry)
        mov.l   @SYMBOL_NAME(interrupt_redirect_table),er1
        sub.l   er1,er0
 #endif
-        shlr.l  #2,er0
+        SHLR2   er0
        dec.l   #1,er0
        mov.l   sp,er1
        subs    #4,er1                          /* adjust ret_pc */
-        jsr     @SYMBOL_NAME(process_int)
+        jsr     @SYMBOL_NAME(do_IRQ)
-        mov.l   @SYMBOL_NAME(irq_stat)+CPUSTAT_SOFTIRQ_PENDING,er0
+        jmp     @SYMBOL_NAME(ret_from_interrupt)
-        beq     1f
-        jsr     @SYMBOL_NAME(do_softirq)
-1:
-        jmp     @SYMBOL_NAME(ret_from_exception)
 SYMBOL_NAME_LABEL(system_call)
        subs    #4,sp                           /* dummy LVEC */
        SAVE_ALL
+        andc    #0x7f,ccr
        mov.l   er0,er4
-        mov.l   #-ENOSYS,er0
-        mov.l   er0,@(LER0:16,sp)
        /* save top of frame */
        mov.l   sp,er0
        jsr     @SYMBOL_NAME(set_esp0)
-        cmp.l   #NR_syscalls,er4
-        bcc     SYMBOL_NAME(ret_from_exception):16
-        shll.l  #2,er4
-        mov.l   #SYMBOL_NAME(sys_call_table),er0
-        add.l   er4,er0
-        mov.l   @er0,er0
-        mov.l   er0,er4
-        beq     SYMBOL_NAME(ret_from_exception):16      
        mov.l   sp,er2
        and.w   #0xe000,r2
-        mov.b   @((TASK_FLAGS+3-(TIF_SYSCALL_TRACE >> 3)):16,er2),r2l
+        mov.b   @((TI_FLAGS+3-(TIF_SYSCALL_TRACE >> 3)):16,er2),r2l
        btst    #(TIF_SYSCALL_TRACE & 7),r2l
+        beq     1f
+        jsr     @SYMBOL_NAME(do_syscall_trace)
+1:
+        cmp.l   #NR_syscalls,er4
+        bcc     badsys
+        SHLL2   er4
+        mov.l   #SYMBOL_NAME(sys_call_table),er0
+        add.l   er4,er0
+        mov.l   @er0,er4
+        beq     SYMBOL_NAME(ret_from_exception):16
        mov.l   @(LER1:16,sp),er0
        mov.l   @(LER2:16,sp),er1
        mov.l   @(LER3:16,sp),er2
-        andc    #0x7f,ccr
        jsr     @er4
-        mov.l   er0,@(LER0:16,sp)                       /* save the return value */
+        mov.l   er0,@(LER0:16,sp)               /* save the return value */
+        mov.l   sp,er2
+        and.w   #0xe000,r2
+        mov.b   @((TI_FLAGS+3-(TIF_SYSCALL_TRACE >> 3)):16,er2),r2l
+        btst    #(TIF_SYSCALL_TRACE & 7),r2l
+        beq     2f
+        jsr     @SYMBOL_NAME(do_syscall_trace)
+2:
 #if defined(CONFIG_SYSCALL_PRINT)
        jsr     @SYMBOL_NAME(syscall_print)
 #endif
-        bra     SYMBOL_NAME(ret_from_exception):8
+        orc     #0x80,ccr
-1:
+        bra     resume_userspace
-        jsr     SYMBOL_NAME(syscall_trace)
-        mov.l   @(LER1:16,sp),er0
-        mov.l   @(LER2:16,sp),er1
-        mov.l   @(LER3:16,sp),er2
-        jsr     @er4
-        mov.l   er0,@(LER0:16,sp)               /* save the return value */
-        jsr     @SYMBOL_NAME(syscall_trace)
-        bra     SYMBOL_NAME(ret_from_exception):8
-SYMBOL_NAME_LABEL(ret_from_fork)
+badsys:
-        mov.l   er2,er0
+        mov.l   #-ENOSYS,er0
-        jsr     @SYMBOL_NAME(schedule_tail)
+        mov.l   er0,@(LER0:16,sp)
-        bra     SYMBOL_NAME(ret_from_exception):8
+        bra     resume_userspace
-SYMBOL_NAME_LABEL(reschedule)
+#if !defined(CONFIG_PREEMPT)
-        /* save top of frame */
+#define resume_kernel restore_all
-        mov.l   sp,er0
+#endif
-        jsr     @SYMBOL_NAME(set_esp0)
-        jsr     @SYMBOL_NAME(schedule)
 SYMBOL_NAME_LABEL(ret_from_exception)
 #if defined(CONFIG_PREEMPT)
@@ -232,58 +280,68 @@ SYMBOL_NAME_LABEL(ret_from_exception)
 #endif
 SYMBOL_NAME_LABEL(ret_from_interrupt)
        mov.b   @(LCCR+1:16,sp),r0l
-        btst    #4,r0l                  /* check if returning to kernel */
+        btst    #4,r0l
-        bne     done:8                  /* if so, skip resched, signals */
+        bne     resume_kernel:8         /* return from kernel */
+resume_userspace:
        andc    #0x7f,ccr
        mov.l   sp,er4
-        and.w   #0xe000,r4
+        and.w   #0xe000,r4              /* er4 <- current thread info */
        mov.l   @(TI_FLAGS:16,er4),er1
        and.l   #_TIF_WORK_MASK,er1
-        beq     done:8
+        beq     restore_all:8
-1:
+work_pending:
-        mov.l   @(TI_FLAGS:16,er4),er1
        btst    #TIF_NEED_RESCHED,r1l
-        bne     SYMBOL_NAME(reschedule):16
+        bne     work_resched:8
+        /* work notifysig */
        mov.l   sp,er0
-        subs    #4,er0                  /* adjust retpc */
+        subs    #4,er0                  /* er0: pt_regs */
-        mov.l   er2,er1
+        jsr     @SYMBOL_NAME(do_notify_resume)
-        jsr     @SYMBOL_NAME(do_signal)
+        bra     restore_all:8
+work_resched:
+        mov.l   sp,er0
+        jsr     @SYMBOL_NAME(set_esp0)
+        jsr     @SYMBOL_NAME(schedule)
+        bra     resume_userspace:8
+restore_all:
+        RESTORE_ALL                     /* Does RTE */
 #if defined(CONFIG_PREEMPT)
-        bra     done:8                  /* userspace thoru */
+resume_kernel:
-3:
+        mov.l   @(TI_PRE_COUNT:16,er4),er0
-        btst    #4,r0l
+        bne     restore_all:8
-        beq     done:8                  /* userspace thoru */
+need_resched:
-4:
+        mov.l   @(TI_FLAGS:16,er4),er0
-        mov.l   @(TI_PRE_COUNT:16,er4),er1
+        btst    #TIF_NEED_RESCHED,r0l
-        bne     done:8
+        beq     restore_all:8
-        mov.l   @(TI_FLAGS:16,er4),er1
+        mov.b   @(LCCR+1:16,sp),r0l     /* Interrupt Enabled? */
-        btst    #TIF_NEED_RESCHED,r1l
+        bmi     restore_all:8
-        beq     done:8
+        mov.l   #PREEMPT_ACTIVE,er0
-        mov.b   r0l,r0l
+        mov.l   er0,@(TI_PRE_COUNT:16,er4)
-        bpl     done:8                  /* interrupt off (exception path?) */
-        mov.l   #PREEMPT_ACTIVE,er1
-        mov.l   er1,@(TI_PRE_COUNT:16,er4)
        andc    #0x7f,ccr
+        mov.l   sp,er0
+        jsr     @SYMBOL_NAME(set_esp0)
        jsr     @SYMBOL_NAME(schedule)
-        sub.l   er1,er1
-        mov.l   er1,@(TI_PRE_COUNT:16,er4)
        orc     #0x80,ccr
-        bra     4b:8
+        bra     need_resched:8
 #endif
-done:
-        RESTORE_ALL                     /* Does RTE */
+SYMBOL_NAME_LABEL(ret_from_fork)
+        mov.l   er2,er0
+        jsr     @SYMBOL_NAME(schedule_tail)
+        jmp     @SYMBOL_NAME(ret_from_exception)
 SYMBOL_NAME_LABEL(resume)
        /*
-         *      er0 = prev
+         * Beware - when entering resume, offset of tss is in d1,
-         *      er1 = next
+         * prev (the current task) is in a0, next (the new task)
-         *      return last in er2
+         * is in a1 and d2.b is non-zero if the mm structure is
+         * shared between the tasks, so don't change these
+         * registers until their contents are no longer needed.
         */
        /* save sr */
        sub.w   r3,r3
        stc     ccr,r3l
-        stc     exr,r3h
        mov.w   r3,@(THREAD_CCR+2:16,er0)
        /* disable interrupts */
@@ -291,41 +349,45 @@ SYMBOL_NAME_LABEL(resume)
        mov.l   @SYMBOL_NAME(sw_usp),er3
        mov.l   er3,@(THREAD_USP:16,er0)
        mov.l   sp,@(THREAD_KSP:16,er0)
-        
        /* Skip address space switching if they are the same. */
        /* FIXME: what did we hack out of here, this does nothing! */
        mov.l   @(THREAD_USP:16,er1),er0
        mov.l   er0,@SYMBOL_NAME(sw_usp)
        mov.l   @(THREAD_KSP:16,er1),sp
-                        
        /* restore status register */
        mov.w   @(THREAD_CCR+2:16,er1),r3
        ldc     r3l,ccr
-        ldc     r3h,exr
        rts
 SYMBOL_NAME_LABEL(trace_break)
-        subs    #4,sp                   /* dummy LVEC */
+        subs    #4,sp
        SAVE_ALL
        sub.l   er1,er1
        dec.l   #1,er1
-        mov.l   er1,@(LORIG,sp) 
+        mov.l   er1,@(LORIG,sp)
        mov.l   sp,er0
        jsr     @SYMBOL_NAME(set_esp0)
        mov.l   @SYMBOL_NAME(sw_usp),er0
        mov.l   @er0,er1
+        mov.w   @(-2:16,er1),r2
+        cmp.w   #0x5730,r2
+        beq     1f
        subs    #2,er1
-        mov.l   er1,@er0        
+        mov.l   er1,@er0
+1:
        and.w   #0xff,e1
        mov.l   er1,er0
        jsr     @SYMBOL_NAME(trace_trap)
-        jmp     @SYMBOL_NAME(ret_from_exception)        
+        jmp     @SYMBOL_NAME(ret_from_exception)
        .section        .bss
 SYMBOL_NAME_LABEL(sw_ksp)
-        .space  4       
+        .space  4
 SYMBOL_NAME_LABEL(sw_usp)
-        .space  4       
+        .space  4
+        .end
diff --git a/arch/h8300/kernel/ints.c b/arch/h8300/kernel/ints.c
deleted file mode 100644
index 3e4f479271..0000000000
--- a/arch/h8300/kernel/ints.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * linux/arch/h8300/kernel/ints.c
- *
- * Yoshinori Sato <ysato@users.sourceforge.jp>
- *
- * Based on linux/arch/$(ARCH)/platform/$(PLATFORM)/ints.c
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive
- * for more details.
- *
- * Copyright 1996 Roman Zippel
- * Copyright 1999 D. Jeff Dionne <jeff@rt-control.com>
- */
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/kernel_stat.h>
-#include <linux/seq_file.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/random.h>
-#include <linux/bootmem.h>
-#include <linux/hardirq.h>
-#include <asm/system.h>
-#include <asm/irq.h>
-#include <asm/traps.h>
-#include <asm/io.h>
-#include <asm/setup.h>
-#include <asm/errno.h>
-/*
- * This structure has only 4 elements for speed reasons
- */
-typedef struct irq_handler {
-        irqreturn_t (*handler)(int, void *, struct pt_regs *);
-        int         flags;
-        int         count;
-        void        *dev_id;
-        const char  *devname;
-} irq_handler_t;
-static irq_handler_t *irq_list[NR_IRQS];
-static int use_kmalloc;
-extern unsigned long *interrupt_redirect_table;
-extern const int h8300_saved_vectors[];
-extern const unsigned long h8300_trap_table[];
-int h8300_enable_irq_pin(unsigned int irq);
-void h8300_disable_irq_pin(unsigned int irq);
-#define CPU_VECTOR ((unsigned long *)0x000000)
-#define ADDR_MASK (0xffffff)
-#if defined(CONFIG_RAMKERNEL)
-static unsigned long __init *get_vector_address(void)
-{
-        unsigned long *rom_vector = CPU_VECTOR;
-        unsigned long base,tmp;
-        int vec_no;
-        base = rom_vector[EXT_IRQ0] & ADDR_MASK;
-        
-        /* check romvector format */
-        for (vec_no = EXT_IRQ1; vec_no <= EXT_IRQ0+EXT_IRQS; vec_no++) {
-                if ((base+(vec_no - EXT_IRQ0)*4) != (rom_vector[vec_no] & ADDR_MASK))
-                        return NULL;
-        }
-        /* ramvector base address */
-        base -= EXT_IRQ0*4;
-        /* writerble check */
-        tmp = ~(*(volatile unsigned long *)base);
-        (*(volatile unsigned long *)base) = tmp;
-        if ((*(volatile unsigned long *)base) != tmp)
-                return NULL;
-        return (unsigned long *)base;
-}
-#endif
-void __init init_IRQ(void)
-{
-#if defined(CONFIG_RAMKERNEL)
-        int i;
-        unsigned long *ramvec,*ramvec_p;
-        const unsigned long *trap_entry;
-        const int *saved_vector;
-        ramvec = get_vector_address();
-        if (ramvec == NULL)
-                panic("interrupt vector serup failed.");
-        else
-                printk(KERN_INFO "virtual vector at 0x%08lx\n",(unsigned long)ramvec);
-        /* create redirect table */
-        ramvec_p = ramvec;
-        trap_entry = h8300_trap_table;
-        saved_vector = h8300_saved_vectors;
-        for ( i = 0; i < NR_IRQS; i++) {
-                if (i == *saved_vector) {
-                        ramvec_p++;
-                        saved_vector++;
-                } else {
-                        if ( i < NR_TRAPS ) {
-                                if (*trap_entry)
-                                        *ramvec_p = VECTOR(*trap_entry);
-                                ramvec_p++;
-                                trap_entry++;
-                        } else
-                                *ramvec_p++ = REDIRECT(interrupt_entry);
-                }
-        }
-        interrupt_redirect_table = ramvec;
-#ifdef DUMP_VECTOR
-        ramvec_p = ramvec;
-        for (i = 0; i < NR_IRQS; i++) {
-                if ((i % 8) == 0)
-                        printk(KERN_DEBUG "\n%p: ",ramvec_p);
-                printk(KERN_DEBUG "%p ",*ramvec_p);
-                ramvec_p++;
-        }
-        printk(KERN_DEBUG "\n");
-#endif
-#endif
-}
-int request_irq(unsigned int irq, 
-                irqreturn_t (*handler)(int, void *, struct pt_regs *),
-                unsigned long flags, const char *devname, void *dev_id)
-{
-        irq_handler_t *irq_handle;
-        if (irq < 0 || irq >= NR_IRQS) {
-                printk(KERN_ERR "Incorrect IRQ %d from %s\n", irq, devname);
-                return -EINVAL;
-        }
-        if (irq_list[irq] || (h8300_enable_irq_pin(irq) == -EBUSY))
-                return -EBUSY;
-        if (use_kmalloc)
-                irq_handle = kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
-        else {
-                /* use bootmem allocater */
-                irq_handle = (irq_handler_t *)alloc_bootmem(sizeof(irq_handler_t));
-                irq_handle = (irq_handler_t *)((unsigned long)irq_handle | 0x80000000);
-        }
-        if (irq_handle == NULL)
-                return -ENOMEM;
-        irq_handle->handler = handler;
-        irq_handle->flags   = flags;
-        irq_handle->count   = 0;
-        irq_handle->dev_id  = dev_id;
-        irq_handle->devname = devname;
-        irq_list[irq] = irq_handle;
-        if (irq_handle->flags & IRQF_SAMPLE_RANDOM)
-                rand_initialize_irq(irq);
-        enable_irq(irq);
-        return 0;
-}
-EXPORT_SYMBOL(request_irq);
-void free_irq(unsigned int irq, void *dev_id)
-{
-        if (irq >= NR_IRQS)
-                return;
-        if (!irq_list[irq] || irq_list[irq]->dev_id != dev_id)
-                printk(KERN_WARNING "Removing probably wrong IRQ %d from %s\n",
-                       irq, irq_list[irq]->devname);
-        disable_irq(irq);
-        h8300_disable_irq_pin(irq);
-        if (((unsigned long)irq_list[irq] & 0x80000000) == 0) {
-                kfree(irq_list[irq]);
-                irq_list[irq] = NULL;
-        }
-}
-EXPORT_SYMBOL(free_irq);
-/*
- * Do we need these probe functions on the m68k?
- */
-unsigned long probe_irq_on (void)
-{
-        return 0;
-}
-EXPORT_SYMBOL(probe_irq_on);
-int probe_irq_off (unsigned long irqs)
-{
-        return 0;
-}
-EXPORT_SYMBOL(probe_irq_off);
-void enable_irq(unsigned int irq)
-{
-        if (irq >= EXT_IRQ0 && irq <= (EXT_IRQ0 + EXT_IRQS))
-                IER_REGS |= 1 << (irq - EXT_IRQ0);
-}
-void disable_irq(unsigned int irq)
-{
-        if (irq >= EXT_IRQ0 && irq <= (EXT_IRQ0 + EXT_IRQS))
-                IER_REGS &= ~(1 << (irq - EXT_IRQ0));
-}
-asmlinkage void process_int(int irq, struct pt_regs *fp)
-{
-        irq_enter();
-        h8300_clear_isr(irq);
-        if (irq >= NR_TRAPS && irq < NR_IRQS) {
-                if (irq_list[irq]) {
-                        irq_list[irq]->handler(irq, irq_list[irq]->dev_id, fp);
-                        irq_list[irq]->count++;
-                        if (irq_list[irq]->flags & IRQF_SAMPLE_RANDOM)
-                                add_interrupt_randomness(irq);
-                }
-        } else {
-                BUG();
-        }
-        irq_exit();
-}
-int show_interrupts(struct seq_file *p, void *v)
-{
-        int i = *(loff_t *) v;
-        if ((i < NR_IRQS) && (irq_list[i]!=NULL)) {
-                seq_printf(p, "%3d: %10u ",i,irq_list[i]->count);
-                seq_printf(p, "%s\n", irq_list[i]->devname);
-        }
-        return 0;
-}
-void init_irq_proc(void)
-{
-}
-static int __init enable_kmalloc(void)
-{
-        use_kmalloc = 1;
-        return 0;
-}
-core_initcall(enable_kmalloc);
diff --git a/arch/h8300/kernel/ptrace.c b/arch/h8300/kernel/ptrace.c
index 8f2411db7e..d32bbf02fc 100644
--- a/arch/h8300/kernel/ptrace.c
+++ b/arch/h8300/kernel/ptrace.c
@@ -111,10 +111,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
      /* when I and D space are separate, this will have to be fixed. */
                case PTRACE_POKETEXT: /* write the word at location addr. */
                case PTRACE_POKEDATA:
-                        ret = 0;
+                        ret = generic_ptrace_pokedata(child, addr, data);
-                        if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data))
-                                break;
-                        ret = -EIO;
                        break;
                case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
@@ -219,7 +216,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        return ret;
 }
-asmlinkage void syscall_trace(void)
+asmlinkage void do_syscall_trace(void)
 {
        if (!test_thread_flag(TIF_SYSCALL_TRACE))
                return;
diff --git a/arch/h8300/kernel/signal.c b/arch/h8300/kernel/signal.c
index 02955604d7..62ea12d339 100644
--- a/arch/h8300/kernel/signal.c
+++ b/arch/h8300/kernel/signal.c
@@ -547,3 +547,9 @@ asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset)
        }
        return 0;
 }
+asmlinkage void do_notify_resume(struct pt_regs *regs, u32 thread_info_flags)
+{
+        if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK))
+                do_signal(regs, NULL);
+}
diff --git a/arch/h8300/platform/h8300h/Makefile b/arch/h8300/platform/h8300h/Makefile
index b24ea08aa0..c5096369ea 100644
--- a/arch/h8300/platform/h8300h/Makefile
+++ b/arch/h8300/platform/h8300h/Makefile
@@ -4,4 +4,4 @@
 # Reuse any files we can from the H8/300H
 #
-obj-y := entry.o irq_pin.o ptrace_h8300h.o
+obj-y := irq_pin.o ptrace_h8300h.o
diff --git a/arch/h8300/platform/h8300h/entry.S b/arch/h8300/platform/h8300h/entry.S
deleted file mode 100644
index f86ac3b5d4..0000000000
--- a/arch/h8300/platform/h8300h/entry.S
+++ /dev/null
@@ -1,332 +0,0 @@
-/* -*- mode: asm -*-
- *
- *  linux/arch/h8300/platform/h8300h/entry.S
- *
- *  Yoshinori Sato <ysato@users.sourceforge.jp>
- *  David McCullough <davidm@snapgear.com>
- *
- */
-/*
- *  entry.S
- *  include exception/interrupt gateway
- *          system call entry
- */
-#include <linux/sys.h>
-#include <asm/unistd.h>
-#include <asm/setup.h>
-#include <asm/segment.h>
-#include <asm/linkage.h>
-#include <asm/asm-offsets.h>
-#include <asm/thread_info.h>
-#include <asm/errno.h>
-        .h8300h
-/* CPU context save/restore macros. */
-        
-        .macro  SAVE_ALL
-        mov.l   er0,@-sp
-        stc     ccr,r0l                         /* check kernel mode */
-        btst    #4,r0l
-        bne     5f
-        mov.l   sp,@SYMBOL_NAME(sw_usp)         /* user mode */
-        mov.l   @sp,er0
-        orc     #0x10,ccr
-        mov.l   @SYMBOL_NAME(sw_ksp),sp
-        sub.l   #(LRET-LORIG),sp                /* allocate LORIG - LRET */ 
-        mov.l   er0,@-sp
-        mov.l   er1,@-sp
-        mov.l   @SYMBOL_NAME(sw_usp),er0
-        mov.l   @(8:16,er0),er1                 /* copy the RET addr */
-        mov.l   er1,@(LRET-LER1:16,sp)
-        mov.w   e1,r1                           /* e1 highbyte = ccr */
-        and     #0xef,r1h                       /* mask mode? flag */
-        sub.w   r0,r0
-        mov.b   r1h,r0l
-        mov.w   r0,@(LCCR-LER1:16,sp)           /* copy ccr */
-        mov.l   @(LORIG-LER1:16,sp),er0
-        mov.l   er0,@(LER0-LER1:16,sp)          /* copy ER0 */
-        bra     6f
-5:
-        mov.l   @sp,er0                         /* kernel mode */
-        subs    #2,sp                           /* dummy ccr */
-        mov.l   er0,@-sp
-        mov.l   er1,@-sp
-        mov.w   @(LRET-LER1:16,sp),r1           /* copy old ccr */
-        mov.b   r1h,r1l
-        mov.b   #0,r1h
-        mov.w   r1,@(LCCR-LER1:16,sp)           /* set ccr */
-6:
-        mov.l   er2,@-sp
-        mov.l   er3,@-sp
-        mov.l   er6,@-sp                        /* syscall arg #6 */
-        mov.l   er5,@-sp                        /* syscall arg #5 */
-        mov.l   er4,@-sp                        /* syscall arg #4 */
-        .endm
-        .macro  RESTORE_ALL
-        mov.l   @sp+,er4
-        mov.l   @sp+,er5
-        mov.l   @sp+,er6
-        mov.l   @sp+,er3
-        mov.l   @sp+,er2
-        mov.w   @(LCCR-LER1:16,sp),r0           /* check kernel mode */
-        btst    #4,r0l
-        bne     7f
-        orc     #0x80,ccr
-        mov.l   @SYMBOL_NAME(sw_usp),er0
-        mov.l   @(LER0-LER1:16,sp),er1          /* restore ER0 */
-        mov.l   er1,@er0
-        mov.w   @(LCCR-LER1:16,sp),r1           /* restore the RET addr */
-        mov.b   r1l,r1h
-        mov.b   @(LRET+1-LER1:16,sp),r1l
-        mov.w   r1,e1
-        mov.w   @(LRET+2-LER1:16,sp),r1
-        mov.l   er1,@(8:16,er0)
-        mov.l   @sp+,er1
-        add.l   #(LRET-LER1),sp                 /* remove LORIG - LRET */ 
-        mov.l   sp,@SYMBOL_NAME(sw_ksp)
-        mov.l   er0,sp
-        bra     8f
-7:
-        mov.l   @sp+,er1
-        adds    #4,sp
-        adds    #2,sp
-8:
-        mov.l   @sp+,er0
-        adds    #4,sp                           /* remove the sw created LVEC */
-        rte
-        .endm
-        
-.globl SYMBOL_NAME(system_call)
-.globl SYMBOL_NAME(ret_from_exception)
-.globl SYMBOL_NAME(ret_from_fork)
-.globl SYMBOL_NAME(ret_from_interrupt)
-.globl SYMBOL_NAME(interrupt_redirect_table)
-.globl SYMBOL_NAME(sw_ksp),SYMBOL_NAME(sw_usp)
-.globl SYMBOL_NAME(resume)
-.globl SYMBOL_NAME(interrupt_redirect_table)
-.globl SYMBOL_NAME(interrupt_entry)
-.globl SYMBOL_NAME(system_call)
-.globl SYMBOL_NAME(trace_break)
-#if defined(CONFIG_ROMKERNEL)
-INTERRUPTS = 64         
-        .section .int_redirect,"ax"
-SYMBOL_NAME_LABEL(interrupt_redirect_table)
-        .rept   7
-        .long   0
-        .endr
-        jsr     @SYMBOL_NAME(interrupt_entry)   /* NMI */
-        jmp     @SYMBOL_NAME(system_call)       /* TRAPA #0 (System call) */
-        .long   0
-        .long   0
-        jmp     @SYMBOL_NAME(trace_break)       /* TRAPA #3 (breakpoint) */
-        .rept   INTERRUPTS-12
-        jsr     @SYMBOL_NAME(interrupt_entry)
-        .endr
-#endif
-#if defined(CONFIG_RAMKERNEL)
-.globl SYMBOL_NAME(interrupt_redirect_table)
-        .section .bss
-SYMBOL_NAME_LABEL(interrupt_redirect_table)
-        .space  4
-#endif
-        .section .text
-        .align  2
-SYMBOL_NAME_LABEL(interrupt_entry)
-        SAVE_ALL
-        mov.w   @(LCCR,sp),r0
-        btst    #4,r0l
-        bne     1f
-        mov.l   @SYMBOL_NAME(sw_usp),er0
-        mov.l   @(4:16,er0),er0
-        bra     2f
-1:
-        mov.l   @(LVEC,sp),er0
-2:
-#if defined(CONFIG_ROMKERNEL)
-        sub.l   #SYMBOL_NAME(interrupt_redirect_table),er0
-#endif
-#if defined(CONFIG_RAMKERNEL)
-        mov.l   @SYMBOL_NAME(interrupt_redirect_table),er1
-        sub.l   er1,er0
-#endif
-        shlr.l  er0
-        shlr.l  er0
-        dec.l   #1,er0
-        mov.l   sp,er1
-        subs    #4,er1                          /* adjust ret_pc */
-        jsr     @SYMBOL_NAME(do_IRQ)
-        mov.l   @SYMBOL_NAME(irq_stat)+CPUSTAT_SOFTIRQ_PENDING,er0
-        beq     1f
-        jsr     @SYMBOL_NAME(do_softirq)
-1:
-        jmp     @SYMBOL_NAME(ret_from_interrupt)
-        
-SYMBOL_NAME_LABEL(system_call)
-        subs    #4,sp                           /* dummy LVEC */
-        SAVE_ALL
-        mov.w   @(LCCR:16,sp),r1
-        bset    #4,r1l
-        ldc     r1l,ccr
-        mov.l   er0,er4
-        mov.l   #-ENOSYS,er0
-        mov.l   er0,@(LER0:16,sp)
-        /* save top of frame */
-        mov.l   sp,er0
-        jsr     @SYMBOL_NAME(set_esp0)
-        cmp.l   #NR_syscalls,er4
-        bcc     SYMBOL_NAME(ret_from_exception):16
-        shll.l  er4
-        shll.l  er4
-        mov.l   #SYMBOL_NAME(sys_call_table),er0
-        add.l   er4,er0
-        mov.l   @er0,er4
-        beq     SYMBOL_NAME(ret_from_exception):16      
-        mov.l   sp,er2
-        and.w   #0xe000,r2
-        mov.b   @((TASK_FLAGS+3-(TIF_SYSCALL_TRACE >> 3)):16,er2),r2l
-        btst    #(TIF_SYSCALL_TRACE & 7),r2l
-        bne     1f
-        mov.l   @(LER1:16,sp),er0
-        mov.l   @(LER2:16,sp),er1
-        mov.l   @(LER3:16,sp),er2
-        jsr     @er4
-        mov.l   er0,@(LER0:16,sp)               /* save the return value */
-#if defined(CONFIG_SYSCALL_PRINT)
-        jsr     @SYMBOL_NAME(syscall_print)
-#endif
-        bra     SYMBOL_NAME(ret_from_exception):8
-1:
-        jsr     SYMBOL_NAME(syscall_trace)
-        mov.l   @(LER1:16,sp),er0
-        mov.l   @(LER2:16,sp),er1
-        mov.l   @(LER3:16,sp),er2
-        jsr     @er4
-        mov.l   er0,@(LER0:16,sp)               /* save the return value */
-        jsr     @SYMBOL_NAME(syscall_trace)
-        bra     SYMBOL_NAME(ret_from_exception):8
-SYMBOL_NAME_LABEL(ret_from_fork)
-        mov.l   er2,er0
-        jsr     @SYMBOL_NAME(schedule_tail)
-        bra     SYMBOL_NAME(ret_from_exception):8
-SYMBOL_NAME_LABEL(reschedule)
-        /* save top of frame */
-        mov.l   sp,er0
-        jsr     @SYMBOL_NAME(set_esp0)
-        jsr     @SYMBOL_NAME(schedule)
-SYMBOL_NAME_LABEL(ret_from_exception)
-#if defined(CONFIG_PREEMPT)
-        orc     #0x80,ccr
-#endif
-SYMBOL_NAME_LABEL(ret_from_interrupt)
-        mov.b   @(LCCR+1:16,sp),r0l
-        btst    #4,r0l                  /* check if returning to kernel */
-        bne     done:8                  /* if so, skip resched, signals */
-        andc    #0x7f,ccr
-        mov.l   sp,er4
-        and.w   #0xe000,r4
-        mov.l   @(TI_FLAGS:16,er4),er1
-        and.l   #_TIF_WORK_MASK,er1
-        beq     done:8
-1:
-        mov.l   @(TI_FLAGS:16,er4),er1
-        btst    #TIF_NEED_RESCHED,r1l
-        bne     SYMBOL_NAME(reschedule):16
-        mov.l   sp,er0
-        subs    #4,er0                  /* adjust retpc */
-        mov.l   er2,er1
-        jsr     @SYMBOL_NAME(do_signal)
-#if defined(CONFIG_PREEMPT)
-        bra     done:8                  /* userspace thoru */
-3:
-        btst    #4,r0l
-        beq     done:8                  /* userspace thoru */
-4:
-        mov.l   @(TI_PRE_COUNT:16,er4),er1
-        bne     done:8
-        mov.l   @(TI_FLAGS:16,er4),er1
-        btst    #TIF_NEED_RESCHED,r1l
-        beq     done:8
-        mov.b   r0l,r0l
-        bpl     done:8                  /* interrupt off (exception path?) */
-        mov.l   #PREEMPT_ACTIVE,er1
-        mov.l   er1,@(TI_PRE_COUNT:16,er4)
-        andc    #0x7f,ccr
-        jsr     @SYMBOL_NAME(schedule)
-        sub.l   er1,er1
-        mov.l   er1,@(TI_PRE_COUNT:16,er4)
-        orc     #0x80,ccr
-        bra     4b:8
-#endif
-done:
-        RESTORE_ALL                     /* Does RTE */
-SYMBOL_NAME_LABEL(resume)
-        /*
-         * Beware - when entering resume, offset of tss is in d1,
-         * prev (the current task) is in a0, next (the new task)
-         * is in a1 and d2.b is non-zero if the mm structure is
-         * shared between the tasks, so don't change these
-         * registers until their contents are no longer needed.
-         */
-        /* save sr */
-        sub.w   r3,r3
-        stc     ccr,r3l
-        mov.w   r3,@(THREAD_CCR+2:16,er0)
-        /* disable interrupts */
-        orc     #0x80,ccr
-        mov.l   @SYMBOL_NAME(sw_usp),er3
-        mov.l   er3,@(THREAD_USP:16,er0)
-        mov.l   sp,@(THREAD_KSP:16,er0)
-        /* Skip address space switching if they are the same. */
-        /* FIXME: what did we hack out of here, this does nothing! */
-        mov.l   @(THREAD_USP:16,er1),er0
-        mov.l   er0,@SYMBOL_NAME(sw_usp)
-        mov.l   @(THREAD_KSP:16,er1),sp
-                        
-        /* restore status register */
-        mov.w   @(THREAD_CCR+2:16,er1),r3
-        ldc     r3l,ccr
-        rts
-        
-SYMBOL_NAME_LABEL(trace_break)
-        subs    #4,sp
-        SAVE_ALL
-        sub.l   er1,er1
-        dec.l   #1,er1
-        mov.l   er1,@(LORIG,sp) 
-        mov.l   sp,er0
-        jsr     @SYMBOL_NAME(set_esp0)
-        mov.l   @SYMBOL_NAME(sw_usp),er0
-        mov.l   @er0,er1
-        subs    #2,er1
-        mov.l   er1,@er0        
-        and.w   #0xff,e1
-        mov.l   er1,er0
-        jsr     @SYMBOL_NAME(trace_trap)
-        jmp     @SYMBOL_NAME(ret_from_exception)        
-        .section        .bss
-SYMBOL_NAME_LABEL(sw_ksp)
-        .space  4       
-SYMBOL_NAME_LABEL(sw_usp)
-        .space  4       
diff --git a/arch/h8300/platform/h8s/Makefile b/arch/h8300/platform/h8s/Makefile
index 0847b15d42..bf12418837 100644
--- a/arch/h8300/platform/h8s/Makefile
+++ b/arch/h8300/platform/h8s/Makefile
@@ -4,4 +4,4 @@
 # Reuse any files we can from the H8S
 #
-obj-y := entry.o ints_h8s.o ptrace_h8s.o
+obj-y := ints_h8s.o ptrace_h8s.o
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index d2f6a24741..7a11b905ef 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -222,6 +222,8 @@ config PARAVIRT
          However, when run without a hypervisor the kernel is
          theoretically slower.  If in doubt, say N.
+source "arch/i386/xen/Kconfig"
 config VMI
        bool "VMI Paravirt-ops support"
        depends on PARAVIRT
@@ -441,8 +443,8 @@ config X86_REBOOTFIXUPS
          this config is intended, is when reboot ends with a stalled/hung
          system.
-          Currently, the only fixup is for the Geode GX1/CS5530A/TROM2.1.
+          Currently, the only fixup is for the Geode machines using
-          combination.
+          CS5530A and CS5536 chipsets.
          Say Y if you want to enable the fixup. Currently, it's safe to
          enable this option even if you don't need it.
@@ -1212,21 +1214,26 @@ source "drivers/Kconfig"
 source "fs/Kconfig"
-menu "Instrumentation Support"
+menuconfig INSTRUMENTATION
+        bool "Instrumentation Support"
        depends on EXPERIMENTAL
+        default y
+if INSTRUMENTATION
 source "arch/i386/oprofile/Kconfig"
 config KPROBES
-        bool "Kprobes (EXPERIMENTAL)"
+        bool "Kprobes"
-        depends on KALLSYMS && EXPERIMENTAL && MODULES
+        depends on KALLSYMS && MODULES
        help
          Kprobes allows you to trap at almost any kernel address and
          execute a callback function.  register_kprobe() establishes
          a probepoint and specifies the callback.  Kprobes is useful
          for kernel debugging, non-intrusive instrumentation and testing.
          If in doubt, say "N".
-endmenu
+endif # INSTRUMENTATION
 source "arch/i386/Kconfig.debug"
diff --git a/arch/i386/Kconfig.cpu b/arch/i386/Kconfig.cpu
index 5c95ceb7f1..9cbe76c3aa 100644
--- a/arch/i386/Kconfig.cpu
+++ b/arch/i386/Kconfig.cpu
@@ -344,8 +344,8 @@ config X86_CMOV
        depends on (MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7)
        default y
-config X86_MINIMUM_CPU_MODEL
+config X86_MINIMUM_CPU_FAMILY
        int
-        default "4" if X86_XADD || X86_CMPXCHG || X86_BSWAP
+        default "4" if X86_XADD || X86_CMPXCHG || X86_BSWAP || X86_WP_WORKS_OK
-        default "0"
+        default "3"
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index bd28f9f9b4..01f0ff0daa 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -93,6 +93,9 @@ mflags-$(CONFIG_X86_ES7000)	:= -Iinclude/asm-i386/mach-es7000
 mcore-$(CONFIG_X86_ES7000)      := mach-default
 core-$(CONFIG_X86_ES7000)       := arch/i386/mach-es7000/
+# Xen paravirtualization support
+core-$(CONFIG_XEN)              += arch/i386/xen/
 # default subarch .h files
 mflags-y += -Iinclude/asm-i386/mach-default
@@ -108,6 +111,7 @@ drivers-$(CONFIG_PCI)			+= arch/i386/pci/
 # must be linked after kernel/
 drivers-$(CONFIG_OPROFILE)              += arch/i386/oprofile/
 drivers-$(CONFIG_PM)                    += arch/i386/power/
+drivers-$(CONFIG_FB)                    += arch/i386/video/
 CFLAGS += $(mflags-y)
 AFLAGS += $(mflags-y)
diff --git a/arch/i386/boot/Makefile b/arch/i386/boot/Makefile
index bfbc32098a..93386a4e40 100644
--- a/arch/i386/boot/Makefile
+++ b/arch/i386/boot/Makefile
@@ -25,27 +25,56 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA
 #RAMDISK := -DRAMDISK=512
-targets         := vmlinux.bin bootsect bootsect.o \
+targets         := vmlinux.bin setup.bin setup.elf zImage bzImage
-                   setup setup.o zImage bzImage
 subdir-         := compressed
+setup-y         += a20.o apm.o cmdline.o copy.o cpu.o cpucheck.o edd.o
+setup-y         += header.o main.o mca.o memory.o pm.o pmjump.o
+setup-y         += printf.o string.o tty.o video.o version.o voyager.o
+# The link order of the video-*.o modules can matter.  In particular,
+# video-vga.o *must* be listed first, followed by video-vesa.o.
+# Hardware-specific drivers should follow in the order they should be
+# probed, and video-bios.o should typically be last.
+setup-y         += video-vga.o
+setup-y         += video-vesa.o
+setup-y         += video-bios.o
+targets         += $(setup-y)
 hostprogs-y     := tools/build
 HOSTCFLAGS_build.o := $(LINUXINCLUDE)
 # ---------------------------------------------------------------------------
+# How to compile the 16-bit code.  Note we always compile for -march=i386,
+# that way we can complain to the user if the CPU is insufficient.
+cflags-i386   := 
+cflags-x86_64 := -m32
+CFLAGS          := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
+                   $(cflags-$(ARCH)) \
+                   -Wall -Wstrict-prototypes \
+                   -march=i386 -mregparm=3 \
+                   -include $(srctree)/$(src)/code16gcc.h \
+                   -fno-strict-aliasing -fomit-frame-pointer \
+                   $(call cc-option, -ffreestanding) \
+                   $(call cc-option, -fno-toplevel-reorder,\
+                        $(call cc-option, -fno-unit-at-a-time)) \
+                   $(call cc-option, -fno-stack-protector) \
+                   $(call cc-option, -mpreferred-stack-boundary=2)
+AFLAGS          := $(CFLAGS) -D__ASSEMBLY__
 $(obj)/zImage:  IMAGE_OFFSET := 0x1000
 $(obj)/zImage:  EXTRA_AFLAGS := $(SVGA_MODE) $(RAMDISK)
 $(obj)/bzImage: IMAGE_OFFSET := 0x100000
+$(obj)/bzImage: EXTRA_CFLAGS := -D__BIG_KERNEL__
 $(obj)/bzImage: EXTRA_AFLAGS := $(SVGA_MODE) $(RAMDISK) -D__BIG_KERNEL__
 $(obj)/bzImage: BUILDFLAGS   := -b
 quiet_cmd_image = BUILD   $@
-cmd_image = $(obj)/tools/build $(BUILDFLAGS) $(obj)/bootsect $(obj)/setup \
+cmd_image = $(obj)/tools/build $(BUILDFLAGS) $(obj)/setup.bin \
            $(obj)/vmlinux.bin $(ROOT_DEV) > $@
-$(obj)/zImage $(obj)/bzImage: $(obj)/bootsect $(obj)/setup \
+$(obj)/zImage $(obj)/bzImage: $(obj)/setup.bin \
                              $(obj)/vmlinux.bin $(obj)/tools/build FORCE
        $(call if_changed,image)
        @echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
@@ -53,12 +82,17 @@ $(obj)/zImage $(obj)/bzImage: $(obj)/bootsect $(obj)/setup \
 $(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE
        $(call if_changed,objcopy)
-LDFLAGS_bootsect := -Ttext 0x0 -s --oformat binary
+SETUP_OBJS = $(addprefix $(obj)/,$(setup-y))
-LDFLAGS_setup    := -Ttext 0x0 -s --oformat binary -e begtext
-$(obj)/setup $(obj)/bootsect: %: %.o FORCE
+LDFLAGS_setup.elf       := -T
+$(obj)/setup.elf: $(src)/setup.ld $(SETUP_OBJS) FORCE
        $(call if_changed,ld)
+OBJCOPYFLAGS_setup.bin  := -O binary
+$(obj)/setup.bin: $(obj)/setup.elf FORCE
+        $(call if_changed,objcopy)
 $(obj)/compressed/vmlinux: FORCE
        $(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@
diff --git a/arch/i386/boot/a20.c b/arch/i386/boot/a20.c
new file mode 100644
index 0000000000..31348d054f
--- /dev/null
+++ b/arch/i386/boot/a20.c
@@ -0,0 +1,161 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/a20.c
+ *
+ * Enable A20 gate (return -1 on failure)
+ */
+#include "boot.h"
+#define MAX_8042_LOOPS  100000
+static int empty_8042(void)
+{
+        u8 status;
+        int loops = MAX_8042_LOOPS;
+        while (loops--) {
+                io_delay();
+                status = inb(0x64);
+                if (status & 1) {
+                        /* Read and discard input data */
+                        io_delay();
+                        (void)inb(0x60);
+                } else if (!(status & 2)) {
+                        /* Buffers empty, finished! */
+                        return 0;
+                }
+        }
+        return -1;
+}
+/* Returns nonzero if the A20 line is enabled.  The memory address
+   used as a test is the int $0x80 vector, which should be safe. */
+#define A20_TEST_ADDR   (4*0x80)
+#define A20_TEST_SHORT  32
+#define A20_TEST_LONG   2097152 /* 2^21 */
+static int a20_test(int loops)
+{
+        int ok = 0;
+        int saved, ctr;
+        set_fs(0x0000);
+        set_gs(0xffff);
+        saved = ctr = rdfs32(A20_TEST_ADDR);
+        while (loops--) {
+                wrfs32(++ctr, A20_TEST_ADDR);
+                io_delay();     /* Serialize and make delay constant */
+                ok = rdgs32(A20_TEST_ADDR+0x10) ^ ctr;
+                if (ok)
+                        break;
+        }
+        wrfs32(saved, A20_TEST_ADDR);
+        return ok;
+}
+/* Quick test to see if A20 is already enabled */
+static int a20_test_short(void)
+{
+        return a20_test(A20_TEST_SHORT);
+}
+/* Longer test that actually waits for A20 to come on line; this
+   is useful when dealing with the KBC or other slow external circuitry. */
+static int a20_test_long(void)
+{
+        return a20_test(A20_TEST_LONG);
+}
+static void enable_a20_bios(void)
+{
+        asm volatile("pushfl; int $0x15; popfl"
+                     : : "a" ((u16)0x2401));
+}
+static void enable_a20_kbc(void)
+{
+        empty_8042();
+        outb(0xd1, 0x64);       /* Command write */
+        empty_8042();
+        outb(0xdf, 0x60);       /* A20 on */
+        empty_8042();
+}
+static void enable_a20_fast(void)
+{
+        u8 port_a;
+        port_a = inb(0x92);     /* Configuration port A */
+        port_a |=  0x02;        /* Enable A20 */
+        port_a &= ~0x01;        /* Do not reset machine */
+        outb(port_a, 0x92);
+}
+/*
+ * Actual routine to enable A20; return 0 on ok, -1 on failure
+ */
+#define A20_ENABLE_LOOPS 255    /* Number of times to try */
+int enable_a20(void)
+{
+        int loops = A20_ENABLE_LOOPS;
+#if defined(CONFIG_X86_ELAN)
+        /* Elan croaks if we try to touch the KBC */
+        enable_a20_fast();
+        while (!a20_test_long())
+                ;
+        return 0;
+#elif defined(CONFIG_X86_VOYAGER)
+        /* On Voyager, a20_test() is unsafe? */
+        enable_a20_kbc();
+        return 0;
+#else
+        while (loops--) {
+                /* First, check to see if A20 is already enabled
+                   (legacy free, etc.) */
+                if (a20_test_short())
+                        return 0;
+                /* Next, try the BIOS (INT 0x15, AX=0x2401) */
+                enable_a20_bios();
+                if (a20_test_short())
+                        return 0;
+                /* Try enabling A20 through the keyboard controller */
+                empty_8042();
+                if (a20_test_short())
+                        return 0; /* BIOS worked, but with delayed reaction */
+                enable_a20_kbc();
+                if (a20_test_long())
+                        return 0;
+                /* Finally, try enabling the "fast A20 gate" */
+                enable_a20_fast();
+                if (a20_test_long())
+                        return 0;
+        }
+        return -1;
+#endif
+}
diff --git a/arch/i386/boot/apm.c b/arch/i386/boot/apm.c
new file mode 100644
index 0000000000..a34087c370
--- /dev/null
+++ b/arch/i386/boot/apm.c
@@ -0,0 +1,97 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   Original APM BIOS checking by Stephen Rothwell, May 1994
+ *   (sfr@canb.auug.org.au)
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/apm.c
+ *
+ * Get APM BIOS information
+ */
+#include "boot.h"
+#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
+int query_apm_bios(void)
+{
+        u16 ax, bx, cx, dx, di;
+        u32 ebx, esi;
+        u8 err;
+        /* APM BIOS installation check */
+        ax = 0x5300;
+        bx = cx = 0;
+        asm volatile("pushl %%ebp ; int $0x15 ; popl %%ebp ; setc %0"
+                     : "=d" (err), "+a" (ax), "+b" (bx), "+c" (cx)
+                     : : "esi", "edi");
+        if (err)
+                return -1;              /* No APM BIOS */
+        if (bx != 0x504d)       /* "PM" signature */
+                return -1;
+        if (cx & 0x02)          /* 32 bits supported? */
+                return -1;
+        /* Disconnect first, just in case */
+        ax = 0x5304;
+        asm volatile("pushl %%ebp ; int $0x15 ; popl %%ebp"
+                     : "+a" (ax)
+                     : : "ebx", "ecx", "edx", "esi", "edi");
+        /* Paranoia */
+        ebx = esi = 0;
+        cx = dx = di = 0;
+        /* 32-bit connect */
+        asm volatile("pushl %%ebp ; int $0x15 ; popl %%ebp ; setc %6"
+                     : "=a" (ax), "+b" (ebx), "+c" (cx), "+d" (dx),
+                       "+S" (esi), "+D" (di), "=m" (err)
+                     : "a" (0x5303));
+        boot_params.apm_bios_info.cseg = ax;
+        boot_params.apm_bios_info.offset = ebx;
+        boot_params.apm_bios_info.cseg_16 = cx;
+        boot_params.apm_bios_info.dseg = dx;
+        boot_params.apm_bios_info.cseg_len = (u16)esi;
+        boot_params.apm_bios_info.cseg_16_len = esi >> 16;
+        boot_params.apm_bios_info.dseg_len = di;
+        if (err)
+                return -1;
+        /* Redo the installation check as the 32-bit connect;
+           some BIOSes return different flags this way... */
+        ax = 0x5300;
+        bx = cx = 0;
+        asm volatile("pushl %%ebp ; int $0x15 ; popl %%ebp ; setc %0"
+                     : "=d" (err), "+a" (ax), "+b" (bx), "+c" (cx)
+                     : : "esi", "edi");
+        if (err || bx != 0x504d) {
+                /* Failure with 32-bit connect, try to disconect and ignore */
+                ax = 0x5304;
+                bx = 0;
+                asm volatile("pushl %%ebp ; int $0x15 ; popl %%ebp"
+                             : "+a" (ax), "+b" (bx)
+                             : : "ecx", "edx", "esi", "edi");
+                return -1;
+        }
+        boot_params.apm_bios_info.version = ax;
+        boot_params.apm_bios_info.flags = cx;
+        return 0;
+}
+#endif
diff --git a/arch/i386/boot/bitops.h b/arch/i386/boot/bitops.h
new file mode 100644
index 0000000000..8dcc8dc7db
--- /dev/null
+++ b/arch/i386/boot/bitops.h
@@ -0,0 +1,45 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/bitops.h
+ *
+ * Very simple bitops for the boot code.
+ */
+#ifndef BOOT_BITOPS_H
+#define BOOT_BITOPS_H
+#define _LINUX_BITOPS_H         /* Inhibit inclusion of <linux/bitops.h> */
+static inline int constant_test_bit(int nr, const void *addr)
+{
+        const u32 *p = (const u32 *)addr;
+        return ((1UL << (nr & 31)) & (p[nr >> 5])) != 0;
+}
+static inline int variable_test_bit(int nr, const void *addr)
+{
+        u8 v;
+        const u32 *p = (const u32 *)addr;
+        asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
+        return v;
+}
+#define test_bit(nr,addr) \
+(__builtin_constant_p(nr) ? \
+ constant_test_bit((nr),(addr)) : \
+ variable_test_bit((nr),(addr)))
+static inline void set_bit(int nr, void *addr)
+{
+        asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
+}
+#endif /* BOOT_BITOPS_H */
diff --git a/arch/i386/boot/boot.h b/arch/i386/boot/boot.h
new file mode 100644
index 0000000000..dec70c9b60
--- /dev/null
+++ b/arch/i386/boot/boot.h
@@ -0,0 +1,296 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/boot.h
+ *
+ * Header file for the real-mode kernel code
+ */
+#ifndef BOOT_BOOT_H
+#define BOOT_BOOT_H
+#ifndef __ASSEMBLY__
+#include <stdarg.h>
+#include <linux/types.h>
+#include <linux/edd.h>
+#include <asm/boot.h>
+#include <asm/bootparam.h>
+/* Useful macros */
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
+extern struct setup_header hdr;
+extern struct boot_params boot_params;
+/* Basic port I/O */
+static inline void outb(u8 v, u16 port)
+{
+        asm volatile("outb %0,%1" : : "a" (v), "dN" (port));
+}
+static inline u8 inb(u16 port)
+{
+        u8 v;
+        asm volatile("inb %1,%0" : "=a" (v) : "dN" (port));
+        return v;
+}
+static inline void outw(u16 v, u16 port)
+{
+        asm volatile("outw %0,%1" : : "a" (v), "dN" (port));
+}
+static inline u16 inw(u16 port)
+{
+        u16 v;
+        asm volatile("inw %1,%0" : "=a" (v) : "dN" (port));
+        return v;
+}
+static inline void outl(u32 v, u16 port)
+{
+        asm volatile("outl %0,%1" : : "a" (v), "dN" (port));
+}
+static inline u32 inl(u32 port)
+{
+        u32 v;
+        asm volatile("inl %1,%0" : "=a" (v) : "dN" (port));
+        return v;
+}
+static inline void io_delay(void)
+{
+        const u16 DELAY_PORT = 0x80;
+        asm volatile("outb %%al,%0" : : "dN" (DELAY_PORT));
+}
+/* These functions are used to reference data in other segments. */
+static inline u16 ds(void)
+{
+        u16 seg;
+        asm("movw %%ds,%0" : "=rm" (seg));
+        return seg;
+}
+static inline void set_fs(u16 seg)
+{
+        asm volatile("movw %0,%%fs" : : "rm" (seg));
+}
+static inline u16 fs(void)
+{
+        u16 seg;
+        asm("movw %%fs,%0" : "=rm" (seg));
+        return seg;
+}
+static inline void set_gs(u16 seg)
+{
+        asm volatile("movw %0,%%gs" : : "rm" (seg));
+}
+static inline u16 gs(void)
+{
+        u16 seg;
+        asm("movw %%gs,%0" : "=rm" (seg));
+        return seg;
+}
+typedef unsigned int addr_t;
+static inline u8 rdfs8(addr_t addr)
+{
+        u8 v;
+        asm("movb %%fs:%1,%0" : "=r" (v) : "m" (*(u8 *)addr));
+        return v;
+}
+static inline u16 rdfs16(addr_t addr)
+{
+        u16 v;
+        asm("movw %%fs:%1,%0" : "=r" (v) : "m" (*(u16 *)addr));
+        return v;
+}
+static inline u32 rdfs32(addr_t addr)
+{
+        u32 v;
+        asm("movl %%fs:%1,%0" : "=r" (v) : "m" (*(u32 *)addr));
+        return v;
+}
+static inline void wrfs8(u8 v, addr_t addr)
+{
+        asm volatile("movb %1,%%fs:%0" : "+m" (*(u8 *)addr) : "r" (v));
+}
+static inline void wrfs16(u16 v, addr_t addr)
+{
+        asm volatile("movw %1,%%fs:%0" : "+m" (*(u16 *)addr) : "r" (v));
+}
+static inline void wrfs32(u32 v, addr_t addr)
+{
+        asm volatile("movl %1,%%fs:%0" : "+m" (*(u32 *)addr) : "r" (v));
+}
+static inline u8 rdgs8(addr_t addr)
+{
+        u8 v;
+        asm("movb %%gs:%1,%0" : "=r" (v) : "m" (*(u8 *)addr));
+        return v;
+}
+static inline u16 rdgs16(addr_t addr)
+{
+        u16 v;
+        asm("movw %%gs:%1,%0" : "=r" (v) : "m" (*(u16 *)addr));
+        return v;
+}
+static inline u32 rdgs32(addr_t addr)
+{
+        u32 v;
+        asm("movl %%gs:%1,%0" : "=r" (v) : "m" (*(u32 *)addr));
+        return v;
+}
+static inline void wrgs8(u8 v, addr_t addr)
+{
+        asm volatile("movb %1,%%gs:%0" : "+m" (*(u8 *)addr) : "r" (v));
+}
+static inline void wrgs16(u16 v, addr_t addr)
+{
+        asm volatile("movw %1,%%gs:%0" : "+m" (*(u16 *)addr) : "r" (v));
+}
+static inline void wrgs32(u32 v, addr_t addr)
+{
+        asm volatile("movl %1,%%gs:%0" : "+m" (*(u32 *)addr) : "r" (v));
+}
+/* Note: these only return true/false, not a signed return value! */
+static inline int memcmp(const void *s1, const void *s2, size_t len)
+{
+        u8 diff;
+        asm("repe; cmpsb; setnz %0"
+            : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
+        return diff;
+}
+static inline int memcmp_fs(const void *s1, addr_t s2, size_t len)
+{
+        u8 diff;
+        asm("fs; repe; cmpsb; setnz %0"
+            : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
+        return diff;
+}
+static inline int memcmp_gs(const void *s1, addr_t s2, size_t len)
+{
+        u8 diff;
+        asm("gs; repe; cmpsb; setnz %0"
+            : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
+        return diff;
+}
+static inline int isdigit(int ch)
+{
+        return (ch >= '0') && (ch <= '9');
+}
+/* Heap -- available for dynamic lists. */
+#define STACK_SIZE      512     /* Minimum number of bytes for stack */
+extern char _end[];
+extern char *HEAP;
+extern char *heap_end;
+#define RESET_HEAP() ((void *)( HEAP = _end ))
+static inline char *__get_heap(size_t s, size_t a, size_t n)
+{
+        char *tmp;
+        HEAP = (char *)(((size_t)HEAP+(a-1)) & ~(a-1));
+        tmp = HEAP;
+        HEAP += s*n;
+        return tmp;
+}
+#define GET_HEAP(type, n) \
+        ((type *)__get_heap(sizeof(type),__alignof__(type),(n)))
+static inline int heap_free(void)
+{
+        return heap_end-HEAP;
+}
+/* copy.S */
+void copy_to_fs(addr_t dst, void *src, size_t len);
+void *copy_from_fs(void *dst, addr_t src, size_t len);
+void copy_to_gs(addr_t dst, void *src, size_t len);
+void *copy_from_gs(void *dst, addr_t src, size_t len);
+void *memcpy(void *dst, void *src, size_t len);
+void *memset(void *dst, int c, size_t len);
+#define memcpy(d,s,l) __builtin_memcpy(d,s,l)
+#define memset(d,c,l) __builtin_memset(d,c,l)
+/* a20.c */
+int enable_a20(void);
+/* apm.c */
+int query_apm_bios(void);
+/* cmdline.c */
+int cmdline_find_option(const char *option, char *buffer, int bufsize);
+/* cpu.c, cpucheck.c */
+int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr);
+int validate_cpu(void);
+/* edd.c */
+void query_edd(void);
+/* header.S */
+void __attribute__((noreturn)) die(void);
+/* mca.c */
+int query_mca(void);
+/* memory.c */
+int detect_memory(void);
+/* pm.c */
+void __attribute__((noreturn)) go_to_protected_mode(void);
+/* pmjump.S */
+void __attribute__((noreturn))
+        protected_mode_jump(u32 entrypoint, u32 bootparams);
+/* printf.c */
+int sprintf(char *buf, const char *fmt, ...);
+int vsprintf(char *buf, const char *fmt, va_list args);
+int printf(const char *fmt, ...);
+/* string.c */
+int strcmp(const char *str1, const char *str2);
+size_t strnlen(const char *s, size_t maxlen);
+unsigned int atou(const char *s);
+/* tty.c */
+void puts(const char *);
+void putchar(int);
+int getchar(void);
+void kbd_flush(void);
+int getchar_timeout(void);
+/* video.c */
+void set_video(void);
+/* video-vesa.c */
+void vesa_store_edid(void);
+/* voyager.c */
+int query_voyager(void);
+#endif /* __ASSEMBLY__ */
+#endif /* BOOT_BOOT_H */
diff --git a/arch/i386/boot/bootsect.S b/arch/i386/boot/bootsect.S
deleted file mode 100644
index 011b7a4993..0000000000
--- a/arch/i386/boot/bootsect.S
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *      bootsect.S              Copyright (C) 1991, 1992 Linus Torvalds
- *
- *      modified by Drew Eckhardt
- *      modified by Bruce Evans (bde)
- *      modified by Chris Noe (May 1999) (as86 -> gas)
- *      gutted by H. Peter Anvin (Jan 2003)
- *
- * BIG FAT NOTE: We're in real mode using 64k segments.  Therefore segment
- * addresses must be multiplied by 16 to obtain their respective linear
- * addresses. To avoid confusion, linear addresses are written using leading
- * hex while segment addresses are written as segment:offset.
- *
- */
-#include <asm/boot.h>
-SETUPSECTS      = 4                     /* default nr of setup-sectors */
-BOOTSEG         = 0x07C0                /* original address of boot-sector */
-INITSEG         = DEF_INITSEG           /* we move boot here - out of the way */
-SETUPSEG        = DEF_SETUPSEG          /* setup starts here */
-SYSSEG          = DEF_SYSSEG            /* system loaded at 0x10000 (65536) */
-SYSSIZE         = DEF_SYSSIZE           /* system size: # of 16-byte clicks */
-                                        /* to be loaded */
-ROOT_DEV        = 0                     /* ROOT_DEV is now written by "build" */
-SWAP_DEV        = 0                     /* SWAP_DEV is now written by "build" */
-#ifndef SVGA_MODE
-#define SVGA_MODE ASK_VGA
-#endif
-#ifndef RAMDISK
-#define RAMDISK 0
-#endif
-#ifndef ROOT_RDONLY
-#define ROOT_RDONLY 1
-#endif
-.code16
-.text
-.global _start
-_start:
-        # Normalize the start address
-        jmpl    $BOOTSEG, $start2
-start2:
-        movw    %cs, %ax
-        movw    %ax, %ds
-        movw    %ax, %es
-        movw    %ax, %ss
-        movw    $0x7c00, %sp
-        sti
-        cld
-        movw    $bugger_off_msg, %si
-msg_loop:
-        lodsb
-        andb    %al, %al
-        jz      die
-        movb    $0xe, %ah
-        movw    $7, %bx
-        int     $0x10
-        jmp     msg_loop
-die:
-        # Allow the user to press a key, then reboot
-        xorw    %ax, %ax
-        int     $0x16
-        int     $0x19
-        # int 0x19 should never return.  In case it does anyway,
-        # invoke the BIOS reset code...
-        ljmp    $0xf000,$0xfff0
-bugger_off_msg:
-        .ascii  "Direct booting from floppy is no longer supported.\r\n"
-        .ascii  "Please use a boot loader program instead.\r\n"
-        .ascii  "\n"
-        .ascii  "Remove disk and press any key to reboot . . .\r\n"
-        .byte   0
-        # Kernel attributes; used by setup
-        .org 497
-setup_sects:    .byte SETUPSECTS
-root_flags:     .word ROOT_RDONLY
-syssize:        .word SYSSIZE
-swap_dev:       .word SWAP_DEV
-ram_size:       .word RAMDISK
-vid_mode:       .word SVGA_MODE
-root_dev:       .word ROOT_DEV
-boot_flag:      .word 0xAA55
diff --git a/arch/i386/boot/cmdline.c b/arch/i386/boot/cmdline.c
new file mode 100644
index 0000000000..34bb778c43
--- /dev/null
+++ b/arch/i386/boot/cmdline.c
@@ -0,0 +1,97 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/cmdline.c
+ *
+ * Simple command-line parser for early boot.
+ */
+#include "boot.h"
+static inline int myisspace(u8 c)
+{
+        return c <= ' ';        /* Close enough approximation */
+}
+/*
+ * Find a non-boolean option, that is, "option=argument".  In accordance
+ * with standard Linux practice, if this option is repeated, this returns
+ * the last instance on the command line.
+ *
+ * Returns the length of the argument (regardless of if it was
+ * truncated to fit in the buffer), or -1 on not found.
+ */
+int cmdline_find_option(const char *option, char *buffer, int bufsize)
+{
+        u32 cmdline_ptr = boot_params.hdr.cmd_line_ptr;
+        addr_t cptr;
+        char c;
+        int len = -1;
+        const char *opptr = NULL;
+        char *bufptr = buffer;
+        enum {
+                st_wordstart,   /* Start of word/after whitespace */
+                st_wordcmp,     /* Comparing this word */
+                st_wordskip,    /* Miscompare, skip */
+                st_bufcpy       /* Copying this to buffer */
+        } state = st_wordstart;
+        if (!cmdline_ptr || cmdline_ptr >= 0x100000)
+                return -1;      /* No command line, or inaccessible */
+        cptr = cmdline_ptr & 0xf;
+        set_fs(cmdline_ptr >> 4);
+        while (cptr < 0x10000 && (c = rdfs8(cptr++))) {
+                switch (state) {
+                case st_wordstart:
+                        if (myisspace(c))
+                                break;
+                        /* else */
+                        state = st_wordcmp;
+                        opptr = option;
+                        /* fall through */
+                case st_wordcmp:
+                        if (c == '=' && !*opptr) {
+                                len = 0;
+                                bufptr = buffer;
+                                state = st_bufcpy;
+                        } else if (myisspace(c)) {
+                                state = st_wordstart;
+                        } else if (c != *opptr++) {
+                                state = st_wordskip;
+                        }
+                        break;
+                case st_wordskip:
+                        if (myisspace(c))
+                                state = st_wordstart;
+                        break;
+                case st_bufcpy:
+                        if (myisspace(c)) {
+                                state = st_wordstart;
+                        } else {
+                                if (len < bufsize-1)
+                                        *bufptr++ = c;
+                                len++;
+                        }
+                        break;
+                }
+        }
+        if (bufsize)
+                *bufptr = '\0';
+        return len;
+}
diff --git a/arch/i386/boot/code16gcc.h b/arch/i386/boot/code16gcc.h
new file mode 100644
index 0000000000..3bd848093b
--- /dev/null
+++ b/arch/i386/boot/code16gcc.h
@@ -0,0 +1,15 @@
+/*
+ * code16gcc.h
+ *
+ * This file is -include'd when compiling 16-bit C code.
+ * Note: this asm() needs to be emitted before gcc omits any code.
+ * Depending on gcc version, this requires -fno-unit-at-a-time or
+ * -fno-toplevel-reorder.
+ *
+ * Hopefully gcc will eventually have a real -m16 option so we can
+ * drop this hack long term.
+ */
+#ifndef __ASSEMBLY__
+asm(".code16gcc");
+#endif
diff --git a/arch/i386/boot/compressed/Makefile b/arch/i386/boot/compressed/Makefile
index a661217f33..189fa1dbef 100644
--- a/arch/i386/boot/compressed/Makefile
+++ b/arch/i386/boot/compressed/Makefile
@@ -9,9 +9,14 @@ targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o \
 EXTRA_AFLAGS    := -traditional
 LDFLAGS_vmlinux := -T
-CFLAGS_misc.o += -fPIC
 hostprogs-y     := relocs
+CFLAGS  := -m32 -D__KERNEL__ $(LINUX_INCLUDE) -O2 \
+           -fno-strict-aliasing -fPIC \
+           $(call cc-option,-ffreestanding) \
+           $(call cc-option,-fno-stack-protector)
+LDFLAGS := -m elf_i386
 $(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE
        $(call if_changed,ld)
        @:
diff --git a/arch/i386/boot/compressed/head.S b/arch/i386/boot/compressed/head.S
index 3517a32aaf..f35ea22375 100644
--- a/arch/i386/boot/compressed/head.S
+++ b/arch/i386/boot/compressed/head.S
@@ -45,10 +45,10 @@ startup_32:
 * at and where we were actually loaded at.  This can only be done
 * with a short local call on x86.  Nothing  else will tell us what
 * address we are running at.  The reserved chunk of the real-mode
- * data at 0x34-0x3f are used as the stack for this calculation.
+ * data at 0x1e4 (defined as a scratch field) are used as the stack
- * Only 4 bytes are needed.
+ * for this calculation. Only 4 bytes are needed.
 */
-        leal 0x40(%esi), %esp
+        leal (0x1e4+4)(%esi), %esp
        call 1f
 1:      popl %ebp
        subl $1b, %ebp
diff --git a/arch/i386/boot/compressed/relocs.c b/arch/i386/boot/compressed/relocs.c
index ce4fda261a..b0e21c3cee 100644
--- a/arch/i386/boot/compressed/relocs.c
+++ b/arch/i386/boot/compressed/relocs.c
@@ -31,6 +31,8 @@ static const char* safe_abs_relocs[] = {
                "__kernel_rt_sigreturn",
                "__kernel_sigreturn",
                "SYSENTER_RETURN",
+                "xen_irq_disable_direct_reloc",
+                "xen_save_fl_direct_reloc",
 };
 static int is_safe_abs_reloc(const char* sym_name)
diff --git a/arch/i386/boot/copy.S b/arch/i386/boot/copy.S
new file mode 100644
index 0000000000..ef127e56a3
--- /dev/null
+++ b/arch/i386/boot/copy.S
@@ -0,0 +1,101 @@
+/* ----------------------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/copy.S
+ *
+ * Memory copy routines
+ */
+        .code16gcc
+        .text
+        .globl  memcpy
+        .type   memcpy, @function
+memcpy:
+        pushw   %si
+        pushw   %di
+        movw    %ax, %di
+        movw    %dx, %si
+        pushw   %cx
+        shrw    $2, %cx
+        rep; movsl
+        popw    %cx
+        andw    $3, %cx
+        rep; movsb
+        popw    %di
+        popw    %si
+        ret
+        .size   memcpy, .-memcpy
+        .globl  memset
+        .type   memset, @function
+memset:
+        pushw   %di
+        movw    %ax, %di
+        movzbl  %dl, %eax
+        imull   $0x01010101,%eax
+        pushw   %cx
+        shrw    $2, %cx
+        rep; stosl
+        popw    %cx
+        andw    $3, %cx
+        rep; stosb
+        popw    %di
+        ret
+        .size   memset, .-memset
+        .globl  copy_from_fs
+        .type   copy_from_fs, @function
+copy_from_fs:
+        pushw   %ds
+        pushw   %fs
+        popw    %ds
+        call    memcpy
+        popw    %ds
+        ret
+        .size   copy_from_fs, .-copy_from_fs
+        .globl  copy_to_fs
+        .type   copy_to_fs, @function
+copy_to_fs:
+        pushw   %es
+        pushw   %fs
+        popw    %es
+        call    memcpy
+        popw    %es
+        ret
+        .size   copy_to_fs, .-copy_to_fs
+#if 0 /* Not currently used, but can be enabled as needed */
+        .globl  copy_from_gs
+        .type   copy_from_gs, @function
+copy_from_gs:
+        pushw   %ds
+        pushw   %gs
+        popw    %ds
+        call    memcpy
+        popw    %ds
+        ret
+        .size   copy_from_gs, .-copy_from_gs
+        .globl  copy_to_gs
+        .type   copy_to_gs, @function
+copy_to_gs:
+        pushw   %es
+        pushw   %gs
+        popw    %es
+        call    memcpy
+        popw    %es
+        ret
+        .size   copy_to_gs, .-copy_to_gs
+#endif
diff --git a/arch/i386/boot/cpu.c b/arch/i386/boot/cpu.c
new file mode 100644
index 0000000000..2a5c32da58
--- /dev/null
+++ b/arch/i386/boot/cpu.c
@@ -0,0 +1,69 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/cpu.c
+ *
+ * Check for obligatory CPU features and abort if the features are not
+ * present.
+ */
+#include "boot.h"
+#include "bitops.h"
+#include <asm/cpufeature.h>
+static char *cpu_name(int level)
+{
+        static char buf[6];
+        if (level == 64) {
+                return "x86-64";
+        } else {
+                sprintf(buf, "i%d86", level);
+                return buf;
+        }
+}
+int validate_cpu(void)
+{
+        u32 *err_flags;
+        int cpu_level, req_level;
+        check_cpu(&cpu_level, &req_level, &err_flags);
+        if (cpu_level < req_level) {
+                printf("This kernel requires an %s CPU, ",
+                       cpu_name(req_level));
+                printf("but only detected an %s CPU.\n",
+                       cpu_name(cpu_level));
+                return -1;
+        }
+        if (err_flags) {
+                int i, j;
+                puts("This kernel requires the following features "
+                     "not present on the CPU:\n");
+                for (i = 0; i < NCAPINTS; i++) {
+                        u32 e = err_flags[i];
+                        for (j = 0; j < 32; j++) {
+                                if (e & 1)
+                                        printf("%d:%d ", i, j);
+                                e >>= 1;
+                        }
+                }
+                putchar('\n');
+                return -1;
+        } else {
+                return 0;
+        }
+}
diff --git a/arch/i386/boot/cpucheck.c b/arch/i386/boot/cpucheck.c
new file mode 100644
index 0000000000..991e8ceae1
--- /dev/null
+++ b/arch/i386/boot/cpucheck.c
@@ -0,0 +1,267 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/cpucheck.c
+ *
+ * Check for obligatory CPU features and abort if the features are not
+ * present.  This code should be compilable as 16-, 32- or 64-bit
+ * code, so be very careful with types and inline assembly.
+ *
+ * This code should not contain any messages; that requires an
+ * additional wrapper.
+ *
+ * As written, this code is not safe for inclusion into the kernel
+ * proper (after FPU initialization, in particular).
+ */
+#ifdef _SETUP
+# include "boot.h"
+# include "bitops.h"
+#endif
+#include <linux/types.h>
+#include <asm/cpufeature.h>
+#include <asm/processor-flags.h>
+#include <asm/required-features.h>
+#include <asm/msr-index.h>
+struct cpu_features {
+        int level;              /* Family, or 64 for x86-64 */
+        int model;
+        u32 flags[NCAPINTS];
+};
+static struct cpu_features cpu;
+static u32 cpu_vendor[3];
+static u32 err_flags[NCAPINTS];
+#ifdef CONFIG_X86_64
+static const int req_level = 64;
+#elif defined(CONFIG_X86_MINIMUM_CPU_FAMILY)
+static const int req_level = CONFIG_X86_MINIMUM_CPU_FAMILY;
+#else
+static const int req_level = 3;
+#endif
+static const u32 req_flags[NCAPINTS] =
+{
+        REQUIRED_MASK0,
+        REQUIRED_MASK1,
+        REQUIRED_MASK2,
+        REQUIRED_MASK3,
+        REQUIRED_MASK4,
+        REQUIRED_MASK5,
+        REQUIRED_MASK6,
+        REQUIRED_MASK7,
+};
+#define A32(a,b,c,d) (((d) << 24)+((c) << 16)+((b) << 8)+(a))
+static int is_amd(void)
+{
+        return cpu_vendor[0] == A32('A','u','t','h') &&
+               cpu_vendor[1] == A32('e','n','t','i') &&
+               cpu_vendor[2] == A32('c','A','M','D');
+}
+static int is_centaur(void)
+{
+        return cpu_vendor[0] == A32('C','e','n','t') &&
+               cpu_vendor[1] == A32('a','u','r','H') &&
+               cpu_vendor[2] == A32('a','u','l','s');
+}
+static int is_transmeta(void)
+{
+        return cpu_vendor[0] == A32('G','e','n','u') &&
+               cpu_vendor[1] == A32('i','n','e','T') &&
+               cpu_vendor[2] == A32('M','x','8','6');
+}
+static int has_fpu(void)
+{
+        u16 fcw = -1, fsw = -1;
+        u32 cr0;
+        asm("movl %%cr0,%0" : "=r" (cr0));
+        if (cr0 & (X86_CR0_EM|X86_CR0_TS)) {
+                cr0 &= ~(X86_CR0_EM|X86_CR0_TS);
+                asm volatile("movl %0,%%cr0" : : "r" (cr0));
+        }
+        asm("fninit ; fnstsw %0 ; fnstcw %1" : "+m" (fsw), "+m" (fcw));
+        return fsw == 0 && (fcw & 0x103f) == 0x003f;
+}
+static int has_eflag(u32 mask)
+{
+        u32 f0, f1;
+        asm("pushfl ; "
+            "pushfl ; "
+            "popl %0 ; "
+            "movl %0,%1 ; "
+            "xorl %2,%1 ; "
+            "pushl %1 ; "
+            "popfl ; "
+            "pushfl ; "
+            "popl %1 ; "
+            "popfl"
+            : "=&r" (f0), "=&r" (f1)
+            : "ri" (mask));
+        return !!((f0^f1) & mask);
+}
+static void get_flags(void)
+{
+        u32 max_intel_level, max_amd_level;
+        u32 tfms;
+        if (has_fpu())
+                set_bit(X86_FEATURE_FPU, cpu.flags);
+        if (has_eflag(X86_EFLAGS_ID)) {
+                asm("cpuid"
+                    : "=a" (max_intel_level),
+                      "=b" (cpu_vendor[0]),
+                      "=d" (cpu_vendor[1]),
+                      "=c" (cpu_vendor[2])
+                    : "a" (0));
+                if (max_intel_level >= 0x00000001 &&
+                    max_intel_level <= 0x0000ffff) {
+                        asm("cpuid"
+                            : "=a" (tfms),
+                              "=c" (cpu.flags[4]),
+                              "=d" (cpu.flags[0])
+                            : "a" (0x00000001)
+                            : "ebx");
+                        cpu.level = (tfms >> 8) & 15;
+                        cpu.model = (tfms >> 4) & 15;
+                        if (cpu.level >= 6)
+                                cpu.model += ((tfms >> 16) & 0xf) << 4;
+                }
+                asm("cpuid"
+                    : "=a" (max_amd_level)
+                    : "a" (0x80000000)
+                    : "ebx", "ecx", "edx");
+                if (max_amd_level >= 0x80000001 &&
+                    max_amd_level <= 0x8000ffff) {
+                        u32 eax = 0x80000001;
+                        asm("cpuid"
+                            : "+a" (eax),
+                              "=c" (cpu.flags[6]),
+                              "=d" (cpu.flags[1])
+                            : : "ebx");
+                }
+        }
+}
+/* Returns a bitmask of which words we have error bits in */
+static int check_flags(void)
+{
+        u32 err;
+        int i;
+        err = 0;
+        for (i = 0; i < NCAPINTS; i++) {
+                err_flags[i] = req_flags[i] & ~cpu.flags[i];
+                if (err_flags[i])
+                        err |= 1 << i;
+        }
+        return err;
+}
+/*
+ * Returns -1 on error.
+ *
+ * *cpu_level is set to the current CPU level; *req_level to the required
+ * level.  x86-64 is considered level 64 for this purpose.
+ *
+ * *err_flags_ptr is set to the flags error array if there are flags missing.
+ */
+int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
+{
+        int err;
+        memset(&cpu.flags, 0, sizeof cpu.flags);
+        cpu.level = 3;
+        if (has_eflag(X86_EFLAGS_AC))
+                cpu.level = 4;
+        get_flags();
+        err = check_flags();
+        if (test_bit(X86_FEATURE_LM, cpu.flags))
+                cpu.level = 64;
+        if (err == 0x01 &&
+            !(err_flags[0] &
+              ~((1 << X86_FEATURE_XMM)|(1 << X86_FEATURE_XMM2))) &&
+            is_amd()) {
+                /* If this is an AMD and we're only missing SSE+SSE2, try to
+                   turn them on */
+                u32 ecx = MSR_K7_HWCR;
+                u32 eax, edx;
+                asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
+                eax &= ~(1 << 15);
+                asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
+                get_flags();    /* Make sure it really did something */
+                err = check_flags();
+        } else if (err == 0x01 &&
+                   !(err_flags[0] & ~(1 << X86_FEATURE_CX8)) &&
+                   is_centaur() && cpu.model >= 6) {
+                /* If this is a VIA C3, we might have to enable CX8
+                   explicitly */
+                u32 ecx = MSR_VIA_FCR;
+                u32 eax, edx;
+                asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
+                eax |= (1<<1)|(1<<7);
+                asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
+                set_bit(X86_FEATURE_CX8, cpu.flags);
+                err = check_flags();
+        } else if (err == 0x01 && is_transmeta()) {
+                /* Transmeta might have masked feature bits in word 0 */
+                u32 ecx = 0x80860004;
+                u32 eax, edx;
+                u32 level = 1;
+                asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
+                asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
+                asm("cpuid"
+                    : "+a" (level), "=d" (cpu.flags[0])
+                    : : "ecx", "ebx");
+                asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
+                err = check_flags();
+        }
+        if (err_flags_ptr)
+                *err_flags_ptr = err ? err_flags : NULL;
+        if (cpu_level_ptr)
+                *cpu_level_ptr = cpu.level;
+        if (req_level_ptr)
+                *req_level_ptr = req_level;
+        return (cpu.level < req_level || err) ? -1 : 0;
+}
diff --git a/arch/i386/boot/edd.S b/arch/i386/boot/edd.S
deleted file mode 100644
index 3432136801..0000000000
--- a/arch/i386/boot/edd.S
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * BIOS Enhanced Disk Drive support
- * Copyright (C) 2002, 2003, 2004 Dell, Inc.
- * by Matt Domsch <Matt_Domsch@dell.com> October 2002
- * conformant to T13 Committee www.t13.org
- *   projects 1572D, 1484D, 1386D, 1226DT
- * disk signature read by Matt Domsch <Matt_Domsch@dell.com>
- *      and Andrew Wilks <Andrew_Wilks@dell.com> September 2003, June 2004
- * legacy CHS retrieval by Patrick J. LoPresti <patl@users.sourceforge.net>
- *      March 2004
- * Command line option parsing, Matt Domsch, November 2004
- */
-#include <linux/edd.h>
-#include <asm/setup.h>
-#if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
-# It is assumed that %ds == INITSEG here
-        movb    $0, (EDD_MBR_SIG_NR_BUF)
-        movb    $0, (EDDNR)
-# Check the command line for options:
-# edd=of  disables EDD completely  (edd=off)
-# edd=sk  skips the MBR test    (edd=skipmbr)
-# edd=on  re-enables EDD (edd=on)
-        pushl   %esi
-        movw    $edd_mbr_sig_start, %di # Default to edd=on
-        movl    %cs:(cmd_line_ptr), %esi
-        andl    %esi, %esi
-        jz      old_cl                  # Old boot protocol?
-# Convert to a real-mode pointer in fs:si
-        movl    %esi, %eax
-        shrl    $4, %eax
-        movw    %ax, %fs
-        andw    $0xf, %si
-        jmp     have_cl_pointer
-# Old-style boot protocol?
-old_cl:
-        push    %ds                     # aka INITSEG
-        pop     %fs
-        cmpw    $0xa33f, (0x20)
-        jne     done_cl                 # No command line at all?
-        movw    (0x22), %si             # Pointer relative to INITSEG
-# fs:si has the pointer to the command line now
-have_cl_pointer:
-# Loop through kernel command line one byte at a time.  Just in
-# case the loader is buggy and failed to null-terminate the command line
-# terminate if we get close enough to the end of the segment that we
-# cannot fit "edd=XX"...
-cl_atspace:
-        cmpw    $-5, %si                # Watch for segment wraparound
-        jae     done_cl
-        movl    %fs:(%si), %eax
-        andb    %al, %al                # End of line?
-        jz      done_cl
-        cmpl    $EDD_CL_EQUALS, %eax
-        jz      found_edd_equals
-        cmpb    $0x20, %al              # <= space consider whitespace
-        ja      cl_skipword
-        incw    %si
-        jmp     cl_atspace
-cl_skipword:
-        cmpw    $-5, %si                # Watch for segment wraparound
-        jae     done_cl
-        movb    %fs:(%si), %al          # End of string?
-        andb    %al, %al
-        jz      done_cl
-        cmpb    $0x20, %al
-        jbe     cl_atspace
-        incw    %si
-        jmp     cl_skipword
-found_edd_equals:
-# only looking at first two characters after equals
-# late overrides early on the command line, so keep going after finding something
-        movw    %fs:4(%si), %ax
-        cmpw    $EDD_CL_OFF, %ax        # edd=of
-        je      do_edd_off
-        cmpw    $EDD_CL_SKIP, %ax       # edd=sk
-        je      do_edd_skipmbr
-        cmpw    $EDD_CL_ON, %ax         # edd=on
-        je      do_edd_on
-        jmp     cl_skipword
-do_edd_skipmbr:
-        movw    $edd_start, %di
-        jmp     cl_skipword
-do_edd_off:
-        movw    $edd_done, %di
-        jmp     cl_skipword
-do_edd_on:
-        movw    $edd_mbr_sig_start, %di
-        jmp     cl_skipword
-done_cl:
-        popl    %esi
-        jmpw    *%di
-# Read the first sector of each BIOS disk device and store the 4-byte signature
-edd_mbr_sig_start:
-        movb    $0x80, %dl                      # from device 80
-        movw    $EDD_MBR_SIG_BUF, %bx           # store buffer ptr in bx
-edd_mbr_sig_read:
-        movl    $0xFFFFFFFF, %eax
-        movl    %eax, (%bx)                     # assume failure
-        pushw   %bx
-        movb    $READ_SECTORS, %ah
-        movb    $1, %al                         # read 1 sector
-        movb    $0, %dh                         # at head 0
-        movw    $1, %cx                         # cylinder 0, sector 0
-        pushw   %es
-        pushw   %ds
-        popw    %es
-        movw    $EDDBUF, %bx                    # disk's data goes into EDDBUF
-        pushw   %dx             # work around buggy BIOSes
-        stc                     # work around buggy BIOSes
-        int     $0x13
-        sti                     # work around buggy BIOSes
-        popw    %dx
-        popw    %es
-        popw    %bx
-        jc      edd_mbr_sig_done                # on failure, we're done.
-        cmpb    $0, %ah         # some BIOSes do not set CF
-        jne     edd_mbr_sig_done                # on failure, we're done.
-        movl    (EDDBUF+EDD_MBR_SIG_OFFSET), %eax # read sig out of the MBR
-        movl    %eax, (%bx)                     # store success
-        incb    (EDD_MBR_SIG_NR_BUF)            # note that we stored something
-        incb    %dl                             # increment to next device
-        addw    $4, %bx                         # increment sig buffer ptr
-        cmpb    $EDD_MBR_SIG_MAX, (EDD_MBR_SIG_NR_BUF)  # Out of space?
-        jb      edd_mbr_sig_read                # keep looping
-edd_mbr_sig_done:
-# Do the BIOS Enhanced Disk Drive calls
-# This consists of two calls:
-#    int 13h ah=41h "Check Extensions Present"
-#    int 13h ah=48h "Get Device Parameters"
-#    int 13h ah=08h "Legacy Get Device Parameters"
-#
-# A buffer of size EDDMAXNR*(EDDEXTSIZE+EDDPARMSIZE) is reserved for our use
-# in the boot_params at EDDBUF.  The first four bytes of which are
-# used to store the device number, interface support map and version
-# results from fn41.  The next four bytes are used to store the legacy
-# cylinders, heads, and sectors from fn08. The following 74 bytes are used to
-# store the results from fn48.  Starting from device 80h, fn41, then fn48
-# are called and their results stored in EDDBUF+n*(EDDEXTSIZE+EDDPARMIZE).
-# Then the pointer is incremented to store the data for the next call.
-# This repeats until either a device doesn't exist, or until EDDMAXNR
-# devices have been stored.
-# The one tricky part is that ds:si always points EDDEXTSIZE bytes into
-# the structure, and the fn41 and fn08 results are stored at offsets
-# from there.  This removes the need to increment the pointer for
-# every store, and leaves it ready for the fn48 call.
-# A second one-byte buffer, EDDNR, in the boot_params stores
-# the number of BIOS devices which exist, up to EDDMAXNR.
-# In setup.c, copy_edd() stores both boot_params buffers away
-# for later use, as they would get overwritten otherwise.
-# This code is sensitive to the size of the structs in edd.h
-edd_start:
-                                                # %ds points to the bootsector
-                                                # result buffer for fn48
-        movw    $EDDBUF+EDDEXTSIZE, %si         # in ds:si, fn41 results
-                                                # kept just before that
-        movb    $0x80, %dl                      # BIOS device 0x80
-edd_check_ext:
-        movb    $CHECKEXTENSIONSPRESENT, %ah    # Function 41
-        movw    $EDDMAGIC1, %bx                 # magic
-        int     $0x13                           # make the call
-        jc      edd_done                        # no more BIOS devices
-        cmpw    $EDDMAGIC2, %bx                 # is magic right?
-        jne     edd_next                        # nope, next...
-        movb    %dl, %ds:-8(%si)                # store device number
-        movb    %ah, %ds:-7(%si)                # store version
-        movw    %cx, %ds:-6(%si)                # store extensions
-        incb    (EDDNR)                         # note that we stored something
-edd_get_device_params:
-        movw    $EDDPARMSIZE, %ds:(%si)         # put size
-        movw    $0x0, %ds:2(%si)                # work around buggy BIOSes
-        movb    $GETDEVICEPARAMETERS, %ah       # Function 48
-        int     $0x13                           # make the call
-                                                # Don't check for fail return
-                                                # it doesn't matter.
-edd_get_legacy_chs:
-        xorw    %ax, %ax
-        movw    %ax, %ds:-4(%si)
-        movw    %ax, %ds:-2(%si)
-        # Ralf Brown's Interrupt List says to set ES:DI to
-        # 0000h:0000h "to guard against BIOS bugs"
-        pushw   %es
-        movw    %ax, %es
-        movw    %ax, %di
-        pushw   %dx                             # legacy call clobbers %dl
-        movb    $LEGACYGETDEVICEPARAMETERS, %ah # Function 08
-        int     $0x13                           # make the call
-        jc      edd_legacy_done                 # failed
-        movb    %cl, %al                        # Low 6 bits are max
-        andb    $0x3F, %al                      #   sector number
-        movb    %al, %ds:-1(%si)                # Record max sect
-        movb    %dh, %ds:-2(%si)                # Record max head number
-        movb    %ch, %al                        # Low 8 bits of max cyl
-        shr     $6, %cl
-        movb    %cl, %ah                        # High 2 bits of max cyl
-        movw    %ax, %ds:-4(%si)
-edd_legacy_done:
-        popw    %dx
-        popw    %es
-        movw    %si, %ax                        # increment si
-        addw    $EDDPARMSIZE+EDDEXTSIZE, %ax
-        movw    %ax, %si
-edd_next:
-        incb    %dl                             # increment to next device
-        cmpb    $EDDMAXNR, (EDDNR)              # Out of space?
-        jb      edd_check_ext                   # keep looping
-edd_done:
-#endif
diff --git a/arch/i386/boot/edd.c b/arch/i386/boot/edd.c
new file mode 100644
index 0000000000..25a282494f
--- /dev/null
+++ b/arch/i386/boot/edd.c
@@ -0,0 +1,196 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/edd.c
+ *
+ * Get EDD BIOS disk information
+ */
+#include "boot.h"
+#include <linux/edd.h>
+#if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
+struct edd_dapa {
+        u8      pkt_size;
+        u8      rsvd;
+        u16     sector_cnt;
+        u16     buf_off, buf_seg;
+        u64     lba;
+        u64     buf_lin_addr;
+};
+/*
+ * Read the MBR (first sector) from a specific device.
+ */
+static int read_mbr(u8 devno, void *buf)
+{
+        struct edd_dapa dapa;
+        u16 ax, bx, cx, dx, si;
+        memset(&dapa, 0, sizeof dapa);
+        dapa.pkt_size = sizeof(dapa);
+        dapa.sector_cnt = 1;
+        dapa.buf_off = (size_t)buf;
+        dapa.buf_seg = ds();
+        /* dapa.lba = 0; */
+        ax = 0x4200;            /* Extended Read */
+        si = (size_t)&dapa;
+        dx = devno;
+        asm("pushfl; stc; int $0x13; setc %%al; popfl"
+            : "+a" (ax), "+S" (si), "+d" (dx)
+            : "m" (dapa)
+            : "ebx", "ecx", "edi", "memory");
+        if (!(u8)ax)
+                return 0;       /* OK */
+        ax = 0x0201;            /* Legacy Read, one sector */
+        cx = 0x0001;            /* Sector 0-0-1 */
+        dx = devno;
+        bx = (size_t)buf;
+        asm("pushfl; stc; int $0x13; setc %%al; popfl"
+            : "+a" (ax), "+c" (cx), "+d" (dx), "+b" (bx)
+            : : "esi", "edi", "memory");
+        return -(u8)ax;         /* 0 or -1 */
+}
+static u32 read_mbr_sig(u8 devno, struct edd_info *ei)
+{
+        int sector_size;
+        char *mbrbuf_ptr, *mbrbuf_end;
+        u32 mbrsig;
+        u32 buf_base, mbr_base;
+        extern char _end[];
+        static char mbr_buf[1024];
+        sector_size = ei->params.bytes_per_sector;
+        if (!sector_size)
+                sector_size = 512; /* Best available guess */
+        buf_base = (ds() << 4) + (u32)&_end;
+        mbr_base = (buf_base+sector_size-1) & ~(sector_size-1);
+        mbrbuf_ptr = mbr_buf + (mbr_base-buf_base);
+        mbrbuf_end = mbrbuf_ptr + sector_size;
+        if (!(boot_params.hdr.loadflags & CAN_USE_HEAP))
+                return 0;
+        if (mbrbuf_end > (char *)(size_t)boot_params.hdr.heap_end_ptr)
+                return 0;
+        if (read_mbr(devno, mbrbuf_ptr))
+                return 0;
+        mbrsig = *(u32 *)&mbrbuf_ptr[EDD_MBR_SIG_OFFSET];
+        return mbrsig;
+}
+static int get_edd_info(u8 devno, struct edd_info *ei)
+{
+        u16 ax, bx, cx, dx, di;
+        memset(ei, 0, sizeof *ei);
+        /* Check Extensions Present */
+        ax = 0x4100;
+        bx = EDDMAGIC1;
+        dx = devno;
+        asm("pushfl; stc; int $0x13; setc %%al; popfl"
+            : "+a" (ax), "+b" (bx), "=c" (cx), "+d" (dx)
+            : : "esi", "edi");
+        if ((u8)ax)
+                return -1;      /* No extended information */
+        if (bx != EDDMAGIC2)
+                return -1;
+        ei->device  = devno;
+        ei->version = ax >> 8;  /* EDD version number */
+        ei->interface_support = cx; /* EDD functionality subsets */
+        /* Extended Get Device Parameters */
+        ei->params.length = sizeof(ei->params);
+        ax = 0x4800;
+        dx = devno;
+        asm("pushfl; int $0x13; popfl"
+            : "+a" (ax), "+d" (dx)
+            : "S" (&ei->params)
+            : "ebx", "ecx", "edi");
+        /* Get legacy CHS parameters */
+        /* Ralf Brown recommends setting ES:DI to 0:0 */
+        ax = 0x0800;
+        dx = devno;
+        di = 0;
+        asm("pushw %%es; "
+            "movw %%di,%%es; "
+            "pushfl; stc; int $0x13; setc %%al; popfl; "
+            "popw %%es"
+            : "+a" (ax), "=b" (bx), "=c" (cx), "+d" (dx), "+D" (di)
+            : : "esi");
+        if ((u8)ax == 0) {
+                ei->legacy_max_cylinder = (cx >> 8) + ((cx & 0xc0) << 2);
+                ei->legacy_max_head = dx >> 8;
+                ei->legacy_sectors_per_track = cx & 0x3f;
+        }
+        return 0;
+}
+void query_edd(void)
+{
+        char eddarg[8];
+        int do_mbr = 1;
+        int do_edd = 1;
+        int devno;
+        struct edd_info ei, *edp;
+        if (cmdline_find_option("edd", eddarg, sizeof eddarg) > 0) {
+                if (!strcmp(eddarg, "skipmbr") || !strcmp(eddarg, "skip"))
+                        do_mbr = 0;
+                else if (!strcmp(eddarg, "off"))
+                        do_edd = 0;
+        }
+        edp = (struct edd_info *)boot_params.eddbuf;
+        if (!do_edd)
+                return;
+        for (devno = 0x80; devno < 0x80+EDD_MBR_SIG_MAX; devno++) {
+                /*
+                 * Scan the BIOS-supported hard disks and query EDD
+                 * information...
+                 */
+                get_edd_info(devno, &ei);
+                if (boot_params.eddbuf_entries < EDDMAXNR) {
+                        memcpy(edp, &ei, sizeof ei);
+                        edp++;
+                        boot_params.eddbuf_entries++;
+                }
+                if (do_mbr) {
+                        u32 mbr_sig;
+                        mbr_sig = read_mbr_sig(devno, &ei);
+                        boot_params.edd_mbr_sig_buffer[devno-0x80] = mbr_sig;
+                }
+        }
+}
+#endif
diff --git a/arch/i386/boot/header.S b/arch/i386/boot/header.S
new file mode 100644
index 0000000000..6b9923fb6e
--- /dev/null
+++ b/arch/i386/boot/header.S
@@ -0,0 +1,283 @@
+/*
+ *      header.S
+ *
+ *      Copyright (C) 1991, 1992 Linus Torvalds
+ *
+ *      Based on bootsect.S and setup.S
+ *      modified by more people than can be counted
+ *
+ *      Rewritten as a common file by H. Peter Anvin (Apr 2007)
+ *
+ * BIG FAT NOTE: We're in real mode using 64k segments.  Therefore segment
+ * addresses must be multiplied by 16 to obtain their respective linear
+ * addresses. To avoid confusion, linear addresses are written using leading
+ * hex while segment addresses are written as segment:offset.
+ *
+ */
+#include <asm/segment.h>
+#include <linux/utsrelease.h>
+#include <asm/boot.h>
+#include <asm/e820.h>
+#include <asm/page.h>
+#include <asm/setup.h>
+#include "boot.h"
+SETUPSECTS      = 4                     /* default nr of setup-sectors */
+BOOTSEG         = 0x07C0                /* original address of boot-sector */
+SYSSEG          = DEF_SYSSEG            /* system loaded at 0x10000 (65536) */
+SYSSIZE         = DEF_SYSSIZE           /* system size: # of 16-byte clicks */
+                                        /* to be loaded */
+ROOT_DEV        = 0                     /* ROOT_DEV is now written by "build" */
+SWAP_DEV        = 0                     /* SWAP_DEV is now written by "build" */
+#ifndef SVGA_MODE
+#define SVGA_MODE ASK_VGA
+#endif
+#ifndef RAMDISK
+#define RAMDISK 0
+#endif
+#ifndef ROOT_RDONLY
+#define ROOT_RDONLY 1
+#endif
+        .code16
+        .section ".bstext", "ax"
+        .global bootsect_start
+bootsect_start:
+        # Normalize the start address
+        ljmp    $BOOTSEG, $start2
+start2:
+        movw    %cs, %ax
+        movw    %ax, %ds
+        movw    %ax, %es
+        movw    %ax, %ss
+        xorw    %sp, %sp
+        sti
+        cld
+        movw    $bugger_off_msg, %si
+msg_loop:
+        lodsb
+        andb    %al, %al
+        jz      bs_die
+        movb    $0xe, %ah
+        movw    $7, %bx
+        int     $0x10
+        jmp     msg_loop
+bs_die:
+        # Allow the user to press a key, then reboot
+        xorw    %ax, %ax
+        int     $0x16
+        int     $0x19
+        # int 0x19 should never return.  In case it does anyway,
+        # invoke the BIOS reset code...
+        ljmp    $0xf000,$0xfff0
+        .section ".bsdata", "a"
+bugger_off_msg:
+        .ascii  "Direct booting from floppy is no longer supported.\r\n"
+        .ascii  "Please use a boot loader program instead.\r\n"
+        .ascii  "\n"
+        .ascii  "Remove disk and press any key to reboot . . .\r\n"
+        .byte   0
+        # Kernel attributes; used by setup.  This is part 1 of the
+        # header, from the old boot sector.
+        .section ".header", "a"
+        .globl  hdr
+hdr:
+setup_sects:    .byte SETUPSECTS
+root_flags:     .word ROOT_RDONLY
+syssize:        .long SYSSIZE
+ram_size:       .word RAMDISK
+vid_mode:       .word SVGA_MODE
+root_dev:       .word ROOT_DEV
+boot_flag:      .word 0xAA55
+        # offset 512, entry point
+        .globl  _start
+_start:
+                # Explicitly enter this as bytes, or the assembler
+                # tries to generate a 3-byte jump here, which causes
+                # everything else to push off to the wrong offset.
+                .byte   0xeb            # short (2-byte) jump
+                .byte   start_of_setup-1f
+1:
+        # Part 2 of the header, from the old setup.S
+                .ascii  "HdrS"          # header signature
+                .word   0x0206          # header version number (>= 0x0105)
+                                        # or else old loadlin-1.5 will fail)
+                .globl realmode_swtch
+realmode_swtch: .word   0, 0            # default_switch, SETUPSEG
+start_sys_seg:  .word   SYSSEG
+                .word   kernel_version-512 # pointing to kernel version string
+                                        # above section of header is compatible
+                                        # with loadlin-1.5 (header v1.5). Don't
+                                        # change it.
+type_of_loader: .byte   0               # = 0, old one (LILO, Loadlin,
+                                        #      Bootlin, SYSLX, bootsect...)
+                                        # See Documentation/i386/boot.txt for
+                                        # assigned ids
+# flags, unused bits must be zero (RFU) bit within loadflags
+loadflags:
+LOADED_HIGH     = 1                     # If set, the kernel is loaded high
+CAN_USE_HEAP    = 0x80                  # If set, the loader also has set
+                                        # heap_end_ptr to tell how much
+                                        # space behind setup.S can be used for
+                                        # heap purposes.
+                                        # Only the loader knows what is free
+#ifndef __BIG_KERNEL__
+                .byte   0
+#else
+                .byte   LOADED_HIGH
+#endif
+setup_move_size: .word  0x8000          # size to move, when setup is not
+                                        # loaded at 0x90000. We will move setup
+                                        # to 0x90000 then just before jumping
+                                        # into the kernel. However, only the
+                                        # loader knows how much data behind
+                                        # us also needs to be loaded.
+code32_start:                           # here loaders can put a different
+                                        # start address for 32-bit code.
+#ifndef __BIG_KERNEL__
+                .long   0x1000          #   0x1000 = default for zImage
+#else
+                .long   0x100000        # 0x100000 = default for big kernel
+#endif
+ramdisk_image:  .long   0               # address of loaded ramdisk image
+                                        # Here the loader puts the 32-bit
+                                        # address where it loaded the image.
+                                        # This only will be read by the kernel.
+ramdisk_size:   .long   0               # its size in bytes
+bootsect_kludge:
+                .long   0               # obsolete
+heap_end_ptr:   .word   _end+1024       # (Header version 0x0201 or later)
+                                        # space from here (exclusive) down to
+                                        # end of setup code can be used by setup
+                                        # for local heap purposes.
+pad1:           .word   0
+cmd_line_ptr:   .long   0               # (Header version 0x0202 or later)
+                                        # If nonzero, a 32-bit pointer
+                                        # to the kernel command line.
+                                        # The command line should be
+                                        # located between the start of
+                                        # setup and the end of low
+                                        # memory (0xa0000), or it may
+                                        # get overwritten before it
+                                        # gets read.  If this field is
+                                        # used, there is no longer
+                                        # anything magical about the
+                                        # 0x90000 segment; the setup
+                                        # can be located anywhere in
+                                        # low memory 0x10000 or higher.
+ramdisk_max:    .long (-__PAGE_OFFSET-(512 << 20)-1) & 0x7fffffff
+                                        # (Header version 0x0203 or later)
+                                        # The highest safe address for
+                                        # the contents of an initrd
+kernel_alignment:  .long CONFIG_PHYSICAL_ALIGN  #physical addr alignment
+                                                #required for protected mode
+                                                #kernel
+#ifdef CONFIG_RELOCATABLE
+relocatable_kernel:    .byte 1
+#else
+relocatable_kernel:    .byte 0
+#endif
+pad2:                   .byte 0
+pad3:                   .word 0
+cmdline_size:   .long   COMMAND_LINE_SIZE-1     #length of the command line,
+                                                #added with boot protocol
+                                                #version 2.06
+# End of setup header #####################################################
+        .section ".inittext", "ax"
+start_of_setup:
+#ifdef SAFE_RESET_DISK_CONTROLLER
+# Reset the disk controller.
+        movw    $0x0000, %ax            # Reset disk controller
+        movb    $0x80, %dl              # All disks
+        int     $0x13
+#endif
+# We will have entired with %cs = %ds+0x20, normalize %cs so
+# it is on par with the other segments.
+        pushw   %ds
+        pushw   $setup2
+        lretw
+setup2:
+# Force %es = %ds
+        movw    %ds, %ax
+        movw    %ax, %es
+        cld
+# Stack paranoia: align the stack and make sure it is good
+# for both 16- and 32-bit references.  In particular, if we
+# were meant to have been using the full 16-bit segment, the
+# caller might have set %sp to zero, which breaks %esp-based
+# references.
+        andw    $~3, %sp        # dword align (might as well...)
+        jnz     1f
+        movw    $0xfffc, %sp    # Make sure we're not zero
+1:      movzwl  %sp, %esp       # Clear upper half of %esp
+        sti
+# Check signature at end of setup
+        cmpl    $0x5a5aaa55, setup_sig
+        jne     setup_bad
+# Zero the bss
+        movw    $__bss_start, %di
+        movw    $_end+3, %cx
+        xorl    %eax, %eax
+        subw    %di, %cx
+        shrw    $2, %cx
+        rep; stosl
+# Jump to C code (should not return)
+        calll   main
+# Setup corrupt somehow...
+setup_bad:
+        movl    $setup_corrupt, %eax
+        calll   puts
+        # Fall through...
+        .globl  die
+        .type   die, @function
+die:
+        hlt
+        jmp     die
+        .size   die, .-due
+        .section ".initdata", "a"
+setup_corrupt:
+        .byte   7
+        .string "No setup signature found..."
diff --git a/arch/i386/boot/main.c b/arch/i386/boot/main.c
new file mode 100644
index 0000000000..7f01f96c4f
--- /dev/null
+++ b/arch/i386/boot/main.c
@@ -0,0 +1,161 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/main.c
+ *
+ * Main module for the real-mode kernel code
+ */
+#include "boot.h"
+struct boot_params boot_params __attribute__((aligned(16)));
+char *HEAP = _end;
+char *heap_end = _end;          /* Default end of heap = no heap */
+/*
+ * Copy the header into the boot parameter block.  Since this
+ * screws up the old-style command line protocol, adjust by
+ * filling in the new-style command line pointer instead.
+ */
+#define OLD_CL_MAGIC    0xA33F
+#define OLD_CL_ADDRESS  0x20
+static void copy_boot_params(void)
+{
+        struct old_cmdline {
+                u16 cl_magic;
+                u16 cl_offset;
+        };
+        const struct old_cmdline * const oldcmd =
+                (const struct old_cmdline *)OLD_CL_ADDRESS;
+        BUILD_BUG_ON(sizeof boot_params != 4096);
+        memcpy(&boot_params.hdr, &hdr, sizeof hdr);
+        if (!boot_params.hdr.cmd_line_ptr &&
+            oldcmd->cl_magic == OLD_CL_MAGIC) {
+                /* Old-style command line protocol. */
+                u16 cmdline_seg;
+                /* Figure out if the command line falls in the region
+                   of memory that an old kernel would have copied up
+                   to 0x90000... */
+                if (oldcmd->cl_offset < boot_params.hdr.setup_move_size)
+                        cmdline_seg = ds();
+                else
+                        cmdline_seg = 0x9000;
+                boot_params.hdr.cmd_line_ptr =
+                        (cmdline_seg << 4) + oldcmd->cl_offset;
+        }
+}
+/*
+ * Set the keyboard repeat rate to maximum.  Unclear why this
+ * is done here; this might be possible to kill off as stale code.
+ */
+static void keyboard_set_repeat(void)
+{
+        u16 ax = 0x0305;
+        u16 bx = 0;
+        asm volatile("int $0x16"
+                     : "+a" (ax), "+b" (bx)
+                     : : "ecx", "edx", "esi", "edi");
+}
+/*
+ * Get Intel SpeedStep IST information.
+ */
+static void query_speedstep_ist(void)
+{
+        asm("int $0x15"
+            : "=a" (boot_params.speedstep_info[0]),
+              "=b" (boot_params.speedstep_info[1]),
+              "=c" (boot_params.speedstep_info[2]),
+              "=d" (boot_params.speedstep_info[3])
+            : "a" (0x0000e980),  /* IST Support */
+              "d" (0x47534943)); /* Request value */
+}
+/*
+ * Tell the BIOS what CPU mode we intend to run in.
+ */
+static void set_bios_mode(void)
+{
+#ifdef CONFIG_X86_64
+        u32 eax, ebx;
+        eax = 0xec00;
+        ebx = 2;
+        asm volatile("int $0x15"
+                     : "+a" (eax), "+b" (ebx)
+                     : : "ecx", "edx", "esi", "edi");
+#endif
+}
+void main(void)
+{
+        /* First, copy the boot header into the "zeropage" */
+        copy_boot_params();
+        /* End of heap check */
+        if (boot_params.hdr.loadflags & CAN_USE_HEAP) {
+                heap_end = (char *)(boot_params.hdr.heap_end_ptr
+                                    +0x200-STACK_SIZE);
+        } else {
+                /* Boot protocol 2.00 only, no heap available */
+                puts("WARNING: Ancient bootloader, some functionality "
+                     "may be limited!\n");
+        }
+        /* Make sure we have all the proper CPU support */
+        if (validate_cpu()) {
+                puts("Unable to boot - please use a kernel appropriate "
+                     "for your CPU.\n");
+                die();
+        }
+        /* Tell the BIOS what CPU mode we intend to run in. */
+        set_bios_mode();
+        /* Detect memory layout */
+        detect_memory();
+        /* Set keyboard repeat rate (why?) */
+        keyboard_set_repeat();
+        /* Set the video mode */
+        set_video();
+        /* Query MCA information */
+        query_mca();
+        /* Voyager */
+#ifdef CONFIG_X86_VOYAGER
+        query_voyager();
+#endif
+        /* Query SpeedStep IST information */
+        query_speedstep_ist();
+        /* Query APM information */
+#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
+        query_apm_bios();
+#endif
+        /* Query EDD information */
+#if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
+        query_edd();
+#endif
+        /* Do the last things and invoke protected mode */
+        go_to_protected_mode();
+}
diff --git a/arch/i386/boot/mca.c b/arch/i386/boot/mca.c
new file mode 100644
index 0000000000..68222f2d4b
--- /dev/null
+++ b/arch/i386/boot/mca.c
@@ -0,0 +1,43 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/mca.c
+ *
+ * Get the MCA system description table
+ */
+#include "boot.h"
+int query_mca(void)
+{
+        u8 err;
+        u16 es, bx, len;
+        asm("pushw %%es ; "
+            "int $0x15 ; "
+            "setc %0 ; "
+            "movw %%es, %1 ; "
+            "popw %%es"
+            : "=acd" (err), "=acdSD" (es), "=b" (bx)
+            : "a" (0xc000));
+        if (err)
+                return -1;      /* No MCA present */
+        set_fs(es);
+        len = rdfs16(bx);
+        if (len > sizeof(boot_params.sys_desc_table))
+                len = sizeof(boot_params.sys_desc_table);
+        copy_from_fs(&boot_params.sys_desc_table, bx, len);
+        return 0;
+}
diff --git a/arch/i386/boot/memory.c b/arch/i386/boot/memory.c
new file mode 100644
index 0000000000..1a2e62db8b
--- /dev/null
+++ b/arch/i386/boot/memory.c
@@ -0,0 +1,99 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/memory.c
+ *
+ * Memory detection code
+ */
+#include "boot.h"
+#define SMAP    0x534d4150      /* ASCII "SMAP" */
+static int detect_memory_e820(void)
+{
+        u32 next = 0;
+        u32 size, id;
+        u8 err;
+        struct e820entry *desc = boot_params.e820_map;
+        do {
+                size = sizeof(struct e820entry);
+                id = SMAP;
+                asm("int $0x15; setc %0"
+                    : "=am" (err), "+b" (next), "+d" (id), "+c" (size),
+                      "=m" (*desc)
+                    : "D" (desc), "a" (0xe820));
+                if (err || id != SMAP)
+                        break;
+                boot_params.e820_entries++;
+                desc++;
+        } while (next && boot_params.e820_entries < E820MAX);
+        return boot_params.e820_entries;
+}
+static int detect_memory_e801(void)
+{
+        u16 ax, bx, cx, dx;
+        u8 err;
+        bx = cx = dx = 0;
+        ax = 0xe801;
+        asm("stc; int $0x15; setc %0"
+            : "=m" (err), "+a" (ax), "+b" (bx), "+c" (cx), "+d" (dx));
+        if (err)
+                return -1;
+        /* Do we really need to do this? */
+        if (cx || dx) {
+                ax = cx;
+                bx = dx;
+        }
+        if (ax > 15*1024)
+                return -1;      /* Bogus! */
+        /* This ignores memory above 16MB if we have a memory hole
+           there.  If someone actually finds a machine with a memory
+           hole at 16MB and no support for 0E820h they should probably
+           generate a fake e820 map. */
+        boot_params.alt_mem_k = (ax == 15*1024) ? (dx << 6)+ax : ax;
+        return 0;
+}
+static int detect_memory_88(void)
+{
+        u16 ax;
+        u8 err;
+        ax = 0x8800;
+        asm("stc; int $0x15; setc %0" : "=bcdm" (err), "+a" (ax));
+        boot_params.screen_info.ext_mem_k = ax;
+        return -err;
+}
+int detect_memory(void)
+{
+        if (detect_memory_e820() > 0)
+                return 0;
+        if (!detect_memory_e801())
+                return 0;
+        return detect_memory_88();
+}
diff --git a/arch/i386/boot/pm.c b/arch/i386/boot/pm.c
new file mode 100644
index 0000000000..1df025c732
--- /dev/null
+++ b/arch/i386/boot/pm.c
@@ -0,0 +1,170 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/pm.c
+ *
+ * Prepare the machine for transition to protected mode.
+ */
+#include "boot.h"
+#include <asm/segment.h>
+/*
+ * Invoke the realmode switch hook if present; otherwise
+ * disable all interrupts.
+ */
+static void realmode_switch_hook(void)
+{
+        if (boot_params.hdr.realmode_swtch) {
+                asm volatile("lcallw *%0"
+                             : : "m" (boot_params.hdr.realmode_swtch)
+                             : "eax", "ebx", "ecx", "edx");
+        } else {
+                asm volatile("cli");
+                outb(0x80, 0x70); /* Disable NMI */
+                io_delay();
+        }
+}
+/*
+ * A zImage kernel is loaded at 0x10000 but wants to run at 0x1000.
+ * A bzImage kernel is loaded and runs at 0x100000.
+ */
+static void move_kernel_around(void)
+{
+        /* Note: rely on the compile-time option here rather than
+           the LOADED_HIGH flag.  The Qemu kernel loader unconditionally
+           sets the loadflags to zero. */
+#ifndef __BIG_KERNEL__
+        u16 dst_seg, src_seg;
+        u32 syssize;
+        dst_seg =  0x1000 >> 4;
+        src_seg = 0x10000 >> 4;
+        syssize = boot_params.hdr.syssize; /* Size in 16-byte paragraphs */
+        while (syssize) {
+                int paras  = (syssize >= 0x1000) ? 0x1000 : syssize;
+                int dwords = paras << 2;
+                asm volatile("pushw %%es ; "
+                             "pushw %%ds ; "
+                             "movw %1,%%es ; "
+                             "movw %2,%%ds ; "
+                             "xorw %%di,%%di ; "
+                             "xorw %%si,%%si ; "
+                             "rep;movsl ; "
+                             "popw %%ds ; "
+                             "popw %%es"
+                             : "+c" (dwords)
+                             : "r" (dst_seg), "r" (src_seg)
+                             : "esi", "edi");
+                syssize -= paras;
+                dst_seg += paras;
+                src_seg += paras;
+        }
+#endif
+}
+/*
+ * Disable all interrupts at the legacy PIC.
+ */
+static void mask_all_interrupts(void)
+{
+        outb(0xff, 0xa1);       /* Mask all interrupts on the seconday PIC */
+        io_delay();
+        outb(0xfb, 0x21);       /* Mask all but cascade on the primary PIC */
+        io_delay();
+}
+/*
+ * Reset IGNNE# if asserted in the FPU.
+ */
+static void reset_coprocessor(void)
+{
+        outb(0, 0xf0);
+        io_delay();
+        outb(0, 0xf1);
+        io_delay();
+}
+/*
+ * Set up the GDT
+ */
+#define GDT_ENTRY(flags,base,limit)             \
+        (((u64)(base & 0xff000000) << 32) |     \
+         ((u64)flags << 40) |                   \
+         ((u64)(limit & 0x00ff0000) << 32) |    \
+         ((u64)(base & 0x00ffff00) << 16) |     \
+         ((u64)(limit & 0x0000ffff)))
+struct gdt_ptr {
+        u16 len;
+        u32 ptr;
+} __attribute__((packed));
+static void setup_gdt(void)
+{
+        /* There are machines which are known to not boot with the GDT
+           being 8-byte unaligned.  Intel recommends 16 byte alignment. */
+        static const u64 boot_gdt[] __attribute__((aligned(16))) = {
+                /* CS: code, read/execute, 4 GB, base 0 */
+                [GDT_ENTRY_BOOT_CS] = GDT_ENTRY(0xc09b, 0, 0xfffff),
+                /* DS: data, read/write, 4 GB, base 0 */
+                [GDT_ENTRY_BOOT_DS] = GDT_ENTRY(0xc093, 0, 0xfffff),
+        };
+        struct gdt_ptr gdt;
+        gdt.len = sizeof(boot_gdt)-1;
+        gdt.ptr = (u32)&boot_gdt + (ds() << 4);
+        asm volatile("lgdtl %0" : : "m" (gdt));
+}
+/*
+ * Set up the IDT
+ */
+static void setup_idt(void)
+{
+        static const struct gdt_ptr null_idt = {0, 0};
+        asm volatile("lidtl %0" : : "m" (null_idt));
+}
+/*
+ * Actual invocation sequence
+ */
+void go_to_protected_mode(void)
+{
+        /* Hook before leaving real mode, also disables interrupts */
+        realmode_switch_hook();
+        /* Move the kernel/setup to their final resting places */
+        move_kernel_around();
+        /* Enable the A20 gate */
+        if (enable_a20()) {
+                puts("A20 gate not responding, unable to boot...\n");
+                die();
+        }
+        /* Reset coprocessor (IGNNE#) */
+        reset_coprocessor();
+        /* Mask all interrupts in the PIC */
+        mask_all_interrupts();
+        /* Actual transition to protected mode... */
+        setup_idt();
+        setup_gdt();
+        protected_mode_jump(boot_params.hdr.code32_start,
+                            (u32)&boot_params + (ds() << 4));
+}
diff --git a/arch/i386/boot/pmjump.S b/arch/i386/boot/pmjump.S
new file mode 100644
index 0000000000..2e55923372
--- /dev/null
+++ b/arch/i386/boot/pmjump.S
@@ -0,0 +1,54 @@
+/* ----------------------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/pmjump.S
+ *
+ * The actual transition into protected mode
+ */
+#include <asm/boot.h>
+#include <asm/segment.h>
+        .text
+        .globl  protected_mode_jump
+        .type   protected_mode_jump, @function
+        .code16
+/*
+ * void protected_mode_jump(u32 entrypoint, u32 bootparams);
+ */
+protected_mode_jump:
+        xorl    %ebx, %ebx              # Flag to indicate this is a boot
+        movl    %edx, %esi              # Pointer to boot_params table
+        movl    %eax, 2f                # Patch ljmpl instruction
+        jmp     1f                      # Short jump to flush instruction q.
+1:
+        movw    $__BOOT_DS, %cx
+        movl    %cr0, %edx
+        orb     $1, %dl                 # Protected mode (PE) bit
+        movl    %edx, %cr0
+        movw    %cx, %ds
+        movw    %cx, %es
+        movw    %cx, %fs
+        movw    %cx, %gs
+        movw    %cx, %ss
+        # Jump to the 32-bit entrypoint
+        .byte   0x66, 0xea              # ljmpl opcode
+2:      .long   0                       # offset
+        .word   __BOOT_CS               # segment
+        .size   protected_mode_jump, .-protected_mode_jump
diff --git a/arch/i386/boot/printf.c b/arch/i386/boot/printf.c
new file mode 100644
index 0000000000..1a09f9309d
--- /dev/null
+++ b/arch/i386/boot/printf.c
@@ -0,0 +1,307 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/printf.c
+ *
+ * Oh, it's a waste of space, but oh-so-yummy for debugging.  This
+ * version of printf() does not include 64-bit support.  "Live with
+ * it."
+ *
+ */
+#include "boot.h"
+static int skip_atoi(const char **s)
+{
+        int i = 0;
+        while (isdigit(**s))
+                i = i * 10 + *((*s)++) - '0';
+        return i;
+}
+#define ZEROPAD 1               /* pad with zero */
+#define SIGN    2               /* unsigned/signed long */
+#define PLUS    4               /* show plus */
+#define SPACE   8               /* space if plus */
+#define LEFT    16              /* left justified */
+#define SPECIAL 32              /* 0x */
+#define LARGE   64              /* use 'ABCDEF' instead of 'abcdef' */
+#define do_div(n,base) ({ \
+int __res; \
+__res = ((unsigned long) n) % (unsigned) base; \
+n = ((unsigned long) n) / (unsigned) base; \
+__res; })
+static char *number(char *str, long num, int base, int size, int precision,
+                    int type)
+{
+        char c, sign, tmp[66];
+        const char *digits = "0123456789abcdefghijklmnopqrstuvwxyz";
+        int i;
+        if (type & LARGE)
+                digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        if (type & LEFT)
+                type &= ~ZEROPAD;
+        if (base < 2 || base > 36)
+                return 0;
+        c = (type & ZEROPAD) ? '0' : ' ';
+        sign = 0;
+        if (type & SIGN) {
+                if (num < 0) {
+                        sign = '-';
+                        num = -num;
+                        size--;
+                } else if (type & PLUS) {
+                        sign = '+';
+                        size--;
+                } else if (type & SPACE) {
+                        sign = ' ';
+                        size--;
+                }
+        }
+        if (type & SPECIAL) {
+                if (base == 16)
+                        size -= 2;
+                else if (base == 8)
+                        size--;
+        }
+        i = 0;
+        if (num == 0)
+                tmp[i++] = '0';
+        else
+                while (num != 0)
+                        tmp[i++] = digits[do_div(num, base)];
+        if (i > precision)
+                precision = i;
+        size -= precision;
+        if (!(type & (ZEROPAD + LEFT)))
+                while (size-- > 0)
+                        *str++ = ' ';
+        if (sign)
+                *str++ = sign;
+        if (type & SPECIAL) {
+                if (base == 8)
+                        *str++ = '0';
+                else if (base == 16) {
+                        *str++ = '0';
+                        *str++ = digits[33];
+                }
+        }
+        if (!(type & LEFT))
+                while (size-- > 0)
+                        *str++ = c;
+        while (i < precision--)
+                *str++ = '0';
+        while (i-- > 0)
+                *str++ = tmp[i];
+        while (size-- > 0)
+                *str++ = ' ';
+        return str;
+}
+int vsprintf(char *buf, const char *fmt, va_list args)
+{
+        int len;
+        unsigned long num;
+        int i, base;
+        char *str;
+        const char *s;
+        int flags;              /* flags to number() */
+        int field_width;        /* width of output field */
+        int precision;          /* min. # of digits for integers; max
+                                   number of chars for from string */
+        int qualifier;          /* 'h', 'l', or 'L' for integer fields */
+        for (str = buf; *fmt; ++fmt) {
+                if (*fmt != '%') {
+                        *str++ = *fmt;
+                        continue;
+                }
+                /* process flags */
+                flags = 0;
+              repeat:
+                ++fmt;          /* this also skips first '%' */
+                switch (*fmt) {
+                case '-':
+                        flags |= LEFT;
+                        goto repeat;
+                case '+':
+                        flags |= PLUS;
+                        goto repeat;
+                case ' ':
+                        flags |= SPACE;
+                        goto repeat;
+                case '#':
+                        flags |= SPECIAL;
+                        goto repeat;
+                case '0':
+                        flags |= ZEROPAD;
+                        goto repeat;
+                }
+                /* get field width */
+                field_width = -1;
+                if (isdigit(*fmt))
+                        field_width = skip_atoi(&fmt);
+                else if (*fmt == '*') {
+                        ++fmt;
+                        /* it's the next argument */
+                        field_width = va_arg(args, int);
+                        if (field_width < 0) {
+                                field_width = -field_width;
+                                flags |= LEFT;
+                        }
+                }
+                /* get the precision */
+                precision = -1;
+                if (*fmt == '.') {
+                        ++fmt;
+                        if (isdigit(*fmt))
+                                precision = skip_atoi(&fmt);
+                        else if (*fmt == '*') {
+                                ++fmt;
+                                /* it's the next argument */
+                                precision = va_arg(args, int);
+                        }
+                        if (precision < 0)
+                                precision = 0;
+                }
+                /* get the conversion qualifier */
+                qualifier = -1;
+                if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L') {
+                        qualifier = *fmt;
+                        ++fmt;
+                }
+                /* default base */
+                base = 10;
+                switch (*fmt) {
+                case 'c':
+                        if (!(flags & LEFT))
+                                while (--field_width > 0)
+                                        *str++ = ' ';
+                        *str++ = (unsigned char)va_arg(args, int);
+                        while (--field_width > 0)
+                                *str++ = ' ';
+                        continue;
+                case 's':
+                        s = va_arg(args, char *);
+                        len = strnlen(s, precision);
+                        if (!(flags & LEFT))
+                                while (len < field_width--)
+                                        *str++ = ' ';
+                        for (i = 0; i < len; ++i)
+                                *str++ = *s++;
+                        while (len < field_width--)
+                                *str++ = ' ';
+                        continue;
+                case 'p':
+                        if (field_width == -1) {
+                                field_width = 2 * sizeof(void *);
+                                flags |= ZEROPAD;
+                        }
+                        str = number(str,
+                                     (unsigned long)va_arg(args, void *), 16,
+                                     field_width, precision, flags);
+                        continue;
+                case 'n':
+                        if (qualifier == 'l') {
+                                long *ip = va_arg(args, long *);
+                                *ip = (str - buf);
+                        } else {
+                                int *ip = va_arg(args, int *);
+                                *ip = (str - buf);
+                        }
+                        continue;
+                case '%':
+                        *str++ = '%';
+                        continue;
+                        /* integer number formats - set up the flags and "break" */
+                case 'o':
+                        base = 8;
+                        break;
+                case 'X':
+                        flags |= LARGE;
+                case 'x':
+                        base = 16;
+                        break;
+                case 'd':
+                case 'i':
+                        flags |= SIGN;
+                case 'u':
+                        break;
+                default:
+                        *str++ = '%';
+                        if (*fmt)
+                                *str++ = *fmt;
+                        else
+                                --fmt;
+                        continue;
+                }
+                if (qualifier == 'l')
+                        num = va_arg(args, unsigned long);
+                else if (qualifier == 'h') {
+                        num = (unsigned short)va_arg(args, int);
+                        if (flags & SIGN)
+                                num = (short)num;
+                } else if (flags & SIGN)
+                        num = va_arg(args, int);
+                else
+                        num = va_arg(args, unsigned int);
+                str = number(str, num, base, field_width, precision, flags);
+        }
+        *str = '\0';
+        return str - buf;
+}
+int sprintf(char *buf, const char *fmt, ...)
+{
+        va_list args;
+        int i;
+        va_start(args, fmt);
+        i = vsprintf(buf, fmt, args);
+        va_end(args);
+        return i;
+}
+int printf(const char *fmt, ...)
+{
+        char printf_buf[1024];
+        va_list args;
+        int printed;
+        va_start(args, fmt);
+        printed = vsprintf(printf_buf, fmt, args);
+        va_end(args);
+        puts(printf_buf);
+        return printed;
+}
diff --git a/arch/i386/boot/setup.S b/arch/i386/boot/setup.S
deleted file mode 100644
index 6dbcc95b21..0000000000
--- a/arch/i386/boot/setup.S
+++ /dev/null
@@ -1,1075 +0,0 @@
-/*
- *      setup.S         Copyright (C) 1991, 1992 Linus Torvalds
- *
- * setup.s is responsible for getting the system data from the BIOS,
- * and putting them into the appropriate places in system memory.
- * both setup.s and system has been loaded by the bootblock.
- *
- * This code asks the bios for memory/disk/other parameters, and
- * puts them in a "safe" place: 0x90000-0x901FF, ie where the
- * boot-block used to be. It is then up to the protected mode
- * system to read them from there before the area is overwritten
- * for buffer-blocks.
- *
- * Move PS/2 aux init code to psaux.c
- * (troyer@saifr00.cfsat.Honeywell.COM) 03Oct92
- *
- * some changes and additional features by Christoph Niemann,
- * March 1993/June 1994 (Christoph.Niemann@linux.org)
- *
- * add APM BIOS checking by Stephen Rothwell, May 1994
- * (sfr@canb.auug.org.au)
- *
- * High load stuff, initrd support and position independency
- * by Hans Lermen & Werner Almesberger, February 1996
- * <lermen@elserv.ffm.fgan.de>, <almesber@lrc.epfl.ch>
- *
- * Video handling moved to video.S by Martin Mares, March 1996
- * <mj@k332.feld.cvut.cz>
- *
- * Extended memory detection scheme retwiddled by orc@pell.chi.il.us (david
- * parsons) to avoid loadlin confusion, July 1997
- *
- * Transcribed from Intel (as86) -> AT&T (gas) by Chris Noe, May 1999.
- * <stiker@northlink.com>
- *
- * Fix to work around buggy BIOSes which don't use carry bit correctly
- * and/or report extended memory in CX/DX for e801h memory size detection 
- * call.  As a result the kernel got wrong figures.  The int15/e801h docs
- * from Ralf Brown interrupt list seem to indicate AX/BX should be used
- * anyway.  So to avoid breaking many machines (presumably there was a reason
- * to orginally use CX/DX instead of AX/BX), we do a kludge to see
- * if CX/DX have been changed in the e801 call and if so use AX/BX .
- * Michael Miller, April 2001 <michaelm@mjmm.org>
- *
- * New A20 code ported from SYSLINUX by H. Peter Anvin. AMD Elan bugfixes
- * by Robert Schwebel, December 2001 <robert@schwebel.de>
- */
-#include <asm/segment.h>
-#include <linux/utsrelease.h>
-#include <linux/compile.h>
-#include <asm/boot.h>
-#include <asm/e820.h>
-#include <asm/page.h>
-#include <asm/setup.h>
-        
-/* Signature words to ensure LILO loaded us right */
-#define SIG1    0xAA55
-#define SIG2    0x5A5A
-INITSEG  = DEF_INITSEG          # 0x9000, we move boot here, out of the way
-SYSSEG   = DEF_SYSSEG           # 0x1000, system loaded at 0x10000 (65536).
-SETUPSEG = DEF_SETUPSEG         # 0x9020, this is the current segment
-                                # ... and the former contents of CS
-DELTA_INITSEG = SETUPSEG - INITSEG      # 0x0020
-.code16
-.globl begtext, begdata, begbss, endtext, enddata, endbss
-.text
-begtext:
-.data
-begdata:
-.bss
-begbss:
-.text
-start:
-        jmp     trampoline
-# This is the setup header, and it must start at %cs:2 (old 0x9020:2)
-                .ascii  "HdrS"          # header signature
-                .word   0x0206          # header version number (>= 0x0105)
-                                        # or else old loadlin-1.5 will fail)
-realmode_swtch: .word   0, 0            # default_switch, SETUPSEG
-start_sys_seg:  .word   SYSSEG
-                .word   kernel_version  # pointing to kernel version string
-                                        # above section of header is compatible
-                                        # with loadlin-1.5 (header v1.5). Don't
-                                        # change it.
-type_of_loader: .byte   0               # = 0, old one (LILO, Loadlin,
-                                        #      Bootlin, SYSLX, bootsect...)
-                                        # See Documentation/i386/boot.txt for
-                                        # assigned ids
-        
-# flags, unused bits must be zero (RFU) bit within loadflags
-loadflags:
-LOADED_HIGH     = 1                     # If set, the kernel is loaded high
-CAN_USE_HEAP    = 0x80                  # If set, the loader also has set
-                                        # heap_end_ptr to tell how much
-                                        # space behind setup.S can be used for
-                                        # heap purposes.
-                                        # Only the loader knows what is free
-#ifndef __BIG_KERNEL__
-                .byte   0
-#else
-                .byte   LOADED_HIGH
-#endif
-setup_move_size: .word  0x8000          # size to move, when setup is not
-                                        # loaded at 0x90000. We will move setup 
-                                        # to 0x90000 then just before jumping
-                                        # into the kernel. However, only the
-                                        # loader knows how much data behind
-                                        # us also needs to be loaded.
-code32_start:                           # here loaders can put a different
-                                        # start address for 32-bit code.
-#ifndef __BIG_KERNEL__
-                .long   0x1000          #   0x1000 = default for zImage
-#else
-                .long   0x100000        # 0x100000 = default for big kernel
-#endif
-ramdisk_image:  .long   0               # address of loaded ramdisk image
-                                        # Here the loader puts the 32-bit
-                                        # address where it loaded the image.
-                                        # This only will be read by the kernel.
-ramdisk_size:   .long   0               # its size in bytes
-bootsect_kludge:
-                .long   0               # obsolete
-heap_end_ptr:   .word   modelist+1024   # (Header version 0x0201 or later)
-                                        # space from here (exclusive) down to
-                                        # end of setup code can be used by setup
-                                        # for local heap purposes.
-pad1:           .word   0
-cmd_line_ptr:   .long 0                 # (Header version 0x0202 or later)
-                                        # If nonzero, a 32-bit pointer
-                                        # to the kernel command line.
-                                        # The command line should be
-                                        # located between the start of
-                                        # setup and the end of low
-                                        # memory (0xa0000), or it may
-                                        # get overwritten before it
-                                        # gets read.  If this field is
-                                        # used, there is no longer
-                                        # anything magical about the
-                                        # 0x90000 segment; the setup
-                                        # can be located anywhere in
-                                        # low memory 0x10000 or higher.
-ramdisk_max:    .long (-__PAGE_OFFSET-(512 << 20)-1) & 0x7fffffff
-                                        # (Header version 0x0203 or later)
-                                        # The highest safe address for
-                                        # the contents of an initrd
-kernel_alignment:  .long CONFIG_PHYSICAL_ALIGN  #physical addr alignment
-                                                #required for protected mode
-                                                #kernel
-#ifdef CONFIG_RELOCATABLE
-relocatable_kernel:    .byte 1
-#else
-relocatable_kernel:    .byte 0
-#endif
-pad2:                   .byte 0
-pad3:                   .word 0
-cmdline_size:   .long   COMMAND_LINE_SIZE-1     #length of the command line,
-                                                #added with boot protocol
-                                                #version 2.06
-trampoline:     call    start_of_setup
-                .align 16
-                                        # The offset at this point is 0x240
-                .space  (0xeff-0x240+1) # E820 & EDD space (ending at 0xeff)
-# End of setup header #####################################################
-start_of_setup:
-# Bootlin depends on this being done early
-        movw    $0x01500, %ax
-        movb    $0x81, %dl
-        int     $0x13
-#ifdef SAFE_RESET_DISK_CONTROLLER
-# Reset the disk controller.
-        movw    $0x0000, %ax
-        movb    $0x80, %dl
-        int     $0x13
-#endif
-# Set %ds = %cs, we know that SETUPSEG = %cs at this point
-        movw    %cs, %ax                # aka SETUPSEG
-        movw    %ax, %ds
-# Check signature at end of setup
-        cmpw    $SIG1, setup_sig1
-        jne     bad_sig
-        cmpw    $SIG2, setup_sig2
-        jne     bad_sig
-        jmp     good_sig1
-# Routine to print asciiz string at ds:si
-prtstr:
-        lodsb
-        andb    %al, %al
-        jz      fin
-        call    prtchr
-        jmp     prtstr
-fin:    ret
-# Space printing
-prtsp2: call    prtspc          # Print double space
-prtspc: movb    $0x20, %al      # Print single space (note: fall-thru)
-# Part of above routine, this one just prints ascii al
-prtchr: pushw   %ax
-        pushw   %cx
-        movw    $7,%bx
-        movw    $0x01, %cx
-        movb    $0x0e, %ah
-        int     $0x10
-        popw    %cx
-        popw    %ax
-        ret
-beep:   movb    $0x07, %al
-        jmp     prtchr
-        
-no_sig_mess: .string    "No setup signature found ..."
-good_sig1:
-        jmp     good_sig
-# We now have to find the rest of the setup code/data
-bad_sig:
-        movw    %cs, %ax                        # SETUPSEG
-        subw    $DELTA_INITSEG, %ax             # INITSEG
-        movw    %ax, %ds
-        xorb    %bh, %bh
-        movb    (497), %bl                      # get setup sect from bootsect
-        subw    $4, %bx                         # LILO loads 4 sectors of setup
-        shlw    $8, %bx                         # convert to words (1sect=2^8 words)
-        movw    %bx, %cx
-        shrw    $3, %bx                         # convert to segment
-        addw    $SYSSEG, %bx
-        movw    %bx, %cs:start_sys_seg
-# Move rest of setup code/data to here
-        movw    $2048, %di                      # four sectors loaded by LILO
-        subw    %si, %si
-        pushw   %cs
-        popw    %es
-        movw    $SYSSEG, %ax
-        movw    %ax, %ds
-        rep
-        movsw
-        movw    %cs, %ax                        # aka SETUPSEG
-        movw    %ax, %ds
-        cmpw    $SIG1, setup_sig1
-        jne     no_sig
-        cmpw    $SIG2, setup_sig2
-        jne     no_sig
-        jmp     good_sig
-no_sig:
-        lea     no_sig_mess, %si
-        call    prtstr
-no_sig_loop:
-        hlt
-        jmp     no_sig_loop
-good_sig:
-        movw    %cs, %ax                        # aka SETUPSEG
-        subw    $DELTA_INITSEG, %ax             # aka INITSEG
-        movw    %ax, %ds
-# Check if an old loader tries to load a big-kernel
-        testb   $LOADED_HIGH, %cs:loadflags     # Do we have a big kernel?
-        jz      loader_ok                       # No, no danger for old loaders.
-        cmpb    $0, %cs:type_of_loader          # Do we have a loader that
-                                                # can deal with us?
-        jnz     loader_ok                       # Yes, continue.
-        pushw   %cs                             # No, we have an old loader,
-        popw    %ds                             # die. 
-        lea     loader_panic_mess, %si
-        call    prtstr
-        jmp     no_sig_loop
-loader_panic_mess: .string "Wrong loader, giving up..."
-# check minimum cpuid
-# we do this here because it is the last place we can actually
-# show a user visible error message. Later the video modus
-# might be already messed up.
-loader_ok:
-        call verify_cpu
-        testl  %eax,%eax
-        jz      cpu_ok
-        movw    %cs,%ax         # aka SETUPSEG
-        movw    %ax,%ds
-        lea     cpu_panic_mess,%si
-        call    prtstr
-1:      jmp     1b
-cpu_panic_mess:
-        .asciz  "PANIC: CPU too old for this kernel."
-#include "../kernel/verify_cpu.S"
-cpu_ok:
-# Get memory size (extended mem, kB)
-        xorl    %eax, %eax
-        movl    %eax, (0x1e0)
-#ifndef STANDARD_MEMORY_BIOS_CALL
-        movb    %al, (E820NR)
-# Try three different memory detection schemes.  First, try
-# e820h, which lets us assemble a memory map, then try e801h,
-# which returns a 32-bit memory size, and finally 88h, which
-# returns 0-64m
-# method E820H:
-# the memory map from hell.  e820h returns memory classified into
-# a whole bunch of different types, and allows memory holes and
-# everything.  We scan through this memory map and build a list
-# of the first 32 memory areas, which we return at [E820MAP].
-# This is documented at http://www.acpi.info/, in the ACPI 2.0 specification.
-#define SMAP  0x534d4150
-meme820:
-        xorl    %ebx, %ebx                      # continuation counter
-        movw    $E820MAP, %di                   # point into the whitelist
-                                                # so we can have the bios
-                                                # directly write into it.
-jmpe820:
-        movl    $0x0000e820, %eax               # e820, upper word zeroed
-        movl    $SMAP, %edx                     # ascii 'SMAP'
-        movl    $20, %ecx                       # size of the e820rec
-        pushw   %ds                             # data record.
-        popw    %es
-        int     $0x15                           # make the call
-        jc      bail820                         # fall to e801 if it fails
-        cmpl    $SMAP, %eax                     # check the return is `SMAP'
-        jne     bail820                         # fall to e801 if it fails
-#       cmpl    $1, 16(%di)                     # is this usable memory?
-#       jne     again820
-        # If this is usable memory, we save it by simply advancing %di by
-        # sizeof(e820rec).
-        #
-good820:
-        movb    (E820NR), %al                   # up to 128 entries
-        cmpb    $E820MAX, %al
-        jae     bail820
-        incb    (E820NR)
-        movw    %di, %ax
-        addw    $20, %ax
-        movw    %ax, %di
-again820:
-        cmpl    $0, %ebx                        # check to see if
-        jne     jmpe820                         # %ebx is set to EOF
-bail820:
-# method E801H:
-# memory size is in 1k chunksizes, to avoid confusing loadlin.
-# we store the 0xe801 memory size in a completely different place,
-# because it will most likely be longer than 16 bits.
-# (use 1e0 because that's what Larry Augustine uses in his
-# alternative new memory detection scheme, and it's sensible
-# to write everything into the same place.)
-meme801:
-        stc                                     # fix to work around buggy
-        xorw    %cx,%cx                         # BIOSes which don't clear/set
-        xorw    %dx,%dx                         # carry on pass/error of
-                                                # e801h memory size call
-                                                # or merely pass cx,dx though
-                                                # without changing them.
-        movw    $0xe801, %ax
-        int     $0x15
-        jc      mem88
-        cmpw    $0x0, %cx                       # Kludge to handle BIOSes
-        jne     e801usecxdx                     # which report their extended
-        cmpw    $0x0, %dx                       # memory in AX/BX rather than
-        jne     e801usecxdx                     # CX/DX.  The spec I have read
-        movw    %ax, %cx                        # seems to indicate AX/BX 
-        movw    %bx, %dx                        # are more reasonable anyway...
-e801usecxdx:
-        andl    $0xffff, %edx                   # clear sign extend
-        shll    $6, %edx                        # and go from 64k to 1k chunks
-        movl    %edx, (0x1e0)                   # store extended memory size
-        andl    $0xffff, %ecx                   # clear sign extend
-        addl    %ecx, (0x1e0)                   # and add lower memory into
-                                                # total size.
-# Ye Olde Traditional Methode.  Returns the memory size (up to 16mb or
-# 64mb, depending on the bios) in ax.
-mem88:
-#endif
-        movb    $0x88, %ah
-        int     $0x15
-        movw    %ax, (2)
-# Set the keyboard repeat rate to the max
-        movw    $0x0305, %ax
-        xorw    %bx, %bx
-        int     $0x16
-# Check for video adapter and its parameters and allow the
-# user to browse video modes.
-        call    video                           # NOTE: we need %ds pointing
-                                                # to bootsector
-# Get hd0 data...
-        xorw    %ax, %ax
-        movw    %ax, %ds
-        ldsw    (4 * 0x41), %si
-        movw    %cs, %ax                        # aka SETUPSEG
-        subw    $DELTA_INITSEG, %ax             # aka INITSEG
-        pushw   %ax
-        movw    %ax, %es
-        movw    $0x0080, %di
-        movw    $0x10, %cx
-        pushw   %cx
-        cld
-        rep
-        movsb
-# Get hd1 data...
-        xorw    %ax, %ax
-        movw    %ax, %ds
-        ldsw    (4 * 0x46), %si
-        popw    %cx
-        popw    %es
-        movw    $0x0090, %di
-        rep
-        movsb
-# Check that there IS a hd1 :-)
-        movw    $0x01500, %ax
-        movb    $0x81, %dl
-        int     $0x13
-        jc      no_disk1
-        
-        cmpb    $3, %ah
-        je      is_disk1
-no_disk1:
-        movw    %cs, %ax                        # aka SETUPSEG
-        subw    $DELTA_INITSEG, %ax             # aka INITSEG
-        movw    %ax, %es
-        movw    $0x0090, %di
-        movw    $0x10, %cx
-        xorw    %ax, %ax
-        cld
-        rep
-        stosb
-is_disk1:
-# check for Micro Channel (MCA) bus
-        movw    %cs, %ax                        # aka SETUPSEG
-        subw    $DELTA_INITSEG, %ax             # aka INITSEG
-        movw    %ax, %ds
-        xorw    %ax, %ax
-        movw    %ax, (0xa0)                     # set table length to 0
-        movb    $0xc0, %ah
-        stc
-        int     $0x15                           # moves feature table to es:bx
-        jc      no_mca
-        pushw   %ds
-        movw    %es, %ax
-        movw    %ax, %ds
-        movw    %cs, %ax                        # aka SETUPSEG
-        subw    $DELTA_INITSEG, %ax             # aka INITSEG
-        movw    %ax, %es
-        movw    %bx, %si
-        movw    $0xa0, %di
-        movw    (%si), %cx
-        addw    $2, %cx                         # table length is a short
-        cmpw    $0x10, %cx
-        jc      sysdesc_ok
-        movw    $0x10, %cx                      # we keep only first 16 bytes
-sysdesc_ok:
-        rep
-        movsb
-        popw    %ds
-no_mca:
-#ifdef CONFIG_X86_VOYAGER
-        movb    $0xff, 0x40     # flag on config found
-        movb    $0xc0, %al
-        mov     $0xff, %ah
-        int     $0x15           # put voyager config info at es:di
-        jc      no_voyager
-        movw    $0x40, %si      # place voyager info in apm table
-        cld
-        movw    $7, %cx
-voyager_rep:
-        movb    %es:(%di), %al
-        movb    %al,(%si)
-        incw    %di
-        incw    %si
-        decw    %cx
-        jnz     voyager_rep
-no_voyager:     
-#endif
-# Check for PS/2 pointing device
-        movw    %cs, %ax                        # aka SETUPSEG
-        subw    $DELTA_INITSEG, %ax             # aka INITSEG
-        movw    %ax, %ds
-        movb    $0, (0x1ff)                     # default is no pointing device
-        int     $0x11                           # int 0x11: equipment list
-        testb   $0x04, %al                      # check if mouse installed
-        jz      no_psmouse
-        movb    $0xAA, (0x1ff)                  # device present
-no_psmouse:
-#if defined(CONFIG_X86_SPEEDSTEP_SMI) || defined(CONFIG_X86_SPEEDSTEP_SMI_MODULE)
-        movl    $0x0000E980, %eax               # IST Support 
-        movl    $0x47534943, %edx               # Request value
-        int     $0x15
-        movl    %eax, (96)
-        movl    %ebx, (100)
-        movl    %ecx, (104)
-        movl    %edx, (108)
-#endif
-#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
-# Then check for an APM BIOS...
-                                                # %ds points to the bootsector
-        movw    $0, 0x40                        # version = 0 means no APM BIOS
-        movw    $0x05300, %ax                   # APM BIOS installation check
-        xorw    %bx, %bx
-        int     $0x15
-        jc      done_apm_bios                   # Nope, no APM BIOS
-        
-        cmpw    $0x0504d, %bx                   # Check for "PM" signature
-        jne     done_apm_bios                   # No signature, no APM BIOS
-        andw    $0x02, %cx                      # Is 32 bit supported?
-        je      done_apm_bios                   # No 32-bit, no (good) APM BIOS
-        movw    $0x05304, %ax                   # Disconnect first just in case
-        xorw    %bx, %bx
-        int     $0x15                           # ignore return code
-        movw    $0x05303, %ax                   # 32 bit connect
-        xorl    %ebx, %ebx
-        xorw    %cx, %cx                        # paranoia :-)
-        xorw    %dx, %dx                        #   ...
-        xorl    %esi, %esi                      #   ...
-        xorw    %di, %di                        #   ...
-        int     $0x15
-        jc      no_32_apm_bios                  # Ack, error. 
-        movw    %ax,  (66)                      # BIOS code segment
-        movl    %ebx, (68)                      # BIOS entry point offset
-        movw    %cx,  (72)                      # BIOS 16 bit code segment
-        movw    %dx,  (74)                      # BIOS data segment
-        movl    %esi, (78)                      # BIOS code segment lengths
-        movw    %di,  (82)                      # BIOS data segment length
-# Redo the installation check as the 32 bit connect
-# modifies the flags returned on some BIOSs
-        movw    $0x05300, %ax                   # APM BIOS installation check
-        xorw    %bx, %bx
-        xorw    %cx, %cx                        # paranoia
-        int     $0x15
-        jc      apm_disconnect                  # error -> shouldn't happen
-        cmpw    $0x0504d, %bx                   # check for "PM" signature
-        jne     apm_disconnect                  # no sig -> shouldn't happen
-        movw    %ax, (64)                       # record the APM BIOS version
-        movw    %cx, (76)                       # and flags
-        jmp     done_apm_bios
-apm_disconnect:                                 # Tidy up
-        movw    $0x05304, %ax                   # Disconnect
-        xorw    %bx, %bx
-        int     $0x15                           # ignore return code
-        jmp     done_apm_bios
-no_32_apm_bios:
-        andw    $0xfffd, (76)                   # remove 32 bit support bit
-done_apm_bios:
-#endif
-#include "edd.S"
-# Now we want to move to protected mode ...
-        cmpw    $0, %cs:realmode_swtch
-        jz      rmodeswtch_normal
-        lcall   *%cs:realmode_swtch
-        jmp     rmodeswtch_end
-rmodeswtch_normal:
-        pushw   %cs
-        call    default_switch
-rmodeswtch_end:
-# Now we move the system to its rightful place ... but we check if we have a
-# big-kernel. In that case we *must* not move it ...
-        testb   $LOADED_HIGH, %cs:loadflags
-        jz      do_move0                        # .. then we have a normal low
-                                                # loaded zImage
-                                                # .. or else we have a high
-                                                # loaded bzImage
-        jmp     end_move                        # ... and we skip moving
-do_move0:
-        movw    $0x100, %ax                     # start of destination segment
-        movw    %cs, %bp                        # aka SETUPSEG
-        subw    $DELTA_INITSEG, %bp             # aka INITSEG
-        movw    %cs:start_sys_seg, %bx          # start of source segment
-        cld
-do_move:
-        movw    %ax, %es                        # destination segment
-        incb    %ah                             # instead of add ax,#0x100
-        movw    %bx, %ds                        # source segment
-        addw    $0x100, %bx
-        subw    %di, %di
-        subw    %si, %si
-        movw    $0x800, %cx
-        rep
-        movsw
-        cmpw    %bp, %bx                        # assume start_sys_seg > 0x200,
-                                                # so we will perhaps read one
-                                                # page more than needed, but
-                                                # never overwrite INITSEG
-                                                # because destination is a
-                                                # minimum one page below source
-        jb      do_move
-end_move:
-# then we load the segment descriptors
-        movw    %cs, %ax                        # aka SETUPSEG
-        movw    %ax, %ds
-                
-# Check whether we need to be downward compatible with version <=201
-        cmpl    $0, cmd_line_ptr
-        jne     end_move_self           # loader uses version >=202 features
-        cmpb    $0x20, type_of_loader
-        je      end_move_self           # bootsect loader, we know of it
-# Boot loader doesnt support boot protocol version 2.02.
-# If we have our code not at 0x90000, we need to move it there now.
-# We also then need to move the params behind it (commandline)
-# Because we would overwrite the code on the current IP, we move
-# it in two steps, jumping high after the first one.
-        movw    %cs, %ax
-        cmpw    $SETUPSEG, %ax
-        je      end_move_self
-        cli                                     # make sure we really have
-                                                # interrupts disabled !
-                                                # because after this the stack
-                                                # should not be used
-        subw    $DELTA_INITSEG, %ax             # aka INITSEG
-        movw    %ss, %dx
-        cmpw    %ax, %dx
-        jb      move_self_1
-        addw    $INITSEG, %dx
-        subw    %ax, %dx                        # this will go into %ss after
-                                                # the move
-move_self_1:
-        movw    %ax, %ds
-        movw    $INITSEG, %ax                   # real INITSEG
-        movw    %ax, %es
-        movw    %cs:setup_move_size, %cx
-        std                                     # we have to move up, so we use
-                                                # direction down because the
-                                                # areas may overlap
-        movw    %cx, %di
-        decw    %di
-        movw    %di, %si
-        subw    $move_self_here+0x200, %cx
-        rep
-        movsb
-        ljmp    $SETUPSEG, $move_self_here
-move_self_here:
-        movw    $move_self_here+0x200, %cx
-        rep
-        movsb
-        movw    $SETUPSEG, %ax
-        movw    %ax, %ds
-        movw    %dx, %ss
-end_move_self:                                  # now we are at the right place
-#
-# Enable A20.  This is at the very best an annoying procedure.
-# A20 code ported from SYSLINUX 1.52-1.63 by H. Peter Anvin.
-# AMD Elan bug fix by Robert Schwebel.
-#
-#if defined(CONFIG_X86_ELAN)
-        movb $0x02, %al                 # alternate A20 gate
-        outb %al, $0x92                 # this works on SC410/SC520
-a20_elan_wait:
-        call a20_test
-        jz a20_elan_wait
-        jmp a20_done
-#endif
-A20_TEST_LOOPS          =  32           # Iterations per wait
-A20_ENABLE_LOOPS        = 255           # Total loops to try            
-#ifndef CONFIG_X86_VOYAGER
-a20_try_loop:
-        # First, see if we are on a system with no A20 gate.
-a20_none:
-        call    a20_test
-        jnz     a20_done
-        # Next, try the BIOS (INT 0x15, AX=0x2401)
-a20_bios:
-        movw    $0x2401, %ax
-        pushfl                                  # Be paranoid about flags
-        int     $0x15
-        popfl
-        call    a20_test
-        jnz     a20_done
-        # Try enabling A20 through the keyboard controller
-#endif /* CONFIG_X86_VOYAGER */
-a20_kbc:
-        call    empty_8042
-#ifndef CONFIG_X86_VOYAGER
-        call    a20_test                        # Just in case the BIOS worked
-        jnz     a20_done                        # but had a delayed reaction.
-#endif
-        movb    $0xD1, %al                      # command write
-        outb    %al, $0x64
-        call    empty_8042
-        movb    $0xDF, %al                      # A20 on
-        outb    %al, $0x60
-        call    empty_8042
-#ifndef CONFIG_X86_VOYAGER
-        # Wait until a20 really *is* enabled; it can take a fair amount of
-        # time on certain systems; Toshiba Tecras are known to have this
-        # problem.
-a20_kbc_wait:
-        xorw    %cx, %cx
-a20_kbc_wait_loop:
-        call    a20_test
-        jnz     a20_done
-        loop    a20_kbc_wait_loop
-        # Final attempt: use "configuration port A"
-a20_fast:
-        inb     $0x92, %al                      # Configuration Port A
-        orb     $0x02, %al                      # "fast A20" version
-        andb    $0xFE, %al                      # don't accidentally reset
-        outb    %al, $0x92
-        # Wait for configuration port A to take effect
-a20_fast_wait:
-        xorw    %cx, %cx
-a20_fast_wait_loop:
-        call    a20_test
-        jnz     a20_done
-        loop    a20_fast_wait_loop
-        # A20 is still not responding.  Try frobbing it again.
-        # 
-        decb    (a20_tries)
-        jnz     a20_try_loop
-        
-        movw    $a20_err_msg, %si
-        call    prtstr
-a20_die:
-        hlt
-        jmp     a20_die
-a20_tries:
-        .byte   A20_ENABLE_LOOPS
-a20_err_msg:
-        .ascii  "linux: fatal error: A20 gate not responding!"
-        .byte   13, 10, 0
-        # If we get here, all is good
-a20_done:
-#endif /* CONFIG_X86_VOYAGER */
-# set up gdt and idt and 32bit start address
-        lidt    idt_48                          # load idt with 0,0
-        xorl    %eax, %eax                      # Compute gdt_base
-        movw    %ds, %ax                        # (Convert %ds:gdt to a linear ptr)
-        shll    $4, %eax
-        addl    %eax, code32
-        addl    $gdt, %eax
-        movl    %eax, (gdt_48+2)
-        lgdt    gdt_48                          # load gdt with whatever is
-                                                # appropriate
-# make sure any possible coprocessor is properly reset..
-        xorw    %ax, %ax
-        outb    %al, $0xf0
-        call    delay
-        outb    %al, $0xf1
-        call    delay
-# well, that went ok, I hope. Now we mask all interrupts - the rest
-# is done in init_IRQ().
-        movb    $0xFF, %al                      # mask all interrupts for now
-        outb    %al, $0xA1
-        call    delay
-        
-        movb    $0xFB, %al                      # mask all irq's but irq2 which
-        outb    %al, $0x21                      # is cascaded
-# Well, that certainly wasn't fun :-(. Hopefully it works, and we don't
-# need no steenking BIOS anyway (except for the initial loading :-).
-# The BIOS-routine wants lots of unnecessary data, and it's less
-# "interesting" anyway. This is how REAL programmers do it.
-#
-# Well, now's the time to actually move into protected mode. To make
-# things as simple as possible, we do no register set-up or anything,
-# we let the gnu-compiled 32-bit programs do that. We just jump to
-# absolute address 0x1000 (or the loader supplied one),
-# in 32-bit protected mode.
-#
-# Note that the short jump isn't strictly needed, although there are
-# reasons why it might be a good idea. It won't hurt in any case.
-        movw    $1, %ax                         # protected mode (PE) bit
-        lmsw    %ax                             # This is it!
-        jmp     flush_instr
-flush_instr:
-        xorw    %bx, %bx                        # Flag to indicate a boot
-        xorl    %esi, %esi                      # Pointer to real-mode code
-        movw    %cs, %si
-        subw    $DELTA_INITSEG, %si
-        shll    $4, %esi                        # Convert to 32-bit pointer
-# jump to startup_32 in arch/i386/boot/compressed/head.S
-#       
-# NOTE: For high loaded big kernels we need a
-#       jmpi    0x100000,__BOOT_CS
-#
-#       but we yet haven't reloaded the CS register, so the default size 
-#       of the target offset still is 16 bit.
-#       However, using an operand prefix (0x66), the CPU will properly
-#       take our 48 bit far pointer. (INTeL 80386 Programmer's Reference
-#       Manual, Mixing 16-bit and 32-bit code, page 16-6)
-        .byte 0x66, 0xea                        # prefix + jmpi-opcode
-code32: .long   startup_32                      # will be set to %cs+startup_32
-        .word   __BOOT_CS
-.code32
-startup_32:
-        movl $(__BOOT_DS), %eax
-        movl %eax, %ds
-        movl %eax, %es
-        movl %eax, %fs
-        movl %eax, %gs
-        movl %eax, %ss
-        xorl %eax, %eax
-1:      incl %eax                               # check that A20 really IS enabled
-        movl %eax, 0x00000000                   # loop forever if it isn't
-        cmpl %eax, 0x00100000
-        je 1b
-        # Jump to the 32bit entry point
-        jmpl *(code32_start - start + (DELTA_INITSEG << 4))(%esi)
-.code16
-# Here's a bunch of information about your current kernel..
-kernel_version: .ascii  UTS_RELEASE
-                .ascii  " ("
-                .ascii  LINUX_COMPILE_BY
-                .ascii  "@"
-                .ascii  LINUX_COMPILE_HOST
-                .ascii  ") "
-                .ascii  UTS_VERSION
-                .byte   0
-# This is the default real mode switch routine.
-# to be called just before protected mode transition
-default_switch:
-        cli                                     # no interrupts allowed !
-        movb    $0x80, %al                      # disable NMI for bootup
-                                                # sequence
-        outb    %al, $0x70
-        lret
-#ifndef CONFIG_X86_VOYAGER
-# This routine tests whether or not A20 is enabled.  If so, it
-# exits with zf = 0.
-#
-# The memory address used, 0x200, is the int $0x80 vector, which
-# should be safe.
-A20_TEST_ADDR = 4*0x80
-a20_test:
-        pushw   %cx
-        pushw   %ax
-        xorw    %cx, %cx
-        movw    %cx, %fs                        # Low memory
-        decw    %cx
-        movw    %cx, %gs                        # High memory area
-        movw    $A20_TEST_LOOPS, %cx
-        movw    %fs:(A20_TEST_ADDR), %ax
-        pushw   %ax
-a20_test_wait:
-        incw    %ax
-        movw    %ax, %fs:(A20_TEST_ADDR)
-        call    delay                           # Serialize and make delay constant
-        cmpw    %gs:(A20_TEST_ADDR+0x10), %ax
-        loope   a20_test_wait
-        popw    %fs:(A20_TEST_ADDR)
-        popw    %ax
-        popw    %cx
-        ret     
-#endif /* CONFIG_X86_VOYAGER */
-# This routine checks that the keyboard command queue is empty
-# (after emptying the output buffers)
-#
-# Some machines have delusions that the keyboard buffer is always full
-# with no keyboard attached...
-#
-# If there is no keyboard controller, we will usually get 0xff
-# to all the reads.  With each IO taking a microsecond and
-# a timeout of 100,000 iterations, this can take about half a
-# second ("delay" == outb to port 0x80). That should be ok,
-# and should also be plenty of time for a real keyboard controller
-# to empty.
-#
-empty_8042:
-        pushl   %ecx
-        movl    $100000, %ecx
-empty_8042_loop:
-        decl    %ecx
-        jz      empty_8042_end_loop
-        call    delay
-        inb     $0x64, %al                      # 8042 status port
-        testb   $1, %al                         # output buffer?
-        jz      no_output
-        call    delay
-        inb     $0x60, %al                      # read it
-        jmp     empty_8042_loop
-no_output:
-        testb   $2, %al                         # is input buffer full?
-        jnz     empty_8042_loop                 # yes - loop
-empty_8042_end_loop:
-        popl    %ecx
-        ret
-# Read the cmos clock. Return the seconds in al
-gettime:
-        pushw   %cx
-        movb    $0x02, %ah
-        int     $0x1a
-        movb    %dh, %al                        # %dh contains the seconds
-        andb    $0x0f, %al
-        movb    %dh, %ah
-        movb    $0x04, %cl
-        shrb    %cl, %ah
-        aad
-        popw    %cx
-        ret
-# Delay is needed after doing I/O
-delay:
-        outb    %al,$0x80
-        ret
-# Descriptor tables
-#
-# NOTE: The intel manual says gdt should be sixteen bytes aligned for
-# efficiency reasons.  However, there are machines which are known not
-# to boot with misaligned GDTs, so alter this at your peril!  If you alter
-# GDT_ENTRY_BOOT_CS (in asm/segment.h) remember to leave at least two
-# empty GDT entries (one for NULL and one reserved).
-#
-# NOTE: On some CPUs, the GDT must be 8 byte aligned.  This is
-# true for the Voyager Quad CPU card which will not boot without
-# This directive.  16 byte aligment is recommended by intel.
-#
-        .align 16
-gdt:
-        .fill GDT_ENTRY_BOOT_CS,8,0
-        .word   0xFFFF                          # 4Gb - (0x100000*0x1000 = 4Gb)
-        .word   0                               # base address = 0
-        .word   0x9A00                          # code read/exec
-        .word   0x00CF                          # granularity = 4096, 386
-                                                #  (+5th nibble of limit)
-        .word   0xFFFF                          # 4Gb - (0x100000*0x1000 = 4Gb)
-        .word   0                               # base address = 0
-        .word   0x9200                          # data read/write
-        .word   0x00CF                          # granularity = 4096, 386
-                                                #  (+5th nibble of limit)
-gdt_end:
-        .align  4
-        
-        .word   0                               # alignment byte
-idt_48:
-        .word   0                               # idt limit = 0
-        .word   0, 0                            # idt base = 0L
-        .word   0                               # alignment byte
-gdt_48:
-        .word   gdt_end - gdt - 1               # gdt limit
-        .word   0, 0                            # gdt base (filled in later)
-# Include video setup & detection code
-#include "video.S"
-# Setup signature -- must be last
-setup_sig1:     .word   SIG1
-setup_sig2:     .word   SIG2
-# After this point, there is some free space which is used by the video mode
-# handling code to store the temporary mode table (not used by the kernel).
-modelist:
-.text
-endtext:
-.data
-enddata:
-.bss
-endbss:
diff --git a/arch/i386/boot/setup.ld b/arch/i386/boot/setup.ld
new file mode 100644
index 0000000000..df9234b3a5
--- /dev/null
+++ b/arch/i386/boot/setup.ld
@@ -0,0 +1,54 @@
+/*
+ * setup.ld
+ *
+ * Linker script for the i386 setup code
+ */
+OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
+OUTPUT_ARCH(i386)
+ENTRY(_start)
+SECTIONS
+{
+        . = 0;
+        .bstext         : { *(.bstext) }
+        .bsdata         : { *(.bsdata) }
+        . = 497;
+        .header         : { *(.header) }
+        .inittext       : { *(.inittext) }
+        .initdata       : { *(.initdata) }
+        .text           : { *(.text*) }
+        . = ALIGN(16);
+        .rodata         : { *(.rodata*) }
+        .videocards     : {
+                video_cards = .;
+                *(.videocards)
+                video_cards_end = .;
+        }
+        . = ALIGN(16);
+        .data           : { *(.data*) }
+        .signature      : {
+                setup_sig = .;
+                LONG(0x5a5aaa55)
+        }
+        . = ALIGN(16);
+        .bss            :
+        {
+                __bss_start = .;
+                *(.bss)
+                __bss_end = .;
+        }
+        . = ALIGN(16);
+        _end = .;
+        /DISCARD/ : { *(.note*) }
+        . = ASSERT(_end <= 0x8000, "Setup too big!");
+        . = ASSERT(hdr == 0x1f1, "The setup header has the wrong offset!");
+}
diff --git a/arch/i386/boot/string.c b/arch/i386/boot/string.c
new file mode 100644
index 0000000000..481a220977
--- /dev/null
+++ b/arch/i386/boot/string.c
@@ -0,0 +1,52 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/string.c
+ *
+ * Very basic string functions
+ */
+#include "boot.h"
+int strcmp(const char *str1, const char *str2)
+{
+        const unsigned char *s1 = (const unsigned char *)str1;
+        const unsigned char *s2 = (const unsigned char *)str2;
+        int delta = 0;
+        while (*s1 || *s2) {
+                delta = *s2 - *s1;
+                if (delta)
+                        return delta;
+                s1++;
+                s2++;
+        }
+        return 0;
+}
+size_t strnlen(const char *s, size_t maxlen)
+{
+        const char *es = s;
+        while (*es && maxlen) {
+                es++;
+                maxlen--;
+        }
+        return (es - s);
+}
+unsigned int atou(const char *s)
+{
+        unsigned int i = 0;
+        while (isdigit(*s))
+                i = i * 10 + (*s++ - '0');
+        return i;
+}
diff --git a/arch/i386/boot/tools/build.c b/arch/i386/boot/tools/build.c
index 05798419a6..b4248740ff 100644
--- a/arch/i386/boot/tools/build.c
+++ b/arch/i386/boot/tools/build.c
@@ -1,13 +1,12 @@
 /*
 *  Copyright (C) 1991, 1992  Linus Torvalds
 *  Copyright (C) 1997 Martin Mares
+ *  Copyright (C) 2007 H. Peter Anvin
 */
 /*
- * This file builds a disk-image from three different files:
+ * This file builds a disk-image from two different files:
 *
- * - bootsect: compatibility mbr which prints an error message if
- *             someone tries to boot the kernel directly.
 * - setup: 8086 machine code, sets up system parm
 * - system: 80386 code for actual system
 *
@@ -21,6 +20,7 @@
 * High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996
 * Cross compiling fixes by Gertjan van Wingerde, July 1996
 * Rewritten by Martin Mares, April 1997
+ * Substantially overhauled by H. Peter Anvin, April 2007
 */
 #include <stdio.h>
@@ -32,23 +32,25 @@
 #include <sys/sysmacros.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/mman.h>
 #include <asm/boot.h>
-typedef unsigned char byte;
+typedef unsigned char  u8;
-typedef unsigned short word;
+typedef unsigned short u16;
-typedef unsigned long u32;
+typedef unsigned long  u32;
 #define DEFAULT_MAJOR_ROOT 0
 #define DEFAULT_MINOR_ROOT 0
-/* Minimal number of setup sectors (see also bootsect.S) */
+/* Minimal number of setup sectors */
-#define SETUP_SECTS 4
+#define SETUP_SECT_MIN 5
+#define SETUP_SECT_MAX 64
-byte buf[1024];
+/* This must be large enough to hold the entire setup */
-int fd;
+u8 buf[SETUP_SECT_MAX*512];
 int is_big_kernel;
-void die(const char * str, ...)
+static void die(const char * str, ...)
 {
        va_list args;
        va_start(args, str);
@@ -57,15 +59,9 @@ void die(const char * str, ...)
        exit(1);
 }
-void file_open(const char *name)
+static void usage(void)
 {
-        if ((fd = open(name, O_RDONLY, 0)) < 0)
+        die("Usage: build [-b] setup system [rootdev] [> image]");
-                die("Unable to open `%s': %m", name);
-}
-void usage(void)
-{
-        die("Usage: build [-b] bootsect setup system [rootdev] [> image]");
 }
 int main(int argc, char ** argv)
@@ -73,27 +69,30 @@ int main(int argc, char ** argv)
        unsigned int i, sz, setup_sectors;
        int c;
        u32 sys_size;
-        byte major_root, minor_root;
+        u8 major_root, minor_root;
        struct stat sb;
+        FILE *file;
+        int fd;
+        void *kernel;
        if (argc > 2 && !strcmp(argv[1], "-b"))
          {
            is_big_kernel = 1;
            argc--, argv++;
          }
-        if ((argc < 4) || (argc > 5))
+        if ((argc < 3) || (argc > 4))
                usage();
-        if (argc > 4) {
+        if (argc > 3) {
-                if (!strcmp(argv[4], "CURRENT")) {
+                if (!strcmp(argv[3], "CURRENT")) {
                        if (stat("/", &sb)) {
                                perror("/");
                                die("Couldn't stat /");
                        }
                        major_root = major(sb.st_dev);
                        minor_root = minor(sb.st_dev);
-                } else if (strcmp(argv[4], "FLOPPY")) {
+                } else if (strcmp(argv[3], "FLOPPY")) {
-                        if (stat(argv[4], &sb)) {
+                        if (stat(argv[3], &sb)) {
-                                perror(argv[4]);
+                                perror(argv[3]);
                                die("Couldn't stat root device.");
                        }
                        major_root = major(sb.st_rdev);
@@ -108,79 +107,62 @@ int main(int argc, char ** argv)
        }
        fprintf(stderr, "Root device is (%d, %d)\n", major_root, minor_root);
-        file_open(argv[1]);
+        /* Copy the setup code */
-        i = read(fd, buf, sizeof(buf));
+        file = fopen(argv[1], "r");
-        fprintf(stderr,"Boot sector %d bytes.\n",i);
+        if (!file)
-        if (i != 512)
+                die("Unable to open `%s': %m", argv[1]);
-                die("Boot block must be exactly 512 bytes");
+        c = fread(buf, 1, sizeof(buf), file);
+        if (ferror(file))
+                die("read-error on `setup'");
+        if (c < 1024)
+                die("The setup must be at least 1024 bytes");
        if (buf[510] != 0x55 || buf[511] != 0xaa)
                die("Boot block hasn't got boot flag (0xAA55)");
+        fclose(file);
+        /* Pad unused space with zeros */
+        setup_sectors = (c + 511) / 512;
+        if (setup_sectors < SETUP_SECT_MIN)
+                setup_sectors = SETUP_SECT_MIN;
+        i = setup_sectors*512;
+        memset(buf+c, 0, i-c);
+        /* Set the default root device */
        buf[508] = minor_root;
        buf[509] = major_root;
-        if (write(1, buf, 512) != 512)
-                die("Write call failed");
-        close (fd);
-        file_open(argv[2]);                                 /* Copy the setup code */
-        for (i=0 ; (c=read(fd, buf, sizeof(buf)))>0 ; i+=c )
-                if (write(1, buf, c) != c)
-                        die("Write call failed");
-        if (c != 0)
-                die("read-error on `setup'");
-        close (fd);
-        setup_sectors = (i + 511) / 512;        /* Pad unused space with zeros */
-        /* for compatibility with ancient versions of LILO. */
-        if (setup_sectors < SETUP_SECTS)
-                setup_sectors = SETUP_SECTS;
-        fprintf(stderr, "Setup is %d bytes.\n", i);
-        memset(buf, 0, sizeof(buf));
-        while (i < setup_sectors * 512) {
-                c = setup_sectors * 512 - i;
-                if (c > sizeof(buf))
-                        c = sizeof(buf);
-                if (write(1, buf, c) != c)
-                        die("Write call failed");
-                i += c;
-        }
-        file_open(argv[3]);
+        fprintf(stderr, "Setup is %d bytes (padded to %d bytes).\n", c, i);
-        if (fstat (fd, &sb))
-                die("Unable to stat `%s': %m", argv[3]);
+        /* Open and stat the kernel file */
+        fd = open(argv[2], O_RDONLY);
+        if (fd < 0)
+                die("Unable to open `%s': %m", argv[2]);
+        if (fstat(fd, &sb))
+                die("Unable to stat `%s': %m", argv[2]);
        sz = sb.st_size;
-        fprintf (stderr, "System is %d kB\n", sz/1024);
+        fprintf (stderr, "System is %d kB\n", (sz+1023)/1024);
+        kernel = mmap(NULL, sz, PROT_READ, MAP_SHARED, fd, 0);
+        if (kernel == MAP_FAILED)
+                die("Unable to mmap '%s': %m", argv[2]);
        sys_size = (sz + 15) / 16;
        if (!is_big_kernel && sys_size > DEF_SYSSIZE)
                die("System is too big. Try using bzImage or modules.");
-        while (sz > 0) {
-                int l, n;
+        /* Patch the setup code with the appropriate size parameters */
+        buf[0x1f1] = setup_sectors-1;
-                l = (sz > sizeof(buf)) ? sizeof(buf) : sz;
+        buf[0x1f4] = sys_size;
-                if ((n=read(fd, buf, l)) != l) {
+        buf[0x1f5] = sys_size >> 8;
-                        if (n < 0)
+        buf[0x1f6] = sys_size >> 16;
-                                die("Error reading %s: %m", argv[3]);
+        buf[0x1f7] = sys_size >> 24;
-                        else
-                                die("%s: Unexpected EOF", argv[3]);
+        if (fwrite(buf, 1, i, stdout) != i)
-                }
+                die("Writing setup failed");
-                if (write(1, buf, l) != l)
-                        die("Write failed");
+        /* Copy the kernel code */
-                sz -= l;
+        if (fwrite(kernel, 1, sz, stdout) != sz)
-        }
+                die("Writing kernel failed");
        close(fd);
-        if (lseek(1, 497, SEEK_SET) != 497)                 /* Write sizes to the bootsector */
+        /* Everything is OK */
-                die("Output: seek failed");
+        return 0;
-        buf[0] = setup_sectors;
-        if (write(1, buf, 1) != 1)
-                die("Write of setup sector count failed");
-        if (lseek(1, 500, SEEK_SET) != 500)
-                die("Output: seek failed");
-        buf[0] = (sys_size & 0xff);
-        buf[1] = ((sys_size >> 8) & 0xff);
-        buf[2] = ((sys_size >> 16) & 0xff);
-        buf[3] = ((sys_size >> 24) & 0xff);
-        if (write(1, buf, 4) != 4)
-                die("Write of image length failed");
-        return 0;                                           /* Everything is OK */
 }
diff --git a/arch/i386/boot/tty.c b/arch/i386/boot/tty.c
new file mode 100644
index 0000000000..9c668aad35
--- /dev/null
+++ b/arch/i386/boot/tty.c
@@ -0,0 +1,112 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/tty.c
+ *
+ * Very simple screen I/O
+ * XXX: Probably should add very simple serial I/O?
+ */
+#include "boot.h"
+/*
+ * These functions are in .inittext so they can be used to signal
+ * error during initialization.
+ */
+void __attribute__((section(".inittext"))) putchar(int ch)
+{
+        unsigned char c = ch;
+        if (c == '\n')
+                putchar('\r');  /* \n -> \r\n */
+        /* int $0x10 is known to have bugs involving touching registers
+           it shouldn't.  Be extra conservative... */
+        asm volatile("pushal; pushw %%ds; int $0x10; popw %%ds; popal"
+                     : : "b" (0x0007), "c" (0x0001), "a" (0x0e00|ch));
+}
+void __attribute__((section(".inittext"))) puts(const char *str)
+{
+        int n = 0;
+        while (*str) {
+                putchar(*str++);
+                n++;
+        }
+}
+/*
+ * Read the CMOS clock through the BIOS, and return the
+ * seconds in BCD.
+ */
+static u8 gettime(void)
+{
+        u16 ax = 0x0200;
+        u16 cx, dx;
+        asm("int $0x1a"
+            : "+a" (ax), "=c" (cx), "=d" (dx)
+            : : "ebx", "esi", "edi");
+        return dx >> 8;
+}
+/*
+ * Read from the keyboard
+ */
+int getchar(void)
+{
+        u16 ax = 0;
+        asm("int $0x16" : "+a" (ax));
+        return ax & 0xff;
+}
+static int kbd_pending(void)
+{
+        u8 pending;
+        asm("int $0x16; setnz %0"
+            : "=rm" (pending)
+            : "a" (0x0100));
+        return pending;
+}
+void kbd_flush(void)
+{
+        for (;;) {
+                if (!kbd_pending())
+                        break;
+                getchar();
+        }
+}
+int getchar_timeout(void)
+{
+        int cnt = 30;
+        int t0, t1;
+        t0 = gettime();
+        while (cnt) {
+                if (kbd_pending())
+                        return getchar();
+                t1 = gettime();
+                if (t0 != t1) {
+                        cnt--;
+                        t0 = t1;
+                }
+        }
+        return 0;               /* Timeout! */
+}
diff --git a/arch/i386/boot/version.c b/arch/i386/boot/version.c
new file mode 100644
index 0000000000..c61462f7d9
--- /dev/null
+++ b/arch/i386/boot/version.c
@@ -0,0 +1,23 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/version.c
+ *
+ * Kernel version string
+ */
+#include "boot.h"
+#include <linux/utsrelease.h>
+#include <linux/compile.h>
+const char kernel_version[] =
+        UTS_RELEASE " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ") "
+        UTS_VERSION;
diff --git a/arch/i386/boot/vesa.h b/arch/i386/boot/vesa.h
new file mode 100644
index 0000000000..ff5b73cd40
--- /dev/null
+++ b/arch/i386/boot/vesa.h
@@ -0,0 +1,79 @@
+/* ----------------------------------------------------------------------- *
+ *
+ *   Copyright 1999-2007 H. Peter Anvin - All Rights Reserved
+ *
+ *   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, Inc., 53 Temple Place Ste 330,
+ *   Boston MA 02111-1307, USA; either version 2 of the License, or
+ *   (at your option) any later version; incorporated herein by reference.
+ *
+ * ----------------------------------------------------------------------- */
+#ifndef BOOT_VESA_H
+#define BOOT_VESA_H
+typedef struct {
+        u16 off, seg;
+} far_ptr;
+/* VESA General Information table */
+struct vesa_general_info {
+        u32 signature;          /* 0 Magic number = "VESA" */
+        u16 version;            /* 4 */
+        far_ptr vendor_string;  /* 6 */
+        u32 capabilities;       /* 10 */
+        far_ptr video_mode_ptr; /* 14 */
+        u16 total_memory;       /* 18 */
+        u16 oem_software_rev;   /* 20 */
+        far_ptr oem_vendor_name_ptr;    /* 22 */
+        far_ptr oem_product_name_ptr;   /* 26 */
+        far_ptr oem_product_rev_ptr;    /* 30 */
+        u8 reserved[222];       /* 34 */
+        u8 oem_data[256];       /* 256 */
+} __attribute__ ((packed));
+#define VESA_MAGIC ('V' + ('E' << 8) + ('S' << 16) + ('A' << 24))
+#define VBE2_MAGIC ('V' + ('B' << 8) + ('E' << 16) + ('2' << 24))
+struct vesa_mode_info {
+        u16 mode_attr;          /* 0 */
+        u8 win_attr[2];         /* 2 */
+        u16 win_grain;          /* 4 */
+        u16 win_size;           /* 6 */
+        u16 win_seg[2];         /* 8 */
+        far_ptr win_scheme;     /* 12 */
+        u16 logical_scan;       /* 16 */
+        u16 h_res;              /* 18 */
+        u16 v_res;              /* 20 */
+        u8 char_width;          /* 22 */
+        u8 char_height;         /* 23 */
+        u8 memory_planes;       /* 24 */
+        u8 bpp;                 /* 25 */
+        u8 banks;               /* 26 */
+        u8 memory_layout;       /* 27 */
+        u8 bank_size;           /* 28 */
+        u8 image_planes;        /* 29 */
+        u8 page_function;       /* 30 */
+        u8 rmask;               /* 31 */
+        u8 rpos;                /* 32 */
+        u8 gmask;               /* 33 */
+        u8 gpos;                /* 34 */
+        u8 bmask;               /* 35 */
+        u8 bpos;                /* 36 */
+        u8 resv_mask;           /* 37 */
+        u8 resv_pos;            /* 38 */
+        u8 dcm_info;            /* 39 */
+        u32 lfb_ptr;            /* 40 Linear frame buffer address */
+        u32 offscreen_ptr;      /* 44 Offscreen memory address */
+        u16 offscreen_size;     /* 48 */
+        u8 reserved[206];       /* 50 */
+} __attribute__ ((packed));
+#endif                          /* LIB_SYS_VESA_H */
diff --git a/arch/i386/boot/video-bios.c b/arch/i386/boot/video-bios.c
new file mode 100644
index 0000000000..afea46c500
--- /dev/null
+++ b/arch/i386/boot/video-bios.c
@@ -0,0 +1,125 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/video-bios.c
+ *
+ * Standard video BIOS modes
+ *
+ * We have two options for this; silent and scanned.
+ */
+#include "boot.h"
+#include "video.h"
+__videocard video_bios;
+/* Set a conventional BIOS mode */
+static int set_bios_mode(u8 mode);
+static int bios_set_mode(struct mode_info *mi)
+{
+        return set_bios_mode(mi->mode - VIDEO_FIRST_BIOS);
+}
+static int set_bios_mode(u8 mode)
+{
+        u16 ax;
+        u8 new_mode;
+        ax = mode;              /* AH=0x00 Set Video Mode */
+        asm volatile(INT10
+                     : "+a" (ax)
+                     : : "ebx", "ecx", "edx", "esi", "edi");
+        ax = 0x0f00;            /* Get Current Video Mode */
+        asm volatile(INT10
+                     : "+a" (ax)
+                     : : "ebx", "ecx", "edx", "esi", "edi");
+        do_restore = 1;         /* Assume video contents was lost */
+        new_mode = ax & 0x7f;   /* Not all BIOSes are clean with the top bit */
+        if (new_mode == mode)
+                return 0;       /* Mode change OK */
+        if (new_mode != boot_params.screen_info.orig_video_mode) {
+                /* Mode setting failed, but we didn't end up where we
+                   started.  That's bad.  Try to revert to the original
+                   video mode. */
+                ax = boot_params.screen_info.orig_video_mode;
+                asm volatile(INT10
+                             : "+a" (ax)
+                             : : "ebx", "ecx", "edx", "esi", "edi");
+        }
+        return -1;
+}
+static int bios_probe(void)
+{
+        u8 mode;
+        u8 saved_mode = boot_params.screen_info.orig_video_mode;
+        u16 crtc;
+        struct mode_info *mi;
+        int nmodes = 0;
+        if (adapter != ADAPTER_EGA && adapter != ADAPTER_VGA)
+                return 0;
+        set_fs(0);
+        crtc = vga_crtc();
+        video_bios.modes = GET_HEAP(struct mode_info, 0);
+        for (mode = 0x14; mode <= 0x7f; mode++) {
+                if (heap_free() < sizeof(struct mode_info))
+                        break;
+                if (mode_defined(VIDEO_FIRST_BIOS+mode))
+                        continue;
+                if (set_bios_mode(mode))
+                        continue;
+                /* Try to verify that it's a text mode. */
+                /* Attribute Controller: make graphics controller disabled */
+                if (in_idx(0x3c0, 0x10) & 0x01)
+                        continue;
+                /* Graphics Controller: verify Alpha addressing enabled */
+                if (in_idx(0x3ce, 0x06) & 0x01)
+                        continue;
+                /* CRTC cursor location low should be zero(?) */
+                if (in_idx(crtc, 0x0f))
+                        continue;
+                mi = GET_HEAP(struct mode_info, 1);
+                mi->mode = VIDEO_FIRST_BIOS+mode;
+                mi->x = rdfs16(0x44a);
+                mi->y = rdfs8(0x484)+1;
+                nmodes++;
+        }
+        set_bios_mode(saved_mode);
+        return nmodes;
+}
+__videocard video_bios =
+{
+        .card_name      = "BIOS (scanned)",
+        .probe          = bios_probe,
+        .set_mode       = bios_set_mode,
+        .unsafe         = 1,
+        .xmode_first    = VIDEO_FIRST_BIOS,
+        .xmode_n        = 0x80,
+};
diff --git a/arch/i386/boot/video-vesa.c b/arch/i386/boot/video-vesa.c
new file mode 100644
index 0000000000..e6aa9eb8d9
--- /dev/null
+++ b/arch/i386/boot/video-vesa.c
@@ -0,0 +1,284 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/video-vesa.c
+ *
+ * VESA text modes
+ */
+#include "boot.h"
+#include "video.h"
+#include "vesa.h"
+/* VESA information */
+static struct vesa_general_info vginfo;
+static struct vesa_mode_info vminfo;
+__videocard video_vesa;
+static void vesa_store_mode_params_graphics(void);
+static int vesa_probe(void)
+{
+#if defined(CONFIG_VIDEO_VESA) || defined(CONFIG_FIRMWARE_EDID)
+        u16 ax;
+        u16 mode;
+        addr_t mode_ptr;
+        struct mode_info *mi;
+        int nmodes = 0;
+        video_vesa.modes = GET_HEAP(struct mode_info, 0);
+        vginfo.signature = VBE2_MAGIC;
+        /* Optimistically assume a VESA BIOS is register-clean... */
+        ax = 0x4f00;
+        asm("int $0x10" : "+a" (ax), "=m" (vginfo) : "D" (&vginfo));
+        if (ax != 0x004f ||
+            vginfo.signature != VESA_MAGIC ||
+            vginfo.version < 0x0102)
+                return 0;       /* Not present */
+#endif /* CONFIG_VIDEO_VESA || CONFIG_FIRMWARE_EDID */
+#ifdef CONFIG_VIDEO_VESA
+        set_fs(vginfo.video_mode_ptr.seg);
+        mode_ptr = vginfo.video_mode_ptr.off;
+        while ((mode = rdfs16(mode_ptr)) != 0xffff) {
+                mode_ptr += 2;
+                if (heap_free() < sizeof(struct mode_info))
+                        break;  /* Heap full, can't save mode info */
+                if (mode & ~0x1ff)
+                        continue;
+                memset(&vminfo, 0, sizeof vminfo); /* Just in case... */
+                ax = 0x4f01;
+                asm("int $0x10"
+                    : "+a" (ax), "=m" (vminfo)
+                    : "c" (mode), "D" (&vminfo));
+                if (ax != 0x004f)
+                        continue;
+                if ((vminfo.mode_attr & 0x15) == 0x05) {
+                        /* Text Mode, TTY BIOS supported,
+                           supported by hardware */
+                        mi = GET_HEAP(struct mode_info, 1);
+                        mi->mode = mode + VIDEO_FIRST_VESA;
+                        mi->x    = vminfo.h_res;
+                        mi->y    = vminfo.v_res;
+                        nmodes++;
+                } else if ((vminfo.mode_attr & 0x99) == 0x99) {
+#ifdef CONFIG_FB
+                        /* Graphics mode, color, linear frame buffer
+                           supported -- register the mode but hide from
+                           the menu.  Only do this if framebuffer is
+                           configured, however, otherwise the user will
+                           be left without a screen. */
+                        mi = GET_HEAP(struct mode_info, 1);
+                        mi->mode = mode + VIDEO_FIRST_VESA;
+                        mi->x = mi->y = 0;
+                        nmodes++;
+#endif
+                }
+        }
+        return nmodes;
+#else
+        return 0;
+#endif /* CONFIG_VIDEO_VESA */
+}
+static int vesa_set_mode(struct mode_info *mode)
+{
+        u16 ax;
+        int is_graphic;
+        u16 vesa_mode = mode->mode - VIDEO_FIRST_VESA;
+        memset(&vminfo, 0, sizeof vminfo); /* Just in case... */
+        ax = 0x4f01;
+        asm("int $0x10"
+            : "+a" (ax), "=m" (vminfo)
+            : "c" (vesa_mode), "D" (&vminfo));
+        if (ax != 0x004f)
+                return -1;
+        if ((vminfo.mode_attr & 0x15) == 0x05) {
+                /* It's a supported text mode */
+                is_graphic = 0;
+        } else if ((vminfo.mode_attr & 0x99) == 0x99) {
+                /* It's a graphics mode with linear frame buffer */
+                is_graphic = 1;
+                vesa_mode |= 0x4000; /* Request linear frame buffer */
+        } else {
+                return -1;      /* Invalid mode */
+        }
+        ax = 0x4f02;
+        asm volatile("int $0x10"
+                     : "+a" (ax)
+                     : "b" (vesa_mode), "D" (0));
+        if (ax != 0x004f)
+                return -1;
+        graphic_mode = is_graphic;
+        if (!is_graphic) {
+                /* Text mode */
+                force_x = mode->x;
+                force_y = mode->y;
+                do_restore = 1;
+        } else {
+                /* Graphics mode */
+                vesa_store_mode_params_graphics();
+        }
+        return 0;
+}
+/* Switch DAC to 8-bit mode */
+static void vesa_dac_set_8bits(void)
+{
+        u8 dac_size = 6;
+        /* If possible, switch the DAC to 8-bit mode */
+        if (vginfo.capabilities & 1) {
+                u16 ax, bx;
+                ax = 0x4f08;
+                bx = 0x0800;
+                asm volatile(INT10
+                             : "+a" (ax), "+b" (bx)
+                             : : "ecx", "edx", "esi", "edi");
+                if (ax == 0x004f)
+                        dac_size = bx >> 8;
+        }
+        /* Set the color sizes to the DAC size, and offsets to 0 */
+        boot_params.screen_info.red_size = dac_size;
+        boot_params.screen_info.green_size = dac_size;
+        boot_params.screen_info.blue_size = dac_size;
+        boot_params.screen_info.rsvd_size = dac_size;
+        boot_params.screen_info.red_pos = 0;
+        boot_params.screen_info.green_pos = 0;
+        boot_params.screen_info.blue_pos = 0;
+        boot_params.screen_info.rsvd_pos = 0;
+}
+/* Save the VESA protected mode info */
+static void vesa_store_pm_info(void)
+{
+        u16 ax, bx, di, es;
+        ax = 0x4f0a;
+        bx = di = 0;
+        asm("pushw %%es; "INT10"; movw %%es,%0; popw %%es"
+            : "=d" (es), "+a" (ax), "+b" (bx), "+D" (di)
+            : : "ecx", "esi");
+        if (ax != 0x004f)
+                return;
+        boot_params.screen_info.vesapm_seg = es;
+        boot_params.screen_info.vesapm_off = di;
+}
+/*
+ * Save video mode parameters for graphics mode
+ */
+static void vesa_store_mode_params_graphics(void)
+{
+        /* Tell the kernel we're in VESA graphics mode */
+        boot_params.screen_info.orig_video_isVGA = 0x23;
+        /* Mode parameters */
+        boot_params.screen_info.vesa_attributes = vminfo.mode_attr;
+        boot_params.screen_info.lfb_linelength = vminfo.logical_scan;
+        boot_params.screen_info.lfb_width = vminfo.h_res;
+        boot_params.screen_info.lfb_height = vminfo.v_res;
+        boot_params.screen_info.lfb_depth = vminfo.bpp;
+        boot_params.screen_info.pages = vminfo.image_planes;
+        boot_params.screen_info.lfb_base = vminfo.lfb_ptr;
+        memcpy(&boot_params.screen_info.red_size,
+               &vminfo.rmask, 8);
+        /* General parameters */
+        boot_params.screen_info.lfb_size = vginfo.total_memory;
+        if (vminfo.bpp <= 8)
+                vesa_dac_set_8bits();
+        vesa_store_pm_info();
+}
+/*
+ * Save EDID information for the kernel; this is invoked, separately,
+ * after mode-setting.
+ */
+void vesa_store_edid(void)
+{
+#ifdef CONFIG_FIRMWARE_EDID
+        u16 ax, bx, cx, dx, di;
+        /* Apparently used as a nonsense token... */
+        memset(&boot_params.edid_info, 0x13, sizeof boot_params.edid_info);
+        if (vginfo.version < 0x0200)
+                return;         /* EDID requires VBE 2.0+ */
+        ax = 0x4f15;            /* VBE DDC */
+        bx = 0x0000;            /* Report DDC capabilities */
+        cx = 0;                 /* Controller 0 */
+        di = 0;                 /* ES:DI must be 0 by spec */
+        /* Note: The VBE DDC spec is different from the main VESA spec;
+           we genuinely have to assume all registers are destroyed here. */
+        asm("pushw %%es; movw %2,%%es; "INT10"; popw %%es"
+            : "+a" (ax), "+b" (bx)
+            :  "c" (cx), "D" (di)
+            : "esi");
+        if (ax != 0x004f)
+                return;         /* No EDID */
+        /* BH = time in seconds to transfer EDD information */
+        /* BL = DDC level supported */
+        ax = 0x4f15;            /* VBE DDC */
+        bx = 0x0001;            /* Read EDID */
+        cx = 0;                 /* Controller 0 */
+        dx = 0;                 /* EDID block number */
+        di =(size_t) &boot_params.edid_info; /* (ES:)Pointer to block */
+        asm(INT10
+            : "+a" (ax), "+b" (bx), "+d" (dx)
+            : "c" (cx), "D" (di)
+            : "esi");
+#endif /* CONFIG_FIRMWARE_EDID */
+}
+__videocard video_vesa =
+{
+        .card_name      = "VESA",
+        .probe          = vesa_probe,
+        .set_mode       = vesa_set_mode,
+        .xmode_first    = VIDEO_FIRST_VESA,
+        .xmode_n        = 0x200,
+};
diff --git a/arch/i386/boot/video-vga.c b/arch/i386/boot/video-vga.c
new file mode 100644
index 0000000000..700d09a9c9
--- /dev/null
+++ b/arch/i386/boot/video-vga.c
@@ -0,0 +1,260 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/video-vga.c
+ *
+ * Common all-VGA modes
+ */
+#include "boot.h"
+#include "video.h"
+static struct mode_info vga_modes[] = {
+        { VIDEO_80x25,  80, 25 },
+        { VIDEO_8POINT, 80, 50 },
+        { VIDEO_80x43,  80, 43 },
+        { VIDEO_80x28,  80, 28 },
+        { VIDEO_80x30,  80, 30 },
+        { VIDEO_80x34,  80, 34 },
+        { VIDEO_80x60,  80, 60 },
+};
+static struct mode_info ega_modes[] = {
+        { VIDEO_80x25,  80, 25 },
+        { VIDEO_8POINT, 80, 43 },
+};
+static struct mode_info cga_modes[] = {
+        { VIDEO_80x25,  80, 25 },
+};
+__videocard video_vga;
+/* Set basic 80x25 mode */
+static u8 vga_set_basic_mode(void)
+{
+        u16 ax;
+        u8 rows;
+        u8 mode;
+#ifdef CONFIG_VIDEO_400_HACK
+        if (adapter >= ADAPTER_VGA) {
+                asm(INT10
+                    : : "a" (0x1202), "b" (0x0030)
+                    : "ecx", "edx", "esi", "edi");
+        }
+#endif
+        ax = 0x0f00;
+        asm(INT10
+            : "+a" (ax)
+            : : "ebx", "ecx", "edx", "esi", "edi");
+        mode = (u8)ax;
+        set_fs(0);
+        rows = rdfs8(0x484);    /* rows minus one */
+#ifndef CONFIG_VIDEO_400_HACK
+        if ((ax == 0x5003 || ax == 0x5007) &&
+            (rows == 0 || rows == 24))
+                return mode;
+#endif
+        if (mode != 3 && mode != 7)
+                mode = 3;
+        /* Set the mode */
+        asm volatile(INT10
+                     : : "a" (mode)
+                     : "ebx", "ecx", "edx", "esi", "edi");
+        do_restore = 1;
+        return mode;
+}
+static void vga_set_8font(void)
+{
+        /* Set 8x8 font - 80x43 on EGA, 80x50 on VGA */
+        /* Set 8x8 font */
+        asm volatile(INT10 : : "a" (0x1112), "b" (0));
+        /* Use alternate print screen */
+        asm volatile(INT10 : : "a" (0x1200), "b" (0x20));
+        /* Turn off cursor emulation */
+        asm volatile(INT10 : : "a" (0x1201), "b" (0x34));
+        /* Cursor is scan lines 6-7 */
+        asm volatile(INT10 : : "a" (0x0100), "c" (0x0607));
+}
+static void vga_set_14font(void)
+{
+        /* Set 9x14 font - 80x28 on VGA */
+        /* Set 9x14 font */
+        asm volatile(INT10 : : "a" (0x1111), "b" (0));
+        /* Turn off cursor emulation */
+        asm volatile(INT10 : : "a" (0x1201), "b" (0x34));
+        /* Cursor is scan lines 11-12 */
+        asm volatile(INT10 : : "a" (0x0100), "c" (0x0b0c));
+}
+static void vga_set_80x43(void)
+{
+        /* Set 80x43 mode on VGA (not EGA) */
+        /* Set 350 scans */
+        asm volatile(INT10 : : "a" (0x1201), "b" (0x30));
+        /* Reset video mode */
+        asm volatile(INT10 : : "a" (0x0003));
+        vga_set_8font();
+}
+/* I/O address of the VGA CRTC */
+u16 vga_crtc(void)
+{
+        return (inb(0x3cc) & 1) ? 0x3d4 : 0x3b4;
+}
+static void vga_set_480_scanlines(int end)
+{
+        u16 crtc;
+        u8  csel;
+        crtc = vga_crtc();
+        out_idx(0x0c, crtc, 0x11); /* Vertical sync end, unlock CR0-7 */
+        out_idx(0x0b, crtc, 0x06); /* Vertical total */
+        out_idx(0x3e, crtc, 0x07); /* Vertical overflow */
+        out_idx(0xea, crtc, 0x10); /* Vertical sync start */
+        out_idx(end, crtc, 0x12); /* Vertical display end */
+        out_idx(0xe7, crtc, 0x15); /* Vertical blank start */
+        out_idx(0x04, crtc, 0x16); /* Vertical blank end */
+        csel = inb(0x3cc);
+        csel &= 0x0d;
+        csel |= 0xe2;
+        outb(csel, 0x3cc);
+}
+static void vga_set_80x30(void)
+{
+        vga_set_480_scanlines(0xdf);
+}
+static void vga_set_80x34(void)
+{
+        vga_set_14font();
+        vga_set_480_scanlines(0xdb);
+}
+static void vga_set_80x60(void)
+{
+        vga_set_8font();
+        vga_set_480_scanlines(0xdf);
+}
+static int vga_set_mode(struct mode_info *mode)
+{
+        /* Set the basic mode */
+        vga_set_basic_mode();
+        /* Override a possibly broken BIOS */
+        force_x = mode->x;
+        force_y = mode->y;
+        switch (mode->mode) {
+        case VIDEO_80x25:
+                break;
+        case VIDEO_8POINT:
+                vga_set_8font();
+                break;
+        case VIDEO_80x43:
+                vga_set_80x43();
+                break;
+        case VIDEO_80x28:
+                vga_set_14font();
+                break;
+        case VIDEO_80x30:
+                vga_set_80x30();
+                break;
+        case VIDEO_80x34:
+                vga_set_80x34();
+                break;
+        case VIDEO_80x60:
+                vga_set_80x60();
+                break;
+        }
+        return 0;
+}
+/*
+ * Note: this probe includes basic information required by all
+ * systems.  It should be executed first, by making sure
+ * video-vga.c is listed first in the Makefile.
+ */
+static int vga_probe(void)
+{
+        static const char *card_name[] = {
+                "CGA/MDA/HGC", "EGA", "VGA"
+        };
+        static struct mode_info *mode_lists[] = {
+                cga_modes,
+                ega_modes,
+                vga_modes,
+        };
+        static int mode_count[] = {
+                sizeof(cga_modes)/sizeof(struct mode_info),
+                sizeof(ega_modes)/sizeof(struct mode_info),
+                sizeof(vga_modes)/sizeof(struct mode_info),
+        };
+        u8 vga_flag;
+        asm(INT10
+            : "=b" (boot_params.screen_info.orig_video_ega_bx)
+            : "a" (0x1200), "b" (0x10) /* Check EGA/VGA */
+            : "ecx", "edx", "esi", "edi");
+        /* If we have MDA/CGA/HGC then BL will be unchanged at 0x10 */
+        if ((u8)boot_params.screen_info.orig_video_ega_bx != 0x10) {
+                /* EGA/VGA */
+                asm(INT10
+                    : "=a" (vga_flag)
+                    : "a" (0x1a00)
+                    : "ebx", "ecx", "edx", "esi", "edi");
+                if (vga_flag == 0x1a) {
+                        adapter = ADAPTER_VGA;
+                        boot_params.screen_info.orig_video_isVGA = 1;
+                } else {
+                        adapter = ADAPTER_EGA;
+                }
+        } else {
+                adapter = ADAPTER_CGA;
+        }
+        video_vga.modes = mode_lists[adapter];
+        video_vga.card_name = card_name[adapter];
+        return mode_count[adapter];
+}
+__videocard video_vga =
+{
+        .card_name      = "VGA",
+        .probe          = vga_probe,
+        .set_mode       = vga_set_mode,
+};
diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S
deleted file mode 100644
index 8143c9516c..0000000000
--- a/arch/i386/boot/video.S
+++ /dev/null
@@ -1,2043 +0,0 @@
-/*      video.S
- *
- *      Display adapter & video mode setup, version 2.13 (14-May-99)
- *
- *      Copyright (C) 1995 -- 1998 Martin Mares <mj@ucw.cz>
- *      Based on the original setup.S code (C) Linus Torvalds and Mats Anderson
- *
- *      Rewritten to use GNU 'as' by Chris Noe <stiker@northlink.com> May 1999
- *
- *      For further information, look at Documentation/svga.txt.
- *
- */
-/* Enable autodetection of SVGA adapters and modes. */
-#undef CONFIG_VIDEO_SVGA
-/* Enable autodetection of VESA modes */
-#define CONFIG_VIDEO_VESA
-/* Enable compacting of mode table */
-#define CONFIG_VIDEO_COMPACT
-/* Retain screen contents when switching modes */
-#define CONFIG_VIDEO_RETAIN
-/* Enable local mode list */
-#undef CONFIG_VIDEO_LOCAL
-/* Force 400 scan lines for standard modes (hack to fix bad BIOS behaviour */
-#undef CONFIG_VIDEO_400_HACK
-/* Hack that lets you force specific BIOS mode ID and specific dimensions */
-#undef CONFIG_VIDEO_GFX_HACK
-#define VIDEO_GFX_BIOS_AX 0x4f02        /* 800x600 on ThinkPad */
-#define VIDEO_GFX_BIOS_BX 0x0102
-#define VIDEO_GFX_DUMMY_RESOLUTION 0x6425       /* 100x37 */
-/* This code uses an extended set of video mode numbers. These include:
- * Aliases for standard modes
- *      NORMAL_VGA (-1)
- *      EXTENDED_VGA (-2)
- *      ASK_VGA (-3)
- * Video modes numbered by menu position -- NOT RECOMMENDED because of lack
- * of compatibility when extending the table. These are between 0x00 and 0xff.
- */
-#define VIDEO_FIRST_MENU 0x0000
-/* Standard BIOS video modes (BIOS number + 0x0100) */
-#define VIDEO_FIRST_BIOS 0x0100
-/* VESA BIOS video modes (VESA number + 0x0200) */
-#define VIDEO_FIRST_VESA 0x0200
-/* Video7 special modes (BIOS number + 0x0900) */
-#define VIDEO_FIRST_V7 0x0900
-/* Special video modes */
-#define VIDEO_FIRST_SPECIAL 0x0f00
-#define VIDEO_80x25 0x0f00
-#define VIDEO_8POINT 0x0f01
-#define VIDEO_80x43 0x0f02
-#define VIDEO_80x28 0x0f03
-#define VIDEO_CURRENT_MODE 0x0f04
-#define VIDEO_80x30 0x0f05
-#define VIDEO_80x34 0x0f06
-#define VIDEO_80x60 0x0f07
-#define VIDEO_GFX_HACK 0x0f08
-#define VIDEO_LAST_SPECIAL 0x0f09
-/* Video modes given by resolution */
-#define VIDEO_FIRST_RESOLUTION 0x1000
-/* The "recalculate timings" flag */
-#define VIDEO_RECALC 0x8000
-/* Positions of various video parameters passed to the kernel */
-/* (see also include/linux/tty.h) */
-#define PARAM_CURSOR_POS        0x00
-#define PARAM_VIDEO_PAGE        0x04
-#define PARAM_VIDEO_MODE        0x06
-#define PARAM_VIDEO_COLS        0x07
-#define PARAM_VIDEO_EGA_BX      0x0a
-#define PARAM_VIDEO_LINES       0x0e
-#define PARAM_HAVE_VGA          0x0f
-#define PARAM_FONT_POINTS       0x10
-#define PARAM_LFB_WIDTH         0x12
-#define PARAM_LFB_HEIGHT        0x14
-#define PARAM_LFB_DEPTH         0x16
-#define PARAM_LFB_BASE          0x18
-#define PARAM_LFB_SIZE          0x1c
-#define PARAM_LFB_LINELENGTH    0x24
-#define PARAM_LFB_COLORS        0x26
-#define PARAM_VESAPM_SEG        0x2e
-#define PARAM_VESAPM_OFF        0x30
-#define PARAM_LFB_PAGES         0x32
-#define PARAM_VESA_ATTRIB       0x34
-#define PARAM_CAPABILITIES      0x36
-/* Define DO_STORE according to CONFIG_VIDEO_RETAIN */
-#ifdef CONFIG_VIDEO_RETAIN
-#define DO_STORE call store_screen
-#else
-#define DO_STORE
-#endif /* CONFIG_VIDEO_RETAIN */
-# This is the main entry point called by setup.S
-# %ds *must* be pointing to the bootsector
-video:  pushw   %ds             # We use different segments
-        pushw   %ds             # FS contains original DS
-        popw    %fs
-        pushw   %cs             # DS is equal to CS
-        popw    %ds
-        pushw   %cs             # ES is equal to CS
-        popw    %es
-        xorw    %ax, %ax
-        movw    %ax, %gs        # GS is zero
-        cld
-        call    basic_detect    # Basic adapter type testing (EGA/VGA/MDA/CGA)
-#ifdef CONFIG_VIDEO_SELECT
-        movw    %fs:(0x01fa), %ax               # User selected video mode
-        cmpw    $ASK_VGA, %ax                   # Bring up the menu
-        jz      vid2
-        call    mode_set                        # Set the mode
-        jc      vid1
-        leaw    badmdt, %si                     # Invalid mode ID
-        call    prtstr
-vid2:   call    mode_menu
-vid1:
-#ifdef CONFIG_VIDEO_RETAIN
-        call    restore_screen                  # Restore screen contents
-#endif /* CONFIG_VIDEO_RETAIN */
-        call    store_edid
-#endif /* CONFIG_VIDEO_SELECT */
-        call    mode_params                     # Store mode parameters
-        popw    %ds                             # Restore original DS
-        ret
-# Detect if we have CGA, MDA, EGA or VGA and pass it to the kernel.
-basic_detect:
-        movb    $0, %fs:(PARAM_HAVE_VGA)
-        movb    $0x12, %ah      # Check EGA/VGA
-        movb    $0x10, %bl
-        int     $0x10
-        movw    %bx, %fs:(PARAM_VIDEO_EGA_BX)   # Identifies EGA to the kernel
-        cmpb    $0x10, %bl                      # No, it's a CGA/MDA/HGA card.
-        je      basret
-        incb    adapter
-        movw    $0x1a00, %ax                    # Check EGA or VGA?
-        int     $0x10
-        cmpb    $0x1a, %al                      # 1a means VGA...
-        jne     basret                          # anything else is EGA.
-        
-        incb    %fs:(PARAM_HAVE_VGA)            # We've detected a VGA
-        incb    adapter
-basret: ret
-# Store the video mode parameters for later usage by the kernel.
-# This is done by asking the BIOS except for the rows/columns
-# parameters in the default 80x25 mode -- these are set directly,
-# because some very obscure BIOSes supply insane values.
-mode_params:
-#ifdef CONFIG_VIDEO_SELECT
-        cmpb    $0, graphic_mode
-        jnz     mopar_gr
-#endif
-        movb    $0x03, %ah                      # Read cursor position
-        xorb    %bh, %bh
-        int     $0x10
-        movw    %dx, %fs:(PARAM_CURSOR_POS)
-        movb    $0x0f, %ah                      # Read page/mode/width
-        int     $0x10
-        movw    %bx, %fs:(PARAM_VIDEO_PAGE)
-        movw    %ax, %fs:(PARAM_VIDEO_MODE)     # Video mode and screen width
-        cmpb    $0x7, %al                       # MDA/HGA => segment differs
-        jnz     mopar0
-        movw    $0xb000, video_segment
-mopar0: movw    %gs:(0x485), %ax                # Font size
-        movw    %ax, %fs:(PARAM_FONT_POINTS)    # (valid only on EGA/VGA)
-        movw    force_size, %ax                 # Forced size?
-        orw     %ax, %ax
-        jz      mopar1
-        movb    %ah, %fs:(PARAM_VIDEO_COLS)
-        movb    %al, %fs:(PARAM_VIDEO_LINES)
-        ret
-mopar1: movb    $25, %al
-        cmpb    $0, adapter                     # If we are on CGA/MDA/HGA, the
-        jz      mopar2                          # screen must have 25 lines.
-        movb    %gs:(0x484), %al                # On EGA/VGA, use the EGA+ BIOS
-        incb    %al                             # location of max lines.
-mopar2: movb    %al, %fs:(PARAM_VIDEO_LINES)
-        ret
-#ifdef CONFIG_VIDEO_SELECT
-# Fetching of VESA frame buffer parameters
-mopar_gr:
-        leaw    modelist+1024, %di
-        movb    $0x23, %fs:(PARAM_HAVE_VGA)
-        movw    16(%di), %ax
-        movw    %ax, %fs:(PARAM_LFB_LINELENGTH)
-        movw    18(%di), %ax
-        movw    %ax, %fs:(PARAM_LFB_WIDTH)
-        movw    20(%di), %ax
-        movw    %ax, %fs:(PARAM_LFB_HEIGHT)
-        movb    25(%di), %al
-        movb    $0, %ah
-        movw    %ax, %fs:(PARAM_LFB_DEPTH)
-        movb    29(%di), %al    
-        movb    $0, %ah
-        movw    %ax, %fs:(PARAM_LFB_PAGES)
-        movl    40(%di), %eax
-        movl    %eax, %fs:(PARAM_LFB_BASE)
-        movl    31(%di), %eax
-        movl    %eax, %fs:(PARAM_LFB_COLORS)
-        movl    35(%di), %eax
-        movl    %eax, %fs:(PARAM_LFB_COLORS+4)
-        movw    0(%di), %ax
-        movw    %ax, %fs:(PARAM_VESA_ATTRIB)
-# get video mem size
-        leaw    modelist+1024, %di
-        movw    $0x4f00, %ax
-        int     $0x10
-        xorl    %eax, %eax
-        movw    18(%di), %ax
-        movl    %eax, %fs:(PARAM_LFB_SIZE)
-# store mode capabilities
-        movl 10(%di), %eax
-        movl %eax, %fs:(PARAM_CAPABILITIES)
-# switching the DAC to 8-bit is for <= 8 bpp only
-        movw    %fs:(PARAM_LFB_DEPTH), %ax
-        cmpw    $8, %ax
-        jg      dac_done
-# get DAC switching capability
-        xorl    %eax, %eax
-        movb    10(%di), %al
-        testb   $1, %al
-        jz      dac_set
-# attempt to switch DAC to 8-bit
-        movw    $0x4f08, %ax
-        movw    $0x0800, %bx
-        int     $0x10
-        cmpw    $0x004f, %ax
-        jne     dac_set
-        movb    %bh, dac_size           # store actual DAC size
-dac_set:
-# set color size to DAC size
-        movb    dac_size, %al
-        movb    %al, %fs:(PARAM_LFB_COLORS+0)
-        movb    %al, %fs:(PARAM_LFB_COLORS+2)
-        movb    %al, %fs:(PARAM_LFB_COLORS+4)
-        movb    %al, %fs:(PARAM_LFB_COLORS+6)
-# set color offsets to 0
-        movb    $0, %fs:(PARAM_LFB_COLORS+1)
-        movb    $0, %fs:(PARAM_LFB_COLORS+3)
-        movb    $0, %fs:(PARAM_LFB_COLORS+5)
-        movb    $0, %fs:(PARAM_LFB_COLORS+7)
-dac_done:
-# get protected mode interface informations
-        movw    $0x4f0a, %ax
-        xorw    %bx, %bx
-        xorw    %di, %di
-        int     $0x10
-        cmp     $0x004f, %ax
-        jnz     no_pm
-        movw    %es, %fs:(PARAM_VESAPM_SEG)
-        movw    %di, %fs:(PARAM_VESAPM_OFF)
-no_pm:  ret
-# The video mode menu
-mode_menu:
-        leaw    keymsg, %si                     # "Return/Space/Timeout" message
-        call    prtstr
-        call    flush
-nokey:  call    getkt
-        cmpb    $0x0d, %al                      # ENTER ?
-        je      listm                           # yes - manual mode selection
-        cmpb    $0x20, %al                      # SPACE ?
-        je      defmd1                          # no - repeat
-        call    beep
-        jmp     nokey
-defmd1: ret                                     # No mode chosen? Default 80x25
-listm:  call    mode_table                      # List mode table
-listm0: leaw    name_bann, %si                  # Print adapter name
-        call    prtstr
-        movw    card_name, %si
-        orw     %si, %si
-        jnz     an2
-        movb    adapter, %al
-        leaw    old_name, %si
-        orb     %al, %al
-        jz      an1
-        leaw    ega_name, %si
-        decb    %al
-        jz      an1
-        leaw    vga_name, %si
-        jmp     an1
-an2:    call    prtstr
-        leaw    svga_name, %si
-an1:    call    prtstr
-        leaw    listhdr, %si                    # Table header
-        call    prtstr
-        movb    $0x30, %dl                      # DL holds mode number
-        leaw    modelist, %si
-lm1:    cmpw    $ASK_VGA, (%si)                 # End?
-        jz      lm2
-        movb    %dl, %al                        # Menu selection number
-        call    prtchr
-        call    prtsp2
-        lodsw
-        call    prthw                           # Mode ID
-        call    prtsp2
-        movb    0x1(%si), %al
-        call    prtdec                          # Rows
-        movb    $0x78, %al                      # the letter 'x'
-        call    prtchr
-        lodsw
-        call    prtdec                          # Columns
-        movb    $0x0d, %al                      # New line
-        call    prtchr
-        movb    $0x0a, %al
-        call    prtchr
-        incb    %dl                             # Next character
-        cmpb    $0x3a, %dl
-        jnz     lm1
-        movb    $0x61, %dl
-        jmp     lm1
-lm2:    leaw    prompt, %si                     # Mode prompt
-        call    prtstr
-        leaw    edit_buf, %di                   # Editor buffer
-lm3:    call    getkey
-        cmpb    $0x0d, %al                      # Enter?
-        jz      lment
-        cmpb    $0x08, %al                      # Backspace?
-        jz      lmbs
-        cmpb    $0x20, %al                      # Printable?
-        jc      lm3
-        cmpw    $edit_buf+4, %di                # Enough space?
-        jz      lm3
-        stosb
-        call    prtchr
-        jmp     lm3
-lmbs:   cmpw    $edit_buf, %di                  # Backspace
-        jz      lm3
-        decw    %di
-        movb    $0x08, %al
-        call    prtchr
-        call    prtspc
-        movb    $0x08, %al
-        call    prtchr
-        jmp     lm3
-        
-lment:  movb    $0, (%di)
-        leaw    crlft, %si
-        call    prtstr
-        leaw    edit_buf, %si
-        cmpb    $0, (%si)                       # Empty string = default mode
-        jz      lmdef
-        cmpb    $0, 1(%si)                      # One character = menu selection
-        jz      mnusel
-        cmpw    $0x6373, (%si)                  # "scan" => mode scanning
-        jnz     lmhx
-        cmpw    $0x6e61, 2(%si)
-        jz      lmscan
-lmhx:   xorw    %bx, %bx                        # Else => mode ID in hex
-lmhex:  lodsb
-        orb     %al, %al
-        jz      lmuse1
-        subb    $0x30, %al
-        jc      lmbad
-        cmpb    $10, %al
-        jc      lmhx1
-        subb    $7, %al
-        andb    $0xdf, %al
-        cmpb    $10, %al
-        jc      lmbad
-        cmpb    $16, %al
-        jnc     lmbad
-lmhx1:  shlw    $4, %bx
-        orb     %al, %bl
-        jmp     lmhex
-lmuse1: movw    %bx, %ax
-        jmp     lmuse
-mnusel: lodsb                                   # Menu selection
-        xorb    %ah, %ah
-        subb    $0x30, %al
-        jc      lmbad
-        cmpb    $10, %al
-        jc      lmuse
-        
-        cmpb    $0x61-0x30, %al
-        jc      lmbad
-        
-        subb    $0x61-0x30-10, %al
-        cmpb    $36, %al
-        jnc     lmbad
-lmuse:  call    mode_set
-        jc      lmdef
-lmbad:  leaw    unknt, %si
-        call    prtstr
-        jmp     lm2
-lmscan: cmpb    $0, adapter                     # Scanning only on EGA/VGA
-        jz      lmbad
-        movw    $0, mt_end                      # Scanning of modes is
-        movb    $1, scanning                    # done as new autodetection.
-        call    mode_table
-        jmp     listm0
-lmdef:  ret
-# Additional parts of mode_set... (relative jumps, you know)
-setv7:                                          # Video7 extended modes
-        DO_STORE
-        subb    $VIDEO_FIRST_V7>>8, %bh
-        movw    $0x6f05, %ax
-        int     $0x10
-        stc
-        ret
-_setrec:        jmp     setrec                  # Ugly...
-_set_80x25:     jmp     set_80x25
-# Aliases for backward compatibility.
-setalias:
-        movw    $VIDEO_80x25, %ax
-        incw    %bx
-        jz      mode_set
-        movb    $VIDEO_8POINT-VIDEO_FIRST_SPECIAL, %al
-        incw    %bx
-        jnz     setbad                          # Fall-through!
-# Setting of user mode (AX=mode ID) => CF=success
-mode_set:
-        movw    %ax, %fs:(0x01fa)               # Store mode for use in acpi_wakeup.S
-        movw    %ax, %bx
-        cmpb    $0xff, %ah
-        jz      setalias
-        testb   $VIDEO_RECALC>>8, %ah
-        jnz     _setrec
-        cmpb    $VIDEO_FIRST_RESOLUTION>>8, %ah
-        jnc     setres
-        
-        cmpb    $VIDEO_FIRST_SPECIAL>>8, %ah
-        jz      setspc
-        
-        cmpb    $VIDEO_FIRST_V7>>8, %ah
-        jz      setv7
-        
-        cmpb    $VIDEO_FIRST_VESA>>8, %ah
-        jnc     check_vesa
-        
-        orb     %ah, %ah
-        jz      setmenu
-        
-        decb    %ah
-        jz      setbios
-setbad: clc
-        movb    $0, do_restore                  # The screen needn't be restored
-        ret
-setvesa:
-        DO_STORE
-        subb    $VIDEO_FIRST_VESA>>8, %bh
-        movw    $0x4f02, %ax                    # VESA BIOS mode set call
-        int     $0x10
-        cmpw    $0x004f, %ax                    # AL=4f if implemented
-        jnz     setbad                          # AH=0 if OK
-        stc
-        ret
-setbios:
-        DO_STORE
-        int     $0x10                           # Standard BIOS mode set call
-        pushw   %bx
-        movb    $0x0f, %ah                      # Check if really set
-        int     $0x10
-        popw    %bx
-        cmpb    %bl, %al
-        jnz     setbad
-        
-        stc
-        ret
-setspc: xorb    %bh, %bh                        # Set special mode
-        cmpb    $VIDEO_LAST_SPECIAL-VIDEO_FIRST_SPECIAL, %bl
-        jnc     setbad
-        
-        addw    %bx, %bx
-        jmp     *spec_inits(%bx)
-setmenu:
-        orb     %al, %al                        # 80x25 is an exception
-        jz      _set_80x25
-        
-        pushw   %bx                             # Set mode chosen from menu
-        call    mode_table                      # Build the mode table
-        popw    %ax
-        shlw    $2, %ax
-        addw    %ax, %si
-        cmpw    %di, %si
-        jnc     setbad
-        
-        movw    (%si), %ax                      # Fetch mode ID
-_m_s:   jmp     mode_set
-setres: pushw   %bx                             # Set mode chosen by resolution
-        call    mode_table
-        popw    %bx
-        xchgb   %bl, %bh
-setr1:  lodsw
-        cmpw    $ASK_VGA, %ax                   # End of the list?
-        jz      setbad
-        
-        lodsw
-        cmpw    %bx, %ax
-        jnz     setr1
-        
-        movw    -4(%si), %ax                    # Fetch mode ID
-        jmp     _m_s
-check_vesa:
-#ifdef CONFIG_FIRMWARE_EDID
-        leaw    modelist+1024, %di
-        movw    $0x4f00, %ax
-        int     $0x10
-        cmpw    $0x004f, %ax
-        jnz     setbad
-        movw    4(%di), %ax
-        movw    %ax, vbe_version
-#endif
-        leaw    modelist+1024, %di
-        subb    $VIDEO_FIRST_VESA>>8, %bh
-        movw    %bx, %cx                        # Get mode information structure
-        movw    $0x4f01, %ax
-        int     $0x10
-        addb    $VIDEO_FIRST_VESA>>8, %bh
-        cmpw    $0x004f, %ax
-        jnz     setbad
-        movb    (%di), %al                      # Check capabilities.
-        andb    $0x19, %al
-        cmpb    $0x09, %al
-        jz      setvesa                         # This is a text mode
-        movb    (%di), %al                      # Check capabilities.
-        andb    $0x99, %al
-        cmpb    $0x99, %al
-        jnz     _setbad                         # Doh! No linear frame buffer.
-        subb    $VIDEO_FIRST_VESA>>8, %bh
-        orw     $0x4000, %bx                    # Use linear frame buffer
-        movw    $0x4f02, %ax                    # VESA BIOS mode set call
-        int     $0x10
-        cmpw    $0x004f, %ax                    # AL=4f if implemented
-        jnz     _setbad                         # AH=0 if OK
-        movb    $1, graphic_mode                # flag graphic mode
-        movb    $0, do_restore                  # no screen restore
-        stc
-        ret
-_setbad:        jmp     setbad                  # Ugly...
-# Recalculate vertical display end registers -- this fixes various
-# inconsistencies of extended modes on many adapters. Called when
-# the VIDEO_RECALC flag is set in the mode ID.
-setrec: subb    $VIDEO_RECALC>>8, %ah           # Set the base mode
-        call    mode_set
-        jnc     rct3
-        movw    %gs:(0x485), %ax                # Font size in pixels
-        movb    %gs:(0x484), %bl                # Number of rows
-        incb    %bl
-        mulb    %bl                             # Number of visible
-        decw    %ax                             # scan lines - 1
-        movw    $0x3d4, %dx
-        movw    %ax, %bx
-        movb    $0x12, %al                      # Lower 8 bits
-        movb    %bl, %ah
-        outw    %ax, %dx
-        movb    $0x07, %al              # Bits 8 and 9 in the overflow register
-        call    inidx
-        xchgb   %al, %ah
-        andb    $0xbd, %ah
-        shrb    %bh
-        jnc     rct1
-        orb     $0x02, %ah
-rct1:   shrb    %bh
-        jnc     rct2
-        orb     $0x40, %ah
-rct2:   movb    $0x07, %al
-        outw    %ax, %dx
-        stc
-rct3:   ret
-# Table of routines for setting of the special modes.
-spec_inits:
-        .word   set_80x25
-        .word   set_8pixel
-        .word   set_80x43
-        .word   set_80x28
-        .word   set_current
-        .word   set_80x30
-        .word   set_80x34
-        .word   set_80x60
-        .word   set_gfx
-# Set the 80x25 mode. If already set, do nothing.
-set_80x25:
-        movw    $0x5019, force_size             # Override possibly broken BIOS
-use_80x25:
-#ifdef CONFIG_VIDEO_400_HACK
-        movw    $0x1202, %ax                    # Force 400 scan lines
-        movb    $0x30, %bl
-        int     $0x10
-#else
-        movb    $0x0f, %ah                      # Get current mode ID
-        int     $0x10
-        cmpw    $0x5007, %ax    # Mode 7 (80x25 mono) is the only one available
-        jz      st80            # on CGA/MDA/HGA and is also available on EGAM
-        cmpw    $0x5003, %ax    # Unknown mode, force 80x25 color
-        jnz     force3
-st80:   cmpb    $0, adapter     # CGA/MDA/HGA => mode 3/7 is always 80x25
-        jz      set80
-        movb    %gs:(0x0484), %al       # This is EGA+ -- beware of 80x50 etc.
-        orb     %al, %al                # Some buggy BIOS'es set 0 rows
-        jz      set80
-        
-        cmpb    $24, %al                # It's hopefully correct
-        jz      set80
-#endif /* CONFIG_VIDEO_400_HACK */
-force3: DO_STORE
-        movw    $0x0003, %ax                    # Forced set
-        int     $0x10
-set80:  stc
-        ret
-# Set the 80x50/80x43 8-pixel mode. Simple BIOS calls.
-set_8pixel:
-        DO_STORE
-        call    use_80x25                       # The base is 80x25
-set_8pt:
-        movw    $0x1112, %ax                    # Use 8x8 font
-        xorb    %bl, %bl
-        int     $0x10
-        movw    $0x1200, %ax                    # Use alternate print screen
-        movb    $0x20, %bl
-        int     $0x10
-        movw    $0x1201, %ax                    # Turn off cursor emulation
-        movb    $0x34, %bl
-        int     $0x10
-        movb    $0x01, %ah                      # Define cursor scan lines 6-7
-        movw    $0x0607, %cx
-        int     $0x10
-set_current:
-        stc
-        ret
-# Set the 80x28 mode. This mode works on all VGA's, because it's a standard
-# 80x25 mode with 14-point fonts instead of 16-point.
-set_80x28:
-        DO_STORE
-        call    use_80x25                       # The base is 80x25
-set14:  movw    $0x1111, %ax                    # Use 9x14 font
-        xorb    %bl, %bl
-        int     $0x10
-        movb    $0x01, %ah                      # Define cursor scan lines 11-12
-        movw    $0x0b0c, %cx
-        int     $0x10
-        stc
-        ret
-# Set the 80x43 mode. This mode is works on all VGA's.
-# It's a 350-scanline mode with 8-pixel font.
-set_80x43:
-        DO_STORE
-        movw    $0x1201, %ax                    # Set 350 scans
-        movb    $0x30, %bl
-        int     $0x10
-        movw    $0x0003, %ax                    # Reset video mode
-        int     $0x10
-        jmp     set_8pt                         # Use 8-pixel font
-# Set the 80x30 mode (all VGA's). 480 scanlines, 16-pixel font.
-set_80x30:
-        call    use_80x25                       # Start with real 80x25
-        DO_STORE
-        movw    $0x3cc, %dx                     # Get CRTC port
-        inb     %dx, %al
-        movb    $0xd4, %dl
-        rorb    %al                             # Mono or color?
-        jc      set48a
-        movb    $0xb4, %dl
-set48a: movw    $0x0c11, %ax            # Vertical sync end (also unlocks CR0-7)
-        call    outidx
-        movw    $0x0b06, %ax                    # Vertical total
-        call    outidx
-        movw    $0x3e07, %ax                    # (Vertical) overflow
-        call    outidx
-        movw    $0xea10, %ax                    # Vertical sync start
-        call    outidx
-        movw    $0xdf12, %ax                    # Vertical display end
-        call    outidx
-        movw    $0xe715, %ax                    # Vertical blank start
-        call    outidx
-        movw    $0x0416, %ax                    # Vertical blank end
-        call    outidx
-        pushw   %dx
-        movb    $0xcc, %dl                      # Misc output register (read)
-        inb     %dx, %al
-        movb    $0xc2, %dl                      # (write)
-        andb    $0x0d, %al      # Preserve clock select bits and color bit
-        orb     $0xe2, %al                      # Set correct sync polarity
-        outb    %al, %dx
-        popw    %dx
-        movw    $0x501e, force_size
-        stc                                     # That's all.
-        ret
-# Set the 80x34 mode (all VGA's). 480 scans, 14-pixel font.
-set_80x34:
-        call    set_80x30                       # Set 480 scans
-        call    set14                           # And 14-pt font
-        movw    $0xdb12, %ax                    # VGA vertical display end
-        movw    $0x5022, force_size
-setvde: call    outidx
-        stc
-        ret
-# Set the 80x60 mode (all VGA's). 480 scans, 8-pixel font.
-set_80x60:
-        call    set_80x30                       # Set 480 scans
-        call    set_8pt                         # And 8-pt font
-        movw    $0xdf12, %ax                    # VGA vertical display end
-        movw    $0x503c, force_size
-        jmp     setvde
-# Special hack for ThinkPad graphics
-set_gfx:
-#ifdef CONFIG_VIDEO_GFX_HACK
-        movw    $VIDEO_GFX_BIOS_AX, %ax
-        movw    $VIDEO_GFX_BIOS_BX, %bx
-        int     $0x10
-        movw    $VIDEO_GFX_DUMMY_RESOLUTION, force_size
-        stc
-#endif
-        ret
-#ifdef CONFIG_VIDEO_RETAIN
-# Store screen contents to temporary buffer.
-store_screen:
-        cmpb    $0, do_restore                  # Already stored?
-        jnz     stsr
-        testb   $CAN_USE_HEAP, loadflags        # Have we space for storing?
-        jz      stsr
-        
-        pushw   %ax
-        pushw   %bx
-        pushw   force_size                      # Don't force specific size
-        movw    $0, force_size
-        call    mode_params                     # Obtain params of current mode
-        popw    force_size
-        movb    %fs:(PARAM_VIDEO_LINES), %ah
-        movb    %fs:(PARAM_VIDEO_COLS), %al
-        movw    %ax, %bx                        # BX=dimensions
-        mulb    %ah
-        movw    %ax, %cx                        # CX=number of characters
-        addw    %ax, %ax                        # Calculate image size
-        addw    $modelist+1024+4, %ax
-        cmpw    heap_end_ptr, %ax
-        jnc     sts1                            # Unfortunately, out of memory
-        movw    %fs:(PARAM_CURSOR_POS), %ax     # Store mode params
-        leaw    modelist+1024, %di
-        stosw
-        movw    %bx, %ax
-        stosw
-        pushw   %ds                             # Store the screen
-        movw    video_segment, %ds
-        xorw    %si, %si
-        rep
-        movsw
-        popw    %ds
-        incb    do_restore                      # Screen will be restored later
-sts1:   popw    %bx
-        popw    %ax
-stsr:   ret
-# Restore screen contents from temporary buffer.
-restore_screen:
-        cmpb    $0, do_restore                  # Has the screen been stored?
-        jz      res1
-        call    mode_params                     # Get parameters of current mode
-        movb    %fs:(PARAM_VIDEO_LINES), %cl
-        movb    %fs:(PARAM_VIDEO_COLS), %ch
-        leaw    modelist+1024, %si              # Screen buffer
-        lodsw                                   # Set cursor position
-        movw    %ax, %dx
-        cmpb    %cl, %dh
-        jc      res2
-        
-        movb    %cl, %dh
-        decb    %dh
-res2:   cmpb    %ch, %dl
-        jc      res3
-        
-        movb    %ch, %dl
-        decb    %dl
-res3:   movb    $0x02, %ah
-        movb    $0x00, %bh
-        int     $0x10
-        lodsw                                   # Display size
-        movb    %ah, %dl                        # DL=number of lines
-        movb    $0, %ah                         # BX=phys. length of orig. line
-        movw    %ax, %bx
-        cmpb    %cl, %dl                        # Too many?
-        jc      res4
-        pushw   %ax
-        movb    %dl, %al
-        subb    %cl, %al
-        mulb    %bl
-        addw    %ax, %si
-        addw    %ax, %si
-        popw    %ax
-        movb    %cl, %dl
-res4:   cmpb    %ch, %al                        # Too wide?
-        jc      res5
-        
-        movb    %ch, %al                        # AX=width of src. line
-res5:   movb    $0, %cl
-        xchgb   %ch, %cl
-        movw    %cx, %bp                        # BP=width of dest. line
-        pushw   %es
-        movw    video_segment, %es
-        xorw    %di, %di                        # Move the data
-        addw    %bx, %bx                        # Convert BX and BP to _bytes_
-        addw    %bp, %bp
-res6:   pushw   %si
-        pushw   %di
-        movw    %ax, %cx
-        rep
-        movsw
-        popw    %di
-        popw    %si
-        addw    %bp, %di
-        addw    %bx, %si
-        decb    %dl
-        jnz     res6
-        
-        popw    %es                             # Done
-res1:   ret
-#endif /* CONFIG_VIDEO_RETAIN */
-# Write to indexed VGA register (AL=index, AH=data, DX=index reg. port)
-outidx: outb    %al, %dx
-        pushw   %ax
-        movb    %ah, %al
-        incw    %dx
-        outb    %al, %dx
-        decw    %dx
-        popw    %ax
-        ret
-# Build the table of video modes (stored after the setup.S code at the
-# `modelist' label. Each video mode record looks like:
-#       .word   MODE-ID         (our special mode ID (see above))
-#       .byte   rows            (number of rows)
-#       .byte   columns         (number of columns)
-# Returns address of the end of the table in DI, the end is marked
-# with a ASK_VGA ID.
-mode_table:
-        movw    mt_end, %di                     # Already filled?
-        orw     %di, %di
-        jnz     mtab1x
-        
-        leaw    modelist, %di                   # Store standard modes:
-        movl    $VIDEO_80x25 + 0x50190000, %eax # The 80x25 mode (ALL)
-        stosl
-        movb    adapter, %al                    # CGA/MDA/HGA -- no more modes
-        orb     %al, %al
-        jz      mtabe
-        
-        decb    %al
-        jnz     mtabv
-        
-        movl    $VIDEO_8POINT + 0x502b0000, %eax        # The 80x43 EGA mode
-        stosl
-        jmp     mtabe
-mtab1x: jmp     mtab1
-mtabv:  leaw    vga_modes, %si                  # All modes for std VGA
-        movw    $vga_modes_end-vga_modes, %cx
-        rep     # I'm unable to use movsw as I don't know how to store a half
-        movsb   # of the expression above to cx without using explicit shr.
-        cmpb    $0, scanning                    # Mode scan requested?
-        jz      mscan1
-        
-        call    mode_scan
-mscan1:
-#ifdef CONFIG_VIDEO_LOCAL
-        call    local_modes
-#endif /* CONFIG_VIDEO_LOCAL */
-#ifdef CONFIG_VIDEO_VESA
-        call    vesa_modes                      # Detect VESA VGA modes
-#endif /* CONFIG_VIDEO_VESA */
-#ifdef CONFIG_VIDEO_SVGA
-        cmpb    $0, scanning                    # Bypass when scanning
-        jnz     mscan2
-        
-        call    svga_modes                      # Detect SVGA cards & modes
-mscan2:
-#endif /* CONFIG_VIDEO_SVGA */
-mtabe:
-#ifdef CONFIG_VIDEO_COMPACT
-        leaw    modelist, %si
-        movw    %di, %dx
-        movw    %si, %di
-cmt1:   cmpw    %dx, %si                        # Scan all modes
-        jz      cmt2
-        leaw    modelist, %bx                   # Find in previous entries
-        movw    2(%si), %cx
-cmt3:   cmpw    %bx, %si
-        jz      cmt4
-        cmpw    2(%bx), %cx                     # Found => don't copy this entry
-        jz      cmt5
-        addw    $4, %bx
-        jmp     cmt3
-cmt4:   movsl                                   # Copy entry
-        jmp     cmt1
-cmt5:   addw    $4, %si                         # Skip entry
-        jmp     cmt1
-cmt2:
-#endif  /* CONFIG_VIDEO_COMPACT */
-        movw    $ASK_VGA, (%di)                 # End marker
-        movw    %di, mt_end
-mtab1:  leaw    modelist, %si                   # SI=mode list, DI=list end
-ret0:   ret
-# Modes usable on all standard VGAs
-vga_modes:
-        .word   VIDEO_8POINT
-        .word   0x5032                          # 80x50
-        .word   VIDEO_80x43
-        .word   0x502b                          # 80x43
-        .word   VIDEO_80x28
-        .word   0x501c                          # 80x28
-        .word   VIDEO_80x30
-        .word   0x501e                          # 80x30
-        .word   VIDEO_80x34
-        .word   0x5022                          # 80x34
-        .word   VIDEO_80x60
-        .word   0x503c                          # 80x60
-#ifdef CONFIG_VIDEO_GFX_HACK
-        .word   VIDEO_GFX_HACK
-        .word   VIDEO_GFX_DUMMY_RESOLUTION
-#endif
-vga_modes_end:
-# Detect VESA modes.
-#ifdef CONFIG_VIDEO_VESA
-vesa_modes:
-        cmpb    $2, adapter                     # VGA only
-        jnz     ret0
-        movw    %di, %bp                        # BP=original mode table end
-        addw    $0x200, %di                     # Buffer space
-        movw    $0x4f00, %ax                    # VESA Get card info call
-        int     $0x10
-        movw    %bp, %di
-        cmpw    $0x004f, %ax                    # Successful?
-        jnz     ret0
-        
-        cmpw    $0x4556, 0x200(%di)
-        jnz     ret0
-        
-        cmpw    $0x4153, 0x202(%di)
-        jnz     ret0
-        
-        movw    $vesa_name, card_name           # Set name to "VESA VGA"
-        pushw   %gs
-        lgsw    0x20e(%di), %si                 # GS:SI=mode list
-        movw    $128, %cx                       # Iteration limit
-vesa1:
-# gas version 2.9.1, using BFD version 2.9.1.0.23 buggers the next inst.
-# XXX:  lodsw   %gs:(%si), %ax                  # Get next mode in the list
-        gs; lodsw
-        cmpw    $0xffff, %ax                    # End of the table?
-        jz      vesar
-        
-        cmpw    $0x0080, %ax                    # Check validity of mode ID
-        jc      vesa2
-        
-        orb     %ah, %ah                # Valid IDs: 0x0000-0x007f/0x0100-0x07ff
-        jz      vesan                   # Certain BIOSes report 0x80-0xff!
-        cmpw    $0x0800, %ax
-        jnc     vesae
-vesa2:  pushw   %cx
-        movw    %ax, %cx                        # Get mode information structure
-        movw    $0x4f01, %ax
-        int     $0x10
-        movw    %cx, %bx                        # BX=mode number
-        addb    $VIDEO_FIRST_VESA>>8, %bh
-        popw    %cx
-        cmpw    $0x004f, %ax
-        jnz     vesan                   # Don't report errors (buggy BIOSES)
-        movb    (%di), %al                      # Check capabilities. We require
-        andb    $0x19, %al                      # a color text mode.
-        cmpb    $0x09, %al
-        jnz     vesan
-        
-        cmpw    $0xb800, 8(%di)         # Standard video memory address required
-        jnz     vesan
-        testb   $2, (%di)                       # Mode characteristics supplied?
-        movw    %bx, (%di)                      # Store mode number
-        jz      vesa3
-        
-        xorw    %dx, %dx
-        movw    0x12(%di), %bx                  # Width
-        orb     %bh, %bh
-        jnz     vesan
-        
-        movb    %bl, 0x3(%di)
-        movw    0x14(%di), %ax                  # Height
-        orb     %ah, %ah
-        jnz     vesan
-        
-        movb    %al, 2(%di)
-        mulb    %bl
-        cmpw    $8193, %ax              # Small enough for Linux console driver?
-        jnc     vesan
-        jmp     vesaok
-vesa3:  subw    $0x8108, %bx    # This mode has no detailed info specified,
-        jc      vesan           # so it must be a standard VESA mode.
-        cmpw    $5, %bx
-        jnc     vesan
-        movw    vesa_text_mode_table(%bx), %ax
-        movw    %ax, 2(%di)
-vesaok: addw    $4, %di                         # The mode is valid. Store it.
-vesan:  loop    vesa1                   # Next mode. Limit exceeded => error
-vesae:  leaw    vesaer, %si
-        call    prtstr
-        movw    %bp, %di                        # Discard already found modes.
-vesar:  popw    %gs
-        ret
-# Dimensions of standard VESA text modes
-vesa_text_mode_table:
-        .byte   60, 80                          # 0108
-        .byte   25, 132                         # 0109
-        .byte   43, 132                         # 010A
-        .byte   50, 132                         # 010B
-        .byte   60, 132                         # 010C
-#endif  /* CONFIG_VIDEO_VESA */
-# Scan for video modes. A bit dirty, but should work.
-mode_scan:
-        movw    $0x0100, %cx                    # Start with mode 0
-scm1:   movb    $0, %ah                         # Test the mode
-        movb    %cl, %al
-        int     $0x10
-        movb    $0x0f, %ah
-        int     $0x10
-        cmpb    %cl, %al
-        jnz     scm2                            # Mode not set
-        movw    $0x3c0, %dx                     # Test if it's a text mode
-        movb    $0x10, %al                      # Mode bits
-        call    inidx
-        andb    $0x03, %al
-        jnz     scm2
-        
-        movb    $0xce, %dl                      # Another set of mode bits
-        movb    $0x06, %al
-        call    inidx
-        shrb    %al
-        jc      scm2
-        
-        movb    $0xd4, %dl                      # Cursor location
-        movb    $0x0f, %al
-        call    inidx
-        orb     %al, %al
-        jnz     scm2
-        
-        movw    %cx, %ax                        # Ok, store the mode
-        stosw
-        movb    %gs:(0x484), %al                # Number of rows
-        incb    %al
-        stosb
-        movw    %gs:(0x44a), %ax                # Number of columns
-        stosb
-scm2:   incb    %cl
-        jns     scm1
-        
-        movw    $0x0003, %ax                    # Return back to mode 3
-        int     $0x10
-        ret
-tstidx: outw    %ax, %dx                        # OUT DX,AX and inidx
-inidx:  outb    %al, %dx                        # Read from indexed VGA register
-        incw    %dx                     # AL=index, DX=index reg port -> AL=data
-        inb     %dx, %al
-        decw    %dx
-        ret
-# Try to detect type of SVGA card and supply (usually approximate) video
-# mode table for it.
-#ifdef CONFIG_VIDEO_SVGA
-svga_modes:
-        leaw    svga_table, %si                 # Test all known SVGA adapters
-dosvga: lodsw
-        movw    %ax, %bp                        # Default mode table
-        orw     %ax, %ax
-        jz      didsv1
-        lodsw                                   # Pointer to test routine
-        pushw   %si
-        pushw   %di
-        pushw   %es
-        movw    $0xc000, %bx
-        movw    %bx, %es
-        call    *%ax                            # Call test routine
-        popw    %es
-        popw    %di
-        popw    %si
-        orw     %bp, %bp
-        jz      dosvga
-        
-        movw    %bp, %si                        # Found, copy the modes
-        movb    svga_prefix, %ah
-cpsvga: lodsb
-        orb     %al, %al
-        jz      didsv
-        
-        stosw
-        movsw
-        jmp     cpsvga
-didsv:  movw    %si, card_name                  # Store pointer to card name
-didsv1: ret
-# Table of all known SVGA cards. For each card, we store a pointer to
-# a table of video modes supported by the card and a pointer to a routine
-# used for testing of presence of the card. The video mode table is always
-# followed by the name of the card or the chipset.
-svga_table:
-        .word   ati_md, ati_test
-        .word   oak_md, oak_test
-        .word   paradise_md, paradise_test
-        .word   realtek_md, realtek_test
-        .word   s3_md, s3_test
-        .word   chips_md, chips_test
-        .word   video7_md, video7_test
-        .word   cirrus5_md, cirrus5_test
-        .word   cirrus6_md, cirrus6_test
-        .word   cirrus1_md, cirrus1_test
-        .word   ahead_md, ahead_test
-        .word   everex_md, everex_test
-        .word   genoa_md, genoa_test
-        .word   trident_md, trident_test
-        .word   tseng_md, tseng_test
-        .word   0
-# Test routines and mode tables:
-# S3 - The test algorithm was taken from the SuperProbe package
-# for XFree86 1.2.1. Report bugs to Christoph.Niemann@linux.org
-s3_test:
-        movw    $0x0f35, %cx    # we store some constants in cl/ch
-        movw    $0x03d4, %dx
-        movb    $0x38, %al
-        call    inidx
-        movb    %al, %bh        # store current CRT-register 0x38
-        movw    $0x0038, %ax
-        call    outidx          # disable writing to special regs
-        movb    %cl, %al        # check whether we can write special reg 0x35
-        call    inidx
-        movb    %al, %bl        # save the current value of CRT reg 0x35
-        andb    $0xf0, %al      # clear bits 0-3
-        movb    %al, %ah
-        movb    %cl, %al        # and write it to CRT reg 0x35
-        call    outidx
-        call    inidx           # now read it back
-        andb    %ch, %al        # clear the upper 4 bits
-        jz      s3_2            # the first test failed. But we have a
-        movb    %bl, %ah        # second chance
-        movb    %cl, %al
-        call    outidx
-        jmp     s3_1            # do the other tests
-s3_2:   movw    %cx, %ax        # load ah with 0xf and al with 0x35
-        orb     %bl, %ah        # set the upper 4 bits of ah with the orig value
-        call    outidx          # write ...
-        call    inidx           # ... and reread 
-        andb    %cl, %al        # turn off the upper 4 bits
-        pushw   %ax
-        movb    %bl, %ah        # restore old value in register 0x35
-        movb    %cl, %al
-        call    outidx
-        popw    %ax
-        cmpb    %ch, %al        # setting lower 4 bits was successful => bad
-        je      no_s3           # writing is allowed => this is not an S3
-s3_1:   movw    $0x4838, %ax    # allow writing to special regs by putting
-        call    outidx          # magic number into CRT-register 0x38
-        movb    %cl, %al        # check whether we can write special reg 0x35
-        call    inidx
-        movb    %al, %bl
-        andb    $0xf0, %al
-        movb    %al, %ah
-        movb    %cl, %al
-        call    outidx
-        call    inidx
-        andb    %ch, %al
-        jnz     no_s3           # no, we can't write => no S3
-        movw    %cx, %ax
-        orb     %bl, %ah
-        call    outidx
-        call    inidx
-        andb    %ch, %al
-        pushw   %ax
-        movb    %bl, %ah        # restore old value in register 0x35
-        movb    %cl, %al
-        call    outidx
-        popw    %ax
-        cmpb    %ch, %al
-        jne     no_s31          # writing not possible => no S3
-        movb    $0x30, %al
-        call    inidx           # now get the S3 id ...
-        leaw    idS3, %di
-        movw    $0x10, %cx
-        repne
-        scasb
-        je      no_s31
-        movb    %bh, %ah
-        movb    $0x38, %al
-        jmp     s3rest
-no_s3:  movb    $0x35, %al      # restore CRT register 0x35
-        movb    %bl, %ah
-        call    outidx
-no_s31: xorw    %bp, %bp        # Detection failed
-s3rest: movb    %bh, %ah
-        movb    $0x38, %al      # restore old value of CRT register 0x38
-        jmp     outidx
-idS3:   .byte   0x81, 0x82, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95
-        .byte   0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa8, 0xb0
-s3_md:  .byte   0x54, 0x2b, 0x84
-        .byte   0x55, 0x19, 0x84
-        .byte   0
-        .ascii  "S3"
-        .byte   0
-# ATI cards.
-ati_test:
-        leaw    idati, %si
-        movw    $0x31, %di
-        movw    $0x09, %cx
-        repe
-        cmpsb
-        je      atiok
-        xorw    %bp, %bp
-atiok:  ret
-idati:  .ascii  "761295520"
-ati_md: .byte   0x23, 0x19, 0x84
-        .byte   0x33, 0x2c, 0x84
-        .byte   0x22, 0x1e, 0x64
-        .byte   0x21, 0x19, 0x64
-        .byte   0x58, 0x21, 0x50
-        .byte   0x5b, 0x1e, 0x50
-        .byte   0
-        .ascii  "ATI"
-        .byte   0
-# AHEAD
-ahead_test:
-        movw    $0x200f, %ax
-        movw    $0x3ce, %dx
-        outw    %ax, %dx
-        incw    %dx
-        inb     %dx, %al
-        cmpb    $0x20, %al
-        je      isahed
-        cmpb    $0x21, %al
-        je      isahed
-        
-        xorw    %bp, %bp
-isahed: ret
-ahead_md:
-        .byte   0x22, 0x2c, 0x84
-        .byte   0x23, 0x19, 0x84
-        .byte   0x24, 0x1c, 0x84
-        .byte   0x2f, 0x32, 0xa0
-        .byte   0x32, 0x22, 0x50
-        .byte   0x34, 0x42, 0x50
-        .byte   0
-        .ascii  "Ahead"
-        .byte   0
-# Chips & Tech.
-chips_test:
-        movw    $0x3c3, %dx
-        inb     %dx, %al
-        orb     $0x10, %al
-        outb    %al, %dx
-        movw    $0x104, %dx
-        inb     %dx, %al
-        movb    %al, %bl
-        movw    $0x3c3, %dx
-        inb     %dx, %al
-        andb    $0xef, %al
-        outb    %al, %dx
-        cmpb    $0xa5, %bl
-        je      cantok
-        
-        xorw    %bp, %bp
-cantok: ret
-chips_md:
-        .byte   0x60, 0x19, 0x84
-        .byte   0x61, 0x32, 0x84
-        .byte   0
-        .ascii  "Chips & Technologies"
-        .byte   0
-# Cirrus Logic 5X0
-cirrus1_test:
-        movw    $0x3d4, %dx
-        movb    $0x0c, %al
-        outb    %al, %dx
-        incw    %dx
-        inb     %dx, %al
-        movb    %al, %bl
-        xorb    %al, %al
-        outb    %al, %dx
-        decw    %dx
-        movb    $0x1f, %al
-        outb    %al, %dx
-        incw    %dx
-        inb     %dx, %al
-        movb    %al, %bh
-        xorb    %ah, %ah
-        shlb    $4, %al
-        movw    %ax, %cx
-        movb    %bh, %al
-        shrb    $4, %al
-        addw    %ax, %cx
-        shlw    $8, %cx
-        addw    $6, %cx
-        movw    %cx, %ax
-        movw    $0x3c4, %dx
-        outw    %ax, %dx
-        incw    %dx
-        inb     %dx, %al
-        andb    %al, %al
-        jnz     nocirr
-        
-        movb    %bh, %al
-        outb    %al, %dx
-        inb     %dx, %al
-        cmpb    $0x01, %al
-        je      iscirr
-nocirr: xorw    %bp, %bp
-iscirr: movw    $0x3d4, %dx
-        movb    %bl, %al
-        xorb    %ah, %ah
-        shlw    $8, %ax
-        addw    $0x0c, %ax
-        outw    %ax, %dx
-        ret
-cirrus1_md:
-        .byte   0x1f, 0x19, 0x84
-        .byte   0x20, 0x2c, 0x84
-        .byte   0x22, 0x1e, 0x84
-        .byte   0x31, 0x25, 0x64
-        .byte   0
-        .ascii  "Cirrus Logic 5X0"
-        .byte   0
-# Cirrus Logic 54XX
-cirrus5_test:
-        movw    $0x3c4, %dx
-        movb    $6, %al
-        call    inidx
-        movb    %al, %bl                        # BL=backup
-        movw    $6, %ax
-        call    tstidx
-        cmpb    $0x0f, %al
-        jne     c5fail
-        
-        movw    $0x1206, %ax
-        call    tstidx
-        cmpb    $0x12, %al
-        jne     c5fail
-        
-        movb    $0x1e, %al
-        call    inidx
-        movb    %al, %bh
-        movb    %bh, %ah
-        andb    $0xc0, %ah
-        movb    $0x1e, %al
-        call    tstidx
-        andb    $0x3f, %al
-        jne     c5xx
-        
-        movb    $0x1e, %al
-        movb    %bh, %ah
-        orb     $0x3f, %ah
-        call    tstidx
-        xorb    $0x3f, %al
-        andb    $0x3f, %al
-c5xx:   pushf
-        movb    $0x1e, %al
-        movb    %bh, %ah
-        outw    %ax, %dx
-        popf
-        je      c5done
-c5fail: xorw    %bp, %bp
-c5done: movb    $6, %al
-        movb    %bl, %ah
-        outw    %ax, %dx
-        ret
-cirrus5_md:
-        .byte   0x14, 0x19, 0x84
-        .byte   0x54, 0x2b, 0x84
-        .byte   0
-        .ascii  "Cirrus Logic 54XX"
-        .byte   0
-# Cirrus Logic 64XX -- no known extra modes, but must be identified, because
-# it's misidentified by the Ahead test.
-cirrus6_test:
-        movw    $0x3ce, %dx
-        movb    $0x0a, %al
-        call    inidx
-        movb    %al, %bl        # BL=backup
-        movw    $0xce0a, %ax
-        call    tstidx
-        orb     %al, %al
-        jne     c2fail
-        
-        movw    $0xec0a, %ax
-        call    tstidx
-        cmpb    $0x01, %al
-        jne     c2fail
-        
-        movb    $0xaa, %al
-        call    inidx           # 4X, 5X, 7X and 8X are valid 64XX chip ID's. 
-        shrb    $4, %al
-        subb    $4, %al
-        jz      c6done
-        
-        decb    %al
-        jz      c6done
-        
-        subb    $2, %al
-        jz      c6done
-        
-        decb    %al
-        jz      c6done
-        
-c2fail: xorw    %bp, %bp
-c6done: movb    $0x0a, %al
-        movb    %bl, %ah
-        outw    %ax, %dx
-        ret
-cirrus6_md:
-        .byte   0
-        .ascii  "Cirrus Logic 64XX"
-        .byte   0
-# Everex / Trident
-everex_test:
-        movw    $0x7000, %ax
-        xorw    %bx, %bx
-        int     $0x10
-        cmpb    $0x70, %al
-        jne     noevrx
-        
-        shrw    $4, %dx
-        cmpw    $0x678, %dx
-        je      evtrid
-        
-        cmpw    $0x236, %dx
-        jne     evrxok
-evtrid: leaw    trident_md, %bp
-evrxok: ret
-noevrx: xorw    %bp, %bp
-        ret
-everex_md:
-        .byte   0x03, 0x22, 0x50
-        .byte   0x04, 0x3c, 0x50
-        .byte   0x07, 0x2b, 0x64
-        .byte   0x08, 0x4b, 0x64
-        .byte   0x0a, 0x19, 0x84
-        .byte   0x0b, 0x2c, 0x84
-        .byte   0x16, 0x1e, 0x50
-        .byte   0x18, 0x1b, 0x64
-        .byte   0x21, 0x40, 0xa0
-        .byte   0x40, 0x1e, 0x84
-        .byte   0
-        .ascii  "Everex/Trident"
-        .byte   0
-# Genoa.
-genoa_test:
-        leaw    idgenoa, %si                    # Check Genoa 'clues'
-        xorw    %ax, %ax
-        movb    %es:(0x37), %al
-        movw    %ax, %di
-        movw    $0x04, %cx
-        decw    %si
-        decw    %di
-l1:     incw    %si
-        incw    %di
-        movb    (%si), %al
-        testb   %al, %al
-        jz      l2
-        cmpb    %es:(%di), %al
-l2:     loope   l1
-        orw     %cx, %cx
-        je      isgen
-        
-        xorw    %bp, %bp
-isgen:  ret
-idgenoa: .byte  0x77, 0x00, 0x99, 0x66
-genoa_md:
-        .byte   0x58, 0x20, 0x50
-        .byte   0x5a, 0x2a, 0x64
-        .byte   0x60, 0x19, 0x84
-        .byte   0x61, 0x1d, 0x84
-        .byte   0x62, 0x20, 0x84
-        .byte   0x63, 0x2c, 0x84
-        .byte   0x64, 0x3c, 0x84
-        .byte   0x6b, 0x4f, 0x64
-        .byte   0x72, 0x3c, 0x50
-        .byte   0x74, 0x42, 0x50
-        .byte   0x78, 0x4b, 0x64
-        .byte   0
-        .ascii  "Genoa"
-        .byte   0
-# OAK
-oak_test:
-        leaw    idoakvga, %si
-        movw    $0x08, %di
-        movw    $0x08, %cx
-        repe
-        cmpsb
-        je      isoak
-        
-        xorw    %bp, %bp
-isoak:  ret
-idoakvga: .ascii  "OAK VGA "
-oak_md: .byte   0x4e, 0x3c, 0x50
-        .byte   0x4f, 0x3c, 0x84
-        .byte   0x50, 0x19, 0x84
-        .byte   0x51, 0x2b, 0x84
-        .byte   0
-        .ascii  "OAK"
-        .byte   0
-# WD Paradise.
-paradise_test:
-        leaw    idparadise, %si
-        movw    $0x7d, %di
-        movw    $0x04, %cx
-        repe
-        cmpsb
-        je      ispara
-        
-        xorw    %bp, %bp
-ispara: ret
-idparadise:     .ascii  "VGA="
-paradise_md:
-        .byte   0x41, 0x22, 0x50
-        .byte   0x47, 0x1c, 0x84
-        .byte   0x55, 0x19, 0x84
-        .byte   0x54, 0x2c, 0x84
-        .byte   0
-        .ascii  "Paradise"
-        .byte   0
-# Trident.
-trident_test:
-        movw    $0x3c4, %dx
-        movb    $0x0e, %al
-        outb    %al, %dx
-        incw    %dx
-        inb     %dx, %al
-        xchgb   %al, %ah
-        xorb    %al, %al
-        outb    %al, %dx
-        inb     %dx, %al
-        xchgb   %ah, %al
-        movb    %al, %bl        # Strange thing ... in the book this wasn't
-        andb    $0x02, %bl      # necessary but it worked on my card which
-        jz      setb2           # is a trident. Without it the screen goes
-                                # blurred ...
-        andb    $0xfd, %al
-        jmp     clrb2           
-setb2:  orb     $0x02, %al      
-clrb2:  outb    %al, %dx
-        andb    $0x0f, %ah
-        cmpb    $0x02, %ah
-        je      istrid
-        xorw    %bp, %bp
-istrid: ret
-trident_md:
-        .byte   0x50, 0x1e, 0x50
-        .byte   0x51, 0x2b, 0x50
-        .byte   0x52, 0x3c, 0x50
-        .byte   0x57, 0x19, 0x84
-        .byte   0x58, 0x1e, 0x84
-        .byte   0x59, 0x2b, 0x84
-        .byte   0x5a, 0x3c, 0x84
-        .byte   0
-        .ascii  "Trident"
-        .byte   0
-# Tseng.
-tseng_test:
-        movw    $0x3cd, %dx
-        inb     %dx, %al        # Could things be this simple ! :-)
-        movb    %al, %bl
-        movb    $0x55, %al
-        outb    %al, %dx
-        inb     %dx, %al
-        movb    %al, %ah
-        movb    %bl, %al
-        outb    %al, %dx
-        cmpb    $0x55, %ah
-        je      istsen
-isnot:  xorw    %bp, %bp
-istsen: ret
-tseng_md:
-        .byte   0x26, 0x3c, 0x50
-        .byte   0x2a, 0x28, 0x64
-        .byte   0x23, 0x19, 0x84
-        .byte   0x24, 0x1c, 0x84
-        .byte   0x22, 0x2c, 0x84
-        .byte   0x21, 0x3c, 0x84
-        .byte   0
-        .ascii  "Tseng"
-        .byte   0
-# Video7.
-video7_test:
-        movw    $0x3cc, %dx
-        inb     %dx, %al
-        movw    $0x3b4, %dx
-        andb    $0x01, %al
-        jz      even7
-        movw    $0x3d4, %dx
-even7:  movb    $0x0c, %al
-        outb    %al, %dx
-        incw    %dx
-        inb     %dx, %al
-        movb    %al, %bl
-        movb    $0x55, %al
-        outb    %al, %dx
-        inb     %dx, %al
-        decw    %dx
-        movb    $0x1f, %al
-        outb    %al, %dx
-        incw    %dx
-        inb     %dx, %al
-        movb    %al, %bh
-        decw    %dx
-        movb    $0x0c, %al
-        outb    %al, %dx
-        incw    %dx
-        movb    %bl, %al
-        outb    %al, %dx
-        movb    $0x55, %al
-        xorb    $0xea, %al
-        cmpb    %bh, %al
-        jne     isnot
-        
-        movb    $VIDEO_FIRST_V7>>8, svga_prefix # Use special mode switching
-        ret
-video7_md:
-        .byte   0x40, 0x2b, 0x50
-        .byte   0x43, 0x3c, 0x50
-        .byte   0x44, 0x3c, 0x64
-        .byte   0x41, 0x19, 0x84
-        .byte   0x42, 0x2c, 0x84
-        .byte   0x45, 0x1c, 0x84
-        .byte   0
-        .ascii  "Video 7"
-        .byte   0
-# Realtek VGA
-realtek_test:
-        leaw    idrtvga, %si
-        movw    $0x45, %di
-        movw    $0x0b, %cx
-        repe
-        cmpsb
-        je      isrt
-        
-        xorw    %bp, %bp
-isrt:   ret
-idrtvga:        .ascii  "REALTEK VGA"
-realtek_md:
-        .byte   0x1a, 0x3c, 0x50
-        .byte   0x1b, 0x19, 0x84
-        .byte   0x1c, 0x1e, 0x84
-        .byte   0x1d, 0x2b, 0x84
-        .byte   0x1e, 0x3c, 0x84
-        .byte   0
-        .ascii  "REALTEK"
-        .byte   0
-#endif  /* CONFIG_VIDEO_SVGA */
-# User-defined local mode table (VGA only)
-#ifdef CONFIG_VIDEO_LOCAL
-local_modes:
-        leaw    local_mode_table, %si
-locm1:  lodsw
-        orw     %ax, %ax
-        jz      locm2
-        
-        stosw
-        movsw
-        jmp     locm1
-locm2:  ret
-# This is the table of local video modes which can be supplied manually
-# by the user. Each entry consists of mode ID (word) and dimensions
-# (byte for column count and another byte for row count). These modes
-# are placed before all SVGA and VESA modes and override them if table
-# compacting is enabled. The table must end with a zero word followed
-# by NUL-terminated video adapter name.
-local_mode_table:
-        .word   0x0100                          # Example: 40x25
-        .byte   25,40
-        .word   0
-        .ascii  "Local"
-        .byte   0
-#endif  /* CONFIG_VIDEO_LOCAL */
-# Read a key and return the ASCII code in al, scan code in ah
-getkey: xorb    %ah, %ah
-        int     $0x16
-        ret
-# Read a key with a timeout of 30 seconds.
-# The hardware clock is used to get the time.
-getkt:  call    gettime
-        addb    $30, %al                        # Wait 30 seconds
-        cmpb    $60, %al
-        jl      lminute
-        subb    $60, %al
-lminute:
-        movb    %al, %cl
-again:  movb    $0x01, %ah
-        int     $0x16
-        jnz     getkey                          # key pressed, so get it
-        call    gettime
-        cmpb    %cl, %al
-        jne     again
-        movb    $0x20, %al                      # timeout, return `space'
-        ret
-# Flush the keyboard buffer
-flush:  movb    $0x01, %ah
-        int     $0x16
-        jz      empty
-        
-        xorb    %ah, %ah
-        int     $0x16
-        jmp     flush
-empty:  ret
-# Print hexadecimal number.
-prthw:  pushw   %ax
-        movb    %ah, %al
-        call    prthb
-        popw    %ax
-prthb:  pushw   %ax
-        shrb    $4, %al
-        call    prthn
-        popw    %ax
-        andb    $0x0f, %al
-prthn:  cmpb    $0x0a, %al
-        jc      prth1
-        addb    $0x07, %al
-prth1:  addb    $0x30, %al
-        jmp     prtchr
-# Print decimal number in al
-prtdec: pushw   %ax
-        pushw   %cx
-        xorb    %ah, %ah
-        movb    $0x0a, %cl
-        idivb   %cl
-        cmpb    $0x09, %al
-        jbe     lt100
-        call    prtdec
-        jmp     skip10
-lt100:  addb    $0x30, %al
-        call    prtchr
-skip10: movb    %ah, %al
-        addb    $0x30, %al
-        call    prtchr  
-        popw    %cx
-        popw    %ax
-        ret
-store_edid:
-#ifdef CONFIG_FIRMWARE_EDID
-        pushw   %es                             # just save all registers
-        pushw   %ax
-        pushw   %bx
-        pushw   %cx
-        pushw   %dx
-        pushw   %di
-        pushw   %fs
-        popw    %es
-        movl    $0x13131313, %eax               # memset block with 0x13
-        movw    $32, %cx
-        movw    $0x140, %di
-        cld
-        rep
-        stosl
-        cmpw    $0x0200, vbe_version            # only do EDID on >= VBE2.0
-        jl      no_edid
-        pushw   %es                             # save ES
-        xorw    %di, %di                        # Report Capability
-        pushw   %di
-        popw    %es                             # ES:DI must be 0:0
-        movw    $0x4f15, %ax
-        xorw    %bx, %bx
-        xorw    %cx, %cx
-        int     $0x10
-        popw    %es                             # restore ES
-        cmpb    $0x00, %ah                      # call successful
-        jne     no_edid
-        cmpb    $0x4f, %al                      # function supported
-        jne     no_edid
-        movw    $0x4f15, %ax                    # do VBE/DDC
-        movw    $0x01, %bx
-        movw    $0x00, %cx
-        movw    $0x00, %dx
-        movw    $0x140, %di
-        int     $0x10
-no_edid:
-        popw    %di                             # restore all registers
-        popw    %dx
-        popw    %cx
-        popw    %bx
-        popw    %ax
-        popw    %es
-#endif
-        ret
-# VIDEO_SELECT-only variables
-mt_end:         .word   0       # End of video mode table if built
-edit_buf:       .space  6       # Line editor buffer
-card_name:      .word   0       # Pointer to adapter name
-scanning:       .byte   0       # Performing mode scan
-do_restore:     .byte   0       # Screen contents altered during mode change
-svga_prefix:    .byte   VIDEO_FIRST_BIOS>>8     # Default prefix for BIOS modes
-graphic_mode:   .byte   0       # Graphic mode with a linear frame buffer
-dac_size:       .byte   6       # DAC bit depth
-vbe_version:    .word   0       # VBE bios version
-# Status messages
-keymsg:         .ascii  "Press <RETURN> to see video modes available, "
-                .ascii  "<SPACE> to continue or wait 30 secs"
-                .byte   0x0d, 0x0a, 0
-listhdr:        .byte   0x0d, 0x0a
-                .ascii  "Mode:    COLSxROWS:"
-crlft:          .byte   0x0d, 0x0a, 0
-prompt:         .byte   0x0d, 0x0a
-                .asciz  "Enter mode number or `scan': "
-unknt:          .asciz  "Unknown mode ID. Try again."
-badmdt:         .ascii  "You passed an undefined mode number."
-                .byte   0x0d, 0x0a, 0
-vesaer:         .ascii  "Error: Scanning of VESA modes failed. Please "
-                .ascii  "report to <mj@ucw.cz>."
-                .byte   0x0d, 0x0a, 0
-old_name:       .asciz  "CGA/MDA/HGA"
-ega_name:       .asciz  "EGA"
-svga_name:      .ascii  " "
-vga_name:       .asciz  "VGA"
-vesa_name:      .asciz  "VESA"
-name_bann:      .asciz  "Video adapter: "
-#endif /* CONFIG_VIDEO_SELECT */
-# Other variables:
-adapter:        .byte   0       # Video adapter: 0=CGA/MDA/HGA,1=EGA,2=VGA
-video_segment:  .word   0xb800  # Video memory segment
-force_size:     .word   0       # Use this size instead of the one in BIOS vars
diff --git a/arch/i386/boot/video.c b/arch/i386/boot/video.c
new file mode 100644
index 0000000000..958130ef00
--- /dev/null
+++ b/arch/i386/boot/video.c
@@ -0,0 +1,461 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/video.c
+ *
+ * Select video mode
+ */
+#include "boot.h"
+#include "video.h"
+#include "vesa.h"
+/*
+ * Mode list variables
+ */
+static struct card_info cards[];    /* List of cards to probe for */
+/*
+ * Common variables
+ */
+int adapter;                    /* 0=CGA/MDA/HGC, 1=EGA, 2=VGA+ */
+u16 video_segment;
+int force_x, force_y;   /* Don't query the BIOS for cols/rows */
+int do_restore = 0;     /* Screen contents changed during mode flip */
+int graphic_mode;       /* Graphic mode with linear frame buffer */
+static void store_cursor_position(void)
+{
+        u16 curpos;
+        u16 ax, bx;
+        ax = 0x0300;
+        bx = 0;
+        asm(INT10
+            : "=d" (curpos), "+a" (ax), "+b" (bx)
+            : : "ecx", "esi", "edi");
+        boot_params.screen_info.orig_x = curpos;
+        boot_params.screen_info.orig_y = curpos >> 8;
+}
+static void store_video_mode(void)
+{
+        u16 ax, page;
+        /* N.B.: the saving of the video page here is a bit silly,
+           since we pretty much assume page 0 everywhere. */
+        ax = 0x0f00;
+        asm(INT10
+            : "+a" (ax), "=b" (page)
+            : : "ecx", "edx", "esi", "edi");
+        /* Not all BIOSes are clean with respect to the top bit */
+        boot_params.screen_info.orig_video_mode = ax & 0x7f;
+        boot_params.screen_info.orig_video_page = page;
+}
+/*
+ * Store the video mode parameters for later usage by the kernel.
+ * This is done by asking the BIOS except for the rows/columns
+ * parameters in the default 80x25 mode -- these are set directly,
+ * because some very obscure BIOSes supply insane values.
+ */
+static void store_mode_params(void)
+{
+        u16 font_size;
+        int x, y;
+        /* For graphics mode, it is up to the mode-setting driver
+           (currently only video-vesa.c) to store the parameters */
+        if (graphic_mode)
+                return;
+        store_cursor_position();
+        store_video_mode();
+        if (boot_params.screen_info.orig_video_mode == 0x07) {
+                /* MDA, HGC, or VGA in monochrome mode */
+                video_segment = 0xb000;
+        } else {
+                /* CGA, EGA, VGA and so forth */
+                video_segment = 0xb800;
+        }
+        set_fs(0);
+        font_size = rdfs16(0x485); /* Font size, BIOS area */
+        boot_params.screen_info.orig_video_points = font_size;
+        x = rdfs16(0x44a);
+        y = (adapter == ADAPTER_CGA) ? 25 : rdfs8(0x484)+1;
+        if (force_x)
+                x = force_x;
+        if (force_y)
+                y = force_y;
+        boot_params.screen_info.orig_video_cols  = x;
+        boot_params.screen_info.orig_video_lines = y;
+}
+/* Probe the video drivers and have them generate their mode lists. */
+static void probe_cards(int unsafe)
+{
+        struct card_info *card;
+        static u8 probed[2];
+        if (probed[unsafe])
+                return;
+        probed[unsafe] = 1;
+        for (card = video_cards; card < video_cards_end; card++) {
+                if (card->unsafe == unsafe) {
+                        if (card->probe)
+                                card->nmodes = card->probe();
+                        else
+                                card->nmodes = 0;
+                }
+        }
+}
+/* Test if a mode is defined */
+int mode_defined(u16 mode)
+{
+        struct card_info *card;
+        struct mode_info *mi;
+        int i;
+        for (card = video_cards; card < video_cards_end; card++) {
+                mi = card->modes;
+                for (i = 0; i < card->nmodes; i++, mi++) {
+                        if (mi->mode == mode)
+                                return 1;
+                }
+        }
+        return 0;
+}
+/* Set mode (without recalc) */
+static int raw_set_mode(u16 mode)
+{
+        int nmode, i;
+        struct card_info *card;
+        struct mode_info *mi;
+        /* Drop the recalc bit if set */
+        mode &= ~VIDEO_RECALC;
+        /* Scan for mode based on fixed ID, position, or resolution */
+        nmode = 0;
+        for (card = video_cards; card < video_cards_end; card++) {
+                mi = card->modes;
+                for (i = 0; i < card->nmodes; i++, mi++) {
+                        int visible = mi->x || mi->y;
+                        if ((mode == nmode && visible) ||
+                            mode == mi->mode ||
+                            mode == (mi->y << 8)+mi->x)
+                                return card->set_mode(mi);
+                        if (visible)
+                                nmode++;
+                }
+        }
+        /* Nothing found?  Is it an "exceptional" (unprobed) mode? */
+        for (card = video_cards; card < video_cards_end; card++) {
+                if (mode >= card->xmode_first &&
+                    mode < card->xmode_first+card->xmode_n) {
+                        struct mode_info mix;
+                        mix.mode = mode;
+                        mix.x = mix.y = 0;
+                        return card->set_mode(&mix);
+                }
+        }
+        /* Otherwise, failure... */
+        return -1;
+}
+/*
+ * Recalculate the vertical video cutoff (hack!)
+ */
+static void vga_recalc_vertical(void)
+{
+        unsigned int font_size, rows;
+        u16 crtc;
+        u8 pt, ov;
+        set_fs(0);
+        font_size = rdfs8(0x485); /* BIOS: font size (pixels) */
+        rows = force_y ? force_y : rdfs8(0x484)+1; /* Text rows */
+        rows *= font_size;      /* Visible scan lines */
+        rows--;                 /* ... minus one */
+        crtc = vga_crtc();
+        pt = in_idx(crtc, 0x11);
+        pt &= ~0x80;            /* Unlock CR0-7 */
+        out_idx(pt, crtc, 0x11);
+        out_idx((u8)rows, crtc, 0x12); /* Lower height register */
+        ov = in_idx(crtc, 0x07); /* Overflow register */
+        ov &= 0xbd;
+        ov |= (rows >> (8-1)) & 0x02;
+        ov |= (rows >> (9-6)) & 0x40;
+        out_idx(ov, crtc, 0x07);
+}
+/* Set mode (with recalc if specified) */
+static int set_mode(u16 mode)
+{
+        int rv;
+        /* Very special mode numbers... */
+        if (mode == VIDEO_CURRENT_MODE)
+                return 0;       /* Nothing to do... */
+        else if (mode == NORMAL_VGA)
+                mode = VIDEO_80x25;
+        else if (mode == EXTENDED_VGA)
+                mode = VIDEO_8POINT;
+        rv = raw_set_mode(mode);
+        if (rv)
+                return rv;
+        if (mode & VIDEO_RECALC)
+                vga_recalc_vertical();
+        return 0;
+}
+static unsigned int get_entry(void)
+{
+        char entry_buf[4];
+        int i, len = 0;
+        int key;
+        unsigned int v;
+        do {
+                key = getchar();
+                if (key == '\b') {
+                        if (len > 0) {
+                                puts("\b \b");
+                                len--;
+                        }
+                } else if ((key >= '0' && key <= '9') ||
+                           (key >= 'A' && key <= 'Z') ||
+                           (key >= 'a' && key <= 'z')) {
+                        if (len < sizeof entry_buf) {
+                                entry_buf[len++] = key;
+                                putchar(key);
+                        }
+                }
+        } while (key != '\r');
+        putchar('\n');
+        if (len == 0)
+                return VIDEO_CURRENT_MODE; /* Default */
+        v = 0;
+        for (i = 0; i < len; i++) {
+                v <<= 4;
+                key = entry_buf[i] | 0x20;
+                v += (key > '9') ? key-'a'+10 : key-'0';
+        }
+        return v;
+}
+static void display_menu(void)
+{
+        struct card_info *card;
+        struct mode_info *mi;
+        char ch;
+        int i;
+        puts("Mode:    COLSxROWS:\n");
+        ch = '0';
+        for (card = video_cards; card < video_cards_end; card++) {
+                mi = card->modes;
+                for (i = 0; i < card->nmodes; i++, mi++) {
+                        int visible = mi->x && mi->y;
+                        u16 mode_id = mi->mode ? mi->mode :
+                                (mi->y << 8)+mi->x;
+                        if (!visible)
+                                continue; /* Hidden mode */
+                        printf("%c  %04X  %3dx%-3d  %s\n",
+                               ch, mode_id, mi->x, mi->y, card->card_name);
+                        if (ch == '9')
+                                ch = 'a';
+                        else if (ch == 'z' || ch == ' ')
+                                ch = ' '; /* Out of keys... */
+                        else
+                                ch++;
+                }
+        }
+}
+#define H(x)    ((x)-'a'+10)
+#define SCAN    ((H('s')<<12)+(H('c')<<8)+(H('a')<<4)+H('n'))
+static unsigned int mode_menu(void)
+{
+        int key;
+        unsigned int sel;
+        puts("Press <ENTER> to see video modes available, "
+             "<SPACE> to continue, or wait 30 sec\n");
+        kbd_flush();
+        while (1) {
+                key = getchar_timeout();
+                if (key == ' ' || key == 0)
+                        return VIDEO_CURRENT_MODE; /* Default */
+                if (key == '\r')
+                        break;
+                putchar('\a');  /* Beep! */
+        }
+        for (;;) {
+                display_menu();
+                puts("Enter a video mode or \"scan\" to scan for "
+                     "additional modes: ");
+                sel = get_entry();
+                if (sel != SCAN)
+                        return sel;
+                probe_cards(1);
+        }
+}
+#ifdef CONFIG_VIDEO_RETAIN
+/* Save screen content to the heap */
+struct saved_screen {
+        int x, y;
+        int curx, cury;
+        u16 *data;
+} saved;
+static void save_screen(void)
+{
+        /* Should be called after store_mode_params() */
+        saved.x = boot_params.screen_info.orig_video_cols;
+        saved.y = boot_params.screen_info.orig_video_lines;
+        saved.curx = boot_params.screen_info.orig_x;
+        saved.cury = boot_params.screen_info.orig_y;
+        if (heap_free() < saved.x*saved.y*sizeof(u16)+512)
+                return;         /* Not enough heap to save the screen */
+        saved.data = GET_HEAP(u16, saved.x*saved.y);
+        set_fs(video_segment);
+        copy_from_fs(saved.data, 0, saved.x*saved.y*sizeof(u16));
+}
+static void restore_screen(void)
+{
+        /* Should be called after store_mode_params() */
+        int xs = boot_params.screen_info.orig_video_cols;
+        int ys = boot_params.screen_info.orig_video_lines;
+        int y;
+        addr_t dst = 0;
+        u16 *src = saved.data;
+        u16 ax, bx, dx;
+        if (graphic_mode)
+                return;         /* Can't restore onto a graphic mode */
+        if (!src)
+                return;         /* No saved screen contents */
+        /* Restore screen contents */
+        set_fs(video_segment);
+        for (y = 0; y < ys; y++) {
+                int npad;
+                if (y < saved.y) {
+                        int copy = (xs < saved.x) ? xs : saved.x;
+                        copy_to_fs(dst, src, copy*sizeof(u16));
+                        dst += copy*sizeof(u16);
+                        src += saved.x;
+                        npad = (xs < saved.x) ? 0 : xs-saved.x;
+                } else {
+                        npad = xs;
+                }
+                /* Writes "npad" blank characters to
+                   video_segment:dst and advances dst */
+                asm volatile("pushw %%es ; "
+                             "movw %2,%%es ; "
+                             "shrw %%cx ; "
+                             "jnc 1f ; "
+                             "stosw \n\t"
+                             "1: rep;stosl ; "
+                             "popw %%es"
+                             : "+D" (dst), "+c" (npad)
+                             : "bdS" (video_segment),
+                               "a" (0x07200720));
+        }
+        /* Restore cursor position */
+        ax = 0x0200;            /* Set cursor position */
+        bx = 0;                 /* Page number (<< 8) */
+        dx = (saved.cury << 8)+saved.curx;
+        asm volatile(INT10
+                     : "+a" (ax), "+b" (bx), "+d" (dx)
+                     : : "ecx", "esi", "edi");
+}
+#else
+#define save_screen()           ((void)0)
+#define restore_screen()        ((void)0)
+#endif
+void set_video(void)
+{
+        u16 mode = boot_params.hdr.vid_mode;
+        RESET_HEAP();
+        store_mode_params();
+        save_screen();
+        probe_cards(0);
+        for (;;) {
+                if (mode == ASK_VGA)
+                        mode = mode_menu();
+                if (!set_mode(mode))
+                        break;
+                printf("Undefined video mode number: %x\n", mode);
+                mode = ASK_VGA;
+        }
+        vesa_store_edid();
+        store_mode_params();
+        if (do_restore)
+                restore_screen();
+}
diff --git a/arch/i386/boot/video.h b/arch/i386/boot/video.h
new file mode 100644
index 0000000000..b92447d512
--- /dev/null
+++ b/arch/i386/boot/video.h
@@ -0,0 +1,152 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/video.h
+ *
+ * Header file for the real-mode video probing code
+ */
+#ifndef BOOT_VIDEO_H
+#define BOOT_VIDEO_H
+#include <linux/types.h>
+/* Enable autodetection of SVGA adapters and modes. */
+#undef CONFIG_VIDEO_SVGA
+/* Enable autodetection of VESA modes */
+#define CONFIG_VIDEO_VESA
+/* Retain screen contents when switching modes */
+#define CONFIG_VIDEO_RETAIN
+/* Force 400 scan lines for standard modes (hack to fix bad BIOS behaviour */
+#undef CONFIG_VIDEO_400_HACK
+/* This code uses an extended set of video mode numbers. These include:
+ * Aliases for standard modes
+ *      NORMAL_VGA (-1)
+ *      EXTENDED_VGA (-2)
+ *      ASK_VGA (-3)
+ * Video modes numbered by menu position -- NOT RECOMMENDED because of lack
+ * of compatibility when extending the table. These are between 0x00 and 0xff.
+ */
+#define VIDEO_FIRST_MENU 0x0000
+/* Standard BIOS video modes (BIOS number + 0x0100) */
+#define VIDEO_FIRST_BIOS 0x0100
+/* VESA BIOS video modes (VESA number + 0x0200) */
+#define VIDEO_FIRST_VESA 0x0200
+/* Video7 special modes (BIOS number + 0x0900) */
+#define VIDEO_FIRST_V7 0x0900
+/* Special video modes */
+#define VIDEO_FIRST_SPECIAL 0x0f00
+#define VIDEO_80x25 0x0f00
+#define VIDEO_8POINT 0x0f01
+#define VIDEO_80x43 0x0f02
+#define VIDEO_80x28 0x0f03
+#define VIDEO_CURRENT_MODE 0x0f04
+#define VIDEO_80x30 0x0f05
+#define VIDEO_80x34 0x0f06
+#define VIDEO_80x60 0x0f07
+#define VIDEO_GFX_HACK 0x0f08
+#define VIDEO_LAST_SPECIAL 0x0f09
+/* Video modes given by resolution */
+#define VIDEO_FIRST_RESOLUTION 0x1000
+/* The "recalculate timings" flag */
+#define VIDEO_RECALC 0x8000
+/* Define DO_STORE according to CONFIG_VIDEO_RETAIN */
+#ifdef CONFIG_VIDEO_RETAIN
+void store_screen(void);
+#define DO_STORE() store_screen()
+#else
+#define DO_STORE() ((void)0)
+#endif /* CONFIG_VIDEO_RETAIN */
+/*
+ * Mode table structures
+ */
+struct mode_info {
+        u16 mode;               /* Mode number (vga= style) */
+        u8  x, y;               /* Width, height */
+};
+struct card_info {
+        const char *card_name;
+        int (*set_mode)(struct mode_info *mode);
+        int (*probe)(void);
+        struct mode_info *modes;
+        int nmodes;             /* Number of probed modes so far */
+        int unsafe;             /* Probing is unsafe, only do after "scan" */
+        u16 xmode_first;        /* Unprobed modes to try to call anyway */
+        u16 xmode_n;            /* Size of unprobed mode range */
+};
+#define __videocard struct card_info __attribute__((section(".videocards")))
+extern struct card_info video_cards[], video_cards_end[];
+int mode_defined(u16 mode);     /* video.c */
+/* Basic video information */
+#define ADAPTER_CGA     0       /* CGA/MDA/HGC */
+#define ADAPTER_EGA     1
+#define ADAPTER_VGA     2
+extern int adapter;
+extern u16 video_segment;
+extern int force_x, force_y;    /* Don't query the BIOS for cols/rows */
+extern int do_restore;          /* Restore screen contents */
+extern int graphic_mode;        /* Graphics mode with linear frame buffer */
+/*
+ * int $0x10 is notorious for touching registers it shouldn't.
+ * gcc doesn't like %ebp being clobbered, so define it as a push/pop
+ * sequence here.
+ *
+ * A number of systems, including the original PC can clobber %bp in
+ * certain circumstances, like when scrolling.  There exists at least
+ * one Trident video card which could clobber DS under a set of
+ * circumstances that we are unlikely to encounter (scrolling when
+ * using an extended graphics mode of more than 800x600 pixels), but
+ * it's cheap insurance to deal with that here.
+ */
+#define INT10 "pushl %%ebp; pushw %%ds; int $0x10; popw %%ds; popl %%ebp"
+/* Accessing VGA indexed registers */
+static inline u8 in_idx(u16 port, u8 index)
+{
+        outb(index, port);
+        return inb(port+1);
+}
+static inline void out_idx(u8 v, u16 port, u8 index)
+{
+        outw(index+(v << 8), port);
+}
+/* Writes a value to an indexed port and then reads the port again */
+static inline u8 tst_idx(u8 v, u16 port, u8 index)
+{
+        out_idx(port, index, v);
+        return in_idx(port, index);
+}
+/* Get the I/O port of the VGA CRTC */
+u16 vga_crtc(void);             /* video-vga.c */
+#endif /* BOOT_VIDEO_H */
diff --git a/arch/i386/boot/voyager.c b/arch/i386/boot/voyager.c
new file mode 100644
index 0000000000..61c8fe0453
--- /dev/null
+++ b/arch/i386/boot/voyager.c
@@ -0,0 +1,46 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright (C) 1991, 1992 Linus Torvalds
+ *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+/*
+ * arch/i386/boot/voyager.c
+ *
+ * Get the Voyager config information
+ */
+#include "boot.h"
+#ifdef CONFIG_X86_VOYAGER
+int query_voyager(void)
+{
+        u8 err;
+        u16 es, di;
+        /* Abuse the apm_bios_info area for this */
+        u8 *data_ptr = (u8 *)&boot_params.apm_bios_info;
+        data_ptr[0] = 0xff;     /* Flag on config not found(?) */
+        asm("pushw %%es ; "
+            "int $0x15 ; "
+            "setc %0 ; "
+            "movw %%es, %1 ; "
+            "popw %%es"
+            : "=q" (err), "=r" (es), "=D" (di)
+            : "a" (0xffc0));
+        if (err)
+                return -1;      /* Not Voyager */
+        set_fs(es);
+        copy_from_fs(data_ptr, di, 7);  /* Table is 7 bytes apparently */
+        return 0;
+}
+#endif /* CONFIG_X86_VOYAGER */
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 280898b045..a574cd2c8b 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -621,8 +621,6 @@ static int __init acpi_parse_sbf(struct acpi_table_header *table)
 static int __init acpi_parse_hpet(struct acpi_table_header *table)
 {
        struct acpi_table_hpet *hpet_tbl;
-        struct resource *hpet_res;
-        resource_size_t res_start;
        hpet_tbl = (struct acpi_table_hpet *)table;
        if (!hpet_tbl) {
@@ -636,29 +634,10 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table)
                return -1;
        }
-#define HPET_RESOURCE_NAME_SIZE 9
-        hpet_res = alloc_bootmem(sizeof(*hpet_res) + HPET_RESOURCE_NAME_SIZE);
-        if (hpet_res) {
-                memset(hpet_res, 0, sizeof(*hpet_res));
-                hpet_res->name = (void *)&hpet_res[1];
-                hpet_res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
-                snprintf((char *)hpet_res->name, HPET_RESOURCE_NAME_SIZE,
-                         "HPET %u", hpet_tbl->sequence);
-                hpet_res->end = (1 * 1024) - 1;
-        }
        hpet_address = hpet_tbl->address.address;
        printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",
               hpet_tbl->id, hpet_address);
-        res_start = hpet_address;
-        if (hpet_res) {
-                hpet_res->start = res_start;
-                hpet_res->end += res_start;
-                insert_resource(&iomem_resource, hpet_res);
-        }
        return 0;
 }
 #else
diff --git a/arch/i386/kernel/acpi/wakeup.S b/arch/i386/kernel/acpi/wakeup.S
index b781b38131..a2295a34b2 100644
--- a/arch/i386/kernel/acpi/wakeup.S
+++ b/arch/i386/kernel/acpi/wakeup.S
@@ -230,6 +230,7 @@ bogus_magic:
 #
 ENTRY(acpi_copy_wakeup_routine)
+        pushl   %ebx
        sgdt    saved_gdt
        sidt    saved_idt
        sldt    saved_ldt
@@ -263,6 +264,7 @@ ENTRY(acpi_copy_wakeup_routine)
        movl    %edx, video_flags - wakeup_start (%eax)
        movl    $0x12345678, real_magic - wakeup_start (%eax)
        movl    $0x12345678, saved_magic
+        popl    %ebx
        ret
 save_registers:
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index 4112afe712..47001d50a0 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -222,6 +222,7 @@
 #include <linux/capability.h>
 #include <linux/device.h>
 #include <linux/kernel.h>
+#include <linux/freezer.h>
 #include <linux/smp.h>
 #include <linux/dmi.h>
 #include <linux/suspend.h>
@@ -2311,7 +2312,6 @@ static int __init apm_init(void)
                remove_proc_entry("apm", NULL);
                return err;
        }
-        kapmd_task->flags |= PF_NOFREEZE;
        wake_up_process(kapmd_task);
        if (num_online_cpus() > 1 && !smp ) {
diff --git a/arch/i386/kernel/asm-offsets.c b/arch/i386/kernel/asm-offsets.c
index 27a776c904..25f7eb5139 100644
--- a/arch/i386/kernel/asm-offsets.c
+++ b/arch/i386/kernel/asm-offsets.c
@@ -17,6 +17,8 @@
 #include <asm/thread_info.h>
 #include <asm/elf.h>
+#include <xen/interface/xen.h>
 #define DEFINE(sym, val) \
        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
@@ -59,6 +61,7 @@ void foo(void)
        OFFSET(TI_addr_limit, thread_info, addr_limit);
        OFFSET(TI_restart_block, thread_info, restart_block);
        OFFSET(TI_sysenter_return, thread_info, sysenter_return);
+        OFFSET(TI_cpu, thread_info, cpu);
        BLANK();
        OFFSET(GDS_size, Xgt_desc_struct, size);
@@ -115,4 +118,10 @@ void foo(void)
        OFFSET(PARAVIRT_iret, paravirt_ops, iret);
        OFFSET(PARAVIRT_read_cr0, paravirt_ops, read_cr0);
 #endif
+#ifdef CONFIG_XEN
+        BLANK();
+        OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
+        OFFSET(XEN_vcpu_info_pending, vcpu_info, evtchn_upcall_pending);
+#endif
 }
diff --git a/arch/i386/kernel/cpu/Makefile b/arch/i386/kernel/cpu/Makefile
index 74f27a463d..0b6a8551e9 100644
--- a/arch/i386/kernel/cpu/Makefile
+++ b/arch/i386/kernel/cpu/Makefile
@@ -8,7 +8,7 @@ obj-y	+=	amd.o
 obj-y   +=      cyrix.o
 obj-y   +=      centaur.o
 obj-y   +=      transmeta.o
-obj-y   +=      intel.o intel_cacheinfo.o
+obj-y   +=      intel.o intel_cacheinfo.o addon_cpuid_features.o
 obj-y   +=      rise.o
 obj-y   +=      nexgen.o
 obj-y   +=      umc.o
diff --git a/arch/i386/kernel/cpu/addon_cpuid_features.c b/arch/i386/kernel/cpu/addon_cpuid_features.c
new file mode 100644
index 0000000000..3e91d3ee26
--- /dev/null
+++ b/arch/i386/kernel/cpu/addon_cpuid_features.c
@@ -0,0 +1,50 @@
+/*
+ *      Routines to indentify additional cpu features that are scattered in
+ *      cpuid space.
+ */
+#include <linux/cpu.h>
+#include <asm/processor.h>
+struct cpuid_bit {
+        u16 feature;
+        u8 reg;
+        u8 bit;
+        u32 level;
+};
+enum cpuid_regs {
+        CR_EAX = 0,
+        CR_ECX,
+        CR_EDX,
+        CR_EBX
+};
+void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c)
+{
+        u32 max_level;
+        u32 regs[4];
+        const struct cpuid_bit *cb;
+        static const struct cpuid_bit cpuid_bits[] = {
+                { X86_FEATURE_IDA, CR_EAX, 1, 0x00000006 },
+                { 0, 0, 0, 0 }
+        };
+        for (cb = cpuid_bits; cb->feature; cb++) {
+                /* Verify that the level is valid */
+                max_level = cpuid_eax(cb->level & 0xffff0000);
+                if (max_level < cb->level ||
+                    max_level > (cb->level | 0xffff))
+                        continue;
+                cpuid(cb->level, &regs[CR_EAX], &regs[CR_EBX],
+                        &regs[CR_ECX], &regs[CR_EDX]);
+                if (regs[cb->reg] & (1 << cb->bit))
+                        set_bit(cb->feature, c->x86_capability);
+        }
+}
diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c
index 794d593c47..e5419a9dec 100644
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.c
@@ -353,6 +353,8 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 * c)
                        if ( xlvl >= 0x80000004 )
                                get_model_name(c); /* Default name */
                }
+                init_scattered_cpuid_features(c);
        }
        early_intel_workaround(c);
diff --git a/arch/i386/kernel/cpu/cpufreq/Kconfig b/arch/i386/kernel/cpu/cpufreq/Kconfig
index e912aae947..094118ba00 100644
--- a/arch/i386/kernel/cpu/cpufreq/Kconfig
+++ b/arch/i386/kernel/cpu/cpufreq/Kconfig
@@ -90,10 +90,17 @@ config X86_POWERNOW_K8
          If in doubt, say N.
 config X86_POWERNOW_K8_ACPI
-        bool
+        bool "ACPI Support"
-        depends on X86_POWERNOW_K8 && ACPI_PROCESSOR
+        select ACPI_PROCESSOR
-        depends on !(X86_POWERNOW_K8 = y && ACPI_PROCESSOR = m)
+        depends on X86_POWERNOW_K8
        default y
+        help
+          This provides access to the K8s Processor Performance States via ACPI.
+          This driver is probably required for CPUFreq to work with multi-socket and
+          SMP systems.  It is not required on at least some single-socket yet
+          multi-core systems, even if SMP is enabled.
+          It is safe to say Y here.
 config X86_GX_SUSPMOD
        tristate "Cyrix MediaGX/NatSemi Geode Suspend Modulation"
@@ -109,7 +116,7 @@ config X86_GX_SUSPMOD
 config X86_SPEEDSTEP_CENTRINO
        tristate "Intel Enhanced SpeedStep"
        select CPU_FREQ_TABLE
-        select X86_SPEEDSTEP_CENTRINO_TABLE if (!X86_SPEEDSTEP_CENTRINO_ACPI)
+        select X86_SPEEDSTEP_CENTRINO_TABLE
        help
          This adds the CPUFreq driver for Enhanced SpeedStep enabled
          mobile CPUs.  This means Intel Pentium M (Centrino) CPUs. However,
@@ -121,20 +128,6 @@ config X86_SPEEDSTEP_CENTRINO
          If in doubt, say N.
-config X86_SPEEDSTEP_CENTRINO_ACPI
-        bool "Use ACPI tables to decode valid frequency/voltage (deprecated)"
-        depends on X86_SPEEDSTEP_CENTRINO && ACPI_PROCESSOR
-        depends on !(X86_SPEEDSTEP_CENTRINO = y && ACPI_PROCESSOR = m)
-        help
-          This is deprecated and this functionality is now merged into
-          acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of
-          speedstep_centrino.
-          Use primarily the information provided in the BIOS ACPI tables
-          to determine valid CPU frequency and voltage pairings. It is
-          required for the driver to work on non-Banias CPUs.
-          If in doubt, say Y.
 config X86_SPEEDSTEP_CENTRINO_TABLE
        bool "Built-in tables for Banias CPUs"
        depends on X86_SPEEDSTEP_CENTRINO
@@ -230,7 +223,7 @@ comment "shared options"
 config X86_ACPI_CPUFREQ_PROC_INTF
        bool "/proc/acpi/processor/../performance interface (deprecated)"
        depends on PROC_FS
-        depends on X86_ACPI_CPUFREQ || X86_SPEEDSTEP_CENTRINO_ACPI || X86_POWERNOW_K7_ACPI || X86_POWERNOW_K8_ACPI
+        depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K7_ACPI || X86_POWERNOW_K8_ACPI
        help
          This enables the deprecated /proc/acpi/processor/../performance
          interface. While it is helpful for debugging, the generic,
diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index 10baa3501e..18c8b67ea3 100644
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -167,11 +167,13 @@ static void do_drv_read(struct drv_cmd *cmd)
 static void do_drv_write(struct drv_cmd *cmd)
 {
-        u32 h = 0;
+        u32 lo, hi;
        switch (cmd->type) {
        case SYSTEM_INTEL_MSR_CAPABLE:
-                wrmsr(cmd->addr.msr.reg, cmd->val, h);
+                rdmsr(cmd->addr.msr.reg, lo, hi);
+                lo = (lo & ~INTEL_MSR_RANGE) | (cmd->val & INTEL_MSR_RANGE);
+                wrmsr(cmd->addr.msr.reg, lo, hi);
                break;
        case SYSTEM_IO_CAPABLE:
                acpi_os_write_port((acpi_io_address)cmd->addr.io.port,
@@ -372,7 +374,6 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
        struct cpufreq_freqs freqs;
        cpumask_t online_policy_cpus;
        struct drv_cmd cmd;
-        unsigned int msr;
        unsigned int next_state = 0; /* Index into freq_table */
        unsigned int next_perf_state = 0; /* Index into perf table */
        unsigned int i;
@@ -417,11 +418,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
        case SYSTEM_INTEL_MSR_CAPABLE:
                cmd.type = SYSTEM_INTEL_MSR_CAPABLE;
                cmd.addr.msr.reg = MSR_IA32_PERF_CTL;
-                msr =
+                cmd.val = (u32) perf->states[next_perf_state].control;
-                    (u32) perf->states[next_perf_state].
-                    control & INTEL_MSR_RANGE;
-                cmd.val = get_cur_val(online_policy_cpus);
-                cmd.val = (cmd.val & ~INTEL_MSR_RANGE) | msr;
                break;
        case SYSTEM_IO_CAPABLE:
                cmd.type = SYSTEM_IO_CAPABLE;
diff --git a/arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c b/arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c
index 0d49d73d1b..66acd50399 100644
--- a/arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c
+++ b/arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c
@@ -391,8 +391,6 @@ static struct cpufreq_driver nforce2_driver = {
 */
 static unsigned int nforce2_detect_chipset(void)
 {
-        u8 revision;
        nforce2_chipset_dev = pci_get_subsys(PCI_VENDOR_ID_NVIDIA,
                                        PCI_DEVICE_ID_NVIDIA_NFORCE2,
                                        PCI_ANY_ID, PCI_ANY_ID, NULL);
@@ -400,10 +398,8 @@ static unsigned int nforce2_detect_chipset(void)
        if (nforce2_chipset_dev == NULL)
                return -ENODEV;
-        pci_read_config_byte(nforce2_chipset_dev, PCI_REVISION_ID, &revision);
        printk(KERN_INFO "cpufreq: Detected nForce2 chipset revision %X\n",
-               revision);
+               nforce2_chipset_dev->revision);
        printk(KERN_INFO
               "cpufreq: FSB changing is maybe unstable and can lead to crashes and data loss.\n");
diff --git a/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c b/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
index 6667e9cceb..194144539a 100644
--- a/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
+++ b/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
@@ -115,7 +115,6 @@ struct gxfreq_params {
        u8 pci_suscfg;
        u8 pci_pmer1;
        u8 pci_pmer2;
-        u8 pci_rev;
        struct pci_dev *cs55x0;
 };
@@ -276,7 +275,7 @@ static void gx_set_cpuspeed(unsigned int khz)
                        pci_write_config_byte(gx_params->cs55x0, PCI_VIDTC, 100);/* typical 50 to 100ms */
                        pci_write_config_byte(gx_params->cs55x0, PCI_PMER1, pmer1);
-                        if (gx_params->pci_rev < 0x10) {   /* CS5530(rev 1.2, 1.3) */
+                        if (gx_params->cs55x0->revision < 0x10) {   /* CS5530(rev 1.2, 1.3) */
                                suscfg = gx_params->pci_suscfg | SUSMOD;
                        } else {                           /* CS5530A,B.. */
                                suscfg = gx_params->pci_suscfg | SUSMOD | PWRSVE;
@@ -471,7 +470,6 @@ static int __init cpufreq_gx_init(void)
        pci_read_config_byte(params->cs55x0, PCI_PMER2, &(params->pci_pmer2));
        pci_read_config_byte(params->cs55x0, PCI_MODON, &(params->on_duration));
        pci_read_config_byte(params->cs55x0, PCI_MODOFF, &(params->off_duration));
-        pci_read_config_byte(params->cs55x0, PCI_REVISION_ID, &params->pci_rev);
        if ((ret = cpufreq_register_driver(&gx_suspmod_driver))) {
                kfree(params);
diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c
index a3df9c039b..ef8f0bc3fc 100644
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c
@@ -29,6 +29,7 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/string.h>
+#include <linux/delay.h>
 #include <asm/msr.h>
 #include <asm/timex.h>
@@ -55,7 +56,6 @@
 /* Flags */
 #define USE_ACPI_C3             (1 << 1)
 #define USE_NORTHBRIDGE         (1 << 2)
-#define USE_VT8235              (1 << 3)
 static int cpu_model;
 static unsigned int numscales=16;
@@ -63,22 +63,19 @@ static unsigned int fsb;
 static const struct mV_pos *vrm_mV_table;
 static const unsigned char *mV_vrm_table;
-struct f_msr {
-        u8 vrm;
-        u8 pos;
-};
-static struct f_msr f_msr_table[32];
 static unsigned int highest_speed, lowest_speed; /* kHz */
 static unsigned int minmult, maxmult;
 static int can_scale_voltage;
 static struct acpi_processor *pr = NULL;
 static struct acpi_processor_cx *cx = NULL;
+static u32 acpi_regs_addr;
 static u8 longhaul_flags;
-static u8 longhaul_pos;
+static unsigned int longhaul_index;
 /* Module parameters */
 static int scale_voltage;
+static int disable_acpi_c3;
 #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "longhaul", msg)
@@ -144,7 +141,7 @@ static void do_longhaul1(unsigned int clock_ratio_index)
        rdmsrl(MSR_VIA_BCR2, bcr2.val);
        /* Enable software clock multiplier */
        bcr2.bits.ESOFTBF = 1;
-        bcr2.bits.CLOCKMUL = clock_ratio_index;
+        bcr2.bits.CLOCKMUL = clock_ratio_index & 0xff;
        /* Sync to timer tick */
        safe_halt();
@@ -163,14 +160,12 @@ static void do_longhaul1(unsigned int clock_ratio_index)
 /* For processor with Longhaul MSR */
-static void do_powersaver(int cx_address, unsigned int clock_ratio_index)
+static void do_powersaver(int cx_address, unsigned int clock_ratio_index,
+                          unsigned int dir)
 {
        union msr_longhaul longhaul;
-        u8 dest_pos;
        u32 t;
-        dest_pos = f_msr_table[clock_ratio_index].pos;
        rdmsrl(MSR_VIA_LONGHAUL, longhaul.val);
        /* Setup new frequency */
        longhaul.bits.RevisionKey = longhaul.bits.RevisionID;
@@ -178,11 +173,11 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index)
        longhaul.bits.SoftBusRatio4 = (clock_ratio_index & 0x10) >> 4;
        /* Setup new voltage */
        if (can_scale_voltage)
-                longhaul.bits.SoftVID = f_msr_table[clock_ratio_index].vrm;
+                longhaul.bits.SoftVID = (clock_ratio_index >> 8) & 0x1f;
        /* Sync to timer tick */
        safe_halt();
        /* Raise voltage if necessary */
-        if (can_scale_voltage && longhaul_pos < dest_pos) {
+        if (can_scale_voltage && dir) {
                longhaul.bits.EnableSoftVID = 1;
                wrmsrl(MSR_VIA_LONGHAUL, longhaul.val);
                /* Change voltage */
@@ -199,7 +194,6 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index)
                }
                longhaul.bits.EnableSoftVID = 0;
                wrmsrl(MSR_VIA_LONGHAUL, longhaul.val);
-                longhaul_pos = dest_pos;
        }
        /* Change frequency on next halt or sleep */
@@ -220,7 +214,7 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index)
        wrmsrl(MSR_VIA_LONGHAUL, longhaul.val);
        /* Reduce voltage if necessary */
-        if (can_scale_voltage && longhaul_pos > dest_pos) {
+        if (can_scale_voltage && !dir) {
                longhaul.bits.EnableSoftVID = 1;
                wrmsrl(MSR_VIA_LONGHAUL, longhaul.val);
                /* Change voltage */
@@ -237,7 +231,6 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index)
                }
                longhaul.bits.EnableSoftVID = 0;
                wrmsrl(MSR_VIA_LONGHAUL, longhaul.val);
-                longhaul_pos = dest_pos;
        }
 }
@@ -248,25 +241,28 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index)
 * Sets a new clock ratio.
 */
-static void longhaul_setstate(unsigned int clock_ratio_index)
+static void longhaul_setstate(unsigned int table_index)
 {
+        unsigned int clock_ratio_index;
        int speed, mult;
        struct cpufreq_freqs freqs;
-        static unsigned int old_ratio=-1;
        unsigned long flags;
        unsigned int pic1_mask, pic2_mask;
+        u16 bm_status = 0;
+        u32 bm_timeout = 1000;
+        unsigned int dir = 0;
-        if (old_ratio == clock_ratio_index)
+        clock_ratio_index = longhaul_table[table_index].index;
-                return;
+        /* Safety precautions */
-        old_ratio = clock_ratio_index;
+        mult = clock_ratio[clock_ratio_index & 0x1f];
-        mult = clock_ratio[clock_ratio_index];
        if (mult == -1)
                return;
        speed = calc_speed(mult);
        if ((speed > highest_speed) || (speed < lowest_speed))
                return;
+        /* Voltage transition before frequency transition? */
+        if (can_scale_voltage && longhaul_index < table_index)
+                dir = 1;
        freqs.old = calc_speed(longhaul_get_cpu_mult());
        freqs.new = speed;
@@ -285,11 +281,24 @@ static void longhaul_setstate(unsigned int clock_ratio_index)
        outb(0xFF,0xA1);        /* Overkill */
        outb(0xFE,0x21);        /* TMR0 only */
+        /* Wait while PCI bus is busy. */
+        if (acpi_regs_addr && (longhaul_flags & USE_NORTHBRIDGE
+            || ((pr != NULL) && pr->flags.bm_control))) {
+                bm_status = inw(acpi_regs_addr);
+                bm_status &= 1 << 4;
+                while (bm_status && bm_timeout) {
+                        outw(1 << 4, acpi_regs_addr);
+                        bm_timeout--;
+                        bm_status = inw(acpi_regs_addr);
+                        bm_status &= 1 << 4;
+                }
+        }
        if (longhaul_flags & USE_NORTHBRIDGE) {
                /* Disable AGP and PCI arbiters */
                outb(3, 0x22);
        } else if ((pr != NULL) && pr->flags.bm_control) {
-                /* Disable bus master arbitration */
+                /* Disable bus master arbitration */
                acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1);
        }
        switch (longhaul_version) {
@@ -314,9 +323,9 @@ static void longhaul_setstate(unsigned int clock_ratio_index)
                if (longhaul_flags & USE_ACPI_C3) {
                        /* Don't allow wakeup */
                        acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
-                        do_powersaver(cx->address, clock_ratio_index);
+                        do_powersaver(cx->address, clock_ratio_index, dir);
                } else {
-                        do_powersaver(0, clock_ratio_index);
+                        do_powersaver(0, clock_ratio_index, dir);
                }
                break;
        }
@@ -336,6 +345,9 @@ static void longhaul_setstate(unsigned int clock_ratio_index)
        freqs.new = calc_speed(longhaul_get_cpu_mult());
        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        if (!bm_timeout)
+                printk(KERN_INFO PFX "Warning: Timeout while waiting for idle PCI bus.\n");
 }
 /*
@@ -369,7 +381,8 @@ static int guess_fsb(int mult)
 static int __init longhaul_get_ranges(void)
 {
-        unsigned int j, k = 0;
+        unsigned int i, j, k = 0;
+        unsigned int ratio;
        int mult;
        /* Get current frequency */
@@ -423,8 +436,7 @@ static int __init longhaul_get_ranges(void)
        if(!longhaul_table)
                return -ENOMEM;
-        for (j=0; j < numscales; j++) {
+        for (j = 0; j < numscales; j++) {
-                unsigned int ratio;
                ratio = clock_ratio[j];
                if (ratio == -1)
                        continue;
@@ -434,13 +446,41 @@ static int __init longhaul_get_ranges(void)
                longhaul_table[k].index = j;
                k++;
        }
+        if (k <= 1) {
+                kfree(longhaul_table);
+                return -ENODEV;
+        }
+        /* Sort */
+        for (j = 0; j < k - 1; j++) {
+                unsigned int min_f, min_i;
+                min_f = longhaul_table[j].frequency;
+                min_i = j;
+                for (i = j + 1; i < k; i++) {
+                        if (longhaul_table[i].frequency < min_f) {
+                                min_f = longhaul_table[i].frequency;
+                                min_i = i;
+                        }
+                }
+                if (min_i != j) {
+                        unsigned int temp;
+                        temp = longhaul_table[j].frequency;
+                        longhaul_table[j].frequency = longhaul_table[min_i].frequency;
+                        longhaul_table[min_i].frequency = temp;
+                        temp = longhaul_table[j].index;
+                        longhaul_table[j].index = longhaul_table[min_i].index;
+                        longhaul_table[min_i].index = temp;
+                }
+        }
        longhaul_table[k].frequency = CPUFREQ_TABLE_END;
-        if (!k) {
-                kfree (longhaul_table);
-                return -EINVAL;
-        }
+        /* Find index we are running on */
+        for (j = 0; j < k; j++) {
+                if (clock_ratio[longhaul_table[j].index & 0x1f] == mult) {
+                        longhaul_index = j;
+                        break;
+                }
+        }
        return 0;
 }
@@ -448,7 +488,7 @@ static int __init longhaul_get_ranges(void)
 static void __init longhaul_setup_voltagescaling(void)
 {
        union msr_longhaul longhaul;
-        struct mV_pos minvid, maxvid;
+        struct mV_pos minvid, maxvid, vid;
        unsigned int j, speed, pos, kHz_step, numvscales;
        int min_vid_speed;
@@ -459,11 +499,11 @@ static void __init longhaul_setup_voltagescaling(void)
        }
        if (!longhaul.bits.VRMRev) {
-                printk (KERN_INFO PFX "VRM 8.5\n");
+                printk(KERN_INFO PFX "VRM 8.5\n");
                vrm_mV_table = &vrm85_mV[0];
                mV_vrm_table = &mV_vrm85[0];
        } else {
-                printk (KERN_INFO PFX "Mobile VRM\n");
+                printk(KERN_INFO PFX "Mobile VRM\n");
                if (cpu_model < CPU_NEHEMIAH)
                        return;
                vrm_mV_table = &mobilevrm_mV[0];
@@ -523,7 +563,6 @@ static void __init longhaul_setup_voltagescaling(void)
        /* Calculate kHz for one voltage step */
        kHz_step = (highest_speed - min_vid_speed) / numvscales;
        j = 0;
        while (longhaul_table[j].frequency != CPUFREQ_TABLE_END) {
                speed = longhaul_table[j].frequency;
@@ -531,15 +570,14 @@ static void __init longhaul_setup_voltagescaling(void)
                        pos = (speed - min_vid_speed) / kHz_step + minvid.pos;
                else
                        pos = minvid.pos;
-                f_msr_table[longhaul_table[j].index].vrm = mV_vrm_table[pos];
+                longhaul_table[j].index |= mV_vrm_table[pos] << 8;
-                f_msr_table[longhaul_table[j].index].pos = pos;
+                vid = vrm_mV_table[mV_vrm_table[pos]];
+                printk(KERN_INFO PFX "f: %d kHz, index: %d, vid: %d mV\n", speed, j, vid.mV);
                j++;
        }
-        longhaul_pos = maxvid.pos;
        can_scale_voltage = 1;
-        printk(KERN_INFO PFX "Voltage scaling enabled. "
+        printk(KERN_INFO PFX "Voltage scaling enabled.\n");
-                "Use of \"conservative\" governor is highly recommended.\n");
 }
@@ -553,15 +591,44 @@ static int longhaul_target(struct cpufreq_policy *policy,
                            unsigned int target_freq, unsigned int relation)
 {
        unsigned int table_index = 0;
-        unsigned int new_clock_ratio = 0;
+        unsigned int i;
+        unsigned int dir = 0;
+        u8 vid, current_vid;
        if (cpufreq_frequency_table_target(policy, longhaul_table, target_freq, relation, &table_index))
                return -EINVAL;
-        new_clock_ratio = longhaul_table[table_index].index & 0xFF;
+        /* Don't set same frequency again */
+        if (longhaul_index == table_index)
-        longhaul_setstate(new_clock_ratio);
+                return 0;
+        if (!can_scale_voltage)
+                longhaul_setstate(table_index);
+        else {
+                /* On test system voltage transitions exceeding single
+                 * step up or down were turning motherboard off. Both
+                 * "ondemand" and "userspace" are unsafe. C7 is doing
+                 * this in hardware, C3 is old and we need to do this
+                 * in software. */
+                i = longhaul_index;
+                current_vid = (longhaul_table[longhaul_index].index >> 8) & 0x1f;
+                if (table_index > longhaul_index)
+                        dir = 1;
+                while (i != table_index) {
+                        vid = (longhaul_table[i].index >> 8) & 0x1f;
+                        if (vid != current_vid) {
+                                longhaul_setstate(i);
+                                current_vid = vid;
+                                msleep(200);
+                        }
+                        if (dir)
+                                i++;
+                        else
+                                i--;
+                }
+                longhaul_setstate(table_index);
+        }
+        longhaul_index = table_index;
        return 0;
 }
@@ -590,11 +657,10 @@ static acpi_status longhaul_walk_callback(acpi_handle obj_handle,
 static int enable_arbiter_disable(void)
 {
        struct pci_dev *dev;
-        int status;
+        int status = 1;
        int reg;
        u8 pci_cmd;
-        status = 1;
        /* Find PLE133 host bridge */
        reg = 0x78;
        dev = pci_get_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8601_0,
@@ -627,13 +693,17 @@ static int enable_arbiter_disable(void)
        return 0;
 }
-static int longhaul_setup_vt8235(void)
+static int longhaul_setup_southbridge(void)
 {
        struct pci_dev *dev;
        u8 pci_cmd;
        /* Find VT8235 southbridge */
        dev = pci_get_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8235, NULL);
+        if (dev == NULL)
+        /* Find VT8237 southbridge */
+                dev = pci_get_device(PCI_VENDOR_ID_VIA,
+                                     PCI_DEVICE_ID_VIA_8237, NULL);
        if (dev != NULL) {
                /* Set transition time to max */
                pci_read_config_byte(dev, 0xec, &pci_cmd);
@@ -645,6 +715,14 @@ static int longhaul_setup_vt8235(void)
                pci_read_config_byte(dev, 0xe5, &pci_cmd);
                pci_cmd |= 1 << 7;
                pci_write_config_byte(dev, 0xe5, pci_cmd);
+                /* Get address of ACPI registers block*/
+                pci_read_config_byte(dev, 0x81, &pci_cmd);
+                if (pci_cmd & 1 << 7) {
+                        pci_read_config_dword(dev, 0x88, &acpi_regs_addr);
+                        acpi_regs_addr &= 0xff00;
+                        printk(KERN_INFO PFX "ACPI I/O at 0x%x\n", acpi_regs_addr);
+                }
                pci_dev_put(dev);
                return 1;
        }
@@ -657,7 +735,6 @@ static int __init longhaul_cpu_init(struct cpufreq_policy *policy)
        char *cpuname=NULL;
        int ret;
        u32 lo, hi;
-        int vt8235_present;
        /* Check what we have on this motherboard */
        switch (c->x86_model) {
@@ -755,7 +832,7 @@ static int __init longhaul_cpu_init(struct cpufreq_policy *policy)
        };
        /* Doesn't hurt */
-        vt8235_present = longhaul_setup_vt8235();
+        longhaul_setup_southbridge();
        /* Find ACPI data for processor */
        acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT,
@@ -765,35 +842,29 @@ static int __init longhaul_cpu_init(struct cpufreq_policy *policy)
        /* Check ACPI support for C3 state */
        if (pr != NULL && longhaul_version == TYPE_POWERSAVER) {
                cx = &pr->power.states[ACPI_STATE_C3];
-                if (cx->address > 0 && cx->latency <= 1000) {
+                if (cx->address > 0 && cx->latency <= 1000)
                        longhaul_flags |= USE_ACPI_C3;
-                        goto print_support_type;
-                }
        }
+        /* Disable if it isn't working */
+        if (disable_acpi_c3)
+                longhaul_flags &= ~USE_ACPI_C3;
        /* Check if northbridge is friendly */
-        if (enable_arbiter_disable()) {
+        if (enable_arbiter_disable())
                longhaul_flags |= USE_NORTHBRIDGE;
-                goto print_support_type;
-        }
-        /* Use VT8235 southbridge if present */
-        if (longhaul_version == TYPE_POWERSAVER && vt8235_present) {
-                longhaul_flags |= USE_VT8235;
-                goto print_support_type;
-        }
        /* Check ACPI support for bus master arbiter disable */
-        if ((pr == NULL) || !(pr->flags.bm_control)) {
+        if (!(longhaul_flags & USE_ACPI_C3
+             || longhaul_flags & USE_NORTHBRIDGE)
+            && ((pr == NULL) || !(pr->flags.bm_control))) {
                printk(KERN_ERR PFX
                        "No ACPI support. Unsupported northbridge.\n");
                return -ENODEV;
        }
-print_support_type:
        if (longhaul_flags & USE_NORTHBRIDGE)
-                printk (KERN_INFO PFX "Using northbridge support.\n");
+                printk(KERN_INFO PFX "Using northbridge support.\n");
-        else if (longhaul_flags & USE_VT8235)
+        if (longhaul_flags & USE_ACPI_C3)
-                printk (KERN_INFO PFX "Using VT8235 support.\n");
+                printk(KERN_INFO PFX "Using ACPI support.\n");
-        else
-                printk (KERN_INFO PFX "Using ACPI support.\n");
        ret = longhaul_get_ranges();
        if (ret != 0)
@@ -885,6 +956,9 @@ static void __exit longhaul_exit(void)
        kfree(longhaul_table);
 }
+module_param (disable_acpi_c3, int, 0644);
+MODULE_PARM_DESC(disable_acpi_c3, "Don't use ACPI C3 support");
 module_param (scale_voltage, int, 0644);
 MODULE_PARM_DESC(scale_voltage, "Scale voltage of processor");
diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.h b/arch/i386/kernel/cpu/cpufreq/longhaul.h
index 102548f128..4fcc320997 100644
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.h
+++ b/arch/i386/kernel/cpu/cpufreq/longhaul.h
@@ -180,7 +180,7 @@ static const int __initdata ezrat_clock_ratio[32] = {
        -1,  /* 0000 -> RESERVED (10.0x) */
        110, /* 0001 -> 11.0x */
-        120, /* 0010 -> 12.0x */
+        -1, /* 0010 -> 12.0x */
        -1,  /* 0011 -> RESERVED (9.0x)*/
        105, /* 0100 -> 10.5x */
        115, /* 0101 -> 11.5x */
@@ -237,7 +237,7 @@ static const int __initdata ezrat_eblcr[32] = {
 static const int __initdata  nehemiah_clock_ratio[32] = {
        100, /* 0000 -> 10.0x */
-        160, /* 0001 -> 16.0x */
+        -1, /* 0001 -> 16.0x */
        40,  /* 0010 ->  4.0x */
        90,  /* 0011 ->  9.0x */
        95,  /* 0100 ->  9.5x */
@@ -252,10 +252,10 @@ static const int __initdata  nehemiah_clock_ratio[32] = {
        75,  /* 1101 ->  7.5x */
        85,  /* 1110 ->  8.5x */
        120, /* 1111 -> 12.0x */
-        100, /* 0000 -> 10.0x */
+        -1, /* 0000 -> 10.0x */
        110, /* 0001 -> 11.0x */
-        120, /* 0010 -> 12.0x */
+        -1, /* 0010 -> 12.0x */
-        90,  /* 0011 ->  9.0x */
+        -1,  /* 0011 ->  9.0x */
        105, /* 0100 -> 10.5x */
        115, /* 0101 -> 11.5x */
        125, /* 0110 -> 12.5x */
@@ -267,7 +267,7 @@ static const int __initdata  nehemiah_clock_ratio[32] = {
        145, /* 1100 -> 14.5x */
        155, /* 1101 -> 15.5x */
        -1,  /* 1110 -> RESERVED (13.0x) */
-        120, /* 1111 -> 12.0x */
+        -1, /* 1111 -> 12.0x */
 };
 static const int __initdata nehemiah_eblcr[32] = {
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
index 4ade55c5f3..34ed53a067 100644
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
@@ -599,14 +599,17 @@ static void print_basics(struct powernow_k8_data *data)
        for (j = 0; j < data->numps; j++) {
                if (data->powernow_table[j].frequency != CPUFREQ_ENTRY_INVALID) {
                        if (cpu_family == CPU_HW_PSTATE) {
-                        printk(KERN_INFO PFX "   %d : fid 0x%x gid 0x%x (%d MHz)\n", j, (data->powernow_table[j].index & 0xff00) >> 8,
+                                printk(KERN_INFO PFX "   %d : fid 0x%x did 0x%x (%d MHz)\n",
-                                (data->powernow_table[j].index & 0xff0000) >> 16,
+                                        j,
-                                data->powernow_table[j].frequency/1000);
+                                        (data->powernow_table[j].index & 0xff00) >> 8,
+                                        (data->powernow_table[j].index & 0xff0000) >> 16,
+                                        data->powernow_table[j].frequency/1000);
                        } else {
-                        printk(KERN_INFO PFX "   %d : fid 0x%x (%d MHz), vid 0x%x\n", j,
+                                printk(KERN_INFO PFX "   %d : fid 0x%x (%d MHz), vid 0x%x\n",
-                                data->powernow_table[j].index & 0xff,
+                                        j,
-                                data->powernow_table[j].frequency/1000,
+                                        data->powernow_table[j].index & 0xff,
-                                data->powernow_table[j].index >> 8);
+                                        data->powernow_table[j].frequency/1000,
+                                        data->powernow_table[j].index >> 8);
                        }
                }
        }
@@ -1086,7 +1089,7 @@ static int powernowk8_target(struct cpufreq_policy *pol, unsigned targfreq, unsi
        if (cpu_family == CPU_HW_PSTATE)
                dprintk("targ: curr fid 0x%x, did 0x%x\n",
-                        data->currfid, data->currvid);
+                        data->currfid, data->currdid);
        else {
                dprintk("targ: curr fid 0x%x, vid 0x%x\n",
                data->currfid, data->currvid);
@@ -1322,16 +1325,22 @@ static struct cpufreq_driver cpufreq_amd64_driver = {
 static int __cpuinit powernowk8_init(void)
 {
        unsigned int i, supported_cpus = 0;
+        unsigned int booted_cores = 1;
        for_each_online_cpu(i) {
                if (check_supported_cpu(i))
                        supported_cpus++;
        }
+#ifdef CONFIG_SMP
+        booted_cores = cpu_data[0].booted_cores;
+#endif
        if (supported_cpus == num_online_cpus()) {
                printk(KERN_INFO PFX "Found %d %s "
-                        "processors (" VERSION ")\n", supported_cpus,
+                        "processors (%d cpu cores) (" VERSION ")\n",
-                        boot_cpu_data.x86_model_id);
+                        supported_cpus/booted_cores,
+                        boot_cpu_data.x86_model_id, supported_cpus);
                return cpufreq_register_driver(&cpufreq_amd64_driver);
        }
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
index 35489fd688..6c5dc2c85a 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
@@ -21,12 +21,6 @@
 #include <linux/delay.h>
 #include <linux/compiler.h>
-#ifdef CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI
-#include <linux/acpi.h>
-#include <linux/dmi.h>
-#include <acpi/processor.h>
-#endif
 #include <asm/msr.h>
 #include <asm/processor.h>
 #include <asm/cpufeature.h>
@@ -257,9 +251,7 @@ static int centrino_cpu_init_table(struct cpufreq_policy *policy)
                /* Matched a non-match */
                dprintk("no table support for CPU model \"%s\"\n",
                       cpu->x86_model_id);
-#ifndef CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI
+                dprintk("try using the acpi-cpufreq driver\n");
-                dprintk("try compiling with CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI enabled\n");
-#endif
                return -ENOENT;
        }
@@ -346,213 +338,6 @@ static unsigned int get_cur_freq(unsigned int cpu)
 }
-#ifdef CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI
-static struct acpi_processor_performance *acpi_perf_data[NR_CPUS];
-/*
- * centrino_cpu_early_init_acpi - Do the preregistering with ACPI P-States
- * library
- *
- * Before doing the actual init, we need to do _PSD related setup whenever
- * supported by the BIOS. These are handled by this early_init routine.
- */
-static int centrino_cpu_early_init_acpi(void)
-{
-        unsigned int    i, j;
-        struct acpi_processor_performance       *data;
-        for_each_possible_cpu(i) {
-                data = kzalloc(sizeof(struct acpi_processor_performance), 
-                                GFP_KERNEL);
-                if (!data) {
-                        for_each_possible_cpu(j) {
-                                kfree(acpi_perf_data[j]);
-                                acpi_perf_data[j] = NULL;
-                        }
-                        return (-ENOMEM);
-                }
-                acpi_perf_data[i] = data;
-        }
-        acpi_processor_preregister_performance(acpi_perf_data);
-        return 0;
-}
-#ifdef CONFIG_SMP
-/*
- * Some BIOSes do SW_ANY coordination internally, either set it up in hw
- * or do it in BIOS firmware and won't inform about it to OS. If not
- * detected, this has a side effect of making CPU run at a different speed
- * than OS intended it to run at. Detect it and handle it cleanly.
- */
-static int bios_with_sw_any_bug;
-static int sw_any_bug_found(struct dmi_system_id *d)
-{
-        bios_with_sw_any_bug = 1;
-        return 0;
-}
-static struct dmi_system_id sw_any_bug_dmi_table[] = {
-        {
-                .callback = sw_any_bug_found,
-                .ident = "Supermicro Server X6DLP",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Supermicro"),
-                        DMI_MATCH(DMI_BIOS_VERSION, "080010"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
-                },
-        },
-        { }
-};
-#endif
-/*
- * centrino_cpu_init_acpi - register with ACPI P-States library
- *
- * Register with the ACPI P-States library (part of drivers/acpi/processor.c)
- * in order to determine correct frequency and voltage pairings by reading
- * the _PSS of the ACPI DSDT or SSDT tables.
- */
-static int centrino_cpu_init_acpi(struct cpufreq_policy *policy)
-{
-        unsigned long                   cur_freq;
-        int                             result = 0, i;
-        unsigned int                    cpu = policy->cpu;
-        struct acpi_processor_performance       *p;
-        p = acpi_perf_data[cpu];
-        /* register with ACPI core */
-        if (acpi_processor_register_performance(p, cpu)) {
-                dprintk(PFX "obtaining ACPI data failed\n");
-                return -EIO;
-        }
-        policy->shared_type = p->shared_type;
-        /*
-         * Will let policy->cpus know about dependency only when software 
-         * coordination is required.
-         */
-        if (policy->shared_type == CPUFREQ_SHARED_TYPE_ALL ||
-            policy->shared_type == CPUFREQ_SHARED_TYPE_ANY) {
-                policy->cpus = p->shared_cpu_map;
-        }
-#ifdef CONFIG_SMP
-        dmi_check_system(sw_any_bug_dmi_table);
-        if (bios_with_sw_any_bug && cpus_weight(policy->cpus) == 1) {
-                policy->shared_type = CPUFREQ_SHARED_TYPE_ALL;
-                policy->cpus = cpu_core_map[cpu];
-        }
-#endif
-        /* verify the acpi_data */
-        if (p->state_count <= 1) {
-                dprintk("No P-States\n");
-                result = -ENODEV;
-                goto err_unreg;
-        }
-        if ((p->control_register.space_id != ACPI_ADR_SPACE_FIXED_HARDWARE) ||
-            (p->status_register.space_id != ACPI_ADR_SPACE_FIXED_HARDWARE)) {
-                dprintk("Invalid control/status registers (%x - %x)\n",
-                        p->control_register.space_id, p->status_register.space_id);
-                result = -EIO;
-                goto err_unreg;
-        }
-        for (i=0; i<p->state_count; i++) {
-                if ((p->states[i].control & INTEL_MSR_RANGE) !=
-                    (p->states[i].status & INTEL_MSR_RANGE)) {
-                        dprintk("Different MSR bits in control (%llu) and status (%llu)\n",
-                                p->states[i].control, p->states[i].status);
-                        result = -EINVAL;
-                        goto err_unreg;
-                }
-                if (!p->states[i].core_frequency) {
-                        dprintk("Zero core frequency for state %u\n", i);
-                        result = -EINVAL;
-                        goto err_unreg;
-                }
-                if (p->states[i].core_frequency > p->states[0].core_frequency) {
-                        dprintk("P%u has larger frequency (%llu) than P0 (%llu), skipping\n", i,
-                                p->states[i].core_frequency, p->states[0].core_frequency);
-                        p->states[i].core_frequency = 0;
-                        continue;
-                }
-        }
-        centrino_model[cpu] = kzalloc(sizeof(struct cpu_model), GFP_KERNEL);
-        if (!centrino_model[cpu]) {
-                result = -ENOMEM;
-                goto err_unreg;
-        }
-        centrino_model[cpu]->model_name=NULL;
-        centrino_model[cpu]->max_freq = p->states[0].core_frequency * 1000;
-        centrino_model[cpu]->op_points =  kmalloc(sizeof(struct cpufreq_frequency_table) *
-                                             (p->state_count + 1), GFP_KERNEL);
-        if (!centrino_model[cpu]->op_points) {
-                result = -ENOMEM;
-                goto err_kfree;
-        }
-        for (i=0; i<p->state_count; i++) {
-                centrino_model[cpu]->op_points[i].index = p->states[i].control & INTEL_MSR_RANGE;
-                centrino_model[cpu]->op_points[i].frequency = p->states[i].core_frequency * 1000;
-                dprintk("adding state %i with frequency %u and control value %04x\n", 
-                        i, centrino_model[cpu]->op_points[i].frequency, centrino_model[cpu]->op_points[i].index);
-        }
-        centrino_model[cpu]->op_points[p->state_count].frequency = CPUFREQ_TABLE_END;
-        cur_freq = get_cur_freq(cpu);
-        for (i=0; i<p->state_count; i++) {
-                if (!p->states[i].core_frequency) {
-                        dprintk("skipping state %u\n", i);
-                        centrino_model[cpu]->op_points[i].frequency = CPUFREQ_ENTRY_INVALID;
-                        continue;
-                }
-                
-                if (extract_clock(centrino_model[cpu]->op_points[i].index, cpu, 0) !=
-                    (centrino_model[cpu]->op_points[i].frequency)) {
-                        dprintk("Invalid encoded frequency (%u vs. %u)\n",
-                                extract_clock(centrino_model[cpu]->op_points[i].index, cpu, 0),
-                                centrino_model[cpu]->op_points[i].frequency);
-                        result = -EINVAL;
-                        goto err_kfree_all;
-                }
-                if (cur_freq == centrino_model[cpu]->op_points[i].frequency)
-                        p->state = i;
-        }
-        /* notify BIOS that we exist */
-        acpi_processor_notify_smm(THIS_MODULE);
-        printk("speedstep-centrino with X86_SPEEDSTEP_CENTRINO_ACPI "
-               "config is deprecated.\n "
-               "Use X86_ACPI_CPUFREQ (acpi-cpufreq) instead.\n" );
-        return 0;
- err_kfree_all:
-        kfree(centrino_model[cpu]->op_points);
- err_kfree:
-        kfree(centrino_model[cpu]);
- err_unreg:
-        acpi_processor_unregister_performance(p, cpu);
-        dprintk(PFX "invalid ACPI data\n");
-        return (result);
-}
-#else
-static inline int centrino_cpu_init_acpi(struct cpufreq_policy *policy) { return -ENODEV; }
-static inline int centrino_cpu_early_init_acpi(void) { return 0; }
-#endif
 static int centrino_cpu_init(struct cpufreq_policy *policy)
 {
        struct cpuinfo_x86 *cpu = &cpu_data[policy->cpu];
@@ -568,27 +353,25 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
        if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
                centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
-        if (centrino_cpu_init_acpi(policy)) {
+        if (policy->cpu != 0)
-                if (policy->cpu != 0)
+                return -ENODEV;
-                        return -ENODEV;
-                for (i = 0; i < N_IDS; i++)
+        for (i = 0; i < N_IDS; i++)
-                        if (centrino_verify_cpu_id(cpu, &cpu_ids[i]))
+                if (centrino_verify_cpu_id(cpu, &cpu_ids[i]))
-                                break;
+                        break;
-                if (i != N_IDS)
+        if (i != N_IDS)
-                        centrino_cpu[policy->cpu] = &cpu_ids[i];
+                centrino_cpu[policy->cpu] = &cpu_ids[i];
-                if (!centrino_cpu[policy->cpu]) {
+        if (!centrino_cpu[policy->cpu]) {
-                        dprintk("found unsupported CPU with "
+                dprintk("found unsupported CPU with "
-                        "Enhanced SpeedStep: send /proc/cpuinfo to "
+                "Enhanced SpeedStep: send /proc/cpuinfo to "
-                        MAINTAINER "\n");
+                MAINTAINER "\n");
-                        return -ENODEV;
+                return -ENODEV;
-                }
+        }
-                if (centrino_cpu_init_table(policy)) {
+        if (centrino_cpu_init_table(policy)) {
-                        return -ENODEV;
+                return -ENODEV;
-                }
        }
        /* Check to see if Enhanced SpeedStep is enabled, and try to
@@ -634,20 +417,6 @@ static int centrino_cpu_exit(struct cpufreq_policy *policy)
        cpufreq_frequency_table_put_attr(cpu);
-#ifdef CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI
-        if (!centrino_model[cpu]->model_name) {
-                static struct acpi_processor_performance *p;
-                if (acpi_perf_data[cpu]) {
-                        p = acpi_perf_data[cpu];
-                        dprintk("unregistering and freeing ACPI data\n");
-                        acpi_processor_unregister_performance(p, cpu);
-                        kfree(centrino_model[cpu]->op_points);
-                        kfree(centrino_model[cpu]);
-                }
-        }
-#endif
        centrino_model[cpu] = NULL;
        return 0;
@@ -849,25 +618,12 @@ static int __init centrino_init(void)
        if (!cpu_has(cpu, X86_FEATURE_EST))
                return -ENODEV;
-        centrino_cpu_early_init_acpi();
        return cpufreq_register_driver(&centrino_driver);
 }
 static void __exit centrino_exit(void)
 {
-#ifdef CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI
-        unsigned int j;
-#endif
-        
        cpufreq_unregister_driver(&centrino_driver);
-#ifdef CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI
-        for_each_possible_cpu(j) {
-                kfree(acpi_perf_data[j]);
-                acpi_perf_data[j] = NULL;
-        }
-#endif
 }
 MODULE_AUTHOR ("Jeremy Fitzhardinge <jeremy@goop.org>");
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c b/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c
index 698f980eb4..a5b2346faf 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c
@@ -205,7 +205,6 @@ static unsigned int speedstep_detect_chipset (void)
                 * host brige. Abort on these systems.
                 */
                static struct pci_dev *hostbridge;
-                u8 rev = 0;
                hostbridge  = pci_get_subsys(PCI_VENDOR_ID_INTEL,
                              PCI_DEVICE_ID_INTEL_82815_MC,
@@ -216,8 +215,7 @@ static unsigned int speedstep_detect_chipset (void)
                if (!hostbridge)
                        return 2; /* 2-M */
-                pci_read_config_byte(hostbridge, PCI_REVISION_ID, &rev);
+                if (hostbridge->revision < 5) {
-                if (rev < 5) {
                        dprintk("hostbridge does not support speedstep\n");
                        speedstep_chipset_dev = NULL;
                        pci_dev_put(hostbridge);
diff --git a/arch/i386/kernel/cpu/mcheck/therm_throt.c b/arch/i386/kernel/cpu/mcheck/therm_throt.c
index 7ba7c3abd3..1203dc5ab8 100644
--- a/arch/i386/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/i386/kernel/cpu/mcheck/therm_throt.c
@@ -134,19 +134,21 @@ static __cpuinit int thermal_throttle_cpu_callback(struct notifier_block *nfb,
        int err;
        sys_dev = get_cpu_sysdev(cpu);
-        mutex_lock(&therm_cpu_lock);
        switch (action) {
        case CPU_ONLINE:
        case CPU_ONLINE_FROZEN:
+                mutex_lock(&therm_cpu_lock);
                err = thermal_throttle_add_dev(sys_dev);
+                mutex_unlock(&therm_cpu_lock);
                WARN_ON(err);
                break;
        case CPU_DEAD:
        case CPU_DEAD_FROZEN:
+                mutex_lock(&therm_cpu_lock);
                thermal_throttle_remove_dev(sys_dev);
+                mutex_unlock(&therm_cpu_lock);
                break;
        }
-        mutex_unlock(&therm_cpu_lock);
        return NOTIFY_OK;
 }
diff --git a/arch/i386/kernel/cpu/mtrr/cyrix.c b/arch/i386/kernel/cpu/mtrr/cyrix.c
index 9edf562558..1001f1e0fe 100644
--- a/arch/i386/kernel/cpu/mtrr/cyrix.c
+++ b/arch/i386/kernel/cpu/mtrr/cyrix.c
@@ -233,12 +233,12 @@ typedef struct {
        mtrr_type type;
 } arr_state_t;
-static arr_state_t arr_state[8] __devinitdata = {
+static arr_state_t arr_state[8] = {
        {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL},
        {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}
 };
-static unsigned char ccr_state[7] __devinitdata = { 0, 0, 0, 0, 0, 0, 0 };
+static unsigned char ccr_state[7] = { 0, 0, 0, 0, 0, 0, 0 };
 static void cyrix_set_all(void)
 {
diff --git a/arch/i386/kernel/cpu/mtrr/generic.c b/arch/i386/kernel/cpu/mtrr/generic.c
index 6d5937891b..f6e46943e6 100644
--- a/arch/i386/kernel/cpu/mtrr/generic.c
+++ b/arch/i386/kernel/cpu/mtrr/generic.c
@@ -65,7 +65,8 @@ get_fixed_ranges(mtrr_type * frs)
 void mtrr_save_fixed_ranges(void *info)
 {
-        get_fixed_ranges(mtrr_state.fixed_ranges);
+        if (cpu_has_mtrr)
+                get_fixed_ranges(mtrr_state.fixed_ranges);
 }
 static void print_fixed(unsigned base, unsigned step, const mtrr_type*types)
@@ -469,11 +470,6 @@ int generic_validate_add_page(unsigned long base, unsigned long size, unsigned i
                }
        }
-        if (base < 0x100) {
-                printk(KERN_WARNING "mtrr: cannot set region below 1 MiB (0x%lx000,0x%lx000)\n",
-                       base, size);
-                return -EINVAL;
-        }
        /*  Check upper bits of base and last are equal and lower bits are 0
            for base and 1 for last  */
        last = base + size - 1;
diff --git a/arch/i386/kernel/cpu/mtrr/main.c b/arch/i386/kernel/cpu/mtrr/main.c
index 55b005152a..75dc6d5214 100644
--- a/arch/i386/kernel/cpu/mtrr/main.c
+++ b/arch/i386/kernel/cpu/mtrr/main.c
@@ -229,6 +229,8 @@ static void set_mtrr(unsigned int reg, unsigned long base,
        data.smp_size = size;
        data.smp_type = type;
        atomic_set(&data.count, num_booting_cpus() - 1);
+        /* make sure data.count is visible before unleashing other CPUs */
+        smp_wmb();
        atomic_set(&data.gate,0);
        /*  Start the ball rolling on other CPUs  */
@@ -242,6 +244,7 @@ static void set_mtrr(unsigned int reg, unsigned long base,
        /* ok, reset count and toggle gate */
        atomic_set(&data.count, num_booting_cpus() - 1);
+        smp_wmb();
        atomic_set(&data.gate,1);
        /* do our MTRR business */
@@ -260,6 +263,7 @@ static void set_mtrr(unsigned int reg, unsigned long base,
                cpu_relax();
        atomic_set(&data.count, num_booting_cpus() - 1);
+        smp_wmb();
        atomic_set(&data.gate,0);
        /*
diff --git a/arch/i386/kernel/cpu/perfctr-watchdog.c b/arch/i386/kernel/cpu/perfctr-watchdog.c
index f0b67630b9..4d26d514c5 100644
--- a/arch/i386/kernel/cpu/perfctr-watchdog.c
+++ b/arch/i386/kernel/cpu/perfctr-watchdog.c
@@ -55,14 +55,45 @@ static DEFINE_PER_CPU(struct nmi_watchdog_ctlblk, nmi_watchdog_ctlblk);
 /* converts an msr to an appropriate reservation bit */
 static inline unsigned int nmi_perfctr_msr_to_bit(unsigned int msr)
 {
-        return wd_ops ? msr - wd_ops->perfctr : 0;
+        /* returns the bit offset of the performance counter register */
+        switch (boot_cpu_data.x86_vendor) {
+        case X86_VENDOR_AMD:
+                return (msr - MSR_K7_PERFCTR0);
+        case X86_VENDOR_INTEL:
+                if (cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON))
+                        return (msr - MSR_ARCH_PERFMON_PERFCTR0);
+                switch (boot_cpu_data.x86) {
+                case 6:
+                        return (msr - MSR_P6_PERFCTR0);
+                case 15:
+                        return (msr - MSR_P4_BPU_PERFCTR0);
+                }
+        }
+        return 0;
 }
 /* converts an msr to an appropriate reservation bit */
 /* returns the bit offset of the event selection register */
 static inline unsigned int nmi_evntsel_msr_to_bit(unsigned int msr)
 {
-        return wd_ops ? msr - wd_ops->evntsel : 0;
+        /* returns the bit offset of the event selection register */
+        switch (boot_cpu_data.x86_vendor) {
+        case X86_VENDOR_AMD:
+                return (msr - MSR_K7_EVNTSEL0);
+        case X86_VENDOR_INTEL:
+                if (cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON))
+                        return (msr - MSR_ARCH_PERFMON_EVENTSEL0);
+                switch (boot_cpu_data.x86) {
+                case 6:
+                        return (msr - MSR_P6_EVNTSEL0);
+                case 15:
+                        return (msr - MSR_P4_BSU_ESCR0);
+                }
+        }
+        return 0;
 }
 /* checks for a bit availability (hack for oprofile) */
diff --git a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c
index 89d91e6cc9..1e31b6caff 100644
--- a/arch/i386/kernel/cpu/proc.c
+++ b/arch/i386/kernel/cpu/proc.c
@@ -29,7 +29,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, "mp", "nx", NULL, "mmxext", NULL,
-                NULL, "fxsr_opt", "pdpe1gb", "rdtscp", NULL, "lm", "3dnowext", "3dnow",
+                NULL, "fxsr_opt", "pdpe1gb", "rdtscp", NULL, "lm",
+                "3dnowext", "3dnow",
                /* Transmeta-defined */
                "recovery", "longrun", NULL, "lrti", NULL, NULL, NULL, NULL,
@@ -40,8 +41,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                /* Other (Linux-defined) */
                "cxmmx", "k6_mtrr", "cyrix_arr", "centaur_mcr",
                NULL, NULL, NULL, NULL,
-                "constant_tsc", "up", NULL, NULL, NULL, NULL, NULL, NULL,
+                "constant_tsc", "up", NULL, "arch_perfmon",
-                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                "pebs", "bts", NULL, "sync_rdtsc",
+                "rep_good", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                /* Intel-defined (#2) */
@@ -57,9 +59,16 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                /* AMD-defined (#2) */
-                "lahf_lm", "cmp_legacy", "svm", "extapic", "cr8legacy", "abm",
+                "lahf_lm", "cmp_legacy", "svm", "extapic", "cr8_legacy",
-                "sse4a", "misalignsse",
+                "altmovcr8", "abm", "sse4a",
-                "3dnowprefetch", "osvw", "ibs", NULL, NULL, NULL, NULL, NULL,
+                "misalignsse", "3dnowprefetch",
+                "osvw", "ibs", NULL, NULL, NULL, NULL,
+                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                /* Auxiliary (Linux-defined) */
+                "ida", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
        };
diff --git a/arch/i386/kernel/e820.c b/arch/i386/kernel/e820.c
index 9645bb51f7..fc822a4689 100644
--- a/arch/i386/kernel/e820.c
+++ b/arch/i386/kernel/e820.c
@@ -734,7 +734,7 @@ void __init print_memory_map(char *who)
                case E820_NVS:
                                printk("(ACPI NVS)\n");
                                break;
-                default:        printk("type %lu\n", e820.map[i].type);
+                default:        printk("type %u\n", e820.map[i].type);
                                break;
                }
        }
diff --git a/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c
index a1808022ea..2452c6fbe9 100644
--- a/arch/i386/kernel/efi.c
+++ b/arch/i386/kernel/efi.c
@@ -278,7 +278,7 @@ void efi_memmap_walk(efi_freemem_callback_t callback, void *arg)
        struct range {
                unsigned long start;
                unsigned long end;
-        } prev, curr;
+        } uninitialized_var(prev), curr;
        efi_memory_desc_t *md;
        unsigned long start, end;
        void *p;
diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S
index b1f16ee65e..a714d6b435 100644
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry.S
@@ -367,10 +367,6 @@ ENTRY(system_call)
        CFI_ADJUST_CFA_OFFSET 4
        SAVE_ALL
        GET_THREAD_INFO(%ebp)
-        testl $TF_MASK,PT_EFLAGS(%esp)
-        jz no_singlestep
-        orl $_TIF_SINGLESTEP,TI_flags(%ebp)
-no_singlestep:
                                        # system call tracing in operation / emulation
        /* Note, _TIF_SECCOMP is bit number 8, and so it needs testw and not testb */
        testw $(_TIF_SYSCALL_EMU|_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT),TI_flags(%ebp)
@@ -385,6 +381,10 @@ syscall_exit:
                                        # setting need_resched or sigpending
                                        # between sampling and the iret
        TRACE_IRQS_OFF
+        testl $TF_MASK,PT_EFLAGS(%esp)  # If tracing set singlestep flag on exit
+        jz no_singlestep
+        orl $_TIF_SINGLESTEP,TI_flags(%ebp)
+no_singlestep:
        movl TI_flags(%ebp), %ecx
        testw $_TIF_ALLWORK_MASK, %cx   # current->work
        jne syscall_exit_work
@@ -409,8 +409,6 @@ restore_nocheck_notrace:
 1:      INTERRUPT_RETURN
 .section .fixup,"ax"
 iret_exc:
-        TRACE_IRQS_ON
-        ENABLE_INTERRUPTS(CLBR_NONE)
        pushl $0                        # no error code
        pushl $do_iret_error
        jmp error_code
@@ -1023,6 +1021,91 @@ ENTRY(kernel_thread_helper)
        CFI_ENDPROC
 ENDPROC(kernel_thread_helper)
+#ifdef CONFIG_XEN
+ENTRY(xen_hypervisor_callback)
+        CFI_STARTPROC
+        pushl $0
+        CFI_ADJUST_CFA_OFFSET 4
+        SAVE_ALL
+        TRACE_IRQS_OFF
+        /* Check to see if we got the event in the critical
+           region in xen_iret_direct, after we've reenabled
+           events and checked for pending events.  This simulates
+           iret instruction's behaviour where it delivers a
+           pending interrupt when enabling interrupts. */
+        movl PT_EIP(%esp),%eax
+        cmpl $xen_iret_start_crit,%eax
+        jb   1f
+        cmpl $xen_iret_end_crit,%eax
+        jae  1f
+        call xen_iret_crit_fixup
+1:      mov %esp, %eax
+        call xen_evtchn_do_upcall
+        jmp  ret_from_intr
+        CFI_ENDPROC
+ENDPROC(xen_hypervisor_callback)
+# Hypervisor uses this for application faults while it executes.
+# We get here for two reasons:
+#  1. Fault while reloading DS, ES, FS or GS
+#  2. Fault while executing IRET
+# Category 1 we fix up by reattempting the load, and zeroing the segment
+# register if the load fails.
+# Category 2 we fix up by jumping to do_iret_error. We cannot use the
+# normal Linux return path in this case because if we use the IRET hypercall
+# to pop the stack frame we end up in an infinite loop of failsafe callbacks.
+# We distinguish between categories by maintaining a status value in EAX.
+ENTRY(xen_failsafe_callback)
+        CFI_STARTPROC
+        pushl %eax
+        CFI_ADJUST_CFA_OFFSET 4
+        movl $1,%eax
+1:      mov 4(%esp),%ds
+2:      mov 8(%esp),%es
+3:      mov 12(%esp),%fs
+4:      mov 16(%esp),%gs
+        testl %eax,%eax
+        popl %eax
+        CFI_ADJUST_CFA_OFFSET -4
+        lea 16(%esp),%esp
+        CFI_ADJUST_CFA_OFFSET -16
+        jz 5f
+        addl $16,%esp
+        jmp iret_exc            # EAX != 0 => Category 2 (Bad IRET)
+5:      pushl $0                # EAX == 0 => Category 1 (Bad segment)
+        CFI_ADJUST_CFA_OFFSET 4
+        SAVE_ALL
+        jmp ret_from_exception
+        CFI_ENDPROC
+.section .fixup,"ax"
+6:      xorl %eax,%eax
+        movl %eax,4(%esp)
+        jmp 1b
+7:      xorl %eax,%eax
+        movl %eax,8(%esp)
+        jmp 2b
+8:      xorl %eax,%eax
+        movl %eax,12(%esp)
+        jmp 3b
+9:      xorl %eax,%eax
+        movl %eax,16(%esp)
+        jmp 4b
+.previous
+.section __ex_table,"a"
+        .align 4
+        .long 1b,6b
+        .long 2b,7b
+        .long 3b,8b
+        .long 4b,9b
+.previous
+ENDPROC(xen_failsafe_callback)
+#endif  /* CONFIG_XEN */
 .section .rodata,"a"
 #include "syscall_table.S"
diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S
index f74dfc419b..7c52b22220 100644
--- a/arch/i386/kernel/head.S
+++ b/arch/i386/kernel/head.S
@@ -168,6 +168,12 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
 .section .init.text,"ax",@progbits
 #endif
+        /* Do an early initialization of the fixmap area */
+        movl $(swapper_pg_dir - __PAGE_OFFSET), %edx
+        movl $(swapper_pg_pmd - __PAGE_OFFSET), %eax
+        addl $0x007, %eax                       /* 0x007 = PRESENT+RW+USER */
+        movl %eax, 4092(%edx)
 #ifdef CONFIG_SMP
 ENTRY(startup_32_smp)
        cld
@@ -504,9 +510,12 @@ ENTRY(_stext)
 /*
 * BSS section
 */
-.section ".bss.page_aligned","w"
+.section ".bss.page_aligned","wa"
+        .align PAGE_SIZE_asm
 ENTRY(swapper_pg_dir)
        .fill 1024,4,0
+ENTRY(swapper_pg_pmd)
+        .fill 1024,4,0
 ENTRY(empty_zero_page)
        .fill 4096,1,0
@@ -530,6 +539,8 @@ fault_msg:
        .ascii "Int %d: CR2 %p  err %p  EIP %p  CS %p  flags %p\n"
        .asciz "Stack: %p %p %p %p %p %p %p %p\n"
+#include "../xen/xen-head.S"
 /*
 * The IDT and GDT 'descriptors' are a strange 48-bit object
 * only used by the lidt and lgdt instructions. They are not
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index 7f8b7af2b9..21db8f56c9 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -667,6 +667,7 @@ static int balanced_irq(void *unused)
                set_pending_irq(i, cpumask_of_cpu(0));
        }
+        set_freezable();
        for ( ; ; ) {
                time_remaining = schedule_timeout_interruptible(time_remaining);
                try_to_freeze();
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index fba121f797..03b7f5584d 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -295,7 +295,7 @@ static unsigned int
        last_irq_sums [NR_CPUS],
        alert_counter [NR_CPUS];
-void touch_nmi_watchdog (void)
+void touch_nmi_watchdog(void)
 {
        if (nmi_watchdog > 0) {
                unsigned cpu;
@@ -304,8 +304,10 @@ void touch_nmi_watchdog (void)
                 * Just reset the alert counters, (other CPUs might be
                 * spinning on locks we hold):
                 */
-                for_each_present_cpu (cpu)
+                for_each_present_cpu(cpu) {
-                        alert_counter[cpu] = 0;
+                        if (alert_counter[cpu])
+                                alert_counter[cpu] = 0;
+                }
        }
        /*
diff --git a/arch/i386/kernel/paravirt.c b/arch/i386/kernel/paravirt.c
index faab09abca..53f07a8275 100644
--- a/arch/i386/kernel/paravirt.c
+++ b/arch/i386/kernel/paravirt.c
@@ -228,6 +228,41 @@ static int __init print_banner(void)
 }
 core_initcall(print_banner);
+static struct resource reserve_ioports = {
+        .start = 0,
+        .end = IO_SPACE_LIMIT,
+        .name = "paravirt-ioport",
+        .flags = IORESOURCE_IO | IORESOURCE_BUSY,
+};
+static struct resource reserve_iomem = {
+        .start = 0,
+        .end = -1,
+        .name = "paravirt-iomem",
+        .flags = IORESOURCE_MEM | IORESOURCE_BUSY,
+};
+/*
+ * Reserve the whole legacy IO space to prevent any legacy drivers
+ * from wasting time probing for their hardware.  This is a fairly
+ * brute-force approach to disabling all non-virtual drivers.
+ *
+ * Note that this must be called very early to have any effect.
+ */
+int paravirt_disable_iospace(void)
+{
+        int ret;
+        ret = request_resource(&ioport_resource, &reserve_ioports);
+        if (ret == 0) {
+                ret = request_resource(&iomem_resource, &reserve_iomem);
+                if (ret)
+                        release_resource(&reserve_ioports);
+        }
+        return ret;
+}
 struct paravirt_ops paravirt_ops = {
        .name = "bare hardware",
        .paravirt_enabled = 0,
@@ -267,7 +302,7 @@ struct paravirt_ops paravirt_ops = {
        .write_msr = native_write_msr_safe,
        .read_tsc = native_read_tsc,
        .read_pmc = native_read_pmc,
-        .get_scheduled_cycles = native_read_tsc,
+        .sched_clock = native_sched_clock,
        .get_cpu_khz = native_calculate_cpu_khz,
        .load_tr_desc = native_load_tr_desc,
        .set_ldt = native_set_ldt,
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index 06dfa65ad1..6c49acb969 100644
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -538,8 +538,31 @@ int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)
        return 1;
 }
-static noinline void __switch_to_xtra(struct task_struct *next_p,
+#ifdef CONFIG_SECCOMP
-                                    struct tss_struct *tss)
+void hard_disable_TSC(void)
+{
+        write_cr4(read_cr4() | X86_CR4_TSD);
+}
+void disable_TSC(void)
+{
+        preempt_disable();
+        if (!test_and_set_thread_flag(TIF_NOTSC))
+                /*
+                 * Must flip the CPU state synchronously with
+                 * TIF_NOTSC in the current running context.
+                 */
+                hard_disable_TSC();
+        preempt_enable();
+}
+void hard_enable_TSC(void)
+{
+        write_cr4(read_cr4() & ~X86_CR4_TSD);
+}
+#endif /* CONFIG_SECCOMP */
+static noinline void
+__switch_to_xtra(struct task_struct *prev_p, struct task_struct *next_p,
+                 struct tss_struct *tss)
 {
        struct thread_struct *next;
@@ -555,6 +578,17 @@ static noinline void __switch_to_xtra(struct task_struct *next_p,
                set_debugreg(next->debugreg[7], 7);
        }
+#ifdef CONFIG_SECCOMP
+        if (test_tsk_thread_flag(prev_p, TIF_NOTSC) ^
+            test_tsk_thread_flag(next_p, TIF_NOTSC)) {
+                /* prev and next are different */
+                if (test_tsk_thread_flag(next_p, TIF_NOTSC))
+                        hard_disable_TSC();
+                else
+                        hard_enable_TSC();
+        }
+#endif
        if (!test_tsk_thread_flag(next_p, TIF_IO_BITMAP)) {
                /*
                 * Disable the bitmap via an invalid offset. We still cache
@@ -586,33 +620,6 @@ static noinline void __switch_to_xtra(struct task_struct *next_p,
 }
 /*
- * This function selects if the context switch from prev to next
- * has to tweak the TSC disable bit in the cr4.
- */
-static inline void disable_tsc(struct task_struct *prev_p,
-                               struct task_struct *next_p)
-{
-        struct thread_info *prev, *next;
-        /*
-         * gcc should eliminate the ->thread_info dereference if
-         * has_secure_computing returns 0 at compile time (SECCOMP=n).
-         */
-        prev = task_thread_info(prev_p);
-        next = task_thread_info(next_p);
-        if (has_secure_computing(prev) || has_secure_computing(next)) {
-                /* slow path here */
-                if (has_secure_computing(prev) &&
-                    !has_secure_computing(next)) {
-                        write_cr4(read_cr4() & ~X86_CR4_TSD);
-                } else if (!has_secure_computing(prev) &&
-                           has_secure_computing(next))
-                        write_cr4(read_cr4() | X86_CR4_TSD);
-        }
-}
-/*
 *      switch_to(x,yn) should switch tasks from x to y.
 *
 * We fsave/fwait so that an exception goes off at the right time
@@ -689,11 +696,9 @@ struct task_struct fastcall * __switch_to(struct task_struct *prev_p, struct tas
        /*
         * Now maybe handle debug registers and/or IO bitmaps
         */
-        if (unlikely((task_thread_info(next_p)->flags & _TIF_WORK_CTXSW)
+        if (unlikely(task_thread_info(prev_p)->flags & _TIF_WORK_CTXSW_PREV ||
-            || test_tsk_thread_flag(prev_p, TIF_IO_BITMAP)))
+                     task_thread_info(next_p)->flags & _TIF_WORK_CTXSW_NEXT))
-                __switch_to_xtra(next_p, tss);
+                __switch_to_xtra(prev_p, next_p, tss);
-        disable_tsc(prev_p, next_p);
        /*
         * Leave lazy mode, flushing any hypercalls made here.
diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c
index 0c0ceec5de..0c8f00e69c 100644
--- a/arch/i386/kernel/ptrace.c
+++ b/arch/i386/kernel/ptrace.c
@@ -164,14 +164,22 @@ static unsigned long convert_eip_to_linear(struct task_struct *child, struct pt_
                u32 *desc;
                unsigned long base;
-                down(&child->mm->context.sem);
+                seg &= ~7UL;
-                desc = child->mm->context.ldt + (seg & ~7);
-                base = (desc[0] >> 16) | ((desc[1] & 0xff) << 16) | (desc[1] & 0xff000000);
-                /* 16-bit code segment? */
+                down(&child->mm->context.sem);
-                if (!((desc[1] >> 22) & 1))
+                if (unlikely((seg >> 3) >= child->mm->context.size))
-                        addr &= 0xffff;
+                        addr = -1L; /* bogus selector, access would fault */
-                addr += base;
+                else {
+                        desc = child->mm->context.ldt + seg;
+                        base = ((desc[0] >> 16) |
+                                ((desc[1] & 0xff) << 16) |
+                                (desc[1] & 0xff000000));
+                        /* 16-bit code segment? */
+                        if (!((desc[1] >> 22) & 1))
+                                addr &= 0xffff;
+                        addr += base;
+                }
                up(&child->mm->context.sem);
        }
        return addr;
@@ -358,17 +366,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        switch (request) {
        /* when I and D space are separate, these will need to be fixed. */
        case PTRACE_PEEKTEXT: /* read word at location addr. */ 
-        case PTRACE_PEEKDATA: {
+        case PTRACE_PEEKDATA:
-                unsigned long tmp;
+                ret = generic_ptrace_peekdata(child, addr, data);
-                int copied;
-                copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
-                ret = -EIO;
-                if (copied != sizeof(tmp))
-                        break;
-                ret = put_user(tmp, datap);
                break;
-        }
        /* read the word at location addr in the USER area. */
        case PTRACE_PEEKUSR: {
@@ -395,10 +395,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        /* when I and D space are separate, this will have to be fixed. */
        case PTRACE_POKETEXT: /* write the word at location addr. */
        case PTRACE_POKEDATA:
-                ret = 0;
+                ret = generic_ptrace_pokedata(child, addr, data);
-                if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data))
-                        break;
-                ret = -EIO;
                break;
        case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
diff --git a/arch/i386/kernel/quirks.c b/arch/i386/kernel/quirks.c
index 9f6ab1789b..6722469c26 100644
--- a/arch/i386/kernel/quirks.c
+++ b/arch/i386/kernel/quirks.c
@@ -20,8 +20,6 @@ static void __devinit quirk_intel_irqbalance(struct pci_dev *dev)
        if (rev > 0x9)
                return;
-        printk(KERN_INFO "Intel E7520/7320/7525 detected.");
        /* enable access to config space*/
        pci_read_config_byte(dev, 0xf4, &config);
        pci_write_config_byte(dev, 0xf4, config|0x2);
@@ -30,7 +28,8 @@ static void __devinit quirk_intel_irqbalance(struct pci_dev *dev)
        raw_pci_ops->read(0, 0, 0x40, 0x4c, 2, &word);
        if (!(word & (1 << 13))) {
-                printk(KERN_INFO "Disabling irq balancing and affinity\n");
+                printk(KERN_INFO "Intel E7520/7320/7525 detected. "
+                        "Disabling irq balancing and affinity\n");
 #ifdef CONFIG_IRQBALANCE
                irqbalance_disable("");
 #endif
diff --git a/arch/i386/kernel/reboot_fixups.c b/arch/i386/kernel/reboot_fixups.c
index 2d78d91834..03e1cce58f 100644
--- a/arch/i386/kernel/reboot_fixups.c
+++ b/arch/i386/kernel/reboot_fixups.c
@@ -5,12 +5,14 @@
 *
 * List of supported fixups:
 * geode-gx1/cs5530a - Jaya Kumar <jayalk@intworks.biz>
+ * geode-gx/lx/cs5536 - Andres Salomon <dilinger@debian.org>
 *
 */
 #include <asm/delay.h>
 #include <linux/pci.h>
 #include <asm/reboot_fixups.h>
+#include <asm/msr.h>
 static void cs5530a_warm_reset(struct pci_dev *dev)
 {
@@ -21,6 +23,16 @@ static void cs5530a_warm_reset(struct pci_dev *dev)
        return;
 }
+static void cs5536_warm_reset(struct pci_dev *dev)
+{
+        /*
+         * 6.6.2.12 Soft Reset (DIVIL_SOFT_RESET)
+         * writing 1 to the LSB of this MSR causes a hard reset.
+         */
+        wrmsrl(0x51400017, 1ULL);
+        udelay(50); /* shouldn't get here but be safe and spin a while */
+}
 struct device_fixup {
        unsigned int vendor;
        unsigned int device;
@@ -29,6 +41,7 @@ struct device_fixup {
 static struct device_fixup fixups_table[] = {
 { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY, cs5530a_warm_reset },
+{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, cs5536_warm_reset },
 };
 /*
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 698c24fe48..74871d066c 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -102,19 +102,10 @@ static unsigned int highmem_pages = -1;
 /*
 * Setup options
 */
-struct drive_info_struct { char dummy[32]; } drive_info;
-#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_HD) || \
-    defined(CONFIG_BLK_DEV_IDE_MODULE) || defined(CONFIG_BLK_DEV_HD_MODULE)
-EXPORT_SYMBOL(drive_info);
-#endif
 struct screen_info screen_info;
 EXPORT_SYMBOL(screen_info);
 struct apm_info apm_info;
 EXPORT_SYMBOL(apm_info);
-struct sys_desc_table_struct {
-        unsigned short length;
-        unsigned char table[0];
-};
 struct edid_info edid_info;
 EXPORT_SYMBOL_GPL(edid_info);
 struct ist_info ist_info;
@@ -134,7 +125,7 @@ unsigned long saved_videomode;
 static char __initdata command_line[COMMAND_LINE_SIZE];
-unsigned char __initdata boot_params[PARAM_SIZE];
+struct boot_params __initdata boot_params;
 #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
 struct edd edd;
@@ -528,7 +519,6 @@ void __init setup_arch(char **cmdline_p)
 #endif
        ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
-        drive_info = DRIVE_INFO;
        screen_info = SCREEN_INFO;
        edid_info = EDID_INFO;
        apm_info.bios = APM_BIOS_INFO;
@@ -611,6 +601,8 @@ void __init setup_arch(char **cmdline_p)
         * NOTE: at this point the bootmem allocator is fully available.
         */
+        paravirt_post_allocator_init();
        dmi_scan_machine();
 #ifdef CONFIG_X86_GENERICARCH
diff --git a/arch/i386/kernel/smp.c b/arch/i386/kernel/smp.c
index 6299c080f6..2d35d85020 100644
--- a/arch/i386/kernel/smp.c
+++ b/arch/i386/kernel/smp.c
@@ -22,6 +22,7 @@
 #include <asm/mtrr.h>
 #include <asm/tlbflush.h>
+#include <asm/mmu_context.h>
 #include <mach_apic.h>
 /*
@@ -249,13 +250,13 @@ static unsigned long flush_va;
 static DEFINE_SPINLOCK(tlbstate_lock);
 /*
- * We cannot call mmdrop() because we are in interrupt context, 
+ * We cannot call mmdrop() because we are in interrupt context,
 * instead update mm->cpu_vm_mask.
 *
 * We need to reload %cr3 since the page tables may be going
 * away from under us..
 */
-static inline void leave_mm (unsigned long cpu)
+void leave_mm(unsigned long cpu)
 {
        if (per_cpu(cpu_tlbstate, cpu).state == TLBSTATE_OK)
                BUG();
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index 88baed1e7e..5910d3fac5 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -148,7 +148,7 @@ void __init smp_alloc_memory(void)
 * a given CPU
 */
-static void __cpuinit smp_store_cpu_info(int id)
+void __cpuinit smp_store_cpu_info(int id)
 {
        struct cpuinfo_x86 *c = cpu_data + id;
@@ -308,8 +308,7 @@ cpumask_t cpu_coregroup_map(int cpu)
 /* representing cpus for which sibling maps can be computed */
 static cpumask_t cpu_sibling_setup_map;
-static inline void
+void set_cpu_sibling_map(int cpu)
-set_cpu_sibling_map(int cpu)
 {
        int i;
        struct cpuinfo_x86 *c = cpu_data;
@@ -941,17 +940,6 @@ exit:
 }
 #endif
-static void smp_tune_scheduling(void)
-{
-        if (cpu_khz) {
-                /* cache size in kB */
-                long cachesize = boot_cpu_data.x86_cache_size;
-                if (cachesize > 0)
-                        max_cache_size = cachesize * 1024;
-        }
-}
 /*
 * Cycle through the processors sending APIC IPIs to boot each.
 */
@@ -980,7 +968,6 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
        x86_cpu_to_apicid[0] = boot_cpu_physical_apicid;
        current_thread_info()->cpu = 0;
-        smp_tune_scheduling();
        set_cpu_sibling_map(0);
@@ -1156,8 +1143,7 @@ void __init native_smp_prepare_boot_cpu(void)
 }
 #ifdef CONFIG_HOTPLUG_CPU
-static void
+void remove_siblinginfo(int cpu)
-remove_siblinginfo(int cpu)
 {
        int sibling;
        struct cpuinfo_x86 *c = cpu_data;
diff --git a/arch/i386/kernel/smpcommon.c b/arch/i386/kernel/smpcommon.c
index 1868ae18eb..bbfe85a0f6 100644
--- a/arch/i386/kernel/smpcommon.c
+++ b/arch/i386/kernel/smpcommon.c
@@ -47,7 +47,7 @@ int smp_call_function(void (*func) (void *info), void *info, int nonatomic,
 EXPORT_SYMBOL(smp_call_function);
 /**
- * smp_call_function_single - Run a function on another CPU
+ * smp_call_function_single - Run a function on a specific CPU
 * @cpu: The target CPU.  Cannot be the calling CPU.
 * @func: The function to run. This must be fast and non-blocking.
 * @info: An arbitrary pointer to pass to the function.
@@ -66,9 +66,11 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
        int ret;
        int me = get_cpu();
        if (cpu == me) {
-                WARN_ON(1);
+                local_irq_disable();
+                func(info);
+                local_irq_enable();
                put_cpu();
-                return -EBUSY;
+                return 0;
        }
        ret = smp_call_function_mask(cpumask_of_cpu(cpu), func, info, wait);
diff --git a/arch/i386/kernel/syscall_table.S b/arch/i386/kernel/syscall_table.S
index bf6adce522..8344c70adf 100644
--- a/arch/i386/kernel/syscall_table.S
+++ b/arch/i386/kernel/syscall_table.S
@@ -323,3 +323,4 @@ ENTRY(sys_call_table)
        .long sys_signalfd
        .long sys_timerfd
        .long sys_eventfd
+        .long sys_fallocate
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 90da0575fc..d32fd4b6f7 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -390,7 +390,7 @@ void die(const char * str, struct pt_regs * regs, long err)
                unsigned long esp;
                unsigned short ss;
-                report_bug(regs->eip);
+                report_bug(regs->eip, regs);
                printk(KERN_EMERG "%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
 #ifdef CONFIG_PREEMPT
@@ -433,6 +433,7 @@ void die(const char * str, struct pt_regs * regs, long err)
        bust_spinlocks(0);
        die.lock_owner = -1;
+        add_taint(TAINT_DIE);
        spin_unlock_irqrestore(&die.lock, flags);
        if (!regs)
@@ -517,10 +518,12 @@ fastcall void do_##name(struct pt_regs * regs, long error_code) \
        do_trap(trapnr, signr, str, 0, regs, error_code, NULL); \
 }
-#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr) \
+#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr, irq) \
 fastcall void do_##name(struct pt_regs * regs, long error_code) \
 { \
        siginfo_t info; \
+        if (irq) \
+                local_irq_enable(); \
        info.si_signo = signr; \
        info.si_errno = 0; \
        info.si_code = sicode; \
@@ -560,13 +563,13 @@ DO_VM86_ERROR( 3, SIGTRAP, "int3", int3)
 #endif
 DO_VM86_ERROR( 4, SIGSEGV, "overflow", overflow)
 DO_VM86_ERROR( 5, SIGSEGV, "bounds", bounds)
-DO_ERROR_INFO( 6, SIGILL,  "invalid opcode", invalid_op, ILL_ILLOPN, regs->eip)
+DO_ERROR_INFO( 6, SIGILL,  "invalid opcode", invalid_op, ILL_ILLOPN, regs->eip, 0)
 DO_ERROR( 9, SIGFPE,  "coprocessor segment overrun", coprocessor_segment_overrun)
 DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS)
 DO_ERROR(11, SIGBUS,  "segment not present", segment_not_present)
 DO_ERROR(12, SIGBUS,  "stack segment", stack_segment)
-DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0)
+DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0)
-DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0)
+DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1)
 fastcall void __kprobes do_general_protection(struct pt_regs * regs,
                                              long error_code)
diff --git a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c
index f64b81f303..252f9010f2 100644
--- a/arch/i386/kernel/tsc.c
+++ b/arch/i386/kernel/tsc.c
@@ -4,6 +4,7 @@
 * See comments there for proper credits.
 */
+#include <linux/sched.h>
 #include <linux/clocksource.h>
 #include <linux/workqueue.h>
 #include <linux/cpufreq.h>
@@ -83,7 +84,7 @@ static inline int check_tsc_unstable(void)
 *
 *                      -johnstul@us.ibm.com "math is hard, lets go shopping!"
 */
-static unsigned long cyc2ns_scale __read_mostly;
+unsigned long cyc2ns_scale __read_mostly;
 #define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */
@@ -92,32 +93,44 @@ static inline void set_cyc2ns_scale(unsigned long cpu_khz)
        cyc2ns_scale = (1000000 << CYC2NS_SCALE_FACTOR)/cpu_khz;
 }
-static inline unsigned long long cycles_2_ns(unsigned long long cyc)
-{
-        return (cyc * cyc2ns_scale) >> CYC2NS_SCALE_FACTOR;
-}
 /*
 * Scheduler clock - returns current time in nanosec units.
 */
-unsigned long long sched_clock(void)
+unsigned long long native_sched_clock(void)
 {
        unsigned long long this_offset;
        /*
         * Fall back to jiffies if there's no TSC available:
+         * ( But note that we still use it if the TSC is marked
+         *   unstable. We do this because unlike Time Of Day,
+         *   the scheduler clock tolerates small errors and it's
+         *   very important for it to be as fast as the platform
+         *   can achive it. )
         */
-        if (unlikely(!tsc_enabled))
+        if (unlikely(!tsc_enabled && !tsc_unstable))
                /* No locking but a rare wrong value is not a big deal: */
                return (jiffies_64 - INITIAL_JIFFIES) * (1000000000 / HZ);
        /* read the Time Stamp Counter: */
-        get_scheduled_cycles(this_offset);
+        rdtscll(this_offset);
        /* return the value in ns */
        return cycles_2_ns(this_offset);
 }
+/* We need to define a real function for sched_clock, to override the
+   weak default version */
+#ifdef CONFIG_PARAVIRT
+unsigned long long sched_clock(void)
+{
+        return paravirt_sched_clock();
+}
+#else
+unsigned long long sched_clock(void)
+        __attribute__((alias("native_sched_clock")));
+#endif
 unsigned long native_calculate_cpu_khz(void)
 {
        unsigned long long start, end;
@@ -277,6 +290,7 @@ static struct clocksource clocksource_tsc = {
 void mark_tsc_unstable(char *reason)
 {
+        sched_clock_unstable_event();
        if (!tsc_unstable) {
                tsc_unstable = 1;
                tsc_enabled = 0;
diff --git a/arch/i386/kernel/verify_cpu.S b/arch/i386/kernel/verify_cpu.S
deleted file mode 100644
index f1d1eacf4a..0000000000
--- a/arch/i386/kernel/verify_cpu.S
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Check if CPU has some minimum CPUID bits
-   This runs in 16bit mode so that the caller can still use the BIOS
-   to output errors on the screen */
-#include <asm/cpufeature.h>
-#include <asm/msr.h>
-verify_cpu:
-        pushfl                          # Save caller passed flags
-        pushl   $0                      # Kill any dangerous flags
-        popfl
-#if CONFIG_X86_MINIMUM_CPU_MODEL >= 4
-        pushfl
-        pop     %eax
-        orl     $(1<<18),%eax           # try setting AC
-        push    %eax
-        popfl
-        pushfl
-        popl    %eax
-        testl   $(1<<18),%eax
-        jz      bad
-#endif
-#if REQUIRED_MASK1 != 0
-        pushfl                          # standard way to check for cpuid
-        popl    %eax
-        movl    %eax,%ebx
-        xorl    $0x200000,%eax
-        pushl   %eax
-        popfl
-        pushfl
-        popl    %eax
-        cmpl    %eax,%ebx
-        pushfl                          # standard way to check for cpuid
-        popl    %eax
-        movl    %eax,%ebx
-        xorl    $0x200000,%eax
-        pushl   %eax
-        popfl
-        pushfl
-        popl    %eax
-        cmpl    %eax,%ebx
-        jz      bad                     # REQUIRED_MASK1 != 0 requires CPUID
-        movl    $0x0,%eax               # See if cpuid 1 is implemented
-        cpuid
-        cmpl    $0x1,%eax
-        jb      bad                     # no cpuid 1
-#if REQUIRED_MASK1 & NEED_CMPXCHG64
-        /* Some VIA C3s need magic MSRs to enable CX64. Do this here */
-        cmpl    $0x746e6543,%ebx        # Cent
-        jne     1f
-        cmpl    $0x48727561,%edx        # aurH
-        jne     1f
-        cmpl    $0x736c7561,%ecx        # auls
-        jne     1f
-        movl    $1,%eax                 # check model
-        cpuid
-        movl    %eax,%ebx
-        shr     $8,%ebx
-        andl    $0xf,%ebx
-        cmp     $6,%ebx                 # check family == 6
-        jne     1f
-        shr     $4,%eax
-        andl    $0xf,%eax
-        cmpl    $6,%eax                 # check model >= 6
-        jb      1f
-        # assume models >= 6 all support this MSR
-        movl    $MSR_VIA_FCR,%ecx
-        rdmsr
-        orl     $((1<<1)|(1<<7)),%eax   # enable CMPXCHG64 and PGE
-        wrmsr
-1:
-#endif
-        movl    $0x1,%eax               # Does the cpu have what it takes
-        cpuid
-#if CONFIG_X86_MINIMUM_CPU_MODEL > 4
-#error  add proper model checking here
-#endif
-        andl    $REQUIRED_MASK1,%edx
-        xorl    $REQUIRED_MASK1,%edx
-        jnz     bad
-#endif /* REQUIRED_MASK1 */
-        popfl
-        xor     %eax,%eax
-        ret
-bad:
-        popfl
-        movl    $1,%eax
-        ret
diff --git a/arch/i386/kernel/vmi.c b/arch/i386/kernel/vmi.c
index c12720d7cb..72042bb7ec 100644
--- a/arch/i386/kernel/vmi.c
+++ b/arch/i386/kernel/vmi.c
@@ -362,7 +362,7 @@ static void *vmi_kmap_atomic_pte(struct page *page, enum km_type type)
 }
 #endif
-static void vmi_allocate_pt(u32 pfn)
+static void vmi_allocate_pt(struct mm_struct *mm, u32 pfn)
 {
        vmi_set_page_type(pfn, VMI_PAGE_L1);
        vmi_ops.allocate_page(pfn, VMI_PAGE_L1, 0, 0, 0);
@@ -891,7 +891,7 @@ static inline int __init activate_vmi(void)
                paravirt_ops.setup_boot_clock = vmi_time_bsp_init;
                paravirt_ops.setup_secondary_clock = vmi_time_ap_init;
 #endif
-                paravirt_ops.get_scheduled_cycles = vmi_get_sched_cycles;
+                paravirt_ops.sched_clock = vmi_sched_clock;
                paravirt_ops.get_cpu_khz = vmi_cpu_khz;
                /* We have true wallclock functions; disable CMOS clock sync */
diff --git a/arch/i386/kernel/vmiclock.c b/arch/i386/kernel/vmiclock.c
index 26a37f8a87..f9b845f4e6 100644
--- a/arch/i386/kernel/vmiclock.c
+++ b/arch/i386/kernel/vmiclock.c
@@ -64,10 +64,10 @@ int vmi_set_wallclock(unsigned long now)
        return 0;
 }
-/* paravirt_ops.get_scheduled_cycles = vmi_get_sched_cycles */
+/* paravirt_ops.sched_clock = vmi_sched_clock */
-unsigned long long vmi_get_sched_cycles(void)
+unsigned long long vmi_sched_clock(void)
 {
-        return vmi_timer_ops.get_cycle_counter(VMI_CYCLES_AVAILABLE);
+        return cycles_2_ns(vmi_timer_ops.get_cycle_counter(VMI_CYCLES_AVAILABLE));
 }
 /* paravirt_ops.get_cpu_khz = vmi_cpu_khz */
diff --git a/arch/i386/kernel/vmlinux.lds.S b/arch/i386/kernel/vmlinux.lds.S
index aa87b06c7c..00f1bc47d3 100644
--- a/arch/i386/kernel/vmlinux.lds.S
+++ b/arch/i386/kernel/vmlinux.lds.S
@@ -88,6 +88,7 @@ SECTIONS
  . = ALIGN(4096);
  .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) {
+        *(.data.page_aligned)
        *(.data.idt)
  }
diff --git a/arch/i386/kernel/vsyscall-note.S b/arch/i386/kernel/vsyscall-note.S
index d4b5be4f3d..271f16a8ca 100644
--- a/arch/i386/kernel/vsyscall-note.S
+++ b/arch/i386/kernel/vsyscall-note.S
@@ -3,23 +3,40 @@
 * Here we can supply some information useful to userland.
 */
-#include <linux/uts.h>
 #include <linux/version.h>
+#include <linux/elfnote.h>
-#define ASM_ELF_NOTE_BEGIN(name, flags, vendor, type)                         \
+/* Ideally this would use UTS_NAME, but using a quoted string here
-        .section name, flags;                                                 \
+   doesn't work. Remember to change this when changing the
-        .balign 4;                                                            \
+   kernel's name. */
-        .long 1f - 0f;          /* name length */                             \
+ELFNOTE_START(Linux, 0, "a")
-        .long 3f - 2f;          /* data length */                             \
+        .long LINUX_VERSION_CODE
-        .long type;             /* note type */                               \
+ELFNOTE_END
-0:      .asciz vendor;          /* vendor name */                             \
-1:      .balign 4;                                                            \
-2:
-#define ASM_ELF_NOTE_END                                                      \
+#ifdef CONFIG_XEN
-3:      .balign 4;              /* pad out section */                         \
-        .previous
-        ASM_ELF_NOTE_BEGIN(".note.kernel-version", "a", UTS_SYSNAME, 0)
+/*
-        .long LINUX_VERSION_CODE
+ * Add a special note telling glibc's dynamic linker a fake hardware
-        ASM_ELF_NOTE_END
+ * flavor that it will use to choose the search path for libraries in the
+ * same way it uses real hardware capabilities like "mmx".
+ * We supply "nosegneg" as the fake capability, to indicate that we
+ * do not like negative offsets in instructions using segment overrides,
+ * since we implement those inefficiently.  This makes it possible to
+ * install libraries optimized to avoid those access patterns in someplace
+ * like /lib/i686/tls/nosegneg.  Note that an /etc/ld.so.conf.d/file
+ * corresponding to the bits here is needed to make ldconfig work right.
+ * It should contain:
+ *      hwcap 1 nosegneg
+ * to match the mapping of bit to name that we give here.
+ */
+/* Bit used for the pseudo-hwcap for non-negative segments.  We use
+   bit 1 to avoid bugs in some versions of glibc when bit 0 is
+   used; the choice is otherwise arbitrary. */
+#define VDSO_NOTE_NONEGSEG_BIT  1
+ELFNOTE_START(GNU, 2, "a")
+        .long 1, 1<<VDSO_NOTE_NONEGSEG_BIT              /* ncaps, mask */
+        .byte VDSO_NOTE_NONEGSEG_BIT; .asciz "nosegneg" /* bit, name */
+ELFNOTE_END
+#endif
diff --git a/arch/i386/mach-es7000/es7000plat.c b/arch/i386/mach-es7000/es7000plat.c
index 9be6ceabf0..ab99072d3f 100644
--- a/arch/i386/mach-es7000/es7000plat.c
+++ b/arch/i386/mach-es7000/es7000plat.c
@@ -40,6 +40,7 @@
 #include <asm/smp.h>
 #include <asm/apicdef.h>
 #include "es7000.h"
+#include <mach_mpparse.h>
 /*
 * ES7000 Globals
@@ -174,6 +175,53 @@ find_unisys_acpi_oem_table(unsigned long *oem_addr)
 }
 #endif
+/*
+ * This file also gets compiled if CONFIG_X86_GENERICARCH is set. Generic
+ * arch already has got following function definitions (asm-generic/es7000.c)
+ * hence no need to define these for that case.
+ */
+#ifndef CONFIG_X86_GENERICARCH
+void es7000_sw_apic(void);
+void __init enable_apic_mode(void)
+{
+        es7000_sw_apic();
+        return;
+}
+__init int mps_oem_check(struct mp_config_table *mpc, char *oem,
+                char *productid)
+{
+        if (mpc->mpc_oemptr) {
+                struct mp_config_oemtable *oem_table =
+                        (struct mp_config_oemtable *)mpc->mpc_oemptr;
+                if (!strncmp(oem, "UNISYS", 6))
+                        return parse_unisys_oem((char *)oem_table);
+        }
+        return 0;
+}
+#ifdef CONFIG_ACPI
+/* Hook from generic ACPI tables.c */
+int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
+{
+        unsigned long oem_addr;
+        if (!find_unisys_acpi_oem_table(&oem_addr)) {
+                if (es7000_check_dsdt())
+                        return parse_unisys_oem((char *)oem_addr);
+                else {
+                        setup_unisys();
+                        return 1;
+                }
+        }
+        return 0;
+}
+#else
+int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
+{
+        return 0;
+}
+#endif
+#endif /* COFIG_X86_GENERICARCH */
 static void
 es7000_spin(int n)
 {
diff --git a/arch/i386/mach-visws/traps.c b/arch/i386/mach-visws/traps.c
index 5199bd0325..843b67acf4 100644
--- a/arch/i386/mach-visws/traps.c
+++ b/arch/i386/mach-visws/traps.c
@@ -23,13 +23,13 @@ static __init void lithium_init(void)
        set_fixmap(FIX_LI_PCIB, LI_PCI_B_PHYS);
        if ((li_pcia_read16(PCI_VENDOR_ID) != PCI_VENDOR_ID_SGI) ||
-            (li_pcia_read16(PCI_DEVICE_ID) != PCI_VENDOR_ID_SGI_LITHIUM)) {
+            (li_pcia_read16(PCI_DEVICE_ID) != PCI_DEVICE_ID_SGI_LITHIUM)) {
                printk(KERN_EMERG "Lithium hostbridge %c not found\n", 'A');
                panic("This machine is not SGI Visual Workstation 320/540");
        }
        if ((li_pcib_read16(PCI_VENDOR_ID) != PCI_VENDOR_ID_SGI) ||
-            (li_pcib_read16(PCI_DEVICE_ID) != PCI_VENDOR_ID_SGI_LITHIUM)) {
+            (li_pcib_read16(PCI_DEVICE_ID) != PCI_DEVICE_ID_SGI_LITHIUM)) {
                printk(KERN_EMERG "Lithium hostbridge %c not found\n", 'B');
                panic("This machine is not SGI Visual Workstation 320/540");
        }
diff --git a/arch/i386/mach-voyager/voyager_thread.c b/arch/i386/mach-voyager/voyager_thread.c
index b4b24e0e45..f9d5953381 100644
--- a/arch/i386/mach-voyager/voyager_thread.c
+++ b/arch/i386/mach-voyager/voyager_thread.c
@@ -52,7 +52,7 @@ execute(const char *string)
                NULL,
        };
-        if ((ret = call_usermodehelper(argv[0], argv, envp, 1)) != 0) {
+        if ((ret = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC)) != 0) {
                printk(KERN_ERR "Voyager failed to run \"%s\": %i\n",
                       string, ret);
        }
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index 7135946d36..6a68b1ae06 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -87,7 +87,7 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
        if (!(pmd_val(*pmd) & _PAGE_PRESENT)) {
                pte_t *page_table = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
-                paravirt_alloc_pt(__pa(page_table) >> PAGE_SHIFT);
+                paravirt_alloc_pt(&init_mm, __pa(page_table) >> PAGE_SHIFT);
                set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
                BUG_ON(page_table != pte_offset_kernel(pmd, 0));
        }
@@ -473,6 +473,7 @@ void zap_low_mappings (void)
 static int disable_nx __initdata = 0;
 u64 __supported_pte_mask __read_mostly = ~_PAGE_NX;
+EXPORT_SYMBOL_GPL(__supported_pte_mask);
 /*
 * noexec = on|off
diff --git a/arch/i386/mm/pageattr.c b/arch/i386/mm/pageattr.c
index 2eb14a73be..37992ffb16 100644
--- a/arch/i386/mm/pageattr.c
+++ b/arch/i386/mm/pageattr.c
@@ -60,7 +60,7 @@ static struct page *split_large_page(unsigned long address, pgprot_t prot,
        address = __pa(address);
        addr = address & LARGE_PAGE_MASK; 
        pbase = (pte_t *)page_address(base);
-        paravirt_alloc_pt(page_to_pfn(base));
+        paravirt_alloc_pt(&init_mm, page_to_pfn(base));
        for (i = 0; i < PTRS_PER_PTE; i++, addr += PAGE_SIZE) {
               set_pte(&pbase[i], pfn_pte(addr >> PAGE_SHIFT,
                                          addr == address ? prot : ref_prot));
diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c
index b95b42950e..e7306dbf6c 100644
--- a/arch/i386/pci/fixup.c
+++ b/arch/i386/pci/fixup.c
@@ -118,12 +118,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3, pci
 static void pci_fixup_via_northbridge_bug(struct pci_dev *d)
 {
        u8 v;
-        u8 revision;
        int where = 0x55;
        int mask = 0x1f; /* clear bits 5, 6, 7 by default */
-        pci_read_config_byte(d, PCI_REVISION_ID, &revision);
        if (d->device == PCI_DEVICE_ID_VIA_8367_0) {
                /* fix pci bus latency issues resulted by NB bios error
                   it appears on bug free^Wreduced kt266x's bios forces
@@ -133,8 +130,8 @@ static void pci_fixup_via_northbridge_bug(struct pci_dev *d)
                where = 0x95; /* the memory write queue timer register is 
                                different for the KT266x's: 0x95 not 0x55 */
        } else if (d->device == PCI_DEVICE_ID_VIA_8363_0 &&
-                        (revision == VIA_8363_KL133_REVISION_ID || 
+                        (d->revision == VIA_8363_KL133_REVISION_ID ||
-                        revision == VIA_8363_KM133_REVISION_ID)) {
+                        d->revision == VIA_8363_KM133_REVISION_ID)) {
                        mask = 0x3f; /* clear only bits 6 and 7; clearing bit 5
                                        causes screen corruption on the KL133/KM133 */
        }
@@ -142,7 +139,7 @@ static void pci_fixup_via_northbridge_bug(struct pci_dev *d)
        pci_read_config_byte(d, where, &v);
        if (v & ~mask) {
                printk(KERN_WARNING "Disabling VIA memory write queue (PCI ID %04x, rev %02x): [%02x] %02x & %02x -> %02x\n", \
-                        d->device, revision, where, v, mask, v & mask);
+                        d->device, d->revision, where, v, mask, v & mask);
                v &= mask;
                pci_write_config_byte(d, where, v);
        }
diff --git a/arch/i386/video/Makefile b/arch/i386/video/Makefile
new file mode 100644
index 0000000000..2c447c94ad
--- /dev/null
+++ b/arch/i386/video/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_FB)               += fbdev.o
diff --git a/arch/i386/video/fbdev.c b/arch/i386/video/fbdev.c
new file mode 100644
index 0000000000..48fb38d7d2
--- /dev/null
+++ b/arch/i386/video/fbdev.c
@@ -0,0 +1,32 @@
+/*
+ * arch/i386/video/fbdev.c - i386 Framebuffer
+ *
+ * Copyright (C) 2007 Antonino Daplas <adaplas@gmail.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive
+ * for more details.
+ *
+ */
+#include <linux/fb.h>
+#include <linux/pci.h>
+int fb_is_primary_device(struct fb_info *info)
+{
+        struct device *device = info->device;
+        struct pci_dev *pci_dev = NULL;
+        struct resource *res = NULL;
+        int retval = 0;
+        if (device)
+                pci_dev = to_pci_dev(device);
+        if (pci_dev)
+                res = &pci_dev->resource[PCI_ROM_RESOURCE];
+        if (res && res->flags & IORESOURCE_ROM_SHADOW)
+                retval = 1;
+        return retval;
+}
+EXPORT_SYMBOL(fb_is_primary_device);
diff --git a/arch/i386/xen/Kconfig b/arch/i386/xen/Kconfig
new file mode 100644
index 0000000000..9df99e1885
--- /dev/null
+++ b/arch/i386/xen/Kconfig
@@ -0,0 +1,11 @@
+#
+# This Kconfig describes xen options
+#
+config XEN
+        bool "Enable support for Xen hypervisor"
+        depends on PARAVIRT && X86_CMPXCHG && X86_TSC && !NEED_MULTIPLE_NODES
+        help
+          This is the Linux Xen port.  Enabling this will allow the
+          kernel to boot in a paravirtualized environment under the
+          Xen hypervisor.
diff --git a/arch/i386/xen/Makefile b/arch/i386/xen/Makefile
new file mode 100644
index 0000000000..343df246bd
--- /dev/null
+++ b/arch/i386/xen/Makefile
@@ -0,0 +1,4 @@
+obj-y           := enlighten.o setup.o features.o multicalls.o mmu.o \
+                        events.o time.o manage.o xen-asm.o
+obj-$(CONFIG_SMP)       += smp.o
diff --git a/arch/i386/xen/enlighten.c b/arch/i386/xen/enlighten.c
new file mode 100644
index 0000000000..9a8c1181c0
--- /dev/null
+++ b/arch/i386/xen/enlighten.c
@@ -0,0 +1,1144 @@
+/*
+ * Core of Xen paravirt_ops implementation.
+ *
+ * This file contains the xen_paravirt_ops structure itself, and the
+ * implementations for:
+ * - privileged instructions
+ * - interrupt flags
+ * - segment operations
+ * - booting and setup
+ *
+ * Jeremy Fitzhardinge <jeremy@xensource.com>, XenSource Inc, 2007
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/smp.h>
+#include <linux/preempt.h>
+#include <linux/hardirq.h>
+#include <linux/percpu.h>
+#include <linux/delay.h>
+#include <linux/start_kernel.h>
+#include <linux/sched.h>
+#include <linux/bootmem.h>
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <linux/page-flags.h>
+#include <linux/highmem.h>
+#include <linux/smp.h>
+#include <xen/interface/xen.h>
+#include <xen/interface/physdev.h>
+#include <xen/interface/vcpu.h>
+#include <xen/interface/sched.h>
+#include <xen/features.h>
+#include <xen/page.h>
+#include <asm/paravirt.h>
+#include <asm/page.h>
+#include <asm/xen/hypercall.h>
+#include <asm/xen/hypervisor.h>
+#include <asm/fixmap.h>
+#include <asm/processor.h>
+#include <asm/setup.h>
+#include <asm/desc.h>
+#include <asm/pgtable.h>
+#include <asm/tlbflush.h>
+#include <asm/reboot.h>
+#include "xen-ops.h"
+#include "mmu.h"
+#include "multicalls.h"
+EXPORT_SYMBOL_GPL(hypercall_page);
+DEFINE_PER_CPU(enum paravirt_lazy_mode, xen_lazy_mode);
+DEFINE_PER_CPU(struct vcpu_info *, xen_vcpu);
+DEFINE_PER_CPU(struct vcpu_info, xen_vcpu_info);
+DEFINE_PER_CPU(unsigned long, xen_cr3);
+struct start_info *xen_start_info;
+EXPORT_SYMBOL_GPL(xen_start_info);
+static /* __initdata */ struct shared_info dummy_shared_info;
+/*
+ * Point at some empty memory to start with. We map the real shared_info
+ * page as soon as fixmap is up and running.
+ */
+struct shared_info *HYPERVISOR_shared_info = (void *)&dummy_shared_info;
+/*
+ * Flag to determine whether vcpu info placement is available on all
+ * VCPUs.  We assume it is to start with, and then set it to zero on
+ * the first failure.  This is because it can succeed on some VCPUs
+ * and not others, since it can involve hypervisor memory allocation,
+ * or because the guest failed to guarantee all the appropriate
+ * constraints on all VCPUs (ie buffer can't cross a page boundary).
+ *
+ * Note that any particular CPU may be using a placed vcpu structure,
+ * but we can only optimise if the all are.
+ *
+ * 0: not available, 1: available
+ */
+static int have_vcpu_info_placement = 1;
+static void __init xen_vcpu_setup(int cpu)
+{
+        struct vcpu_register_vcpu_info info;
+        int err;
+        struct vcpu_info *vcpup;
+        per_cpu(xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu];
+        if (!have_vcpu_info_placement)
+                return;         /* already tested, not available */
+        vcpup = &per_cpu(xen_vcpu_info, cpu);
+        info.mfn = virt_to_mfn(vcpup);
+        info.offset = offset_in_page(vcpup);
+        printk(KERN_DEBUG "trying to map vcpu_info %d at %p, mfn %x, offset %d\n",
+               cpu, vcpup, info.mfn, info.offset);
+        /* Check to see if the hypervisor will put the vcpu_info
+           structure where we want it, which allows direct access via
+           a percpu-variable. */
+        err = HYPERVISOR_vcpu_op(VCPUOP_register_vcpu_info, cpu, &info);
+        if (err) {
+                printk(KERN_DEBUG "register_vcpu_info failed: err=%d\n", err);
+                have_vcpu_info_placement = 0;
+        } else {
+                /* This cpu is using the registered vcpu info, even if
+                   later ones fail to. */
+                per_cpu(xen_vcpu, cpu) = vcpup;
+                printk(KERN_DEBUG "cpu %d using vcpu_info at %p\n",
+                       cpu, vcpup);
+        }
+}
+static void __init xen_banner(void)
+{
+        printk(KERN_INFO "Booting paravirtualized kernel on %s\n",
+               paravirt_ops.name);
+        printk(KERN_INFO "Hypervisor signature: %s\n", xen_start_info->magic);
+}
+static void xen_cpuid(unsigned int *eax, unsigned int *ebx,
+                      unsigned int *ecx, unsigned int *edx)
+{
+        unsigned maskedx = ~0;
+        /*
+         * Mask out inconvenient features, to try and disable as many
+         * unsupported kernel subsystems as possible.
+         */
+        if (*eax == 1)
+                maskedx = ~((1 << X86_FEATURE_APIC) |  /* disable APIC */
+                            (1 << X86_FEATURE_ACPI) |  /* disable ACPI */
+                            (1 << X86_FEATURE_ACC));   /* thermal monitoring */
+        asm(XEN_EMULATE_PREFIX "cpuid"
+                : "=a" (*eax),
+                  "=b" (*ebx),
+                  "=c" (*ecx),
+                  "=d" (*edx)
+                : "0" (*eax), "2" (*ecx));
+        *edx &= maskedx;
+}
+static void xen_set_debugreg(int reg, unsigned long val)
+{
+        HYPERVISOR_set_debugreg(reg, val);
+}
+static unsigned long xen_get_debugreg(int reg)
+{
+        return HYPERVISOR_get_debugreg(reg);
+}
+static unsigned long xen_save_fl(void)
+{
+        struct vcpu_info *vcpu;
+        unsigned long flags;
+        vcpu = x86_read_percpu(xen_vcpu);
+        /* flag has opposite sense of mask */
+        flags = !vcpu->evtchn_upcall_mask;
+        /* convert to IF type flag
+           -0 -> 0x00000000
+           -1 -> 0xffffffff
+        */
+        return (-flags) & X86_EFLAGS_IF;
+}
+static void xen_restore_fl(unsigned long flags)
+{
+        struct vcpu_info *vcpu;
+        /* convert from IF type flag */
+        flags = !(flags & X86_EFLAGS_IF);
+        /* There's a one instruction preempt window here.  We need to
+           make sure we're don't switch CPUs between getting the vcpu
+           pointer and updating the mask. */
+        preempt_disable();
+        vcpu = x86_read_percpu(xen_vcpu);
+        vcpu->evtchn_upcall_mask = flags;
+        preempt_enable_no_resched();
+        /* Doesn't matter if we get preempted here, because any
+           pending event will get dealt with anyway. */
+        if (flags == 0) {
+                preempt_check_resched();
+                barrier(); /* unmask then check (avoid races) */
+                if (unlikely(vcpu->evtchn_upcall_pending))
+                        force_evtchn_callback();
+        }
+}
+static void xen_irq_disable(void)
+{
+        /* There's a one instruction preempt window here.  We need to
+           make sure we're don't switch CPUs between getting the vcpu
+           pointer and updating the mask. */
+        preempt_disable();
+        x86_read_percpu(xen_vcpu)->evtchn_upcall_mask = 1;
+        preempt_enable_no_resched();
+}
+static void xen_irq_enable(void)
+{
+        struct vcpu_info *vcpu;
+        /* There's a one instruction preempt window here.  We need to
+           make sure we're don't switch CPUs between getting the vcpu
+           pointer and updating the mask. */
+        preempt_disable();
+        vcpu = x86_read_percpu(xen_vcpu);
+        vcpu->evtchn_upcall_mask = 0;
+        preempt_enable_no_resched();
+        /* Doesn't matter if we get preempted here, because any
+           pending event will get dealt with anyway. */
+        barrier(); /* unmask then check (avoid races) */
+        if (unlikely(vcpu->evtchn_upcall_pending))
+                force_evtchn_callback();
+}
+static void xen_safe_halt(void)
+{
+        /* Blocking includes an implicit local_irq_enable(). */
+        if (HYPERVISOR_sched_op(SCHEDOP_block, 0) != 0)
+                BUG();
+}
+static void xen_halt(void)
+{
+        if (irqs_disabled())
+                HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL);
+        else
+                xen_safe_halt();
+}
+static void xen_set_lazy_mode(enum paravirt_lazy_mode mode)
+{
+        BUG_ON(preemptible());
+        switch (mode) {
+        case PARAVIRT_LAZY_NONE:
+                BUG_ON(x86_read_percpu(xen_lazy_mode) == PARAVIRT_LAZY_NONE);
+                break;
+        case PARAVIRT_LAZY_MMU:
+        case PARAVIRT_LAZY_CPU:
+                BUG_ON(x86_read_percpu(xen_lazy_mode) != PARAVIRT_LAZY_NONE);
+                break;
+        case PARAVIRT_LAZY_FLUSH:
+                /* flush if necessary, but don't change state */
+                if (x86_read_percpu(xen_lazy_mode) != PARAVIRT_LAZY_NONE)
+                        xen_mc_flush();
+                return;
+        }
+        xen_mc_flush();
+        x86_write_percpu(xen_lazy_mode, mode);
+}
+static unsigned long xen_store_tr(void)
+{
+        return 0;
+}
+static void xen_set_ldt(const void *addr, unsigned entries)
+{
+        unsigned long linear_addr = (unsigned long)addr;
+        struct mmuext_op *op;
+        struct multicall_space mcs = xen_mc_entry(sizeof(*op));
+        op = mcs.args;
+        op->cmd = MMUEXT_SET_LDT;
+        if (linear_addr) {
+                /* ldt my be vmalloced, use arbitrary_virt_to_machine */
+                xmaddr_t maddr;
+                maddr = arbitrary_virt_to_machine((unsigned long)addr);
+                linear_addr = (unsigned long)maddr.maddr;
+        }
+        op->arg1.linear_addr = linear_addr;
+        op->arg2.nr_ents = entries;
+        MULTI_mmuext_op(mcs.mc, op, 1, NULL, DOMID_SELF);
+        xen_mc_issue(PARAVIRT_LAZY_CPU);
+}
+static void xen_load_gdt(const struct Xgt_desc_struct *dtr)
+{
+        unsigned long *frames;
+        unsigned long va = dtr->address;
+        unsigned int size = dtr->size + 1;
+        unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
+        int f;
+        struct multicall_space mcs;
+        /* A GDT can be up to 64k in size, which corresponds to 8192
+           8-byte entries, or 16 4k pages.. */
+        BUG_ON(size > 65536);
+        BUG_ON(va & ~PAGE_MASK);
+        mcs = xen_mc_entry(sizeof(*frames) * pages);
+        frames = mcs.args;
+        for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
+                frames[f] = virt_to_mfn(va);
+                make_lowmem_page_readonly((void *)va);
+        }
+        MULTI_set_gdt(mcs.mc, frames, size / sizeof(struct desc_struct));
+        xen_mc_issue(PARAVIRT_LAZY_CPU);
+}
+static void load_TLS_descriptor(struct thread_struct *t,
+                                unsigned int cpu, unsigned int i)
+{
+        struct desc_struct *gdt = get_cpu_gdt_table(cpu);
+        xmaddr_t maddr = virt_to_machine(&gdt[GDT_ENTRY_TLS_MIN+i]);
+        struct multicall_space mc = __xen_mc_entry(0);
+        MULTI_update_descriptor(mc.mc, maddr.maddr, t->tls_array[i]);
+}
+static void xen_load_tls(struct thread_struct *t, unsigned int cpu)
+{
+        xen_mc_batch();
+        load_TLS_descriptor(t, cpu, 0);
+        load_TLS_descriptor(t, cpu, 1);
+        load_TLS_descriptor(t, cpu, 2);
+        xen_mc_issue(PARAVIRT_LAZY_CPU);
+        /*
+         * XXX sleazy hack: If we're being called in a lazy-cpu zone,
+         * it means we're in a context switch, and %gs has just been
+         * saved.  This means we can zero it out to prevent faults on
+         * exit from the hypervisor if the next process has no %gs.
+         * Either way, it has been saved, and the new value will get
+         * loaded properly.  This will go away as soon as Xen has been
+         * modified to not save/restore %gs for normal hypercalls.
+         */
+        if (xen_get_lazy_mode() == PARAVIRT_LAZY_CPU)
+                loadsegment(gs, 0);
+}
+static void xen_write_ldt_entry(struct desc_struct *dt, int entrynum,
+                                u32 low, u32 high)
+{
+        unsigned long lp = (unsigned long)&dt[entrynum];
+        xmaddr_t mach_lp = virt_to_machine(lp);
+        u64 entry = (u64)high << 32 | low;
+        preempt_disable();
+        xen_mc_flush();
+        if (HYPERVISOR_update_descriptor(mach_lp.maddr, entry))
+                BUG();
+        preempt_enable();
+}
+static int cvt_gate_to_trap(int vector, u32 low, u32 high,
+                            struct trap_info *info)
+{
+        u8 type, dpl;
+        type = (high >> 8) & 0x1f;
+        dpl = (high >> 13) & 3;
+        if (type != 0xf && type != 0xe)
+                return 0;
+        info->vector = vector;
+        info->address = (high & 0xffff0000) | (low & 0x0000ffff);
+        info->cs = low >> 16;
+        info->flags = dpl;
+        /* interrupt gates clear IF */
+        if (type == 0xe)
+                info->flags |= 4;
+        return 1;
+}
+/* Locations of each CPU's IDT */
+static DEFINE_PER_CPU(struct Xgt_desc_struct, idt_desc);
+/* Set an IDT entry.  If the entry is part of the current IDT, then
+   also update Xen. */
+static void xen_write_idt_entry(struct desc_struct *dt, int entrynum,
+                                u32 low, u32 high)
+{
+        unsigned long p = (unsigned long)&dt[entrynum];
+        unsigned long start, end;
+        preempt_disable();
+        start = __get_cpu_var(idt_desc).address;
+        end = start + __get_cpu_var(idt_desc).size + 1;
+        xen_mc_flush();
+        write_dt_entry(dt, entrynum, low, high);
+        if (p >= start && (p + 8) <= end) {
+                struct trap_info info[2];
+                info[1].address = 0;
+                if (cvt_gate_to_trap(entrynum, low, high, &info[0]))
+                        if (HYPERVISOR_set_trap_table(info))
+                                BUG();
+        }
+        preempt_enable();
+}
+static void xen_convert_trap_info(const struct Xgt_desc_struct *desc,
+                                  struct trap_info *traps)
+{
+        unsigned in, out, count;
+        count = (desc->size+1) / 8;
+        BUG_ON(count > 256);
+        for (in = out = 0; in < count; in++) {
+                const u32 *entry = (u32 *)(desc->address + in * 8);
+                if (cvt_gate_to_trap(in, entry[0], entry[1], &traps[out]))
+                        out++;
+        }
+        traps[out].address = 0;
+}
+void xen_copy_trap_info(struct trap_info *traps)
+{
+        const struct Xgt_desc_struct *desc = &__get_cpu_var(idt_desc);
+        xen_convert_trap_info(desc, traps);
+}
+/* Load a new IDT into Xen.  In principle this can be per-CPU, so we
+   hold a spinlock to protect the static traps[] array (static because
+   it avoids allocation, and saves stack space). */
+static void xen_load_idt(const struct Xgt_desc_struct *desc)
+{
+        static DEFINE_SPINLOCK(lock);
+        static struct trap_info traps[257];
+        spin_lock(&lock);
+        __get_cpu_var(idt_desc) = *desc;
+        xen_convert_trap_info(desc, traps);
+        xen_mc_flush();
+        if (HYPERVISOR_set_trap_table(traps))
+                BUG();
+        spin_unlock(&lock);
+}
+/* Write a GDT descriptor entry.  Ignore LDT descriptors, since
+   they're handled differently. */
+static void xen_write_gdt_entry(struct desc_struct *dt, int entry,
+                                u32 low, u32 high)
+{
+        preempt_disable();
+        switch ((high >> 8) & 0xff) {
+        case DESCTYPE_LDT:
+        case DESCTYPE_TSS:
+                /* ignore */
+                break;
+        default: {
+                xmaddr_t maddr = virt_to_machine(&dt[entry]);
+                u64 desc = (u64)high << 32 | low;
+                xen_mc_flush();
+                if (HYPERVISOR_update_descriptor(maddr.maddr, desc))
+                        BUG();
+        }
+        }
+        preempt_enable();
+}
+static void xen_load_esp0(struct tss_struct *tss,
+                          struct thread_struct *thread)
+{
+        struct multicall_space mcs = xen_mc_entry(0);
+        MULTI_stack_switch(mcs.mc, __KERNEL_DS, thread->esp0);
+        xen_mc_issue(PARAVIRT_LAZY_CPU);
+}
+static void xen_set_iopl_mask(unsigned mask)
+{
+        struct physdev_set_iopl set_iopl;
+        /* Force the change at ring 0. */
+        set_iopl.iopl = (mask == 0) ? 1 : (mask >> 12) & 3;
+        HYPERVISOR_physdev_op(PHYSDEVOP_set_iopl, &set_iopl);
+}
+static void xen_io_delay(void)
+{
+}
+#ifdef CONFIG_X86_LOCAL_APIC
+static unsigned long xen_apic_read(unsigned long reg)
+{
+        return 0;
+}
+static void xen_apic_write(unsigned long reg, unsigned long val)
+{
+        /* Warn to see if there's any stray references */
+        WARN_ON(1);
+}
+#endif
+static void xen_flush_tlb(void)
+{
+        struct mmuext_op *op;
+        struct multicall_space mcs = xen_mc_entry(sizeof(*op));
+        op = mcs.args;
+        op->cmd = MMUEXT_TLB_FLUSH_LOCAL;
+        MULTI_mmuext_op(mcs.mc, op, 1, NULL, DOMID_SELF);
+        xen_mc_issue(PARAVIRT_LAZY_MMU);
+}
+static void xen_flush_tlb_single(unsigned long addr)
+{
+        struct mmuext_op *op;
+        struct multicall_space mcs = xen_mc_entry(sizeof(*op));
+        op = mcs.args;
+        op->cmd = MMUEXT_INVLPG_LOCAL;
+        op->arg1.linear_addr = addr & PAGE_MASK;
+        MULTI_mmuext_op(mcs.mc, op, 1, NULL, DOMID_SELF);
+        xen_mc_issue(PARAVIRT_LAZY_MMU);
+}
+static void xen_flush_tlb_others(const cpumask_t *cpus, struct mm_struct *mm,
+                                 unsigned long va)
+{
+        struct {
+                struct mmuext_op op;
+                cpumask_t mask;
+        } *args;
+        cpumask_t cpumask = *cpus;
+        struct multicall_space mcs;
+        /*
+         * A couple of (to be removed) sanity checks:
+         *
+         * - current CPU must not be in mask
+         * - mask must exist :)
+         */
+        BUG_ON(cpus_empty(cpumask));
+        BUG_ON(cpu_isset(smp_processor_id(), cpumask));
+        BUG_ON(!mm);
+        /* If a CPU which we ran on has gone down, OK. */
+        cpus_and(cpumask, cpumask, cpu_online_map);
+        if (cpus_empty(cpumask))
+                return;
+        mcs = xen_mc_entry(sizeof(*args));
+        args = mcs.args;
+        args->mask = cpumask;
+        args->op.arg2.vcpumask = &args->mask;
+        if (va == TLB_FLUSH_ALL) {
+                args->op.cmd = MMUEXT_TLB_FLUSH_MULTI;
+        } else {
+                args->op.cmd = MMUEXT_INVLPG_MULTI;
+                args->op.arg1.linear_addr = va;
+        }
+        MULTI_mmuext_op(mcs.mc, &args->op, 1, NULL, DOMID_SELF);
+        xen_mc_issue(PARAVIRT_LAZY_MMU);
+}
+static void xen_write_cr2(unsigned long cr2)
+{
+        x86_read_percpu(xen_vcpu)->arch.cr2 = cr2;
+}
+static unsigned long xen_read_cr2(void)
+{
+        return x86_read_percpu(xen_vcpu)->arch.cr2;
+}
+static unsigned long xen_read_cr2_direct(void)
+{
+        return x86_read_percpu(xen_vcpu_info.arch.cr2);
+}
+static void xen_write_cr4(unsigned long cr4)
+{
+        /* never allow TSC to be disabled */
+        native_write_cr4(cr4 & ~X86_CR4_TSD);
+}
+static unsigned long xen_read_cr3(void)
+{
+        return x86_read_percpu(xen_cr3);
+}
+static void xen_write_cr3(unsigned long cr3)
+{
+        BUG_ON(preemptible());
+        if (cr3 == x86_read_percpu(xen_cr3)) {
+                /* just a simple tlb flush */
+                xen_flush_tlb();
+                return;
+        }
+        x86_write_percpu(xen_cr3, cr3);
+        {
+                struct mmuext_op *op;
+                struct multicall_space mcs = xen_mc_entry(sizeof(*op));
+                unsigned long mfn = pfn_to_mfn(PFN_DOWN(cr3));
+                op = mcs.args;
+                op->cmd = MMUEXT_NEW_BASEPTR;
+                op->arg1.mfn = mfn;
+                MULTI_mmuext_op(mcs.mc, op, 1, NULL, DOMID_SELF);
+                xen_mc_issue(PARAVIRT_LAZY_CPU);
+        }
+}
+/* Early in boot, while setting up the initial pagetable, assume
+   everything is pinned. */
+static __init void xen_alloc_pt_init(struct mm_struct *mm, u32 pfn)
+{
+        BUG_ON(mem_map);        /* should only be used early */
+        make_lowmem_page_readonly(__va(PFN_PHYS(pfn)));
+}
+/* This needs to make sure the new pte page is pinned iff its being
+   attached to a pinned pagetable. */
+static void xen_alloc_pt(struct mm_struct *mm, u32 pfn)
+{
+        struct page *page = pfn_to_page(pfn);
+        if (PagePinned(virt_to_page(mm->pgd))) {
+                SetPagePinned(page);
+                if (!PageHighMem(page))
+                        make_lowmem_page_readonly(__va(PFN_PHYS(pfn)));
+                else
+                        /* make sure there are no stray mappings of
+                           this page */
+                        kmap_flush_unused();
+        }
+}
+/* This should never happen until we're OK to use struct page */
+static void xen_release_pt(u32 pfn)
+{
+        struct page *page = pfn_to_page(pfn);
+        if (PagePinned(page)) {
+                if (!PageHighMem(page))
+                        make_lowmem_page_readwrite(__va(PFN_PHYS(pfn)));
+        }
+}
+#ifdef CONFIG_HIGHPTE
+static void *xen_kmap_atomic_pte(struct page *page, enum km_type type)
+{
+        pgprot_t prot = PAGE_KERNEL;
+        if (PagePinned(page))
+                prot = PAGE_KERNEL_RO;
+        if (0 && PageHighMem(page))
+                printk("mapping highpte %lx type %d prot %s\n",
+                       page_to_pfn(page), type,
+                       (unsigned long)pgprot_val(prot) & _PAGE_RW ? "WRITE" : "READ");
+        return kmap_atomic_prot(page, type, prot);
+}
+#endif
+static __init pte_t mask_rw_pte(pte_t *ptep, pte_t pte)
+{
+        /* If there's an existing pte, then don't allow _PAGE_RW to be set */
+        if (pte_val_ma(*ptep) & _PAGE_PRESENT)
+                pte = __pte_ma(((pte_val_ma(*ptep) & _PAGE_RW) | ~_PAGE_RW) &
+                               pte_val_ma(pte));
+        return pte;
+}
+/* Init-time set_pte while constructing initial pagetables, which
+   doesn't allow RO pagetable pages to be remapped RW */
+static __init void xen_set_pte_init(pte_t *ptep, pte_t pte)
+{
+        pte = mask_rw_pte(ptep, pte);
+        xen_set_pte(ptep, pte);
+}
+static __init void xen_pagetable_setup_start(pgd_t *base)
+{
+        pgd_t *xen_pgd = (pgd_t *)xen_start_info->pt_base;
+        /* special set_pte for pagetable initialization */
+        paravirt_ops.set_pte = xen_set_pte_init;
+        init_mm.pgd = base;
+        /*
+         * copy top-level of Xen-supplied pagetable into place.  For
+         * !PAE we can use this as-is, but for PAE it is a stand-in
+         * while we copy the pmd pages.
+         */
+        memcpy(base, xen_pgd, PTRS_PER_PGD * sizeof(pgd_t));
+        if (PTRS_PER_PMD > 1) {
+                int i;
+                /*
+                 * For PAE, need to allocate new pmds, rather than
+                 * share Xen's, since Xen doesn't like pmd's being
+                 * shared between address spaces.
+                 */
+                for (i = 0; i < PTRS_PER_PGD; i++) {
+                        if (pgd_val_ma(xen_pgd[i]) & _PAGE_PRESENT) {
+                                pmd_t *pmd = (pmd_t *)alloc_bootmem_low_pages(PAGE_SIZE);
+                                memcpy(pmd, (void *)pgd_page_vaddr(xen_pgd[i]),
+                                       PAGE_SIZE);
+                                make_lowmem_page_readonly(pmd);
+                                set_pgd(&base[i], __pgd(1 + __pa(pmd)));
+                        } else
+                                pgd_clear(&base[i]);
+                }
+        }
+        /* make sure zero_page is mapped RO so we can use it in pagetables */
+        make_lowmem_page_readonly(empty_zero_page);
+        make_lowmem_page_readonly(base);
+        /*
+         * Switch to new pagetable.  This is done before
+         * pagetable_init has done anything so that the new pages
+         * added to the table can be prepared properly for Xen.
+         */
+        xen_write_cr3(__pa(base));
+}
+static __init void xen_pagetable_setup_done(pgd_t *base)
+{
+        /* This will work as long as patching hasn't happened yet
+           (which it hasn't) */
+        paravirt_ops.alloc_pt = xen_alloc_pt;
+        paravirt_ops.set_pte = xen_set_pte;
+        if (!xen_feature(XENFEAT_auto_translated_physmap)) {
+                /*
+                 * Create a mapping for the shared info page.
+                 * Should be set_fixmap(), but shared_info is a machine
+                 * address with no corresponding pseudo-phys address.
+                 */
+                set_pte_mfn(fix_to_virt(FIX_PARAVIRT_BOOTMAP),
+                            PFN_DOWN(xen_start_info->shared_info),
+                            PAGE_KERNEL);
+                HYPERVISOR_shared_info =
+                        (struct shared_info *)fix_to_virt(FIX_PARAVIRT_BOOTMAP);
+        } else
+                HYPERVISOR_shared_info =
+                        (struct shared_info *)__va(xen_start_info->shared_info);
+        /* Actually pin the pagetable down, but we can't set PG_pinned
+           yet because the page structures don't exist yet. */
+        {
+                struct mmuext_op op;
+#ifdef CONFIG_X86_PAE
+                op.cmd = MMUEXT_PIN_L3_TABLE;
+#else
+                op.cmd = MMUEXT_PIN_L3_TABLE;
+#endif
+                op.arg1.mfn = pfn_to_mfn(PFN_DOWN(__pa(base)));
+                if (HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF))
+                        BUG();
+        }
+}
+/* This is called once we have the cpu_possible_map */
+void __init xen_setup_vcpu_info_placement(void)
+{
+        int cpu;
+        for_each_possible_cpu(cpu)
+                xen_vcpu_setup(cpu);
+        /* xen_vcpu_setup managed to place the vcpu_info within the
+           percpu area for all cpus, so make use of it */
+        if (have_vcpu_info_placement) {
+                printk(KERN_INFO "Xen: using vcpu_info placement\n");
+                paravirt_ops.save_fl = xen_save_fl_direct;
+                paravirt_ops.restore_fl = xen_restore_fl_direct;
+                paravirt_ops.irq_disable = xen_irq_disable_direct;
+                paravirt_ops.irq_enable = xen_irq_enable_direct;
+                paravirt_ops.read_cr2 = xen_read_cr2_direct;
+                paravirt_ops.iret = xen_iret_direct;
+        }
+}
+static unsigned xen_patch(u8 type, u16 clobbers, void *insns, unsigned len)
+{
+        char *start, *end, *reloc;
+        unsigned ret;
+        start = end = reloc = NULL;
+#define SITE(x)                                                         \
+        case PARAVIRT_PATCH(x):                                         \
+        if (have_vcpu_info_placement) {                                 \
+                start = (char *)xen_##x##_direct;                       \
+                end = xen_##x##_direct_end;                             \
+                reloc = xen_##x##_direct_reloc;                         \
+        }                                                               \
+        goto patch_site
+        switch (type) {
+                SITE(irq_enable);
+                SITE(irq_disable);
+                SITE(save_fl);
+                SITE(restore_fl);
+#undef SITE
+        patch_site:
+                if (start == NULL || (end-start) > len)
+                        goto default_patch;
+                ret = paravirt_patch_insns(insns, len, start, end);
+                /* Note: because reloc is assigned from something that
+                   appears to be an array, gcc assumes it's non-null,
+                   but doesn't know its relationship with start and
+                   end. */
+                if (reloc > start && reloc < end) {
+                        int reloc_off = reloc - start;
+                        long *relocp = (long *)(insns + reloc_off);
+                        long delta = start - (char *)insns;
+                        *relocp += delta;
+                }
+                break;
+        default_patch:
+        default:
+                ret = paravirt_patch_default(type, clobbers, insns, len);
+                break;
+        }
+        return ret;
+}
+static const struct paravirt_ops xen_paravirt_ops __initdata = {
+        .paravirt_enabled = 1,
+        .shared_kernel_pmd = 0,
+        .name = "Xen",
+        .banner = xen_banner,
+        .patch = xen_patch,
+        .memory_setup = xen_memory_setup,
+        .arch_setup = xen_arch_setup,
+        .init_IRQ = xen_init_IRQ,
+        .post_allocator_init = xen_mark_init_mm_pinned,
+        .time_init = xen_time_init,
+        .set_wallclock = xen_set_wallclock,
+        .get_wallclock = xen_get_wallclock,
+        .get_cpu_khz = xen_cpu_khz,
+        .sched_clock = xen_sched_clock,
+        .cpuid = xen_cpuid,
+        .set_debugreg = xen_set_debugreg,
+        .get_debugreg = xen_get_debugreg,
+        .clts = native_clts,
+        .read_cr0 = native_read_cr0,
+        .write_cr0 = native_write_cr0,
+        .read_cr2 = xen_read_cr2,
+        .write_cr2 = xen_write_cr2,
+        .read_cr3 = xen_read_cr3,
+        .write_cr3 = xen_write_cr3,
+        .read_cr4 = native_read_cr4,
+        .read_cr4_safe = native_read_cr4_safe,
+        .write_cr4 = xen_write_cr4,
+        .save_fl = xen_save_fl,
+        .restore_fl = xen_restore_fl,
+        .irq_disable = xen_irq_disable,
+        .irq_enable = xen_irq_enable,
+        .safe_halt = xen_safe_halt,
+        .halt = xen_halt,
+        .wbinvd = native_wbinvd,
+        .read_msr = native_read_msr_safe,
+        .write_msr = native_write_msr_safe,
+        .read_tsc = native_read_tsc,
+        .read_pmc = native_read_pmc,
+        .iret = (void *)&hypercall_page[__HYPERVISOR_iret],
+        .irq_enable_sysexit = NULL,  /* never called */
+        .load_tr_desc = paravirt_nop,
+        .set_ldt = xen_set_ldt,
+        .load_gdt = xen_load_gdt,
+        .load_idt = xen_load_idt,
+        .load_tls = xen_load_tls,
+        .store_gdt = native_store_gdt,
+        .store_idt = native_store_idt,
+        .store_tr = xen_store_tr,
+        .write_ldt_entry = xen_write_ldt_entry,
+        .write_gdt_entry = xen_write_gdt_entry,
+        .write_idt_entry = xen_write_idt_entry,
+        .load_esp0 = xen_load_esp0,
+        .set_iopl_mask = xen_set_iopl_mask,
+        .io_delay = xen_io_delay,
+#ifdef CONFIG_X86_LOCAL_APIC
+        .apic_write = xen_apic_write,
+        .apic_write_atomic = xen_apic_write,
+        .apic_read = xen_apic_read,
+        .setup_boot_clock = paravirt_nop,
+        .setup_secondary_clock = paravirt_nop,
+        .startup_ipi_hook = paravirt_nop,
+#endif
+        .flush_tlb_user = xen_flush_tlb,
+        .flush_tlb_kernel = xen_flush_tlb,
+        .flush_tlb_single = xen_flush_tlb_single,
+        .flush_tlb_others = xen_flush_tlb_others,
+        .pte_update = paravirt_nop,
+        .pte_update_defer = paravirt_nop,
+        .pagetable_setup_start = xen_pagetable_setup_start,
+        .pagetable_setup_done = xen_pagetable_setup_done,
+        .alloc_pt = xen_alloc_pt_init,
+        .release_pt = xen_release_pt,
+        .alloc_pd = paravirt_nop,
+        .alloc_pd_clone = paravirt_nop,
+        .release_pd = paravirt_nop,
+#ifdef CONFIG_HIGHPTE
+        .kmap_atomic_pte = xen_kmap_atomic_pte,
+#endif
+        .set_pte = NULL,        /* see xen_pagetable_setup_* */
+        .set_pte_at = xen_set_pte_at,
+        .set_pmd = xen_set_pmd,
+        .pte_val = xen_pte_val,
+        .pgd_val = xen_pgd_val,
+        .make_pte = xen_make_pte,
+        .make_pgd = xen_make_pgd,
+#ifdef CONFIG_X86_PAE
+        .set_pte_atomic = xen_set_pte_atomic,
+        .set_pte_present = xen_set_pte_at,
+        .set_pud = xen_set_pud,
+        .pte_clear = xen_pte_clear,
+        .pmd_clear = xen_pmd_clear,
+        .make_pmd = xen_make_pmd,
+        .pmd_val = xen_pmd_val,
+#endif  /* PAE */
+        .activate_mm = xen_activate_mm,
+        .dup_mmap = xen_dup_mmap,
+        .exit_mmap = xen_exit_mmap,
+        .set_lazy_mode = xen_set_lazy_mode,
+};
+#ifdef CONFIG_SMP
+static const struct smp_ops xen_smp_ops __initdata = {
+        .smp_prepare_boot_cpu = xen_smp_prepare_boot_cpu,
+        .smp_prepare_cpus = xen_smp_prepare_cpus,
+        .cpu_up = xen_cpu_up,
+        .smp_cpus_done = xen_smp_cpus_done,
+        .smp_send_stop = xen_smp_send_stop,
+        .smp_send_reschedule = xen_smp_send_reschedule,
+        .smp_call_function_mask = xen_smp_call_function_mask,
+};
+#endif  /* CONFIG_SMP */
+static void xen_reboot(int reason)
+{
+#ifdef CONFIG_SMP
+        smp_send_stop();
+#endif
+        if (HYPERVISOR_sched_op(SCHEDOP_shutdown, reason))
+                BUG();
+}
+static void xen_restart(char *msg)
+{
+        xen_reboot(SHUTDOWN_reboot);
+}
+static void xen_emergency_restart(void)
+{
+        xen_reboot(SHUTDOWN_reboot);
+}
+static void xen_machine_halt(void)
+{
+        xen_reboot(SHUTDOWN_poweroff);
+}
+static void xen_crash_shutdown(struct pt_regs *regs)
+{
+        xen_reboot(SHUTDOWN_crash);
+}
+static const struct machine_ops __initdata xen_machine_ops = {
+        .restart = xen_restart,
+        .halt = xen_machine_halt,
+        .power_off = xen_machine_halt,
+        .shutdown = xen_machine_halt,
+        .crash_shutdown = xen_crash_shutdown,
+        .emergency_restart = xen_emergency_restart,
+};
+/* First C function to be called on Xen boot */
+asmlinkage void __init xen_start_kernel(void)
+{
+        pgd_t *pgd;
+        if (!xen_start_info)
+                return;
+        BUG_ON(memcmp(xen_start_info->magic, "xen-3.0", 7) != 0);
+        /* Install Xen paravirt ops */
+        paravirt_ops = xen_paravirt_ops;
+        machine_ops = xen_machine_ops;
+#ifdef CONFIG_SMP
+        smp_ops = xen_smp_ops;
+#endif
+        xen_setup_features();
+        /* Get mfn list */
+        if (!xen_feature(XENFEAT_auto_translated_physmap))
+                phys_to_machine_mapping = (unsigned long *)xen_start_info->mfn_list;
+        pgd = (pgd_t *)xen_start_info->pt_base;
+        init_pg_tables_end = __pa(pgd) + xen_start_info->nr_pt_frames*PAGE_SIZE;
+        init_mm.pgd = pgd; /* use the Xen pagetables to start */
+        /* keep using Xen gdt for now; no urgent need to change it */
+        x86_write_percpu(xen_cr3, __pa(pgd));
+#ifdef CONFIG_SMP
+        /* Don't do the full vcpu_info placement stuff until we have a
+           possible map. */
+        per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0];
+#else
+        /* May as well do it now, since there's no good time to call
+           it later on UP. */
+        xen_setup_vcpu_info_placement();
+#endif
+        paravirt_ops.kernel_rpl = 1;
+        if (xen_feature(XENFEAT_supervisor_mode_kernel))
+                paravirt_ops.kernel_rpl = 0;
+        /* set the limit of our address space */
+        reserve_top_address(-HYPERVISOR_VIRT_START + 2 * PAGE_SIZE);
+        /* set up basic CPUID stuff */
+        cpu_detect(&new_cpu_data);
+        new_cpu_data.hard_math = 1;
+        new_cpu_data.x86_capability[0] = cpuid_edx(1);
+        /* Poke various useful things into boot_params */
+        LOADER_TYPE = (9 << 4) | 0;
+        INITRD_START = xen_start_info->mod_start ? __pa(xen_start_info->mod_start) : 0;
+        INITRD_SIZE = xen_start_info->mod_len;
+        /* Start the world */
+        start_kernel();
+}
diff --git a/arch/i386/xen/events.c b/arch/i386/xen/events.c
new file mode 100644
index 0000000000..8904acc20f
--- /dev/null
+++ b/arch/i386/xen/events.c
@@ -0,0 +1,590 @@
+/*
+ * Xen event channels
+ *
+ * Xen models interrupts with abstract event channels.  Because each
+ * domain gets 1024 event channels, but NR_IRQ is not that large, we
+ * must dynamically map irqs<->event channels.  The event channels
+ * interface with the rest of the kernel by defining a xen interrupt
+ * chip.  When an event is recieved, it is mapped to an irq and sent
+ * through the normal interrupt processing path.
+ *
+ * There are four kinds of events which can be mapped to an event
+ * channel:
+ *
+ * 1. Inter-domain notifications.  This includes all the virtual
+ *    device events, since they're driven by front-ends in another domain
+ *    (typically dom0).
+ * 2. VIRQs, typically used for timers.  These are per-cpu events.
+ * 3. IPIs.
+ * 4. Hardware interrupts. Not supported at present.
+ *
+ * Jeremy Fitzhardinge <jeremy@xensource.com>, XenSource Inc, 2007
+ */
+#include <linux/linkage.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/module.h>
+#include <linux/string.h>
+#include <asm/ptrace.h>
+#include <asm/irq.h>
+#include <asm/sync_bitops.h>
+#include <asm/xen/hypercall.h>
+#include <xen/events.h>
+#include <xen/interface/xen.h>
+#include <xen/interface/event_channel.h>
+#include "xen-ops.h"
+/*
+ * This lock protects updates to the following mapping and reference-count
+ * arrays. The lock does not need to be acquired to read the mapping tables.
+ */
+static DEFINE_SPINLOCK(irq_mapping_update_lock);
+/* IRQ <-> VIRQ mapping. */
+static DEFINE_PER_CPU(int, virq_to_irq[NR_VIRQS]) = {[0 ... NR_VIRQS-1] = -1};
+/* IRQ <-> IPI mapping */
+static DEFINE_PER_CPU(int, ipi_to_irq[XEN_NR_IPIS]) = {[0 ... XEN_NR_IPIS-1] = -1};
+/* Packed IRQ information: binding type, sub-type index, and event channel. */
+struct packed_irq
+{
+        unsigned short evtchn;
+        unsigned char index;
+        unsigned char type;
+};
+static struct packed_irq irq_info[NR_IRQS];
+/* Binding types. */
+enum {
+        IRQT_UNBOUND,
+        IRQT_PIRQ,
+        IRQT_VIRQ,
+        IRQT_IPI,
+        IRQT_EVTCHN
+};
+/* Convenient shorthand for packed representation of an unbound IRQ. */
+#define IRQ_UNBOUND     mk_irq_info(IRQT_UNBOUND, 0, 0)
+static int evtchn_to_irq[NR_EVENT_CHANNELS] = {
+        [0 ... NR_EVENT_CHANNELS-1] = -1
+};
+static unsigned long cpu_evtchn_mask[NR_CPUS][NR_EVENT_CHANNELS/BITS_PER_LONG];
+static u8 cpu_evtchn[NR_EVENT_CHANNELS];
+/* Reference counts for bindings to IRQs. */
+static int irq_bindcount[NR_IRQS];
+/* Xen will never allocate port zero for any purpose. */
+#define VALID_EVTCHN(chn)       ((chn) != 0)
+/*
+ * Force a proper event-channel callback from Xen after clearing the
+ * callback mask. We do this in a very simple manner, by making a call
+ * down into Xen. The pending flag will be checked by Xen on return.
+ */
+void force_evtchn_callback(void)
+{
+        (void)HYPERVISOR_xen_version(0, NULL);
+}
+EXPORT_SYMBOL_GPL(force_evtchn_callback);
+static struct irq_chip xen_dynamic_chip;
+/* Constructor for packed IRQ information. */
+static inline struct packed_irq mk_irq_info(u32 type, u32 index, u32 evtchn)
+{
+        return (struct packed_irq) { evtchn, index, type };
+}
+/*
+ * Accessors for packed IRQ information.
+ */
+static inline unsigned int evtchn_from_irq(int irq)
+{
+        return irq_info[irq].evtchn;
+}
+static inline unsigned int index_from_irq(int irq)
+{
+        return irq_info[irq].index;
+}
+static inline unsigned int type_from_irq(int irq)
+{
+        return irq_info[irq].type;
+}
+static inline unsigned long active_evtchns(unsigned int cpu,
+                                           struct shared_info *sh,
+                                           unsigned int idx)
+{
+        return (sh->evtchn_pending[idx] &
+                cpu_evtchn_mask[cpu][idx] &
+                ~sh->evtchn_mask[idx]);
+}
+static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)
+{
+        int irq = evtchn_to_irq[chn];
+        BUG_ON(irq == -1);
+#ifdef CONFIG_SMP
+        irq_desc[irq].affinity = cpumask_of_cpu(cpu);
+#endif
+        __clear_bit(chn, cpu_evtchn_mask[cpu_evtchn[chn]]);
+        __set_bit(chn, cpu_evtchn_mask[cpu]);
+        cpu_evtchn[chn] = cpu;
+}
+static void init_evtchn_cpu_bindings(void)
+{
+#ifdef CONFIG_SMP
+        int i;
+        /* By default all event channels notify CPU#0. */
+        for (i = 0; i < NR_IRQS; i++)
+                irq_desc[i].affinity = cpumask_of_cpu(0);
+#endif
+        memset(cpu_evtchn, 0, sizeof(cpu_evtchn));
+        memset(cpu_evtchn_mask[0], ~0, sizeof(cpu_evtchn_mask[0]));
+}
+static inline unsigned int cpu_from_evtchn(unsigned int evtchn)
+{
+        return cpu_evtchn[evtchn];
+}
+static inline void clear_evtchn(int port)
+{
+        struct shared_info *s = HYPERVISOR_shared_info;
+        sync_clear_bit(port, &s->evtchn_pending[0]);
+}
+static inline void set_evtchn(int port)
+{
+        struct shared_info *s = HYPERVISOR_shared_info;
+        sync_set_bit(port, &s->evtchn_pending[0]);
+}
+/**
+ * notify_remote_via_irq - send event to remote end of event channel via irq
+ * @irq: irq of event channel to send event to
+ *
+ * Unlike notify_remote_via_evtchn(), this is safe to use across
+ * save/restore. Notifications on a broken connection are silently
+ * dropped.
+ */
+void notify_remote_via_irq(int irq)
+{
+        int evtchn = evtchn_from_irq(irq);
+        if (VALID_EVTCHN(evtchn))
+                notify_remote_via_evtchn(evtchn);
+}
+EXPORT_SYMBOL_GPL(notify_remote_via_irq);
+static void mask_evtchn(int port)
+{
+        struct shared_info *s = HYPERVISOR_shared_info;
+        sync_set_bit(port, &s->evtchn_mask[0]);
+}
+static void unmask_evtchn(int port)
+{
+        struct shared_info *s = HYPERVISOR_shared_info;
+        unsigned int cpu = get_cpu();
+        BUG_ON(!irqs_disabled());
+        /* Slow path (hypercall) if this is a non-local port. */
+        if (unlikely(cpu != cpu_from_evtchn(port))) {
+                struct evtchn_unmask unmask = { .port = port };
+                (void)HYPERVISOR_event_channel_op(EVTCHNOP_unmask, &unmask);
+        } else {
+                struct vcpu_info *vcpu_info = __get_cpu_var(xen_vcpu);
+                sync_clear_bit(port, &s->evtchn_mask[0]);
+                /*
+                 * The following is basically the equivalent of
+                 * 'hw_resend_irq'. Just like a real IO-APIC we 'lose
+                 * the interrupt edge' if the channel is masked.
+                 */
+                if (sync_test_bit(port, &s->evtchn_pending[0]) &&
+                    !sync_test_and_set_bit(port / BITS_PER_LONG,
+                                           &vcpu_info->evtchn_pending_sel))
+                        vcpu_info->evtchn_upcall_pending = 1;
+        }
+        put_cpu();
+}
+static int find_unbound_irq(void)
+{
+        int irq;
+        /* Only allocate from dynirq range */
+        for (irq = 0; irq < NR_IRQS; irq++)
+                if (irq_bindcount[irq] == 0)
+                        break;
+        if (irq == NR_IRQS)
+                panic("No available IRQ to bind to: increase NR_IRQS!\n");
+        return irq;
+}
+int bind_evtchn_to_irq(unsigned int evtchn)
+{
+        int irq;
+        spin_lock(&irq_mapping_update_lock);
+        irq = evtchn_to_irq[evtchn];
+        if (irq == -1) {
+                irq = find_unbound_irq();
+                dynamic_irq_init(irq);
+                set_irq_chip_and_handler_name(irq, &xen_dynamic_chip,
+                                              handle_level_irq, "event");
+                evtchn_to_irq[evtchn] = irq;
+                irq_info[irq] = mk_irq_info(IRQT_EVTCHN, 0, evtchn);
+        }
+        irq_bindcount[irq]++;
+        spin_unlock(&irq_mapping_update_lock);
+        return irq;
+}
+EXPORT_SYMBOL_GPL(bind_evtchn_to_irq);
+static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
+{
+        struct evtchn_bind_ipi bind_ipi;
+        int evtchn, irq;
+        spin_lock(&irq_mapping_update_lock);
+        irq = per_cpu(ipi_to_irq, cpu)[ipi];
+        if (irq == -1) {
+                irq = find_unbound_irq();
+                if (irq < 0)
+                        goto out;
+                dynamic_irq_init(irq);
+                set_irq_chip_and_handler_name(irq, &xen_dynamic_chip,
+                                              handle_level_irq, "ipi");
+                bind_ipi.vcpu = cpu;
+                if (HYPERVISOR_event_channel_op(EVTCHNOP_bind_ipi,
+                                                &bind_ipi) != 0)
+                        BUG();
+                evtchn = bind_ipi.port;
+                evtchn_to_irq[evtchn] = irq;
+                irq_info[irq] = mk_irq_info(IRQT_IPI, ipi, evtchn);
+                per_cpu(ipi_to_irq, cpu)[ipi] = irq;
+                bind_evtchn_to_cpu(evtchn, cpu);
+        }
+        irq_bindcount[irq]++;
+ out:
+        spin_unlock(&irq_mapping_update_lock);
+        return irq;
+}
+static int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
+{
+        struct evtchn_bind_virq bind_virq;
+        int evtchn, irq;
+        spin_lock(&irq_mapping_update_lock);
+        irq = per_cpu(virq_to_irq, cpu)[virq];
+        if (irq == -1) {
+                bind_virq.virq = virq;
+                bind_virq.vcpu = cpu;
+                if (HYPERVISOR_event_channel_op(EVTCHNOP_bind_virq,
+                                                &bind_virq) != 0)
+                        BUG();
+                evtchn = bind_virq.port;
+                irq = find_unbound_irq();
+                dynamic_irq_init(irq);
+                set_irq_chip_and_handler_name(irq, &xen_dynamic_chip,
+                                              handle_level_irq, "virq");
+                evtchn_to_irq[evtchn] = irq;
+                irq_info[irq] = mk_irq_info(IRQT_VIRQ, virq, evtchn);
+                per_cpu(virq_to_irq, cpu)[virq] = irq;
+                bind_evtchn_to_cpu(evtchn, cpu);
+        }
+        irq_bindcount[irq]++;
+        spin_unlock(&irq_mapping_update_lock);
+        return irq;
+}
+static void unbind_from_irq(unsigned int irq)
+{
+        struct evtchn_close close;
+        int evtchn = evtchn_from_irq(irq);
+        spin_lock(&irq_mapping_update_lock);
+        if (VALID_EVTCHN(evtchn) && (--irq_bindcount[irq] == 0)) {
+                close.port = evtchn;
+                if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close) != 0)
+                        BUG();
+                switch (type_from_irq(irq)) {
+                case IRQT_VIRQ:
+                        per_cpu(virq_to_irq, cpu_from_evtchn(evtchn))
+                                [index_from_irq(irq)] = -1;
+                        break;
+                default:
+                        break;
+                }
+                /* Closed ports are implicitly re-bound to VCPU0. */
+                bind_evtchn_to_cpu(evtchn, 0);
+                evtchn_to_irq[evtchn] = -1;
+                irq_info[irq] = IRQ_UNBOUND;
+                dynamic_irq_init(irq);
+        }
+        spin_unlock(&irq_mapping_update_lock);
+}
+int bind_evtchn_to_irqhandler(unsigned int evtchn,
+                              irqreturn_t (*handler)(int, void *),
+                              unsigned long irqflags,
+                              const char *devname, void *dev_id)
+{
+        unsigned int irq;
+        int retval;
+        irq = bind_evtchn_to_irq(evtchn);
+        retval = request_irq(irq, handler, irqflags, devname, dev_id);
+        if (retval != 0) {
+                unbind_from_irq(irq);
+                return retval;
+        }
+        return irq;
+}
+EXPORT_SYMBOL_GPL(bind_evtchn_to_irqhandler);
+int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,
+                            irqreturn_t (*handler)(int, void *),
+                            unsigned long irqflags, const char *devname, void *dev_id)
+{
+        unsigned int irq;
+        int retval;
+        irq = bind_virq_to_irq(virq, cpu);
+        retval = request_irq(irq, handler, irqflags, devname, dev_id);
+        if (retval != 0) {
+                unbind_from_irq(irq);
+                return retval;
+        }
+        return irq;
+}
+EXPORT_SYMBOL_GPL(bind_virq_to_irqhandler);
+int bind_ipi_to_irqhandler(enum ipi_vector ipi,
+                           unsigned int cpu,
+                           irq_handler_t handler,
+                           unsigned long irqflags,
+                           const char *devname,
+                           void *dev_id)
+{
+        int irq, retval;
+        irq = bind_ipi_to_irq(ipi, cpu);
+        if (irq < 0)
+                return irq;
+        retval = request_irq(irq, handler, irqflags, devname, dev_id);
+        if (retval != 0) {
+                unbind_from_irq(irq);
+                return retval;
+        }
+        return irq;
+}
+void unbind_from_irqhandler(unsigned int irq, void *dev_id)
+{
+        free_irq(irq, dev_id);
+        unbind_from_irq(irq);
+}
+EXPORT_SYMBOL_GPL(unbind_from_irqhandler);
+void xen_send_IPI_one(unsigned int cpu, enum ipi_vector vector)
+{
+        int irq = per_cpu(ipi_to_irq, cpu)[vector];
+        BUG_ON(irq < 0);
+        notify_remote_via_irq(irq);
+}
+/*
+ * Search the CPUs pending events bitmasks.  For each one found, map
+ * the event number to an irq, and feed it into do_IRQ() for
+ * handling.
+ *
+ * Xen uses a two-level bitmap to speed searching.  The first level is
+ * a bitset of words which contain pending event bits.  The second
+ * level is a bitset of pending events themselves.
+ */
+fastcall void xen_evtchn_do_upcall(struct pt_regs *regs)
+{
+        int cpu = get_cpu();
+        struct shared_info *s = HYPERVISOR_shared_info;
+        struct vcpu_info *vcpu_info = __get_cpu_var(xen_vcpu);
+        unsigned long pending_words;
+        vcpu_info->evtchn_upcall_pending = 0;
+        /* NB. No need for a barrier here -- XCHG is a barrier on x86. */
+        pending_words = xchg(&vcpu_info->evtchn_pending_sel, 0);
+        while (pending_words != 0) {
+                unsigned long pending_bits;
+                int word_idx = __ffs(pending_words);
+                pending_words &= ~(1UL << word_idx);
+                while ((pending_bits = active_evtchns(cpu, s, word_idx)) != 0) {
+                        int bit_idx = __ffs(pending_bits);
+                        int port = (word_idx * BITS_PER_LONG) + bit_idx;
+                        int irq = evtchn_to_irq[port];
+                        if (irq != -1) {
+                                regs->orig_eax = ~irq;
+                                do_IRQ(regs);
+                        }
+                }
+        }
+        put_cpu();
+}
+/* Rebind an evtchn so that it gets delivered to a specific cpu */
+static void rebind_irq_to_cpu(unsigned irq, unsigned tcpu)
+{
+        struct evtchn_bind_vcpu bind_vcpu;
+        int evtchn = evtchn_from_irq(irq);
+        if (!VALID_EVTCHN(evtchn))
+                return;
+        /* Send future instances of this interrupt to other vcpu. */
+        bind_vcpu.port = evtchn;
+        bind_vcpu.vcpu = tcpu;
+        /*
+         * If this fails, it usually just indicates that we're dealing with a
+         * virq or IPI channel, which don't actually need to be rebound. Ignore
+         * it, but don't do the xenlinux-level rebind in that case.
+         */
+        if (HYPERVISOR_event_channel_op(EVTCHNOP_bind_vcpu, &bind_vcpu) >= 0)
+                bind_evtchn_to_cpu(evtchn, tcpu);
+}
+static void set_affinity_irq(unsigned irq, cpumask_t dest)
+{
+        unsigned tcpu = first_cpu(dest);
+        rebind_irq_to_cpu(irq, tcpu);
+}
+static void enable_dynirq(unsigned int irq)
+{
+        int evtchn = evtchn_from_irq(irq);
+        if (VALID_EVTCHN(evtchn))
+                unmask_evtchn(evtchn);
+}
+static void disable_dynirq(unsigned int irq)
+{
+        int evtchn = evtchn_from_irq(irq);
+        if (VALID_EVTCHN(evtchn))
+                mask_evtchn(evtchn);
+}
+static void ack_dynirq(unsigned int irq)
+{
+        int evtchn = evtchn_from_irq(irq);
+        move_native_irq(irq);
+        if (VALID_EVTCHN(evtchn))
+                clear_evtchn(evtchn);
+}
+static int retrigger_dynirq(unsigned int irq)
+{
+        int evtchn = evtchn_from_irq(irq);
+        int ret = 0;
+        if (VALID_EVTCHN(evtchn)) {
+                set_evtchn(evtchn);
+                ret = 1;
+        }
+        return ret;
+}
+static struct irq_chip xen_dynamic_chip __read_mostly = {
+        .name           = "xen-dyn",
+        .mask           = disable_dynirq,
+        .unmask         = enable_dynirq,
+        .ack            = ack_dynirq,
+        .set_affinity   = set_affinity_irq,
+        .retrigger      = retrigger_dynirq,
+};
+void __init xen_init_IRQ(void)
+{
+        int i;
+        init_evtchn_cpu_bindings();
+        /* No event channels are 'live' right now. */
+        for (i = 0; i < NR_EVENT_CHANNELS; i++)
+                mask_evtchn(i);
+        /* Dynamic IRQ space is currently unbound. Zero the refcnts. */
+        for (i = 0; i < NR_IRQS; i++)
+                irq_bindcount[i] = 0;
+        irq_ctx_init(smp_processor_id());
+}
diff --git a/arch/i386/xen/features.c b/arch/i386/xen/features.c
new file mode 100644
index 0000000000..0707714e40
--- /dev/null
+++ b/arch/i386/xen/features.c
@@ -0,0 +1,29 @@
+/******************************************************************************
+ * features.c
+ *
+ * Xen feature flags.
+ *
+ * Copyright (c) 2006, Ian Campbell, XenSource Inc.
+ */
+#include <linux/types.h>
+#include <linux/cache.h>
+#include <linux/module.h>
+#include <asm/xen/hypervisor.h>
+#include <xen/features.h>
+u8 xen_features[XENFEAT_NR_SUBMAPS * 32] __read_mostly;
+EXPORT_SYMBOL_GPL(xen_features);
+void xen_setup_features(void)
+{
+        struct xen_feature_info fi;
+        int i, j;
+        for (i = 0; i < XENFEAT_NR_SUBMAPS; i++) {
+                fi.submap_idx = i;
+                if (HYPERVISOR_xen_version(XENVER_get_features, &fi) < 0)
+                        break;
+                for (j = 0; j < 32; j++)
+                        xen_features[i * 32 + j] = !!(fi.submap & 1<<j);
+        }
+}
diff --git a/arch/i386/xen/manage.c b/arch/i386/xen/manage.c
new file mode 100644
index 0000000000..aa7af9e6ab
--- /dev/null
+++ b/arch/i386/xen/manage.c
@@ -0,0 +1,143 @@
+/*
+ * Handle extern requests for shutdown, reboot and sysrq
+ */
+#include <linux/kernel.h>
+#include <linux/err.h>
+#include <linux/reboot.h>
+#include <linux/sysrq.h>
+#include <xen/xenbus.h>
+#define SHUTDOWN_INVALID  -1
+#define SHUTDOWN_POWEROFF  0
+#define SHUTDOWN_SUSPEND   2
+/* Code 3 is SHUTDOWN_CRASH, which we don't use because the domain can only
+ * report a crash, not be instructed to crash!
+ * HALT is the same as POWEROFF, as far as we're concerned.  The tools use
+ * the distinction when we return the reason code to them.
+ */
+#define SHUTDOWN_HALT      4
+/* Ignore multiple shutdown requests. */
+static int shutting_down = SHUTDOWN_INVALID;
+static void shutdown_handler(struct xenbus_watch *watch,
+                             const char **vec, unsigned int len)
+{
+        char *str;
+        struct xenbus_transaction xbt;
+        int err;
+        if (shutting_down != SHUTDOWN_INVALID)
+                return;
+ again:
+        err = xenbus_transaction_start(&xbt);
+        if (err)
+                return;
+        str = (char *)xenbus_read(xbt, "control", "shutdown", NULL);
+        /* Ignore read errors and empty reads. */
+        if (XENBUS_IS_ERR_READ(str)) {
+                xenbus_transaction_end(xbt, 1);
+                return;
+        }
+        xenbus_write(xbt, "control", "shutdown", "");
+        err = xenbus_transaction_end(xbt, 0);
+        if (err == -EAGAIN) {
+                kfree(str);
+                goto again;
+        }
+        if (strcmp(str, "poweroff") == 0 ||
+            strcmp(str, "halt") == 0)
+                orderly_poweroff(false);
+        else if (strcmp(str, "reboot") == 0)
+                ctrl_alt_del();
+        else {
+                printk(KERN_INFO "Ignoring shutdown request: %s\n", str);
+                shutting_down = SHUTDOWN_INVALID;
+        }
+        kfree(str);
+}
+static void sysrq_handler(struct xenbus_watch *watch, const char **vec,
+                          unsigned int len)
+{
+        char sysrq_key = '\0';
+        struct xenbus_transaction xbt;
+        int err;
+ again:
+        err = xenbus_transaction_start(&xbt);
+        if (err)
+                return;
+        if (!xenbus_scanf(xbt, "control", "sysrq", "%c", &sysrq_key)) {
+                printk(KERN_ERR "Unable to read sysrq code in "
+                       "control/sysrq\n");
+                xenbus_transaction_end(xbt, 1);
+                return;
+        }
+        if (sysrq_key != '\0')
+                xenbus_printf(xbt, "control", "sysrq", "%c", '\0');
+        err = xenbus_transaction_end(xbt, 0);
+        if (err == -EAGAIN)
+                goto again;
+        if (sysrq_key != '\0')
+                handle_sysrq(sysrq_key, NULL);
+}
+static struct xenbus_watch shutdown_watch = {
+        .node = "control/shutdown",
+        .callback = shutdown_handler
+};
+static struct xenbus_watch sysrq_watch = {
+        .node = "control/sysrq",
+        .callback = sysrq_handler
+};
+static int setup_shutdown_watcher(void)
+{
+        int err;
+        err = register_xenbus_watch(&shutdown_watch);
+        if (err) {
+                printk(KERN_ERR "Failed to set shutdown watcher\n");
+                return err;
+        }
+        err = register_xenbus_watch(&sysrq_watch);
+        if (err) {
+                printk(KERN_ERR "Failed to set sysrq watcher\n");
+                return err;
+        }
+        return 0;
+}
+static int shutdown_event(struct notifier_block *notifier,
+                          unsigned long event,
+                          void *data)
+{
+        setup_shutdown_watcher();
+        return NOTIFY_DONE;
+}
+static int __init setup_shutdown_event(void)
+{
+        static struct notifier_block xenstore_notifier = {
+                .notifier_call = shutdown_event
+        };
+        register_xenstore_notifier(&xenstore_notifier);
+        return 0;
+}
+subsys_initcall(setup_shutdown_event);
diff --git a/arch/i386/xen/mmu.c b/arch/i386/xen/mmu.c
new file mode 100644
index 0000000000..4ae038aa6c
--- /dev/null
+++ b/arch/i386/xen/mmu.c
@@ -0,0 +1,564 @@
+/*
+ * Xen mmu operations
+ *
+ * This file contains the various mmu fetch and update operations.
+ * The most important job they must perform is the mapping between the
+ * domain's pfn and the overall machine mfns.
+ *
+ * Xen allows guests to directly update the pagetable, in a controlled
+ * fashion.  In other words, the guest modifies the same pagetable
+ * that the CPU actually uses, which eliminates the overhead of having
+ * a separate shadow pagetable.
+ *
+ * In order to allow this, it falls on the guest domain to map its
+ * notion of a "physical" pfn - which is just a domain-local linear
+ * address - into a real "machine address" which the CPU's MMU can
+ * use.
+ *
+ * A pgd_t/pmd_t/pte_t will typically contain an mfn, and so can be
+ * inserted directly into the pagetable.  When creating a new
+ * pte/pmd/pgd, it converts the passed pfn into an mfn.  Conversely,
+ * when reading the content back with __(pgd|pmd|pte)_val, it converts
+ * the mfn back into a pfn.
+ *
+ * The other constraint is that all pages which make up a pagetable
+ * must be mapped read-only in the guest.  This prevents uncontrolled
+ * guest updates to the pagetable.  Xen strictly enforces this, and
+ * will disallow any pagetable update which will end up mapping a
+ * pagetable page RW, and will disallow using any writable page as a
+ * pagetable.
+ *
+ * Naively, when loading %cr3 with the base of a new pagetable, Xen
+ * would need to validate the whole pagetable before going on.
+ * Naturally, this is quite slow.  The solution is to "pin" a
+ * pagetable, which enforces all the constraints on the pagetable even
+ * when it is not actively in use.  This menas that Xen can be assured
+ * that it is still valid when you do load it into %cr3, and doesn't
+ * need to revalidate it.
+ *
+ * Jeremy Fitzhardinge <jeremy@xensource.com>, XenSource Inc, 2007
+ */
+#include <linux/sched.h>
+#include <linux/highmem.h>
+#include <linux/bug.h>
+#include <linux/sched.h>
+#include <asm/pgtable.h>
+#include <asm/tlbflush.h>
+#include <asm/mmu_context.h>
+#include <asm/paravirt.h>
+#include <asm/xen/hypercall.h>
+#include <asm/xen/hypervisor.h>
+#include <xen/page.h>
+#include <xen/interface/xen.h>
+#include "multicalls.h"
+#include "mmu.h"
+xmaddr_t arbitrary_virt_to_machine(unsigned long address)
+{
+        pte_t *pte = lookup_address(address);
+        unsigned offset = address & PAGE_MASK;
+        BUG_ON(pte == NULL);
+        return XMADDR((pte_mfn(*pte) << PAGE_SHIFT) + offset);
+}
+void make_lowmem_page_readonly(void *vaddr)
+{
+        pte_t *pte, ptev;
+        unsigned long address = (unsigned long)vaddr;
+        pte = lookup_address(address);
+        BUG_ON(pte == NULL);
+        ptev = pte_wrprotect(*pte);
+        if (HYPERVISOR_update_va_mapping(address, ptev, 0))
+                BUG();
+}
+void make_lowmem_page_readwrite(void *vaddr)
+{
+        pte_t *pte, ptev;
+        unsigned long address = (unsigned long)vaddr;
+        pte = lookup_address(address);
+        BUG_ON(pte == NULL);
+        ptev = pte_mkwrite(*pte);
+        if (HYPERVISOR_update_va_mapping(address, ptev, 0))
+                BUG();
+}
+void xen_set_pmd(pmd_t *ptr, pmd_t val)
+{
+        struct multicall_space mcs;
+        struct mmu_update *u;
+        preempt_disable();
+        mcs = xen_mc_entry(sizeof(*u));
+        u = mcs.args;
+        u->ptr = virt_to_machine(ptr).maddr;
+        u->val = pmd_val_ma(val);
+        MULTI_mmu_update(mcs.mc, u, 1, NULL, DOMID_SELF);
+        xen_mc_issue(PARAVIRT_LAZY_MMU);
+        preempt_enable();
+}
+/*
+ * Associate a virtual page frame with a given physical page frame
+ * and protection flags for that frame.
+ */
+void set_pte_mfn(unsigned long vaddr, unsigned long mfn, pgprot_t flags)
+{
+        pgd_t *pgd;
+        pud_t *pud;
+        pmd_t *pmd;
+        pte_t *pte;
+        pgd = swapper_pg_dir + pgd_index(vaddr);
+        if (pgd_none(*pgd)) {
+                BUG();
+                return;
+        }
+        pud = pud_offset(pgd, vaddr);
+        if (pud_none(*pud)) {
+                BUG();
+                return;
+        }
+        pmd = pmd_offset(pud, vaddr);
+        if (pmd_none(*pmd)) {
+                BUG();
+                return;
+        }
+        pte = pte_offset_kernel(pmd, vaddr);
+        /* <mfn,flags> stored as-is, to permit clearing entries */
+        xen_set_pte(pte, mfn_pte(mfn, flags));
+        /*
+         * It's enough to flush this one mapping.
+         * (PGE mappings get flushed as well)
+         */
+        __flush_tlb_one(vaddr);
+}
+void xen_set_pte_at(struct mm_struct *mm, unsigned long addr,
+                    pte_t *ptep, pte_t pteval)
+{
+        if (mm == current->mm || mm == &init_mm) {
+                if (xen_get_lazy_mode() == PARAVIRT_LAZY_MMU) {
+                        struct multicall_space mcs;
+                        mcs = xen_mc_entry(0);
+                        MULTI_update_va_mapping(mcs.mc, addr, pteval, 0);
+                        xen_mc_issue(PARAVIRT_LAZY_MMU);
+                        return;
+                } else
+                        if (HYPERVISOR_update_va_mapping(addr, pteval, 0) == 0)
+                                return;
+        }
+        xen_set_pte(ptep, pteval);
+}
+#ifdef CONFIG_X86_PAE
+void xen_set_pud(pud_t *ptr, pud_t val)
+{
+        struct multicall_space mcs;
+        struct mmu_update *u;
+        preempt_disable();
+        mcs = xen_mc_entry(sizeof(*u));
+        u = mcs.args;
+        u->ptr = virt_to_machine(ptr).maddr;
+        u->val = pud_val_ma(val);
+        MULTI_mmu_update(mcs.mc, u, 1, NULL, DOMID_SELF);
+        xen_mc_issue(PARAVIRT_LAZY_MMU);
+        preempt_enable();
+}
+void xen_set_pte(pte_t *ptep, pte_t pte)
+{
+        ptep->pte_high = pte.pte_high;
+        smp_wmb();
+        ptep->pte_low = pte.pte_low;
+}
+void xen_set_pte_atomic(pte_t *ptep, pte_t pte)
+{
+        set_64bit((u64 *)ptep, pte_val_ma(pte));
+}
+void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
+{
+        ptep->pte_low = 0;
+        smp_wmb();              /* make sure low gets written first */
+        ptep->pte_high = 0;
+}
+void xen_pmd_clear(pmd_t *pmdp)
+{
+        xen_set_pmd(pmdp, __pmd(0));
+}
+unsigned long long xen_pte_val(pte_t pte)
+{
+        unsigned long long ret = 0;
+        if (pte.pte_low) {
+                ret = ((unsigned long long)pte.pte_high << 32) | pte.pte_low;
+                ret = machine_to_phys(XMADDR(ret)).paddr | 1;
+        }
+        return ret;
+}
+unsigned long long xen_pmd_val(pmd_t pmd)
+{
+        unsigned long long ret = pmd.pmd;
+        if (ret)
+                ret = machine_to_phys(XMADDR(ret)).paddr | 1;
+        return ret;
+}
+unsigned long long xen_pgd_val(pgd_t pgd)
+{
+        unsigned long long ret = pgd.pgd;
+        if (ret)
+                ret = machine_to_phys(XMADDR(ret)).paddr | 1;
+        return ret;
+}
+pte_t xen_make_pte(unsigned long long pte)
+{
+        if (pte & 1)
+                pte = phys_to_machine(XPADDR(pte)).maddr;
+        return (pte_t){ pte, pte >> 32 };
+}
+pmd_t xen_make_pmd(unsigned long long pmd)
+{
+        if (pmd & 1)
+                pmd = phys_to_machine(XPADDR(pmd)).maddr;
+        return (pmd_t){ pmd };
+}
+pgd_t xen_make_pgd(unsigned long long pgd)
+{
+        if (pgd & _PAGE_PRESENT)
+                pgd = phys_to_machine(XPADDR(pgd)).maddr;
+        return (pgd_t){ pgd };
+}
+#else  /* !PAE */
+void xen_set_pte(pte_t *ptep, pte_t pte)
+{
+        *ptep = pte;
+}
+unsigned long xen_pte_val(pte_t pte)
+{
+        unsigned long ret = pte.pte_low;
+        if (ret & _PAGE_PRESENT)
+                ret = machine_to_phys(XMADDR(ret)).paddr;
+        return ret;
+}
+unsigned long xen_pgd_val(pgd_t pgd)
+{
+        unsigned long ret = pgd.pgd;
+        if (ret)
+                ret = machine_to_phys(XMADDR(ret)).paddr | 1;
+        return ret;
+}
+pte_t xen_make_pte(unsigned long pte)
+{
+        if (pte & _PAGE_PRESENT)
+                pte = phys_to_machine(XPADDR(pte)).maddr;
+        return (pte_t){ pte };
+}
+pgd_t xen_make_pgd(unsigned long pgd)
+{
+        if (pgd & _PAGE_PRESENT)
+                pgd = phys_to_machine(XPADDR(pgd)).maddr;
+        return (pgd_t){ pgd };
+}
+#endif  /* CONFIG_X86_PAE */
+/*
+  (Yet another) pagetable walker.  This one is intended for pinning a
+  pagetable.  This means that it walks a pagetable and calls the
+  callback function on each page it finds making up the page table,
+  at every level.  It walks the entire pagetable, but it only bothers
+  pinning pte pages which are below pte_limit.  In the normal case
+  this will be TASK_SIZE, but at boot we need to pin up to
+  FIXADDR_TOP.  But the important bit is that we don't pin beyond
+  there, because then we start getting into Xen's ptes.
+*/
+static int pgd_walk(pgd_t *pgd_base, int (*func)(struct page *, unsigned),
+                    unsigned long limit)
+{
+        pgd_t *pgd = pgd_base;
+        int flush = 0;
+        unsigned long addr = 0;
+        unsigned long pgd_next;
+        BUG_ON(limit > FIXADDR_TOP);
+        if (xen_feature(XENFEAT_auto_translated_physmap))
+                return 0;
+        for (; addr != FIXADDR_TOP; pgd++, addr = pgd_next) {
+                pud_t *pud;
+                unsigned long pud_limit, pud_next;
+                pgd_next = pud_limit = pgd_addr_end(addr, FIXADDR_TOP);
+                if (!pgd_val(*pgd))
+                        continue;
+                pud = pud_offset(pgd, 0);
+                if (PTRS_PER_PUD > 1) /* not folded */
+                        flush |= (*func)(virt_to_page(pud), 0);
+                for (; addr != pud_limit; pud++, addr = pud_next) {
+                        pmd_t *pmd;
+                        unsigned long pmd_limit;
+                        pud_next = pud_addr_end(addr, pud_limit);
+                        if (pud_next < limit)
+                                pmd_limit = pud_next;
+                        else
+                                pmd_limit = limit;
+                        if (pud_none(*pud))
+                                continue;
+                        pmd = pmd_offset(pud, 0);
+                        if (PTRS_PER_PMD > 1) /* not folded */
+                                flush |= (*func)(virt_to_page(pmd), 0);
+                        for (; addr != pmd_limit; pmd++) {
+                                addr += (PAGE_SIZE * PTRS_PER_PTE);
+                                if ((pmd_limit-1) < (addr-1)) {
+                                        addr = pmd_limit;
+                                        break;
+                                }
+                                if (pmd_none(*pmd))
+                                        continue;
+                                flush |= (*func)(pmd_page(*pmd), 0);
+                        }
+                }
+        }
+        flush |= (*func)(virt_to_page(pgd_base), UVMF_TLB_FLUSH);
+        return flush;
+}
+static int pin_page(struct page *page, unsigned flags)
+{
+        unsigned pgfl = test_and_set_bit(PG_pinned, &page->flags);
+        int flush;
+        if (pgfl)
+                flush = 0;              /* already pinned */
+        else if (PageHighMem(page))
+                /* kmaps need flushing if we found an unpinned
+                   highpage */
+                flush = 1;
+        else {
+                void *pt = lowmem_page_address(page);
+                unsigned long pfn = page_to_pfn(page);
+                struct multicall_space mcs = __xen_mc_entry(0);
+                flush = 0;
+                MULTI_update_va_mapping(mcs.mc, (unsigned long)pt,
+                                        pfn_pte(pfn, PAGE_KERNEL_RO),
+                                        flags);
+        }
+        return flush;
+}
+/* This is called just after a mm has been created, but it has not
+   been used yet.  We need to make sure that its pagetable is all
+   read-only, and can be pinned. */
+void xen_pgd_pin(pgd_t *pgd)
+{
+        struct multicall_space mcs;
+        struct mmuext_op *op;
+        xen_mc_batch();
+        if (pgd_walk(pgd, pin_page, TASK_SIZE)) {
+                /* re-enable interrupts for kmap_flush_unused */
+                xen_mc_issue(0);
+                kmap_flush_unused();
+                xen_mc_batch();
+        }
+        mcs = __xen_mc_entry(sizeof(*op));
+        op = mcs.args;
+#ifdef CONFIG_X86_PAE
+        op->cmd = MMUEXT_PIN_L3_TABLE;
+#else
+        op->cmd = MMUEXT_PIN_L2_TABLE;
+#endif
+        op->arg1.mfn = pfn_to_mfn(PFN_DOWN(__pa(pgd)));
+        MULTI_mmuext_op(mcs.mc, op, 1, NULL, DOMID_SELF);
+        xen_mc_issue(0);
+}
+/* The init_mm pagetable is really pinned as soon as its created, but
+   that's before we have page structures to store the bits.  So do all
+   the book-keeping now. */
+static __init int mark_pinned(struct page *page, unsigned flags)
+{
+        SetPagePinned(page);
+        return 0;
+}
+void __init xen_mark_init_mm_pinned(void)
+{
+        pgd_walk(init_mm.pgd, mark_pinned, FIXADDR_TOP);
+}
+static int unpin_page(struct page *page, unsigned flags)
+{
+        unsigned pgfl = test_and_clear_bit(PG_pinned, &page->flags);
+        if (pgfl && !PageHighMem(page)) {
+                void *pt = lowmem_page_address(page);
+                unsigned long pfn = page_to_pfn(page);
+                struct multicall_space mcs = __xen_mc_entry(0);
+                MULTI_update_va_mapping(mcs.mc, (unsigned long)pt,
+                                        pfn_pte(pfn, PAGE_KERNEL),
+                                        flags);
+        }
+        return 0;               /* never need to flush on unpin */
+}
+/* Release a pagetables pages back as normal RW */
+static void xen_pgd_unpin(pgd_t *pgd)
+{
+        struct mmuext_op *op;
+        struct multicall_space mcs;
+        xen_mc_batch();
+        mcs = __xen_mc_entry(sizeof(*op));
+        op = mcs.args;
+        op->cmd = MMUEXT_UNPIN_TABLE;
+        op->arg1.mfn = pfn_to_mfn(PFN_DOWN(__pa(pgd)));
+        MULTI_mmuext_op(mcs.mc, op, 1, NULL, DOMID_SELF);
+        pgd_walk(pgd, unpin_page, TASK_SIZE);
+        xen_mc_issue(0);
+}
+void xen_activate_mm(struct mm_struct *prev, struct mm_struct *next)
+{
+        spin_lock(&next->page_table_lock);
+        xen_pgd_pin(next->pgd);
+        spin_unlock(&next->page_table_lock);
+}
+void xen_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm)
+{
+        spin_lock(&mm->page_table_lock);
+        xen_pgd_pin(mm->pgd);
+        spin_unlock(&mm->page_table_lock);
+}
+#ifdef CONFIG_SMP
+/* Another cpu may still have their %cr3 pointing at the pagetable, so
+   we need to repoint it somewhere else before we can unpin it. */
+static void drop_other_mm_ref(void *info)
+{
+        struct mm_struct *mm = info;
+        if (__get_cpu_var(cpu_tlbstate).active_mm == mm)
+                leave_mm(smp_processor_id());
+}
+static void drop_mm_ref(struct mm_struct *mm)
+{
+        if (current->active_mm == mm) {
+                if (current->mm == mm)
+                        load_cr3(swapper_pg_dir);
+                else
+                        leave_mm(smp_processor_id());
+        }
+        if (!cpus_empty(mm->cpu_vm_mask))
+                xen_smp_call_function_mask(mm->cpu_vm_mask, drop_other_mm_ref,
+                                           mm, 1);
+}
+#else
+static void drop_mm_ref(struct mm_struct *mm)
+{
+        if (current->active_mm == mm)
+                load_cr3(swapper_pg_dir);
+}
+#endif
+/*
+ * While a process runs, Xen pins its pagetables, which means that the
+ * hypervisor forces it to be read-only, and it controls all updates
+ * to it.  This means that all pagetable updates have to go via the
+ * hypervisor, which is moderately expensive.
+ *
+ * Since we're pulling the pagetable down, we switch to use init_mm,
+ * unpin old process pagetable and mark it all read-write, which
+ * allows further operations on it to be simple memory accesses.
+ *
+ * The only subtle point is that another CPU may be still using the
+ * pagetable because of lazy tlb flushing.  This means we need need to
+ * switch all CPUs off this pagetable before we can unpin it.
+ */
+void xen_exit_mmap(struct mm_struct *mm)
+{
+        get_cpu();              /* make sure we don't move around */
+        drop_mm_ref(mm);
+        put_cpu();
+        spin_lock(&mm->page_table_lock);
+        xen_pgd_unpin(mm->pgd);
+        spin_unlock(&mm->page_table_lock);
+}
diff --git a/arch/i386/xen/mmu.h b/arch/i386/xen/mmu.h
new file mode 100644
index 0000000000..c9ff27f3ac
--- /dev/null
+++ b/arch/i386/xen/mmu.h
@@ -0,0 +1,60 @@
+#ifndef _XEN_MMU_H
+#include <linux/linkage.h>
+#include <asm/page.h>
+/*
+ * Page-directory addresses above 4GB do not fit into architectural %cr3.
+ * When accessing %cr3, or equivalent field in vcpu_guest_context, guests
+ * must use the following accessor macros to pack/unpack valid MFNs.
+ *
+ * Note that Xen is using the fact that the pagetable base is always
+ * page-aligned, and putting the 12 MSB of the address into the 12 LSB
+ * of cr3.
+ */
+#define xen_pfn_to_cr3(pfn) (((unsigned)(pfn) << 12) | ((unsigned)(pfn) >> 20))
+#define xen_cr3_to_pfn(cr3) (((unsigned)(cr3) >> 12) | ((unsigned)(cr3) << 20))
+void set_pte_mfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags);
+void xen_set_pte(pte_t *ptep, pte_t pteval);
+void xen_set_pte_at(struct mm_struct *mm, unsigned long addr,
+                    pte_t *ptep, pte_t pteval);
+void xen_set_pmd(pmd_t *pmdp, pmd_t pmdval);
+void xen_activate_mm(struct mm_struct *prev, struct mm_struct *next);
+void xen_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm);
+void xen_exit_mmap(struct mm_struct *mm);
+void xen_pgd_pin(pgd_t *pgd);
+//void xen_pgd_unpin(pgd_t *pgd);
+#ifdef CONFIG_X86_PAE
+unsigned long long xen_pte_val(pte_t);
+unsigned long long xen_pmd_val(pmd_t);
+unsigned long long xen_pgd_val(pgd_t);
+pte_t xen_make_pte(unsigned long long);
+pmd_t xen_make_pmd(unsigned long long);
+pgd_t xen_make_pgd(unsigned long long);
+void xen_set_pte_at(struct mm_struct *mm, unsigned long addr,
+                    pte_t *ptep, pte_t pteval);
+void xen_set_pte_atomic(pte_t *ptep, pte_t pte);
+void xen_set_pud(pud_t *ptr, pud_t val);
+void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep);
+void xen_pmd_clear(pmd_t *pmdp);
+#else
+unsigned long xen_pte_val(pte_t);
+unsigned long xen_pmd_val(pmd_t);
+unsigned long xen_pgd_val(pgd_t);
+pte_t xen_make_pte(unsigned long);
+pmd_t xen_make_pmd(unsigned long);
+pgd_t xen_make_pgd(unsigned long);
+#endif
+#endif  /* _XEN_MMU_H */
diff --git a/arch/i386/xen/multicalls.c b/arch/i386/xen/multicalls.c
new file mode 100644
index 0000000000..c837e8e463
--- /dev/null
+++ b/arch/i386/xen/multicalls.c
@@ -0,0 +1,90 @@
+/*
+ * Xen hypercall batching.
+ *
+ * Xen allows multiple hypercalls to be issued at once, using the
+ * multicall interface.  This allows the cost of trapping into the
+ * hypervisor to be amortized over several calls.
+ *
+ * This file implements a simple interface for multicalls.  There's a
+ * per-cpu buffer of outstanding multicalls.  When you want to queue a
+ * multicall for issuing, you can allocate a multicall slot for the
+ * call and its arguments, along with storage for space which is
+ * pointed to by the arguments (for passing pointers to structures,
+ * etc).  When the multicall is actually issued, all the space for the
+ * commands and allocated memory is freed for reuse.
+ *
+ * Multicalls are flushed whenever any of the buffers get full, or
+ * when explicitly requested.  There's no way to get per-multicall
+ * return results back.  It will BUG if any of the multicalls fail.
+ *
+ * Jeremy Fitzhardinge <jeremy@xensource.com>, XenSource Inc, 2007
+ */
+#include <linux/percpu.h>
+#include <linux/hardirq.h>
+#include <asm/xen/hypercall.h>
+#include "multicalls.h"
+#define MC_BATCH        32
+#define MC_ARGS         (MC_BATCH * 16 / sizeof(u64))
+struct mc_buffer {
+        struct multicall_entry entries[MC_BATCH];
+        u64 args[MC_ARGS];
+        unsigned mcidx, argidx;
+};
+static DEFINE_PER_CPU(struct mc_buffer, mc_buffer);
+DEFINE_PER_CPU(unsigned long, xen_mc_irq_flags);
+void xen_mc_flush(void)
+{
+        struct mc_buffer *b = &__get_cpu_var(mc_buffer);
+        int ret = 0;
+        unsigned long flags;
+        BUG_ON(preemptible());
+        /* Disable interrupts in case someone comes in and queues
+           something in the middle */
+        local_irq_save(flags);
+        if (b->mcidx) {
+                int i;
+                if (HYPERVISOR_multicall(b->entries, b->mcidx) != 0)
+                        BUG();
+                for (i = 0; i < b->mcidx; i++)
+                        if (b->entries[i].result < 0)
+                                ret++;
+                b->mcidx = 0;
+                b->argidx = 0;
+        } else
+                BUG_ON(b->argidx != 0);
+        local_irq_restore(flags);
+        BUG_ON(ret);
+}
+struct multicall_space __xen_mc_entry(size_t args)
+{
+        struct mc_buffer *b = &__get_cpu_var(mc_buffer);
+        struct multicall_space ret;
+        unsigned argspace = (args + sizeof(u64) - 1) / sizeof(u64);
+        BUG_ON(preemptible());
+        BUG_ON(argspace > MC_ARGS);
+        if (b->mcidx == MC_BATCH ||
+            (b->argidx + argspace) > MC_ARGS)
+                xen_mc_flush();
+        ret.mc = &b->entries[b->mcidx];
+        b->mcidx++;
+        ret.args = &b->args[b->argidx];
+        b->argidx += argspace;
+        return ret;
+}
diff --git a/arch/i386/xen/multicalls.h b/arch/i386/xen/multicalls.h
new file mode 100644
index 0000000000..e6f7530b15
--- /dev/null
+++ b/arch/i386/xen/multicalls.h
@@ -0,0 +1,45 @@
+#ifndef _XEN_MULTICALLS_H
+#define _XEN_MULTICALLS_H
+#include "xen-ops.h"
+/* Multicalls */
+struct multicall_space
+{
+        struct multicall_entry *mc;
+        void *args;
+};
+/* Allocate room for a multicall and its args */
+struct multicall_space __xen_mc_entry(size_t args);
+DECLARE_PER_CPU(unsigned long, xen_mc_irq_flags);
+/* Call to start a batch of multiple __xen_mc_entry()s.  Must be
+   paired with xen_mc_issue() */
+static inline void xen_mc_batch(void)
+{
+        /* need to disable interrupts until this entry is complete */
+        local_irq_save(__get_cpu_var(xen_mc_irq_flags));
+}
+static inline struct multicall_space xen_mc_entry(size_t args)
+{
+        xen_mc_batch();
+        return __xen_mc_entry(args);
+}
+/* Flush all pending multicalls */
+void xen_mc_flush(void);
+/* Issue a multicall if we're not in a lazy mode */
+static inline void xen_mc_issue(unsigned mode)
+{
+        if ((xen_get_lazy_mode() & mode) == 0)
+                xen_mc_flush();
+        /* restore flags saved in xen_mc_batch */
+        local_irq_restore(x86_read_percpu(xen_mc_irq_flags));
+}
+#endif /* _XEN_MULTICALLS_H */
diff --git a/arch/i386/xen/setup.c b/arch/i386/xen/setup.c
new file mode 100644
index 0000000000..2fe6eac510
--- /dev/null
+++ b/arch/i386/xen/setup.c
@@ -0,0 +1,96 @@
+/*
+ * Machine specific setup for xen
+ *
+ * Jeremy Fitzhardinge <jeremy@xensource.com>, XenSource Inc, 2007
+ */
+#include <linux/module.h>
+#include <linux/sched.h>
+#include <linux/mm.h>
+#include <linux/pm.h>
+#include <asm/elf.h>
+#include <asm/e820.h>
+#include <asm/setup.h>
+#include <asm/xen/hypervisor.h>
+#include <asm/xen/hypercall.h>
+#include <xen/interface/physdev.h>
+#include <xen/features.h>
+#include "xen-ops.h"
+/* These are code, but not functions.  Defined in entry.S */
+extern const char xen_hypervisor_callback[];
+extern const char xen_failsafe_callback[];
+unsigned long *phys_to_machine_mapping;
+EXPORT_SYMBOL(phys_to_machine_mapping);
+/**
+ * machine_specific_memory_setup - Hook for machine specific memory setup.
+ **/
+char * __init xen_memory_setup(void)
+{
+        unsigned long max_pfn = xen_start_info->nr_pages;
+        e820.nr_map = 0;
+        add_memory_region(0, PFN_PHYS(max_pfn), E820_RAM);
+        return "Xen";
+}
+static void xen_idle(void)
+{
+        local_irq_disable();
+        if (need_resched())
+                local_irq_enable();
+        else {
+                current_thread_info()->status &= ~TS_POLLING;
+                smp_mb__after_clear_bit();
+                safe_halt();
+                current_thread_info()->status |= TS_POLLING;
+        }
+}
+void __init xen_arch_setup(void)
+{
+        struct physdev_set_iopl set_iopl;
+        int rc;
+        HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_4gb_segments);
+        HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_writable_pagetables);
+        if (!xen_feature(XENFEAT_auto_translated_physmap))
+                HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_pae_extended_cr3);
+        HYPERVISOR_set_callbacks(__KERNEL_CS, (unsigned long)xen_hypervisor_callback,
+                                 __KERNEL_CS, (unsigned long)xen_failsafe_callback);
+        set_iopl.iopl = 1;
+        rc = HYPERVISOR_physdev_op(PHYSDEVOP_set_iopl, &set_iopl);
+        if (rc != 0)
+                printk(KERN_INFO "physdev_op failed %d\n", rc);
+#ifdef CONFIG_ACPI
+        if (!(xen_start_info->flags & SIF_INITDOMAIN)) {
+                printk(KERN_INFO "ACPI in unprivileged domain disabled\n");
+                disable_acpi();
+        }
+#endif
+        memcpy(boot_command_line, xen_start_info->cmd_line,
+               MAX_GUEST_CMDLINE > COMMAND_LINE_SIZE ?
+               COMMAND_LINE_SIZE : MAX_GUEST_CMDLINE);
+        pm_idle = xen_idle;
+#ifdef CONFIG_SMP
+        /* fill cpus_possible with all available cpus */
+        xen_fill_possible_map();
+#endif
+        paravirt_disable_iospace();
+}
diff --git a/arch/i386/xen/smp.c b/arch/i386/xen/smp.c
new file mode 100644
index 0000000000..557b8e2470
--- /dev/null
+++ b/arch/i386/xen/smp.c
@@ -0,0 +1,404 @@
+/*
+ * Xen SMP support
+ *
+ * This file implements the Xen versions of smp_ops.  SMP under Xen is
+ * very straightforward.  Bringing a CPU up is simply a matter of
+ * loading its initial context and setting it running.
+ *
+ * IPIs are handled through the Xen event mechanism.
+ *
+ * Because virtual CPUs can be scheduled onto any real CPU, there's no
+ * useful topology information for the kernel to make use of.  As a
+ * result, all CPUs are treated as if they're single-core and
+ * single-threaded.
+ *
+ * This does not handle HOTPLUG_CPU yet.
+ */
+#include <linux/sched.h>
+#include <linux/err.h>
+#include <linux/smp.h>
+#include <asm/paravirt.h>
+#include <asm/desc.h>
+#include <asm/pgtable.h>
+#include <asm/cpu.h>
+#include <xen/interface/xen.h>
+#include <xen/interface/vcpu.h>
+#include <asm/xen/interface.h>
+#include <asm/xen/hypercall.h>
+#include <xen/page.h>
+#include <xen/events.h>
+#include "xen-ops.h"
+#include "mmu.h"
+static cpumask_t cpu_initialized_map;
+static DEFINE_PER_CPU(int, resched_irq);
+static DEFINE_PER_CPU(int, callfunc_irq);
+/*
+ * Structure and data for smp_call_function(). This is designed to minimise
+ * static memory requirements. It also looks cleaner.
+ */
+static DEFINE_SPINLOCK(call_lock);
+struct call_data_struct {
+        void (*func) (void *info);
+        void *info;
+        atomic_t started;
+        atomic_t finished;
+        int wait;
+};
+static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id);
+static struct call_data_struct *call_data;
+/*
+ * Reschedule call back. Nothing to do,
+ * all the work is done automatically when
+ * we return from the interrupt.
+ */
+static irqreturn_t xen_reschedule_interrupt(int irq, void *dev_id)
+{
+        return IRQ_HANDLED;
+}
+static __cpuinit void cpu_bringup_and_idle(void)
+{
+        int cpu = smp_processor_id();
+        cpu_init();
+        preempt_disable();
+        per_cpu(cpu_state, cpu) = CPU_ONLINE;
+        xen_setup_cpu_clockevents();
+        /* We can take interrupts now: we're officially "up". */
+        local_irq_enable();
+        wmb();                  /* make sure everything is out */
+        cpu_idle();
+}
+static int xen_smp_intr_init(unsigned int cpu)
+{
+        int rc;
+        const char *resched_name, *callfunc_name;
+        per_cpu(resched_irq, cpu) = per_cpu(callfunc_irq, cpu) = -1;
+        resched_name = kasprintf(GFP_KERNEL, "resched%d", cpu);
+        rc = bind_ipi_to_irqhandler(XEN_RESCHEDULE_VECTOR,
+                                    cpu,
+                                    xen_reschedule_interrupt,
+                                    IRQF_DISABLED|IRQF_PERCPU|IRQF_NOBALANCING,
+                                    resched_name,
+                                    NULL);
+        if (rc < 0)
+                goto fail;
+        per_cpu(resched_irq, cpu) = rc;
+        callfunc_name = kasprintf(GFP_KERNEL, "callfunc%d", cpu);
+        rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_VECTOR,
+                                    cpu,
+                                    xen_call_function_interrupt,
+                                    IRQF_DISABLED|IRQF_PERCPU|IRQF_NOBALANCING,
+                                    callfunc_name,
+                                    NULL);
+        if (rc < 0)
+                goto fail;
+        per_cpu(callfunc_irq, cpu) = rc;
+        return 0;
+ fail:
+        if (per_cpu(resched_irq, cpu) >= 0)
+                unbind_from_irqhandler(per_cpu(resched_irq, cpu), NULL);
+        if (per_cpu(callfunc_irq, cpu) >= 0)
+                unbind_from_irqhandler(per_cpu(callfunc_irq, cpu), NULL);
+        return rc;
+}
+void __init xen_fill_possible_map(void)
+{
+        int i, rc;
+        for (i = 0; i < NR_CPUS; i++) {
+                rc = HYPERVISOR_vcpu_op(VCPUOP_is_up, i, NULL);
+                if (rc >= 0)
+                        cpu_set(i, cpu_possible_map);
+        }
+}
+void __init xen_smp_prepare_boot_cpu(void)
+{
+        int cpu;
+        BUG_ON(smp_processor_id() != 0);
+        native_smp_prepare_boot_cpu();
+        /* We've switched to the "real" per-cpu gdt, so make sure the
+           old memory can be recycled */
+        make_lowmem_page_readwrite(&per_cpu__gdt_page);
+        for (cpu = 0; cpu < NR_CPUS; cpu++) {
+                cpus_clear(cpu_sibling_map[cpu]);
+                cpus_clear(cpu_core_map[cpu]);
+        }
+        xen_setup_vcpu_info_placement();
+}
+void __init xen_smp_prepare_cpus(unsigned int max_cpus)
+{
+        unsigned cpu;
+        for (cpu = 0; cpu < NR_CPUS; cpu++) {
+                cpus_clear(cpu_sibling_map[cpu]);
+                cpus_clear(cpu_core_map[cpu]);
+        }
+        smp_store_cpu_info(0);
+        set_cpu_sibling_map(0);
+        if (xen_smp_intr_init(0))
+                BUG();
+        cpu_initialized_map = cpumask_of_cpu(0);
+        /* Restrict the possible_map according to max_cpus. */
+        while ((num_possible_cpus() > 1) && (num_possible_cpus() > max_cpus)) {
+                for (cpu = NR_CPUS-1; !cpu_isset(cpu, cpu_possible_map); cpu--)
+                        continue;
+                cpu_clear(cpu, cpu_possible_map);
+        }
+        for_each_possible_cpu (cpu) {
+                struct task_struct *idle;
+                if (cpu == 0)
+                        continue;
+                idle = fork_idle(cpu);
+                if (IS_ERR(idle))
+                        panic("failed fork for CPU %d", cpu);
+                cpu_set(cpu, cpu_present_map);
+        }
+        //init_xenbus_allowed_cpumask();
+}
+static __cpuinit int
+cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
+{
+        struct vcpu_guest_context *ctxt;
+        struct gdt_page *gdt = &per_cpu(gdt_page, cpu);
+        if (cpu_test_and_set(cpu, cpu_initialized_map))
+                return 0;
+        ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL);
+        if (ctxt == NULL)
+                return -ENOMEM;
+        ctxt->flags = VGCF_IN_KERNEL;
+        ctxt->user_regs.ds = __USER_DS;
+        ctxt->user_regs.es = __USER_DS;
+        ctxt->user_regs.fs = __KERNEL_PERCPU;
+        ctxt->user_regs.gs = 0;
+        ctxt->user_regs.ss = __KERNEL_DS;
+        ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
+        ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
+        memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
+        xen_copy_trap_info(ctxt->trap_ctxt);
+        ctxt->ldt_ents = 0;
+        BUG_ON((unsigned long)gdt->gdt & ~PAGE_MASK);
+        make_lowmem_page_readonly(gdt->gdt);
+        ctxt->gdt_frames[0] = virt_to_mfn(gdt->gdt);
+        ctxt->gdt_ents      = ARRAY_SIZE(gdt->gdt);
+        ctxt->user_regs.cs = __KERNEL_CS;
+        ctxt->user_regs.esp = idle->thread.esp0 - sizeof(struct pt_regs);
+        ctxt->kernel_ss = __KERNEL_DS;
+        ctxt->kernel_sp = idle->thread.esp0;
+        ctxt->event_callback_cs     = __KERNEL_CS;
+        ctxt->event_callback_eip    = (unsigned long)xen_hypervisor_callback;
+        ctxt->failsafe_callback_cs  = __KERNEL_CS;
+        ctxt->failsafe_callback_eip = (unsigned long)xen_failsafe_callback;
+        per_cpu(xen_cr3, cpu) = __pa(swapper_pg_dir);
+        ctxt->ctrlreg[3] = xen_pfn_to_cr3(virt_to_mfn(swapper_pg_dir));
+        if (HYPERVISOR_vcpu_op(VCPUOP_initialise, cpu, ctxt))
+                BUG();
+        kfree(ctxt);
+        return 0;
+}
+int __cpuinit xen_cpu_up(unsigned int cpu)
+{
+        struct task_struct *idle = idle_task(cpu);
+        int rc;
+#if 0
+        rc = cpu_up_check(cpu);
+        if (rc)
+                return rc;
+#endif
+        init_gdt(cpu);
+        per_cpu(current_task, cpu) = idle;
+        irq_ctx_init(cpu);
+        xen_setup_timer(cpu);
+        /* make sure interrupts start blocked */
+        per_cpu(xen_vcpu, cpu)->evtchn_upcall_mask = 1;
+        rc = cpu_initialize_context(cpu, idle);
+        if (rc)
+                return rc;
+        if (num_online_cpus() == 1)
+                alternatives_smp_switch(1);
+        rc = xen_smp_intr_init(cpu);
+        if (rc)
+                return rc;
+        smp_store_cpu_info(cpu);
+        set_cpu_sibling_map(cpu);
+        /* This must be done before setting cpu_online_map */
+        wmb();
+        cpu_set(cpu, cpu_online_map);
+        rc = HYPERVISOR_vcpu_op(VCPUOP_up, cpu, NULL);
+        BUG_ON(rc);
+        return 0;
+}
+void xen_smp_cpus_done(unsigned int max_cpus)
+{
+}
+static void stop_self(void *v)
+{
+        int cpu = smp_processor_id();
+        /* make sure we're not pinning something down */
+        load_cr3(swapper_pg_dir);
+        /* should set up a minimal gdt */
+        HYPERVISOR_vcpu_op(VCPUOP_down, cpu, NULL);
+        BUG();
+}
+void xen_smp_send_stop(void)
+{
+        smp_call_function(stop_self, NULL, 0, 0);
+}
+void xen_smp_send_reschedule(int cpu)
+{
+        xen_send_IPI_one(cpu, XEN_RESCHEDULE_VECTOR);
+}
+static void xen_send_IPI_mask(cpumask_t mask, enum ipi_vector vector)
+{
+        unsigned cpu;
+        cpus_and(mask, mask, cpu_online_map);
+        for_each_cpu_mask(cpu, mask)
+                xen_send_IPI_one(cpu, vector);
+}
+static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id)
+{
+        void (*func) (void *info) = call_data->func;
+        void *info = call_data->info;
+        int wait = call_data->wait;
+        /*
+         * Notify initiating CPU that I've grabbed the data and am
+         * about to execute the function
+         */
+        mb();
+        atomic_inc(&call_data->started);
+        /*
+         * At this point the info structure may be out of scope unless wait==1
+         */
+        irq_enter();
+        (*func)(info);
+        irq_exit();
+        if (wait) {
+                mb();           /* commit everything before setting finished */
+                atomic_inc(&call_data->finished);
+        }
+        return IRQ_HANDLED;
+}
+int xen_smp_call_function_mask(cpumask_t mask, void (*func)(void *),
+                               void *info, int wait)
+{
+        struct call_data_struct data;
+        int cpus;
+        /* Holding any lock stops cpus from going down. */
+        spin_lock(&call_lock);
+        cpu_clear(smp_processor_id(), mask);
+        cpus = cpus_weight(mask);
+        if (!cpus) {
+                spin_unlock(&call_lock);
+                return 0;
+        }
+        /* Can deadlock when called with interrupts disabled */
+        WARN_ON(irqs_disabled());
+        data.func = func;
+        data.info = info;
+        atomic_set(&data.started, 0);
+        data.wait = wait;
+        if (wait)
+                atomic_set(&data.finished, 0);
+        call_data = &data;
+        mb();                   /* write everything before IPI */
+        /* Send a message to other CPUs and wait for them to respond */
+        xen_send_IPI_mask(mask, XEN_CALL_FUNCTION_VECTOR);
+        /* Make sure other vcpus get a chance to run.
+           XXX too severe?  Maybe we should check the other CPU's states? */
+        HYPERVISOR_sched_op(SCHEDOP_yield, 0);
+        /* Wait for response */
+        while (atomic_read(&data.started) != cpus ||
+               (wait && atomic_read(&data.finished) != cpus))
+                cpu_relax();
+        spin_unlock(&call_lock);
+        return 0;
+}
diff --git a/arch/i386/xen/time.c b/arch/i386/xen/time.c
new file mode 100644
index 0000000000..51fdabf1fd
--- /dev/null
+++ b/arch/i386/xen/time.c
@@ -0,0 +1,590 @@
+/*
+ * Xen time implementation.
+ *
+ * This is implemented in terms of a clocksource driver which uses
+ * the hypervisor clock as a nanosecond timebase, and a clockevent
+ * driver which uses the hypervisor's timer mechanism.
+ *
+ * Jeremy Fitzhardinge <jeremy@xensource.com>, XenSource Inc, 2007
+ */
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/clocksource.h>
+#include <linux/clockchips.h>
+#include <linux/kernel_stat.h>
+#include <asm/xen/hypervisor.h>
+#include <asm/xen/hypercall.h>
+#include <xen/events.h>
+#include <xen/interface/xen.h>
+#include <xen/interface/vcpu.h>
+#include "xen-ops.h"
+#define XEN_SHIFT 22
+/* Xen may fire a timer up to this many ns early */
+#define TIMER_SLOP      100000
+#define NS_PER_TICK     (1000000000LL / HZ)
+static cycle_t xen_clocksource_read(void);
+/* These are perodically updated in shared_info, and then copied here. */
+struct shadow_time_info {
+        u64 tsc_timestamp;     /* TSC at last update of time vals.  */
+        u64 system_timestamp;  /* Time, in nanosecs, since boot.    */
+        u32 tsc_to_nsec_mul;
+        int tsc_shift;
+        u32 version;
+};
+static DEFINE_PER_CPU(struct shadow_time_info, shadow_time);
+/* runstate info updated by Xen */
+static DEFINE_PER_CPU(struct vcpu_runstate_info, runstate);
+/* snapshots of runstate info */
+static DEFINE_PER_CPU(struct vcpu_runstate_info, runstate_snapshot);
+/* unused ns of stolen and blocked time */
+static DEFINE_PER_CPU(u64, residual_stolen);
+static DEFINE_PER_CPU(u64, residual_blocked);
+/* return an consistent snapshot of 64-bit time/counter value */
+static u64 get64(const u64 *p)
+{
+        u64 ret;
+        if (BITS_PER_LONG < 64) {
+                u32 *p32 = (u32 *)p;
+                u32 h, l;
+                /*
+                 * Read high then low, and then make sure high is
+                 * still the same; this will only loop if low wraps
+                 * and carries into high.
+                 * XXX some clean way to make this endian-proof?
+                 */
+                do {
+                        h = p32[1];
+                        barrier();
+                        l = p32[0];
+                        barrier();
+                } while (p32[1] != h);
+                ret = (((u64)h) << 32) | l;
+        } else
+                ret = *p;
+        return ret;
+}
+/*
+ * Runstate accounting
+ */
+static void get_runstate_snapshot(struct vcpu_runstate_info *res)
+{
+        u64 state_time;
+        struct vcpu_runstate_info *state;
+        BUG_ON(preemptible());
+        state = &__get_cpu_var(runstate);
+        /*
+         * The runstate info is always updated by the hypervisor on
+         * the current CPU, so there's no need to use anything
+         * stronger than a compiler barrier when fetching it.
+         */
+        do {
+                state_time = get64(&state->state_entry_time);
+                barrier();
+                *res = *state;
+                barrier();
+        } while (get64(&state->state_entry_time) != state_time);
+}
+static void setup_runstate_info(int cpu)
+{
+        struct vcpu_register_runstate_memory_area area;
+        area.addr.v = &per_cpu(runstate, cpu);
+        if (HYPERVISOR_vcpu_op(VCPUOP_register_runstate_memory_area,
+                               cpu, &area))
+                BUG();
+}
+static void do_stolen_accounting(void)
+{
+        struct vcpu_runstate_info state;
+        struct vcpu_runstate_info *snap;
+        s64 blocked, runnable, offline, stolen;
+        cputime_t ticks;
+        get_runstate_snapshot(&state);
+        WARN_ON(state.state != RUNSTATE_running);
+        snap = &__get_cpu_var(runstate_snapshot);
+        /* work out how much time the VCPU has not been runn*ing*  */
+        blocked = state.time[RUNSTATE_blocked] - snap->time[RUNSTATE_blocked];
+        runnable = state.time[RUNSTATE_runnable] - snap->time[RUNSTATE_runnable];
+        offline = state.time[RUNSTATE_offline] - snap->time[RUNSTATE_offline];
+        *snap = state;
+        /* Add the appropriate number of ticks of stolen time,
+           including any left-overs from last time.  Passing NULL to
+           account_steal_time accounts the time as stolen. */
+        stolen = runnable + offline + __get_cpu_var(residual_stolen);
+        if (stolen < 0)
+                stolen = 0;
+        ticks = 0;
+        while (stolen >= NS_PER_TICK) {
+                ticks++;
+                stolen -= NS_PER_TICK;
+        }
+        __get_cpu_var(residual_stolen) = stolen;
+        account_steal_time(NULL, ticks);
+        /* Add the appropriate number of ticks of blocked time,
+           including any left-overs from last time.  Passing idle to
+           account_steal_time accounts the time as idle/wait. */
+        blocked += __get_cpu_var(residual_blocked);
+        if (blocked < 0)
+                blocked = 0;
+        ticks = 0;
+        while (blocked >= NS_PER_TICK) {
+                ticks++;
+                blocked -= NS_PER_TICK;
+        }
+        __get_cpu_var(residual_blocked) = blocked;
+        account_steal_time(idle_task(smp_processor_id()), ticks);
+}
+/*
+ * Xen sched_clock implementation.  Returns the number of unstolen
+ * nanoseconds, which is nanoseconds the VCPU spent in RUNNING+BLOCKED
+ * states.
+ */
+unsigned long long xen_sched_clock(void)
+{
+        struct vcpu_runstate_info state;
+        cycle_t now;
+        u64 ret;
+        s64 offset;
+        /*
+         * Ideally sched_clock should be called on a per-cpu basis
+         * anyway, so preempt should already be disabled, but that's
+         * not current practice at the moment.
+         */
+        preempt_disable();
+        now = xen_clocksource_read();
+        get_runstate_snapshot(&state);
+        WARN_ON(state.state != RUNSTATE_running);
+        offset = now - state.state_entry_time;
+        if (offset < 0)
+                offset = 0;
+        ret = state.time[RUNSTATE_blocked] +
+                state.time[RUNSTATE_running] +
+                offset;
+        preempt_enable();
+        return ret;
+}
+/* Get the CPU speed from Xen */
+unsigned long xen_cpu_khz(void)
+{
+        u64 cpu_khz = 1000000ULL << 32;
+        const struct vcpu_time_info *info =
+                &HYPERVISOR_shared_info->vcpu_info[0].time;
+        do_div(cpu_khz, info->tsc_to_system_mul);
+        if (info->tsc_shift < 0)
+                cpu_khz <<= -info->tsc_shift;
+        else
+                cpu_khz >>= info->tsc_shift;
+        return cpu_khz;
+}
+/*
+ * Reads a consistent set of time-base values from Xen, into a shadow data
+ * area.
+ */
+static unsigned get_time_values_from_xen(void)
+{
+        struct vcpu_time_info   *src;
+        struct shadow_time_info *dst;
+        /* src is shared memory with the hypervisor, so we need to
+           make sure we get a consistent snapshot, even in the face of
+           being preempted. */
+        src = &__get_cpu_var(xen_vcpu)->time;
+        dst = &__get_cpu_var(shadow_time);
+        do {
+                dst->version = src->version;
+                rmb();          /* fetch version before data */
+                dst->tsc_timestamp     = src->tsc_timestamp;
+                dst->system_timestamp  = src->system_time;
+                dst->tsc_to_nsec_mul   = src->tsc_to_system_mul;
+                dst->tsc_shift         = src->tsc_shift;
+                rmb();          /* test version after fetching data */
+        } while ((src->version & 1) | (dst->version ^ src->version));
+        return dst->version;
+}
+/*
+ * Scale a 64-bit delta by scaling and multiplying by a 32-bit fraction,
+ * yielding a 64-bit result.
+ */
+static inline u64 scale_delta(u64 delta, u32 mul_frac, int shift)
+{
+        u64 product;
+#ifdef __i386__
+        u32 tmp1, tmp2;
+#endif
+        if (shift < 0)
+                delta >>= -shift;
+        else
+                delta <<= shift;
+#ifdef __i386__
+        __asm__ (
+                "mul  %5       ; "
+                "mov  %4,%%eax ; "
+                "mov  %%edx,%4 ; "
+                "mul  %5       ; "
+                "xor  %5,%5    ; "
+                "add  %4,%%eax ; "
+                "adc  %5,%%edx ; "
+                : "=A" (product), "=r" (tmp1), "=r" (tmp2)
+                : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) );
+#elif __x86_64__
+        __asm__ (
+                "mul %%rdx ; shrd $32,%%rdx,%%rax"
+                : "=a" (product) : "0" (delta), "d" ((u64)mul_frac) );
+#else
+#error implement me!
+#endif
+        return product;
+}
+static u64 get_nsec_offset(struct shadow_time_info *shadow)
+{
+        u64 now, delta;
+        now = native_read_tsc();
+        delta = now - shadow->tsc_timestamp;
+        return scale_delta(delta, shadow->tsc_to_nsec_mul, shadow->tsc_shift);
+}
+static cycle_t xen_clocksource_read(void)
+{
+        struct shadow_time_info *shadow = &get_cpu_var(shadow_time);
+        cycle_t ret;
+        unsigned version;
+        do {
+                version = get_time_values_from_xen();
+                barrier();
+                ret = shadow->system_timestamp + get_nsec_offset(shadow);
+                barrier();
+        } while (version != __get_cpu_var(xen_vcpu)->time.version);
+        put_cpu_var(shadow_time);
+        return ret;
+}
+static void xen_read_wallclock(struct timespec *ts)
+{
+        const struct shared_info *s = HYPERVISOR_shared_info;
+        u32 version;
+        u64 delta;
+        struct timespec now;
+        /* get wallclock at system boot */
+        do {
+                version = s->wc_version;
+                rmb();          /* fetch version before time */
+                now.tv_sec  = s->wc_sec;
+                now.tv_nsec = s->wc_nsec;
+                rmb();          /* fetch time before checking version */
+        } while ((s->wc_version & 1) | (version ^ s->wc_version));
+        delta = xen_clocksource_read(); /* time since system boot */
+        delta += now.tv_sec * (u64)NSEC_PER_SEC + now.tv_nsec;
+        now.tv_nsec = do_div(delta, NSEC_PER_SEC);
+        now.tv_sec = delta;
+        set_normalized_timespec(ts, now.tv_sec, now.tv_nsec);
+}
+unsigned long xen_get_wallclock(void)
+{
+        struct timespec ts;
+        xen_read_wallclock(&ts);
+        return ts.tv_sec;
+}
+int xen_set_wallclock(unsigned long now)
+{
+        /* do nothing for domU */
+        return -1;
+}
+static struct clocksource xen_clocksource __read_mostly = {
+        .name = "xen",
+        .rating = 400,
+        .read = xen_clocksource_read,
+        .mask = ~0,
+        .mult = 1<<XEN_SHIFT,           /* time directly in nanoseconds */
+        .shift = XEN_SHIFT,
+        .flags = CLOCK_SOURCE_IS_CONTINUOUS,
+};
+/*
+   Xen clockevent implementation
+   Xen has two clockevent implementations:
+   The old timer_op one works with all released versions of Xen prior
+   to version 3.0.4.  This version of the hypervisor provides a
+   single-shot timer with nanosecond resolution.  However, sharing the
+   same event channel is a 100Hz tick which is delivered while the
+   vcpu is running.  We don't care about or use this tick, but it will
+   cause the core time code to think the timer fired too soon, and
+   will end up resetting it each time.  It could be filtered, but
+   doing so has complications when the ktime clocksource is not yet
+   the xen clocksource (ie, at boot time).
+   The new vcpu_op-based timer interface allows the tick timer period
+   to be changed or turned off.  The tick timer is not useful as a
+   periodic timer because events are only delivered to running vcpus.
+   The one-shot timer can report when a timeout is in the past, so
+   set_next_event is capable of returning -ETIME when appropriate.
+   This interface is used when available.
+*/
+/*
+  Get a hypervisor absolute time.  In theory we could maintain an
+  offset between the kernel's time and the hypervisor's time, and
+  apply that to a kernel's absolute timeout.  Unfortunately the
+  hypervisor and kernel times can drift even if the kernel is using
+  the Xen clocksource, because ntp can warp the kernel's clocksource.
+*/
+static s64 get_abs_timeout(unsigned long delta)
+{
+        return xen_clocksource_read() + delta;
+}
+static void xen_timerop_set_mode(enum clock_event_mode mode,
+                                 struct clock_event_device *evt)
+{
+        switch (mode) {
+        case CLOCK_EVT_MODE_PERIODIC:
+                /* unsupported */
+                WARN_ON(1);
+                break;
+        case CLOCK_EVT_MODE_ONESHOT:
+                break;
+        case CLOCK_EVT_MODE_UNUSED:
+        case CLOCK_EVT_MODE_SHUTDOWN:
+                HYPERVISOR_set_timer_op(0);  /* cancel timeout */
+                break;
+        }
+}
+static int xen_timerop_set_next_event(unsigned long delta,
+                                      struct clock_event_device *evt)
+{
+        WARN_ON(evt->mode != CLOCK_EVT_MODE_ONESHOT);
+        if (HYPERVISOR_set_timer_op(get_abs_timeout(delta)) < 0)
+                BUG();
+        /* We may have missed the deadline, but there's no real way of
+           knowing for sure.  If the event was in the past, then we'll
+           get an immediate interrupt. */
+        return 0;
+}
+static const struct clock_event_device xen_timerop_clockevent = {
+        .name = "xen",
+        .features = CLOCK_EVT_FEAT_ONESHOT,
+        .max_delta_ns = 0xffffffff,
+        .min_delta_ns = TIMER_SLOP,
+        .mult = 1,
+        .shift = 0,
+        .rating = 500,
+        .set_mode = xen_timerop_set_mode,
+        .set_next_event = xen_timerop_set_next_event,
+};
+static void xen_vcpuop_set_mode(enum clock_event_mode mode,
+                                struct clock_event_device *evt)
+{
+        int cpu = smp_processor_id();
+        switch (mode) {
+        case CLOCK_EVT_MODE_PERIODIC:
+                WARN_ON(1);     /* unsupported */
+                break;
+        case CLOCK_EVT_MODE_ONESHOT:
+                if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, cpu, NULL))
+                        BUG();
+                break;
+        case CLOCK_EVT_MODE_UNUSED:
+        case CLOCK_EVT_MODE_SHUTDOWN:
+                if (HYPERVISOR_vcpu_op(VCPUOP_stop_singleshot_timer, cpu, NULL) ||
+                    HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, cpu, NULL))
+                        BUG();
+                break;
+        }
+}
+static int xen_vcpuop_set_next_event(unsigned long delta,
+                                     struct clock_event_device *evt)
+{
+        int cpu = smp_processor_id();
+        struct vcpu_set_singleshot_timer single;
+        int ret;
+        WARN_ON(evt->mode != CLOCK_EVT_MODE_ONESHOT);
+        single.timeout_abs_ns = get_abs_timeout(delta);
+        single.flags = VCPU_SSHOTTMR_future;
+        ret = HYPERVISOR_vcpu_op(VCPUOP_set_singleshot_timer, cpu, &single);
+        BUG_ON(ret != 0 && ret != -ETIME);
+        return ret;
+}
+static const struct clock_event_device xen_vcpuop_clockevent = {
+        .name = "xen",
+        .features = CLOCK_EVT_FEAT_ONESHOT,
+        .max_delta_ns = 0xffffffff,
+        .min_delta_ns = TIMER_SLOP,
+        .mult = 1,
+        .shift = 0,
+        .rating = 500,
+        .set_mode = xen_vcpuop_set_mode,
+        .set_next_event = xen_vcpuop_set_next_event,
+};
+static const struct clock_event_device *xen_clockevent =
+        &xen_timerop_clockevent;
+static DEFINE_PER_CPU(struct clock_event_device, xen_clock_events);
+static irqreturn_t xen_timer_interrupt(int irq, void *dev_id)
+{
+        struct clock_event_device *evt = &__get_cpu_var(xen_clock_events);
+        irqreturn_t ret;
+        ret = IRQ_NONE;
+        if (evt->event_handler) {
+                evt->event_handler(evt);
+                ret = IRQ_HANDLED;
+        }
+        do_stolen_accounting();
+        return ret;
+}
+void xen_setup_timer(int cpu)
+{
+        const char *name;
+        struct clock_event_device *evt;
+        int irq;
+        printk(KERN_INFO "installing Xen timer for CPU %d\n", cpu);
+        name = kasprintf(GFP_KERNEL, "timer%d", cpu);
+        if (!name)
+                name = "<timer kasprintf failed>";
+        irq = bind_virq_to_irqhandler(VIRQ_TIMER, cpu, xen_timer_interrupt,
+                                      IRQF_DISABLED|IRQF_PERCPU|IRQF_NOBALANCING,
+                                      name, NULL);
+        evt = &per_cpu(xen_clock_events, cpu);
+        memcpy(evt, xen_clockevent, sizeof(*evt));
+        evt->cpumask = cpumask_of_cpu(cpu);
+        evt->irq = irq;
+        setup_runstate_info(cpu);
+}
+void xen_setup_cpu_clockevents(void)
+{
+        BUG_ON(preemptible());
+        clockevents_register_device(&__get_cpu_var(xen_clock_events));
+}
+__init void xen_time_init(void)
+{
+        int cpu = smp_processor_id();
+        get_time_values_from_xen();
+        clocksource_register(&xen_clocksource);
+        if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, cpu, NULL) == 0) {
+                /* Successfully turned off 100Hz tick, so we have the
+                   vcpuop-based timer interface */
+                printk(KERN_DEBUG "Xen: using vcpuop timer interface\n");
+                xen_clockevent = &xen_vcpuop_clockevent;
+        }
+        /* Set initial system time with full resolution */
+        xen_read_wallclock(&xtime);
+        set_normalized_timespec(&wall_to_monotonic,
+                                -xtime.tv_sec, -xtime.tv_nsec);
+        tsc_disable = 0;
+        xen_setup_timer(cpu);
+        xen_setup_cpu_clockevents();
+}
diff --git a/arch/i386/xen/xen-asm.S b/arch/i386/xen/xen-asm.S
new file mode 100644
index 0000000000..1a43b60c0c
--- /dev/null
+++ b/arch/i386/xen/xen-asm.S
@@ -0,0 +1,291 @@
+/*
+        Asm versions of Xen pv-ops, suitable for either direct use or inlining.
+        The inline versions are the same as the direct-use versions, with the
+        pre- and post-amble chopped off.
+        This code is encoded for size rather than absolute efficiency,
+        with a view to being able to inline as much as possible.
+        We only bother with direct forms (ie, vcpu in pda) of the operations
+        here; the indirect forms are better handled in C, since they're
+        generally too large to inline anyway.
+ */
+#include <linux/linkage.h>
+#include <asm/asm-offsets.h>
+#include <asm/thread_info.h>
+#include <asm/percpu.h>
+#include <asm/processor-flags.h>
+#include <asm/segment.h>
+#include <xen/interface/xen.h>
+#define RELOC(x, v)     .globl x##_reloc; x##_reloc=v
+#define ENDPATCH(x)     .globl x##_end; x##_end=.
+/* Pseudo-flag used for virtual NMI, which we don't implement yet */
+#define XEN_EFLAGS_NMI  0x80000000
+/*
+        Enable events.  This clears the event mask and tests the pending
+        event status with one and operation.  If there are pending
+        events, then enter the hypervisor to get them handled.
+ */
+ENTRY(xen_irq_enable_direct)
+        /* Clear mask and test pending */
+        andw $0x00ff, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_pending
+        /* Preempt here doesn't matter because that will deal with
+           any pending interrupts.  The pending check may end up being
+           run on the wrong CPU, but that doesn't hurt. */
+        jz 1f
+2:      call check_events
+1:
+ENDPATCH(xen_irq_enable_direct)
+        ret
+        ENDPROC(xen_irq_enable_direct)
+        RELOC(xen_irq_enable_direct, 2b+1)
+/*
+        Disabling events is simply a matter of making the event mask
+        non-zero.
+ */
+ENTRY(xen_irq_disable_direct)
+        movb $1, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_mask
+ENDPATCH(xen_irq_disable_direct)
+        ret
+        ENDPROC(xen_irq_disable_direct)
+        RELOC(xen_irq_disable_direct, 0)
+/*
+        (xen_)save_fl is used to get the current interrupt enable status.
+        Callers expect the status to be in X86_EFLAGS_IF, and other bits
+        may be set in the return value.  We take advantage of this by
+        making sure that X86_EFLAGS_IF has the right value (and other bits
+        in that byte are 0), but other bits in the return value are
+        undefined.  We need to toggle the state of the bit, because
+        Xen and x86 use opposite senses (mask vs enable).
+ */
+ENTRY(xen_save_fl_direct)
+        testb $0xff, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_mask
+        setz %ah
+        addb %ah,%ah
+ENDPATCH(xen_save_fl_direct)
+        ret
+        ENDPROC(xen_save_fl_direct)
+        RELOC(xen_save_fl_direct, 0)
+/*
+        In principle the caller should be passing us a value return
+        from xen_save_fl_direct, but for robustness sake we test only
+        the X86_EFLAGS_IF flag rather than the whole byte. After
+        setting the interrupt mask state, it checks for unmasked
+        pending events and enters the hypervisor to get them delivered
+        if so.
+ */
+ENTRY(xen_restore_fl_direct)
+        testb $X86_EFLAGS_IF>>8, %ah
+        setz PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_mask
+        /* Preempt here doesn't matter because that will deal with
+           any pending interrupts.  The pending check may end up being
+           run on the wrong CPU, but that doesn't hurt. */
+        /* check for unmasked and pending */
+        cmpw $0x0001, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_pending
+        jz 1f
+2:      call check_events
+1:
+ENDPATCH(xen_restore_fl_direct)
+        ret
+        ENDPROC(xen_restore_fl_direct)
+        RELOC(xen_restore_fl_direct, 2b+1)
+/*
+        This is run where a normal iret would be run, with the same stack setup:
+              8: eflags
+              4: cs
+        esp-> 0: eip
+        This attempts to make sure that any pending events are dealt
+        with on return to usermode, but there is a small window in
+        which an event can happen just before entering usermode.  If
+        the nested interrupt ends up setting one of the TIF_WORK_MASK
+        pending work flags, they will not be tested again before
+        returning to usermode. This means that a process can end up
+        with pending work, which will be unprocessed until the process
+        enters and leaves the kernel again, which could be an
+        unbounded amount of time.  This means that a pending signal or
+        reschedule event could be indefinitely delayed.
+        The fix is to notice a nested interrupt in the critical
+        window, and if one occurs, then fold the nested interrupt into
+        the current interrupt stack frame, and re-process it
+        iteratively rather than recursively.  This means that it will
+        exit via the normal path, and all pending work will be dealt
+        with appropriately.
+        Because the nested interrupt handler needs to deal with the
+        current stack state in whatever form its in, we keep things
+        simple by only using a single register which is pushed/popped
+        on the stack.
+        Non-direct iret could be done in the same way, but it would
+        require an annoying amount of code duplication.  We'll assume
+        that direct mode will be the common case once the hypervisor
+        support becomes commonplace.
+ */
+ENTRY(xen_iret_direct)
+        /* test eflags for special cases */
+        testl $(X86_EFLAGS_VM | XEN_EFLAGS_NMI), 8(%esp)
+        jnz hyper_iret
+        push %eax
+        ESP_OFFSET=4    # bytes pushed onto stack
+        /* Store vcpu_info pointer for easy access.  Do it this
+           way to avoid having to reload %fs */
+#ifdef CONFIG_SMP
+        GET_THREAD_INFO(%eax)
+        movl TI_cpu(%eax),%eax
+        movl __per_cpu_offset(,%eax,4),%eax
+        lea per_cpu__xen_vcpu_info(%eax),%eax
+#else
+        movl $per_cpu__xen_vcpu_info, %eax
+#endif
+        /* check IF state we're restoring */
+        testb $X86_EFLAGS_IF>>8, 8+1+ESP_OFFSET(%esp)
+        /* Maybe enable events.  Once this happens we could get a
+           recursive event, so the critical region starts immediately
+           afterwards.  However, if that happens we don't end up
+           resuming the code, so we don't have to be worried about
+           being preempted to another CPU. */
+        setz XEN_vcpu_info_mask(%eax)
+xen_iret_start_crit:
+        /* check for unmasked and pending */
+        cmpw $0x0001, XEN_vcpu_info_pending(%eax)
+        /* If there's something pending, mask events again so we
+           can jump back into xen_hypervisor_callback */
+        sete XEN_vcpu_info_mask(%eax)
+        popl %eax
+        /* From this point on the registers are restored and the stack
+           updated, so we don't need to worry about it if we're preempted */
+iret_restore_end:
+        /* Jump to hypervisor_callback after fixing up the stack.
+           Events are masked, so jumping out of the critical
+           region is OK. */
+        je xen_hypervisor_callback
+        iret
+xen_iret_end_crit:
+hyper_iret:
+        /* put this out of line since its very rarely used */
+        jmp hypercall_page + __HYPERVISOR_iret * 32
+        .globl xen_iret_start_crit, xen_iret_end_crit
+/*
+   This is called by xen_hypervisor_callback in entry.S when it sees
+   that the EIP at the time of interrupt was between xen_iret_start_crit
+   and xen_iret_end_crit.  We're passed the EIP in %eax so we can do
+   a more refined determination of what to do.
+   The stack format at this point is:
+        ----------------
+         ss             : (ss/esp may be present if we came from usermode)
+         esp            :
+         eflags         }  outer exception info
+         cs             }
+         eip            }
+        ---------------- <- edi (copy dest)
+         eax            :  outer eax if it hasn't been restored
+        ----------------
+         eflags         }  nested exception info
+         cs             }   (no ss/esp because we're nested
+         eip            }    from the same ring)
+         orig_eax       }<- esi (copy src)
+         - - - - - - - -
+         fs             }
+         es             }
+         ds             }  SAVE_ALL state
+         eax            }
+          :             :
+         ebx            }
+        ----------------
+         return addr     <- esp
+        ----------------
+   In order to deliver the nested exception properly, we need to shift
+   everything from the return addr up to the error code so it
+   sits just under the outer exception info.  This means that when we
+   handle the exception, we do it in the context of the outer exception
+   rather than starting a new one.
+   The only caveat is that if the outer eax hasn't been
+   restored yet (ie, it's still on stack), we need to insert
+   its value into the SAVE_ALL state before going on, since
+   it's usermode state which we eventually need to restore.
+ */
+ENTRY(xen_iret_crit_fixup)
+        /* offsets +4 for return address */
+        /*
+           Paranoia: Make sure we're really coming from userspace.
+           One could imagine a case where userspace jumps into the
+           critical range address, but just before the CPU delivers a GP,
+           it decides to deliver an interrupt instead.  Unlikely?
+           Definitely.  Easy to avoid?  Yes.  The Intel documents
+           explicitly say that the reported EIP for a bad jump is the
+           jump instruction itself, not the destination, but some virtual
+           environments get this wrong.
+         */
+        movl PT_CS+4(%esp), %ecx
+        andl $SEGMENT_RPL_MASK, %ecx
+        cmpl $USER_RPL, %ecx
+        je 2f
+        lea PT_ORIG_EAX+4(%esp), %esi
+        lea PT_EFLAGS+4(%esp), %edi
+        /* If eip is before iret_restore_end then stack
+           hasn't been restored yet. */
+        cmp $iret_restore_end, %eax
+        jae 1f
+        movl 0+4(%edi),%eax             /* copy EAX */
+        movl %eax, PT_EAX+4(%esp)
+        lea ESP_OFFSET(%edi),%edi       /* move dest up over saved regs */
+        /* set up the copy */
+1:      std
+        mov $(PT_EIP+4) / 4, %ecx       /* copy ret+saved regs up to orig_eax */
+        rep movsl
+        cld
+        lea 4(%edi),%esp                /* point esp to new frame */
+2:      ret
+/*
+        Force an event check by making a hypercall,
+        but preserve regs before making the call.
+ */
+check_events:
+        push %eax
+        push %ecx
+        push %edx
+        call force_evtchn_callback
+        pop %edx
+        pop %ecx
+        pop %eax
+        ret
diff --git a/arch/i386/xen/xen-head.S b/arch/i386/xen/xen-head.S
new file mode 100644
index 0000000000..2998d55a00
--- /dev/null
+++ b/arch/i386/xen/xen-head.S
@@ -0,0 +1,36 @@
+/* Xen-specific pieces of head.S, intended to be included in the right
+        place in head.S */
+#ifdef CONFIG_XEN
+#include <linux/elfnote.h>
+#include <asm/boot.h>
+#include <xen/interface/elfnote.h>
+ENTRY(startup_xen)
+        movl %esi,xen_start_info
+        cld
+        movl $(init_thread_union+THREAD_SIZE),%esp
+        jmp xen_start_kernel
+.pushsection ".bss.page_aligned"
+        .align PAGE_SIZE_asm
+ENTRY(hypercall_page)
+        .skip 0x1000
+.popsection
+        ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS,       .asciz "linux")
+        ELFNOTE(Xen, XEN_ELFNOTE_GUEST_VERSION,  .asciz "2.6")
+        ELFNOTE(Xen, XEN_ELFNOTE_XEN_VERSION,    .asciz "xen-3.0")
+        ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE,      .long  __PAGE_OFFSET)
+        ELFNOTE(Xen, XEN_ELFNOTE_ENTRY,          .long  startup_xen)
+        ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .long  hypercall_page)
+        ELFNOTE(Xen, XEN_ELFNOTE_FEATURES,       .asciz "!writable_page_tables|pae_pgdir_above_4gb")
+#ifdef CONFIG_X86_PAE
+        ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE,       .asciz "yes")
+#else
+        ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE,       .asciz "no")
+#endif
+        ELFNOTE(Xen, XEN_ELFNOTE_LOADER,         .asciz "generic")
+#endif /*CONFIG_XEN */
diff --git a/arch/i386/xen/xen-ops.h b/arch/i386/xen/xen-ops.h
new file mode 100644
index 0000000000..b9aaea45f0
--- /dev/null
+++ b/arch/i386/xen/xen-ops.h
@@ -0,0 +1,71 @@
+#ifndef XEN_OPS_H
+#define XEN_OPS_H
+#include <linux/init.h>
+/* These are code, but not functions.  Defined in entry.S */
+extern const char xen_hypervisor_callback[];
+extern const char xen_failsafe_callback[];
+void xen_copy_trap_info(struct trap_info *traps);
+DECLARE_PER_CPU(struct vcpu_info *, xen_vcpu);
+DECLARE_PER_CPU(unsigned long, xen_cr3);
+extern struct start_info *xen_start_info;
+extern struct shared_info *HYPERVISOR_shared_info;
+char * __init xen_memory_setup(void);
+void __init xen_arch_setup(void);
+void __init xen_init_IRQ(void);
+void xen_setup_timer(int cpu);
+void xen_setup_cpu_clockevents(void);
+unsigned long xen_cpu_khz(void);
+void __init xen_time_init(void);
+unsigned long xen_get_wallclock(void);
+int xen_set_wallclock(unsigned long time);
+unsigned long long xen_sched_clock(void);
+void xen_mark_init_mm_pinned(void);
+DECLARE_PER_CPU(enum paravirt_lazy_mode, xen_lazy_mode);
+static inline unsigned xen_get_lazy_mode(void)
+{
+        return x86_read_percpu(xen_lazy_mode);
+}
+void __init xen_fill_possible_map(void);
+void __init xen_setup_vcpu_info_placement(void);
+void xen_smp_prepare_boot_cpu(void);
+void xen_smp_prepare_cpus(unsigned int max_cpus);
+int xen_cpu_up(unsigned int cpu);
+void xen_smp_cpus_done(unsigned int max_cpus);
+void xen_smp_send_stop(void);
+void xen_smp_send_reschedule(int cpu);
+int xen_smp_call_function (void (*func) (void *info), void *info, int nonatomic,
+                           int wait);
+int xen_smp_call_function_single(int cpu, void (*func) (void *info), void *info,
+                                 int nonatomic, int wait);
+int xen_smp_call_function_mask(cpumask_t mask, void (*func)(void *),
+                               void *info, int wait);
+/* Declare an asm function, along with symbols needed to make it
+   inlineable */
+#define DECL_ASM(ret, name, ...)                \
+        ret name(__VA_ARGS__);                  \
+        extern char name##_end[];               \
+        extern char name##_reloc[]              \
+DECL_ASM(void, xen_irq_enable_direct, void);
+DECL_ASM(void, xen_irq_disable_direct, void);
+DECL_ASM(unsigned long, xen_save_fl_direct, void);
+DECL_ASM(void, xen_restore_fl_direct, unsigned long);
+void xen_iret_direct(void);
+#endif /* XEN_OPS_H */
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index de1bff6599..616c96e734 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -520,8 +520,10 @@ config PCI
          here unless you are using a simulator without PCI support.
 config PCI_DOMAINS
-        bool
+        def_bool PCI
-        default PCI
+config PCI_SYSCALL
+        def_bool PCI
 source "drivers/pci/pcie/Kconfig"
@@ -580,8 +582,8 @@ menu "Instrumentation Support"
 source "arch/ia64/oprofile/Kconfig"
 config KPROBES
-        bool "Kprobes (EXPERIMENTAL)"
+        bool "Kprobes"
-        depends on KALLSYMS && EXPERIMENTAL && MODULES
+        depends on KALLSYMS && MODULES
        help
          Kprobes allows you to trap at almost any kernel address and
          execute a callback function.  register_kprobe() establishes
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index c1dca226b4..cd4adf52f1 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -34,6 +34,7 @@
 #include <linux/efi.h>
 #include <linux/nodemask.h>
 #include <linux/bitops.h>         /* hweight64() */
+#include <linux/crash_dump.h>
 #include <asm/delay.h>          /* ia64_get_itc() */
 #include <asm/io.h>
@@ -43,6 +44,8 @@
 #include <asm/acpi-ext.h>
+extern int swiotlb_late_init_with_default_size (size_t size);
 #define PFX "IOC: "
 /*
@@ -2026,11 +2029,24 @@ sba_init(void)
        if (!ia64_platform_is("hpzx1") && !ia64_platform_is("hpzx1_swiotlb"))
                return 0;
+#if defined(CONFIG_IA64_GENERIC) && defined(CONFIG_CRASH_DUMP)
+        /* If we are booting a kdump kernel, the sba_iommu will
+         * cause devices that were not shutdown properly to MCA
+         * as soon as they are turned back on.  Our only option for
+         * a successful kdump kernel boot is to use the swiotlb.
+         */
+        if (elfcorehdr_addr < ELFCORE_ADDR_MAX) {
+                if (swiotlb_late_init_with_default_size(64 * (1<<20)) != 0)
+                        panic("Unable to initialize software I/O TLB:"
+                                  " Try machvec=dig boot option");
+                machvec_init("dig");
+                return 0;
+        }
+#endif
        acpi_bus_register_driver(&acpi_sba_ioc_driver);
        if (!ioc_list) {
 #ifdef CONFIG_IA64_GENERIC
-                extern int swiotlb_late_init_with_default_size (size_t size);
                /*
                 * If we didn't find something sba_iommu can claim, we
                 * need to setup the swiotlb and switch to the dig machvec.
diff --git a/arch/ia64/hp/sim/boot/fw-emu.c b/arch/ia64/hp/sim/boot/fw-emu.c
index 300acd913d..1189d035d3 100644
--- a/arch/ia64/hp/sim/boot/fw-emu.c
+++ b/arch/ia64/hp/sim/boot/fw-emu.c
@@ -329,11 +329,6 @@ sys_fw_init (const char *args, int arglen)
        strcpy(sal_systab->product_id, "HP-simulator");
 #endif
-#ifdef CONFIG_IA64_SDV
-        strcpy(sal_systab->oem_id, "Intel");
-        strcpy(sal_systab->product_id, "SDV");
-#endif
        /* fill in an entry point: */
        sal_ed->type = SAL_DESC_ENTRY_POINT;
        sal_ed->pal_proc = __pa(pal_desc[0]);
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index 324ea7565e..ef252df50e 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -36,10 +36,6 @@
 #include <asm/hw_irq.h>
 #include <asm/uaccess.h>
-#ifdef CONFIG_KDB
-# include <linux/kdb.h>
-#endif
 #undef SIMSERIAL_DEBUG  /* define this to get some debug information */
 #define KEYBOARD_INTR   3       /* must match with simulator! */
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c
index c05bda6623..6f4d3d06f0 100644
--- a/arch/ia64/ia32/binfmt_elf32.c
+++ b/arch/ia64/ia32/binfmt_elf32.c
@@ -261,7 +261,7 @@ elf32_set_personality (void)
 }
 static unsigned long
-elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type)
+elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused)
 {
        unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK;
diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S
index 99b665e2b1..06efd1f9b8 100644
--- a/arch/ia64/ia32/ia32_entry.S
+++ b/arch/ia64/ia32/ia32_entry.S
@@ -304,7 +304,7 @@ ia32_syscall_table:
        data8 sys_ni_syscall    /* init_module */
        data8 sys_ni_syscall    /* delete_module */
        data8 sys_ni_syscall    /* get_kernel_syms */  /* 130 */
-        data8 sys_quotactl
+        data8 sys32_quotactl
        data8 sys_getpgid
        data8 sys_fchdir
        data8 sys_ni_syscall    /* sys_bdflush */
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index 75ec3478d8..73ca86d038 100644
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -28,6 +28,7 @@
 #include <linux/time.h>
 #include <linux/efi.h>
 #include <linux/kexec.h>
+#include <linux/mm.h>
 #include <asm/io.h>
 #include <asm/kregs.h>
diff --git a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S
index 8589e84a27..3f926c2dc7 100644
--- a/arch/ia64/kernel/fsys.S
+++ b/arch/ia64/kernel/fsys.S
@@ -247,6 +247,9 @@ ENTRY(fsys_gettimeofday)
 .time_redo:
        .pred.rel.mutex p8,p9,p10
        ld4.acq r28 = [r29]     // xtime_lock.sequence. Must come first for locking purposes
+        ;;
+        and r28 = ~1,r28        // Make sequence even to force retry if odd
+        ;;
 (p8)    mov r2 = ar.itc         // CPU_TIMER. 36 clocks latency!!!
        add r22 = IA64_TIME_INTERPOLATOR_LAST_COUNTER_OFFSET,r20
 (p9)    ld8 r2 = [r30]          // readq(ti->address). Could also have latency issues..
@@ -284,7 +287,6 @@ EX(.fail_efault, probe.w.fault r31, 3)	// This takes 5 cycles and we have spare
 (p15)   ld8 r17 = [r19],-IA64_TIMESPEC_TV_NSEC_OFFSET
 (p7)    cmp.ne p7,p0 = r25,r3   // if cmpxchg not successful redo
        // simulate tbit.nz.or p7,p0 = r28,0
-        and r28 = ~1,r28        // Make sequence even to force retry if odd
        getf.sig r2 = f8
        mf
        add r8 = r8,r18         // Add time interpolator offset
diff --git a/arch/ia64/kernel/gate.S b/arch/ia64/kernel/gate.S
index 3274850cf2..74b1ccce4e 100644
--- a/arch/ia64/kernel/gate.S
+++ b/arch/ia64/kernel/gate.S
@@ -30,6 +30,7 @@
        .previous
 #define BRL_COND_FSYS_BUBBLE_DOWN(pr)                   \
 [1:](pr)brl.cond.sptk 0;                                \
+        ;;                                              \
        .xdata4 ".data.patch.brl_fsys_bubble_down", 1b-.
 GLOBAL_ENTRY(__kernel_syscall_via_break)
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 1ead5ea6c5..4b5daa3cc0 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -57,6 +57,9 @@
 *
 * 2006-09-15 Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
 *            Add printing support for MCA/INIT.
+ *
+ * 2007-04-27 Russ Anderson <rja@sgi.com>
+ *            Support multiple cpus going through OS_MCA in the same event.
 */
 #include <linux/types.h>
 #include <linux/init.h>
@@ -96,7 +99,6 @@
 #endif
 /* Used by mca_asm.S */
-u32                             ia64_mca_serialize;
 DEFINE_PER_CPU(u64, ia64_mca_data); /* == __per_cpu_mca[smp_processor_id()] */
 DEFINE_PER_CPU(u64, ia64_mca_per_cpu_pte); /* PTE to map per-CPU area */
 DEFINE_PER_CPU(u64, ia64_mca_pal_pte);      /* PTE to map PAL code */
@@ -963,11 +965,12 @@ ia64_mca_modify_original_stack(struct pt_regs *regs,
                goto no_mod;
        }
+        if (r13 != sos->prev_IA64_KR_CURRENT) {
+                msg = "inconsistent previous current and r13";
+                goto no_mod;
+        }
        if (!mca_recover_range(ms->pmsa_iip)) {
-                if (r13 != sos->prev_IA64_KR_CURRENT) {
-                        msg = "inconsistent previous current and r13";
-                        goto no_mod;
-                }
                if ((r12 - r13) >= KERNEL_STACK_SIZE) {
                        msg = "inconsistent r12 and r13";
                        goto no_mod;
@@ -1187,6 +1190,13 @@ all_in:
 *      further MCA logging is enabled by clearing logs.
 *      Monarch also has the duty of sending wakeup-IPIs to pull the
 *      slave processors out of rendezvous spinloop.
+ *
+ *      If multiple processors call into OS_MCA, the first will become
+ *      the monarch.  Subsequent cpus will be recorded in the mca_cpu
+ *      bitmask.  After the first monarch has processed its MCA, it
+ *      will wake up the next cpu in the mca_cpu bitmask and then go
+ *      into the rendezvous loop.  When all processors have serviced
+ *      their MCA, the last monarch frees up the rest of the processors.
 */
 void
 ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
@@ -1196,16 +1206,32 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
        struct task_struct *previous_current;
        struct ia64_mca_notify_die nd =
                { .sos = sos, .monarch_cpu = &monarch_cpu };
+        static atomic_t mca_count;
+        static cpumask_t mca_cpu;
+        if (atomic_add_return(1, &mca_count) == 1) {
+                monarch_cpu = cpu;
+                sos->monarch = 1;
+        } else {
+                cpu_set(cpu, mca_cpu);
+                sos->monarch = 0;
+        }
        mprintk(KERN_INFO "Entered OS MCA handler. PSP=%lx cpu=%d "
                "monarch=%ld\n", sos->proc_state_param, cpu, sos->monarch);
        previous_current = ia64_mca_modify_original_stack(regs, sw, sos, "MCA");
-        monarch_cpu = cpu;
        if (notify_die(DIE_MCA_MONARCH_ENTER, "MCA", regs, (long)&nd, 0, 0)
                        == NOTIFY_STOP)
                ia64_mca_spin(__FUNCTION__);
-        ia64_wait_for_slaves(cpu, "MCA");
+        if (sos->monarch) {
+                ia64_wait_for_slaves(cpu, "MCA");
+        } else {
+                ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_CONCURRENT_MCA;
+                while (cpu_isset(cpu, mca_cpu))
+                        cpu_relax();    /* spin until monarch wakes us */
+                ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE;
+        }
        /* Wakeup all the processors which are spinning in the rendezvous loop.
         * They will leave SAL, then spin in the OS with interrupts disabled
@@ -1244,6 +1270,26 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
                        == NOTIFY_STOP)
                ia64_mca_spin(__FUNCTION__);
+        if (atomic_dec_return(&mca_count) > 0) {
+                int i;
+                /* wake up the next monarch cpu,
+                 * and put this cpu in the rendez loop.
+                 */
+                ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_CONCURRENT_MCA;
+                for_each_online_cpu(i) {
+                        if (cpu_isset(i, mca_cpu)) {
+                                monarch_cpu = i;
+                                cpu_clear(i, mca_cpu);  /* wake next cpu */
+                                while (monarch_cpu != -1)
+                                        cpu_relax();    /* spin until last cpu leaves */
+                                ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE;
+                                set_curr_task(cpu, previous_current);
+                                return;
+                        }
+                }
+        }
        set_curr_task(cpu, previous_current);
        monarch_cpu = -1;
 }
diff --git a/arch/ia64/kernel/mca_asm.S b/arch/ia64/kernel/mca_asm.S
index 8c9c26aa6a..0f5965fcdf 100644
--- a/arch/ia64/kernel/mca_asm.S
+++ b/arch/ia64/kernel/mca_asm.S
@@ -133,14 +133,6 @@ ia64_do_tlb_purge:
 //StartMain////////////////////////////////////////////////////////////////////
 ia64_os_mca_dispatch:
-        // Serialize all MCA processing
-        mov     r3=1;;
-        LOAD_PHYSICAL(p0,r2,ia64_mca_serialize);;
-ia64_os_mca_spin:
-        xchg4   r4=[r2],r3;;
-        cmp.ne  p6,p0=r4,r0
-(p6)    br ia64_os_mca_spin
        mov r3=IA64_MCA_CPU_MCA_STACK_OFFSET    // use the MCA stack
        LOAD_PHYSICAL(p0,r2,1f)                 // return address
        mov r19=1                               // All MCA events are treated as monarch (for now)
@@ -291,10 +283,6 @@ END(ia64_os_mca_virtual_begin)
        mov             b0=r12                  // SAL_CHECK return address
-        // release lock
-        LOAD_PHYSICAL(p0,r3,ia64_mca_serialize);;
-        st4.rel         [r3]=r0
        br              b0
 //EndMain//////////////////////////////////////////////////////////////////////
diff --git a/arch/ia64/kernel/mca_drv_asm.S b/arch/ia64/kernel/mca_drv_asm.S
index f2d4900751..3bccb06c8d 100644
--- a/arch/ia64/kernel/mca_drv_asm.S
+++ b/arch/ia64/kernel/mca_drv_asm.S
@@ -40,7 +40,11 @@ GLOBAL_ENTRY(mca_handler_bhhook)
        mov     b6=loc1
        ;;
        mov     loc1=rp
-        ssm     psr.i | psr.ic
+        ssm     psr.ic
+        ;;
+        srlz.i
+        ;;
+        ssm     psr.i
        br.call.sptk.many rp=b6         // does not return ...
        ;;
        mov     ar.pfs=loc0
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index af73b8dfde..fa40cba433 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -513,7 +513,8 @@ copy_thread (int nr, unsigned long clone_flags,
 static void
 do_copy_task_regs (struct task_struct *task, struct unw_frame_info *info, void *arg)
 {
-        unsigned long mask, sp, nat_bits = 0, ip, ar_rnat, urbs_end, cfm;
+        unsigned long mask, sp, nat_bits = 0, ar_rnat, urbs_end, cfm;
+        unsigned long uninitialized_var(ip);    /* GCC be quiet */
        elf_greg_t *dst = arg;
        struct pt_regs *pt;
        char nat;
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index eaa6a24bc0..4d9864cc92 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -390,10 +390,6 @@ early_console_setup (char *cmdline)
        if (!efi_setup_pcdp_console(cmdline))
                earlycons++;
 #endif
-#ifdef CONFIG_SERIAL_8250_CONSOLE
-        if (!early_serial_console_init(cmdline))
-                earlycons++;
-#endif
        return (earlycons) ? 0 : -1;
 }
@@ -805,7 +801,6 @@ static void __cpuinit
 get_max_cacheline_size (void)
 {
        unsigned long line_size, max = 1;
-        unsigned int cache_size = 0;
        u64 l, levels, unique_caches;
        pal_cache_config_info_t cci;
        s64 status;
@@ -835,8 +830,6 @@ get_max_cacheline_size (void)
                line_size = 1 << cci.pcci_line_size;
                if (line_size > max)
                        max = line_size;
-                if (cache_size < cci.pcci_cache_size)
-                        cache_size = cci.pcci_cache_size;
                if (!cci.pcci_unified) {
                        status = ia64_pal_cache_config_info(l,
                                                    /* cache_type (instruction)= */ 1,
@@ -853,9 +846,6 @@ get_max_cacheline_size (void)
                        ia64_i_cache_stride_shift = cci.pcci_stride;
        }
  out:
-#ifdef CONFIG_SMP
-        max_cache_size = max(max_cache_size, cache_size);
-#endif
        if (max > ia64_max_cacheline_size)
                ia64_max_cacheline_size = max;
 }
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index a06667c7ac..3486fe7d6e 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -18,7 +18,6 @@
 #include <linux/time.h>
 #include <linux/interrupt.h>
 #include <linux/efi.h>
-#include <linux/profile.h>
 #include <linux/timex.h>
 #include <asm/machvec.h>
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index 15ad85da15..3aeaf15e46 100644
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -69,6 +69,7 @@ die (const char *str, struct pt_regs *regs, long err)
        bust_spinlocks(0);
        die.lock_owner = -1;
+        add_taint(TAINT_DIE);
        spin_unlock_irq(&die.lock);
        if (panic_on_oops)
diff --git a/arch/ia64/kernel/unwind.c b/arch/ia64/kernel/unwind.c
index b0b08b5f3e..c1bdb51318 100644
--- a/arch/ia64/kernel/unwind.c
+++ b/arch/ia64/kernel/unwind.c
@@ -1856,11 +1856,19 @@ find_save_locs (struct unw_frame_info *info)
        return 0;
 }
+static int
+unw_valid(const struct unw_frame_info *info, unsigned long* p)
+{
+        unsigned long loc = (unsigned long)p;
+        return (loc >= info->regstk.limit && loc < info->regstk.top) ||
+               (loc >= info->memstk.top && loc < info->memstk.limit);
+}
 int
 unw_unwind (struct unw_frame_info *info)
 {
        unsigned long prev_ip, prev_sp, prev_bsp;
-        unsigned long ip, pr, num_regs, rp_loc, pfs_loc;
+        unsigned long ip, pr, num_regs;
        STAT(unsigned long start, flags;)
        int retval;
@@ -1871,8 +1879,7 @@ unw_unwind (struct unw_frame_info *info)
        prev_bsp = info->bsp;
        /* validate the return IP pointer */
-        rp_loc = (unsigned long) info->rp_loc;
+        if (!unw_valid(info, info->rp_loc)) {
-        if ((rp_loc < info->regstk.limit) || (rp_loc > info->regstk.top)) {
                /* FIXME: should really be level 0 but it occurs too often. KAO */
                UNW_DPRINT(1, "unwind.%s: failed to locate return link (ip=0x%lx)!\n",
                           __FUNCTION__, info->ip);
@@ -1888,8 +1895,7 @@ unw_unwind (struct unw_frame_info *info)
        }
        /* validate the previous stack frame pointer */
-        pfs_loc = (unsigned long) info->pfs_loc;
+        if (!unw_valid(info, info->pfs_loc)) {
-        if ((pfs_loc < info->regstk.limit) || (pfs_loc > info->regstk.top)) {
                UNW_DPRINT(0, "unwind.%s: failed to locate ar.pfs!\n", __FUNCTION__);
                STAT(unw.stat.api.unwind_time += ia64_get_itc() - start; local_irq_restore(flags));
                return -1;
diff --git a/arch/ia64/lib/checksum.c b/arch/ia64/lib/checksum.c
index 4411d9baeb..9fc955026f 100644
--- a/arch/ia64/lib/checksum.c
+++ b/arch/ia64/lib/checksum.c
@@ -60,6 +60,7 @@ csum_tcpudp_nofold (__be32 saddr, __be32 daddr, unsigned short len,
        result = (result & 0xffffffff) + (result >> 32);
        return (__force __wsum)result;
 }
+EXPORT_SYMBOL(csum_tcpudp_nofold);
 extern unsigned long do_csum (const unsigned char *, long);
diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
index 1346b7f053..d22861c5b0 100644
--- a/arch/ia64/mm/hugetlbpage.c
+++ b/arch/ia64/mm/hugetlbpage.c
@@ -15,6 +15,7 @@
 #include <linux/pagemap.h>
 #include <linux/slab.h>
 #include <linux/sysctl.h>
+#include <linux/log2.h>
 #include <asm/mman.h>
 #include <asm/pgalloc.h>
 #include <asm/tlb.h>
@@ -182,7 +183,7 @@ static int __init hugetlb_setup_sz(char *str)
                tr_pages = 0x15557000UL;
        size = memparse(str, &str);
-        if (*str || (size & (size-1)) || !(tr_pages & size) ||
+        if (*str || !is_power_of_2(size) || !(tr_pages & size) ||
                size <= PAGE_SIZE ||
                size >= (1UL << PAGE_SHIFT << MAX_ORDER)) {
                printk(KERN_WARNING "Invalid huge page size specified\n");
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c
index fa4e6d4810..1682fc6390 100644
--- a/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
@@ -175,7 +175,7 @@ EXPORT_SYMBOL(flush_tlb_range);
 void __devinit
 ia64_tlb_init (void)
 {
-        ia64_ptce_info_t ptce_info;
+        ia64_ptce_info_t uninitialized_var(ptce_info); /* GCC be quiet */
        unsigned long tr_pgbits;
        long status;
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 73696b4a2e..07d0e92742 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -591,6 +591,9 @@ int
 pci_mmap_page_range (struct pci_dev *dev, struct vm_area_struct *vma,
                     enum pci_mmap_state mmap_state, int write_combine)
 {
+        unsigned long size = vma->vm_end - vma->vm_start;
+        pgprot_t prot;
        /*
         * I/O space cannot be accessed via normal processor loads and
         * stores on this platform.
@@ -604,15 +607,24 @@ pci_mmap_page_range (struct pci_dev *dev, struct vm_area_struct *vma,
                 */
                return -EINVAL;
+        if (!valid_mmap_phys_addr_range(vma->vm_pgoff, size))
+                return -EINVAL;
+        prot = phys_mem_access_prot(NULL, vma->vm_pgoff, size,
+                                    vma->vm_page_prot);
        /*
-         * Leave vm_pgoff as-is, the PCI space address is the physical
+         * If the user requested WC, the kernel uses UC or WC for this region,
-         * address on this platform.
+         * and the chipset supports WC, we can use WC. Otherwise, we have to
+         * use the same attribute the kernel uses.
         */
-        if (write_combine && efi_range_is_wc(vma->vm_start,
+        if (write_combine &&
-                                             vma->vm_end - vma->vm_start))
+            ((pgprot_val(prot) & _PAGE_MA_MASK) == _PAGE_MA_UC ||
+             (pgprot_val(prot) & _PAGE_MA_MASK) == _PAGE_MA_WC) &&
+            efi_range_is_wc(vma->vm_start, vma->vm_end - vma->vm_start))
                vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
        else
-                vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+                vma->vm_page_prot = prot;
        if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
                             vma->vm_end - vma->vm_start, vma->vm_page_prot))
diff --git a/arch/ia64/sn/kernel/io_acpi_init.c b/arch/ia64/sn/kernel/io_acpi_init.c
index c6216f454f..3c7178f5dc 100644
--- a/arch/ia64/sn/kernel/io_acpi_init.c
+++ b/arch/ia64/sn/kernel/io_acpi_init.c
@@ -418,7 +418,7 @@ sn_acpi_slot_fixup(struct pci_dev *dev)
        void __iomem *addr;
        struct pcidev_info *pcidev_info = NULL;
        struct sn_irq_info *sn_irq_info = NULL;
-        size_t size;
+        size_t image_size, size;
        if (sn_acpi_get_pcidev_info(dev, &pcidev_info, &sn_irq_info)) {
                panic("%s:  Failure obtaining pcidev_info for %s\n",
@@ -428,17 +428,16 @@ sn_acpi_slot_fixup(struct pci_dev *dev)
        if (pcidev_info->pdi_pio_mapped_addr[PCI_ROM_RESOURCE]) {
                /*
                 * A valid ROM image exists and has been shadowed by the
-                 * PROM. Setup the pci_dev ROM resource to point to
+                 * PROM. Setup the pci_dev ROM resource with the address
-                 * the shadowed copy.
+                 * of the shadowed copy, and the actual length of the ROM image.
                 */
-                size = dev->resource[PCI_ROM_RESOURCE].end -
+                size = pci_resource_len(dev, PCI_ROM_RESOURCE);
-                                dev->resource[PCI_ROM_RESOURCE].start;
+                addr = ioremap(pcidev_info->pdi_pio_mapped_addr[PCI_ROM_RESOURCE],
-                addr =
+                               size);
-                     ioremap(pcidev_info->pdi_pio_mapped_addr[PCI_ROM_RESOURCE],
+                image_size = pci_get_rom_size(addr, size);
-                             size);
                dev->resource[PCI_ROM_RESOURCE].start = (unsigned long) addr;
                dev->resource[PCI_ROM_RESOURCE].end =
-                                                (unsigned long) addr + size;
+                                        (unsigned long) addr + image_size - 1;
                dev->resource[PCI_ROM_RESOURCE].flags |= IORESOURCE_ROM_BIOS_COPY;
        }
        sn_pci_fixup_slot(dev, pcidev_info, sn_irq_info);
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index 6b10e5d284..906b93674b 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -259,9 +259,23 @@ sn_io_slot_fixup(struct pci_dev *dev)
                        insert_resource(&ioport_resource, &dev->resource[idx]);
                else
                        insert_resource(&iomem_resource, &dev->resource[idx]);
-                /* If ROM, mark as shadowed in PROM */
+                /*
-                if (idx == PCI_ROM_RESOURCE)
+                 * If ROM, set the actual ROM image size, and mark as
-                        dev->resource[idx].flags |= IORESOURCE_ROM_BIOS_COPY;
+                 * shadowed in PROM.
+                 */
+                if (idx == PCI_ROM_RESOURCE) {
+                        size_t image_size;
+                        void __iomem *rom;
+                        rom = ioremap(pci_resource_start(dev, PCI_ROM_RESOURCE),
+                                      size + 1);
+                        image_size = pci_get_rom_size(rom, size + 1);
+                        dev->resource[PCI_ROM_RESOURCE].end =
+                                dev->resource[PCI_ROM_RESOURCE].start +
+                                image_size - 1;
+                        dev->resource[PCI_ROM_RESOURCE].flags |=
+                                                 IORESOURCE_ROM_BIOS_COPY;
+                }
        }
        /* Create a pci_window in the pci_controller struct for
         * each device resource.
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index 6da9854751..df8d5bed61 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -750,9 +750,10 @@ sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, u64 arg)
                        goto error;
                } else
                if ((r = sn_hwperf_enum_objects(&nobj, &objs)) == 0) {
+                        int cpuobj_index = 0;
                        memset(p, 0, a.sz);
                        for (i = 0; i < nobj; i++) {
-                                int cpuobj_index = 0;
                                if (!SN_HWPERF_IS_NODE(objs + i))
                                        continue;
                                node = sn_hwperf_obj_to_cnode(objs + i);
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c
index 493380b2c0..5a289e4de8 100644
--- a/arch/ia64/sn/kernel/tiocx.c
+++ b/arch/ia64/sn/kernel/tiocx.c
@@ -369,7 +369,7 @@ static void tio_corelet_reset(nasid_t nasid, int corelet)
 static int is_fpga_tio(int nasid, int *bt)
 {
-        u16 ioboard_type;
+        u16 uninitialized_var(ioboard_type);    /* GCC be quiet */
        s64 rc;
        rc = ia64_sn_sysctl_ioboard_get(nasid, &ioboard_type);
diff --git a/arch/ia64/sn/kernel/xp_nofault.S b/arch/ia64/sn/kernel/xp_nofault.S
index b772543053..54e8973b6e 100644
--- a/arch/ia64/sn/kernel/xp_nofault.S
+++ b/arch/ia64/sn/kernel/xp_nofault.S
@@ -21,7 +21,8 @@
 xp_nofault_PIOR:
        mov     r8=r0                   // Stage a success return value
        ld8.acq r9=[r32];;              // PIO Read the specified register
-        adds    r9=1,r9                 // Add to force a consume
+        adds    r9=1,r9;;               // Add to force consumption
+        or      r9=r9,r9;;              // Or to force consumption
        br.ret.sptk.many b0;;           // Return success
        .global xp_error_PIOR
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
index 04a8256017..42485ad50c 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
@@ -15,6 +15,7 @@
 #include <asm/sn/pcibus_provider_defs.h>
 #include <asm/sn/pcidev.h>
 #include <asm/sn/sn_sal.h>
+#include <asm/sn/pic.h>
 #include <asm/sn/sn2/sn_hwperf.h>
 #include "xtalk/xwidgetdev.h"
 #include "xtalk/hubdev.h"
@@ -79,7 +80,7 @@ static int sal_pcibr_error_interrupt(struct pcibus_info *soft)
 u16 sn_ioboard_to_pci_bus(struct pci_bus *pci_bus)
 {
        s64 rc;
-        u16 ioboard;
+        u16 uninitialized_var(ioboard);         /* GCC be quiet */
        nasid_t nasid = NASID_GET(SN_PCIBUS_BUSSOFT(pci_bus)->bs_base);
        rc = ia64_sn_sysctl_ioboard_get(nasid, &ioboard);
@@ -130,9 +131,9 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
        }
        memcpy(soft, prom_bussoft, sizeof(struct pcibus_info));
-        soft->pbi_buscommon.bs_base =
+        soft->pbi_buscommon.bs_base = (unsigned long)
-            (((u64) soft->pbi_buscommon.
+                ioremap(REGION_OFFSET(soft->pbi_buscommon.bs_base),
-              bs_base << 4) >> 4) | __IA64_UNCACHED_OFFSET;
+                        sizeof(struct pic));
        spin_lock_init(&soft->pbi_lock);
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
index b9bedbd6e1..d798dd4d0d 100644
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
@@ -610,7 +610,9 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
                return NULL;
        memcpy(tioca_common, prom_bussoft, sizeof(struct tioca_common));
-        tioca_common->ca_common.bs_base |= __IA64_UNCACHED_OFFSET;
+        tioca_common->ca_common.bs_base = (unsigned long)
+                ioremap(REGION_OFFSET(tioca_common->ca_common.bs_base),
+                        sizeof(struct tioca_common));
        /* init kernel-private area */
diff --git a/arch/ia64/sn/pci/tioce_provider.c b/arch/ia64/sn/pci/tioce_provider.c
index f4c0b961a9..84b72b27e2 100644
--- a/arch/ia64/sn/pci/tioce_provider.c
+++ b/arch/ia64/sn/pci/tioce_provider.c
@@ -1002,7 +1002,9 @@ tioce_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
                return NULL;
        memcpy(tioce_common, prom_bussoft, sizeof(struct tioce_common));
-        tioce_common->ce_pcibus.bs_base |= __IA64_UNCACHED_OFFSET;
+        tioce_common->ce_pcibus.bs_base = (unsigned long)
+                ioremap(REGION_OFFSET(tioce_common->ce_pcibus.bs_base),
+                        sizeof(struct tioce_common));
        tioce_kern = tioce_kern_init(tioce_common);
        if (tioce_kern == NULL) {
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index c3bb8a755b..8ccf3e47bf 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -31,6 +31,9 @@ config GENERIC_IRQ_PROBE
 config NO_IOPORT
        def_bool y
+config NO_DMA
+        def_bool y
 source "init/Kconfig"
diff --git a/arch/m32r/kernel/ptrace.c b/arch/m32r/kernel/ptrace.c
index 5f02b31448..57a92ef31a 100644
--- a/arch/m32r/kernel/ptrace.c
+++ b/arch/m32r/kernel/ptrace.c
@@ -595,7 +595,6 @@ void ptrace_disable(struct task_struct *child)
 static int
 do_ptrace(long request, struct task_struct *child, long addr, long data)
 {
-        unsigned long tmp;
        int ret;
        switch (request) {
@@ -604,11 +603,7 @@ do_ptrace(long request, struct task_struct *child, long addr, long data)
         */
        case PTRACE_PEEKTEXT:
        case PTRACE_PEEKDATA:
-                ret = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
+                ret = generic_ptrace_peekdata(child, addr, data);
-                if (ret == sizeof(tmp))
-                        ret = put_user(tmp,(unsigned long __user *) data);
-                else
-                        ret = -EIO;
                break;
        /*
@@ -624,15 +619,9 @@ do_ptrace(long request, struct task_struct *child, long addr, long data)
         */
        case PTRACE_POKETEXT:
        case PTRACE_POKEDATA:
-                ret = access_process_vm(child, addr, &data, sizeof(data), 1);
+                ret = generic_ptrace_pokedata(child, addr, data);
-                if (ret == sizeof(data)) {
+                if (ret == 0 && request == PTRACE_POKETEXT)
-                        ret = 0;
+                        invalidate_cache();
-                        if (request == PTRACE_POKETEXT) {
-                                invalidate_cache();
-                        }
-                } else {
-                        ret = -EIO;
-                }
                break;
        /*
diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c
index cdba9fd6d8..2cf0690b78 100644
--- a/arch/m68k/kernel/ptrace.c
+++ b/arch/m68k/kernel/ptrace.c
@@ -128,10 +128,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        /* when I and D space are separate, these will need to be fixed. */
        case PTRACE_PEEKTEXT:   /* read word at location addr. */
        case PTRACE_PEEKDATA:
-                i = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
+                ret = generic_ptrace_peekdata(child, addr, data);
-                if (i != sizeof(tmp))
-                        goto out_eio;
-                ret = put_user(tmp, (unsigned long *)data);
                break;
        /* read the word at location addr in the USER area. */
@@ -160,8 +157,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        /* when I and D space are separate, this will have to be fixed. */
        case PTRACE_POKETEXT:   /* write the word at location addr. */
        case PTRACE_POKEDATA:
-                if (access_process_vm(child, addr, &data, sizeof(data), 1) != sizeof(data))
+                ret = generic_ptrace_pokedata(child, addr, data);
-                        goto out_eio;
                break;
        case PTRACE_POKEUSR:    /* write the word at location addr in the USER area */
diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c
index a27a4fa332..4e2752a0e8 100644
--- a/arch/m68k/kernel/traps.c
+++ b/arch/m68k/kernel/traps.c
@@ -1170,6 +1170,7 @@ void die_if_kernel (char *str, struct pt_regs *fp, int nr)
        console_verbose();
        printk("%s: %08x\n",str,nr);
        show_registers(fp);
+        add_taint(TAINT_DIE);
        do_exit(SIGSEGV);
 }
diff --git a/arch/m68k/lib/checksum.c b/arch/m68k/lib/checksum.c
index cf6bb51945..6216f12a75 100644
--- a/arch/m68k/lib/checksum.c
+++ b/arch/m68k/lib/checksum.c
@@ -422,3 +422,4 @@ csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
            );
    return(sum);
 }
+EXPORT_SYMBOL(csum_partial_copy_nocheck);
diff --git a/arch/m68knommu/kernel/process.c b/arch/m68knommu/kernel/process.c
index 941955dc3b..846f975346 100644
--- a/arch/m68knommu/kernel/process.c
+++ b/arch/m68knommu/kernel/process.c
@@ -377,7 +377,7 @@ unsigned long get_wchan(struct task_struct *p)
        fp = ((struct switch_stack *)p->thread.ksp)->a6;
        do {
                if (fp < stack_page+sizeof(struct thread_info) ||
-                    fp >= 8184+stack_page)
+                    fp >= THREAD_SIZE-8+stack_page)
                        return 0;
                pc = ((unsigned long *)fp)[1];
                if (!in_sched_functions(pc))
diff --git a/arch/m68knommu/kernel/ptrace.c b/arch/m68knommu/kernel/ptrace.c
index f54b6a3dfe..ef70ca070c 100644
--- a/arch/m68knommu/kernel/ptrace.c
+++ b/arch/m68knommu/kernel/ptrace.c
@@ -106,17 +106,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        switch (request) {
                /* when I and D space are separate, these will need to be fixed. */
                case PTRACE_PEEKTEXT: /* read word at location addr. */ 
-                case PTRACE_PEEKDATA: {
+                case PTRACE_PEEKDATA:
-                        unsigned long tmp;
+                        ret = generic_ptrace_peekdata(child, addr, data);
-                        int copied;
-                        copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
-                        ret = -EIO;
-                        if (copied != sizeof(tmp))
-                                break;
-                        ret = put_user(tmp,(unsigned long *) data);
                        break;
-                }
                /* read the word at location addr in the USER area. */
                case PTRACE_PEEKUSR: {
@@ -159,10 +151,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                /* when I and D space are separate, this will have to be fixed. */
                case PTRACE_POKETEXT: /* write the word at location addr. */
                case PTRACE_POKEDATA:
-                        ret = 0;
+                        ret = generic_ptrace_pokedata(child, addr, data);
-                        if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data))
-                                break;
-                        ret = -EIO;
                        break;
                case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c
index 8133b10473..80f4e9d74a 100644
--- a/arch/m68knommu/kernel/setup.c
+++ b/arch/m68knommu/kernel/setup.c
@@ -1,8 +1,8 @@
 /*
 *  linux/arch/m68knommu/kernel/setup.c
 *
- *  Copyright (C) 1999-2004  Greg Ungerer (gerg@snapgear.com)
+ *  Copyright (C) 1999-2007  Greg Ungerer (gerg@snapgear.com)
- *  Copyright (C) 1998,1999  D. Jeff Dionne <jeff@lineo.ca>
+ *  Copyright (C) 1998,1999  D. Jeff Dionne <jeff@uClinux.org>
 *  Copyleft  ()) 2000       James D. Schettine {james@telos-systems.com}
 *  Copyright (C) 1998       Kenneth Albanowski <kjahds@kjahds.com>
 *  Copyright (C) 1995       Hamish Macdonald
@@ -20,17 +20,13 @@
 #include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
-#include <linux/fs.h>
 #include <linux/fb.h>
 #include <linux/module.h>
 #include <linux/console.h>
-#include <linux/genhd.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/major.h>
 #include <linux/bootmem.h>
 #include <linux/seq_file.h>
-#include <linux/root_dev.h>
 #include <linux/init.h>
 #include <asm/setup.h>
@@ -46,34 +42,19 @@ EXPORT_SYMBOL(memory_end);
 char __initdata command_line[COMMAND_LINE_SIZE];
-/* setup some dummy routines */
+void (*mach_trap_init)(void);
-static void dummy_waitbut(void)
-{
-}
-void (*mach_sched_init) (irq_handler_t handler);
-void (*mach_tick)( void );
-/* machine dependent keyboard functions */
-int (*mach_keyb_init) (void);
-int (*mach_kbdrate) (struct kbd_repeat *);
-void (*mach_kbd_leds) (unsigned int);
-/* machine dependent irq functions */
-void (*mach_init_IRQ) (void);
-irq_handler_t mach_default_handler;
-int (*mach_get_irq_list) (struct seq_file *, void *);
-void (*mach_process_int) (int irq, struct pt_regs *fp);
-void (*mach_trap_init) (void);
 /* machine dependent timer functions */
-unsigned long (*mach_gettimeoffset) (void);
+void (*mach_sched_init)(irq_handler_t handler);
-void (*mach_gettod) (int*, int*, int*, int*, int*, int*);
+void (*mach_tick)(void);
-int (*mach_hwclk) (int, struct rtc_time*);
+void (*mach_gettod)(int*, int*, int*, int*, int*, int*);
-int (*mach_set_clock_mmss) (unsigned long);
+int (*mach_set_clock_mmss)(unsigned long);
-void (*mach_mksound)( unsigned int count, unsigned int ticks );
+unsigned long (*mach_gettimeoffset)(void);
-void (*mach_reset)( void );
-void (*waitbut)(void) = dummy_waitbut;
+/* machine dependent reboot functions */
-void (*mach_debug_init)(void);
+void (*mach_reset)(void);
-void (*mach_halt)( void );
+void (*mach_halt)(void);
-void (*mach_power_off)( void );
+void (*mach_power_off)(void);
 #ifdef CONFIG_M68000
@@ -134,13 +115,6 @@ void (*mach_power_off)( void );
        #define CPU "UNKNOWN"
 #endif
-/* (es) */
-/* note: why is this defined here?  the must be a better place to put this */
-#if defined( CONFIG_TELOS) || defined( CONFIG_UCDIMM ) || defined( CONFIG_UCSIMM ) || defined(CONFIG_DRAGEN2) || (defined( CONFIG_PILOT ) && defined( CONFIG_M68328 ))
-#define CAT_ROMARRAY
-#endif
-/* (/es) */
 extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end;
 extern int _ramstart, _ramend;
@@ -148,15 +122,8 @@ void setup_arch(char **cmdline_p)
 {
        int bootmap_size;
-#if defined(CAT_ROMARRAY) && defined(DEBUG)
-        extern int __data_rom_start;
-        extern int __data_start;
-        int *romarray = (int *)((int) &__data_rom_start +
-                              (int)&_edata - (int)&__data_start);
-#endif
        memory_start = PAGE_ALIGN(_ramstart);
-        memory_end = _ramend; /* by now the stack is part of the init task */
+        memory_end = _ramend;
        init_mm.start_code = (unsigned long) &_stext;
        init_mm.end_code = (unsigned long) &_etext;
@@ -220,11 +187,7 @@ void setup_arch(char **cmdline_p)
                (int) &_sbss, (int) &_ebss);
        printk(KERN_DEBUG "KERNEL -> ROMFS=0x%06x-0x%06x MEM=0x%06x-0x%06x "
                "STACK=0x%06x-0x%06x\n",
-#ifdef CAT_ROMARRAY
-                (int) romarray, ((int) romarray) + romarray[2],
-#else
                (int) &_ebss, (int) memory_start,
-#endif
                (int) memory_start, (int) memory_end,
                (int) memory_end, (int) _ramend);
 #endif
diff --git a/arch/m68knommu/kernel/traps.c b/arch/m68knommu/kernel/traps.c
index bed5f47bf5..fde04e1757 100644
--- a/arch/m68knommu/kernel/traps.c
+++ b/arch/m68knommu/kernel/traps.c
@@ -83,6 +83,7 @@ void die_if_kernel(char *str, struct pt_regs *fp, int nr)
        printk(KERN_EMERG "Process %s (pid: %d, stackpage=%08lx)\n",
                current->comm, current->pid, PAGE_SIZE+(unsigned long)current);
        show_stack(NULL, (unsigned long *)fp);
+        add_taint(TAINT_DIE);
        do_exit(SIGSEGV);
 }
diff --git a/arch/m68knommu/mm/memory.c b/arch/m68knommu/mm/memory.c
index 411e45248e..1a66b71035 100644
--- a/arch/m68knommu/mm/memory.c
+++ b/arch/m68knommu/mm/memory.c
@@ -17,90 +17,14 @@
 #include <linux/types.h>
 #include <linux/slab.h>
-#include <asm/setup.h>
 #include <asm/segment.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
-#include <asm/traps.h>
-#include <asm/io.h>
 /*
- * cache_clear() semantics: Clear any cache entries for the area in question,
+ * Map some physical address range into the kernel address space.
- * without writing back dirty entries first. This is useful if the data will
+ * The code is copied and adapted from map_chunk().
- * be overwritten anyway, e.g. by DMA to memory. The range is defined by a
- * _physical_ address.
- */
-void cache_clear (unsigned long paddr, int len)
-{
-}
-/*
- *      Define cache invalidate functions. The ColdFire 5407 is really
- *      the only processor that needs to do some work here. Anything
- *      that has separate data and instruction caches will be a problem.
- */
-#ifdef CONFIG_M5407
-static __inline__ void cache_invalidate_lines(unsigned long paddr, int len)
-{
-        unsigned long   sset, eset;
-        sset = (paddr & 0x00000ff0);
-        eset = ((paddr + len) & 0x0000ff0) + 0x10;
-        __asm__ __volatile__ (
-                "nop\n\t"
-                "clrl   %%d0\n\t"
-                "1:\n\t"
-                "movel  %0,%%a0\n\t"
-                "addl   %%d0,%%a0\n\t"
-                "2:\n\t"
-                ".word  0xf4e8\n\t"
-                "addl   #0x10,%%a0\n\t"
-                "cmpl   %1,%%a0\n\t"
-                "blt    2b\n\t"
-                "addql  #1,%%d0\n\t"
-                "cmpil  #4,%%d0\n\t"
-                "bne    1b"
-                : : "a" (sset), "a" (eset) : "d0", "a0" );
-}
-#else
-#define cache_invalidate_lines(a,b)
-#endif
-/*
- * cache_push() semantics: Write back any dirty cache data in the given area,
- * and invalidate the range in the instruction cache. It needs not (but may)
- * invalidate those entries also in the data cache. The range is defined by a
- * _physical_ address.
- */
-void cache_push (unsigned long paddr, int len)
-{
-        cache_invalidate_lines(paddr, len);
-}
-/*
- * cache_push_v() semantics: Write back any dirty cache data in the given
- * area, and invalidate those entries at least in the instruction cache. This
- * is intended to be used after data has been written that can be executed as
- * code later. The range is defined by a _user_mode_ _virtual_ address  (or,
- * more exactly, the space is defined by the %sfc/%dfc register.)
- */
-void cache_push_v (unsigned long vaddr, int len)
-{
-        cache_invalidate_lines(vaddr, len);
-}
-/* Map some physical address range into the kernel address space. The
- * code is copied and adapted from map_chunk().
 */
 unsigned long kernel_map(unsigned long paddr, unsigned long size,
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 9528ee9064..5c863bcd56 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -15,6 +15,29 @@ choice
        prompt "System type"
        default SGI_IP22
+config LEMOTE_FULONG
+        bool "Lemote Fulong mini-PC"
+        select ARCH_SPARSEMEM_ENABLE
+        select SYS_HAS_CPU_LOONGSON2
+        select DMA_NONCOHERENT
+        select BOOT_ELF32
+        select BOARD_SCACHE
+        select HAVE_STD_PC_SERIAL_PORT
+        select HW_HAS_PCI
+        select I8259
+        select ISA
+        select IRQ_CPU
+        select SYS_SUPPORTS_32BIT_KERNEL
+        select SYS_SUPPORTS_64BIT_KERNEL
+        select SYS_SUPPORTS_LITTLE_ENDIAN
+        select SYS_SUPPORTS_HIGHMEM
+        select SYS_HAS_EARLY_PRINTK
+        select GENERIC_HARDIRQS_NO__DO_IRQ
+        select CPU_HAS_WB
+        help
+          Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and
+          an FPGA northbridge
 config MACH_ALCHEMY
        bool "Alchemy processor based machines"
@@ -63,7 +86,7 @@ config MACH_DECSTATION
        bool "DECstations"
        select BOOT_ELF32
        select DMA_NONCOHERENT
-        select SYS_HAS_EARLY_PRINTK
+        select NO_IOPORT
        select IRQ_CPU
        select SYS_HAS_CPU_R3000
        select SYS_HAS_CPU_R4X00
@@ -88,33 +111,15 @@ config MACH_DECSTATION
          otherwise choose R3000.
-config MIPS_EV64120
-        bool "Galileo EV64120 Evaluation board (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
-        select DMA_NONCOHERENT
-        select HW_HAS_PCI
-        select PCI_GT64XXX_PCI0
-        select SYS_HAS_CPU_R5000
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_64BIT_KERNEL
-        select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_KGDB
-        help
-          This is an evaluation board based on the Galileo GT-64120
-          single-chip system controller that contains a MIPS R5000 compatible
-          core running at 75/100MHz.  Their website is located at
-          <http://www.marvell.com/>.  Say Y here if you wish to build a
-          kernel for this platform.
 config MACH_JAZZ
        bool "Jazz family of machines"
        select ARC
        select ARC32
        select ARCH_MAY_HAVE_PC_FDC
        select GENERIC_ISA_DMA
-        select I8253
        select I8259
        select ISA
+        select PCSPEAKER
        select SYS_HAS_CPU_R4X00
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
@@ -126,20 +131,6 @@ config MACH_JAZZ
         Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
         Olivetti M700-10 workstations.
-config LASAT
-        bool "LASAT Networks platforms"
-        select DMA_NONCOHERENT
-        select SYS_HAS_EARLY_PRINTK
-        select HW_HAS_PCI
-        select PCI_GT64XXX_PCI0
-        select MIPS_NILE4
-        select R5000_CPU_SCACHE
-        select SYS_HAS_CPU_R5000
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_64BIT_KERNEL if BROKEN
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select GENERIC_HARDIRQS_NO__DO_IRQ
 config MIPS_ATLAS
        bool "MIPS Atlas board"
        select BOOT_ELF32
@@ -173,7 +164,6 @@ config MIPS_MALTA
        bool "MIPS Malta board"
        select ARCH_MAY_HAVE_PC_FDC
        select BOOT_ELF32
-        select HAVE_STD_PC_SERIAL_PORT
        select DMA_NONCOHERENT
        select GENERIC_ISA_DMA
        select IRQ_CPU
@@ -246,11 +236,13 @@ config MIPS_SIM
        select DMA_NONCOHERENT
        select SYS_HAS_EARLY_PRINTK
        select IRQ_CPU
+        select BOOT_RAW
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_HAS_CPU_MIPS32_R2
        select SYS_HAS_EARLY_PRINTK
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_MULTITHREADING
        select SYS_SUPPORTS_LITTLE_ENDIAN
        help
          This option enables support for MIPS Technologies MIPSsim software
@@ -274,50 +266,13 @@ config MOMENCO_OCELOT
          The Ocelot is a MIPS-based Single Board Computer (SBC) made by
          Momentum Computer <http://www.momenco.com/>.
-config MOMENCO_OCELOT_3
-        bool "Momentum Ocelot-3 board"
-        select BOOT_ELF32
-        select DMA_NONCOHERENT
-        select HW_HAS_PCI
-        select IRQ_CPU
-        select IRQ_CPU_RM7K
-        select IRQ_MV64340
-        select PCI_MARVELL
-        select RM7000_CPU_SCACHE
-        select SWAP_IO_SPACE
-        select SYS_HAS_CPU_RM9000
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_64BIT_KERNEL
-        select SYS_SUPPORTS_BIG_ENDIAN
-        help
-          The Ocelot-3 is based off Discovery III System Controller and
-          PMC-Sierra Rm79000 core.
-config MOMENCO_OCELOT_C
-        bool "Momentum Ocelot-C board"
-        select DMA_NONCOHERENT
-        select HW_HAS_PCI
-        select IRQ_CPU
-        select IRQ_MV64340
-        select PCI_MARVELL
-        select RM7000_CPU_SCACHE
-        select SWAP_IO_SPACE
-        select SYS_HAS_CPU_RM7000
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_64BIT_KERNEL
-        select SYS_SUPPORTS_BIG_ENDIAN
-        select GENERIC_HARDIRQS_NO__DO_IRQ
-        help
-          The Ocelot is a MIPS-based Single Board Computer (SBC) made by
-          Momentum Computer <http://www.momenco.com/>.
 config PNX8550_JBS
        bool "Philips PNX8550 based JBS board"
        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 config PNX8550_STB810
-        bool "Support for Philips PNX8550 based STB810 board"
+        bool "Philips PNX8550 based STB810 board"
        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -346,6 +301,27 @@ config MACH_VR41XX
        select SYS_HAS_CPU_VR41XX
        select GENERIC_HARDIRQS_NO__DO_IRQ
+config PMC_MSP
+        bool "PMC-Sierra MSP chipsets"
+        depends on EXPERIMENTAL
+        select DMA_NONCOHERENT
+        select SWAP_IO_SPACE
+        select NO_EXCEPT_FILL
+        select BOOT_RAW
+        select SYS_HAS_CPU_MIPS32_R1
+        select SYS_HAS_CPU_MIPS32_R2
+        select SYS_SUPPORTS_32BIT_KERNEL
+        select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_KGDB
+        select IRQ_CPU
+        select SERIAL_8250
+        select SERIAL_8250_CONSOLE
+        help
+          This adds support for the PMC-Sierra family of Multi-Service
+          Processor System-On-A-Chips.  These parts include a number
+          of integrated peripherals, interfaces and DSPs in addition to
+          a variety of MIPS cores.
 config PMC_YOSEMITE
        bool "PMC-Sierra Yosemite eval board"
        select DMA_COHERENT
@@ -371,9 +347,9 @@ config QEMU
        select DMA_COHERENT
        select GENERIC_ISA_DMA
        select HAVE_STD_PC_SERIAL_PORT
-        select I8253
        select I8259
        select ISA
+        select PCSPEAKER
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_32BIT_KERNEL
@@ -392,7 +368,7 @@ config QEMU
          can be found at http://www.linux-mips.org/wiki/Qemu.
 config MARKEINS
-        bool "Support for NEC EMMA2RH Mark-eins"
+        bool "NEC EMMA2RH Mark-eins"
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select IRQ_CPU
@@ -450,8 +426,7 @@ config SGI_IP27
          here.
 config SGI_IP32
-        bool "SGI IP32 (O2) (EXPERIMENTAL)"
+        bool "SGI IP32 (O2)"
-        depends on EXPERIMENTAL
        select ARC
        select ARC32
        select BOOT_ELF32
@@ -587,9 +562,9 @@ config SNI_RM
        select HW_HAS_EISA
        select HW_HAS_PCI
        select IRQ_CPU
-        select I8253
        select I8259
        select ISA
+        select PCSPEAKER
        select SWAP_IO_SPACE if CPU_BIG_ENDIAN
        select SYS_HAS_CPU_R4X00
        select SYS_HAS_CPU_R5000
@@ -652,6 +627,7 @@ config TOSHIBA_RBTX4938
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_KGDB
        select GENERIC_HARDIRQS_NO__DO_IRQ
+        select GENERIC_GPIO
        help
          This Toshiba board is based on the TX4938 processor. Say Y here to
          support this machine type
@@ -660,9 +636,7 @@ endchoice
 source "arch/mips/au1000/Kconfig"
 source "arch/mips/ddb5xxx/Kconfig"
-source "arch/mips/gt64120/ev64120/Kconfig"
 source "arch/mips/jazz/Kconfig"
-source "arch/mips/lasat/Kconfig"
 source "arch/mips/pmc-sierra/Kconfig"
 source "arch/mips/sgi-ip27/Kconfig"
 source "arch/mips/sibyte/Kconfig"
@@ -721,6 +695,9 @@ config ARC
 config ARCH_MAY_HAVE_PC_FDC
        bool
+config BOOT_RAW
+        bool
 config DMA_COHERENT
        bool
@@ -768,16 +745,19 @@ config MIPS_BONITO64
 config MIPS_MSC
        bool
-config MIPS_NILE4
-        bool
 config MIPS_DISABLE_OBSOLETE_IDE
        bool
+config NO_IOPORT
+        def_bool n
 config GENERIC_ISA_DMA_SUPPORT_BROKEN
        bool
        select ZONE_DMA
+config GENERIC_GPIO
+        bool
 #
 # Endianess selection.  Sufficiently obscure so many users don't know what to
 # answer,so we try hard to limit the available choices.  Also the use of a
@@ -821,7 +801,10 @@ config IRQ_CPU_RM7K
 config IRQ_CPU_RM9K
        bool
-config IRQ_MV64340
+config IRQ_MSP_SLP
+        bool
+config IRQ_MSP_CIC
        bool
 config DDB5XXX_COMMON
@@ -834,6 +817,9 @@ config MIPS_BOARDS_GEN
 config PCI_GT64XXX_PCI0
        bool
+config NO_EXCEPT_FILL
+        bool
 config MIPS_TX3927
        bool
        select HAS_TXX9_SERIAL
@@ -841,14 +827,6 @@ config MIPS_TX3927
 config MIPS_RM9122
        bool
        select SERIAL_RM9000
-        select GPI_RM9000
-        select WDT_RM9000
-config PCI_MARVELL
-        bool
-config SERIAL_RM9000
-        bool
 config PNX8550
        bool
@@ -863,6 +841,7 @@ config SOC_PNX8550
        select SYS_SUPPORTS_32BIT_KERNEL
        select GENERIC_HARDIRQS_NO__DO_IRQ
        select SYS_SUPPORTS_KGDB
+        select GENERIC_GPIO
 config SWAP_IO_SPACE
        bool
@@ -875,31 +854,17 @@ config EMMA2RH
 config SERIAL_RM9000
        bool
-config GPI_RM9000
-        bool
-config WDT_RM9000
-        bool
 #
 # Unfortunately not all GT64120 systems run the chip at the same clock.
 # As the user for the clock rate and try to minimize the available options.
 #
 choice
        prompt "Galileo Chip Clock"
-        #default SYSCLK_83 if MIPS_EV64120
+        depends on MOMENCO_OCELOT
-        depends on MIPS_EV64120 || MOMENCO_OCELOT
-        default SYSCLK_83 if MIPS_EV64120
        default SYSCLK_100 if MOMENCO_OCELOT
-config SYSCLK_75
-        bool "75" if MIPS_EV64120
-config SYSCLK_83
-        bool "83.3" if MIPS_EV64120
 config SYSCLK_100
-        bool "100" if MIPS_EV64120 || MOMENCO_OCELOT
+        bool "100" if MOMENCO_OCELOT
 endchoice
@@ -911,8 +876,9 @@ config BOOT_ELF32
 config MIPS_L1_CACHE_SHIFT
        int
-        default "4" if MACH_DECSTATION || SNI_RM
+        default "4" if MACH_DECSTATION
-        default "7" if SGI_IP27
+        default "7" if SGI_IP27 || SNI_RM
+        default "4" if PMC_MSP4200_EVAL
        default "5"
 config HAVE_STD_PC_SERIAL_PORT
@@ -944,6 +910,16 @@ choice
        prompt "CPU type"
        default CPU_R4X00
+config CPU_LOONGSON2
+        bool "Loongson 2"
+        depends on SYS_HAS_CPU_LOONGSON2
+        select CPU_SUPPORTS_32BIT_KERNEL
+        select CPU_SUPPORTS_64BIT_KERNEL
+        select CPU_SUPPORTS_HIGHMEM
+        help
+          The Loongson 2E processor implements the MIPS III instruction set
+          with many extensions.
 config CPU_MIPS32_R1
        bool "MIPS32 Release 1"
        depends on SYS_HAS_CPU_MIPS32_R1
@@ -1154,6 +1130,9 @@ config CPU_SB1
 endchoice
+config SYS_HAS_CPU_LOONGSON2
+        bool
 config SYS_HAS_CPU_MIPS32_R1
        bool
@@ -1392,6 +1371,7 @@ config MIPS_VPE_LOADER
        depends on SYS_SUPPORTS_MULTITHREADING
        select CPU_MIPSR2_IRQ_VI
        select CPU_MIPSR2_IRQ_EI
+        select CPU_MIPSR2_SRS
        select MIPS_MT
        help
          Includes a loader for loading an elf relocatable object
@@ -1424,6 +1404,19 @@ config MIPS_MT_SMTC_INSTANT_REPLAY
          it off), but ensures that IPIs are handled promptly even under
          heavy I/O interrupt load.
+config MIPS_MT_SMTC_IM_BACKSTOP
+        bool "Use per-TC register bits as backstop for inhibited IM bits"
+        depends on MIPS_MT_SMTC
+        default y
+        help
+          To support multiple TC microthreads acting as "CPUs" within
+          a VPE, VPE-wide interrupt mask bits must be specially manipulated
+          during interrupt handling. To support legacy drivers and interrupt
+          controller management code, SMTC has a "backstop" to track and
+          if necessary restore the interrupt mask. This has some performance
+          impact on interrupt service overhead. Disable it only if you know
+          what you are doing.
 config MIPS_VPE_LOADER_TOM
        bool "Load VPE program into memory hidden from linux"
        depends on MIPS_VPE_LOADER
@@ -1487,6 +1480,15 @@ config CPU_HAS_SMARTMIPS
 config CPU_HAS_WB
        bool
+config 64BIT_CONTEXT
+        bool "Save 64bit integer registers"
+        depends on 32BIT && CPU_LOONGSON2
+        help
+          Loongson2 CPU is 64bit , when used in 32BIT mode, its integer
+          registers can still be accessed as 64bit, mainly for multimedia
+          instructions. We must have all 64bit save/restored to make sure
+          those instructions to get correct result.
 #
 # Vectored interrupt mode is an R2 feature
 #
@@ -1862,7 +1864,7 @@ config MMU
        bool
        default y
-config I8253
+config PCSPEAKER
        bool
 source "drivers/pcmcia/Kconfig"
diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
index 72d5c198e7..3efe117721 100644
--- a/arch/mips/Kconfig.debug
+++ b/arch/mips/Kconfig.debug
@@ -37,7 +37,7 @@ config DEBUG_STACK_USAGE
          This option will slow down process creation somewhat.
-config CONFIG_SMTC_IDLE_HOOK_DEBUG
+config SMTC_IDLE_HOOK_DEBUG
        bool "Enable additional debug checks before going into CPU idle loop"
        depends on DEBUG_KERNEL && MIPS_MT_SMTC
        help
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index f450066b62..20d19c9b77 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -118,6 +118,7 @@ cflags-$(CONFIG_CPU_R4300)	+= -march=r4300 -Wa,--trap
 cflags-$(CONFIG_CPU_VR41XX)     += -march=r4100 -Wa,--trap
 cflags-$(CONFIG_CPU_R4X00)      += -march=r4600 -Wa,--trap
 cflags-$(CONFIG_CPU_TX49XX)     += -march=r4600 -Wa,--trap
+cflags-$(CONFIG_CPU_LOONGSON2)  += -march=r4600 -Wa,--trap
 cflags-$(CONFIG_CPU_MIPS32_R1)  += $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \
                        -Wa,-mips32 -Wa,--trap
 cflags-$(CONFIG_CPU_MIPS32_R2)  += $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \
@@ -283,14 +284,6 @@ load-$(CONFIG_MACH_DECSTATION)	+= 0xffffffff80040000
 CLEAN_FILES                     += drivers/tc/lk201-map.c
 #
-# Galileo EV64120 Board
-#
-core-$(CONFIG_MIPS_EV64120)     += arch/mips/gt64120/ev64120/
-core-$(CONFIG_MIPS_EV64120)     += arch/mips/gt64120/common/
-cflags-$(CONFIG_MIPS_EV64120)   += -Iinclude/asm-mips/mach-ev64120
-load-$(CONFIG_MIPS_EV64120)     += 0xffffffff80100000
-#
 # Wind River PPMC Board (4KC + GT64120)
 #
 core-$(CONFIG_WR_PPMC)          += arch/mips/gt64120/wrppmc/
@@ -298,6 +291,13 @@ cflags-$(CONFIG_WR_PPMC)		+= -Iinclude/asm-mips/mach-wrppmc
 load-$(CONFIG_WR_PPMC)          += 0xffffffff80100000
 #
+# lemote fulong mini-PC board
+#
+core-$(CONFIG_LEMOTE_FULONG) +=arch/mips/lemote/lm2e/
+load-$(CONFIG_LEMOTE_FULONG) +=0xffffffff80100000
+cflags-$(CONFIG_LEMOTE_FULONG) += -Iinclude/asm-mips/mach-lemote
+#
 # For all MIPS, Inc. eval boards
 #
 core-$(CONFIG_MIPS_BOARDS_GEN)  += arch/mips/mips-boards/generic/
@@ -327,7 +327,7 @@ load-$(CONFIG_MIPS_SEAD)	+= 0xffffffff80100000
 #
 # MIPS SIM
 #
-core-$(CONFIG_MIPS_SIM)         += arch/mips/mips-boards/sim/
+core-$(CONFIG_MIPS_SIM)         += arch/mips/mipssim/
 cflags-$(CONFIG_MIPS_SIM)       += -Iinclude/asm-mips/mach-sim
 load-$(CONFIG_MIPS_SIM)         += 0x80100000
@@ -343,12 +343,12 @@ cflags-$(CONFIG_MOMENCO_OCELOT)	+= -Iinclude/asm-mips/mach-ocelot
 load-$(CONFIG_MOMENCO_OCELOT)   += 0xffffffff80100000
 #
-# Momentum Ocelot-C and -CS boards
+# PMC-Sierra MSP SOCs
 #
-# The Ocelot-C[S] setup.o must be linked early - it does the ioremap() for the
+core-$(CONFIG_PMC_MSP)          += arch/mips/pmc-sierra/msp71xx/
-# mips_io_port_base.
+cflags-$(CONFIG_PMC_MSP)        += -Iinclude/asm-mips/pmc-sierra/msp71xx \
-core-$(CONFIG_MOMENCO_OCELOT_C) += arch/mips/momentum/ocelot_c/
+                                        -mno-branch-likely
-load-$(CONFIG_MOMENCO_OCELOT_C) += 0xffffffff80100000
+load-$(CONFIG_PMC_MSP)          += 0xffffffff80100000
 #
 # PMC-Sierra Yosemite
@@ -365,13 +365,6 @@ cflags-$(CONFIG_QEMU)		+= -Iinclude/asm-mips/mach-qemu
 load-$(CONFIG_QEMU)             += 0xffffffff80010000
 #
-# Momentum Ocelot-3
-#
-core-$(CONFIG_MOMENCO_OCELOT_3)         += arch/mips/momentum/ocelot_3/
-cflags-$(CONFIG_MOMENCO_OCELOT_3)       += -Iinclude/asm-mips/mach-ocelot3
-load-$(CONFIG_MOMENCO_OCELOT_3)         += 0xffffffff80100000
-#
 # Basler eXcite
 #
 core-$(CONFIG_BASLER_EXCITE)    += arch/mips/basler/excite/
@@ -389,10 +382,6 @@ core-$(CONFIG_DDB5XXX_COMMON)	+= arch/mips/ddb5xxx/common/
 core-$(CONFIG_DDB5477)          += arch/mips/ddb5xxx/ddb5477/
 load-$(CONFIG_DDB5477)          += 0xffffffff80100000
-core-$(CONFIG_LASAT)            += arch/mips/lasat/
-cflags-$(CONFIG_LASAT)          += -Iinclude/asm-mips/mach-lasat
-load-$(CONFIG_LASAT)            += 0xffffffff80000000
 #
 # Common VR41xx
 #
@@ -580,6 +569,7 @@ load-$(CONFIG_TOSHIBA_JMR3927)	+= 0xffffffff80050000
 #
 core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/tx4927/toshiba_rbtx4927/
 core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/tx4927/common/
+cflags-$(CONFIG_TOSHIBA_RBTX4927) += -Iinclude/asm-mips/mach-tx49xx
 load-$(CONFIG_TOSHIBA_RBTX4927) += 0xffffffff80020000
 #
@@ -587,6 +577,7 @@ load-$(CONFIG_TOSHIBA_RBTX4927)	+= 0xffffffff80020000
 #
 core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/toshiba_rbtx4938/
 core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/common/
+cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
 load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
 cflags-y                        += -Iinclude/asm-mips/mach-generic
@@ -603,7 +594,8 @@ JIFFIES			= jiffies_64
 endif
 AFLAGS          += $(cflags-y)
-CFLAGS          += $(cflags-y)
+CFLAGS          += $(cflags-y) \
+                        -D"VMLINUX_LOAD_ADDRESS=$(load-y)"
 LDFLAGS                 += -m $(ld-emul)
@@ -633,18 +625,11 @@ CPPFLAGS_vmlinux.lds := \
 head-y := arch/mips/kernel/head.o arch/mips/kernel/init_task.o
 libs-y                  += arch/mips/lib/
-libs-$(CONFIG_32BIT)    += arch/mips/lib-32/
-libs-$(CONFIG_64BIT)    += arch/mips/lib-64/
 core-y                  += arch/mips/kernel/ arch/mips/mm/ arch/mips/math-emu/
 drivers-$(CONFIG_OPROFILE)      += arch/mips/oprofile/
-ifdef CONFIG_LASAT
-rom.bin rom.sw: vmlinux
-        $(Q)$(MAKE) $(build)=arch/mips/lasat/image $@
-endif
 #
 # Some machines like the Indy need 32-bit ELF binaries for booting purposes.
 # Other need ECOFF, so we build a 32-bit ELF binary for them which we then
@@ -702,32 +687,19 @@ vmlinux.srec: $(vmlinux-32)
 CLEAN_FILES += vmlinux.ecoff \
               vmlinux.srec
+archprepare:
+ifdef CONFIG_MIPS32_N32
+        @echo '  Checking missing-syscalls for N32'
+        $(Q)$(MAKE) $(build)=. missing-syscalls EXTRA_CFLAGS="-mabi=n32"
+endif
+ifdef CONFIG_MIPS32_O32
+        @echo '  Checking missing-syscalls for O32'
+        $(Q)$(MAKE) $(build)=. missing-syscalls EXTRA_CFLAGS="-mabi=32"
+endif
 archclean:
        @$(MAKE) $(clean)=arch/mips/boot
-        @$(MAKE) $(clean)=arch/mips/lasat
 CLEAN_FILES += vmlinux.32 \
               vmlinux.64 \
               vmlinux.ecoff
-quiet_cmd_syscalls_n32 = CALL-N32 $<
-      cmd_syscalls_n32 = $(CONFIG_SHELL) $< $(CC) $(c_flags) -mabi=n32
-quiet_cmd_syscalls_o32 = CALL-O32 $<
-      cmd_syscalls_o32 = $(CONFIG_SHELL) $< $(CC) $(c_flags) -mabi=32
-PHONY += missing-syscalls-n32 missing-syscalls-o32
-missing-syscalls-n32: scripts/checksyscalls.sh FORCE
-        $(call cmd,syscalls_n32)
-missing-syscalls-o32: scripts/checksyscalls.sh FORCE
-        $(call cmd,syscalls_o32)
-archprepare:
-ifdef CONFIG_MIPS32_N32
-        $(Q)$(MAKE) $(build)=arch/mips missing-syscalls-n32
-endif
-ifdef CONFIG_MIPS32_O32
-        $(Q)$(MAKE) $(build)=arch/mips missing-syscalls-o32
-endif
diff --git a/arch/mips/au1000/common/gpio.c b/arch/mips/au1000/common/gpio.c
index ce55297dcb..7abe420994 100644
--- a/arch/mips/au1000/common/gpio.c
+++ b/arch/mips/au1000/common/gpio.c
@@ -1,4 +1,7 @@
 /*
+ *  Copyright (C) 2007, OpenWrt.org, Florian Fainelli <florian@openwrt.org>
+ *      Architecture specific GPIO support
+ *
 *  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
@@ -18,101 +21,136 @@
 *  You should have received a copy of the  GNU General Public License along
 *  with this program; if not, write  to the Free Software Foundation, Inc.,
 *  675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *  Notes :
+ *      au1000 SoC have only one GPIO line : GPIO1
+ *      others have a second one : GPIO2
 */
+#include <linux/autoconf.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/types.h>
 #include <linux/module.h>
-#include <au1000.h>
-#include <au1xxx_gpio.h>
+#include <asm/addrspace.h>
+#include <asm/mach-au1x00/au1000.h>
+#include <asm/gpio.h>
 #define gpio1 sys
 #if !defined(CONFIG_SOC_AU1000)
-static AU1X00_GPIO2 * const gpio2 = (AU1X00_GPIO2 *)GPIO2_BASE;
-#define GPIO2_OUTPUT_ENABLE_MASK 0x00010000
+static struct au1x00_gpio2 *const gpio2 = (struct au1x00_gpio2 *) GPIO2_BASE;
+#define GPIO2_OUTPUT_ENABLE_MASK        0x00010000
-int au1xxx_gpio2_read(int signal)
+static int au1xxx_gpio2_read(unsigned gpio)
 {
-        signal -= 200;
+        gpio -= AU1XXX_GPIO_BASE;
-/*      gpio2->dir &= ~(0x01 << signal);                                                //Set GPIO to input */
+        return ((gpio2->pinstate >> gpio) & 0x01);
-        return ((gpio2->pinstate >> signal) & 0x01);
 }
-void au1xxx_gpio2_write(int signal, int value)
+static void au1xxx_gpio2_write(unsigned gpio, int value)
 {
-        signal -= 200;
+        gpio -= AU1XXX_GPIO_BASE;
-        gpio2->output = (GPIO2_OUTPUT_ENABLE_MASK << signal) |
+        gpio2->output = (GPIO2_OUTPUT_ENABLE_MASK << gpio) | (value << gpio);
-                (value << signal);
 }
-void au1xxx_gpio2_tristate(int signal)
+static int au1xxx_gpio2_direction_input(unsigned gpio)
 {
-        signal -= 200;
+        gpio -= AU1XXX_GPIO_BASE;
-        gpio2->dir &= ~(0x01 << signal);        /* Set GPIO to input */
+        gpio2->dir &= ~(0x01 << gpio);
+        return 0;
 }
-#endif
-int au1xxx_gpio1_read(int signal)
+static int au1xxx_gpio2_direction_output(unsigned gpio, int value)
+{
+        gpio -= AU1XXX_GPIO_BASE;
+        gpio2->dir = (0x01 << gpio) | (value << gpio);
+        return 0;
+}
+#endif /* !defined(CONFIG_SOC_AU1000) */
+static int au1xxx_gpio1_read(unsigned gpio)
 {
-/*      gpio1->trioutclr |= (0x01 << signal); */
+        return ((gpio1->pinstaterd >> gpio) & 0x01);
-        return ((gpio1->pinstaterd >> signal) & 0x01);
 }
-void au1xxx_gpio1_write(int signal, int value)
+static void au1xxx_gpio1_write(unsigned gpio, int value)
 {
-        if(value)
+        if (value)
-                gpio1->outputset = (0x01 << signal);
+                gpio1->outputset = (0x01 << gpio);
        else
-                gpio1->outputclr = (0x01 << signal);    /* Output a Zero */
+                /* Output a zero */
+                gpio1->outputclr = (0x01 << gpio);
 }
-void au1xxx_gpio1_tristate(int signal)
+static int au1xxx_gpio1_direction_input(unsigned gpio)
 {
-        gpio1->trioutclr = (0x01 << signal);            /* Tristate signal */
+        gpio1->pininputen = (0x01 << gpio);
+        return 0;
 }
+static int au1xxx_gpio1_direction_output(unsigned gpio, int value)
+{
+        gpio1->trioutclr = (0x01 & gpio);
+        return 0;
+}
-int au1xxx_gpio_read(int signal)
+int au1xxx_gpio_get_value(unsigned gpio)
 {
-        if(signal >= 200)
+        if (gpio >= AU1XXX_GPIO_BASE)
 #if defined(CONFIG_SOC_AU1000)
                return 0;
 #else
-                return au1xxx_gpio2_read(signal);
+                return au1xxx_gpio2_read(gpio);
 #endif
        else
-                return au1xxx_gpio1_read(signal);
+                return au1xxx_gpio1_read(gpio);
 }
-void au1xxx_gpio_write(int signal, int value)
+EXPORT_SYMBOL(au1xxx_gpio_get_value);
+void au1xxx_gpio_set_value(unsigned gpio, int value)
 {
-        if(signal >= 200)
+        if (gpio >= AU1XXX_GPIO_BASE)
 #if defined(CONFIG_SOC_AU1000)
                ;
 #else
-                au1xxx_gpio2_write(signal, value);
+                au1xxx_gpio2_write(gpio, value);
 #endif
        else
-                au1xxx_gpio1_write(signal, value);
+                au1xxx_gpio1_write(gpio, value);
 }
-void au1xxx_gpio_tristate(int signal)
+EXPORT_SYMBOL(au1xxx_gpio_set_value);
+int au1xxx_gpio_direction_input(unsigned gpio)
 {
-        if(signal >= 200)
+        if (gpio >= AU1XXX_GPIO_BASE)
 #if defined(CONFIG_SOC_AU1000)
                ;
 #else
-                au1xxx_gpio2_tristate(signal);
+                return au1xxx_gpio2_direction_input(gpio);
 #endif
        else
-                au1xxx_gpio1_tristate(signal);
+                return au1xxx_gpio1_direction_input(gpio);
 }
-void au1xxx_gpio1_set_inputs(void)
+EXPORT_SYMBOL(au1xxx_gpio_direction_input);
+int au1xxx_gpio_direction_output(unsigned gpio, int value)
 {
-        gpio1->pininputen = 0;
+        if (gpio >= AU1XXX_GPIO_BASE)
+#if defined(CONFIG_SOC_AU1000)
+                ;
+#else
+                return au1xxx_gpio2_direction_output(gpio, value);
+#endif
+        else
+                return au1xxx_gpio1_direction_output(gpio, value);
 }
-EXPORT_SYMBOL(au1xxx_gpio1_set_inputs);
+EXPORT_SYMBOL(au1xxx_gpio_direction_output);
-EXPORT_SYMBOL(au1xxx_gpio_tristate);
-EXPORT_SYMBOL(au1xxx_gpio_write);
-EXPORT_SYMBOL(au1xxx_gpio_read);
diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c
index 8fd203d4a3..d51e18fb78 100644
--- a/arch/mips/au1000/common/platform.c
+++ b/arch/mips/au1000/common/platform.c
@@ -289,7 +289,7 @@ static struct platform_device *au1xxx_platform_devices[] __initdata = {
 #endif
 };
-int au1xxx_platform_init(void)
+int __init au1xxx_platform_init(void)
 {
        return platform_add_devices(au1xxx_platform_devices, ARRAY_SIZE(au1xxx_platform_devices));
 }
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c
index 13fe187f35..a95b377731 100644
--- a/arch/mips/au1000/common/setup.c
+++ b/arch/mips/au1000/common/setup.c
@@ -100,18 +100,9 @@ void __init plat_mem_setup(void)
        argptr = prom_getcmdline();
        /* default panel */
        /*strcat(argptr, " video=au1100fb:panel:Sharp_320x240_16");*/
-#ifdef CONFIG_MIPS_HYDROGEN3
-         strcat(argptr, " video=au1100fb:panel:Hydrogen_3_NEC_panel_320x240,nohwcursor");
-#endif
    }
 #endif
-#ifdef CONFIG_FB_XPERT98
-        if ((argptr = strstr(argptr, "video=")) == NULL) {
-                argptr = prom_getcmdline();
-                strcat(argptr, " video=atyfb:1024x768-8@70");
-        }
-#endif
 #if defined(CONFIG_SOUND_AU1X00) && !defined(CONFIG_SOC_AU1000)
        /* au1000 does not support vra, au1500 and au1100 do */
diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c
index fa1c62f055..8fc29982d7 100644
--- a/arch/mips/au1000/common/time.c
+++ b/arch/mips/au1000/common/time.c
@@ -203,11 +203,7 @@ wakeup_counter0_set(int ticks)
 /* I haven't found anyone that doesn't use a 12 MHz source clock,
 * but just in case.....
 */
-#ifdef CONFIG_AU1000_SRC_CLK
-#define AU1000_SRC_CLK  CONFIG_AU1000_SRC_CLK
-#else
 #define AU1000_SRC_CLK  12000000
-#endif
 /*
 * We read the real processor speed from the PLL.  This is important
@@ -247,33 +243,8 @@ unsigned long cal_r4koff(void)
                au_writel (0, SYS_TOYWRITE);
                while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S);
-#if defined(CONFIG_AU1000_USE32K)
-                {
-                        unsigned long start, end, count;
-                        start = au_readl(SYS_RTCREAD);
-                        start += 2;
-                        /* wait for the beginning of a new tick
-                        */
-                        while (au_readl(SYS_RTCREAD) < start);
-                        /* Start r4k counter.
-                        */
-                        write_c0_count(0);
-                        /* Wait 0.5 seconds.
-                        */
-                        end = start + (32768 / trim_divide)/2;
-                        while (end > au_readl(SYS_RTCREAD));
-                        count = read_c0_count();
-                        cpu_speed = count * 2;
-                }
-#else
                cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) *
                        AU1000_SRC_CLK;
-#endif
        }
        else {
                /* The 32KHz oscillator isn't running, so assume there
diff --git a/arch/mips/au1000/pb1100/init.c b/arch/mips/au1000/pb1100/init.c
index 1fae39a608..6131b56f41 100644
--- a/arch/mips/au1000/pb1100/init.c
+++ b/arch/mips/au1000/pb1100/init.c
@@ -53,7 +53,7 @@ void __init prom_init(void)
        prom_argc = fw_arg0;
        prom_argv = (char **) fw_arg1;
-        prom_envp = (int *) fw_arg3;
+        prom_envp = (char **) fw_arg3;
        mips_machgroup = MACH_GROUP_ALCHEMY;
        mips_machtype = MACH_PB1100;
diff --git a/arch/mips/au1000/pb1200/board_setup.c b/arch/mips/au1000/pb1200/board_setup.c
index 043302b7fe..eea2092bde 100644
--- a/arch/mips/au1000/pb1200/board_setup.c
+++ b/arch/mips/au1000/pb1200/board_setup.c
@@ -131,14 +131,7 @@ void __init board_setup(void)
        /* The Pb1200 development board uses external MUX for PSC0 to
        support SMB/SPI. bcsr->resets bit 12: 0=SMB 1=SPI
        */
-#if defined(CONFIG_AU1XXX_PSC_SPI) && defined(CONFIG_I2C_AU1550)
+#ifdef CONFIG_I2C_AU1550
-        #error I2C and SPI are mutually exclusive. Both are physically connected to PSC0.\
-                        Refer to Pb1200/Db1200 documentation.
-#elif defined( CONFIG_AU1XXX_PSC_SPI )
-        bcsr->resets |= BCSR_RESETS_PCS0MUX;
-        /*Hard Coding Value to enable Temp Sensors [bit 14] Value for SOC Au1200. Pls refer documentation*/
-          bcsr->resets =0x900f;
-#elif defined( CONFIG_I2C_AU1550 )
        bcsr->resets &= (~BCSR_RESETS_PCS0MUX);
 #endif
        au_sync();
diff --git a/arch/mips/au1000/pb1500/board_setup.c b/arch/mips/au1000/pb1500/board_setup.c
index 0ffdb4fd57..c9b655616f 100644
--- a/arch/mips/au1000/pb1500/board_setup.c
+++ b/arch/mips/au1000/pb1500/board_setup.c
@@ -125,7 +125,7 @@ void __init board_setup(void)
                au_writel((au_readl(0xac000028) | 0x20), 0xac000028);
        }
        /* Put the clock in BCD mode */
-        if (readl(0xac00002C) & 0x4) { /* reg B */
+        if (au_readl(0xac00002C) & 0x4) { /* reg B */
                au_writel(au_readl(0xac00002c) & ~0x4, 0xac00002c);
                au_sync();
        }
diff --git a/arch/mips/basler/excite/excite_setup.c b/arch/mips/basler/excite/excite_setup.c
index 2f0e4c08eb..56003188f1 100644
--- a/arch/mips/basler/excite/excite_setup.c
+++ b/arch/mips/basler/excite/excite_setup.c
@@ -26,6 +26,7 @@
 #include <linux/tty.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
+#include <linux/serial_8250.h>
 #include <linux/ioport.h>
 #include <linux/spinlock.h>
 #include <asm/bootinfo.h>
diff --git a/arch/mips/cobalt/pci.c b/arch/mips/cobalt/pci.c
index d91027f43d..cfce7af1bc 100644
--- a/arch/mips/cobalt/pci.c
+++ b/arch/mips/cobalt/pci.c
@@ -35,6 +35,7 @@ static struct pci_controller cobalt_pci_controller = {
        .mem_resource   = &cobalt_mem_resource,
        .io_resource    = &cobalt_io_resource,
        .io_offset      = 0 - GT_DEF_PCI0_IO_BASE,
+        .io_map_base    = CKSEG1ADDR(GT_DEF_PCI0_IO_BASE),
 };
 static int __init cobalt_pci_init(void)
diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig
index 39e251300c..129e2c961f 100644
--- a/arch/mips/configs/atlas_defconfig
+++ b/arch/mips/configs/atlas_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 CONFIG_MIPS_ATLAS=y
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_MIPS_ATLAS=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index 4713a13211..dc3e1bf4e4 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig
index 5e7ae56b1f..4c7031222e 100644
--- a/arch/mips/configs/capcella_defconfig
+++ b/arch/mips/configs/capcella_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig
index 631b2138ad..c8c05785a8 100644
--- a/arch/mips/configs/cobalt_defconfig
+++ b/arch/mips/configs/cobalt_defconfig
@@ -1,44 +1,24 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc7
+# Linux kernel version: 2.6.22-rc2
-# Wed Apr 18 14:25:45 2007
+# Fri May 25 11:17:29 2007
 #
 CONFIG_MIPS=y
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
+# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
 # CONFIG_BASLER_EXCITE is not set
 CONFIG_MIPS_COBALT=y
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
-# CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_DDB5477 is not set
@@ -138,7 +118,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
@@ -178,6 +158,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
 # CONFIG_BLK_DEV_INITRD is not set
@@ -193,14 +174,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -233,16 +219,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_HW_HAS_PCI=y
 CONFIG_PCI=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_MMU=y
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
@@ -268,7 +251,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -300,11 +282,11 @@ CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
+# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
-CONFIG_NETWORK_SECMARK=y
+# CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
 #
@@ -345,13 +327,16 @@ CONFIG_NETWORK_SECMARK=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
-CONFIG_IEEE80211=y
+# CONFIG_AF_RXRPC is not set
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=y
+#
-CONFIG_IEEE80211_CRYPT_CCMP=y
+# Wireless
-CONFIG_IEEE80211_SOFTMAC=y
+#
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+# CONFIG_CFG80211 is not set
-CONFIG_WIRELESS_EXT=y
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -370,10 +355,6 @@ CONFIG_FW_LOADER=y
 #
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -418,7 +399,6 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 #
 # Mapping drivers for chip access
@@ -445,16 +425,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=0
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
 #
-# OneNAND Flash Device Drivers
+# UBI - Unsorted block images
 #
-# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_UBI is not set
 #
 # Parallel port support
@@ -479,87 +456,145 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_RAM is not set
-CONFIG_CDROM_PKTCDVD=y
+# CONFIG_CDROM_PKTCDVD is not set
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=y
 #
 # Misc devices
 #
-CONFIG_SGI_IOC4=y
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
+# CONFIG_IDE is not set
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=y
-CONFIG_IDE_MAX_HWIFS=4
-CONFIG_BLK_DEV_IDE=y
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_IDEPCI_SHARE_IRQ is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_PIIX is not set
-CONFIG_BLK_DEV_IT8213=y
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-CONFIG_BLK_DEV_VIA82CXXX=y
-CONFIG_BLK_DEV_TC86C001=y
-# CONFIG_IDE_ARM is not set
-CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_BLK_DEV_HD is not set
 #
 # SCSI device support
 #
 CONFIG_RAID_ATTRS=y
-# CONFIG_SCSI is not set
+CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
-#
+# SCSI support type (disk, tape, CD-ROM)
-# CONFIG_ATA is not set
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+#
+# SCSI low-level drivers
+#
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_ESP_CORE is not set
+# CONFIG_SCSI_SRP is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+CONFIG_PATA_VIA=y
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_PLATFORM is not set
 #
 # Multi-device support (RAID and LVM)
@@ -570,10 +605,14 @@ CONFIG_RAID_ATTRS=y
 # Fusion MPT device support
 #
 # CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
@@ -594,24 +633,7 @@ CONFIG_NETDEVICES=y
 # ARCnet devices
 #
 # CONFIG_ARCNET is not set
+# CONFIG_PHYLIB is not set
-#
-# PHY device support
-#
-CONFIG_PHYLIB=y
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=y
-CONFIG_DAVICOM_PHY=y
-CONFIG_QSEMI_PHY=y
-CONFIG_LXT_PHY=y
-CONFIG_CICADA_PHY=y
-CONFIG_VITESSE_PHY=y
-CONFIG_SMSC_PHY=y
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_FIXED_PHY is not set
 #
 # Ethernet (10 or 100Mbit)
@@ -639,35 +661,8 @@ CONFIG_TULIP=y
 # CONFIG_ULI526X is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
+# CONFIG_NETDEV_1000 is not set
-#
+# CONFIG_NETDEV_10000 is not set
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-CONFIG_QLA3XXX=y
-# CONFIG_ATL1 is not set
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_CHELSIO_T1 is not set
-CONFIG_CHELSIO_T3=y
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_MYRI10GE is not set
-CONFIG_NETXEN_NIC=y
 #
 # Token Ring devices
@@ -675,18 +670,16 @@ CONFIG_NETXEN_NIC=y
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
@@ -711,10 +704,7 @@ CONFIG_INPUT=y
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 # CONFIG_INPUT_EVDEV is not set
@@ -726,18 +716,23 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_PCSPKR is not set
+CONFIG_INPUT_COBALT_BTNS=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_UINPUT is not set
+CONFIG_INPUT_POLLDEV=y
 #
 # Hardware I/O ports
 #
-CONFIG_SERIO=y
+# CONFIG_SERIO is not set
-# CONFIG_SERIO_I8042 is not set
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_LIBPS2 is not set
-CONFIG_SERIO_RAW=y
 # CONFIG_GAMEPORT is not set
 #
@@ -754,7 +749,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
 #
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_PCI=y
+# CONFIG_SERIAL_8250_PCI is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
@@ -773,16 +768,11 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
 # CONFIG_GEN_RTC is not set
 CONFIG_COBALT_LCD=y
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_DRM is not set
@@ -792,10 +782,7 @@ CONFIG_COBALT_LCD=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -808,12 +795,7 @@ CONFIG_COBALT_LCD=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 # CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multifunction device drivers
@@ -824,16 +806,19 @@ CONFIG_COBALT_LCD=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 #
@@ -868,10 +853,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -912,18 +893,30 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
 #
-# RTC drivers
+# I2C RTC drivers
+#
+#
+# SPI RTC drivers
+#
+#
+# Platform RTC drivers
 #
 CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_TEST is not set
 # CONFIG_RTC_DRV_V3020 is not set
 #
+# on-CPU RTC drivers
+#
+#
 # DMA Engine support
 #
 # CONFIG_DMA_ENGINE is not set
@@ -937,14 +930,6 @@ CONFIG_RTC_DRV_CMOS=y
 #
 #
-# Auxiliary Display support
-#
-#
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -952,8 +937,13 @@ CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 # CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
 # CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
@@ -969,7 +959,7 @@ CONFIG_INOTIFY_USER=y
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
-CONFIG_FUSE_FS=y
+# CONFIG_FUSE_FS is not set
 CONFIG_GENERIC_ACL=y
 #
@@ -1003,7 +993,6 @@ CONFIG_CONFIGFS_FS=y
 #
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
-# CONFIG_ECRYPT_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
@@ -1021,13 +1010,23 @@ CONFIG_CONFIGFS_FS=y
 # Network File Systems
 #
 CONFIG_NFS_FS=y
-# CONFIG_NFS_V3 is not set
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
 # CONFIG_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_TCP=y
 CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1051,10 +1050,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Distributed Lock Manager
 #
-CONFIG_DLM=y
+# CONFIG_DLM is not set
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
-# CONFIG_DLM_DEBUG is not set
 #
 # Profiling support
@@ -1072,72 +1068,30 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CROSSCOMPILE=y
 CONFIG_CMDLINE=""
 #
 # Security options
 #
-CONFIG_KEYS=y
+# CONFIG_KEYS is not set
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
 # CONFIG_SECURITY is not set
 #
 # Cryptographic options
 #
-CONFIG_CRYPTO=y
+# CONFIG_CRYPTO is not set
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_WP512=y
-CONFIG_CRYPTO_TGR192=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_PCBC=y
-CONFIG_CRYPTO_LRW=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_FCRYPT=y
-CONFIG_CRYPTO_BLOWFISH=y
-CONFIG_CRYPTO_TWOFISH=y
-CONFIG_CRYPTO_TWOFISH_COMMON=y
-CONFIG_CRYPTO_SERPENT=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_CAST5=y
-CONFIG_CRYPTO_CAST6=y
-CONFIG_CRYPTO_TEA=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_KHAZAD=y
-CONFIG_CRYPTO_ANUBIS=y
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CAMELLIA=y
-#
-# Hardware crypto devices
-#
 #
 # Library routines
 #
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
-CONFIG_CRC16=y
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig
index 10f6af4375..ec60beb888 100644
--- a/arch/mips/configs/db1000_defconfig
+++ b/arch/mips/configs/db1000_defconfig
@@ -26,9 +26,7 @@ CONFIG_MIPS_DB1000=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -36,8 +34,6 @@ CONFIG_MIPS_DB1000=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig
index 4b08629277..f3c25f08bf 100644
--- a/arch/mips/configs/db1100_defconfig
+++ b/arch/mips/configs/db1100_defconfig
@@ -26,9 +26,7 @@ CONFIG_MIPS_DB1100=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -36,8 +34,6 @@ CONFIG_MIPS_DB1100=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig
index 820659e810..6d400befba 100644
--- a/arch/mips/configs/db1200_defconfig
+++ b/arch/mips/configs/db1200_defconfig
@@ -26,9 +26,7 @@ CONFIG_MIPS_DB1200=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -36,8 +34,6 @@ CONFIG_MIPS_DB1200=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig
index 4050b9b91b..82aea6e088 100644
--- a/arch/mips/configs/db1500_defconfig
+++ b/arch/mips/configs/db1500_defconfig
@@ -26,9 +26,7 @@ CONFIG_MIPS_DB1500=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -36,8 +34,6 @@ CONFIG_MIPS_DB1500=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig
index 7b3519058a..82697714a9 100644
--- a/arch/mips/configs/db1550_defconfig
+++ b/arch/mips/configs/db1550_defconfig
@@ -26,9 +26,7 @@ CONFIG_MIPS_DB1550=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -36,8 +34,6 @@ CONFIG_MIPS_DB1550=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig
index 5b502a2013..a42ab9ae7d 100644
--- a/arch/mips/configs/ddb5477_defconfig
+++ b/arch/mips/configs/ddb5477_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig
index 4bbdab078f..d6e3fffbc8 100644
--- a/arch/mips/configs/decstation_defconfig
+++ b/arch/mips/configs/decstation_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 CONFIG_MACH_DECSTATION=y
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_MACH_DECSTATION=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig
index b5714a6a53..78f5004fb7 100644
--- a/arch/mips/configs/e55_defconfig
+++ b/arch/mips/configs/e55_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/emma2rh_defconfig b/arch/mips/configs/emma2rh_defconfig
index 3044579f17..b29bff0f56 100644
--- a/arch/mips/configs/emma2rh_defconfig
+++ b/arch/mips/configs/emma2rh_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
@@ -951,8 +947,7 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_RTC=m
-CONFIG_GEN_RTC=m
+# CONFIG_GEN_RTC is not set
-CONFIG_GEN_RTC_X=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig
deleted file mode 100644
index c10e4e0632..0000000000
--- a/arch/mips/configs/ev64120_defconfig
+++ /dev/null
@@ -1,985 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:30 2007
-#
-CONFIG_MIPS=y
-#
-# Machine selection
-#
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
-# CONFIG_BASLER_EXCITE is not set
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MACH_DECSTATION is not set
-CONFIG_MIPS_EV64120=y
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
-# CONFIG_MIPS_ATLAS is not set
-# CONFIG_MIPS_MALTA is not set
-# CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
-# CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
-# CONFIG_MIPS_XXS1500 is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TOSHIBA_RBTX4938 is not set
-# CONFIG_EVB_PCI1 is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_TIME=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_CPU_LITTLE_ENDIAN is not set
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-CONFIG_MIPS_GT64120=y
-# CONFIG_SYSCLK_75 is not set
-# CONFIG_SYSCLK_83 is not set
-CONFIG_SYSCLK_100=y
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-#
-# CPU selection
-#
-# CONFIG_CPU_MIPS32_R1 is not set
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_VR41XX is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_TX49XX is not set
-CONFIG_CPU_R5000=y
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_SYS_HAS_CPU_R5000=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
-#
-# Kernel type
-#
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_64KB is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
-# CONFIG_64BIT_PHYS_ADDR is not set
-CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
-# CONFIG_HZ_48 is not set
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
-# CONFIG_HZ_1024 is not set
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_KEXEC is not set
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_RELAY=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_EMBEDDED=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SHMEM=y
-CONFIG_SLAB=y
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_KMOD is not set
-#
-# Block layer
-#
-CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-#
-# Bus options (PCI, PCMCIA, EISA, ISA, TC)
-#
-CONFIG_HW_HAS_PCI=y
-CONFIG_PCI=y
-CONFIG_MMU=y
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-# CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
-# CONFIG_HOTPLUG_PCI is not set
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-CONFIG_TRAD_SIGNALS=y
-#
-# Power management options
-#
-CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
-#
-# Networking
-#
-CONFIG_NET=y
-#
-# Networking options
-#
-# CONFIG_NETDEBUG is not set
-# CONFIG_PACKET is not set
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_MIGRATE=y
-CONFIG_NET_KEY=y
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_DHCP is not set
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
-# CONFIG_IPV6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
-CONFIG_NETWORK_SECMARK=y
-# CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_WIRELESS_EXT=y
-#
-# Device Drivers
-#
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=m
-# CONFIG_SYS_HYPERVISOR is not set
-#
-# Connector - unified userspace <-> kernelspace linker
-#
-CONFIG_CONNECTOR=m
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-#
-# Block devices
-#
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-#
-# Misc devices
-#
-CONFIG_SGI_IOC4=m
-# CONFIG_TIFM_CORE is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
-# CONFIG_IDE is not set
-#
-# SCSI device support
-#
-CONFIG_RAID_ATTRS=m
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_NETLINK is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-# CONFIG_ATA is not set
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_IEEE1394 is not set
-#
-# I2O device support
-#
-# CONFIG_I2O is not set
-#
-# Network device support
-#
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-#
-# PHY device support
-#
-CONFIG_PHYLIB=m
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_FIXED_PHY is not set
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_CASSINI is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_DM9000 is not set
-#
-# Tulip family network device support
-#
-# CONFIG_NET_TULIP is not set
-# CONFIG_HP100 is not set
-# CONFIG_NET_PCI is not set
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-CONFIG_QLA3XXX=m
-# CONFIG_ATL1 is not set
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_CHELSIO_T1 is not set
-CONFIG_CHELSIO_T3=m
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_MYRI10GE is not set
-CONFIG_NETXEN_NIC=m
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PPP=y
-# CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPP_FILTER is not set
-CONFIG_PPP_ASYNC=y
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPP_DEFLATE is not set
-# CONFIG_PPP_BSDCOMP is not set
-CONFIG_PPP_MPPE=m
-# CONFIG_PPPOE is not set
-# CONFIG_SLIP is not set
-CONFIG_SLHC=y
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-# CONFIG_SERIO_I8042 is not set
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_LIBPS2 is not set
-CONFIG_SERIO_RAW=m
-# CONFIG_GAMEPORT is not set
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_SERIAL_JSM is not set
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-# CONFIG_DRM is not set
-# CONFIG_RAW_DRIVER is not set
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-#
-# SPI support
-#
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-#
-# Dallas's 1-wire bus
-#
-# CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-#
-# Graphics support
-#
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB is not set
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-#
-# HID Devices
-#
-# CONFIG_HID is not set
-#
-# USB support
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
-# CONFIG_MMC is not set
-#
-# LED devices
-#
-# CONFIG_NEW_LEDS is not set
-#
-# LED drivers
-#
-#
-# LED Triggers
-#
-#
-# InfiniBand support
-#
-# CONFIG_INFINIBAND is not set
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-#
-# Real Time Clock
-#
-# CONFIG_RTC_CLASS is not set
-#
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-#
-# DMA Clients
-#
-#
-# DMA Devices
-#
-#
-# Auxiliary Display support
-#
-#
-# Virtualization
-#
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT4DEV_FS is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-CONFIG_FUSE_FS=m
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_SYSFS=y
-# CONFIG_TMPFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-CONFIG_CONFIGFS_FS=m
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_ECRYPT_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=y
-# CONFIG_NFS_V3 is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-#
-# Native Language Support
-#
-# CONFIG_NLS is not set
-#
-# Distributed Lock Manager
-#
-CONFIG_DLM=m
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
-# CONFIG_DLM_DEBUG is not set
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_CROSSCOMPILE=y
-CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs rw nfsroot=192.168.1.1:/mnt/disk2/fs.gal ip=192.168.1.211:192.168.1.1:::gt::"
-CONFIG_SYS_SUPPORTS_KGDB=y
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-# CONFIG_SECURITY is not set
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CAMELLIA=m
-# CONFIG_CRYPTO_TEST is not set
-#
-# Hardware crypto devices
-#
-#
-# Library routines
-#
-CONFIG_BITREVERSE=m
-CONFIG_CRC_CCITT=y
-CONFIG_CRC16=m
-CONFIG_CRC32=m
-CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_PLIST=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/excite_defconfig b/arch/mips/configs/excite_defconfig
index 460d7a26a8..69810592aa 100644
--- a/arch/mips/configs/excite_defconfig
+++ b/arch/mips/configs/excite_defconfig
@@ -26,9 +26,7 @@ CONFIG_BASLER_EXCITE=y
 # CONFIG_BASLER_EXCITE_PROTOTYPE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -36,8 +34,6 @@ CONFIG_BASLER_EXCITE=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/fulong_defconfig b/arch/mips/configs/fulong_defconfig
new file mode 100644
index 0000000000..6ab94d8cf0
--- /dev/null
+++ b/arch/mips/configs/fulong_defconfig
@@ -0,0 +1,1765 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.22-rc4
+# Mon Jun 11 00:23:51 2007
+#
+CONFIG_MIPS=y
+#
+# Machine selection
+#
+CONFIG_LEMOTE_FULONG=y
+# CONFIG_MACH_ALCHEMY is not set
+# CONFIG_BASLER_EXCITE is not set
+# CONFIG_MIPS_COBALT is not set
+# CONFIG_MACH_DECSTATION is not set
+# CONFIG_MACH_JAZZ is not set
+# CONFIG_MIPS_ATLAS is not set
+# CONFIG_MIPS_MALTA is not set
+# CONFIG_MIPS_SEAD is not set
+# CONFIG_WR_PPMC is not set
+# CONFIG_MIPS_SIM is not set
+# CONFIG_MOMENCO_OCELOT is not set
+# CONFIG_PNX8550_JBS is not set
+# CONFIG_PNX8550_STB810 is not set
+# CONFIG_DDB5477 is not set
+# CONFIG_MACH_VR41XX is not set
+# CONFIG_PMC_YOSEMITE is not set
+# CONFIG_QEMU is not set
+# CONFIG_MARKEINS is not set
+# CONFIG_SGI_IP22 is not set
+# CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP32 is not set
+# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_SENTOSA is not set
+# CONFIG_SIBYTE_RHONE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_PTSWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SNI_RM is not set
+# CONFIG_TOSHIBA_JMR3927 is not set
+# CONFIG_TOSHIBA_RBTX4927 is not set
+# CONFIG_TOSHIBA_RBTX4938 is not set
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_DMA_NONCOHERENT=y
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_SYS_HAS_EARLY_PRINTK=y
+CONFIG_I8259=y
+# CONFIG_NO_IOPORT is not set
+# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
+CONFIG_IRQ_CPU=y
+CONFIG_BOOT_ELF32=y
+CONFIG_MIPS_L1_CACHE_SHIFT=5
+#
+# CPU selection
+#
+CONFIG_CPU_LOONGSON2=y
+# CONFIG_CPU_MIPS32_R1 is not set
+# CONFIG_CPU_MIPS32_R2 is not set
+# CONFIG_CPU_MIPS64_R1 is not set
+# CONFIG_CPU_MIPS64_R2 is not set
+# CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_TX39XX is not set
+# CONFIG_CPU_VR41XX is not set
+# CONFIG_CPU_R4300 is not set
+# CONFIG_CPU_R4X00 is not set
+# CONFIG_CPU_TX49XX is not set
+# CONFIG_CPU_R5000 is not set
+# CONFIG_CPU_R5432 is not set
+# CONFIG_CPU_R6000 is not set
+# CONFIG_CPU_NEVADA is not set
+# CONFIG_CPU_R8000 is not set
+# CONFIG_CPU_R10000 is not set
+# CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_RM9000 is not set
+# CONFIG_CPU_SB1 is not set
+CONFIG_SYS_HAS_CPU_LOONGSON2=y
+CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
+CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
+CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
+CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
+#
+# Kernel type
+#
+# CONFIG_32BIT is not set
+CONFIG_64BIT=y
+# CONFIG_PAGE_SIZE_4KB is not set
+# CONFIG_PAGE_SIZE_8KB is not set
+CONFIG_PAGE_SIZE_16KB=y
+# CONFIG_PAGE_SIZE_64KB is not set
+CONFIG_BOARD_SCACHE=y
+CONFIG_MIPS_MT_DISABLED=y
+# CONFIG_MIPS_MT_SMP is not set
+# CONFIG_MIPS_MT_SMTC is not set
+# CONFIG_MIPS_VPE_LOADER is not set
+CONFIG_CPU_HAS_WB=y
+CONFIG_CPU_HAS_SYNC=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_CPU_SUPPORTS_HIGHMEM=y
+CONFIG_SYS_SUPPORTS_HIGHMEM=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_RESOURCES_64BIT=y
+CONFIG_ZONE_DMA_FLAG=0
+# CONFIG_HZ_48 is not set
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_128 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_256 is not set
+# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_1024 is not set
+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
+CONFIG_HZ=250
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+# CONFIG_KEXEC is not set
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+#
+# General setup
+#
+CONFIG_LOCALVERSION="lm32"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+# CONFIG_BLK_DEV_INITRD is not set
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+#
+# Bus options (PCI, PCMCIA, EISA, ISA, TC)
+#
+CONFIG_HW_HAS_PCI=y
+CONFIG_PCI=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_ISA=y
+CONFIG_MMU=y
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=y
+# CONFIG_BUILD_ELF64 is not set
+CONFIG_MIPS32_COMPAT=y
+CONFIG_COMPAT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_MIPS32_O32=y
+CONFIG_MIPS32_N32=y
+CONFIG_BINFMT_ELF32=y
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
+# CONFIG_PM_DEBUG is not set
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+#
+# Networking
+#
+CONFIG_NET=y
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IP_VS is not set
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+# CONFIG_NF_CONNTRACK_ENABLED is not set
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+CONFIG_NET_CLS_ROUTE=y
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+# CONFIG_IEEE80211_CRYPT_CCMP is not set
+# CONFIG_IEEE80211_CRYPT_TKIP is not set
+# CONFIG_IEEE80211_SOFTMAC is not set
+# CONFIG_RFKILL is not set
+#
+# Device Drivers
+#
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+# CONFIG_SYS_HYPERVISOR is not set
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=m
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+# CONFIG_MTD_PARTITIONS is not set
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_BLOCK_RO is not set
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_GEOMETRY is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=m
+CONFIG_MTD_PHYSMAP_START=0x1fc00000
+CONFIG_MTD_PHYSMAP_LEN=0x80000
+CONFIG_MTD_PHYSMAP_BANKWIDTH=1
+# CONFIG_MTD_PLATRAM is not set
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+#
+# Plug and Play support
+#
+# CONFIG_PNP is not set
+# CONFIG_PNPACPI is not set
+#
+# Block devices
+#
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+#
+# Misc devices
+#
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
+CONFIG_IDE=y
+CONFIG_IDE_MAX_HWIFS=4
+CONFIG_BLK_DEV_IDE=y
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_IDEDISK_MULTI_MODE=y
+CONFIG_BLK_DEV_IDECD=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+CONFIG_BLK_DEV_IDESCSI=y
+CONFIG_IDE_TASK_IOCTL=y
+CONFIG_IDE_PROC_FS=y
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+# CONFIG_IDEDMA_ONLYDISK is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_BLK_DEV_TC86C001 is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_IDE_CHIPSETS is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+# CONFIG_BLK_DEV_HD is not set
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CHR_DEV_SCH is not set
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_CONSTANTS=y
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+#
+# SCSI low-level drivers
+#
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_PSI240I is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_ATA is not set
+#
+# Old CD-ROM drivers (not SCSI, not IDE)
+#
+# CONFIG_CD_NO_IDESCSI is not set
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_ARCNET is not set
+CONFIG_PHYLIB=m
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_FIXED_PHY is not set
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_SMC is not set
+# CONFIG_DM9000 is not set
+# CONFIG_NET_VENDOR_RACAL is not set
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_AT1700 is not set
+# CONFIG_DEPCA is not set
+# CONFIG_HP100 is not set
+# CONFIG_NET_ISA is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_AC3200 is not set
+# CONFIG_APRICOT is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_CS89x0 is not set
+# CONFIG_TC35815 is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+CONFIG_8139TOO=y
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139_OLD_RX_RESET is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_SC92031 is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_TR is not set
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_NET_FC=y
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=y
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_SERIAL=y
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_MOUSE_PC110PAD is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+# CONFIG_SERIAL_8250_EXTENDED is not set
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=y
+CONFIG_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=m
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_ELEKTOR is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VIA is not set
+CONFIG_I2C_VIAPRO=m
+# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_PCA_ISA is not set
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+# CONFIG_HWMON is not set
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+#
+# Multimedia devices
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
+CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_BT848 is not set
+# CONFIG_VIDEO_PMS is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CPIA2 is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_TUNER_3036 is not set
+# CONFIG_VIDEO_STRADIS is not set
+# CONFIG_VIDEO_SAA7134 is not set
+# CONFIG_VIDEO_MXB is not set
+# CONFIG_VIDEO_DPC is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_CX88 is not set
+# CONFIG_VIDEO_IVTV is not set
+# CONFIG_VIDEO_CAFE_CCIC is not set
+CONFIG_V4L_USB_DRIVERS=y
+# CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_USBVISION is not set
+CONFIG_VIDEO_USBVIDEO=m
+CONFIG_USB_VICAM=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_KONICAWC=m
+CONFIG_USB_QUICKCAM_MESSENGER=m
+CONFIG_USB_ET61X251=m
+# CONFIG_VIDEO_OVCAMCHIP is not set
+# CONFIG_USB_W9968CF is not set
+CONFIG_USB_OV511=m
+CONFIG_USB_SE401=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_STV680=m
+CONFIG_USB_ZC0301=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+# CONFIG_USB_ZR364XX is not set
+CONFIG_RADIO_ADAPTERS=y
+# CONFIG_RADIO_CADET is not set
+# CONFIG_RADIO_RTRACK is not set
+# CONFIG_RADIO_RTRACK2 is not set
+# CONFIG_RADIO_AZTECH is not set
+# CONFIG_RADIO_GEMTEK is not set
+# CONFIG_RADIO_GEMTEK_PCI is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_MAESTRO is not set
+# CONFIG_RADIO_SF16FMI is not set
+# CONFIG_RADIO_SF16FMR2 is not set
+# CONFIG_RADIO_TERRATEC is not set
+# CONFIG_RADIO_TRUST is not set
+# CONFIG_RADIO_TYPHOON is not set
+# CONFIG_RADIO_ZOLTRIX is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
+# CONFIG_USB_DABUSB is not set
+#
+# Graphics support
+#
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_LCD_CLASS_DEVICE=m
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_TILEBLITTING is not set
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+CONFIG_FB_RADEON=y
+# CONFIG_FB_RADEON_I2C is not set
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_SMIVGX is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_VIRTUAL is not set
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_LOGO is not set
+#
+# Sound
+#
+CONFIG_SOUND=y
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_RTCTIMER=m
+CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+#
+# Generic devices
+#
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_AC97_CODEC=m
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+#
+# PCI devices
+#
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+CONFIG_SND_VIA82XX=m
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+#
+# ALSA MIPS devices
+#
+#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_CAIAQ is not set
+#
+# System on Chip audio support
+#
+# CONFIG_SND_SOC is not set
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+#
+# HID Devices
+#
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG is not set
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_SPLIT_ISO=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=m
+# CONFIG_USB_SL811_HCD is not set
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=y
+CONFIG_USB_PRINTER=y
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+CONFIG_USB_LIBUSUAL=y
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_MON is not set
+#
+# USB port drivers
+#
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+#
+# USB DSL modem support
+#
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+#
+# LED drivers
+#
+#
+# LED Triggers
+#
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+#
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+#
+#
+# Real Time Clock
+#
+# CONFIG_RTC_CLASS is not set
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+#
+# DMA Clients
+#
+#
+# DMA Devices
+#
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+CONFIG_EXT2_FS_XIP=y
+CONFIG_FS_XIP=y
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+CONFIG_AUTOFS_FS=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=y
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=936
+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_DIRECTIO=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+# CONFIG_SUNRPC_BIND34 is not set
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+CONFIG_SMB_NLS_DEFAULT=y
+CONFIG_SMB_NLS_REMOTE="cp936"
+CONFIG_CIFS=m
+CONFIG_CIFS_STATS=y
+CONFIG_CIFS_STATS2=y
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DEBUG2=y
+CONFIG_CIFS_EXPERIMENTAL=y
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+CONFIG_NLS_CODEPAGE_936=y
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+#
+# Profiling support
+#
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=m
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_CROSSCOMPILE=y
+CONFIG_CMDLINE=""
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_SHA1=m
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_DES=m
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_DEFLATE=m
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_TEST is not set
+#
+# Hardware crypto devices
+#
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_CRC_CCITT=y
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
index 7ec618f3c8..405c9f505a 100644
--- a/arch/mips/configs/ip22_defconfig
+++ b/arch/mips/configs/ip22_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index 9ddc3eff47..a9dcbcf563 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig
index 8fc18809d5..a040459bec 100644
--- a/arch/mips/configs/ip32_defconfig
+++ b/arch/mips/configs/ip32_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/jazz_defconfig b/arch/mips/configs/jazz_defconfig
index 9331cb0a19..8a0b4ac528 100644
--- a/arch/mips/configs/jazz_defconfig
+++ b/arch/mips/configs/jazz_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 CONFIG_MACH_JAZZ=y
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_MACH_JAZZ=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
@@ -245,7 +241,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_ISA=y
 CONFIG_MMU=y
-CONFIG_I8253=y
+CONFIG_PCSPEAKER=y
 #
 # PCCARD (PCMCIA/CardBus) support
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig
index 1b364cf691..9a25e770ab 100644
--- a/arch/mips/configs/jmr3927_defconfig
+++ b/arch/mips/configs/jmr3927_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig
deleted file mode 100644
index fd4272c145..0000000000
--- a/arch/mips/configs/lasat200_defconfig
+++ /dev/null
@@ -1,1118 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:34 2007
-#
-CONFIG_MIPS=y
-#
-# Machine selection
-#
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
-# CONFIG_BASLER_EXCITE is not set
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
-# CONFIG_MACH_JAZZ is not set
-CONFIG_LASAT=y
-# CONFIG_MIPS_ATLAS is not set
-# CONFIG_MIPS_MALTA is not set
-# CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
-# CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
-# CONFIG_MIPS_XXS1500 is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TOSHIBA_RBTX4938 is not set
-CONFIG_PICVUE=y
-CONFIG_PICVUE_PROC=y
-CONFIG_DS1603=y
-CONFIG_LASAT_SYSCTL=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_TIME=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_MIPS_NILE4=y
-# CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-CONFIG_MIPS_GT64120=y
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-#
-# CPU selection
-#
-# CONFIG_CPU_MIPS32_R1 is not set
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_VR41XX is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_TX49XX is not set
-CONFIG_CPU_R5000=y
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_SYS_HAS_CPU_R5000=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
-#
-# Kernel type
-#
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_64KB is not set
-CONFIG_BOARD_SCACHE=y
-CONFIG_R5000_CPU_SCACHE=y
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
-# CONFIG_64BIT_PHYS_ADDR is not set
-CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
-# CONFIG_HZ_48 is not set
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
-# CONFIG_HZ_1024 is not set
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_KEXEC is not set
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_RELAY=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_EMBEDDED=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SHMEM=y
-CONFIG_SLAB=y
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-CONFIG_KMOD=y
-#
-# Block layer
-#
-CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-#
-# Bus options (PCI, PCMCIA, EISA, ISA, TC)
-#
-CONFIG_HW_HAS_PCI=y
-CONFIG_PCI=y
-CONFIG_MMU=y
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-# CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
-# CONFIG_HOTPLUG_PCI is not set
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-CONFIG_TRAD_SIGNALS=y
-#
-# Power management options
-#
-CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
-#
-# Networking
-#
-CONFIG_NET=y
-#
-# Networking options
-#
-# CONFIG_NETDEBUG is not set
-# CONFIG_PACKET is not set
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_MIGRATE=y
-CONFIG_NET_KEY=y
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
-# CONFIG_IPV6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
-CONFIG_NETWORK_SECMARK=y
-# CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_WIRELESS_EXT=y
-#
-# Device Drivers
-#
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=m
-# CONFIG_SYS_HYPERVISOR is not set
-#
-# Connector - unified userspace <-> kernelspace linker
-#
-CONFIG_CONNECTOR=m
-#
-# Memory Technology Devices (MTD)
-#
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_CONCAT is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_CFI_INTELEXT is not set
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_PHYSMAP is not set
-CONFIG_MTD_LASAT=y
-# CONFIG_MTD_PLATRAM is not set
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-#
-# NAND Flash Device Drivers
-#
-# CONFIG_MTD_NAND is not set
-#
-# OneNAND Flash Device Drivers
-#
-# CONFIG_MTD_ONENAND is not set
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-#
-# Block devices
-#
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-#
-# Misc devices
-#
-CONFIG_SGI_IOC4=m
-# CONFIG_TIFM_CORE is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=y
-CONFIG_IDE_MAX_HWIFS=4
-CONFIG_BLK_DEV_IDE=y
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_IDEDISK_MULTI_MODE=y
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_IDEPCI_SHARE_IRQ is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=y
-# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
-# CONFIG_IDEDMA_ONLYDISK is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-CONFIG_BLK_DEV_CMD64X=y
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_PIIX is not set
-CONFIG_BLK_DEV_IT8213=m
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-CONFIG_BLK_DEV_TC86C001=m
-# CONFIG_IDE_ARM is not set
-CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_IVB is not set
-CONFIG_IDEDMA_AUTO=y
-# CONFIG_BLK_DEV_HD is not set
-#
-# SCSI device support
-#
-CONFIG_RAID_ATTRS=m
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_NETLINK is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-# CONFIG_ATA is not set
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_IEEE1394 is not set
-#
-# I2O device support
-#
-# CONFIG_I2O is not set
-#
-# Network device support
-#
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-#
-# PHY device support
-#
-CONFIG_PHYLIB=m
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_FIXED_PHY is not set
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_CASSINI is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_DM9000 is not set
-#
-# Tulip family network device support
-#
-# CONFIG_NET_TULIP is not set
-# CONFIG_HP100 is not set
-# CONFIG_NET_PCI is not set
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-CONFIG_QLA3XXX=m
-# CONFIG_ATL1 is not set
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_CHELSIO_T1 is not set
-CONFIG_CHELSIO_T3=m
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_MYRI10GE is not set
-CONFIG_NETXEN_NIC=m
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_LIBPS2 is not set
-CONFIG_SERIO_RAW=m
-# CONFIG_GAMEPORT is not set
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_SERIAL_JSM is not set
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-# CONFIG_DRM is not set
-# CONFIG_RAW_DRIVER is not set
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-#
-# SPI support
-#
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-#
-# Dallas's 1-wire bus
-#
-# CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-#
-# Graphics support
-#
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB is not set
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-#
-# HID Devices
-#
-# CONFIG_HID is not set
-#
-# USB support
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
-# CONFIG_MMC is not set
-#
-# LED devices
-#
-# CONFIG_NEW_LEDS is not set
-#
-# LED drivers
-#
-#
-# LED Triggers
-#
-#
-# InfiniBand support
-#
-# CONFIG_INFINIBAND is not set
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-#
-# Real Time Clock
-#
-# CONFIG_RTC_CLASS is not set
-#
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-#
-# DMA Clients
-#
-#
-# DMA Devices
-#
-#
-# Auxiliary Display support
-#
-#
-# Virtualization
-#
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_XATTR=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
-CONFIG_EXT3_FS_SECURITY=y
-# CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
-# CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-CONFIG_FUSE_FS=m
-CONFIG_GENERIC_ACL=y
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-CONFIG_CONFIGFS_FS=m
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_ECRYPT_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-#
-# Native Language Support
-#
-# CONFIG_NLS is not set
-#
-# Distributed Lock Manager
-#
-CONFIG_DLM=m
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
-# CONFIG_DLM_DEBUG is not set
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_CROSSCOMPILE=y
-CONFIG_CMDLINE=""
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-# CONFIG_SECURITY is not set
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CAMELLIA=m
-# CONFIG_CRYPTO_TEST is not set
-#
-# Hardware crypto devices
-#
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-# CONFIG_CRC_CCITT is not set
-CONFIG_CRC16=m
-CONFIG_CRC32=y
-CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_PLIST=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index 1f64d7632a..546cb243fd 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 CONFIG_MIPS_MALTA=y
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_MIPS_MALTA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig
index a2db5c2012..6abad6f883 100644
--- a/arch/mips/configs/mipssim_defconfig
+++ b/arch/mips/configs/mipssim_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 CONFIG_MIPS_SIM=y
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
@@ -496,36 +492,23 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
+# CONFIG_PHYLIB is not set
-#
-# PHY device support
-#
 #
 # Ethernet (10 or 100Mbit)
 #
-# CONFIG_NET_ETHERNET is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_MII is not set
-#
+CONFIG_MIPS_SIM_NET=y
-# Ethernet (1000 Mbit)
+# CONFIG_DM9000 is not set
-#
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
-#
-# Ethernet (10000 Mbit)
-#
-#
-# Token Ring devices
-#
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
 #
-# Wan interfaces
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig
index ad5c0bf87b..4981ce425d 100644
--- a/arch/mips/configs/mpc30x_defconfig
+++ b/arch/mips/configs/mpc30x_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/msp71xx_defconfig
index 28547313ce..adca5f7ba5 100644
--- a/arch/mips/configs/ocelot_3_defconfig
+++ b/arch/mips/configs/msp71xx_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
+# Linux kernel version: 2.6.21-rc4
-# Tue Feb 20 21:47:35 2007
+# Thu Apr 26 18:11:29 2007
 #
 CONFIG_MIPS=y
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,14 +33,13 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-CONFIG_MOMENCO_OCELOT_3=y
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
+CONFIG_PMC_MSP=y
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
 # CONFIG_MARKEINS is not set
@@ -62,6 +59,16 @@ CONFIG_MOMENCO_OCELOT_3=y
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_PMC_MSP4200_EVAL is not set
+# CONFIG_PMC_MSP4200_GW is not set
+# CONFIG_PMC_MSP7120_EVAL is not set
+CONFIG_PMC_MSP7120_GW=y
+# CONFIG_PMC_MSP7120_FPGA is not set
+#
+# Options for PMC-Sierra MSP chipsets
+#
+CONFIG_PMC_MSP_EMBEDDED_ROOTFS=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -71,24 +78,24 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_TIME=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
+CONFIG_BOOT_RAW=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+CONFIG_NO_EXCEPT_FILL=y
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_IRQ_CPU=y
-CONFIG_IRQ_CPU_RM7K=y
+CONFIG_IRQ_MSP_CIC=y
-CONFIG_IRQ_MV64340=y
+CONFIG_MSP_USB=y
-CONFIG_PCI_MARVELL=y
 CONFIG_SWAP_IO_SPACE=y
-CONFIG_BOOT_ELF32=y
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
 # CONFIG_CPU_MIPS32_R1 is not set
-# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPS32_R2=y
 # CONFIG_CPU_MIPS64_R1 is not set
 # CONFIG_CPU_MIPS64_R2 is not set
 # CONFIG_CPU_R3000 is not set
@@ -104,14 +111,14 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_CPU_R8000 is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_RM7000 is not set
-CONFIG_CPU_RM9000=y
+# CONFIG_CPU_RM9000 is not set
 # CONFIG_CPU_SB1 is not set
-CONFIG_SYS_HAS_CPU_RM9000=y
+CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_WEAK_ORDERING=y
+CONFIG_SYS_HAS_CPU_MIPS32_R2=y
+CONFIG_CPU_MIPS32=y
+CONFIG_CPU_MIPSR2=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 #
 # Kernel type
@@ -122,13 +129,12 @@ CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 # CONFIG_PAGE_SIZE_64KB is not set
-CONFIG_BOARD_SCACHE=y
-CONFIG_RM7000_CPU_SCACHE=y
 CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_VPE_LOADER is not set
+CONFIG_SYS_SUPPORTS_MULTITHREADING=y
 # CONFIG_64BIT_PHYS_ADDR is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_SYNC=y
@@ -149,15 +155,16 @@ CONFIG_ZONE_DMA_FLAG=1
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1024 is not set
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
+CONFIG_HZ=250
-CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
+# CONFIG_PREEMPT_BKL is not set
 # CONFIG_KEXEC is not set
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
@@ -168,14 +175,15 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 #
 # General setup
 #
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="-pmc"
 CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
+# CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
@@ -184,15 +192,16 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
-CONFIG_IKCONFIG=y
+# CONFIG_IKCONFIG is not set
-CONFIG_IKCONFIG_PROC=y
 CONFIG_SYSFS_DEPRECATED=y
-CONFIG_RELAY=y
+# CONFIG_RELAY is not set
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
@@ -201,11 +210,11 @@ CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
-CONFIG_SHMEM=y
+# CONFIG_SHMEM is not set
 CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
+CONFIG_TINY_SHMEM=y
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
@@ -232,8 +241,8 @@ CONFIG_BLOCK=y
 #
 CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_IOSCHED_CFQ=y
+# CONFIG_IOSCHED_CFQ is not set
 CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_CFQ is not set
@@ -245,6 +254,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_HW_HAS_PCI=y
 CONFIG_PCI=y
+# CONFIG_PCI_DEBUG is not set
 CONFIG_MMU=y
 #
@@ -267,10 +277,7 @@ CONFIG_TRAD_SIGNALS=y
 #
 # Power management options
 #
-CONFIG_PM=y
+# CONFIG_PM is not set
-# CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
 #
 # Networking
@@ -281,17 +288,16 @@ CONFIG_NET=y
 # Networking options
 #
 # CONFIG_NETDEBUG is not set
-CONFIG_PACKET=y
+# CONFIG_PACKET is not set
-# CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
+CONFIG_XFRM_USER=y
 # CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_MIGRATE is not set
 CONFIG_NET_KEY=y
-CONFIG_NET_KEY_MIGRATE=y
+# CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
+CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_FIB_HASH=y
 CONFIG_IP_PNP=y
@@ -300,122 +306,92 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
 # CONFIG_ARPD is not set
 # CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
+CONFIG_INET_AH=y
-# CONFIG_INET_ESP is not set
+CONFIG_INET_ESP=y
-# CONFIG_INET_IPCOMP is not set
+CONFIG_INET_IPCOMP=y
-# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_XFRM_TUNNEL=y
-CONFIG_INET_TUNNEL=m
+CONFIG_INET_TUNNEL=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
+# CONFIG_TCP_MD5SIG is not set
 #
 # IP: Virtual Server Configuration
 #
 # CONFIG_IP_VS is not set
-CONFIG_IPV6=m
+# CONFIG_IPV6 is not set
-# CONFIG_IPV6_PRIVACY is not set
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
-CONFIG_IPV6_MIP6=y
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+# CONFIG_NETWORK_SECMARK is not set
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-# CONFIG_IPV6_TUNNEL is not set
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_NETWORK_SECMARK=y
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
 #
 # Core Netfilter Configuration
 #
-CONFIG_NETFILTER_NETLINK=m
+# CONFIG_NETFILTER_NETLINK is not set
-CONFIG_NETFILTER_NETLINK_QUEUE=m
+# CONFIG_NF_CONNTRACK_ENABLED is not set
-CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_XTABLES=y
-CONFIG_NF_CONNTRACK_ENABLED=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-CONFIG_NF_CONNTRACK_SUPPORT=y
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-CONFIG_NF_CONNTRACK=m
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-CONFIG_NF_CT_ACCT=y
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-CONFIG_NF_CONNTRACK_SECMARK=y
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-CONFIG_NF_CONNTRACK_EVENTS=y
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-CONFIG_NF_CT_PROTO_GRE=m
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-CONFIG_NF_CT_PROTO_SCTP=m
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-CONFIG_NF_CONNTRACK_AMANDA=m
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-CONFIG_NF_CONNTRACK_FTP=m
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-CONFIG_NF_CONNTRACK_H323=m
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-CONFIG_NF_CONNTRACK_IRC=m
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-CONFIG_NF_CONNTRACK_PPTP=m
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-CONFIG_NF_CONNTRACK_SANE=m
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-CONFIG_NF_CONNTRACK_SIP=m
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-CONFIG_NF_CONNTRACK_TFTP=m
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-CONFIG_NF_CT_NETLINK=m
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-CONFIG_NETFILTER_XT_TARGET_MARK=m
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 #
 # IP: Netfilter Configuration
 #
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 # CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_IPTABLES is not set
+CONFIG_IP_NF_IPTABLES=y
+# CONFIG_IP_NF_MATCH_IPRANGE is not set
+# CONFIG_IP_NF_MATCH_TOS is not set
+# CONFIG_IP_NF_MATCH_RECENT is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_AH is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+# CONFIG_IP_NF_MATCH_OWNER is not set
+# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=y
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_NF_MANGLE is not set
+# CONFIG_IP_NF_RAW is not set
 # CONFIG_IP_NF_ARPTABLES is not set
 #
-# IPv6: Netfilter Configuration (EXPERIMENTAL)
+# Bridge: Netfilter Configuration
 #
-CONFIG_NF_CONNTRACK_IPV6=m
+# CONFIG_BRIDGE_NF_EBTABLES is not set
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_IPTABLES is not set
 #
 # DCCP Configuration (EXPERIMENTAL)
@@ -432,9 +408,10 @@ CONFIG_NF_CONNTRACK_IPV6=m
 #
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
+CONFIG_BRIDGE=y
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
+CONFIG_LLC=y
 # CONFIG_LLC2 is not set
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
@@ -447,7 +424,6 @@ CONFIG_NF_CONNTRACK_IPV6=m
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
-CONFIG_NET_CLS_ROUTE=y
 #
 # Network testing
@@ -456,14 +432,8 @@ CONFIG_NET_CLS_ROUTE=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
-CONFIG_IEEE80211=m
+# CONFIG_IEEE80211 is not set
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_WIRELESS_EXT=y
-CONFIG_FIB_RULES=y
 #
 # Device Drivers
@@ -473,19 +443,101 @@ CONFIG_FIB_RULES=y
 # Generic Driver Options
 #
 CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-CONFIG_FW_LOADER=m
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 #
 # Connector - unified userspace <-> kernelspace linker
 #
-CONFIG_CONNECTOR=m
+# CONFIG_CONNECTOR is not set
 #
 # Memory Technology Devices (MTD)
 #
-# CONFIG_MTD is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+CONFIG_MTD_RAM=y
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PMC_MSP_EVM=y
+CONFIG_MSP_FLASH_MAP_LIMIT_32M=y
+CONFIG_MSP_FLASH_MAP_LIMIT=0x02000000
+CONFIG_MTD_PMC_MSP_RAMROOT=y
+# CONFIG_MTD_PLATRAM is not set
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
 #
 # Parallel port support
@@ -505,19 +557,21 @@ CONFIG_CONNECTOR=m
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
-CONFIG_ATA_OVER_ETH=m
+# CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
-CONFIG_SGI_IOC4=m
+# CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
 #
@@ -528,16 +582,16 @@ CONFIG_SGI_IOC4=m
 #
 # SCSI device support
 #
-CONFIG_RAID_ATTRS=m
+# CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=m
+CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
+# CONFIG_SCSI_TGT is not set
-CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
 #
 # SCSI support type (disk, tape, CD-ROM)
 #
-# CONFIG_BLK_DEV_SD is not set
+CONFIG_BLK_DEV_SD=y
 # CONFIG_CHR_DEV_ST is not set
 # CONFIG_CHR_DEV_OSST is not set
 # CONFIG_BLK_DEV_SR is not set
@@ -550,22 +604,21 @@ CONFIG_SCSI_PROC_FS=y
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_SCAN_ASYNC=y
+# CONFIG_SCSI_SCAN_ASYNC is not set
 #
 # SCSI Transports
 #
 # CONFIG_SCSI_SPI_ATTRS is not set
-CONFIG_SCSI_FC_ATTRS=m
+# CONFIG_SCSI_FC_ATTRS is not set
-CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set
-CONFIG_SCSI_SAS_ATTRS=m
+# CONFIG_SCSI_SAS_ATTRS is not set
-CONFIG_SCSI_SAS_LIBSAS=m
+# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 #
 # SCSI low-level drivers
 #
-CONFIG_ISCSI_TCP=m
+# CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
 # CONFIG_SCSI_ACARD is not set
@@ -573,8 +626,7 @@ CONFIG_ISCSI_TCP=m
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_AIC79XX is not set
-CONFIG_SCSI_AIC94XX=m
+# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_AIC94XX_DEBUG is not set
 # CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_ARCMSR is not set
 # CONFIG_MEGARAID_NEWGEN is not set
@@ -630,10 +682,10 @@ CONFIG_SCSI_AIC94XX=m
 # Network device support
 #
 CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
+CONFIG_DUMMY=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
-CONFIG_TUN=m
+# CONFIG_TUN is not set
 #
 # ARCnet devices
@@ -643,26 +695,16 @@ CONFIG_TUN=m
 #
 # PHY device support
 #
-CONFIG_PHYLIB=m
+# CONFIG_PHYLIB is not set
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_FIXED_PHY is not set
 #
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+CONFIG_MSPETH=y
+CONFIG_MSPETH_NAPI=y
+# CONFIG_MSPETH_SKB_RECYCLE is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
@@ -674,26 +716,7 @@ CONFIG_MII=y
 #
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
-CONFIG_NET_PCI=y
+# CONFIG_NET_PCI is not set
-# CONFIG_PCNET32 is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_B44 is not set
-# CONFIG_FORCEDETH is not set
-# CONFIG_DGRS is not set
-# CONFIG_EEPRO100 is not set
-CONFIG_E100=y
-# CONFIG_FEALNX is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_SIS900 is not set
-# CONFIG_EPIC100 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_TLAN is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_SC92031 is not set
 #
 # Ethernet (1000 Mbit)
@@ -709,22 +732,20 @@ CONFIG_E100=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
-# CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
-CONFIG_MV643XX_ETH=y
+# CONFIG_QLA3XXX is not set
-CONFIG_QLA3XXX=m
 # CONFIG_ATL1 is not set
 #
 # Ethernet (10000 Mbit)
 #
 # CONFIG_CHELSIO_T1 is not set
-CONFIG_CHELSIO_T3=m
+# CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
-CONFIG_NETXEN_NIC=m
+# CONFIG_NETXEN_NIC is not set
 #
 # Token Ring devices
@@ -734,7 +755,29 @@ CONFIG_NETXEN_NIC=m
 #
 # Wireless LAN (non-hamradio)
 #
-# CONFIG_NET_RADIO is not set
+CONFIG_NET_RADIO=y
+# CONFIG_NET_WIRELESS_RTNETLINK is not set
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+#
+# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
+#
+# CONFIG_PRISM54 is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_HOSTAP is not set
+CONFIG_NET_WIRELESS=y
 #
 # Wan interfaces
@@ -742,17 +785,17 @@ CONFIG_NETXEN_NIC=m
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
-CONFIG_PPP=m
+CONFIG_PPP=y
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPP_FILTER is not set
-CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_ASYNC is not set
-CONFIG_PPP_SYNC_TTY=m
+# CONFIG_PPP_SYNC_TTY is not set
-CONFIG_PPP_DEFLATE=m
+# CONFIG_PPP_DEFLATE is not set
 # CONFIG_PPP_BSDCOMP is not set
-CONFIG_PPP_MPPE=m
+# CONFIG_PPP_MPPE is not set
-CONFIG_PPPOE=m
+# CONFIG_PPPOE is not set
 # CONFIG_SLIP is not set
-CONFIG_SLHC=m
+CONFIG_SLHC=y
 # CONFIG_NET_FC is not set
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
@@ -796,31 +839,24 @@ CONFIG_INPUT=y
 #
 # Hardware I/O ports
 #
-CONFIG_SERIO=y
+# CONFIG_SERIO is not set
-# CONFIG_SERIO_I8042 is not set
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_LIBPS2 is not set
-# CONFIG_SERIO_RAW is not set
 # CONFIG_GAMEPORT is not set
 #
 # Character devices
 #
-CONFIG_VT=y
+# CONFIG_VT is not set
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_SERIAL_NONSTANDARD is not set
+CONFIG_PMCMSP_GPIO=y
 #
 # Serial drivers
 #
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_PCI=y
+# CONFIG_SERIAL_8250_PCI is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=2
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
 # CONFIG_SERIAL_8250_EXTENDED is not set
 #
@@ -830,8 +866,7 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
-CONFIG_LEGACY_PTY_COUNT=256
 #
 # IPMI
@@ -843,7 +878,8 @@ CONFIG_LEGACY_PTY_COUNT=256
 #
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
-CONFIG_RTC=y
+# CONFIG_RTC is not set
+# CONFIG_GEN_RTC is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
@@ -858,7 +894,58 @@ CONFIG_RTC=y
 #
 # I2C support
 #
-# CONFIG_I2C is not set
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PASEMI is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_PCA_ISA is not set
+CONFIG_I2C_PMCMSP=y
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+CONFIG_PMCTWILED=y
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
 #
 # SPI support
@@ -874,8 +961,57 @@ CONFIG_RTC=y
 #
 # Hardware Monitoring support
 #
-# CONFIG_HWMON is not set
+CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
 #
 # Multimedia devices
@@ -886,62 +1022,13 @@ CONFIG_RTC=y
 # Digital Video Broadcasting Devices
 #
 # CONFIG_DVB is not set
+# CONFIG_USB_DABUSB is not set
 #
 # Graphics support
 #
-# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FB=y
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
-CONFIG_FB_MODE_HELPERS=y
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_SMIVGX is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_VIRTUAL is not set
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-#
-# Logo configuration
-#
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_FB is not set
 #
 # Sound
@@ -960,13 +1047,134 @@ CONFIG_HID=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_OHCI_HCD is not set
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
 #
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
 #
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
+#
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_TOUCHSCREEN is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_ATI_REMOTE2 is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+# CONFIG_USB_GTCO is not set
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
+CONFIG_USB_MON=y
+#
+# USB port drivers
+#
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+#
+# USB DSL modem support
+#
+#
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
@@ -1030,37 +1238,22 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
+# CONFIG_EXT3_FS is not set
-CONFIG_EXT3_FS_XATTR=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
-# CONFIG_EXT3_FS_SECURITY is not set
 # CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=m
+# CONFIG_REISERFS_FS is not set
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_REISERFS_FS_XATTR is not set
 # CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
+# CONFIG_FS_POSIX_ACL is not set
-CONFIG_XFS_FS=m
+# CONFIG_XFS_FS is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_SECURITY is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
-CONFIG_INOTIFY=y
+# CONFIG_INOTIFY is not set
-CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
+# CONFIG_DNOTIFY is not set
-CONFIG_AUTOFS_FS=y
+# CONFIG_AUTOFS_FS is not set
-CONFIG_AUTOFS4_FS=m
+# CONFIG_AUTOFS4_FS is not set
-CONFIG_FUSE_FS=m
+# CONFIG_FUSE_FS is not set
-CONFIG_GENERIC_ACL=y
 #
 # CD-ROM/DVD Filesystems
@@ -1071,22 +1264,25 @@ CONFIG_GENERIC_ACL=y
 #
 # DOS/FAT/NT Filesystems
 #
-# CONFIG_MSDOS_FS is not set
+CONFIG_FAT_FS=y
-# CONFIG_VFAT_FS is not set
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_NTFS_FS is not set
 #
 # Pseudo filesystems
 #
 CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
+# CONFIG_PROC_KCORE is not set
 CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-CONFIG_CONFIGFS_FS=m
+# CONFIG_CONFIGFS_FS is not set
 #
 # Miscellaneous filesystems
@@ -1097,8 +1293,21 @@ CONFIG_CONFIGFS_FS=m
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
-CONFIG_EFS_FS=y
+# CONFIG_EFS_FS is not set
-CONFIG_CRAMFS=y
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_CRAMFS is not set
+CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_SQUASHFS_VMALLOC=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
@@ -1108,26 +1317,9 @@ CONFIG_CRAMFS=y
 #
 # Network File Systems
 #
-CONFIG_NFS_FS=y
+# CONFIG_NFS_FS is not set
-CONFIG_NFS_V3=y
+# CONFIG_NFSD is not set
-# CONFIG_NFS_V3_ACL is not set
+# CONFIG_SMB_FS is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD=y
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-# CONFIG_NFSD_V4 is not set
-# CONFIG_NFSD_TCP is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
 # CONFIG_CIFS is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
@@ -1143,9 +1335,9 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Native Language Support
 #
-CONFIG_NLS=m
+CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_CODEPAGE_437 is not set
+CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1169,7 +1361,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_CODEPAGE_1250 is not set
 # CONFIG_NLS_CODEPAGE_1251 is not set
 # CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_ISO8859_1 is not set
+CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
@@ -1187,10 +1379,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 #
 # Distributed Lock Manager
 #
-CONFIG_DLM=m
+# CONFIG_DLM is not set
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
-# CONFIG_DLM_DEBUG is not set
 #
 # Profiling support
@@ -1203,14 +1392,40 @@ CONFIG_DLM_TCP=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_SLAB is not set
+CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
 CONFIG_CROSSCOMPILE=y
-CONFIG_CMDLINE="ip=any root=nfs"
+CONFIG_CMDLINE=""
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_KGDB is not set
+CONFIG_SYS_SUPPORTS_KGDB=y
+# CONFIG_RUNTIME_DEBUG is not set
+# CONFIG_MIPS_UNCACHED is not set
 #
 # Security options
@@ -1223,41 +1438,40 @@ CONFIG_CMDLINE="ip=any root=nfs"
 #
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
+# CONFIG_CRYPTO_XCBC is not set
-CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_MD4=m
+# CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=m
+# CONFIG_CRYPTO_SHA256 is not set
-CONFIG_CRYPTO_SHA512=m
+# CONFIG_CRYPTO_SHA512 is not set
-CONFIG_CRYPTO_WP512=m
+# CONFIG_CRYPTO_WP512 is not set
-CONFIG_CRYPTO_TGR192=m
+# CONFIG_CRYPTO_TGR192 is not set
-CONFIG_CRYPTO_GF128MUL=m
+# CONFIG_CRYPTO_GF128MUL is not set
-CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_ECB is not set
-CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_LRW=m
+# CONFIG_CRYPTO_LRW is not set
-CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_FCRYPT=m
+# CONFIG_CRYPTO_FCRYPT is not set
-CONFIG_CRYPTO_BLOWFISH=m
+# CONFIG_CRYPTO_BLOWFISH is not set
-CONFIG_CRYPTO_TWOFISH=m
+# CONFIG_CRYPTO_TWOFISH is not set
-CONFIG_CRYPTO_TWOFISH_COMMON=m
+# CONFIG_CRYPTO_SERPENT is not set
-CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_CAST5 is not set
-CONFIG_CRYPTO_CAST5=m
+# CONFIG_CRYPTO_CAST6 is not set
-CONFIG_CRYPTO_CAST6=m
+# CONFIG_CRYPTO_TEA is not set
-CONFIG_CRYPTO_TEA=m
+# CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_KHAZAD is not set
-CONFIG_CRYPTO_KHAZAD=m
+# CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_DEFLATE=m
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-CONFIG_CRYPTO_MICHAEL_MIC=m
+# CONFIG_CRYPTO_CRC32C is not set
-CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_CAMELLIA is not set
-CONFIG_CRYPTO_CAMELLIA=m
 # CONFIG_CRYPTO_TEST is not set
 #
@@ -1268,16 +1482,12 @@ CONFIG_CRYPTO_CAMELLIA=m
 # Library routines
 #
 CONFIG_BITREVERSE=y
-CONFIG_CRC_CCITT=m
+# CONFIG_CRC_CCITT is not set
-CONFIG_CRC16=m
+# CONFIG_CRC16 is not set
 CONFIG_CRC32=y
-CONFIG_LIBCRC32C=m
+# CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_DEFLATE=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig
deleted file mode 100644
index 82ff6fc0cd..0000000000
--- a/arch/mips/configs/ocelot_c_defconfig
+++ /dev/null
@@ -1,982 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:36 2007
-#
-CONFIG_MIPS=y
-#
-# Machine selection
-#
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
-# CONFIG_BASLER_EXCITE is not set
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
-# CONFIG_MIPS_ATLAS is not set
-# CONFIG_MIPS_MALTA is not set
-# CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
-# CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-CONFIG_MOMENCO_OCELOT_C=y
-# CONFIG_MOMENCO_OCELOT_G is not set
-# CONFIG_MIPS_XXS1500 is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_DDB5477 is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TOSHIBA_RBTX4938 is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_TIME=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_CPU_LITTLE_ENDIAN is not set
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-CONFIG_IRQ_CPU=y
-CONFIG_IRQ_MV64340=y
-CONFIG_PCI_MARVELL=y
-CONFIG_SWAP_IO_SPACE=y
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-#
-# CPU selection
-#
-# CONFIG_CPU_MIPS32_R1 is not set
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_VR41XX is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_R10000 is not set
-CONFIG_CPU_RM7000=y
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_SYS_HAS_CPU_RM7000=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
-#
-# Kernel type
-#
-# CONFIG_32BIT is not set
-CONFIG_64BIT=y
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_64KB is not set
-CONFIG_BOARD_SCACHE=y
-CONFIG_RM7000_CPU_SCACHE=y
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
-CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_RESOURCES_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
-# CONFIG_HZ_48 is not set
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
-# CONFIG_HZ_1024 is not set
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_KEXEC is not set
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_RELAY=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_EMBEDDED=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SHMEM=y
-CONFIG_SLAB=y
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
-#
-# Block layer
-#
-CONFIG_BLOCK=y
-# CONFIG_BLK_DEV_IO_TRACE is not set
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-#
-# Bus options (PCI, PCMCIA, EISA, ISA, TC)
-#
-CONFIG_HW_HAS_PCI=y
-CONFIG_PCI=y
-CONFIG_MMU=y
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-# CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
-# CONFIG_HOTPLUG_PCI is not set
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_BUILD_ELF64 is not set
-CONFIG_MIPS32_COMPAT=y
-CONFIG_COMPAT=y
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_MIPS32_O32=y
-CONFIG_MIPS32_N32=y
-CONFIG_BINFMT_ELF32=y
-#
-# Power management options
-#
-CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
-#
-# Networking
-#
-CONFIG_NET=y
-#
-# Networking options
-#
-# CONFIG_NETDEBUG is not set
-# CONFIG_PACKET is not set
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=y
-# CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_MIGRATE=y
-CONFIG_NET_KEY=y
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
-# CONFIG_IPV6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
-CONFIG_NETWORK_SECMARK=y
-# CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-CONFIG_IEEE80211=y
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=y
-CONFIG_IEEE80211_CRYPT_CCMP=y
-CONFIG_IEEE80211_SOFTMAC=y
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_WIRELESS_EXT=y
-#
-# Device Drivers
-#
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-# CONFIG_SYS_HYPERVISOR is not set
-#
-# Connector - unified userspace <-> kernelspace linker
-#
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-#
-# Block devices
-#
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_CDROM_PKTCDVD=y
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=y
-#
-# Misc devices
-#
-CONFIG_SGI_IOC4=y
-# CONFIG_TIFM_CORE is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
-# CONFIG_IDE is not set
-#
-# SCSI device support
-#
-CONFIG_RAID_ATTRS=y
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_NETLINK is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-# CONFIG_ATA is not set
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_IEEE1394 is not set
-#
-# I2O device support
-#
-# CONFIG_I2O is not set
-#
-# Network device support
-#
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-#
-# PHY device support
-#
-CONFIG_PHYLIB=y
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=y
-CONFIG_DAVICOM_PHY=y
-CONFIG_QSEMI_PHY=y
-CONFIG_LXT_PHY=y
-CONFIG_CICADA_PHY=y
-CONFIG_VITESSE_PHY=y
-CONFIG_SMSC_PHY=y
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_FIXED_PHY is not set
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_CASSINI is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_DM9000 is not set
-#
-# Tulip family network device support
-#
-# CONFIG_NET_TULIP is not set
-# CONFIG_HP100 is not set
-# CONFIG_NET_PCI is not set
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-# CONFIG_MV643XX_ETH is not set
-CONFIG_QLA3XXX=y
-# CONFIG_ATL1 is not set
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_CHELSIO_T1 is not set
-CONFIG_CHELSIO_T3=y
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_MYRI10GE is not set
-CONFIG_NETXEN_NIC=y
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-# CONFIG_SERIO_I8042 is not set
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_LIBPS2 is not set
-CONFIG_SERIO_RAW=y
-# CONFIG_GAMEPORT is not set
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_SERIAL_JSM is not set
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-# CONFIG_DRM is not set
-# CONFIG_RAW_DRIVER is not set
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-#
-# SPI support
-#
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-#
-# Dallas's 1-wire bus
-#
-# CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-#
-# Graphics support
-#
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB is not set
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-#
-# HID Devices
-#
-# CONFIG_HID is not set
-#
-# USB support
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
-# CONFIG_MMC is not set
-#
-# LED devices
-#
-# CONFIG_NEW_LEDS is not set
-#
-# LED drivers
-#
-#
-# LED Triggers
-#
-#
-# InfiniBand support
-#
-# CONFIG_INFINIBAND is not set
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-#
-# Real Time Clock
-#
-# CONFIG_RTC_CLASS is not set
-#
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-#
-# DMA Clients
-#
-#
-# DMA Devices
-#
-#
-# Auxiliary Display support
-#
-#
-# Virtualization
-#
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT4DEV_FS is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
-# CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-CONFIG_FUSE_FS=y
-CONFIG_GENERIC_ACL=y
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-CONFIG_CONFIGFS_FS=y
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_ECRYPT_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=y
-# CONFIG_NFS_V3 is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD=y
-# CONFIG_NFSD_V3 is not set
-# CONFIG_NFSD_TCP is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
-CONFIG_EXPORTFS=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-#
-# Native Language Support
-#
-# CONFIG_NLS is not set
-#
-# Distributed Lock Manager
-#
-CONFIG_DLM=y
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
-# CONFIG_DLM_DEBUG is not set
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_CROSSCOMPILE=y
-CONFIG_CMDLINE=""
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-# CONFIG_SECURITY is not set
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_WP512=y
-CONFIG_CRYPTO_TGR192=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_PCBC=y
-CONFIG_CRYPTO_LRW=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_FCRYPT=y
-CONFIG_CRYPTO_BLOWFISH=y
-CONFIG_CRYPTO_TWOFISH=y
-CONFIG_CRYPTO_TWOFISH_COMMON=y
-CONFIG_CRYPTO_SERPENT=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_CAST5=y
-CONFIG_CRYPTO_CAST6=y
-CONFIG_CRYPTO_TEA=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_KHAZAD=y
-CONFIG_CRYPTO_ANUBIS=y
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CAMELLIA=y
-#
-# Hardware crypto devices
-#
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-# CONFIG_CRC_CCITT is not set
-CONFIG_CRC16=y
-CONFIG_CRC32=y
-CONFIG_LIBCRC32C=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_PLIST=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig
index 15a027e00e..e1db1fb80c 100644
--- a/arch/mips/configs/ocelot_defconfig
+++ b/arch/mips/configs/ocelot_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 CONFIG_MOMENCO_OCELOT=y
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig
index 37d696c645..0028aef0af 100644
--- a/arch/mips/configs/pb1100_defconfig
+++ b/arch/mips/configs/pb1100_defconfig
@@ -26,9 +26,7 @@ CONFIG_MIPS_PB1100=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -36,8 +34,6 @@ CONFIG_MIPS_PB1100=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig
index b11f0e8b60..8a1d588873 100644
--- a/arch/mips/configs/pb1500_defconfig
+++ b/arch/mips/configs/pb1500_defconfig
@@ -26,9 +26,7 @@ CONFIG_MIPS_PB1500=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -36,8 +34,6 @@ CONFIG_MIPS_PB1500=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig
index 2927f38f49..5581ad2ca4 100644
--- a/arch/mips/configs/pb1550_defconfig
+++ b/arch/mips/configs/pb1550_defconfig
@@ -26,9 +26,7 @@ CONFIG_MIPS_PB1550=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -36,8 +34,6 @@ CONFIG_MIPS_PB1550=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig
index fae16c5ec5..821c1cee56 100644
--- a/arch/mips/configs/pnx8550-jbs_defconfig
+++ b/arch/mips/configs/pnx8550-jbs_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 CONFIG_PNX8550_JBS=y
diff --git a/arch/mips/configs/pnx8550-stb810_defconfig b/arch/mips/configs/pnx8550-stb810_defconfig
index cd821e5218..0e8bd92b38 100644
--- a/arch/mips/configs/pnx8550-stb810_defconfig
+++ b/arch/mips/configs/pnx8550-stb810_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig
index 8e8d031579..703de002e3 100644
--- a/arch/mips/configs/qemu_defconfig
+++ b/arch/mips/configs/qemu_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
@@ -225,7 +221,7 @@ CONFIG_DEFAULT_IOSCHED="noop"
 #
 CONFIG_ISA=y
 CONFIG_MMU=y
-CONFIG_I8253=y
+CONFIG_PCSPEAKER=y
 #
 # PCCARD (PCMCIA/CardBus) support
diff --git a/arch/mips/configs/rbhma4200_defconfig b/arch/mips/configs/rbhma4200_defconfig
index 35d6426091..20a38526d4 100644
--- a/arch/mips/configs/rbhma4200_defconfig
+++ b/arch/mips/configs/rbhma4200_defconfig
@@ -24,17 +24,13 @@ CONFIG_MIPS=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig
index 41011f770a..5dbb250f71 100644
--- a/arch/mips/configs/rbhma4500_defconfig
+++ b/arch/mips/configs/rbhma4500_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
+# Linux kernel version: 2.6.22-rc5
-# Tue Feb 20 21:47:39 2007
+# Fri Jun 22 21:39:45 2007
 #
 CONFIG_MIPS=y
@@ -9,40 +9,23 @@ CONFIG_MIPS=y
 # Machine selection
 #
 CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
+# CONFIG_LEMOTE_FULONG is not set
-# CONFIG_MIPS_BOSPORUS is not set
+# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
 # CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
-# CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_DDB5477 is not set
 # CONFIG_MACH_VR41XX is not set
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
 # CONFIG_MARKEINS is not set
@@ -82,6 +65,8 @@ CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_I8259=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_GPIO=y
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
@@ -93,6 +78,7 @@ CONFIG_HAVE_STD_PC_SERIAL_PORT=y
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -149,12 +135,12 @@ CONFIG_ZONE_DMA_FLAG=1
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1024 is not set
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
+CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
@@ -186,28 +172,35 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
-CONFIG_RELAY=y
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
+# CONFIG_HOTPLUG is not set
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 # CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -244,17 +237,12 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_HW_HAS_PCI=y
 CONFIG_PCI=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_MMU=y
 #
 # PCCARD (PCMCIA/CardBus) support
 #
-# CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
-# CONFIG_HOTPLUG_PCI is not set
 #
 # Executable file formats
@@ -266,10 +254,7 @@ CONFIG_TRAD_SIGNALS=y
 #
 # Power management options
 #
-CONFIG_PM=y
+# CONFIG_PM is not set
-# CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
 #
 # Networking
@@ -279,14 +264,9 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_MIGRATE=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -294,7 +274,7 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_FIB_HASH=y
 CONFIG_IP_PNP=y
 # CONFIG_IP_PNP_DHCP is not set
-CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_BOOTP is not set
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
@@ -305,130 +285,23 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET_TUNNEL=m
+# CONFIG_INET_TUNNEL is not set
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-CONFIG_INET_XFRM_MODE_TUNNEL=m
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_XFRM_MODE_BEET is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
-#
-# IP: Virtual Server Configuration
-#
-# CONFIG_IP_VS is not set
-CONFIG_IPV6=m
-# CONFIG_IPV6_PRIVACY is not set
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
-CONFIG_IPV6_MIP6=y
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+# CONFIG_NETWORK_SECMARK is not set
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
+# CONFIG_NETFILTER is not set
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-# CONFIG_IPV6_TUNNEL is not set
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK_ENABLED=m
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CT_ACCT=y
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NETFILTER_XTABLES=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-#
-# IPv6: Netfilter Configuration (EXPERIMENTAL)
-#
-CONFIG_NF_CONNTRACK_IPV6=m
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_IPTABLES is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -446,7 +319,6 @@ CONFIG_NF_CONNTRACK_IPV6=m
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
-CONFIG_NET_CLS_ROUTE=y
 #
 # Network testing
@@ -455,15 +327,16 @@ CONFIG_NET_CLS_ROUTE=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
-CONFIG_IEEE80211=m
+# CONFIG_AF_RXRPC is not set
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
+#
-CONFIG_IEEE80211_CRYPT_CCMP=m
+# Wireless
-CONFIG_IEEE80211_CRYPT_TKIP=m
+#
-CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_CFG80211 is not set
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+# CONFIG_WIRELESS_EXT is not set
-CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 is not set
-CONFIG_FIB_RULES=y
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -474,94 +347,13 @@ CONFIG_FIB_RULES=y
 #
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=m
 # CONFIG_SYS_HYPERVISOR is not set
 #
 # Connector - unified userspace <-> kernelspace linker
 #
-CONFIG_CONNECTOR=m
+# CONFIG_CONNECTOR is not set
+# CONFIG_MTD is not set
-#
-# Memory Technology Devices (MTD)
-#
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_CONCAT is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PLATRAM is not set
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-#
-# NAND Flash Device Drivers
-#
-# CONFIG_MTD_NAND is not set
-#
-# OneNAND Flash Device Drivers
-#
-# CONFIG_MTD_ONENAND is not set
 #
 # Parallel port support
@@ -583,93 +375,30 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
-CONFIG_SGI_IOC4=m
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
+# CONFIG_IDE is not set
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=y
-CONFIG_IDE_MAX_HWIFS=4
-CONFIG_BLK_DEV_IDE=y
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
-CONFIG_BLK_DEV_IDECD=y
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_IDEDMA_PCI_AUTO is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_PIIX is not set
-CONFIG_BLK_DEV_IT8213=m
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-CONFIG_BLK_DEV_TC86C001=m
-# CONFIG_IDE_ARM is not set
-CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_BLK_DEV_HD is not set
 #
 # SCSI device support
 #
-CONFIG_RAID_ATTRS=m
+# CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -685,6 +414,7 @@ CONFIG_RAID_ATTRS=m
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
@@ -699,36 +429,15 @@ CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
-CONFIG_TUN=m
+# CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
+# CONFIG_PHYLIB is not set
-#
-# PHY device support
-#
-CONFIG_PHYLIB=m
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_FIXED_PHY is not set
 #
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
+CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
@@ -747,6 +456,7 @@ CONFIG_NET_PCI=y
 # CONFIG_ADAPTEC_STARFIRE is not set
 # CONFIG_B44 is not set
 # CONFIG_FORCEDETH is not set
+CONFIG_TC35815=y
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 # CONFIG_E100 is not set
@@ -761,91 +471,20 @@ CONFIG_NET_PCI=y
 # CONFIG_TLAN is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_SC92031 is not set
+# CONFIG_NETDEV_1000 is not set
-#
+# CONFIG_NETDEV_10000 is not set
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-CONFIG_QLA3XXX=m
-# CONFIG_ATL1 is not set
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_CHELSIO_T1 is not set
-CONFIG_CHELSIO_T3=m
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_MYRI10GE is not set
-CONFIG_NETXEN_NIC=m
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
-#
-CONFIG_NET_RADIO=y
-# CONFIG_NET_WIRELESS_RTNETLINK is not set
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-# CONFIG_IPW2100 is not set
-CONFIG_IPW2200=m
-# CONFIG_IPW2200_MONITOR is not set
-# CONFIG_IPW2200_QOS is not set
-# CONFIG_IPW2200_DEBUG is not set
-# CONFIG_HERMES is not set
-# CONFIG_ATMEL is not set
-#
-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
-#
-# CONFIG_PRISM54 is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_BCM43XX is not set
-# CONFIG_ZD1211RW is not set
-CONFIG_NET_WIRELESS=y
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
-CONFIG_PPP=m
+# CONFIG_PPP is not set
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPP_FILTER is not set
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-# CONFIG_PPP_BSDCOMP is not set
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
 # CONFIG_SLIP is not set
-CONFIG_SLHC=m
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
@@ -864,57 +503,18 @@ CONFIG_SLHC=m
 #
 # Input device support
 #
-CONFIG_INPUT=y
+# CONFIG_INPUT is not set
-# CONFIG_INPUT_FF_MEMLESS is not set
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
 #
 # Hardware I/O ports
 #
-CONFIG_SERIO=y
+# CONFIG_SERIO is not set
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_PCIPS2 is not set
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
 # CONFIG_GAMEPORT is not set
 #
 # Character devices
 #
-CONFIG_VT=y
+# CONFIG_VT is not set
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 #
@@ -926,11 +526,12 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
 # Non-8250 serial port support
 #
 CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_TXX9=y
 CONFIG_HAS_TXX9_SERIAL=y
 CONFIG_SERIAL_TXX9_NR_UARTS=6
-# CONFIG_SERIAL_TXX9_CONSOLE is not set
+CONFIG_SERIAL_TXX9_CONSOLE=y
-# CONFIG_SERIAL_TXX9_STDSERIAL is not set
+CONFIG_SERIAL_TXX9_STDSERIAL=y
 # CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
@@ -940,15 +541,10 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
 # CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_DRM is not set
@@ -958,108 +554,61 @@ CONFIG_LEGACY_PTY_COUNT=256
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+# CONFIG_I2C is not set
+#
+# SPI support
+#
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
 #
-# I2C support
+# SPI Master Controller Drivers
 #
-# CONFIG_I2C is not set
+# CONFIG_SPI_BITBANG is not set
+CONFIG_SPI_TXX9=y
 #
-# SPI support
+# SPI Protocol Masters
 #
-# CONFIG_SPI is not set
+CONFIG_SPI_AT25=y
-# CONFIG_SPI_MASTER is not set
+# CONFIG_SPI_SPIDEV is not set
 #
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
+# CONFIG_HWMON is not set
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-CONFIG_HWMON=y
+# CONFIG_MFD_SM501 is not set
-# CONFIG_HWMON_VID is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
-#
+# CONFIG_DAB is not set
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-# CONFIG_USB_DABUSB is not set
 #
 # Graphics support
 #
-# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-CONFIG_FB_ATY=y
-CONFIG_FB_ATY_CT=y
-# CONFIG_FB_ATY_GENERIC_LCD is not set
-# CONFIG_FB_ATY_GX is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_SMIVGX is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_VIRTUAL is not set
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
-#
-# Logo configuration
-#
-# CONFIG_LOGO is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Sound
+# Display device support
 #
-# CONFIG_SOUND is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_FB is not set
 #
-# HID Devices
+# Sound
 #
-CONFIG_HID=y
+# CONFIG_SOUND is not set
-# CONFIG_HID_DEBUG is not set
 #
 # USB support
@@ -1067,148 +616,80 @@ CONFIG_HID=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB=y
+# CONFIG_USB is not set
-# CONFIG_USB_DEBUG is not set
-#
-# Miscellaneous USB options
-#
-# CONFIG_USB_DEVICEFS is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_SUSPEND is not set
-# CONFIG_USB_OTG is not set
-#
-# USB Host Controller Drivers
-#
-# CONFIG_USB_EHCI_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_UHCI_HCD is not set
-# CONFIG_USB_SL811_HCD is not set
-#
-# USB Device Class drivers
-#
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
 #
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
 #
-# may also be needed; see USB_STORAGE Help for more information
+# USB Gadget Support
-#
-# CONFIG_USB_LIBUSUAL is not set
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=y
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-# CONFIG_HID_FF is not set
-CONFIG_USB_HIDDEV=y
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-CONFIG_USB_YEALINK=m
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-# CONFIG_USB_GTCO is not set
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_USBNET is not set
-CONFIG_USB_MON=y
-#
-# USB port drivers
 #
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
 #
-# USB Serial Converter support
+# LED devices
 #
-# CONFIG_USB_SERIAL is not set
+# CONFIG_NEW_LEDS is not set
 #
-# USB Miscellaneous drivers
+# LED drivers
 #
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_AUERSWALD is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_BERRY_CHARGE is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGET is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
 #
-# USB DSL modem support
+# LED Triggers
 #
 #
-# USB Gadget Support
+# InfiniBand support
 #
-# CONFIG_USB_GADGET is not set
+# CONFIG_INFINIBAND is not set
 #
-# MMC/SD Card support
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
 #
-# CONFIG_MMC is not set
 #
-# LED devices
+# Real Time Clock
 #
-# CONFIG_NEW_LEDS is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
 #
-# LED drivers
+# RTC interfaces
 #
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+# CONFIG_RTC_DRV_TEST is not set
 #
-# LED Triggers
+# I2C RTC drivers
 #
 #
-# InfiniBand support
+# SPI RTC drivers
 #
-# CONFIG_INFINIBAND is not set
+CONFIG_RTC_DRV_RS5C348=y
+# CONFIG_RTC_DRV_MAX6902 is not set
 #
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+# Platform RTC drivers
 #
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_V3020 is not set
 #
-# Real Time Clock
+# on-CPU RTC drivers
 #
-# CONFIG_RTC_CLASS is not set
 #
 # DMA Engine support
@@ -1224,38 +705,15 @@ CONFIG_USB_MON=y
 #
 #
-# Auxiliary Display support
-#
-#
-# Virtualization
-#
-#
 # File systems
 #
-CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS is not set
-# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT3_FS is not set
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_XATTR=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
-# CONFIG_EXT3_FS_SECURITY is not set
 # CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=m
+# CONFIG_REISERFS_FS is not set
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_REISERFS_FS_XATTR is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
-CONFIG_XFS_FS=m
+# CONFIG_XFS_FS is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_SECURITY is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
@@ -1265,26 +723,21 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 # CONFIG_DNOTIFY is not set
 # CONFIG_AUTOFS_FS is not set
-CONFIG_AUTOFS4_FS=m
+# CONFIG_AUTOFS4_FS is not set
-CONFIG_FUSE_FS=m
+# CONFIG_FUSE_FS is not set
 CONFIG_GENERIC_ACL=y
 #
 # CD-ROM/DVD Filesystems
 #
-CONFIG_ISO9660_FS=y
+# CONFIG_ISO9660_FS is not set
-# CONFIG_JOLIET is not set
-# CONFIG_ZISOFS is not set
 # CONFIG_UDF_FS is not set
 #
 # DOS/FAT/NT Filesystems
 #
-CONFIG_FAT_FS=y
 # CONFIG_MSDOS_FS is not set
-CONFIG_VFAT_FS=y
+# CONFIG_VFAT_FS is not set
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_NTFS_FS is not set
 #
@@ -1298,7 +751,7 @@ CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-CONFIG_CONFIGFS_FS=m
+# CONFIG_CONFIGFS_FS is not set
 #
 # Miscellaneous filesystems
@@ -1310,16 +763,7 @@ CONFIG_CONFIGFS_FS=m
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=y
+# CONFIG_CRAMFS is not set
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_CRAMFS=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
@@ -1334,19 +778,16 @@ CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
 # CONFIG_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD=m
+# CONFIG_NFSD is not set
-# CONFIG_NFSD_V3 is not set
-# CONFIG_NFSD_TCP is not set
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
-CONFIG_SMB_FS=m
+# CONFIG_SMB_FS is not set
-# CONFIG_SMB_NLS_DEFAULT is not set
 # CONFIG_CIFS is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
@@ -1362,54 +803,12 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Native Language Support
 #
-CONFIG_NLS=y
+# CONFIG_NLS is not set
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_ISO8859_1 is not set
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
 #
 # Distributed Lock Manager
 #
-CONFIG_DLM=m
+# CONFIG_DLM is not set
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
-# CONFIG_DLM_DEBUG is not set
 #
 # Profiling support
@@ -1427,7 +826,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CROSSCOMPILE=y
 CONFIG_CMDLINE=""
 CONFIG_SYS_SUPPORTS_KGDB=y
@@ -1441,62 +839,17 @@ CONFIG_SYS_SUPPORTS_KGDB=y
 #
 # Cryptographic options
 #
-CONFIG_CRYPTO=y
+# CONFIG_CRYPTO is not set
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CAMELLIA=m
-# CONFIG_CRYPTO_TEST is not set
-#
-# Hardware crypto devices
-#
 #
 # Library routines
 #
 CONFIG_BITREVERSE=y
-CONFIG_CRC_CCITT=m
+# CONFIG_CRC_CCITT is not set
-CONFIG_CRC16=m
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
-CONFIG_LIBCRC32C=m
+# CONFIG_LIBCRC32C is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig
index 5593cde9f7..a5dc5cb97a 100644
--- a/arch/mips/configs/rm200_defconfig
+++ b/arch/mips/configs/rm200_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
@@ -255,7 +251,7 @@ CONFIG_PCI=y
 CONFIG_ISA=y
 # CONFIG_EISA is not set
 CONFIG_MMU=y
-CONFIG_I8253=y
+CONFIG_PCSPEAKER=y
 #
 # PCCARD (PCMCIA/CardBus) support
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig
index 6c4f09a381..98a9140922 100644
--- a/arch/mips/configs/sb1250-swarm_defconfig
+++ b/arch/mips/configs/sb1250-swarm_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig
index 988b9cdef0..69c08b24c8 100644
--- a/arch/mips/configs/sead_defconfig
+++ b/arch/mips/configs/sead_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 CONFIG_MIPS_SEAD=y
@@ -35,8 +33,6 @@ CONFIG_MIPS_SEAD=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/tb0219_defconfig b/arch/mips/configs/tb0219_defconfig
index 8b1675c07e..5d4fc0e4f7 100644
--- a/arch/mips/configs/tb0219_defconfig
+++ b/arch/mips/configs/tb0219_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig
index b5be8b74d8..1b92b48de0 100644
--- a/arch/mips/configs/tb0226_defconfig
+++ b/arch/mips/configs/tb0226_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig
index 8bb6be4342..5b77c7a5d8 100644
--- a/arch/mips/configs/tb0287_defconfig
+++ b/arch/mips/configs/tb0287_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig
index 8f019ffcc7..94a4f94a8b 100644
--- a/arch/mips/configs/workpad_defconfig
+++ b/arch/mips/configs/workpad_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/wrppmc_defconfig b/arch/mips/configs/wrppmc_defconfig
index 52b48c0715..e38bd9b0ea 100644
--- a/arch/mips/configs/wrppmc_defconfig
+++ b/arch/mips/configs/wrppmc_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_WR_PPMC=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig
index 6824606309..f342d8c887 100644
--- a/arch/mips/configs/yosemite_defconfig
+++ b/arch/mips/configs/yosemite_defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
@@ -596,8 +592,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
-CONFIG_GEN_RTC=y
-CONFIG_GEN_RTC_X=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
diff --git a/arch/mips/ddb5xxx/ddb5477/Makefile b/arch/mips/ddb5xxx/ddb5477/Makefile
index 23fd3b81fe..4864b8a659 100644
--- a/arch/mips/ddb5xxx/ddb5477/Makefile
+++ b/arch/mips/ddb5xxx/ddb5477/Makefile
@@ -2,7 +2,8 @@
 # Makefile for NEC DDB-Vrc5477 board
 #
-obj-y                   += irq.o irq_5477.o setup.o lcd44780.o
+obj-y                   += ddb5477-platform.o irq.o irq_5477.o setup.o \
+                           lcd44780.o
 obj-$(CONFIG_RUNTIME_DEBUG)     += debug.o
 obj-$(CONFIG_KGDB)              += kgdb_io.o
diff --git a/arch/mips/ddb5xxx/ddb5477/ddb5477-platform.c b/arch/mips/ddb5xxx/ddb5477/ddb5477-platform.c
new file mode 100644
index 0000000000..c16020ad54
--- /dev/null
+++ b/arch/mips/ddb5xxx/ddb5477/ddb5477-platform.c
@@ -0,0 +1,49 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org)
+ */
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/serial_8250.h>
+#include <asm/ddb5xxx/ddb5477.h>
+#define DDB_UART_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP)
+#define DDB5477_PORT(base, int)                                         \
+{                                                                       \
+        .mapbase        = base,                                         \
+        .irq            = int,                                          \
+        .uartclk        = 1843200,                                      \
+        .iotype         = UPIO_MEM,                                     \
+        .flags          = DDB_UART_FLAGS,                               \
+        .regshift       = 3,                                            \
+}
+static struct plat_serial8250_port uart8250_data[] = {
+        DDB5477_PORT(0xbfa04200, VRC5477_IRQ_UART0),
+        DDB5477_PORT(0xbfa04240, VRC5477_IRQ_UART1),
+        { },
+};
+static struct platform_device uart8250_device = {
+        .name                   = "serial8250",
+        .id                     = PLAT8250_DEV_PLATFORM,
+        .dev                    = {
+                .platform_data  = uart8250_data,
+        },
+};
+static int __init uart8250_init(void)
+{
+        return platform_device_register(&uart8250_device);
+}
+module_init(uart8250_init);
+MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("8250 UART probe driver for the NEC DDB5477");
diff --git a/arch/mips/dec/prom/console.c b/arch/mips/dec/prom/console.c
index 65419bf324..078e1a1242 100644
--- a/arch/mips/dec/prom/console.c
+++ b/arch/mips/dec/prom/console.c
@@ -3,7 +3,7 @@
 *
 *      DECstation PROM-based early console support.
 *
- *      Copyright (C) 2004  Maciej W. Rozycki
+ *      Copyright (C) 2004, 2007  Maciej W. Rozycki
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License
@@ -13,15 +13,35 @@
 #include <linux/console.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/string.h>
 #include <asm/dec/prom.h>
-void prom_putchar(char c)
+static void __init prom_console_write(struct console *con, const char *s,
+                                      unsigned int c)
 {
-        char s[2];
+        char buf[81];
+        unsigned int chunk = sizeof(buf) - 1;
-        s[0] = c;
+        while (c > 0) {
-        s[1] = '\0';
+                if (chunk > c)
+                        chunk = c;
+                memcpy(buf, s, chunk);
+                buf[chunk] = '\0';
+                prom_printf("%s", buf);
+                s += chunk;
+                c -= chunk;
+        }
+}
+static struct console promcons __initdata = {
+        .name   = "prom",
+        .write  = prom_console_write,
+        .flags  = CON_BOOT | CON_PRINTBUFFER,
+        .index  = -1,
+};
-        prom_printf( s);
+void __init register_prom_console(void)
+{
+        register_console(&promcons);
 }
diff --git a/arch/mips/dec/prom/init.c b/arch/mips/dec/prom/init.c
index a217aafe59..808c182fd3 100644
--- a/arch/mips/dec/prom/init.c
+++ b/arch/mips/dec/prom/init.c
@@ -86,7 +86,7 @@ void __init which_prom(s32 magic, s32 *prom_vec)
 void __init prom_init(void)
 {
-        extern void ATTRIB_NORET dec_machine_halt(void);
+        extern void dec_machine_halt(void);
        static char cpu_msg[] __initdata =
                "Sorry, this kernel is compiled for a wrong CPU type!\n";
        s32 argc = fw_arg0;
@@ -103,6 +103,9 @@ void __init prom_init(void)
        if (prom_is_rex(magic))
                rex_clear_cache();
+        /* Register the early console.  */
+        register_prom_console();
        /* Were we compiled with the right CPU option? */
 #if defined(CONFIG_CPU_R3000)
        if ((current_cpu_data.cputype == CPU_R4000SC) ||
diff --git a/arch/mips/dec/reset.c b/arch/mips/dec/reset.c
index 56397227ad..c15a879046 100644
--- a/arch/mips/dec/reset.c
+++ b/arch/mips/dec/reset.c
@@ -9,26 +9,26 @@
 #include <asm/addrspace.h>
-typedef void ATTRIB_NORET (* noret_func_t)(void);
+typedef void __noreturn (* noret_func_t)(void);
-static inline void ATTRIB_NORET back_to_prom(void)
+static inline void __noreturn back_to_prom(void)
 {
        noret_func_t func = (void *)CKSEG1ADDR(0x1fc00000);
        func();
 }
-void ATTRIB_NORET dec_machine_restart(char *command)
+void __noreturn dec_machine_restart(char *command)
 {
        back_to_prom();
 }
-void ATTRIB_NORET dec_machine_halt(void)
+void __noreturn dec_machine_halt(void)
 {
        back_to_prom();
 }
-void ATTRIB_NORET dec_machine_power_off(void)
+void __noreturn dec_machine_power_off(void)
 {
    /* DECstations don't have a software power switch */
        back_to_prom();
diff --git a/arch/mips/defconfig b/arch/mips/defconfig
index 41211f8b77..b3b6e58058 100644
--- a/arch/mips/defconfig
+++ b/arch/mips/defconfig
@@ -25,9 +25,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
@@ -35,8 +33,6 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
 # CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 # CONFIG_MOMENCO_OCELOT_G is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/arch/mips/gt64120/ev64120/Kconfig b/arch/mips/gt64120/ev64120/Kconfig
deleted file mode 100644
index d691762cb0..0000000000
--- a/arch/mips/gt64120/ev64120/Kconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-config EVB_PCI1
-        bool "Enable Second PCI (PCI1)"
-        depends on MIPS_EV64120
diff --git a/arch/mips/gt64120/ev64120/Makefile b/arch/mips/gt64120/ev64120/Makefile
deleted file mode 100644
index 323b2cebc6..0000000000
--- a/arch/mips/gt64120/ev64120/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#  Copyright 2000 RidgeRun, Inc.
-#  Author: RidgeRun, Inc.
-#       glonnon@ridgerun.com, skranz@ridgerun.com, stevej@ridgerun.com
-#
-# Makefile for the Galileo EV64120 board.
-#
-obj-y   += irq.o promcon.o reset.o serialGT.o setup.o
diff --git a/arch/mips/gt64120/ev64120/irq.c b/arch/mips/gt64120/ev64120/irq.c
deleted file mode 100644
index 64e4c80b61..0000000000
--- a/arch/mips/gt64120/ev64120/irq.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * BRIEF MODULE DESCRIPTION
- * Code to handle irqs on GT64120A boards
- *  Derived from mips/orion and Cort <cort@fsmlabs.com>
- *
- * Copyright (C) 2000 RidgeRun, Inc.
- * Author: RidgeRun, Inc.
- *   glonnon@ridgerun.com, skranz@ridgerun.com, stevej@ridgerun.com
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/kernel_stat.h>
-#include <linux/module.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/timex.h>
-#include <linux/slab.h>
-#include <linux/random.h>
-#include <linux/bitops.h>
-#include <asm/bootinfo.h>
-#include <asm/io.h>
-#include <asm/mipsregs.h>
-#include <asm/system.h>
-#include <asm/gt64120.h>
-asmlinkage void plat_irq_dispatch(void)
-{
-        unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;
-        if (pending & STATUSF_IP4)              /* int2 hardware line (timer) */
-                do_IRQ(4);
-        else if (pending & STATUSF_IP2)         /* int0 hardware line */
-                do_IRQ(GT_INTA);
-        else if (pending & STATUSF_IP5)         /* int3 hardware line */
-                do_IRQ(GT_INTD);
-        else if (pending & STATUSF_IP6)         /* int4 hardware line */
-                do_IRQ(6);
-        else if (pending & STATUSF_IP7)         /* compare int */
-                do_IRQ(7);
-        else
-                spurious_interrupt();
-}
-static void disable_ev64120_irq(unsigned int irq_nr)
-{
-        if (irq_nr >= 8) {      // All PCI interrupts are on line 5 or 2
-                clear_c0_status(9 << 10);
-        } else {
-                clear_c0_status(1 << (irq_nr + 8));
-        }
-}
-static void enable_ev64120_irq(unsigned int irq_nr)
-{
-        if (irq_nr >= 8)        // All PCI interrupts are on line 5 or 2
-                set_c0_status(9 << 10);
-        else
-                set_c0_status(1 << (irq_nr + 8));
-}
-static void end_ev64120_irq(unsigned int irq)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-                enable_ev64120_irq(irq);
-}
-static struct irq_chip ev64120_irq_type = {
-        .name           = "EV64120",
-        .ack            = disable_ev64120_irq,
-        .mask           = disable_ev64120_irq,
-        .mask_ack       = disable_ev64120_irq,
-        .unmask         = enable_ev64120_irq,
-        .end            = end_ev64120_irq,
-};
-void gt64120_irq_setup(void)
-{
-        /*
-         * Clear all of the interrupts while we change the able around a bit.
-         */
-        clear_c0_status(ST0_IM);
-        /*
-         * Enable timer.  Other interrupts will be enabled as they are
-         * registered.
-         */
-        set_c0_status(IE_IRQ2);
-}
-void __init arch_init_irq(void)
-{
-        gt64120_irq_setup();
-}
diff --git a/arch/mips/gt64120/ev64120/promcon.c b/arch/mips/gt64120/ev64120/promcon.c
deleted file mode 100644
index 6e0ecfed96..0000000000
--- a/arch/mips/gt64120/ev64120/promcon.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Wrap-around code for a console using the
- * SGI PROM io-routines.
- *
- * Copyright (c) 1999 Ulf Carlsson
- *
- * Derived from DECstation promcon.c
- * Copyright (c) 1998 Harald Koerfgen
- */
-#include <linux/tty.h>
-#include <linux/init.h>
-#include <linux/console.h>
-static void prom_console_write(struct console *co, const char *s,
-                               unsigned count)
-{
-        extern int CONSOLE_CHANNEL;     // The default serial port
-        unsigned i;
-        for (i = 0; i < count; i++) {
-                if (*s == 10)
-                        serial_putc(CONSOLE_CHANNEL, 13);
-                serial_putc(CONSOLE_CHANNEL, *s++);
-        }
-}
-static struct console sercons = {
-    .name       = "ttyS",
-    .write      = prom_console_write,
-    .flags      = CON_PRINTBUFFER,
-    .index      = -1,
-};
-/*
- *    Register console.
- */
-static int gal_serial_console_init(void)
-{
-        //  serial_init();
-        //serial_set(115200);
-        register_console(&sercons);
-        return 0;
-}
-console_initcall(gal_serial_console_init);
diff --git a/arch/mips/gt64120/ev64120/reset.c b/arch/mips/gt64120/ev64120/reset.c
deleted file mode 100644
index 7b9f5e5bf2..0000000000
--- a/arch/mips/gt64120/ev64120/reset.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 1997 Ralf Baechle
- */
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/processor.h>
-#include <asm/reboot.h>
-#include <asm/system.h>
-void galileo_machine_restart(char *command)
-{
-        *(volatile char *) 0xbc000000 = 0x0f;
-        /*
-         * Ouch, we're still alive ... This time we take the silver bullet ...
-         * ... and find that we leave the hardware in a state in which the
-         * kernel in the flush locks up somewhen during of after the PCI
-         * detection stuff.
-         */
-        set_c0_status(ST0_BEV | ST0_ERL);
-        change_c0_config(CONF_CM_CMASK, CONF_CM_UNCACHED);
-        flush_cache_all();
-        write_c0_wired(0);
-        __asm__ __volatile__("jr\t%0"::"r"(0xbfc00000));
-}
-void galileo_machine_halt(void)
-{
-        printk(KERN_NOTICE "You can safely turn off the power\n");
-        while (1)
-                __asm__(".set\tmips3\n\t"
-                        "wait\n\t"
-                        ".set\tmips0");
-}
-void galileo_machine_power_off(void)
-{
-        galileo_machine_halt();
-}
diff --git a/arch/mips/gt64120/ev64120/serialGT.c b/arch/mips/gt64120/ev64120/serialGT.c
deleted file mode 100644
index 8f0d835491..0000000000
--- a/arch/mips/gt64120/ev64120/serialGT.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * serialGT.c
- *
- * BRIEF MODULE DESCRIPTION
- *  Low Level Serial Port control for use
- *  with the Galileo EVB64120A MIPS eval board and
- *  its on board two channel 16552 Uart.
- *
- * Copyright (C) 2000 RidgeRun, Inc.
- * Author: RidgeRun, Inc.
- *   glonnon@ridgerun.com, skranz@ridgerun.com, stevej@ridgerun.com
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-// Note:
-//   Serial CHANNELS - 0 is the bottom connector of evb64120A.
-//                       (The one that maps to the "B" channel of the
-//                       board's uart)
-//                     1 is the top connector of evb64120A.
-//                       (The one that maps to the "A" channel of the
-//                       board's uart)
-int DEBUG_CHANNEL = 0;          // See Note Above
-int CONSOLE_CHANNEL = 1;        // See Note Above
-#define DUART 0xBD000000        /* Base address of Uart. */
-#define CHANNELOFFSET 0x20      /* DUART+CHANNELOFFSET gets you to the ChanA
-                                   register set of the 16552 Uart device.
-                                   DUART+0 gets you to the ChanB register set.
-                                 */
-#define DUART_DELTA 0x4
-#define FIFO_ENABLE 0x07
-#define INT_ENABLE  0x04        /* default interrupt mask */
-#define RBR 0x00
-#define THR 0x00
-#define DLL 0x00
-#define IER 0x01
-#define DLM 0x01
-#define IIR 0x02
-#define FCR 0x02
-#define LCR 0x03
-#define MCR 0x04
-#define LSR 0x05
-#define MSR 0x06
-#define SCR 0x07
-#define LCR_DLAB 0x80
-#define XTAL 1843200
-#define LSR_THRE 0x20
-#define LSR_BI   0x10
-#define LSR_DR   0x01
-#define MCR_LOOP 0x10
-#define ACCESS_DELAY 0x10000
-/******************************
- Routine:
- Description:
- ******************************/
-int inreg(int channel, int reg)
-{
-        int val;
-        val =
-            *((volatile unsigned char *) DUART +
-              (channel * CHANNELOFFSET) + (reg * DUART_DELTA));
-        return val;
-}
-/******************************
- Routine:
- Description:
- ******************************/
-void outreg(int channel, int reg, unsigned char val)
-{
-        *((volatile unsigned char *) DUART + (channel * CHANNELOFFSET)
-          + (reg * DUART_DELTA)) = val;
-}
-/******************************
- Routine:
- Description:
-   Initialize the device driver.
- ******************************/
-void serial_init(int channel)
-{
-        /*
-         * Configure active port, (CHANNELOFFSET already set.)
-         *
-         * Set 8 bits, 1 stop bit, no parity.
-         *
-         * LCR<7>       0       divisor latch access bit
-         * LCR<6>       0       break control (1=send break)
-         * LCR<5>       0       stick parity (0=space, 1=mark)
-         * LCR<4>       0       parity even (0=odd, 1=even)
-         * LCR<3>       0       parity enable (1=enabled)
-         * LCR<2>       0       # stop bits (0=1, 1=1.5)
-         * LCR<1:0>     11      bits per character(00=5, 01=6, 10=7, 11=8)
-         */
-        outreg(channel, LCR, 0x3);
-        outreg(channel, FCR, FIFO_ENABLE);      /* Enable the FIFO */
-        outreg(channel, IER, INT_ENABLE);       /* Enable appropriate interrupts */
-}
-/******************************
- Routine:
- Description:
-   Set the baud rate.
- ******************************/
-void serial_set(int channel, unsigned long baud)
-{
-        unsigned char sav_lcr;
-        /*
-         * Enable access to the divisor latches by setting DLAB in LCR.
-         *
-         */
-        sav_lcr = inreg(channel, LCR);
-#if 0
-        /*
-         * Set baud rate
-         */
-        outreg(channel, LCR, LCR_DLAB | sav_lcr);
-        //  outreg(DLL,(XTAL/(16*2*(baud))-2));
-        outreg(channel, DLL, XTAL / (16 * baud));
-        //  outreg(DLM,(XTAL/(16*2*(baud))-2)>>8);
-        outreg(channel, DLM, (XTAL / (16 * baud)) >> 8);
-#else
-        /*
-         * Note: Set baud rate, hardcoded here for rate of 115200
-         * since became unsure of above "baud rate" algorithm (??).
-         */
-        outreg(channel, LCR, 0x83);
-        outreg(channel, DLM, 0x00);     // See note above
-        outreg(channel, DLL, 0x02);     // See note above.
-        outreg(channel, LCR, 0x03);
-#endif
-        /*
-         * Restore line control register
-         */
-        outreg(channel, LCR, sav_lcr);
-}
-/******************************
- Routine:
- Description:
-   Transmit a character.
- ******************************/
-void serial_putc(int channel, int c)
-{
-        while ((inreg(channel, LSR) & LSR_THRE) == 0);
-        outreg(channel, THR, c);
-}
-/******************************
- Routine:
- Description:
-    Read a received character if one is
-    available.  Return -1 otherwise.
- ******************************/
-int serial_getc(int channel)
-{
-        if (inreg(channel, LSR) & LSR_DR) {
-                return inreg(channel, RBR);
-        }
-        return -1;
-}
-/******************************
- Routine:
- Description:
-   Used by embedded gdb client. (example; gdb-stub.c)
- ******************************/
-char getDebugChar()
-{
-        int val;
-        while ((val = serial_getc(DEBUG_CHANNEL)) == -1);       // loop until we get a character in.
-        return (char) val;
-}
-/******************************
- Routine:
- Description:
-   Used by embedded gdb target. (example; gdb-stub.c)
- ******************************/
-void putDebugChar(char c)
-{
-        serial_putc(DEBUG_CHANNEL, (int) c);
-}
diff --git a/arch/mips/gt64120/ev64120/setup.c b/arch/mips/gt64120/ev64120/setup.c
deleted file mode 100644
index 477848c22a..0000000000
--- a/arch/mips/gt64120/ev64120/setup.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2000 RidgeRun, Inc.
- * Author: RidgeRun, Inc.
- *   glonnon@ridgerun.com, skranz@ridgerun.com, stevej@ridgerun.com
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/swap.h>
-#include <linux/ioport.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/timex.h>
-#include <linux/pm.h>
-#include <asm/bootinfo.h>
-#include <asm/page.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/pci.h>
-#include <asm/processor.h>
-#include <asm/time.h>
-#include <asm/reboot.h>
-#include <asm/traps.h>
-#include <linux/bootmem.h>
-unsigned long gt64120_base = KSEG1ADDR(0x14000000);
-/* These functions are used for rebooting or halting the machine*/
-extern void galileo_machine_restart(char *command);
-extern void galileo_machine_halt(void);
-extern void galileo_machine_power_off(void);
-/*
- *This structure holds pointers to the pci configuration space accesses
- *and interrupts allocating routine for device over the PCI
- */
-extern struct pci_ops galileo_pci_ops;
-void __init prom_free_prom_memory(void)
-{
-}
-/*
- * Initializes basic routines and structures pointers, memory size (as
- * given by the bios and saves the command line.
- */
-void __init plat_mem_setup(void)
-{
-        _machine_restart = galileo_machine_restart;
-        _machine_halt = galileo_machine_halt;
-        pm_power_off = galileo_machine_power_off;
-        set_io_port_base(KSEG1);
-}
-const char *get_system_type(void)
-{
-        return "Galileo EV64120A";
-}
-/*
- * Kernel arguments passed by the firmware
- *
- * $a0 - nothing
- * $a1 - holds a pointer to the eprom parameters
- * $a2 - nothing
- */
-void __init prom_init(void)
-{
-        mips_machgroup = MACH_GROUP_GALILEO;
-        mips_machtype = MACH_EV64120A;
-        add_memory_region(0, 32 << 20, BOOT_MEM_RAM);
-}
diff --git a/arch/mips/gt64120/momenco_ocelot/Makefile b/arch/mips/gt64120/momenco_ocelot/Makefile
index 9f9a33fc76..1df5fe23c6 100644
--- a/arch/mips/gt64120/momenco_ocelot/Makefile
+++ b/arch/mips/gt64120/momenco_ocelot/Makefile
@@ -2,6 +2,6 @@
 # Makefile for Momentum's Ocelot board.
 #
-obj-y                   += irq.o prom.o reset.o setup.o
+obj-y                   += irq.o ocelot-platform.o prom.o reset.o setup.o
 obj-$(CONFIG_KGDB)      += dbg_io.o
diff --git a/arch/mips/gt64120/momenco_ocelot/ocelot-platform.c b/arch/mips/gt64120/momenco_ocelot/ocelot-platform.c
new file mode 100644
index 0000000000..81d9031a5a
--- /dev/null
+++ b/arch/mips/gt64120/momenco_ocelot/ocelot-platform.c
@@ -0,0 +1,46 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org)
+ *
+ * A NS16552 DUART with a 20MHz crystal.
+ *
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/serial_8250.h>
+#define OCELOT_UART_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP)
+static struct plat_serial8250_port uart8250_data[] = {
+        {
+                .mapbase        = 0xe0001020,
+                .irq            = 4,
+                .uartclk        = 20000000,
+                .iotype         = UPIO_MEM,
+                .flags          = OCELOT_UART_FLAGS,
+                .regshift       = 2,
+        },
+        { },
+};
+static struct platform_device uart8250_device = {
+        .name                   = "serial8250",
+        .id                     = PLAT8250_DEV_PLATFORM,
+        .dev                    = {
+                .platform_data  = uart8250_data,
+        },
+};
+static int __init uart8250_init(void)
+{
+        return platform_device_register(&uart8250_device);
+}
+module_init(uart8250_init);
+MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("8250 UART probe driver for the Momenco Ocelot");
diff --git a/arch/mips/gt64120/wrppmc/setup.c b/arch/mips/gt64120/wrppmc/setup.c
index 121188d5ec..ed58c13b60 100644
--- a/arch/mips/gt64120/wrppmc/setup.c
+++ b/arch/mips/gt64120/wrppmc/setup.c
@@ -14,6 +14,7 @@
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <linux/pm.h>
 #include <asm/io.h>
@@ -158,8 +159,8 @@ const char *get_system_type(void)
 */
 void __init prom_init(void)
 {
-        mips_machgroup = MACH_GROUP_GALILEO;
+        mips_machgroup = MACH_GROUP_WINDRIVER;
-        mips_machtype = MACH_EV64120A;
+        mips_machtype = MACH_WRPPMC;
        add_memory_region(WRPPMC_SDRAM_SCS0_BASE, WRPPMC_SDRAM_SCS0_SIZE, BOOT_MEM_RAM);
        add_memory_region(WRPPMC_BOOTROM_BASE, WRPPMC_BOOTROM_SIZE, BOOT_MEM_ROM_DATA);
diff --git a/arch/mips/jazz/Makefile b/arch/mips/jazz/Makefile
index dd9d99bfcf..ae4c402b50 100644
--- a/arch/mips/jazz/Makefile
+++ b/arch/mips/jazz/Makefile
@@ -2,4 +2,4 @@
 # Makefile for the Jazz family specific parts of the kernel
 #
-obj-y           := irq.o jazzdma.o reset.o setup.o
+obj-y           := irq.o jazzdma.o jazz-platform.o reset.o setup.o
diff --git a/arch/mips/jazz/jazz-platform.c b/arch/mips/jazz/jazz-platform.c
new file mode 100644
index 0000000000..fd736703ee
--- /dev/null
+++ b/arch/mips/jazz/jazz-platform.c
@@ -0,0 +1,60 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org)
+ */
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/serial_8250.h>
+#include <asm/jazz.h>
+/*
+ * Confusion ...  It seems the original Microsoft Jazz machine used to have a
+ * 4.096MHz clock for its UART while the MIPS Magnum and Millenium systems
+ * had 8MHz.  The Olivetti M700-10 and the Acer PICA have 1.8432MHz like PCs.
+ */
+#ifdef CONFIG_OLIVETTI_M700
+#define JAZZ_BASE_BAUD 1843200
+#else
+#define JAZZ_BASE_BAUD  8000000 /* 3072000 */
+#endif
+#define JAZZ_UART_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP)
+#define JAZZ_PORT(base, int)                                            \
+{                                                                       \
+        .mapbase        = base,                                         \
+        .irq            = int,                                          \
+        .uartclk        = JAZZ_BASE_BAUD,                               \
+        .iotype         = UPIO_MEM,                                     \
+        .flags          = JAZZ_UART_FLAGS,                              \
+        .regshift       = 0,                                            \
+}
+static struct plat_serial8250_port uart8250_data[] = {
+        JAZZ_PORT(JAZZ_SERIAL1_BASE, JAZZ_SERIAL1_IRQ),
+        JAZZ_PORT(JAZZ_SERIAL2_BASE, JAZZ_SERIAL2_IRQ),
+        { },
+};
+static struct platform_device uart8250_device = {
+        .name                   = "serial8250",
+        .id                     = PLAT8250_DEV_PLATFORM,
+        .dev                    = {
+                .platform_data  = uart8250_data,
+        },
+};
+static int __init uart8250_init(void)
+{
+        return platform_device_register(&uart8250_device);
+}
+module_init(uart8250_init);
+MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("8250 UART probe driver for the Jazz family");
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index d848f1a077..81ec559a1c 100644
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -54,7 +54,7 @@ static struct resource jazz_io_resources[] = {
                .start  = 0x40,
                .end    = 0x5f,
                .name   = "timer",
-                .end    = IORESOURCE_BUSY
+                .flags  = IORESOURCE_BUSY
        }, {
                .start  = 0x80,
                .end    = 0x8f,
diff --git a/arch/mips/kernel/8250-platform.c b/arch/mips/kernel/8250-platform.c
new file mode 100644
index 0000000000..cbf3fe20ad
--- /dev/null
+++ b/arch/mips/kernel/8250-platform.c
@@ -0,0 +1,47 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org)
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/serial_8250.h>
+#define PORT(base, int)                                                 \
+{                                                                       \
+        .iobase         = base,                                         \
+        .irq            = int,                                          \
+        .uartclk        = 1843200,                                      \
+        .iotype         = UPIO_PORT,                                    \
+        .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,            \
+        .regshift       = 0,                                            \
+}
+static struct plat_serial8250_port uart8250_data[] = {
+        PORT(0x3F8, 4),
+        PORT(0x2F8, 3),
+        PORT(0x3E8, 4),
+        PORT(0x2E8, 3),
+        { },
+};
+static struct platform_device uart8250_device = {
+        .name                   = "serial8250",
+        .id                     = PLAT8250_DEV_PLATFORM,
+        .dev                    = {
+                .platform_data  = uart8250_data,
+        },
+};
+static int __init uart8250_init(void)
+{
+        return platform_device_register(&uart8250_device);
+}
+module_init(uart8250_init);
+MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Generic 8250 UART probe driver");
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 49246264cc..5c8085b6d7 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -14,14 +14,15 @@ binfmt_irix-objs	:= irixelf.o irixinv.o irixioctl.o irixsig.o	\
 obj-$(CONFIG_STACKTRACE)        += stacktrace.o
 obj-$(CONFIG_MODULES)           += mips_ksyms.o module.o
+obj-$(CONFIG_CPU_LOONGSON2)     += r4k_fpu.o r4k_switch.o
+obj-$(CONFIG_CPU_MIPS32)        += r4k_fpu.o r4k_switch.o
+obj-$(CONFIG_CPU_MIPS64)        += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R3000)         += r2300_fpu.o r2300_switch.o
-obj-$(CONFIG_CPU_TX39XX)        += r2300_fpu.o r2300_switch.o
-obj-$(CONFIG_CPU_TX49XX)        += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R4000)         += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_VR41XX)        += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R4300)         += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R4X00)         += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R5000)         += r4k_fpu.o r4k_switch.o
+obj-$(CONFIG_CPU_R6000)         += r6000_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R5432)         += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R8000)         += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_RM7000)        += r4k_fpu.o r4k_switch.o
@@ -29,13 +30,14 @@ obj-$(CONFIG_CPU_RM9000)	+= r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_NEVADA)        += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R10000)        += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_SB1)           += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_MIPS32)        += r4k_fpu.o r4k_switch.o
+obj-$(CONFIG_CPU_TX39XX)        += r2300_fpu.o r2300_switch.o
-obj-$(CONFIG_CPU_MIPS64)        += r4k_fpu.o r4k_switch.o
+obj-$(CONFIG_CPU_TX49XX)        += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_R6000)         += r6000_fpu.o r4k_switch.o
+obj-$(CONFIG_CPU_VR41XX)        += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_SMP)               += smp.o
 obj-$(CONFIG_MIPS_MT)           += mips-mt.o
+obj-$(CONFIG_MIPS_MT_FPAFF)     += mips-mt-fpaff.o
 obj-$(CONFIG_MIPS_MT_SMTC)      += smtc.o smtc-asm.o smtc-proc.o
 obj-$(CONFIG_MIPS_MT_SMP)       += smp-mt.o
@@ -47,7 +49,6 @@ obj-$(CONFIG_I8259)		+= i8259.o
 obj-$(CONFIG_IRQ_CPU)           += irq_cpu.o
 obj-$(CONFIG_IRQ_CPU_RM7K)      += irq-rm7000.o
 obj-$(CONFIG_IRQ_CPU_RM9K)      += irq-rm9000.o
-obj-$(CONFIG_IRQ_MV64340)       += irq-mv6434x.o
 obj-$(CONFIG_MIPS_BOARDS_GEN)   += irq-msc01.o
 obj-$(CONFIG_32BIT)             += scall32-o32.o
@@ -62,9 +63,11 @@ obj-$(CONFIG_PROC_FS)		+= proc.o
 obj-$(CONFIG_64BIT)             += cpu-bugs64.o
-obj-$(CONFIG_I8253)             += i8253.o
+obj-$(CONFIG_PCSPEAKER)         += pcspeaker.o
 obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o
 obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
 CFLAGS_cpu-bugs64.o     = $(shell if $(CC) $(CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
+obj-$(CONFIG_HAVE_STD_PC_SERIAL_PORT)   += 8250-platform.o
diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c
index 76fd3f22c7..6b5df8bfab 100644
--- a/arch/mips/kernel/branch.c
+++ b/arch/mips/kernel/branch.c
@@ -22,7 +22,8 @@
 */
 int __compute_return_epc(struct pt_regs *regs)
 {
-        unsigned int *addr, bit, fcr31, dspcontrol;
+        unsigned int __user *addr;
+        unsigned int bit, fcr31, dspcontrol;
        long epc;
        union mips_instruction insn;
@@ -33,7 +34,7 @@ int __compute_return_epc(struct pt_regs *regs)
        /*
         * Read the instruction
         */
-        addr = (unsigned int *) epc;
+        addr = (unsigned int __user *) epc;
        if (__get_user(insn.word, addr)) {
                force_sig(SIGSEGV, current);
                return -EFAULT;
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index ab755ea26c..c6b8b074a8 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -137,14 +137,24 @@ static inline void check_wait(void)
        case CPU_4KEC:
        case CPU_4KSC:
        case CPU_5KC:
-/*      case CPU_20KC:*/
-        case CPU_24K:
        case CPU_25KF:
+        case CPU_PR4450:
+                cpu_wait = r4k_wait;
+                break;
+        case CPU_24K:
        case CPU_34K:
+                cpu_wait = r4k_wait;
+                if (read_c0_config7() & MIPS_CONF7_WII)
+                        cpu_wait = r4k_wait_irqoff;
+                break;
        case CPU_74K:
-        case CPU_PR4450:
                cpu_wait = r4k_wait;
+                if ((c->processor_id & 0xff) >= PRID_REV_ENCODE_332(2, 1, 0))
+                        cpu_wait = r4k_wait_irqoff;
                break;
        case CPU_TX49XX:
                cpu_wait = r4k_wait_irqoff;
                break;
@@ -156,6 +166,17 @@ static inline void check_wait(void)
                if (allow_au1k_wait)
                        cpu_wait = au1k_wait;
                break;
+        case CPU_20KC:
+                /*
+                 * WAIT on Rev1.0 has E1, E2, E3 and E16.
+                 * WAIT on Rev2.0 and Rev3.0 has E16.
+                 * Rev3.1 WAIT is nop, why bother
+                 */
+                if ((c->processor_id & 0xff) <= 0x64)
+                        break;
+                cpu_wait = r4k_wait;
+                break;
        case CPU_RM9000:
                if ((c->processor_id & 0x00ff) >= 0x40)
                        cpu_wait = r4k_wait;
@@ -165,9 +186,29 @@ static inline void check_wait(void)
        }
 }
+static inline void check_errata(void)
+{
+        struct cpuinfo_mips *c = &current_cpu_data;
+        switch (c->cputype) {
+        case CPU_34K:
+                /*
+                 * Erratum "RPS May Cause Incorrect Instruction Execution"
+                 * This code only handles VPE0, any SMP/SMTC/RTOS code
+                 * making use of VPE1 will be responsable for that VPE.
+                 */
+                if ((c->processor_id & PRID_REV_MASK) <= PRID_REV_34K_V1_0_2)
+                        write_c0_config7(read_c0_config7() | MIPS_CONF7_RPS);
+                break;
+        default:
+                break;
+        }
+}
 void __init check_bugs32(void)
 {
        check_wait();
+        check_errata();
 }
 /*
@@ -464,6 +505,14 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                             MIPS_CPU_LLSC;
                c->tlbsize = 64;
                break;
+        case PRID_IMP_LOONGSON2:
+                c->cputype = CPU_LOONGSON2;
+                c->isa_level = MIPS_CPU_ISA_III;
+                c->options = R4K_OPTS |
+                             MIPS_CPU_FPU | MIPS_CPU_LLSC |
+                             MIPS_CPU_32FPR;
+                c->tlbsize = 64;
+                break;
        }
 }
@@ -567,6 +616,8 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c)
                c->options |= MIPS_CPU_VEIC;
        if (config3 & MIPS_CONF3_MT)
                c->ases |= MIPS_ASE_MIPSMT;
+        if (config3 & MIPS_CONF3_ULRI)
+                c->options |= MIPS_CPU_ULRI;
        return config3 & MIPS_CONF_M;
 }
diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S
index 686249c5c3..e29598ae93 100644
--- a/arch/mips/kernel/entry.S
+++ b/arch/mips/kernel/entry.S
@@ -84,6 +84,7 @@ FEXPORT(restore_all)			# restore full frame
        LONG_S  sp, TI_REGS($28)
        jal     deferred_smtc_ipi
        LONG_S  s0, TI_REGS($28)
+#ifdef CONFIG_MIPS_MT_SMTC_IM_BACKSTOP
 /* Re-arm any temporarily masked interrupts not explicitly "acked" */
        mfc0    v0, CP0_TCSTATUS
        ori     v1, v0, TCSTATUS_IXMT
@@ -110,6 +111,7 @@ FEXPORT(restore_all)			# restore full frame
        _ehb
        xor     t0, t0, t3
        mtc0    t0, CP0_TCCONTEXT
+#endif /* CONFIG_MIPS_MT_SMTC_IM_BACKSTOP */
 #endif /* CONFIG_MIPS_MT_SMTC */
        .set    noat
        RESTORE_TEMP
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
index 297bd56c23..c0f19d638b 100644
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -243,9 +243,11 @@ NESTED(except_vec_vi_handler, 0, sp)
         */
        mfc0    t1, CP0_STATUS
        and     t0, a0, t1
+#ifdef CONFIG_MIPS_MT_SMTC_IM_BACKSTOP
        mfc0    t2, CP0_TCCONTEXT
        or      t0, t0, t2
        mtc0    t0, CP0_TCCONTEXT
+#endif /* CONFIG_MIPS_MT_SMTC_IM_BACKSTOP */
        xor     t1, t1, t0
        mtc0    t1, CP0_STATUS
        _ehb
diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S
index 6f57ca4429..f78538ecee 100644
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/threads.h>
+#include <asm/addrspace.h>
 #include <asm/asm.h>
 #include <asm/asmmacro.h>
 #include <asm/irqflags.h>
@@ -129,24 +130,25 @@
 #endif
        .endm
+#ifndef CONFIG_NO_EXCEPT_FILL
        /*
         * Reserved space for exception handlers.
         * Necessary for machines which link their kernels at KSEG0.
         */
        .fill   0x400
+#endif
 EXPORT(stext)                                   # used for profiling
 EXPORT(_stext)
-#ifdef CONFIG_MIPS_SIM
+#ifdef CONFIG_BOOT_RAW
        /*
         * Give us a fighting chance of running if execution beings at the
         * kernel load address.  This is needed because this platform does
         * not have a ELF loader yet.
         */
-        j       kernel_entry
-#endif
        __INIT
+#endif
 NESTED(kernel_entry, 16, sp)                    # kernel entry point
@@ -197,9 +199,7 @@ NESTED(kernel_entry, 16, sp)			# kernel entry point
        j               start_kernel
        END(kernel_entry)
-#ifdef CONFIG_QEMU
        __INIT
-#endif
 #ifdef CONFIG_SMP
 /*
diff --git a/arch/mips/kernel/irq-mv6434x.c b/arch/mips/kernel/irq-mv6434x.c
deleted file mode 100644
index 3dd561832e..0000000000
--- a/arch/mips/kernel/irq-mv6434x.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2002 Momentum Computer
- * Author: mdharm@momenco.com
- * Copyright (C) 2004, 06 Ralf Baechle <ralf@linux-mips.org>
- *
- * 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.
- */
-#include <linux/module.h>
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/kernel_stat.h>
-#include <linux/mv643xx.h>
-#include <linux/sched.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/marvell.h>
-static unsigned int irq_base;
-static inline int ls1bit32(unsigned int x)
-{
-        int b = 31, s;
-        s = 16; if (x << 16 == 0) s = 0; b -= s; x <<= s;
-        s =  8; if (x <<  8 == 0) s = 0; b -= s; x <<= s;
-        s =  4; if (x <<  4 == 0) s = 0; b -= s; x <<= s;
-        s =  2; if (x <<  2 == 0) s = 0; b -= s; x <<= s;
-        s =  1; if (x <<  1 == 0) s = 0; b -= s;
-        return b;
-}
-/* mask off an interrupt -- 1 is enable, 0 is disable */
-static inline void mask_mv64340_irq(unsigned int irq)
-{
-        uint32_t value;
-        if (irq < (irq_base + 32)) {
-                value = MV_READ(MV64340_INTERRUPT0_MASK_0_LOW);
-                value &= ~(1 << (irq - irq_base));
-                MV_WRITE(MV64340_INTERRUPT0_MASK_0_LOW, value);
-        } else {
-                value = MV_READ(MV64340_INTERRUPT0_MASK_0_HIGH);
-                value &= ~(1 << (irq - irq_base - 32));
-                MV_WRITE(MV64340_INTERRUPT0_MASK_0_HIGH, value);
-        }
-}
-/* unmask an interrupt -- 1 is enable, 0 is disable */
-static inline void unmask_mv64340_irq(unsigned int irq)
-{
-        uint32_t value;
-        if (irq < (irq_base + 32)) {
-                value = MV_READ(MV64340_INTERRUPT0_MASK_0_LOW);
-                value |= 1 << (irq - irq_base);
-                MV_WRITE(MV64340_INTERRUPT0_MASK_0_LOW, value);
-        } else {
-                value = MV_READ(MV64340_INTERRUPT0_MASK_0_HIGH);
-                value |= 1 << (irq - irq_base - 32);
-                MV_WRITE(MV64340_INTERRUPT0_MASK_0_HIGH, value);
-        }
-}
-/*
- * Interrupt handler for interrupts coming from the Marvell chip.
- * It could be built in ethernet ports etc...
- */
-void ll_mv64340_irq(void)
-{
-        unsigned int irq_src_low, irq_src_high;
-        unsigned int irq_mask_low, irq_mask_high;
-        /* read the interrupt status registers */
-        irq_mask_low = MV_READ(MV64340_INTERRUPT0_MASK_0_LOW);
-        irq_mask_high = MV_READ(MV64340_INTERRUPT0_MASK_0_HIGH);
-        irq_src_low = MV_READ(MV64340_MAIN_INTERRUPT_CAUSE_LOW);
-        irq_src_high = MV_READ(MV64340_MAIN_INTERRUPT_CAUSE_HIGH);
-        /* mask for just the interrupts we want */
-        irq_src_low &= irq_mask_low;
-        irq_src_high &= irq_mask_high;
-        if (irq_src_low)
-                do_IRQ(ls1bit32(irq_src_low) + irq_base);
-        else
-                do_IRQ(ls1bit32(irq_src_high) + irq_base + 32);
-}
-struct irq_chip mv64340_irq_type = {
-        .name = "MV-64340",
-        .ack = mask_mv64340_irq,
-        .mask = mask_mv64340_irq,
-        .mask_ack = mask_mv64340_irq,
-        .unmask = unmask_mv64340_irq,
-};
-void __init mv64340_irq_init(unsigned int base)
-{
-        int i;
-        for (i = base; i < base + 64; i++)
-                set_irq_chip_and_handler(i, &mv64340_irq_type,
-                                         handle_level_irq);
-        irq_base = base;
-}
diff --git a/arch/mips/kernel/mips-mt-fpaff.c b/arch/mips/kernel/mips-mt-fpaff.c
new file mode 100644
index 0000000000..ede5d73d65
--- /dev/null
+++ b/arch/mips/kernel/mips-mt-fpaff.c
@@ -0,0 +1,176 @@
+/*
+ * General MIPS MT support routines, usable in AP/SP, SMVP, or SMTC kernels
+ * Copyright (C) 2005 Mips Technologies, Inc
+ */
+#include <linux/cpu.h>
+#include <linux/cpumask.h>
+#include <linux/delay.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/security.h>
+#include <linux/types.h>
+#include <asm/uaccess.h>
+/*
+ * CPU mask used to set process affinity for MT VPEs/TCs with FPUs
+ */
+cpumask_t mt_fpu_cpumask;
+static int fpaff_threshold = -1;
+unsigned long mt_fpemul_threshold = 0;
+/*
+ * Replacement functions for the sys_sched_setaffinity() and
+ * sys_sched_getaffinity() system calls, so that we can integrate
+ * FPU affinity with the user's requested processor affinity.
+ * This code is 98% identical with the sys_sched_setaffinity()
+ * and sys_sched_getaffinity() system calls, and should be
+ * updated when kernel/sched.c changes.
+ */
+/*
+ * find_process_by_pid - find a process with a matching PID value.
+ * used in sys_sched_set/getaffinity() in kernel/sched.c, so
+ * cloned here.
+ */
+static inline struct task_struct *find_process_by_pid(pid_t pid)
+{
+        return pid ? find_task_by_pid(pid) : current;
+}
+/*
+ * mipsmt_sys_sched_setaffinity - set the cpu affinity of a process
+ */
+asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len,
+                                      unsigned long __user *user_mask_ptr)
+{
+        cpumask_t new_mask;
+        cpumask_t effective_mask;
+        int retval;
+        struct task_struct *p;
+        if (len < sizeof(new_mask))
+                return -EINVAL;
+        if (copy_from_user(&new_mask, user_mask_ptr, sizeof(new_mask)))
+                return -EFAULT;
+        lock_cpu_hotplug();
+        read_lock(&tasklist_lock);
+        p = find_process_by_pid(pid);
+        if (!p) {
+                read_unlock(&tasklist_lock);
+                unlock_cpu_hotplug();
+                return -ESRCH;
+        }
+        /*
+         * It is not safe to call set_cpus_allowed with the
+         * tasklist_lock held.  We will bump the task_struct's
+         * usage count and drop tasklist_lock before invoking
+         * set_cpus_allowed.
+         */
+        get_task_struct(p);
+        retval = -EPERM;
+        if ((current->euid != p->euid) && (current->euid != p->uid) &&
+                        !capable(CAP_SYS_NICE)) {
+                read_unlock(&tasklist_lock);
+                goto out_unlock;
+        }
+        retval = security_task_setscheduler(p, 0, NULL);
+        if (retval)
+                goto out_unlock;
+        /* Record new user-specified CPU set for future reference */
+        p->thread.user_cpus_allowed = new_mask;
+        /* Unlock the task list */
+        read_unlock(&tasklist_lock);
+        /* Compute new global allowed CPU set if necessary */
+        if ((p->thread.mflags & MF_FPUBOUND)
+        && cpus_intersects(new_mask, mt_fpu_cpumask)) {
+                cpus_and(effective_mask, new_mask, mt_fpu_cpumask);
+                retval = set_cpus_allowed(p, effective_mask);
+        } else {
+                p->thread.mflags &= ~MF_FPUBOUND;
+                retval = set_cpus_allowed(p, new_mask);
+        }
+out_unlock:
+        put_task_struct(p);
+        unlock_cpu_hotplug();
+        return retval;
+}
+/*
+ * mipsmt_sys_sched_getaffinity - get the cpu affinity of a process
+ */
+asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len,
+                                      unsigned long __user *user_mask_ptr)
+{
+        unsigned int real_len;
+        cpumask_t mask;
+        int retval;
+        struct task_struct *p;
+        real_len = sizeof(mask);
+        if (len < real_len)
+                return -EINVAL;
+        lock_cpu_hotplug();
+        read_lock(&tasklist_lock);
+        retval = -ESRCH;
+        p = find_process_by_pid(pid);
+        if (!p)
+                goto out_unlock;
+        retval = security_task_getscheduler(p);
+        if (retval)
+                goto out_unlock;
+        cpus_and(mask, p->thread.user_cpus_allowed, cpu_possible_map);
+out_unlock:
+        read_unlock(&tasklist_lock);
+        unlock_cpu_hotplug();
+        if (retval)
+                return retval;
+        if (copy_to_user(user_mask_ptr, &mask, real_len))
+                return -EFAULT;
+        return real_len;
+}
+static int __init fpaff_thresh(char *str)
+{
+        get_option(&str, &fpaff_threshold);
+        return 1;
+}
+__setup("fpaff=", fpaff_thresh);
+/*
+ * FPU Use Factor empirically derived from experiments on 34K
+ */
+#define FPUSEFACTOR 333
+static __init int mt_fp_affinity_init(void)
+{
+        if (fpaff_threshold >= 0) {
+                mt_fpemul_threshold = fpaff_threshold;
+        } else {
+                mt_fpemul_threshold =
+                        (FPUSEFACTOR * (loops_per_jiffy/(500000/HZ))) / HZ;
+        }
+        printk(KERN_DEBUG "FPU Affinity set after %ld emulations\n",
+               mt_fpemul_threshold);
+        return 0;
+}
+arch_initcall(mt_fp_affinity_init);
diff --git a/arch/mips/kernel/mips-mt.c b/arch/mips/kernel/mips-mt.c
index ba01800b60..1a7d892312 100644
--- a/arch/mips/kernel/mips-mt.c
+++ b/arch/mips/kernel/mips-mt.c
@@ -6,7 +6,6 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
-#include <linux/cpumask.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/security.h>
@@ -23,149 +22,6 @@
 #include <asm/cacheflush.h>
 /*
- * CPU mask used to set process affinity for MT VPEs/TCs with FPUs
- */
-cpumask_t mt_fpu_cpumask;
-#ifdef CONFIG_MIPS_MT_FPAFF
-#include <linux/cpu.h>
-#include <linux/delay.h>
-#include <asm/uaccess.h>
-unsigned long mt_fpemul_threshold = 0;
-/*
- * Replacement functions for the sys_sched_setaffinity() and
- * sys_sched_getaffinity() system calls, so that we can integrate
- * FPU affinity with the user's requested processor affinity.
- * This code is 98% identical with the sys_sched_setaffinity()
- * and sys_sched_getaffinity() system calls, and should be
- * updated when kernel/sched.c changes.
- */
-/*
- * find_process_by_pid - find a process with a matching PID value.
- * used in sys_sched_set/getaffinity() in kernel/sched.c, so
- * cloned here.
- */
-static inline struct task_struct *find_process_by_pid(pid_t pid)
-{
-        return pid ? find_task_by_pid(pid) : current;
-}
-/*
- * mipsmt_sys_sched_setaffinity - set the cpu affinity of a process
- */
-asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len,
-                                      unsigned long __user *user_mask_ptr)
-{
-        cpumask_t new_mask;
-        cpumask_t effective_mask;
-        int retval;
-        struct task_struct *p;
-        if (len < sizeof(new_mask))
-                return -EINVAL;
-        if (copy_from_user(&new_mask, user_mask_ptr, sizeof(new_mask)))
-                return -EFAULT;
-        lock_cpu_hotplug();
-        read_lock(&tasklist_lock);
-        p = find_process_by_pid(pid);
-        if (!p) {
-                read_unlock(&tasklist_lock);
-                unlock_cpu_hotplug();
-                return -ESRCH;
-        }
-        /*
-         * It is not safe to call set_cpus_allowed with the
-         * tasklist_lock held.  We will bump the task_struct's
-         * usage count and drop tasklist_lock before invoking
-         * set_cpus_allowed.
-         */
-        get_task_struct(p);
-        retval = -EPERM;
-        if ((current->euid != p->euid) && (current->euid != p->uid) &&
-                        !capable(CAP_SYS_NICE)) {
-                read_unlock(&tasklist_lock);
-                goto out_unlock;
-        }
-        retval = security_task_setscheduler(p, 0, NULL);
-        if (retval)
-                goto out_unlock;
-        /* Record new user-specified CPU set for future reference */
-        p->thread.user_cpus_allowed = new_mask;
-        /* Unlock the task list */
-        read_unlock(&tasklist_lock);
-        /* Compute new global allowed CPU set if necessary */
-        if( (p->thread.mflags & MF_FPUBOUND)
-        && cpus_intersects(new_mask, mt_fpu_cpumask)) {
-                cpus_and(effective_mask, new_mask, mt_fpu_cpumask);
-                retval = set_cpus_allowed(p, effective_mask);
-        } else {
-                p->thread.mflags &= ~MF_FPUBOUND;
-                retval = set_cpus_allowed(p, new_mask);
-        }
-out_unlock:
-        put_task_struct(p);
-        unlock_cpu_hotplug();
-        return retval;
-}
-/*
- * mipsmt_sys_sched_getaffinity - get the cpu affinity of a process
- */
-asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len,
-                                      unsigned long __user *user_mask_ptr)
-{
-        unsigned int real_len;
-        cpumask_t mask;
-        int retval;
-        struct task_struct *p;
-        real_len = sizeof(mask);
-        if (len < real_len)
-                return -EINVAL;
-        lock_cpu_hotplug();
-        read_lock(&tasklist_lock);
-        retval = -ESRCH;
-        p = find_process_by_pid(pid);
-        if (!p)
-                goto out_unlock;
-        retval = security_task_getscheduler(p);
-        if (retval)
-                goto out_unlock;
-        cpus_and(mask, p->thread.user_cpus_allowed, cpu_possible_map);
-out_unlock:
-        read_unlock(&tasklist_lock);
-        unlock_cpu_hotplug();
-        if (retval)
-                return retval;
-        if (copy_to_user(user_mask_ptr, &mask, real_len))
-                return -EFAULT;
-        return real_len;
-}
-#endif /* CONFIG_MIPS_MT_FPAFF */
-/*
 * Dump new MIPS MT state for the core. Does not leave TCs halted.
 * Takes an argument which taken to be a pre-call MVPControl value.
 */
@@ -195,27 +51,31 @@ void mips_mt_regdump(unsigned long mvpctl)
        nvpe = ((mvpconf0 & MVPCONF0_PVPE) >> MVPCONF0_PVPE_SHIFT) + 1;
        ntc = ((mvpconf0 & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1;
        printk("-- per-VPE State --\n");
-        for(i = 0; i < nvpe; i++) {
+        for (i = 0; i < nvpe; i++) {
-            for(tc = 0; tc < ntc; tc++) {
+                for (tc = 0; tc < ntc; tc++) {
                        settc(tc);
-                if((read_tc_c0_tcbind() & TCBIND_CURVPE) == i) {
+                        if ((read_tc_c0_tcbind() & TCBIND_CURVPE) == i) {
-                    printk("  VPE %d\n", i);
+                                printk("  VPE %d\n", i);
-                    printk("   VPEControl : %08lx\n", read_vpe_c0_vpecontrol());
+                                printk("   VPEControl : %08lx\n",
-                    printk("   VPEConf0 : %08lx\n", read_vpe_c0_vpeconf0());
+                                       read_vpe_c0_vpecontrol());
-                    printk("   VPE%d.Status : %08lx\n",
+                                printk("   VPEConf0 : %08lx\n",
-                                i, read_vpe_c0_status());
+                                       read_vpe_c0_vpeconf0());
-                    printk("   VPE%d.EPC : %08lx\n", i, read_vpe_c0_epc());
+                                printk("   VPE%d.Status : %08lx\n",
-                    printk("   VPE%d.Cause : %08lx\n", i, read_vpe_c0_cause());
+                                       i, read_vpe_c0_status());
-                    printk("   VPE%d.Config7 : %08lx\n",
+                                printk("   VPE%d.EPC : %08lx\n",
-                                i, read_vpe_c0_config7());
+                                       i, read_vpe_c0_epc());
-                    break; /* Next VPE */
+                                printk("   VPE%d.Cause : %08lx\n",
+                                       i, read_vpe_c0_cause());
+                                printk("   VPE%d.Config7 : %08lx\n",
+                                       i, read_vpe_c0_config7());
+                                break; /* Next VPE */
+                        }
                }
-            }
        }
        printk("-- per-TC State --\n");
-        for(tc = 0; tc < ntc; tc++) {
+        for (tc = 0; tc < ntc; tc++) {
                settc(tc);
-                if(read_tc_c0_tcbind() == read_c0_tcbind()) {
+                if (read_tc_c0_tcbind() == read_c0_tcbind()) {
                        /* Are we dumping ourself?  */
                        haltval = 0; /* Then we're not halted, and mustn't be */
                        tcstatval = flags; /* And pre-dump TCStatus is flags */
@@ -310,17 +170,6 @@ static int __init ndflush(char *s)
        return 1;
 }
 __setup("ndflush=", ndflush);
-#ifdef CONFIG_MIPS_MT_FPAFF
-static int fpaff_threshold = -1;
-static int __init fpaff_thresh(char *str)
-{
-        get_option(&str, &fpaff_threshold);
-        return 1;
-}
-__setup("fpaff=", fpaff_thresh);
-#endif /* CONFIG_MIPS_MT_FPAFF */
 static unsigned int itc_base = 0;
@@ -376,20 +225,6 @@ void mips_mt_set_cpuoptions(void)
        if (mt_n_dflushes != 1)
                printk("D-Cache Flushes Repeated %d times\n", mt_n_dflushes);
-#ifdef CONFIG_MIPS_MT_FPAFF
-        /* FPU Use Factor empirically derived from experiments on 34K */
-#define FPUSEFACTOR 333
-        if (fpaff_threshold >= 0) {
-                mt_fpemul_threshold = fpaff_threshold;
-        } else {
-                mt_fpemul_threshold =
-                        (FPUSEFACTOR * (loops_per_jiffy/(500000/HZ))) / HZ;
-        }
-        printk("FPU Affinity set after %ld emulations\n",
-                        mt_fpemul_threshold);
-#endif /* CONFIG_MIPS_MT_FPAFF */
        if (itc_base != 0) {
                /*
                 * Configure ITC mapping.  This code is very
diff --git a/arch/mips/kernel/i8253.c b/arch/mips/kernel/pcspeaker.c
index 475df69042..475df69042 100644
--- a/arch/mips/kernel/i8253.c
+++ b/arch/mips/kernel/pcspeaker.c
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 5ddc2e9dee..ec04f5a1a5 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -14,7 +14,6 @@
 #include <asm/cpu-features.h>
 #include <asm/mipsregs.h>
 #include <asm/processor.h>
-#include <asm/watch.h>
 unsigned int vced_count, vcei_count;
@@ -84,6 +83,7 @@ static const char *cpu_name[] = {
        [CPU_VR4181A]   = "NEC VR4181A",
        [CPU_SR71000]   = "Sandcraft SR71000",
        [CPU_PR4450]    = "Philips PR4450",
+        [CPU_LOONGSON2] = "ICT Loongson-2",
 };
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 6bdfb5a9fa..8f4cf27c71 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -46,7 +46,7 @@
 * power and have a low exit latency (ie sit in a loop waiting for somebody to
 * say that they'd like to reschedule)
 */
-ATTRIB_NORET void cpu_idle(void)
+void __noreturn cpu_idle(void)
 {
        /* endless idle loop with no priority at all */
        while (1) {
@@ -213,7 +213,7 @@ int dump_task_fpu (struct task_struct *t, elf_fpregset_t *fpr)
 /*
 * Create a kernel thread
 */
-static ATTRIB_NORET void kernel_thread_helper(void *arg, int (*fn)(void *))
+static void __noreturn kernel_thread_helper(void *arg, int (*fn)(void *))
 {
        do_exit(fn(arg));
 }
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index b5a7b46bbc..893e7bccf2 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -174,17 +174,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        switch (request) {
        /* when I and D space are separate, these will need to be fixed. */
        case PTRACE_PEEKTEXT: /* read word at location addr. */
-        case PTRACE_PEEKDATA: {
+        case PTRACE_PEEKDATA:
-                unsigned long tmp;
+                ret = generic_ptrace_peekdata(child, addr, data);
-                int copied;
-                copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
-                ret = -EIO;
-                if (copied != sizeof(tmp))
-                        break;
-                ret = put_user(tmp,(unsigned long __user *) data);
                break;
-        }
        /* Read the word at location addr in the USER area. */
        case PTRACE_PEEKUSR: {
@@ -313,11 +305,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        /* when I and D space are separate, this will have to be fixed. */
        case PTRACE_POKETEXT: /* write the word at location addr. */
        case PTRACE_POKEDATA:
-                ret = 0;
+                ret = generic_ptrace_pokedata(child, addr, data);
-                if (access_process_vm(child, addr, &data, sizeof(data), 1)
-                    == sizeof(data))
-                        break;
-                ret = -EIO;
                break;
        case PTRACE_POKEUSR: {
diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S
index 0672959681..d9bfae53c4 100644
--- a/arch/mips/kernel/r4k_switch.S
+++ b/arch/mips/kernel/r4k_switch.S
@@ -85,12 +85,7 @@
        move    $28, a2
        cpu_restore_nonscratch a1
-#if (_THREAD_SIZE - 32) < 0x10000
+        PTR_ADDU        t0, $28, _THREAD_SIZE - 32
-        PTR_ADDIU       t0, $28, _THREAD_SIZE - 32
-#else
-        PTR_LI          t0, _THREAD_SIZE - 32
-        PTR_ADDU        t0, $28
-#endif
        set_saved_sp    t0, t1, t2
 #ifdef CONFIG_MIPS_MT_SMTC
        /* Read-modify-writes of Status must be atomic on a VPE */
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 4975da0bfb..316685fca0 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -20,6 +20,7 @@
 #include <linux/highmem.h>
 #include <linux/console.h>
 #include <linux/pfn.h>
+#include <linux/debugfs.h>
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
@@ -574,3 +575,18 @@ __setup("nodsp", dsp_disable);
 unsigned long kernelsp[NR_CPUS];
 unsigned long fw_arg0, fw_arg1, fw_arg2, fw_arg3;
+#ifdef CONFIG_DEBUG_FS
+struct dentry *mips_debugfs_dir;
+static int __init debugfs_mips(void)
+{
+        struct dentry *d;
+        d = debugfs_create_dir("mips", NULL);
+        if (IS_ERR(d))
+                return PTR_ERR(d);
+        mips_debugfs_dir = d;
+        return 0;
+}
+arch_initcall(debugfs_mips);
+#endif
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index 003f8152b9..486b8e5f52 100644
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -36,68 +36,6 @@
 #include "signal-common.h"
-#define SI_PAD_SIZE32   ((SI_MAX_SIZE/sizeof(int)) - 3)
-typedef struct compat_siginfo {
-        int si_signo;
-        int si_code;
-        int si_errno;
-        union {
-                int _pad[SI_PAD_SIZE32];
-                /* kill() */
-                struct {
-                        compat_pid_t _pid;      /* sender's pid */
-                        compat_uid_t _uid;      /* sender's uid */
-                } _kill;
-                /* SIGCHLD */
-                struct {
-                        compat_pid_t _pid;      /* which child */
-                        compat_uid_t _uid;      /* sender's uid */
-                        int _status;            /* exit code */
-                        compat_clock_t _utime;
-                        compat_clock_t _stime;
-                } _sigchld;
-                /* IRIX SIGCHLD */
-                struct {
-                        compat_pid_t _pid;      /* which child */
-                        compat_clock_t _utime;
-                        int _status;            /* exit code */
-                        compat_clock_t _stime;
-                } _irix_sigchld;
-                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
-                struct {
-                        s32 _addr; /* faulting insn/memory ref. */
-                } _sigfault;
-                /* SIGPOLL, SIGXFSZ (To do ...)  */
-                struct {
-                        int _band;      /* POLL_IN, POLL_OUT, POLL_MSG */
-                        int _fd;
-                } _sigpoll;
-                /* POSIX.1b timers */
-                struct {
-                        timer_t _tid;           /* timer id */
-                        int _overrun;           /* overrun count */
-                        compat_sigval_t _sigval;/* same as below */
-                        int _sys_private;       /* not to be passed to user */
-                } _timer;
-                /* POSIX.1b signals */
-                struct {
-                        compat_pid_t _pid;      /* sender's pid */
-                        compat_uid_t _uid;      /* sender's uid */
-                        compat_sigval_t _sigval;
-                } _rt;
-        } _sifields;
-} compat_siginfo_t;
 /*
 * Including <asm/unistd.h> would give use the 64-bit syscall numbers ...
 */
diff --git a/arch/mips/kernel/signal_n32.c b/arch/mips/kernel/signal_n32.c
index 4cf9ff24d1..eb7e05926e 100644
--- a/arch/mips/kernel/signal_n32.c
+++ b/arch/mips/kernel/signal_n32.c
@@ -72,7 +72,7 @@ struct ucontextn32 {
 struct rt_sigframe_n32 {
        u32 rs_ass[4];                  /* argument save space for o32 */
        u32 rs_code[2];                 /* signal trampoline */
-        struct siginfo rs_info;
+        struct compat_siginfo rs_info;
        struct ucontextn32 rs_uc;
 };
@@ -81,7 +81,7 @@ struct rt_sigframe_n32 {
 struct rt_sigframe_n32 {
        u32 rs_ass[4];                  /* argument save space for o32 */
        u32 rs_pad[2];
-        struct siginfo rs_info;
+        struct compat_siginfo rs_info;
        struct ucontextn32 rs_uc;
        u32 rs_code[8] ____cacheline_aligned;           /* signal trampoline */
 };
@@ -187,7 +187,7 @@ static int setup_rt_frame_n32(struct k_sigaction * ka,
        install_sigtramp(frame->rs_code, __NR_N32_rt_sigreturn);
        /* Create siginfo.  */
-        err |= copy_siginfo_to_user(&frame->rs_info, info);
+        err |= copy_siginfo_to_user32(&frame->rs_info, info);
        /* Create the ucontext.  */
        err |= __put_user(0, &frame->rs_uc.uc_flags);
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c
index b8fa7ddd78..19b30d6f17 100644
--- a/arch/mips/kernel/smp-mt.c
+++ b/arch/mips/kernel/smp-mt.c
@@ -236,8 +236,6 @@ void __init plat_smp_setup(void)
        dvpe();
        dmt();
-        mips_mt_set_cpuoptions();
        /* Put MVPE's into 'configuration state' */
        set_c0_mvpcontrol(MVPCONTROL_VPC);
@@ -263,6 +261,8 @@ void __init plat_smp_setup(void)
 void __init plat_prepare_cpus(unsigned int max_cpus)
 {
+        mips_mt_set_cpuoptions();
        /* set up ipi interrupts */
        if (cpu_has_vint) {
                set_vi_handler(MIPS_CPU_IPI_RESCHED_IRQ, ipi_resched_dispatch);
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 67edfa7ed9..be7362bc2c 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -51,18 +51,8 @@ int __cpu_logical_map[NR_CPUS];		/* Map logical to physical */
 EXPORT_SYMBOL(phys_cpu_present_map);
 EXPORT_SYMBOL(cpu_online_map);
-/* This happens early in bootup, can't really do it better */
-static void smp_tune_scheduling (void)
-{
-        struct cache_desc *cd = &current_cpu_data.scache;
-        unsigned long cachesize = cd->linesz * cd->sets * cd->ways;
-        if (cachesize > max_cache_size)
-                max_cache_size = cachesize;
-}
 extern void __init calibrate_delay(void);
-extern ATTRIB_NORET void cpu_idle(void);
+extern void cpu_idle(void);
 /*
 * First C code run on the secondary CPUs after being started up by
@@ -228,7 +218,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 {
        init_new_context(current, &init_mm);
        current_thread_info()->cpu = 0;
-        smp_tune_scheduling();
        plat_prepare_cpus(max_cpus);
 #ifndef CONFIG_HOTPLUG_CPU
        cpu_present_map = cpu_possible_map;
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index 2e011470c3..342d873b2e 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -822,7 +822,7 @@ void ipi_decode(struct smtc_ipi *pipi)
        switch (type_copy) {
        case SMTC_CLOCK_TICK:
                irq_enter();
-                kstat_this_cpu.irqs[MIPS_CPU_IRQ_BASE + cp0_perfcount_irq]++;
+                kstat_this_cpu.irqs[MIPS_CPU_IRQ_BASE + cp0_compare_irq]++;
                /* Invoke Clock "Interrupt" */
                ipi_timer_latch[dest_copy] = 0;
 #ifdef CONFIG_SMTC_IDLE_HOOK_DEBUG
@@ -1104,7 +1104,7 @@ void smtc_idle_loop_hook(void)
        mtflags = dmt();
        pdb_msg = &id_ho_db_msg[0];
        im = read_c0_status();
-        vpe = cpu_data[smp_processor_id()].vpe_id;
+        vpe = current_cpu_data.vpe_id;
        for (bit = 0; bit < 8; bit++) {
                /*
                 * In current prototype, I/O interrupts
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
index 9dd5a2df8e..b947c61c0c 100644
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@@ -272,9 +272,8 @@ asmlinkage int sys_set_thread_area(unsigned long addr)
        struct thread_info *ti = task_thread_info(current);
        ti->tp_value = addr;
+        if (cpu_has_userlocal)
-        /* If some future MIPS implementation has this register in hardware,
+                write_c0_userlocal(addr);
-         * we will need to update it here (and in context switches).  */
        return 0;
 }
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index b1233644fc..ce277cb34d 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -39,7 +39,6 @@
 #include <asm/traps.h>
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
-#include <asm/watch.h>
 #include <asm/types.h>
 #include <asm/stacktrace.h>
@@ -70,6 +69,7 @@ extern asmlinkage void handle_reserved(void);
 extern int fpu_emulator_cop1Handler(struct pt_regs *xcp,
        struct mips_fpu_struct *ctx, int has_fpu);
+void (*board_watchpoint_handler)(struct pt_regs *regs);
 void (*board_be_init)(void);
 int (*board_be_handler)(struct pt_regs *regs, int is_fixup);
 void (*board_nmi_handler_setup)(void);
@@ -131,7 +131,7 @@ static void show_stacktrace(struct task_struct *task, struct pt_regs *regs)
        const int field = 2 * sizeof(unsigned long);
        long stackdata;
        int i;
-        unsigned long *sp = (unsigned long *)regs->regs[29];
+        unsigned long __user *sp = (unsigned long __user *)regs->regs[29];
        printk("Stack :");
        i = 0;
@@ -187,7 +187,7 @@ void dump_stack(void)
 EXPORT_SYMBOL(dump_stack);
-void show_code(unsigned int *pc)
+static void show_code(unsigned int __user *pc)
 {
        long i;
@@ -305,13 +305,13 @@ void show_registers(struct pt_regs *regs)
        printk("Process %s (pid: %d, threadinfo=%p, task=%p)\n",
                current->comm, current->pid, current_thread_info(), current);
        show_stacktrace(current, regs);
-        show_code((unsigned int *) regs->cp0_epc);
+        show_code((unsigned int __user *) regs->cp0_epc);
        printk("\n");
 }
 static DEFINE_SPINLOCK(die_lock);
-NORET_TYPE void ATTRIB_NORET die(const char * str, struct pt_regs * regs)
+void __noreturn die(const char * str, struct pt_regs * regs)
 {
        static int die_counter;
 #ifdef CONFIG_MIPS_MT_SMTC
@@ -326,6 +326,7 @@ NORET_TYPE void ATTRIB_NORET die(const char * str, struct pt_regs * regs)
 #endif /* CONFIG_MIPS_MT_SMTC */
        printk("%s[#%d]:\n", str, ++die_counter);
        show_registers(regs);
+        add_taint(TAINT_DIE);
        spin_unlock_irq(&die_lock);
        if (in_interrupt())
@@ -373,7 +374,7 @@ asmlinkage void do_be(struct pt_regs *regs)
                action = MIPS_BE_FIXUP;
        if (board_be_handler)
-                action = board_be_handler(regs, fixup != 0);
+                action = board_be_handler(regs, fixup != NULL);
        switch (action) {
        case MIPS_BE_DISCARD:
@@ -753,6 +754,33 @@ asmlinkage void do_ri(struct pt_regs *regs)
        force_sig(SIGILL, current);
 }
+/*
+ * MIPS MT processors may have fewer FPU contexts than CPU threads. If we've
+ * emulated more than some threshold number of instructions, force migration to
+ * a "CPU" that has FP support.
+ */
+static void mt_ase_fp_affinity(void)
+{
+#ifdef CONFIG_MIPS_MT_FPAFF
+        if (mt_fpemul_threshold > 0 &&
+             ((current->thread.emulated_fp++ > mt_fpemul_threshold))) {
+                /*
+                 * If there's no FPU present, or if the application has already
+                 * restricted the allowed set to exclude any CPUs with FPUs,
+                 * we'll skip the procedure.
+                 */
+                if (cpus_intersects(current->cpus_allowed, mt_fpu_cpumask)) {
+                        cpumask_t tmask;
+                        cpus_and(tmask, current->thread.user_cpus_allowed,
+                                 mt_fpu_cpumask);
+                        set_cpus_allowed(current, tmask);
+                        current->thread.mflags |= MF_FPUBOUND;
+                }
+        }
+#endif /* CONFIG_MIPS_MT_FPAFF */
+}
 asmlinkage void do_cpu(struct pt_regs *regs)
 {
        unsigned int cpid;
@@ -786,36 +814,8 @@ asmlinkage void do_cpu(struct pt_regs *regs)
                                                &current->thread.fpu, 0);
                        if (sig)
                                force_sig(sig, current);
-#ifdef CONFIG_MIPS_MT_FPAFF
+                        else
-                        else {
+                                mt_ase_fp_affinity();
-                        /*
-                         * MIPS MT processors may have fewer FPU contexts
-                         * than CPU threads. If we've emulated more than
-                         * some threshold number of instructions, force
-                         * migration to a "CPU" that has FP support.
-                         */
-                         if(mt_fpemul_threshold > 0
-                         && ((current->thread.emulated_fp++
-                            > mt_fpemul_threshold))) {
-                          /*
-                           * If there's no FPU present, or if the
-                           * application has already restricted
-                           * the allowed set to exclude any CPUs
-                           * with FPUs, we'll skip the procedure.
-                           */
-                          if (cpus_intersects(current->cpus_allowed,
-                                                mt_fpu_cpumask)) {
-                            cpumask_t tmask;
-                            cpus_and(tmask,
-                                        current->thread.user_cpus_allowed,
-                                        mt_fpu_cpumask);
-                            set_cpus_allowed(current, tmask);
-                            current->thread.mflags |= MF_FPUBOUND;
-                          }
-                         }
-                        }
-#endif /* CONFIG_MIPS_MT_FPAFF */
                }
                return;
@@ -835,6 +835,11 @@ asmlinkage void do_mdmx(struct pt_regs *regs)
 asmlinkage void do_watch(struct pt_regs *regs)
 {
+        if (board_watchpoint_handler) {
+                (*board_watchpoint_handler)(regs);
+                return;
+        }
        /*
         * We use the watch exception where available to detect stack
         * overflows.
@@ -861,7 +866,7 @@ asmlinkage void do_mcheck(struct pt_regs *regs)
                dump_tlb_all();
        }
-        show_code((unsigned int *) regs->cp0_epc);
+        show_code((unsigned int __user *) regs->cp0_epc);
        /*
         * Some chips may have other causes of machine check (e.g. SB1
@@ -1343,7 +1348,14 @@ void __init per_cpu_trap_init(void)
                set_c0_status(ST0_MX);
 #ifdef CONFIG_CPU_MIPSR2
-        write_c0_hwrena (0x0000000f); /* Allow rdhwr to all registers */
+        if (cpu_has_mips_r2) {
+                unsigned int enable = 0x0000000f;
+                if (cpu_has_userlocal)
+                        enable |= (1 << 29);
+                write_c0_hwrena(enable);
+        }
 #endif
 #ifdef CONFIG_MIPS_MT_SMTC
@@ -1372,12 +1384,12 @@ void __init per_cpu_trap_init(void)
         */
        if (cpu_has_mips_r2) {
                cp0_compare_irq = (read_c0_intctl () >> 29) & 7;
-                cp0_perfcount_irq = -1;
-        } else {
-                cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ;
                cp0_perfcount_irq = (read_c0_intctl () >> 26) & 7;
-                if (cp0_perfcount_irq != cp0_compare_irq)
+                if (cp0_perfcount_irq == cp0_compare_irq)
                        cp0_perfcount_irq = -1;
+        } else {
+                cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ;
+                cp0_perfcount_irq = -1;
        }
 #ifdef CONFIG_MIPS_MT_SMTC
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
index 18c4a3c45a..8b9c34ffae 100644
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
@@ -77,6 +77,7 @@
 #include <linux/signal.h>
 #include <linux/smp.h>
 #include <linux/sched.h>
+#include <linux/debugfs.h>
 #include <asm/asm.h>
 #include <asm/branch.h>
 #include <asm/byteorder.h>
@@ -87,9 +88,18 @@
 #define STR(x)  __STR(x)
 #define __STR(x)  #x
-#ifdef CONFIG_PROC_FS
+enum {
-unsigned long unaligned_instructions;
+        UNALIGNED_ACTION_QUIET,
+        UNALIGNED_ACTION_SIGNAL,
+        UNALIGNED_ACTION_SHOW,
+};
+#ifdef CONFIG_DEBUG_FS
+static u32 unaligned_instructions;
+static u32 unaligned_action;
+#else
+#define unaligned_action UNALIGNED_ACTION_QUIET
 #endif
+extern void show_registers(struct pt_regs *regs);
 static inline int emulate_load_store_insn(struct pt_regs *regs,
        void __user *addr, unsigned int __user *pc,
@@ -459,7 +469,7 @@ static inline int emulate_load_store_insn(struct pt_regs *regs,
                goto sigill;
        }
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_DEBUG_FS
        unaligned_instructions++;
 #endif
@@ -516,6 +526,10 @@ asmlinkage void do_ade(struct pt_regs *regs)
        pc = (unsigned int __user *) exception_epc(regs);
        if (user_mode(regs) && (current->thread.mflags & MF_FIXADE) == 0)
                goto sigbus;
+        if (unaligned_action == UNALIGNED_ACTION_SIGNAL)
+                goto sigbus;
+        else if (unaligned_action == UNALIGNED_ACTION_SHOW)
+                show_registers(regs);
        /*
         * Do branch emulation only if we didn't forward the exception.
@@ -546,3 +560,24 @@ sigbus:
         * XXX On return from the signal handler we should advance the epc
         */
 }
+#ifdef CONFIG_DEBUG_FS
+extern struct dentry *mips_debugfs_dir;
+static int __init debugfs_unaligned(void)
+{
+        struct dentry *d;
+        if (!mips_debugfs_dir)
+                return -ENODEV;
+        d = debugfs_create_u32("unaligned_instructions", S_IRUGO,
+                               mips_debugfs_dir, &unaligned_instructions);
+        if (IS_ERR(d))
+                return PTR_ERR(d);
+        d = debugfs_create_u32("unaligned_action", S_IRUGO | S_IWUSR,
+                               mips_debugfs_dir, &unaligned_action);
+        if (IS_ERR(d))
+                return PTR_ERR(d);
+        return 0;
+}
+__initcall(debugfs_unaligned);
+#endif
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index c9ee9d2d58..9e66354dee 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -1436,10 +1436,6 @@ static int __init vpe_module_init(void)
                        write_vpe_c0_vpecontrol(read_vpe_c0_vpecontrol() & ~VPECONTROL_TE);
                        if (i != 0) {
-                                write_vpe_c0_status((read_c0_status() &
-                                                     ~(ST0_IM | ST0_IE | ST0_KSU))
-                                                    | ST0_CU0);
                                /*
                                 * Set config to be the same as vpe0,
                                 * particularly kseg0 coherency alg
diff --git a/arch/mips/lasat/Kconfig b/arch/mips/lasat/Kconfig
deleted file mode 100644
index 1d2ee8a9be..0000000000
--- a/arch/mips/lasat/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-config PICVUE
-        tristate "PICVUE LCD display driver"
-        depends on LASAT
-config PICVUE_PROC
-        tristate "PICVUE LCD display driver /proc interface"
-        depends on PICVUE
-config DS1603
-        bool "DS1603 RTC driver"
-        depends on LASAT
-config LASAT_SYSCTL
-        bool "LASAT sysctl interface"
-        depends on LASAT
diff --git a/arch/mips/lasat/Makefile b/arch/mips/lasat/Makefile
deleted file mode 100644
index 99f5046fdf..0000000000
--- a/arch/mips/lasat/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Makefile for the LASAT specific kernel interface routines under Linux.
-#
-obj-y                           += reset.o setup.o prom.o lasat_board.o \
-                                   at93c.o interrupt.o
-obj-$(CONFIG_LASAT_SYSCTL)      += sysctl.o
-obj-$(CONFIG_DS1603)            += ds1603.o
-obj-$(CONFIG_PICVUE)            += picvue.o
-obj-$(CONFIG_PICVUE_PROC)       += picvue_proc.o
-clean:
-        make -C image clean
diff --git a/arch/mips/lasat/at93c.c b/arch/mips/lasat/at93c.c
deleted file mode 100644
index ca26e55461..0000000000
--- a/arch/mips/lasat/at93c.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Atmel AT93C46 serial eeprom driver
- *
- * Brian Murphy <brian.murphy@eicon.com>
- *
- */
-#include <linux/kernel.h>
-#include <linux/delay.h>
-#include <asm/lasat/lasat.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include "at93c.h"
-#define AT93C_ADDR_SHIFT        7
-#define AT93C_ADDR_MAX          ((1 << AT93C_ADDR_SHIFT) - 1)
-#define AT93C_RCMD              (0x6 << AT93C_ADDR_SHIFT)
-#define AT93C_WCMD              (0x5 << AT93C_ADDR_SHIFT)
-#define AT93C_WENCMD            0x260
-#define AT93C_WDSCMD            0x200
-struct at93c_defs *at93c;
-static void at93c_reg_write(u32 val)
-{
-        *at93c->reg = val;
-}
-static u32 at93c_reg_read(void)
-{
-        u32 tmp = *at93c->reg;
-        return tmp;
-}
-static u32 at93c_datareg_read(void)
-{
-        u32 tmp = *at93c->rdata_reg;
-        return tmp;
-}
-static void at93c_cycle_clk(u32 data)
-{
-        at93c_reg_write(data | at93c->clk);
-        lasat_ndelay(250);
-        at93c_reg_write(data & ~at93c->clk);
-        lasat_ndelay(250);
-}
-static void at93c_write_databit(u8 bit)
-{
-        u32 data = at93c_reg_read();
-        if (bit)
-                data |= 1 << at93c->wdata_shift;
-        else
-                data &= ~(1 << at93c->wdata_shift);
-        at93c_reg_write(data);
-        lasat_ndelay(100);
-        at93c_cycle_clk(data);
-}
-static unsigned int at93c_read_databit(void)
-{
-        u32 data;
-        at93c_cycle_clk(at93c_reg_read());
-        data = (at93c_datareg_read() >> at93c->rdata_shift) & 1;
-        return data;
-}
-static u8 at93c_read_byte(void)
-{
-        int i;
-        u8 data = 0;
-        for (i = 0; i<=7; i++) {
-                data <<= 1;
-                data |= at93c_read_databit();
-        }
-        return data;
-}
-static void at93c_write_bits(u32 data, int size)
-{
-        int i;
-        int shift = size - 1;
-        u32 mask = (1 << shift);
-        for (i = 0; i < size; i++) {
-                at93c_write_databit((data & mask) >> shift);
-                data <<= 1;
-        }
-}
-static void at93c_init_op(void)
-{
-        at93c_reg_write((at93c_reg_read() | at93c->cs) & ~at93c->clk & ~(1 << at93c->rdata_shift));
-        lasat_ndelay(50);
-}
-static void at93c_end_op(void)
-{
-        at93c_reg_write(at93c_reg_read() & ~at93c->cs);
-        lasat_ndelay(250);
-}
-static void at93c_wait(void)
-{
-        at93c_init_op();
-        while (!at93c_read_databit())
-                ;
-        at93c_end_op();
-};
-static void at93c_disable_wp(void)
-{
-        at93c_init_op();
-        at93c_write_bits(AT93C_WENCMD, 10);
-        at93c_end_op();
-}
-static void at93c_enable_wp(void)
-{
-        at93c_init_op();
-        at93c_write_bits(AT93C_WDSCMD, 10);
-        at93c_end_op();
-}
-u8 at93c_read(u8 addr)
-{
-        u8 byte;
-        at93c_init_op();
-        at93c_write_bits((addr & AT93C_ADDR_MAX)|AT93C_RCMD, 10);
-        byte = at93c_read_byte();
-        at93c_end_op();
-        return byte;
-}
-void at93c_write(u8 addr, u8 data)
-{
-        at93c_disable_wp();
-        at93c_init_op();
-        at93c_write_bits((addr & AT93C_ADDR_MAX)|AT93C_WCMD, 10);
-        at93c_write_bits(data, 8);
-        at93c_end_op();
-        at93c_wait();
-        at93c_enable_wp();
-}
diff --git a/arch/mips/lasat/at93c.h b/arch/mips/lasat/at93c.h
deleted file mode 100644
index cfe2f99b1d..0000000000
--- a/arch/mips/lasat/at93c.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Atmel AT93C46 serial eeprom driver
- *
- * Brian Murphy <brian.murphy@eicon.com>
- *
- */
-extern struct at93c_defs {
-        volatile u32 *reg;
-        volatile u32 *rdata_reg;
-        int rdata_shift;
-        int wdata_shift;
-        u32 cs;
-        u32 clk;
-} *at93c;
-u8 at93c_read(u8 addr);
-void at93c_write(u8 addr, u8 data);
diff --git a/arch/mips/lasat/ds1603.c b/arch/mips/lasat/ds1603.c
deleted file mode 100644
index 7dced67c55..0000000000
--- a/arch/mips/lasat/ds1603.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Dallas Semiconductors 1603 RTC driver
- *
- * Brian Murphy <brian@murphy.dk>
- *
- */
-#include <linux/kernel.h>
-#include <asm/lasat/lasat.h>
-#include <linux/delay.h>
-#include <asm/lasat/ds1603.h>
-#include <asm/time.h>
-#include "ds1603.h"
-#define READ_TIME_CMD 0x81
-#define SET_TIME_CMD 0x80
-#define TRIMMER_SET_CMD 0xC0
-#define TRIMMER_VALUE_MASK 0x38
-#define TRIMMER_SHIFT 3
-struct ds_defs *ds1603 = NULL;
-/* HW specific register functions */
-static void rtc_reg_write(unsigned long val)
-{
-        *ds1603->reg = val;
-}
-static unsigned long rtc_reg_read(void)
-{
-        unsigned long tmp = *ds1603->reg;
-        return tmp;
-}
-static unsigned long rtc_datareg_read(void)
-{
-        unsigned long tmp = *ds1603->data_reg;
-        return tmp;
-}
-static void rtc_nrst_high(void)
-{
-        rtc_reg_write(rtc_reg_read() | ds1603->rst);
-}
-static void rtc_nrst_low(void)
-{
-        rtc_reg_write(rtc_reg_read() & ~ds1603->rst);
-}
-static void rtc_cycle_clock(unsigned long data)
-{
-        data |= ds1603->clk;
-        rtc_reg_write(data);
-        lasat_ndelay(250);
-        if (ds1603->data_reversed)
-                data &= ~ds1603->data;
-        else
-                data |= ds1603->data;
-        data &= ~ds1603->clk;
-        rtc_reg_write(data);
-        lasat_ndelay(250 + ds1603->huge_delay);
-}
-static void rtc_write_databit(unsigned int bit)
-{
-        unsigned long data = rtc_reg_read();
-        if (ds1603->data_reversed)
-                bit = !bit;
-        if (bit)
-                data |= ds1603->data;
-        else
-                data &= ~ds1603->data;
-        rtc_reg_write(data);
-        lasat_ndelay(50 + ds1603->huge_delay);
-        rtc_cycle_clock(data);
-}
-static unsigned int rtc_read_databit(void)
-{
-        unsigned int data;
-        data = (rtc_datareg_read() & (1 << ds1603->data_read_shift))
-                >> ds1603->data_read_shift;
-        rtc_cycle_clock(rtc_reg_read());
-        return data;
-}
-static void rtc_write_byte(unsigned int byte)
-{
-        int i;
-        for (i = 0; i<=7; i++) {
-                rtc_write_databit(byte & 1L);
-                byte >>= 1;
-        }
-}
-static void rtc_write_word(unsigned long word)
-{
-        int i;
-        for (i = 0; i<=31; i++) {
-                rtc_write_databit(word & 1L);
-                word >>= 1;
-        }
-}
-static unsigned long rtc_read_word(void)
-{
-        int i;
-        unsigned long word = 0;
-        unsigned long shift = 0;
-        for (i = 0; i<=31; i++) {
-                word |= rtc_read_databit() << shift;
-                shift++;
-        }
-        return word;
-}
-static void rtc_init_op(void)
-{
-        rtc_nrst_high();
-        rtc_reg_write(rtc_reg_read() & ~ds1603->clk);
-        lasat_ndelay(50);
-}
-static void rtc_end_op(void)
-{
-        rtc_nrst_low();
-        lasat_ndelay(1000);
-}
-/* interface */
-unsigned long ds1603_read(void)
-{
-        unsigned long word;
-        unsigned long flags;
-        spin_lock_irqsave(&rtc_lock, flags);
-        rtc_init_op();
-        rtc_write_byte(READ_TIME_CMD);
-        word = rtc_read_word();
-        rtc_end_op();
-        spin_unlock_irqrestore(&rtc_lock, flags);
-        return word;
-}
-int ds1603_set(unsigned long time)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&rtc_lock, flags);
-        rtc_init_op();
-        rtc_write_byte(SET_TIME_CMD);
-        rtc_write_word(time);
-        rtc_end_op();
-        spin_unlock_irqrestore(&rtc_lock, flags);
-        return 0;
-}
-void ds1603_set_trimmer(unsigned int trimval)
-{
-        rtc_init_op();
-        rtc_write_byte(((trimval << TRIMMER_SHIFT) & TRIMMER_VALUE_MASK)
-                        | (TRIMMER_SET_CMD));
-        rtc_end_op();
-}
-void ds1603_disable(void)
-{
-        ds1603_set_trimmer(TRIMMER_DISABLE_RTC);
-}
-void ds1603_enable(void)
-{
-        ds1603_set_trimmer(TRIMMER_DEFAULT);
-}
diff --git a/arch/mips/lasat/ds1603.h b/arch/mips/lasat/ds1603.h
deleted file mode 100644
index c2e5c76a37..0000000000
--- a/arch/mips/lasat/ds1603.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Dallas Semiconductors 1603 RTC driver
- *
- * Brian Murphy <brian@murphy.dk>
- *
- */
-#ifndef __DS1603_H
-#define __DS1603_H
-struct ds_defs {
-        volatile u32 *reg;
-        volatile u32 *data_reg;
-        u32 rst;
-        u32 clk;
-        u32 data;
-        u32 data_read_shift;
-        char data_reversed;
-        u32 huge_delay;
-};
-extern struct ds_defs *ds1603;
-unsigned long ds1603_read(void);
-int ds1603_set(unsigned long);
-void ds1603_set_trimmer(unsigned int);
-void ds1603_enable(void);
-void ds1603_disable(void);
-void ds1603_init(struct ds_defs *);
-#define TRIMMER_DEFAULT 3
-#define TRIMMER_DISABLE_RTC 0
-#endif
diff --git a/arch/mips/lasat/image/Makefile b/arch/mips/lasat/image/Makefile
deleted file mode 100644
index 35ecd6483e..0000000000
--- a/arch/mips/lasat/image/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# MAKEFILE FOR THE MIPS LINUX BOOTLOADER AND ROM DEBUGGER
-#
-# i-data Networks
-#
-# Author: Thomas Horsten <thh@i-data.com>
-#
-ifndef Version
- Version = "$(USER)-test"
-endif
-MKLASATIMG = mklasatimg
-MKLASATIMG_ARCH = mq2,mqpro,sp100,sp200
-KERNEL_IMAGE = $(TOPDIR)/vmlinux
-KERNEL_START = $(shell $(NM) $(KERNEL_IMAGE) | grep " _text" | cut -f1 -d\ )
-KERNEL_ENTRY = $(shell $(NM) $(KERNEL_IMAGE) | grep kernel_entry | cut -f1 -d\ )
-LDSCRIPT= -L$(obj) -Tromscript.normal
-HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \
-                -D_kernel_entry=0x$(KERNEL_ENTRY) \
-                -D VERSION="\"$(Version)\"" \
-                -D TIMESTAMP=$(shell date +%s)
-$(obj)/head.o: $(obj)/head.S $(KERNEL_IMAGE)
-        $(CC) -fno-pic $(HEAD_DEFINES) -I$(TOPDIR)/include -c -o $@ $<
-OBJECTS = head.o kImage.o
-rom.sw: $(obj)/rom.sw
-$(obj)/rom.sw:  $(obj)/rom.bin
-        $(MKLASATIMG) -o $@ -k $^ -m $(MKLASATIMG_ARCH)
-$(obj)/rom.bin: $(obj)/rom
-        $(OBJCOPY) -O binary -S $^ $@
-# Rule to make the bootloader
-$(obj)/rom: $(addprefix $(obj)/,$(OBJECTS))
-        $(LD) $(LDFLAGS) $(LDSCRIPT) -o $@ $^
-$(obj)/%.o: $(obj)/%.gz
-        $(LD) -r -o $@ -b binary $<
-$(obj)/%.gz: $(obj)/%.bin
-        gzip -cf -9 $< > $@
-$(obj)/kImage.bin: $(KERNEL_IMAGE)
-        $(OBJCOPY) -O binary -S $^ $@
-clean:
-        rm -f rom rom.bin rom.sw kImage.bin kImage.o
diff --git a/arch/mips/lasat/image/head.S b/arch/mips/lasat/image/head.S
deleted file mode 100644
index efb95f2609..0000000000
--- a/arch/mips/lasat/image/head.S
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <asm/lasat/head.h>
-        .text
-        .section .text.start, "ax"
-        .set noreorder
-        .set mips3
-        /* Magic words identifying a software image */
-        .word   LASAT_K_MAGIC0_VAL
-        .word   LASAT_K_MAGIC1_VAL
-        /* Image header version */
-        .word   0x00000002
-        /* image start and size */
-        .word   _image_start
-        .word   _image_size
-        /* start of kernel and entrypoint in uncompressed image */
-        .word   _kernel_start
-        .word   _kernel_entry
-        /* Here we have room for future flags */
-        .org    0x40
-reldate:
-        .word   TIMESTAMP
-        .org    0x50
-release:
-        .string VERSION
diff --git a/arch/mips/lasat/image/romscript.normal b/arch/mips/lasat/image/romscript.normal
deleted file mode 100644
index 988f8ad189..0000000000
--- a/arch/mips/lasat/image/romscript.normal
+++ /dev/null
@@ -1,23 +0,0 @@
-OUTPUT_ARCH(mips)
-SECTIONS
-{
-  .text :
-  {
-    *(.text.start)
-  }
-  /* Data in ROM */
-  .data ALIGN(0x10) :
-  {
-    *(.data)
-  }
-  _image_start = ADDR(.data);
-  _image_size = SIZEOF(.data);
-  .other :
-  {
-    *(.*)
-  }
-}
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c
deleted file mode 100644
index 9a622b9a10..0000000000
--- a/arch/mips/lasat/interrupt.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Carsten Langgaard, carstenl@mips.com
- * Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.
- *
- *  This program is free software; you can distribute it and/or modify it
- *  under the terms of the GNU General Public License (Version 2) as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Routines for generic manipulation of the interrupts found on the
- * Lasat boards.
- */
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/kernel_stat.h>
-#include <asm/bootinfo.h>
-#include <asm/irq.h>
-#include <asm/lasat/lasatint.h>
-#include <asm/time.h>
-#include <asm/gdb-stub.h>
-static volatile int *lasat_int_status = NULL;
-static volatile int *lasat_int_mask = NULL;
-static volatile int lasat_int_mask_shift;
-void disable_lasat_irq(unsigned int irq_nr)
-{
-        *lasat_int_mask &= ~(1 << irq_nr) << lasat_int_mask_shift;
-}
-void enable_lasat_irq(unsigned int irq_nr)
-{
-        *lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift;
-}
-static struct irq_chip lasat_irq_type = {
-        .name = "Lasat",
-        .ack = disable_lasat_irq,
-        .mask = disable_lasat_irq,
-        .mask_ack = disable_lasat_irq,
-        .unmask = enable_lasat_irq,
-};
-static inline int ls1bit32(unsigned int x)
-{
-        int b = 31, s;
-        s = 16; if (x << 16 == 0) s = 0; b -= s; x <<= s;
-        s =  8; if (x <<  8 == 0) s = 0; b -= s; x <<= s;
-        s =  4; if (x <<  4 == 0) s = 0; b -= s; x <<= s;
-        s =  2; if (x <<  2 == 0) s = 0; b -= s; x <<= s;
-        s =  1; if (x <<  1 == 0) s = 0; b -= s;
-        return b;
-}
-static unsigned long (* get_int_status)(void);
-static unsigned long get_int_status_100(void)
-{
-        return *lasat_int_status & *lasat_int_mask;
-}
-static unsigned long get_int_status_200(void)
-{
-        unsigned long int_status;
-        int_status = *lasat_int_status;
-        int_status &= (int_status >> LASATINT_MASK_SHIFT_200) & 0xffff;
-        return int_status;
-}
-asmlinkage void plat_irq_dispatch(void)
-{
-        unsigned long int_status;
-        unsigned int cause = read_c0_cause();
-        int irq;
-        if (cause & CAUSEF_IP7) {       /* R4000 count / compare IRQ */
-                ll_timer_interrupt(7);
-                return;
-        }
-        int_status = get_int_status();
-        /* if int_status == 0, then the interrupt has already been cleared */
-        if (int_status) {
-                irq = ls1bit32(int_status);
-                do_IRQ(irq);
-        }
-}
-void __init arch_init_irq(void)
-{
-        int i;
-        switch (mips_machtype) {
-        case MACH_LASAT_100:
-                lasat_int_status = (void *)LASAT_INT_STATUS_REG_100;
-                lasat_int_mask = (void *)LASAT_INT_MASK_REG_100;
-                lasat_int_mask_shift = LASATINT_MASK_SHIFT_100;
-                get_int_status = get_int_status_100;
-                *lasat_int_mask = 0;
-                break;
-        case MACH_LASAT_200:
-                lasat_int_status = (void *)LASAT_INT_STATUS_REG_200;
-                lasat_int_mask = (void *)LASAT_INT_MASK_REG_200;
-                lasat_int_mask_shift = LASATINT_MASK_SHIFT_200;
-                get_int_status = get_int_status_200;
-                *lasat_int_mask &= 0xffff;
-                break;
-        default:
-                panic("arch_init_irq: mips_machtype incorrect");
-        }
-        for (i = 0; i <= LASATINT_END; i++)
-                set_irq_chip_and_handler(i, &lasat_irq_type, handle_level_irq);
-}
diff --git a/arch/mips/lasat/lasat_board.c b/arch/mips/lasat/lasat_board.c
deleted file mode 100644
index fbe9a87bd0..0000000000
--- a/arch/mips/lasat/lasat_board.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Thomas Horsten <thh@lasat.com>
- * Copyright (C) 2000 LASAT Networks A/S.
- *
- *  This program is free software; you can distribute it and/or modify it
- *  under the terms of the GNU General Public License (Version 2) as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Routines specific to the LASAT boards
- */
-#include <linux/types.h>
-#include <linux/crc32.h>
-#include <asm/lasat/lasat.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/ctype.h>
-#include <asm/bootinfo.h>
-#include <asm/addrspace.h>
-#include "at93c.h"
-/* New model description table */
-#include "lasat_models.h"
-#define EEPROM_CRC(data, len) (~0 ^ crc32(~0, data, len))
-struct lasat_info lasat_board_info;
-void update_bcastaddr(void);
-int EEPROMRead(unsigned int pos, unsigned char *data, int len)
-{
-        int i;
-        for (i=0; i<len; i++)
-                *data++ = at93c_read(pos++);
-        return 0;
-}
-int EEPROMWrite(unsigned int pos, unsigned char *data, int len)
-{
-        int i;
-        for (i=0; i<len; i++)
-                at93c_write(pos++, *data++);
-        return 0;
-}
-static void init_flash_sizes(void)
-{
-        int i;
-        unsigned long *lb = lasat_board_info.li_flashpart_base;
-        unsigned long *ls = lasat_board_info.li_flashpart_size;
-        ls[LASAT_MTD_BOOTLOADER] = 0x40000;
-        ls[LASAT_MTD_SERVICE] = 0xC0000;
-        ls[LASAT_MTD_NORMAL] = 0x100000;
-        if (mips_machtype == MACH_LASAT_100) {
-                lasat_board_info.li_flash_base = 0x1e000000;
-                lb[LASAT_MTD_BOOTLOADER] = 0x1e400000;
-                if (lasat_board_info.li_flash_size > 0x200000) {
-                        ls[LASAT_MTD_CONFIG] = 0x100000;
-                        ls[LASAT_MTD_FS] = 0x500000;
-                }
-        } else {
-                lasat_board_info.li_flash_base = 0x10000000;
-                if (lasat_board_info.li_flash_size < 0x1000000) {
-                        lb[LASAT_MTD_BOOTLOADER] = 0x10000000;
-                        ls[LASAT_MTD_CONFIG] = 0x100000;
-                        if (lasat_board_info.li_flash_size >= 0x400000) {
-                                ls[LASAT_MTD_FS] = lasat_board_info.li_flash_size - 0x300000;
-                        }
-                }
-        }
-        for (i = 1; i < LASAT_MTD_LAST; i++)
-                lb[i] = lb[i-1] + ls[i-1];
-}
-int lasat_init_board_info(void)
-{
-        int c;
-        unsigned long crc;
-        unsigned long cfg0, cfg1;
-        const product_info_t   *ppi;
-        int i_n_base_models = N_BASE_MODELS;
-        const char * const * i_txt_base_models = txt_base_models;
-        int i_n_prids = N_PRIDS;
-        memset(&lasat_board_info, 0, sizeof(lasat_board_info));
-        /* First read the EEPROM info */
-        EEPROMRead(0, (unsigned char *)&lasat_board_info.li_eeprom_info,
-                   sizeof(struct lasat_eeprom_struct));
-        /* Check the CRC */
-        crc = EEPROM_CRC((unsigned char *)(&lasat_board_info.li_eeprom_info),
-                    sizeof(struct lasat_eeprom_struct) - 4);
-        if (crc != lasat_board_info.li_eeprom_info.crc32) {
-                printk(KERN_WARNING "WARNING...\nWARNING...\nEEPROM CRC does "
-                       "not match calculated, attempting to soldier on...\n");
-        }
-        if (lasat_board_info.li_eeprom_info.version != LASAT_EEPROM_VERSION) {
-                printk(KERN_WARNING "WARNING...\nWARNING...\nEEPROM version "
-                       "%d, wanted version %d, attempting to soldier on...\n",
-                       (unsigned int)lasat_board_info.li_eeprom_info.version,
-                       LASAT_EEPROM_VERSION);
-        }
-        cfg0 = lasat_board_info.li_eeprom_info.cfg[0];
-        cfg1 = lasat_board_info.li_eeprom_info.cfg[1];
-        if ( LASAT_W0_DSCTYPE(cfg0) != 1) {
-                printk(KERN_WARNING "WARNING...\nWARNING...\n"
-                       "Invalid configuration read from EEPROM, attempting to "
-                       "soldier on...");
-        }
-        /* We have a valid configuration */
-        switch (LASAT_W0_SDRAMBANKSZ(cfg0)) {
-        case 0:
-                lasat_board_info.li_memsize = 0x0800000;
-                break;
-        case 1:
-                lasat_board_info.li_memsize = 0x1000000;
-                break;
-        case 2:
-                lasat_board_info.li_memsize = 0x2000000;
-                break;
-        case 3:
-                lasat_board_info.li_memsize = 0x4000000;
-                break;
-        case 4:
-                lasat_board_info.li_memsize = 0x8000000;
-                break;
-        default:
-                lasat_board_info.li_memsize = 0;
-        }
-        switch (LASAT_W0_SDRAMBANKS(cfg0)) {
-        case 0:
-                break;
-        case 1:
-                lasat_board_info.li_memsize *= 2;
-                break;
-        default:
-                break;
-        }
-        switch (LASAT_W0_BUSSPEED(cfg0)) {
-        case 0x0:
-                lasat_board_info.li_bus_hz = 60000000;
-                break;
-        case 0x1:
-                lasat_board_info.li_bus_hz = 66000000;
-                break;
-        case 0x2:
-                lasat_board_info.li_bus_hz = 66666667;
-                break;
-        case 0x3:
-                lasat_board_info.li_bus_hz = 80000000;
-                break;
-        case 0x4:
-                lasat_board_info.li_bus_hz = 83333333;
-                break;
-        case 0x5:
-                lasat_board_info.li_bus_hz = 100000000;
-                break;
-        }
-        switch (LASAT_W0_CPUCLK(cfg0)) {
-        case 0x0:
-                lasat_board_info.li_cpu_hz =
-                        lasat_board_info.li_bus_hz;
-                break;
-        case 0x1:
-                lasat_board_info.li_cpu_hz =
-                        lasat_board_info.li_bus_hz +
-                        (lasat_board_info.li_bus_hz >> 1);
-                break;
-        case 0x2:
-                lasat_board_info.li_cpu_hz =
-                        lasat_board_info.li_bus_hz +
-                        lasat_board_info.li_bus_hz;
-                break;
-        case 0x3:
-                lasat_board_info.li_cpu_hz =
-                        lasat_board_info.li_bus_hz +
-                        lasat_board_info.li_bus_hz +
-                        (lasat_board_info.li_bus_hz >> 1);
-                break;
-        case 0x4:
-                lasat_board_info.li_cpu_hz =
-                        lasat_board_info.li_bus_hz +
-                        lasat_board_info.li_bus_hz +
-                        lasat_board_info.li_bus_hz;
-                break;
-        }
-        /* Flash size */
-        switch (LASAT_W1_FLASHSIZE(cfg1)) {
-        case 0:
-                lasat_board_info.li_flash_size = 0x200000;
-                break;
-        case 1:
-                lasat_board_info.li_flash_size = 0x400000;
-                break;
-        case 2:
-                lasat_board_info.li_flash_size = 0x800000;
-                break;
-        case 3:
-                lasat_board_info.li_flash_size = 0x1000000;
-                break;
-        case 4:
-                lasat_board_info.li_flash_size = 0x2000000;
-                break;
-        }
-        init_flash_sizes();
-        lasat_board_info.li_bmid = LASAT_W0_BMID(cfg0);
-        lasat_board_info.li_prid = lasat_board_info.li_eeprom_info.prid;
-        if (lasat_board_info.li_prid == 0xffff || lasat_board_info.li_prid == 0)
-                lasat_board_info.li_prid = lasat_board_info.li_bmid;
-        /* Base model stuff */
-        if (lasat_board_info.li_bmid > i_n_base_models)
-                lasat_board_info.li_bmid = i_n_base_models;
-        strcpy(lasat_board_info.li_bmstr, i_txt_base_models[lasat_board_info.li_bmid]);
-        /* Product ID dependent values */
-        c = lasat_board_info.li_prid;
-        if (c >= i_n_prids) {
-                strcpy(lasat_board_info.li_namestr, "Unknown Model");
-                strcpy(lasat_board_info.li_typestr, "Unknown Type");
-        } else {
-                ppi = &vendor_info_table[0].vi_product_info[c];
-                strcpy(lasat_board_info.li_namestr, ppi->pi_name);
-                if (ppi->pi_type)
-                        strcpy(lasat_board_info.li_typestr, ppi->pi_type);
-                else
-                        sprintf(lasat_board_info.li_typestr, "%d",10*c);
-        }
-#if defined(CONFIG_INET) && defined(CONFIG_SYSCTL)
-        update_bcastaddr();
-#endif
-        return 0;
-}
-void lasat_write_eeprom_info(void)
-{
-        unsigned long crc;
-        /* Generate the CRC */
-        crc = EEPROM_CRC((unsigned char *)(&lasat_board_info.li_eeprom_info),
-                    sizeof(struct lasat_eeprom_struct) - 4);
-        lasat_board_info.li_eeprom_info.crc32 = crc;
-        /* Write the EEPROM info */
-        EEPROMWrite(0, (unsigned char *)&lasat_board_info.li_eeprom_info,
-                    sizeof(struct lasat_eeprom_struct));
-}
diff --git a/arch/mips/lasat/lasat_models.h b/arch/mips/lasat/lasat_models.h
deleted file mode 100644
index ae0c5d0bd4..0000000000
--- a/arch/mips/lasat/lasat_models.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Model description tables
- */
-typedef struct product_info_t {
-        const char     *pi_name;
-        const char     *pi_type;
-} product_info_t;
-typedef struct vendor_info_t {
-        const char     *vi_name;
-        const product_info_t *vi_product_info;
-} vendor_info_t;
-/*
- * Base models
- */
-static const char * const txt_base_models[] = {
-  "MQ 2", "MQ Pro", "SP 25", "SP 50", "SP 100", "SP 5000", "SP 7000", "SP 1000", "Unknown"
-};
-#define N_BASE_MODELS (sizeof(txt_base_models)/sizeof(char*)-1)
-/*
- * Eicon Networks
- */
-static const char txt_en_mq[] = "Masquerade";
-static const char txt_en_sp[] = "Safepipe";
-static const product_info_t product_info_eicon[] = {
-  { txt_en_mq, "II"   }, /*  0 */
-  { txt_en_mq, "Pro"  }, /*  1 */
-  { txt_en_sp, "25"   }, /*  2 */
-  { txt_en_sp, "50"   }, /*  3 */
-  { txt_en_sp, "100"  }, /*  4 */
-  { txt_en_sp, "5000" }, /*  5 */
-  { txt_en_sp, "7000" }, /*  6 */
-  { txt_en_sp, "30"   }, /*  7 */
-  { txt_en_sp, "5100" }, /*  8 */
-  { txt_en_sp, "7100" }, /*  9 */
-  { txt_en_sp, "1110" }, /* 10 */
-  { txt_en_sp, "3020" }, /* 11 */
-  { txt_en_sp, "3030" }, /* 12 */
-  { txt_en_sp, "5020" }, /* 13 */
-  { txt_en_sp, "5030" }, /* 14 */
-  { txt_en_sp, "1120" }, /* 15 */
-  { txt_en_sp, "1130" }, /* 16 */
-  { txt_en_sp, "6010" }, /* 17 */
-  { txt_en_sp, "6110" }, /* 18 */
-  { txt_en_sp, "6210" }, /* 19 */
-  { txt_en_sp, "1020" }, /* 20 */
-  { txt_en_sp, "1040" }, /* 21 */
-  { txt_en_sp, "1050" }, /* 22 */
-  { txt_en_sp, "1060" }, /* 23 */
-};
-#define N_PRIDS (sizeof(product_info_eicon)/sizeof(product_info_t))
-/*
- * The vendor table
- */
-static vendor_info_t const vendor_info_table[] = {
-  { "Eicon Networks",   product_info_eicon   },
-};
-#define N_VENDORS (sizeof(vendor_info_table)/sizeof(vendor_info_t))
diff --git a/arch/mips/lasat/picvue.c b/arch/mips/lasat/picvue.c
deleted file mode 100644
index 9ae82c3ffb..0000000000
--- a/arch/mips/lasat/picvue.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Picvue PVC160206 display driver
- *
- * Brian Murphy <brian@murphy.dk>
- *
- */
-#include <linux/kernel.h>
-#include <linux/delay.h>
-#include <asm/bootinfo.h>
-#include <asm/lasat/lasat.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include "picvue.h"
-#define PVC_BUSY                0x80
-#define PVC_NLINES              2
-#define PVC_DISPMEM             80
-#define PVC_LINELEN             PVC_DISPMEM / PVC_NLINES
-struct pvc_defs *picvue = NULL;
-DECLARE_MUTEX(pvc_sem);
-static void pvc_reg_write(u32 val)
-{
-        *picvue->reg = val;
-}
-static u32 pvc_reg_read(void)
-{
-        u32 tmp = *picvue->reg;
-        return tmp;
-}
-static void pvc_write_byte(u32 data, u8 byte)
-{
-        data |= picvue->e;
-        pvc_reg_write(data);
-        data &= ~picvue->data_mask;
-        data |= byte << picvue->data_shift;
-        pvc_reg_write(data);
-        ndelay(220);
-        pvc_reg_write(data & ~picvue->e);
-        ndelay(220);
-}
-static u8 pvc_read_byte(u32 data)
-{
-        u8 byte;
-        data |= picvue->e;
-        pvc_reg_write(data);
-        ndelay(220);
-        byte = (pvc_reg_read() & picvue->data_mask) >> picvue->data_shift;
-        data &= ~picvue->e;
-        pvc_reg_write(data);
-        ndelay(220);
-        return byte;
-}
-static u8 pvc_read_data(void)
-{
-        u32 data = pvc_reg_read();
-        u8 byte;
-        data |= picvue->rw;
-        data &= ~picvue->rs;
-        pvc_reg_write(data);
-        ndelay(40);
-        byte = pvc_read_byte(data);
-        data |= picvue->rs;
-        pvc_reg_write(data);
-        return byte;
-}
-#define TIMEOUT 1000
-static int pvc_wait(void)
-{
-        int i = TIMEOUT;
-        int err = 0;
-        while ((pvc_read_data() & PVC_BUSY) && i)
-                i--;
-        if (i == 0)
-                err = -ETIME;
-        return err;
-}
-#define MODE_INST 0
-#define MODE_DATA 1
-static void pvc_write(u8 byte, int mode)
-{
-        u32 data = pvc_reg_read();
-        data &= ~picvue->rw;
-        if (mode == MODE_DATA)
-                data |= picvue->rs;
-        else
-                data &= ~picvue->rs;
-        pvc_reg_write(data);
-        ndelay(40);
-        pvc_write_byte(data, byte);
-        if (mode == MODE_DATA)
-                data &= ~picvue->rs;
-        else
-                data |= picvue->rs;
-        pvc_reg_write(data);
-        pvc_wait();
-}
-void pvc_write_string(const unsigned char *str, u8 addr, int line)
-{
-        int i = 0;
-        if (line > 0 && (PVC_NLINES > 1))
-                addr += 0x40 * line;
-        pvc_write(0x80 | addr, MODE_INST);
-        while (*str != 0 && i < PVC_LINELEN) {
-                pvc_write(*str++, MODE_DATA);
-                i++;
-        }
-}
-void pvc_write_string_centered(const unsigned char *str, int line)
-{
-        int len = strlen(str);
-        u8 addr;
-        if (len > PVC_VISIBLE_CHARS)
-                addr = 0;
-        else
-                addr = (PVC_VISIBLE_CHARS - strlen(str))/2;
-        pvc_write_string(str, addr, line);
-}
-void pvc_dump_string(const unsigned char *str)
-{
-        int len = strlen(str);
-        pvc_write_string(str, 0, 0);
-        if (len > PVC_VISIBLE_CHARS)
-                pvc_write_string(&str[PVC_VISIBLE_CHARS], 0, 1);
-}
-#define BM_SIZE                 8
-#define MAX_PROGRAMMABLE_CHARS  8
-int pvc_program_cg(int charnum, u8 bitmap[BM_SIZE])
-{
-        int i;
-        int addr;
-        if (charnum > MAX_PROGRAMMABLE_CHARS)
-                return -ENOENT;
-        addr = charnum * 8;
-        pvc_write(0x40 | addr, MODE_INST);
-        for (i=0; i<BM_SIZE; i++)
-                pvc_write(bitmap[i], MODE_DATA);
-        return 0;
-}
-#define FUNC_SET_CMD    0x20
-#define  EIGHT_BYTE     (1 << 4)
-#define  FOUR_BYTE      0
-#define  TWO_LINES      (1 << 3)
-#define  ONE_LINE       0
-#define  LARGE_FONT     (1 << 2)
-#define  SMALL_FONT     0
-static void pvc_funcset(u8 cmd)
-{
-        pvc_write(FUNC_SET_CMD | (cmd & (EIGHT_BYTE|TWO_LINES|LARGE_FONT)), MODE_INST);
-}
-#define ENTRYMODE_CMD           0x4
-#define  AUTO_INC               (1 << 1)
-#define  AUTO_DEC               0
-#define  CURSOR_FOLLOWS_DISP    (1 << 0)
-static void pvc_entrymode(u8 cmd)
-{
-        pvc_write(ENTRYMODE_CMD | (cmd & (AUTO_INC|CURSOR_FOLLOWS_DISP)), MODE_INST);
-}
-#define DISP_CNT_CMD    0x08
-#define  DISP_OFF       0
-#define  DISP_ON        (1 << 2)
-#define  CUR_ON         (1 << 1)
-#define  CUR_BLINK      (1 << 0)
-void pvc_dispcnt(u8 cmd)
-{
-        pvc_write(DISP_CNT_CMD | (cmd & (DISP_ON|CUR_ON|CUR_BLINK)), MODE_INST);
-}
-#define MOVE_CMD        0x10
-#define  DISPLAY        (1 << 3)
-#define  CURSOR         0
-#define  RIGHT          (1 << 2)
-#define  LEFT           0
-void pvc_move(u8 cmd)
-{
-        pvc_write(MOVE_CMD | (cmd & (DISPLAY|RIGHT)), MODE_INST);
-}
-#define CLEAR_CMD       0x1
-void pvc_clear(void)
-{
-        pvc_write(CLEAR_CMD, MODE_INST);
-}
-#define HOME_CMD        0x2
-void pvc_home(void)
-{
-        pvc_write(HOME_CMD, MODE_INST);
-}
-int pvc_init(void)
-{
-        u8 cmd = EIGHT_BYTE;
-        if (PVC_NLINES == 2)
-                cmd |= (SMALL_FONT|TWO_LINES);
-        else
-                cmd |= (LARGE_FONT|ONE_LINE);
-        pvc_funcset(cmd);
-        pvc_dispcnt(DISP_ON);
-        pvc_entrymode(AUTO_INC);
-        pvc_clear();
-        pvc_write_string_centered("Display", 0);
-        pvc_write_string_centered("Initialized", 1);
-        return 0;
-}
-module_init(pvc_init);
-MODULE_LICENSE("GPL");
diff --git a/arch/mips/lasat/picvue.h b/arch/mips/lasat/picvue.h
deleted file mode 100644
index 2a96bf9718..0000000000
--- a/arch/mips/lasat/picvue.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Picvue PVC160206 display driver
- *
- * Brian Murphy <brian.murphy@eicon.com>
- *
- */
-#include <asm/semaphore.h>
-struct pvc_defs {
-        volatile u32 *reg;
-        u32 data_shift;
-        u32 data_mask;
-        u32 e;
-        u32 rw;
-        u32 rs;
-};
-extern struct pvc_defs *picvue;
-#define PVC_NLINES              2
-#define PVC_DISPMEM             80
-#define PVC_LINELEN             PVC_DISPMEM / PVC_NLINES
-#define PVC_VISIBLE_CHARS       16
-void pvc_write_string(const unsigned char *str, u8 addr, int line);
-void pvc_write_string_centered(const unsigned char *str, int line);
-void pvc_dump_string(const unsigned char *str);
-#define BM_SIZE                 8
-#define MAX_PROGRAMMABLE_CHARS  8
-int pvc_program_cg(int charnum, u8 bitmap[BM_SIZE]);
-void pvc_dispcnt(u8 cmd);
-#define  DISP_OFF       0
-#define  DISP_ON        (1 << 2)
-#define  CUR_ON         (1 << 1)
-#define  CUR_BLINK      (1 << 0)
-void pvc_move(u8 cmd);
-#define  DISPLAY        (1 << 3)
-#define  CURSOR         0
-#define  RIGHT          (1 << 2)
-#define  LEFT           0
-void pvc_clear(void);
-void pvc_home(void);
-extern struct semaphore pvc_sem;
diff --git a/arch/mips/lasat/picvue_proc.c b/arch/mips/lasat/picvue_proc.c
deleted file mode 100644
index cce7cddcdb..0000000000
--- a/arch/mips/lasat/picvue_proc.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Picvue PVC160206 display driver
- *
- * Brian Murphy <brian.murphy@eicon.com>
- *
- */
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/proc_fs.h>
-#include <linux/interrupt.h>
-#include <linux/timer.h>
-#include "picvue.h"
-static char pvc_lines[PVC_NLINES][PVC_LINELEN+1];
-static int pvc_linedata[PVC_NLINES];
-static struct proc_dir_entry *pvc_display_dir;
-static char *pvc_linename[PVC_NLINES] = {"line1", "line2"};
-#define DISPLAY_DIR_NAME "display"
-static int scroll_dir = 0, scroll_interval = 0;
-static struct timer_list timer;
-static void pvc_display(unsigned long data) {
-        int i;
-        pvc_clear();
-        for (i=0; i<PVC_NLINES; i++)
-                pvc_write_string(pvc_lines[i], 0, i);
-}
-static DECLARE_TASKLET(pvc_display_tasklet, &pvc_display, 0);
-static int pvc_proc_read_line(char *page, char **start,
-                             off_t off, int count,
-                             int *eof, void *data)
-{
-        char *origpage = page;
-        int lineno = *(int *)data;
-        if (lineno < 0 || lineno > PVC_NLINES) {
-                printk("proc_read_line: invalid lineno %d\n", lineno);
-                return 0;
-        }
-        down(&pvc_sem);
-        page += sprintf(page, "%s\n", pvc_lines[lineno]);
-        up(&pvc_sem);
-        return page - origpage;
-}
-static int pvc_proc_write_line(struct file *file, const char *buffer,
-                           unsigned long count, void *data)
-{
-        int origcount = count;
-        int lineno = *(int *)data;
-        if (lineno < 0 || lineno > PVC_NLINES) {
-                printk("proc_write_line: invalid lineno %d\n", lineno);
-                return origcount;
-        }
-        if (count > PVC_LINELEN)
-                count = PVC_LINELEN;
-        if (buffer[count-1] == '\n')
-                count--;
-        down(&pvc_sem);
-        strncpy(pvc_lines[lineno], buffer, count);
-        pvc_lines[lineno][count] = '\0';
-        up(&pvc_sem);
-        tasklet_schedule(&pvc_display_tasklet);
-        return origcount;
-}
-static int pvc_proc_write_scroll(struct file *file, const char *buffer,
-                           unsigned long count, void *data)
-{
-        int origcount = count;
-        int cmd = simple_strtol(buffer, NULL, 10);
-        down(&pvc_sem);
-        if (scroll_interval != 0)
-                del_timer(&timer);
-        if (cmd == 0) {
-                scroll_dir = 0;
-                scroll_interval = 0;
-        } else {
-                if (cmd < 0) {
-                        scroll_dir = -1;
-                        scroll_interval = -cmd;
-                } else {
-                        scroll_dir = 1;
-                        scroll_interval = cmd;
-                }
-                add_timer(&timer);
-        }
-        up(&pvc_sem);
-        return origcount;
-}
-static int pvc_proc_read_scroll(char *page, char **start,
-                             off_t off, int count,
-                             int *eof, void *data)
-{
-        char *origpage = page;
-        down(&pvc_sem);
-        page += sprintf(page, "%d\n", scroll_dir * scroll_interval);
-        up(&pvc_sem);
-        return page - origpage;
-}
-void pvc_proc_timerfunc(unsigned long data)
-{
-        if (scroll_dir < 0)
-                pvc_move(DISPLAY|RIGHT);
-        else if (scroll_dir > 0)
-                pvc_move(DISPLAY|LEFT);
-        timer.expires = jiffies + scroll_interval;
-        add_timer(&timer);
-}
-static void pvc_proc_cleanup(void)
-{
-        int i;
-        for (i=0; i<PVC_NLINES; i++)
-                remove_proc_entry(pvc_linename[i], pvc_display_dir);
-        remove_proc_entry("scroll", pvc_display_dir);
-        remove_proc_entry(DISPLAY_DIR_NAME, NULL);
-        del_timer(&timer);
-}
-static int __init pvc_proc_init(void)
-{
-        struct proc_dir_entry *proc_entry;
-        int i;
-        pvc_display_dir = proc_mkdir(DISPLAY_DIR_NAME, NULL);
-        if (pvc_display_dir == NULL)
-                goto error;
-        for (i=0; i<PVC_NLINES; i++) {
-                strcpy(pvc_lines[i], "");
-                pvc_linedata[i] = i;
-        }
-        for (i=0; i<PVC_NLINES; i++) {
-                proc_entry = create_proc_entry(pvc_linename[i], 0644, pvc_display_dir);
-                if (proc_entry == NULL)
-                        goto error;
-                proc_entry->read_proc = pvc_proc_read_line;
-                proc_entry->write_proc = pvc_proc_write_line;
-                proc_entry->data = &pvc_linedata[i];
-        }
-        proc_entry = create_proc_entry("scroll", 0644, pvc_display_dir);
-        if (proc_entry == NULL)
-                goto error;
-        proc_entry->write_proc = pvc_proc_write_scroll;
-        proc_entry->read_proc = pvc_proc_read_scroll;
-        init_timer(&timer);
-        timer.function = pvc_proc_timerfunc;
-        return 0;
-error:
-        pvc_proc_cleanup();
-        return -ENOMEM;
-}
-module_init(pvc_proc_init);
-module_exit(pvc_proc_cleanup);
-MODULE_LICENSE("GPL");
diff --git a/arch/mips/lasat/prom.c b/arch/mips/lasat/prom.c
deleted file mode 100644
index 812c6ac366..0000000000
--- a/arch/mips/lasat/prom.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * PROM interface routines.
- */
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/string.h>
-#include <linux/ctype.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/bootmem.h>
-#include <linux/ioport.h>
-#include <asm/bootinfo.h>
-#include <asm/lasat/lasat.h>
-#include <asm/cpu.h>
-#include "at93c.h"
-#include <asm/lasat/eeprom.h>
-#include "prom.h"
-#define RESET_VECTOR    0xbfc00000
-#define PROM_JUMP_TABLE_ENTRY(n) (*((u32 *)(RESET_VECTOR + 0x20) + n))
-#define PROM_DISPLAY_ADDR       PROM_JUMP_TABLE_ENTRY(0)
-#define PROM_PUTC_ADDR          PROM_JUMP_TABLE_ENTRY(1)
-#define PROM_MONITOR_ADDR       PROM_JUMP_TABLE_ENTRY(2)
-static void null_prom_display(const char *string, int pos, int clear)
-{
-}
-static void null_prom_monitor(void)
-{
-}
-static void null_prom_putc(char c)
-{
-}
-/* these are functions provided by the bootloader */
-static void (* __prom_putc)(char c) = null_prom_putc;
-void prom_putchar(char c)
-{
-        __prom_putc(c);
-}
-void (* prom_display)(const char *string, int pos, int clear) =
-                null_prom_display;
-void (* prom_monitor)(void) = null_prom_monitor;
-unsigned int lasat_ndelay_divider;
-static void setup_prom_vectors(void)
-{
-        u32 version = *(u32 *)(RESET_VECTOR + 0x90);
-        if (version >= 307) {
-                prom_display = (void *)PROM_DISPLAY_ADDR;
-                __prom_putc = (void *)PROM_PUTC_ADDR;
-                prom_monitor = (void *)PROM_MONITOR_ADDR;
-        }
-        printk("prom vectors set up\n");
-}
-static struct at93c_defs at93c_defs[N_MACHTYPES] = {
-        {(void *)AT93C_REG_100, (void *)AT93C_RDATA_REG_100, AT93C_RDATA_SHIFT_100,
-        AT93C_WDATA_SHIFT_100, AT93C_CS_M_100, AT93C_CLK_M_100},
-        {(void *)AT93C_REG_200, (void *)AT93C_RDATA_REG_200, AT93C_RDATA_SHIFT_200,
-        AT93C_WDATA_SHIFT_200, AT93C_CS_M_200, AT93C_CLK_M_200},
-};
-void __init prom_init(void)
-{
-        int argc = fw_arg0;
-        char **argv = (char **) fw_arg1;
-        setup_prom_vectors();
-        if (current_cpu_data.cputype == CPU_R5000) {
-                printk("LASAT 200 board\n");
-                mips_machtype = MACH_LASAT_200;
-                lasat_ndelay_divider = LASAT_200_DIVIDER;
-        } else {
-                printk("LASAT 100 board\n");
-                mips_machtype = MACH_LASAT_100;
-                lasat_ndelay_divider = LASAT_100_DIVIDER;
-        }
-        at93c = &at93c_defs[mips_machtype];
-        lasat_init_board_info();                /* Read info from EEPROM */
-        mips_machgroup = MACH_GROUP_LASAT;
-        /* Get the command line */
-        if (argc > 0) {
-                strncpy(arcs_cmdline, argv[0], CL_SIZE-1);
-                arcs_cmdline[CL_SIZE-1] = '\0';
-        }
-        /* Set the I/O base address */
-        set_io_port_base(KSEG1);
-        /* Set memory regions */
-        ioport_resource.start = 0;
-        ioport_resource.end = 0xffffffff;       /* Wrong, fixme.  */
-        add_memory_region(0, lasat_board_info.li_memsize, BOOT_MEM_RAM);
-}
-void __init prom_free_prom_memory(void)
-{
-}
-const char *get_system_type(void)
-{
-        return lasat_board_info.li_bmstr;
-}
diff --git a/arch/mips/lasat/prom.h b/arch/mips/lasat/prom.h
deleted file mode 100644
index 019d45fbd2..0000000000
--- a/arch/mips/lasat/prom.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef PROM_H
-#define PROM_H
-extern void (* prom_display)(const char *string, int pos, int clear);
-extern void (* prom_monitor)(void);
-#endif
diff --git a/arch/mips/lasat/reset.c b/arch/mips/lasat/reset.c
deleted file mode 100644
index 9e22acf030..0000000000
--- a/arch/mips/lasat/reset.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Thomas Horsten <thh@lasat.com>
- * Copyright (C) 2000 LASAT Networks A/S.
- *
- *  This program is free software; you can distribute it and/or modify it
- *  under the terms of the GNU General Public License (Version 2) as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Reset the LASAT board.
- */
-#include <linux/kernel.h>
-#include <linux/pm.h>
-#include <asm/reboot.h>
-#include <asm/system.h>
-#include <asm/lasat/lasat.h>
-#include "picvue.h"
-#include "prom.h"
-static void lasat_machine_restart(char *command);
-static void lasat_machine_halt(void);
-/* Used to set machine to boot in service mode via /proc interface */
-int lasat_boot_to_service = 0;
-static void lasat_machine_restart(char *command)
-{
-        local_irq_disable();
-        if (lasat_boot_to_service) {
-                printk("machine_restart: Rebooting to service mode\n");
-                *(volatile unsigned int *)0xa0000024 = 0xdeadbeef;
-                *(volatile unsigned int *)0xa00000fc = 0xfedeabba;
-        }
-        *lasat_misc->reset_reg = 0xbedead;
-        for (;;) ;
-}
-#define MESSAGE "System halted"
-static void lasat_machine_halt(void)
-{
-        local_irq_disable();
-        /* Disable interrupts and loop forever */
-        printk(KERN_NOTICE MESSAGE "\n");
-#ifdef CONFIG_PICVUE
-        pvc_clear();
-        pvc_write_string(MESSAGE, 0, 0);
-#endif
-        prom_monitor();
-        for (;;) ;
-}
-void lasat_reboot_setup(void)
-{
-        _machine_restart = lasat_machine_restart;
-        _machine_halt = lasat_machine_halt;
-        pm_power_off = lasat_machine_halt;
-}
diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c
deleted file mode 100644
index 488007f139..0000000000
--- a/arch/mips/lasat/setup.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Carsten Langgaard, carstenl@mips.com
- * Copyright (C) 1999 MIPS Technologies, Inc.  All rights reserved.
- *
- * Thomas Horsten <thh@lasat.com>
- * Copyright (C) 2000 LASAT Networks A/S.
- *
- * Brian Murphy <brian@murphy.dk>
- *
- *  This program is free software; you can distribute it and/or modify it
- *  under the terms of the GNU General Public License (Version 2) as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Lasat specific setup.
- */
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/pci.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-#include <asm/time.h>
-#include <asm/cpu.h>
-#include <asm/bootinfo.h>
-#include <asm/irq.h>
-#include <asm/lasat/lasat.h>
-#include <asm/lasat/serial.h>
-#ifdef CONFIG_PICVUE
-#include <linux/notifier.h>
-#endif
-#include "ds1603.h"
-#include <asm/lasat/ds1603.h>
-#include <asm/lasat/picvue.h>
-#include <asm/lasat/eeprom.h>
-#include "prom.h"
-int lasat_command_line = 0;
-void lasatint_init(void);
-extern void lasat_reboot_setup(void);
-extern void pcisetup(void);
-extern void edhac_init(void *, void *, void *);
-extern void addrflt_init(void);
-struct lasat_misc lasat_misc_info[N_MACHTYPES] = {
-        {(void *)KSEG1ADDR(0x1c840000), (void *)KSEG1ADDR(0x1c800000), 2},
-        {(void *)KSEG1ADDR(0x11080000), (void *)KSEG1ADDR(0x11000000), 6}
-};
-struct lasat_misc *lasat_misc = NULL;
-#ifdef CONFIG_DS1603
-static struct ds_defs ds_defs[N_MACHTYPES] = {
-        { (void *)DS1603_REG_100, (void *)DS1603_REG_100,
-                DS1603_RST_100, DS1603_CLK_100, DS1603_DATA_100,
-                DS1603_DATA_SHIFT_100, 0, 0 },
-        { (void *)DS1603_REG_200, (void *)DS1603_DATA_REG_200,
-                DS1603_RST_200, DS1603_CLK_200, DS1603_DATA_200,
-                DS1603_DATA_READ_SHIFT_200, 1, 2000 }
-};
-#endif
-#ifdef CONFIG_PICVUE
-#include "picvue.h"
-static struct pvc_defs pvc_defs[N_MACHTYPES] = {
-        { (void *)PVC_REG_100, PVC_DATA_SHIFT_100, PVC_DATA_M_100,
-                PVC_E_100, PVC_RW_100, PVC_RS_100 },
-        { (void *)PVC_REG_200, PVC_DATA_SHIFT_200, PVC_DATA_M_200,
-                PVC_E_200, PVC_RW_200, PVC_RS_200 }
-};
-#endif
-static int lasat_panic_display(struct notifier_block *this,
-                             unsigned long event, void *ptr)
-{
-#ifdef CONFIG_PICVUE
-        unsigned char *string = ptr;
-        if (string == NULL)
-                string = "Kernel Panic";
-        pvc_dump_string(string);
-#endif
-        return NOTIFY_DONE;
-}
-static int lasat_panic_prom_monitor(struct notifier_block *this,
-                             unsigned long event, void *ptr)
-{
-        prom_monitor();
-        return NOTIFY_DONE;
-}
-static struct notifier_block lasat_panic_block[] =
-{
-        { lasat_panic_display, NULL, INT_MAX },
-        { lasat_panic_prom_monitor, NULL, INT_MIN }
-};
-static void lasat_time_init(void)
-{
-        mips_hpt_frequency = lasat_board_info.li_cpu_hz / 2;
-}
-void __init plat_timer_setup(struct irqaction *irq)
-{
-        change_c0_status(ST0_IM, IE_IRQ0 | IE_IRQ5);
-}
-#define DYNAMIC_SERIAL_INIT
-#ifdef DYNAMIC_SERIAL_INIT
-void __init serial_init(void)
-{
-#ifdef CONFIG_SERIAL_8250
-        struct uart_port s;
-        memset(&s, 0, sizeof(s));
-        s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
-        s.iotype = UPIO_MEM;
-        if (mips_machtype == MACH_LASAT_100) {
-                s.uartclk = LASAT_BASE_BAUD_100 * 16;
-                s.irq = LASATINT_UART_100;
-                s.regshift = LASAT_UART_REGS_SHIFT_100;
-                s.membase = (char *)KSEG1ADDR(LASAT_UART_REGS_BASE_100);
-        } else {
-                s.uartclk = LASAT_BASE_BAUD_200 * 16;
-                s.irq = LASATINT_UART_200;
-                s.regshift = LASAT_UART_REGS_SHIFT_200;
-                s.membase = (char *)KSEG1ADDR(LASAT_UART_REGS_BASE_200);
-        }
-        if (early_serial_setup(&s) != 0)
-                printk(KERN_ERR "Serial setup failed!\n");
-#endif
-}
-#endif
-void __init plat_mem_setup(void)
-{
-        int i;
-        lasat_misc  = &lasat_misc_info[mips_machtype];
-#ifdef CONFIG_PICVUE
-        picvue = &pvc_defs[mips_machtype];
-#endif
-        /* Set up panic notifier */
-        for (i = 0; i < sizeof(lasat_panic_block) / sizeof(struct notifier_block); i++)
-                atomic_notifier_chain_register(&panic_notifier_list,
-                                &lasat_panic_block[i]);
-        lasat_reboot_setup();
-        board_time_init = lasat_time_init;
-#ifdef CONFIG_DS1603
-        ds1603 = &ds_defs[mips_machtype];
-        rtc_mips_get_time = ds1603_read;
-        rtc_mips_set_time = ds1603_set;
-#endif
-#ifdef DYNAMIC_SERIAL_INIT
-        serial_init();
-#endif
-        /* Switch from prom exception handler to normal mode */
-        change_c0_status(ST0_BEV,0);
-        pr_info("Lasat specific initialization complete\n");
-}
diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c
deleted file mode 100644
index 699ab1886c..0000000000
--- a/arch/mips/lasat/sysctl.c
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
- * Thomas Horsten <thh@lasat.com>
- * Copyright (C) 2000 LASAT Networks A/S.
- *
- *  This program is free software; you can distribute it and/or modify it
- *  under the terms of the GNU General Public License (Version 2) as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Routines specific to the LASAT boards
- */
-#include <linux/types.h>
-#include <asm/lasat/lasat.h>
-#include <linux/module.h>
-#include <linux/sysctl.h>
-#include <linux/stddef.h>
-#include <linux/init.h>
-#include <linux/fs.h>
-#include <linux/ctype.h>
-#include <linux/string.h>
-#include <linux/net.h>
-#include <linux/inet.h>
-#include <linux/mutex.h>
-#include <asm/uaccess.h>
-#include "sysctl.h"
-#include "ds1603.h"
-static DEFINE_MUTEX(lasat_info_mutex);
-/* Strategy function to write EEPROM after changing string entry */
-int sysctl_lasatstring(ctl_table *table, int *name, int nlen,
-                void *oldval, size_t *oldlenp,
-                void *newval, size_t newlen)
-{
-        int r;
-        mutex_lock(&lasat_info_mutex);
-        r = sysctl_string(table, name,
-                          nlen, oldval, oldlenp, newval, newlen);
-        if (r < 0) {
-                mutex_unlock(&lasat_info_mutex);
-                return r;
-        }
-        if (newval && newlen) {
-                lasat_write_eeprom_info();
-        }
-        mutex_unlock(&lasat_info_mutex);
-        return 1;
-}
-/* And the same for proc */
-int proc_dolasatstring(ctl_table *table, int write, struct file *filp,
-                       void *buffer, size_t *lenp, loff_t *ppos)
-{
-        int r;
-        mutex_lock(&lasat_info_mutex);
-        r = proc_dostring(table, write, filp, buffer, lenp, ppos);
-        if ( (!write) || r) {
-                mutex_unlock(&lasat_info_mutex);
-                return r;
-        }
-        lasat_write_eeprom_info();
-        mutex_unlock(&lasat_info_mutex);
-        return 0;
-}
-/* proc function to write EEPROM after changing int entry */
-int proc_dolasatint(ctl_table *table, int write, struct file *filp,
-                       void *buffer, size_t *lenp, loff_t *ppos)
-{
-        int r;
-        mutex_lock(&lasat_info_mutex);
-        r = proc_dointvec(table, write, filp, buffer, lenp, ppos);
-        if ( (!write) || r) {
-                mutex_unlock(&lasat_info_mutex);
-                return r;
-        }
-        lasat_write_eeprom_info();
-        mutex_unlock(&lasat_info_mutex);
-        return 0;
-}
-static int rtctmp;
-#ifdef CONFIG_DS1603
-/* proc function to read/write RealTime Clock */
-int proc_dolasatrtc(ctl_table *table, int write, struct file *filp,
-                       void *buffer, size_t *lenp, loff_t *ppos)
-{
-        int r;
-        mutex_lock(&lasat_info_mutex);
-        if (!write) {
-                rtctmp = ds1603_read();
-                /* check for time < 0 and set to 0 */
-                if (rtctmp < 0)
-                        rtctmp = 0;
-        }
-        r = proc_dointvec(table, write, filp, buffer, lenp, ppos);
-        if ( (!write) || r) {
-                mutex_unlock(&lasat_info_mutex);
-                return r;
-        }
-        ds1603_set(rtctmp);
-        mutex_unlock(&lasat_info_mutex);
-        return 0;
-}
-#endif
-/* Sysctl for setting the IP addresses */
-int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen,
-                    void *oldval, size_t *oldlenp,
-                    void *newval, size_t newlen)
-{
-        int r;
-        mutex_lock(&lasat_info_mutex);
-        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
-        if (r < 0) {
-                mutex_unlock(&lasat_info_mutex);
-                return r;
-        }
-        if (newval && newlen) {
-                lasat_write_eeprom_info();
-        }
-        mutex_unlock(&lasat_info_mutex);
-        return 1;
-}
-#ifdef CONFIG_DS1603
-/* Same for RTC */
-int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen,
-                    void *oldval, size_t *oldlenp,
-                    void *newval, size_t newlen)
-{
-        int r;
-        mutex_lock(&lasat_info_mutex);
-        rtctmp = ds1603_read();
-        if (rtctmp < 0)
-                rtctmp = 0;
-        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
-        if (r < 0) {
-                mutex_unlock(&lasat_info_mutex);
-                return r;
-        }
-        if (newval && newlen) {
-                ds1603_set(rtctmp);
-        }
-        mutex_unlock(&lasat_info_mutex);
-        return 1;
-}
-#endif
-#ifdef CONFIG_INET
-static char lasat_bcastaddr[16];
-void update_bcastaddr(void)
-{
-        unsigned int ip;
-        ip = (lasat_board_info.li_eeprom_info.ipaddr &
-                lasat_board_info.li_eeprom_info.netmask) |
-                ~lasat_board_info.li_eeprom_info.netmask;
-        sprintf(lasat_bcastaddr, "%d.%d.%d.%d",
-                        (ip      ) & 0xff,
-                        (ip >>  8) & 0xff,
-                        (ip >> 16) & 0xff,
-                        (ip >> 24) & 0xff);
-}
-static char proc_lasat_ipbuf[32];
-/* Parsing of IP address */
-int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
-                       void *buffer, size_t *lenp, loff_t *ppos)
-{
-        int len;
-        unsigned int ip;
-        char *p, c;
-        if (!table->data || !table->maxlen || !*lenp ||
-            (*ppos && !write)) {
-                *lenp = 0;
-                return 0;
-        }
-        mutex_lock(&lasat_info_mutex);
-        if (write) {
-                len = 0;
-                p = buffer;
-                while (len < *lenp) {
-                        if(get_user(c, p++)) {
-                                mutex_unlock(&lasat_info_mutex);
-                                return -EFAULT;
-                        }
-                        if (c == 0 || c == '\n')
-                                break;
-                        len++;
-                }
-                if (len >= sizeof(proc_lasat_ipbuf)-1)
-                        len = sizeof(proc_lasat_ipbuf) - 1;
-                if (copy_from_user(proc_lasat_ipbuf, buffer, len))
-                {
-                        mutex_unlock(&lasat_info_mutex);
-                        return -EFAULT;
-                }
-                proc_lasat_ipbuf[len] = 0;
-                *ppos += *lenp;
-                /* Now see if we can convert it to a valid IP */
-                ip = in_aton(proc_lasat_ipbuf);
-                *(unsigned int *)(table->data) = ip;
-                lasat_write_eeprom_info();
-        } else {
-                ip = *(unsigned int *)(table->data);
-                sprintf(proc_lasat_ipbuf, "%d.%d.%d.%d",
-                        (ip      ) & 0xff,
-                        (ip >>  8) & 0xff,
-                        (ip >> 16) & 0xff,
-                        (ip >> 24) & 0xff);
-                len = strlen(proc_lasat_ipbuf);
-                if (len > *lenp)
-                        len = *lenp;
-                if (len)
-                        if(copy_to_user(buffer, proc_lasat_ipbuf, len)) {
-                                mutex_unlock(&lasat_info_mutex);
-                                return -EFAULT;
-                        }
-                if (len < *lenp) {
-                        if(put_user('\n', ((char *) buffer) + len)) {
-                                mutex_unlock(&lasat_info_mutex);
-                                return -EFAULT;
-                        }
-                        len++;
-                }
-                *lenp = len;
-                *ppos += len;
-        }
-        update_bcastaddr();
-        mutex_unlock(&lasat_info_mutex);
-        return 0;
-}
-#endif /* defined(CONFIG_INET) */
-static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen,
-                                     void *oldval, size_t *oldlenp,
-                                     void *newval, size_t newlen)
-{
-        int r;
-        mutex_lock(&lasat_info_mutex);
-        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
-        if (r < 0) {
-                mutex_unlock(&lasat_info_mutex);
-                return r;
-        }
-        if (newval && newlen)
-        {
-                if (name && *name == LASAT_PRID)
-                        lasat_board_info.li_eeprom_info.prid = *(int*)newval;
-                lasat_write_eeprom_info();
-                lasat_init_board_info();
-        }
-        mutex_unlock(&lasat_info_mutex);
-        return 0;
-}
-int proc_lasat_eeprom_value(ctl_table *table, int write, struct file *filp,
-                       void *buffer, size_t *lenp, loff_t *ppos)
-{
-        int r;
-        mutex_lock(&lasat_info_mutex);
-        r = proc_dointvec(table, write, filp, buffer, lenp, ppos);
-        if ( (!write) || r) {
-                mutex_unlock(&lasat_info_mutex);
-                return r;
-        }
-        if (filp && filp->f_path.dentry)
-        {
-                if (!strcmp(filp->f_path.dentry->d_name.name, "prid"))
-                        lasat_board_info.li_eeprom_info.prid = lasat_board_info.li_prid;
-                if (!strcmp(filp->f_path.dentry->d_name.name, "debugaccess"))
-                        lasat_board_info.li_eeprom_info.debugaccess = lasat_board_info.li_debugaccess;
-        }
-        lasat_write_eeprom_info();
-        mutex_unlock(&lasat_info_mutex);
-        return 0;
-}
-extern int lasat_boot_to_service;
-#ifdef CONFIG_SYSCTL
-static ctl_table lasat_table[] = {
-        {
-                .ctl_name       = CTL_UNNUMBERED,
-                .procname       = "cpu-hz",
-                .data           = &lasat_board_info.li_cpu_hz,
-                .maxlen         = sizeof(int),
-                .mode           = 0444,
-                .proc_handler   = &proc_dointvec,
-                .strategy       = &sysctl_intvec
-        },
-        {
-                .ctl_name       = CTL_UNNUMBERED,
-                .procname       = "bus-hz",
-                .data           = &lasat_board_info.li_bus_hz,
-                .maxlen         = sizeof(int),
-                .mode           = 0444,
-                .proc_handler   = &proc_dointvec,
-                .strategy       = &sysctl_intvec
-        },
-        {
-                .ctl_name       = CTL_UNNUMBERED,
-                .procname       = "bmid",
-                .data           = &lasat_board_info.li_bmid,
-                .maxlen         = sizeof(int),
-                .mode           = 0444,
-                .proc_handler   = &proc_dointvec,
-                .strategy       = &sysctl_intvec
-        },
-        {
-                .ctl_name       = CTL_UNNUMBERED,
-                .procname       = "prid",
-                .data           = &lasat_board_info.li_prid,
-                .maxlen         = sizeof(int),
-                .mode           = 0644,
-                .proc_handler   = &proc_lasat_eeprom_value,
-                .strategy       = &sysctl_lasat_eeprom_value
-        },
-#ifdef CONFIG_INET
-        {
-                .ctl_name       = CTL_UNNUMBERED,
-                .procname       = "ipaddr",
-                .data           = &lasat_board_info.li_eeprom_info.ipaddr,
-                .maxlen         = sizeof(int),
-                .mode           = 0644,
-                .proc_handler   = &proc_lasat_ip,
-                .strategy       = &sysctl_lasat_intvec
-        },
-        {
-                .ctl_name       = LASAT_NETMASK,
-                .procname       = "netmask",
-                .data           = &lasat_board_info.li_eeprom_info.netmask,
-                .maxlen         = sizeof(int),
-                .mode           = 0644,
-                .proc_handler   = &proc_lasat_ip,
-                .strategy       = &sysctl_lasat_intvec
-        },
-        {
-                .ctl_name       = CTL_UNNUMBERED,
-                .procname       = "bcastaddr",
-                .data           = &lasat_bcastaddr,
-                .maxlen         = sizeof(lasat_bcastaddr),
-                .mode           = 0600,
-                .proc_handler   = &proc_dostring,
-                .strategy       = &sysctl_string
-        },
-#endif
-        {
-                .ctl_name       = CTL_UNNUMBERED,
-                .procname       = "passwd_hash",
-                .data           = &lasat_board_info.li_eeprom_info.passwd_hash,
-                .maxlen         = sizeof(lasat_board_info.li_eeprom_info.passwd_hash),
-                .mode           = 0600,
-                .proc_handler   = &proc_dolasatstring,
-                .strategy       = &sysctl_lasatstring
-        },
-        {
-                .ctl_name       = CTL_UNNUMBERED,
-                .procname       = "boot-service",
-                .data           = &lasat_boot_to_service,
-                .maxlen         = sizeof(int),
-                .mode           = 0644,
-                .proc_handler   = &proc_dointvec,
-                .strategy       = &sysctl_intvec
-        },
-#ifdef CONFIG_DS1603
-        {
-                .ctl_name       = CTL_UNNUMBERED,
-                .procname       = "rtc",
-                .data           = &rtctmp,
-                .maxlen         = sizeof(int),
-                .mode           = 0644,
-                .proc_handler   = &proc_dolasatrtc,
-                .strategy       = &sysctl_lasat_rtc
-        },
-#endif
-        {
-                .ctl_name       = CTL_UNNUMBERED,
-                .procname       = "namestr",
-                .data           = &lasat_board_info.li_namestr,
-                .maxlen         = sizeof(lasat_board_info.li_namestr),
-                .mode           = 0444,
-                .proc_handler   =  &proc_dostring,
-                .strategy       = &sysctl_string
-        },
-        {
-                .ctl_name       = CTL_UNNUMBERED,
-                .procname       = "typestr",
-                .data           = &lasat_board_info.li_typestr,
-                .maxlen         = sizeof(lasat_board_info.li_typestr),
-                .mode           = 0444,
-                .proc_handler   = &proc_dostring,
-                .strategy       = &sysctl_string
-        },
-        {}
-};
-static ctl_table lasat_root_table[] = {
-        {
-                .ctl_name       = CTL_UNNUMBERED,
-                .procname       = "lasat",
-                .mode           =  0555,
-                .child          = lasat_table
-        },
-        {}
-};
-static int __init lasat_register_sysctl(void)
-{
-        struct ctl_table_header *lasat_table_header;
-        lasat_table_header =
-                register_sysctl_table(lasat_root_table);
-        return 0;
-}
-__initcall(lasat_register_sysctl);
-#endif /* CONFIG_SYSCTL */
diff --git a/arch/mips/lasat/sysctl.h b/arch/mips/lasat/sysctl.h
deleted file mode 100644
index 4d139d2adb..0000000000
--- a/arch/mips/lasat/sysctl.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * LASAT sysctl values
- */
-#ifndef _LASAT_SYSCTL_H
-#define _LASAT_SYSCTL_H
-/* /proc/sys/lasat */
-enum {
-        LASAT_CPU_HZ=1,
-        LASAT_BUS_HZ,
-        LASAT_MODEL,
-        LASAT_PRID,
-        LASAT_IPADDR,
-        LASAT_NETMASK,
-        LASAT_BCAST,
-        LASAT_PASSWORD,
-        LASAT_SBOOT,
-        LASAT_RTC,
-        LASAT_NAMESTR,
-        LASAT_TYPESTR,
-};
-#endif /* _LASAT_SYSCTL_H */
diff --git a/arch/mips/lemote/lm2e/Makefile b/arch/mips/lemote/lm2e/Makefile
new file mode 100644
index 0000000000..fb1b48c48c
--- /dev/null
+++ b/arch/mips/lemote/lm2e/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for Lemote Fulong mini-PC board.
+#
+obj-y += setup.o prom.o reset.o irq.o pci.o bonito-irq.o dbg_io.o mem.o
+EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/lemote/lm2e/bonito-irq.c b/arch/mips/lemote/lm2e/bonito-irq.c
new file mode 100644
index 0000000000..8fc3bce707
--- /dev/null
+++ b/arch/mips/lemote/lm2e/bonito-irq.c
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2001 MontaVista Software Inc.
+ * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
+ * Copyright (C) 2000, 2001 Ralf Baechle (ralf@gnu.org)
+ *
+ * Copyright (C) 2007 Lemote Inc. & Insititute of Computing Technology
+ * Author: Fuxin Zhang, zhangfx@lemote.com
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <asm/mips-boards/bonito64.h>
+static inline void bonito_irq_enable(unsigned int irq)
+{
+        BONITO_INTENSET = (1 << (irq - BONITO_IRQ_BASE));
+        mmiowb();
+}
+static inline void bonito_irq_disable(unsigned int irq)
+{
+        BONITO_INTENCLR = (1 << (irq - BONITO_IRQ_BASE));
+        mmiowb();
+}
+static struct irq_chip bonito_irq_type = {
+        .name   = "bonito_irq",
+        .ack    = bonito_irq_disable,
+        .mask   = bonito_irq_disable,
+        .mask_ack = bonito_irq_disable,
+        .unmask = bonito_irq_enable,
+};
+static struct irqaction dma_timeout_irqaction = {
+        .handler        = no_action,
+        .name           = "dma_timeout",
+};
+void bonito_irq_init(void)
+{
+        u32 i;
+        for (i = BONITO_IRQ_BASE; i < BONITO_IRQ_BASE + 32; i++) {
+                set_irq_chip_and_handler(i, &bonito_irq_type, handle_level_irq);
+        }
+        setup_irq(BONITO_IRQ_BASE + 10, &dma_timeout_irqaction);
+}
diff --git a/arch/mips/lemote/lm2e/dbg_io.c b/arch/mips/lemote/lm2e/dbg_io.c
new file mode 100644
index 0000000000..6c95da3ca7
--- /dev/null
+++ b/arch/mips/lemote/lm2e/dbg_io.c
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2001 MontaVista Software Inc.
+ * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
+ * Copyright (C) 2000, 2001 Ralf Baechle (ralf@gnu.org)
+ *
+ * Copyright (C) 2007 Lemote Inc. & Insititute of Computing Technology
+ * Author: Fuxin Zhang, zhangfx@lemote.com
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#include <linux/io.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <asm/serial.h>
+#define         UART16550_BAUD_2400             2400
+#define         UART16550_BAUD_4800             4800
+#define         UART16550_BAUD_9600             9600
+#define         UART16550_BAUD_19200            19200
+#define         UART16550_BAUD_38400            38400
+#define         UART16550_BAUD_57600            57600
+#define         UART16550_BAUD_115200           115200
+#define         UART16550_PARITY_NONE           0
+#define         UART16550_PARITY_ODD            0x08
+#define         UART16550_PARITY_EVEN           0x18
+#define         UART16550_PARITY_MARK           0x28
+#define         UART16550_PARITY_SPACE          0x38
+#define         UART16550_DATA_5BIT             0x0
+#define         UART16550_DATA_6BIT             0x1
+#define         UART16550_DATA_7BIT             0x2
+#define         UART16550_DATA_8BIT             0x3
+#define         UART16550_STOP_1BIT             0x0
+#define         UART16550_STOP_2BIT             0x4
+/* ----------------------------------------------------- */
+/* === CONFIG === */
+#ifdef CONFIG_64BIT
+#define         BASE                    (0xffffffffbfd003f8)
+#else
+#define         BASE                    (0xbfd003f8)
+#endif
+#define         MAX_BAUD                BASE_BAUD
+/* === END OF CONFIG === */
+#define         REG_OFFSET              1
+/* register offset */
+#define         OFS_RCV_BUFFER          0
+#define         OFS_TRANS_HOLD          0
+#define         OFS_SEND_BUFFER         0
+#define         OFS_INTR_ENABLE         (1*REG_OFFSET)
+#define         OFS_INTR_ID             (2*REG_OFFSET)
+#define         OFS_DATA_FORMAT         (3*REG_OFFSET)
+#define         OFS_LINE_CONTROL        (3*REG_OFFSET)
+#define         OFS_MODEM_CONTROL       (4*REG_OFFSET)
+#define         OFS_RS232_OUTPUT        (4*REG_OFFSET)
+#define         OFS_LINE_STATUS         (5*REG_OFFSET)
+#define         OFS_MODEM_STATUS        (6*REG_OFFSET)
+#define         OFS_RS232_INPUT         (6*REG_OFFSET)
+#define         OFS_SCRATCH_PAD         (7*REG_OFFSET)
+#define         OFS_DIVISOR_LSB         (0*REG_OFFSET)
+#define         OFS_DIVISOR_MSB         (1*REG_OFFSET)
+/* memory-mapped read/write of the port */
+#define         UART16550_READ(y)       readb((char *)BASE + (y))
+#define         UART16550_WRITE(y, z)   writeb(z, (char *)BASE + (y))
+void debugInit(u32 baud, u8 data, u8 parity, u8 stop)
+{
+        u32 divisor;
+        /* disable interrupts */
+        UART16550_WRITE(OFS_INTR_ENABLE, 0);
+        /* set up buad rate */
+        /* set DIAB bit */
+        UART16550_WRITE(OFS_LINE_CONTROL, 0x80);
+        /* set divisor */
+        divisor = MAX_BAUD / baud;
+        UART16550_WRITE(OFS_DIVISOR_LSB, divisor & 0xff);
+        UART16550_WRITE(OFS_DIVISOR_MSB, (divisor & 0xff00) >> 8);
+        /* clear DIAB bit */
+        UART16550_WRITE(OFS_LINE_CONTROL, 0x0);
+        /* set data format */
+        UART16550_WRITE(OFS_DATA_FORMAT, data | parity | stop);
+}
+static int remoteDebugInitialized;
+u8 getDebugChar(void)
+{
+        if (!remoteDebugInitialized) {
+                remoteDebugInitialized = 1;
+                debugInit(UART16550_BAUD_115200,
+                          UART16550_DATA_8BIT,
+                          UART16550_PARITY_NONE, UART16550_STOP_1BIT);
+        }
+        while ((UART16550_READ(OFS_LINE_STATUS) & 0x1) == 0) ;
+        return UART16550_READ(OFS_RCV_BUFFER);
+}
+int putDebugChar(u8 byte)
+{
+        if (!remoteDebugInitialized) {
+                remoteDebugInitialized = 1;
+                /*
+                   debugInit(UART16550_BAUD_115200,
+                   UART16550_DATA_8BIT,
+                   UART16550_PARITY_NONE, UART16550_STOP_1BIT); */
+        }
+        while ((UART16550_READ(OFS_LINE_STATUS) & 0x20) == 0) ;
+        UART16550_WRITE(OFS_SEND_BUFFER, byte);
+        return 1;
+}
diff --git a/arch/mips/lemote/lm2e/irq.c b/arch/mips/lemote/lm2e/irq.c
new file mode 100644
index 0000000000..05693bceae
--- /dev/null
+++ b/arch/mips/lemote/lm2e/irq.c
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2007 Lemote Inc. & Insititute of Computing Technology
+ * Author: Fuxin Zhang, zhangfx@lemote.com
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <asm/irq_cpu.h>
+#include <asm/i8259.h>
+#include <asm/mipsregs.h>
+#include <asm/mips-boards/bonito64.h>
+/*
+ * the first level int-handler will jump here if it is a bonito irq
+ */
+static void bonito_irqdispatch(void)
+{
+        u32 int_status;
+        int i;
+        /* workaround the IO dma problem: let cpu looping to allow DMA finish */
+        int_status = BONITO_INTISR;
+        if (int_status & (1 << 10)) {
+                while (int_status & (1 << 10)) {
+                        udelay(1);
+                        int_status = BONITO_INTISR;
+                }
+        }
+        /* Get pending sources, masked by current enables */
+        int_status = BONITO_INTISR & BONITO_INTEN;
+        if (int_status != 0) {
+                i = __ffs(int_status);
+                int_status &= ~(1 << i);
+                do_IRQ(BONITO_IRQ_BASE + i);
+        }
+}
+static void i8259_irqdispatch(void)
+{
+        int irq;
+        irq = i8259_irq();
+        if (irq >= 0) {
+                do_IRQ(irq);
+        } else {
+                spurious_interrupt();
+        }
+}
+asmlinkage void plat_irq_dispatch(void)
+{
+        unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM;
+        if (pending & CAUSEF_IP7) {
+                do_IRQ(MIPS_CPU_IRQ_BASE + 7);
+        } else if (pending & CAUSEF_IP5) {
+                i8259_irqdispatch();
+        } else if (pending & CAUSEF_IP2) {
+                bonito_irqdispatch();
+        } else {
+                spurious_interrupt();
+        }
+}
+static struct irqaction cascade_irqaction = {
+        .handler = no_action,
+        .mask = CPU_MASK_NONE,
+        .name = "cascade",
+};
+void __init arch_init_irq(void)
+{
+        extern void bonito_irq_init(void);
+        /*
+         * Clear all of the interrupts while we change the able around a bit.
+         * int-handler is not on bootstrap
+         */
+        clear_c0_status(ST0_IM | ST0_BEV);
+        local_irq_disable();
+        /* most bonito irq should be level triggered */
+        BONITO_INTEDGE = BONITO_ICU_SYSTEMERR | BONITO_ICU_MASTERERR |
+                BONITO_ICU_RETRYERR | BONITO_ICU_MBOXES;
+        BONITO_INTSTEER = 0;
+        /*
+         * Mask out all interrupt by writing "1" to all bit position in
+         * the interrupt reset reg.
+         */
+        BONITO_INTENCLR = ~0;
+        /* init all controller
+         *   0-15         ------> i8259 interrupt
+         *   16-23        ------> mips cpu interrupt
+         *   32-63        ------> bonito irq
+         */
+        /* Sets the first-level interrupt dispatcher. */
+        mips_cpu_irq_init();
+        init_i8259_irqs();
+        bonito_irq_init();
+        /*
+        printk("GPIODATA=%x, GPIOIE=%x\n", BONITO_GPIODATA, BONITO_GPIOIE);
+        printk("INTEN=%x, INTSET=%x, INTCLR=%x, INTISR=%x\n",
+                        BONITO_INTEN, BONITO_INTENSET,
+                        BONITO_INTENCLR, BONITO_INTISR);
+        */
+        /* bonito irq at IP2 */
+        setup_irq(MIPS_CPU_IRQ_BASE + 2, &cascade_irqaction);
+        /* 8259 irq at IP5 */
+        setup_irq(MIPS_CPU_IRQ_BASE + 5, &cascade_irqaction);
+}
diff --git a/arch/mips/lemote/lm2e/mem.c b/arch/mips/lemote/lm2e/mem.c
new file mode 100644
index 0000000000..16cd21587d
--- /dev/null
+++ b/arch/mips/lemote/lm2e/mem.c
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+#include <linux/fs.h>
+#include <linux/fcntl.h>
+#include <linux/mm.h>
+/* override of arch/mips/mm/cache.c: __uncached_access */
+int __uncached_access(struct file *file, unsigned long addr)
+{
+        if (file->f_flags & O_SYNC)
+                return 1;
+        /*
+         * On the Lemote Loongson 2e system, the peripheral registers
+         * reside between 0x1000:0000 and 0x2000:0000.
+         */
+        return addr >= __pa(high_memory) ||
+                ((addr >= 0x10000000) && (addr < 0x20000000));
+}
diff --git a/arch/mips/lemote/lm2e/pci.c b/arch/mips/lemote/lm2e/pci.c
new file mode 100644
index 0000000000..1ade1cef38
--- /dev/null
+++ b/arch/mips/lemote/lm2e/pci.c
@@ -0,0 +1,93 @@
+/*
+ * pci.c
+ *
+ * Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology
+ * Author: Fuxin Zhang, zhangfx@lemote.com
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <asm/mips-boards/bonito64.h>
+extern struct pci_ops bonito64_pci_ops;
+static struct resource loongson2e_pci_mem_resource = {
+        .name   = "LOONGSON2E PCI MEM",
+        .start  = 0x14000000UL,
+        .end    = 0x1fffffffUL,
+        .flags  = IORESOURCE_MEM,
+};
+static struct resource loongson2e_pci_io_resource = {
+        .name   = "LOONGSON2E PCI IO MEM",
+        .start  = 0x00004000UL,
+        .end    = IO_SPACE_LIMIT,
+        .flags  = IORESOURCE_IO,
+};
+static struct pci_controller  loongson2e_pci_controller = {
+        .pci_ops        = &bonito64_pci_ops,
+        .io_resource    = &loongson2e_pci_io_resource,
+        .mem_resource   = &loongson2e_pci_mem_resource,
+        .mem_offset     = 0x00000000UL,
+        .io_offset      = 0x00000000UL,
+};
+static void __init ict_pcimap(void)
+{
+        /*
+         * local to PCI mapping: [256M,512M] -> [256M,512M]; differ from PMON
+         *
+         * CPU address space [256M,448M] is window for accessing pci space
+         * we set pcimap_lo[0,1,2] to map it to pci space [256M,448M]
+         * pcimap: bit18,pcimap_2; bit[17-12],lo2;bit[11-6],lo1;bit[5-0],lo0
+         */
+        /* 1,00 0110 ,0001 01,00 0000 */
+        BONITO_PCIMAP = 0x46140;
+        /* 1, 00 0010, 0000,01, 00 0000 */
+        /* BONITO_PCIMAP = 0x42040; */
+        /*
+         * PCI to local mapping: [2G,2G+256M] -> [0,256M]
+         */
+        BONITO_PCIBASE0 = 0x80000000;
+        BONITO_PCIBASE1 = 0x00800000;
+        BONITO_PCIBASE2 = 0x90000000;
+}
+static int __init pcibios_init(void)
+{
+        extern int pci_probe_only;
+        pci_probe_only = 0;
+        ict_pcimap();
+        register_pci_controller(&loongson2e_pci_controller);
+        return 0;
+}
+arch_initcall(pcibios_init);
diff --git a/arch/mips/lemote/lm2e/prom.c b/arch/mips/lemote/lm2e/prom.c
new file mode 100644
index 0000000000..67312d7acf
--- /dev/null
+++ b/arch/mips/lemote/lm2e/prom.c
@@ -0,0 +1,104 @@
+/*
+ * Based on Ocelot Linux port, which is
+ * Copyright 2001 MontaVista Software Inc.
+ * Author: jsun@mvista.com or jsun@junsun.net
+ *
+ * Copyright 2003 ICT CAS
+ * Author: Michael Guo <guoyi@ict.ac.cn>
+ *
+ * Copyright (C) 2007 Lemote Inc. & Insititute of Computing Technology
+ * Author: Fuxin Zhang, zhangfx@lemote.com
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+#include <linux/bootmem.h>
+#include <asm/addrspace.h>
+#include <asm/bootinfo.h>
+extern unsigned long bus_clock;
+extern unsigned long cpu_clock;
+extern unsigned int memsize, highmemsize;
+extern int putDebugChar(unsigned char byte);
+static int argc;
+/* pmon passes arguments in 32bit pointers */
+static int *arg;
+static int *env;
+const char *get_system_type(void)
+{
+        return "lemote-fulong";
+}
+void __init prom_init_cmdline(void)
+{
+        int i;
+        long l;
+        /* arg[0] is "g", the rest is boot parameters */
+        arcs_cmdline[0] = '\0';
+        for (i = 1; i < argc; i++) {
+                l = (long)arg[i];
+                if (strlen(arcs_cmdline) + strlen(((char *)l) + 1)
+                    >= sizeof(arcs_cmdline))
+                        break;
+                strcat(arcs_cmdline, ((char *)l));
+                strcat(arcs_cmdline, " ");
+        }
+}
+void __init prom_init(void)
+{
+        long l;
+        argc = fw_arg0;
+        arg = (int *)fw_arg1;
+        env = (int *)fw_arg2;
+        mips_machgroup = MACH_GROUP_LEMOTE;
+        mips_machtype = MACH_LEMOTE_FULONG;
+        prom_init_cmdline();
+        if ((strstr(arcs_cmdline, "console=")) == NULL)
+                strcat(arcs_cmdline, " console=ttyS0,115200");
+        if ((strstr(arcs_cmdline, "root=")) == NULL)
+                strcat(arcs_cmdline, " root=/dev/hda1");
+#define parse_even_earlier(res, option, p)                              \
+do {                                                                    \
+        if (strncmp(option, (char *)p, strlen(option)) == 0)            \
+                res = simple_strtol((char *)p + strlen(option"="),      \
+                                    NULL, 10);                          \
+} while (0)
+        l = (long)*env;
+        while (l != 0) {
+                parse_even_earlier(bus_clock, "busclock", l);
+                parse_even_earlier(cpu_clock, "cpuclock", l);
+                parse_even_earlier(memsize, "memsize", l);
+                parse_even_earlier(highmemsize, "highmemsize", l);
+                env++;
+                l = (long)*env;
+        }
+        if (memsize == 0)
+                memsize = 256;
+        pr_info("busclock=%ld, cpuclock=%ld,memsize=%d,highmemsize=%d\n",
+               bus_clock, cpu_clock, memsize, highmemsize);
+}
+void __init prom_free_prom_memory(void)
+{
+}
+void prom_putchar(char c)
+{
+        putDebugChar(c);
+}
diff --git a/arch/mips/lemote/lm2e/reset.c b/arch/mips/lemote/lm2e/reset.c
new file mode 100644
index 0000000000..099387a382
--- /dev/null
+++ b/arch/mips/lemote/lm2e/reset.c
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ *
+ * Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology
+ * Author: Fuxin Zhang, zhangfx@lemote.com
+ */
+#include <linux/pm.h>
+#include <asm/reboot.h>
+static void loongson2e_restart(char *command)
+{
+#ifdef CONFIG_32BIT
+        *(unsigned long *)0xbfe00104 &= ~(1 << 2);
+        *(unsigned long *)0xbfe00104 |= (1 << 2);
+#else
+        *(unsigned long *)0xffffffffbfe00104 &= ~(1 << 2);
+        *(unsigned long *)0xffffffffbfe00104 |= (1 << 2);
+#endif
+        __asm__ __volatile__("jr\t%0"::"r"(0xbfc00000));
+}
+static void loongson2e_halt(void)
+{
+        while (1) ;
+}
+static void loongson2e_power_off(void)
+{
+        loongson2e_halt();
+}
+void mips_reboot_setup(void)
+{
+        _machine_restart = loongson2e_restart;
+        _machine_halt = loongson2e_halt;
+        pm_power_off = loongson2e_power_off;
+}
diff --git a/arch/mips/lemote/lm2e/setup.c b/arch/mips/lemote/lm2e/setup.c
new file mode 100644
index 0000000000..0e4d1fa572
--- /dev/null
+++ b/arch/mips/lemote/lm2e/setup.c
@@ -0,0 +1,134 @@
+/*
+ * BRIEF MODULE DESCRIPTION
+ * setup.c - board dependent boot routines
+ *
+ * Copyright (C) 2007 Lemote Inc. & Insititute of Computing Technology
+ * Author: Fuxin Zhang, zhangfx@lemote.com
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#include <linux/bootmem.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/mc146818rtc.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/tty.h>
+#include <linux/types.h>
+#include <asm/bootinfo.h>
+#include <asm/mc146818-time.h>
+#include <asm/time.h>
+#include <asm/wbflush.h>
+#ifdef CONFIG_VT
+#include <linux/console.h>
+#include <linux/screen_info.h>
+#endif
+extern void mips_reboot_setup(void);
+#ifdef CONFIG_64BIT
+#define PTR_PAD(p) ((0xffffffff00000000)|((unsigned long long)(p)))
+#else
+#define PTR_PAD(p) (p)
+#endif
+unsigned long cpu_clock;
+unsigned long bus_clock;
+unsigned int memsize;
+unsigned int highmemsize = 0;
+void __init plat_timer_setup(struct irqaction *irq)
+{
+        setup_irq(MIPS_CPU_IRQ_BASE + 7, irq);
+}
+static void __init loongson2e_time_init(void)
+{
+        /* setup mips r4k timer */
+        mips_hpt_frequency = cpu_clock / 2;
+}
+static unsigned long __init mips_rtc_get_time(void)
+{
+        return mc146818_get_cmos_time();
+}
+void (*__wbflush)(void);
+EXPORT_SYMBOL(__wbflush);
+static void wbflush_loongson2e(void)
+{
+        asm(".set\tpush\n\t"
+            ".set\tnoreorder\n\t"
+            ".set mips3\n\t"
+            "sync\n\t"
+            "nop\n\t"
+            ".set\tpop\n\t"
+            ".set mips0\n\t");
+}
+void __init plat_mem_setup(void)
+{
+        set_io_port_base(PTR_PAD(0xbfd00000));
+        mips_reboot_setup();
+        board_time_init = loongson2e_time_init;
+        rtc_mips_get_time = mips_rtc_get_time;
+        __wbflush = wbflush_loongson2e;
+        add_memory_region(0x0, (memsize << 20), BOOT_MEM_RAM);
+#ifdef CONFIG_64BIT
+        if (highmemsize > 0) {
+                add_memory_region(0x20000000, highmemsize << 20, BOOT_MEM_RAM);
+        }
+#endif
+#ifdef CONFIG_VT
+#if defined(CONFIG_VGA_CONSOLE)
+        conswitchp = &vga_con;
+        screen_info = (struct screen_info) {
+                0, 25,          /* orig-x, orig-y */
+                    0,          /* unused */
+                    0,          /* orig-video-page */
+                    0,          /* orig-video-mode */
+                    80,         /* orig-video-cols */
+                    0, 0, 0,    /* ega_ax, ega_bx, ega_cx */
+                    25,         /* orig-video-lines */
+                    VIDEO_TYPE_VGAC,    /* orig-video-isVGA */
+                    16          /* orig-video-points */
+        };
+#elif defined(CONFIG_DUMMY_CONSOLE)
+        conswitchp = &dummy_con;
+#endif
+#endif
+}
diff --git a/arch/mips/lib-32/Makefile b/arch/mips/lib-32/Makefile
deleted file mode 100644
index 8b94d4cc5a..0000000000
--- a/arch/mips/lib-32/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Makefile for MIPS-specific library files..
-#
-lib-y   += watch.o
-obj-$(CONFIG_CPU_MIPS32)        += dump_tlb.o
-obj-$(CONFIG_CPU_MIPS64)        += dump_tlb.o
-obj-$(CONFIG_CPU_NEVADA)        += dump_tlb.o
-obj-$(CONFIG_CPU_R10000)        += dump_tlb.o
-obj-$(CONFIG_CPU_R3000)         += r3k_dump_tlb.o
-obj-$(CONFIG_CPU_R4300)         += dump_tlb.o
-obj-$(CONFIG_CPU_R4X00)         += dump_tlb.o
-obj-$(CONFIG_CPU_R5000)         += dump_tlb.o
-obj-$(CONFIG_CPU_R5432)         += dump_tlb.o
-obj-$(CONFIG_CPU_R6000)         +=
-obj-$(CONFIG_CPU_R8000)         +=
-obj-$(CONFIG_CPU_RM7000)        += dump_tlb.o
-obj-$(CONFIG_CPU_RM9000)        += dump_tlb.o
-obj-$(CONFIG_CPU_SB1)           += dump_tlb.o
-obj-$(CONFIG_CPU_TX39XX)        += r3k_dump_tlb.o
-obj-$(CONFIG_CPU_TX49XX)        += dump_tlb.o
-obj-$(CONFIG_CPU_VR41XX)        += dump_tlb.o
diff --git a/arch/mips/lib-32/dump_tlb.c b/arch/mips/lib-32/dump_tlb.c
deleted file mode 100644
index 6a68deb51a..0000000000
--- a/arch/mips/lib-32/dump_tlb.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Dump R4x00 TLB for debugging purposes.
- *
- * Copyright (C) 1994, 1995 by Waldorf Electronics, written by Ralf Baechle.
- * Copyright (C) 1999 by Silicon Graphics, Inc.
- */
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <asm/bootinfo.h>
-#include <asm/cachectl.h>
-#include <asm/cpu.h>
-#include <asm/mipsregs.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-static inline const char *msk2str(unsigned int mask)
-{
-        switch (mask) {
-        case PM_4K:
-                return "4kb";
-        case PM_16K:
-                return "16kb";
-        case PM_64K:
-                return "64kb";
-        case PM_256K:
-                return "256kb";
-#ifndef CONFIG_CPU_VR41XX
-        case PM_1M:
-                return "1Mb";
-        case PM_4M:
-                return "4Mb";
-        case PM_16M:
-                return "16Mb";
-        case PM_64M:
-                return "64Mb";
-        case PM_256M:
-                return "256Mb";
-#endif
-        }
-        return "unknown";
-}
-#define BARRIER()                                       \
-        __asm__ __volatile__(                           \
-                ".set\tnoreorder\n\t"                   \
-                "nop;nop;nop;nop;nop;nop;nop\n\t"       \
-                ".set\treorder");
-void dump_tlb(int first, int last)
-{
-        unsigned int pagemask, c0, c1, asid;
-        unsigned long long entrylo0, entrylo1;
-        unsigned long entryhi;
-        int i;
-        asid = read_c0_entryhi() & 0xff;
-        printk("\n");
-        for (i = first; i <= last; i++) {
-                write_c0_index(i);
-                BARRIER();
-                tlb_read();
-                BARRIER();
-                pagemask = read_c0_pagemask();
-                entryhi = read_c0_entryhi();
-                entrylo0 = read_c0_entrylo0();
-                entrylo1 = read_c0_entrylo1();
-                /* Unused entries have a virtual address in KSEG0.  */
-                if ((entryhi & 0xf0000000) != 0x80000000
-                    && (entryhi & 0xff) == asid) {
-                        /*
-                         * Only print entries in use
-                         */
-                        printk("Index: %2d pgmask=%s ", i, msk2str(pagemask));
-                        c0 = (entrylo0 >> 3) & 7;
-                        c1 = (entrylo1 >> 3) & 7;
-                        printk("va=%08lx asid=%02lx\n",
-                               (entryhi & 0xffffe000), (entryhi & 0xff));
-                        printk("\t\t\t[pa=%08Lx c=%d d=%d v=%d g=%Ld]\n",
-                               (entrylo0 << 6) & PAGE_MASK, c0,
-                               (entrylo0 & 4) ? 1 : 0,
-                               (entrylo0 & 2) ? 1 : 0, (entrylo0 & 1));
-                        printk("\t\t\t[pa=%08Lx c=%d d=%d v=%d g=%Ld]\n",
-                               (entrylo1 << 6) & PAGE_MASK, c1,
-                               (entrylo1 & 4) ? 1 : 0,
-                               (entrylo1 & 2) ? 1 : 0, (entrylo1 & 1));
-                        printk("\n");
-                }
-        }
-        write_c0_entryhi(asid);
-}
-void dump_tlb_all(void)
-{
-        dump_tlb(0, current_cpu_data.tlbsize - 1);
-}
-void dump_tlb_wired(void)
-{
-        int wired;
-        wired = read_c0_wired();
-        printk("Wired: %d", wired);
-        dump_tlb(0, read_c0_wired());
-}
-void dump_tlb_addr(unsigned long addr)
-{
-        unsigned int flags, oldpid;
-        int index;
-        local_irq_save(flags);
-        oldpid = read_c0_entryhi() & 0xff;
-        BARRIER();
-        write_c0_entryhi((addr & PAGE_MASK) | oldpid);
-        BARRIER();
-        tlb_probe();
-        BARRIER();
-        index = read_c0_index();
-        write_c0_entryhi(oldpid);
-        local_irq_restore(flags);
-        if (index < 0) {
-                printk("No entry for address 0x%08lx in TLB\n", addr);
-                return;
-        }
-        printk("Entry %d maps address 0x%08lx\n", index, addr);
-        dump_tlb(index, index);
-}
-void dump_tlb_nonwired(void)
-{
-        dump_tlb(read_c0_wired(), current_cpu_data.tlbsize - 1);
-}
-void dump_list_process(struct task_struct *t, void *address)
-{
-        pgd_t *page_dir, *pgd;
-        pud_t *pud;
-        pmd_t *pmd;
-        pte_t *pte, page;
-        unsigned long addr, val;
-        addr = (unsigned long) address;
-        printk("Addr                 == %08lx\n", addr);
-        printk("task                 == %8p\n", t);
-        printk("task->mm             == %8p\n", t->mm);
-        //printk("tasks->mm.pgd        == %08x\n", (unsigned int) t->mm->pgd);
-        if (addr > KSEG0) {
-                page_dir = pgd_offset_k(0);
-                pgd = pgd_offset_k(addr);
-        } else if (t->mm) {
-                page_dir = pgd_offset(t->mm, 0);
-                pgd = pgd_offset(t->mm, addr);
-        } else {
-                printk("Current thread has no mm\n");
-                return;
-        }
-        printk("page_dir == %08x\n", (unsigned int) page_dir);
-        printk("pgd == %08x, ", (unsigned int) pgd);
-        pud = pud_offset(pgd, addr);
-        printk("pud == %08x, ", (unsigned int) pud);
-        pmd = pmd_offset(pud, addr);
-        printk("pmd == %08x, ", (unsigned int) pmd);
-        pte = pte_offset(pmd, addr);
-        printk("pte == %08x, ", (unsigned int) pte);
-        page = *pte;
-#ifdef CONFIG_64BIT_PHYS_ADDR
-        printk("page == %08Lx\n", pte_val(page));
-#else
-        printk("page == %08lx\n", pte_val(page));
-#endif
-        val = pte_val(page);
-        if (val & _PAGE_PRESENT)
-                printk("present ");
-        if (val & _PAGE_READ)
-                printk("read ");
-        if (val & _PAGE_WRITE)
-                printk("write ");
-        if (val & _PAGE_ACCESSED)
-                printk("accessed ");
-        if (val & _PAGE_MODIFIED)
-                printk("modified ");
-        if (val & _PAGE_R4KBUG)
-                printk("r4kbug ");
-        if (val & _PAGE_GLOBAL)
-                printk("global ");
-        if (val & _PAGE_VALID)
-                printk("valid ");
-        printk("\n");
-}
-void dump_list_current(void *address)
-{
-        dump_list_process(current, address);
-}
-unsigned int vtop(void *address)
-{
-        pgd_t *pgd;
-        pud_t *pud;
-        pmd_t *pmd;
-        pte_t *pte;
-        unsigned int addr, paddr;
-        addr = (unsigned long) address;
-        pgd = pgd_offset(current->mm, addr);
-        pud = pud_offset(pgd, addr);
-        pmd = pmd_offset(pud, addr);
-        pte = pte_offset(pmd, addr);
-        paddr = (KSEG1 | (unsigned int) pte_val(*pte)) & PAGE_MASK;
-        paddr |= (addr & ~PAGE_MASK);
-        return paddr;
-}
-void dump16(unsigned long *p)
-{
-        int i;
-        for (i = 0; i < 8; i++) {
-                printk("*%08lx == %08lx, ", (unsigned long) p, *p);
-                p++;
-                printk("*%08lx == %08lx\n", (unsigned long) p, *p);
-                p++;
-        }
-}
diff --git a/arch/mips/lib-32/r3k_dump_tlb.c b/arch/mips/lib-32/r3k_dump_tlb.c
deleted file mode 100644
index 4f2cb74f07..0000000000
--- a/arch/mips/lib-32/r3k_dump_tlb.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Dump R3000 TLB for debugging purposes.
- *
- * Copyright (C) 1994, 1995 by Waldorf Electronics, written by Ralf Baechle.
- * Copyright (C) 1999 by Silicon Graphics, Inc.
- * Copyright (C) 1999 by Harald Koerfgen
- */
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <asm/bootinfo.h>
-#include <asm/cachectl.h>
-#include <asm/cpu.h>
-#include <asm/mipsregs.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-extern int r3k_have_wired_reg;  /* defined in tlb-r3k.c */
-void dump_tlb(int first, int last)
-{
-        int     i;
-        unsigned int asid;
-        unsigned long entryhi, entrylo0;
-        asid = read_c0_entryhi() & 0xfc0;
-        for (i = first; i <= last; i++) {
-                write_c0_index(i<<8);
-                __asm__ __volatile__(
-                        ".set\tnoreorder\n\t"
-                        "tlbr\n\t"
-                        "nop\n\t"
-                        ".set\treorder");
-                entryhi  = read_c0_entryhi();
-                entrylo0 = read_c0_entrylo0();
-                /* Unused entries have a virtual address of KSEG0.  */
-                if ((entryhi & 0xffffe000) != 0x80000000
-                    && (entryhi & 0xfc0) == asid) {
-                        /*
-                         * Only print entries in use
-                         */
-                        printk("Index: %2d ", i);
-                        printk("va=%08lx asid=%08lx"
-                               "  [pa=%06lx n=%d d=%d v=%d g=%d]",
-                               (entryhi & 0xffffe000),
-                               entryhi & 0xfc0,
-                               entrylo0 & PAGE_MASK,
-                               (entrylo0 & (1 << 11)) ? 1 : 0,
-                               (entrylo0 & (1 << 10)) ? 1 : 0,
-                               (entrylo0 & (1 << 9)) ? 1 : 0,
-                               (entrylo0 & (1 << 8)) ? 1 : 0);
-                }
-        }
-        printk("\n");
-        write_c0_entryhi(asid);
-}
-void dump_tlb_all(void)
-{
-        dump_tlb(0, current_cpu_data.tlbsize - 1);
-}
-void dump_tlb_wired(void)
-{
-        int wired = r3k_have_wired_reg ? read_c0_wired() : 8;
-        printk("Wired: %d", wired);
-        dump_tlb(0, wired - 1);
-}
-void dump_tlb_addr(unsigned long addr)
-{
-        unsigned long flags, oldpid;
-        int index;
-        local_irq_save(flags);
-        oldpid = read_c0_entryhi() & 0xff;
-        write_c0_entryhi((addr & PAGE_MASK) | oldpid);
-        tlb_probe();
-        index = read_c0_index();
-        write_c0_entryhi(oldpid);
-        local_irq_restore(flags);
-        if (index < 0) {
-                printk("No entry for address 0x%08lx in TLB\n", addr);
-                return;
-        }
-        printk("Entry %d maps address 0x%08lx\n", index, addr);
-        dump_tlb(index, index);
-}
-void dump_tlb_nonwired(void)
-{
-        int wired = r3k_have_wired_reg ? read_c0_wired() : 8;
-        dump_tlb(wired, current_cpu_data.tlbsize - 1);
-}
-void dump_list_process(struct task_struct *t, void *address)
-{
-        pgd_t   *page_dir, *pgd;
-        pud_t   *pud;
-        pmd_t   *pmd;
-        pte_t   *pte, page;
-        unsigned int addr;
-        unsigned long val;
-        addr = (unsigned int) address;
-        printk("Addr                 == %08x\n", addr);
-        printk("tasks->mm.pgd        == %08x\n", (unsigned int) t->mm->pgd);
-        page_dir = pgd_offset(t->mm, 0);
-        printk("page_dir == %08x\n", (unsigned int) page_dir);
-        pgd = pgd_offset(t->mm, addr);
-        printk("pgd == %08x, ", (unsigned int) pgd);
-        pud = pud_offset(pgd, addr);
-        printk("pud == %08x, ", (unsigned int) pud);
-        pmd = pmd_offset(pud, addr);
-        printk("pmd == %08x, ", (unsigned int) pmd);
-        pte = pte_offset(pmd, addr);
-        printk("pte == %08x, ", (unsigned int) pte);
-        page = *pte;
-        printk("page == %08x\n", (unsigned int) pte_val(page));
-        val = pte_val(page);
-        if (val & _PAGE_PRESENT) printk("present ");
-        if (val & _PAGE_READ) printk("read ");
-        if (val & _PAGE_WRITE) printk("write ");
-        if (val & _PAGE_ACCESSED) printk("accessed ");
-        if (val & _PAGE_MODIFIED) printk("modified ");
-        if (val & _PAGE_GLOBAL) printk("global ");
-        if (val & _PAGE_VALID) printk("valid ");
-        printk("\n");
-}
-void dump_list_current(void *address)
-{
-        dump_list_process(current, address);
-}
-unsigned int vtop(void *address)
-{
-        pgd_t   *pgd;
-        pud_t   *pud;
-        pmd_t   *pmd;
-        pte_t   *pte;
-        unsigned int addr, paddr;
-        addr = (unsigned long) address;
-        pgd = pgd_offset(current->mm, addr);
-        pud = pud_offset(pgd, addr);
-        pmd = pmd_offset(pud, addr);
-        pte = pte_offset(pmd, addr);
-        paddr = (KSEG1 | (unsigned int) pte_val(*pte)) & PAGE_MASK;
-        paddr |= (addr & ~PAGE_MASK);
-        return paddr;
-}
-void dump16(unsigned long *p)
-{
-        int i;
-        for (i = 0; i < 8; i++) {
-                printk("*%08lx == %08lx, ", (unsigned long)p, *p);
-                p++;
-                printk("*%08lx == %08lx\n", (unsigned long)p, *p);
-                p++;
-        }
-}
diff --git a/arch/mips/lib-32/watch.S b/arch/mips/lib-32/watch.S
deleted file mode 100644
index 808b3af1a6..0000000000
--- a/arch/mips/lib-32/watch.S
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Kernel debug stuff to use the Watch registers.
- * Useful to find stack overflows, dangling pointers etc.
- *
- * Copyright (C) 1995, 1996, 1999 by Ralf Baechle
- */
-#include <asm/asm.h>
-#include <asm/mipsregs.h>
-#include <asm/regdef.h>
-                .set    noreorder
-/*
- * Parameter: a0 - logic address to watch
- *                 Currently only KSEG0 addresses are allowed!
- *            a1 - set bit #1 to trap on load references
- *                     bit #0 to trap on store references
- * Results  : none
- */
-                LEAF(__watch_set)
-                li      t0, 0x80000000
-                subu    a0, t0
-                ori     a0, 7
-                xori    a0, 7
-                or      a0, a1
-                mtc0    a0, CP0_WATCHLO
-                sw      a0, watch_savelo
-                jr      ra
-                 mtc0   zero, CP0_WATCHHI
-                END(__watch_set)
-/*
- * Parameter: none
- * Results  : none
- */
-                LEAF(__watch_clear)
-                jr      ra
-                 mtc0   zero, CP0_WATCHLO
-                END(__watch_clear)
-/*
- * Parameter: none
- * Results  : none
- */
-                LEAF(__watch_reenable)
-                lw      t0, watch_savelo
-                jr      ra
-                 mtc0   t0, CP0_WATCHLO
-                END(__watch_reenable)
-/*
- * Saved value of the c0_watchlo register for watch_reenable()
- */
-                .data
-watch_savelo:   .word   0
-                .text
diff --git a/arch/mips/lib-64/Makefile b/arch/mips/lib-64/Makefile
deleted file mode 100644
index 8b94d4cc5a..0000000000
--- a/arch/mips/lib-64/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Makefile for MIPS-specific library files..
-#
-lib-y   += watch.o
-obj-$(CONFIG_CPU_MIPS32)        += dump_tlb.o
-obj-$(CONFIG_CPU_MIPS64)        += dump_tlb.o
-obj-$(CONFIG_CPU_NEVADA)        += dump_tlb.o
-obj-$(CONFIG_CPU_R10000)        += dump_tlb.o
-obj-$(CONFIG_CPU_R3000)         += r3k_dump_tlb.o
-obj-$(CONFIG_CPU_R4300)         += dump_tlb.o
-obj-$(CONFIG_CPU_R4X00)         += dump_tlb.o
-obj-$(CONFIG_CPU_R5000)         += dump_tlb.o
-obj-$(CONFIG_CPU_R5432)         += dump_tlb.o
-obj-$(CONFIG_CPU_R6000)         +=
-obj-$(CONFIG_CPU_R8000)         +=
-obj-$(CONFIG_CPU_RM7000)        += dump_tlb.o
-obj-$(CONFIG_CPU_RM9000)        += dump_tlb.o
-obj-$(CONFIG_CPU_SB1)           += dump_tlb.o
-obj-$(CONFIG_CPU_TX39XX)        += r3k_dump_tlb.o
-obj-$(CONFIG_CPU_TX49XX)        += dump_tlb.o
-obj-$(CONFIG_CPU_VR41XX)        += dump_tlb.o
diff --git a/arch/mips/lib-64/dump_tlb.c b/arch/mips/lib-64/dump_tlb.c
deleted file mode 100644
index 594df1a05e..0000000000
--- a/arch/mips/lib-64/dump_tlb.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Dump R4x00 TLB for debugging purposes.
- *
- * Copyright (C) 1994, 1995 by Waldorf Electronics, written by Ralf Baechle.
- * Copyright (C) 1999 by Silicon Graphics, Inc.
- */
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <asm/bootinfo.h>
-#include <asm/cachectl.h>
-#include <asm/cpu.h>
-#include <asm/mipsregs.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-static inline const char *msk2str(unsigned int mask)
-{
-        switch (mask) {
-        case PM_4K:     return "4kb";
-        case PM_16K:    return "16kb";
-        case PM_64K:    return "64kb";
-        case PM_256K:   return "256kb";
-#ifndef CONFIG_CPU_VR41XX
-        case PM_1M:     return "1Mb";
-        case PM_4M:     return "4Mb";
-        case PM_16M:    return "16Mb";
-        case PM_64M:    return "64Mb";
-        case PM_256M:   return "256Mb";
-#endif
-        }
-        return "unknown";
-}
-#define BARRIER()                                       \
-        __asm__ __volatile__(                           \
-                ".set\tnoreorder\n\t"                   \
-                "nop;nop;nop;nop;nop;nop;nop\n\t"       \
-                ".set\treorder");
-void dump_tlb(int first, int last)
-{
-        unsigned long s_entryhi, entryhi, entrylo0, entrylo1, asid;
-        unsigned int s_index, pagemask, c0, c1, i;
-        s_entryhi = read_c0_entryhi();
-        s_index = read_c0_index();
-        asid = s_entryhi & 0xff;
-        for (i = first; i <= last; i++) {
-                write_c0_index(i);
-                BARRIER();
-                tlb_read();
-                BARRIER();
-                pagemask = read_c0_pagemask();
-                entryhi  = read_c0_entryhi();
-                entrylo0 = read_c0_entrylo0();
-                entrylo1 = read_c0_entrylo1();
-                /* Unused entries have a virtual address of CKSEG0.  */
-                if ((entryhi & ~0x1ffffUL) != CKSEG0
-                    && (entryhi & 0xff) == asid) {
-                        /*
-                         * Only print entries in use
-                         */
-                        printk("Index: %2d pgmask=%s ", i, msk2str(pagemask));
-                        c0 = (entrylo0 >> 3) & 7;
-                        c1 = (entrylo1 >> 3) & 7;
-                        printk("va=%011lx asid=%02lx\n",
-                               (entryhi & ~0x1fffUL),
-                               entryhi & 0xff);
-                        printk("\t[pa=%011lx c=%d d=%d v=%d g=%ld] ",
-                               (entrylo0 << 6) & PAGE_MASK, c0,
-                               (entrylo0 & 4) ? 1 : 0,
-                               (entrylo0 & 2) ? 1 : 0,
-                               (entrylo0 & 1));
-                        printk("[pa=%011lx c=%d d=%d v=%d g=%ld]\n",
-                               (entrylo1 << 6) & PAGE_MASK, c1,
-                               (entrylo1 & 4) ? 1 : 0,
-                               (entrylo1 & 2) ? 1 : 0,
-                               (entrylo1 & 1));
-                }
-        }
-        printk("\n");
-        write_c0_entryhi(s_entryhi);
-        write_c0_index(s_index);
-}
-void dump_tlb_all(void)
-{
-        dump_tlb(0, current_cpu_data.tlbsize - 1);
-}
-void dump_tlb_wired(void)
-{
-        int     wired;
-        wired = read_c0_wired();
-        printk("Wired: %d", wired);
-        dump_tlb(0, read_c0_wired());
-}
-void dump_tlb_addr(unsigned long addr)
-{
-        unsigned int flags, oldpid;
-        int index;
-        local_irq_save(flags);
-        oldpid = read_c0_entryhi() & 0xff;
-        BARRIER();
-        write_c0_entryhi((addr & PAGE_MASK) | oldpid);
-        BARRIER();
-        tlb_probe();
-        BARRIER();
-        index = read_c0_index();
-        write_c0_entryhi(oldpid);
-        local_irq_restore(flags);
-        if (index < 0) {
-                printk("No entry for address 0x%08lx in TLB\n", addr);
-                return;
-        }
-        printk("Entry %d maps address 0x%08lx\n", index, addr);
-        dump_tlb(index, index);
-}
-void dump_tlb_nonwired(void)
-{
-        dump_tlb(read_c0_wired(), current_cpu_data.tlbsize - 1);
-}
-void dump_list_process(struct task_struct *t, void *address)
-{
-        pgd_t   *page_dir, *pgd;
-        pud_t   *pud;
-        pmd_t   *pmd;
-        pte_t   *pte, page;
-        unsigned long addr, val;
-        addr = (unsigned long) address;
-        printk("Addr                 == %08lx\n", addr);
-        printk("tasks->mm.pgd        == %08lx\n", (unsigned long) t->mm->pgd);
-        page_dir = pgd_offset(t->mm, 0UL);
-        printk("page_dir == %016lx\n", (unsigned long) page_dir);
-        pgd = pgd_offset(t->mm, addr);
-        printk("pgd == %016lx\n", (unsigned long) pgd);
-        pud = pud_offset(pgd, addr);
-        printk("pud == %016lx\n", (unsigned long) pud);
-        pmd = pmd_offset(pud, addr);
-        printk("pmd == %016lx\n", (unsigned long) pmd);
-        pte = pte_offset(pmd, addr);
-        printk("pte == %016lx\n", (unsigned long) pte);
-        page = *pte;
-        printk("page == %08lx\n", pte_val(page));
-        val = pte_val(page);
-        if (val & _PAGE_PRESENT) printk("present ");
-        if (val & _PAGE_READ) printk("read ");
-        if (val & _PAGE_WRITE) printk("write ");
-        if (val & _PAGE_ACCESSED) printk("accessed ");
-        if (val & _PAGE_MODIFIED) printk("modified ");
-        if (val & _PAGE_R4KBUG) printk("r4kbug ");
-        if (val & _PAGE_GLOBAL) printk("global ");
-        if (val & _PAGE_VALID) printk("valid ");
-        printk("\n");
-}
-void dump_list_current(void *address)
-{
-        dump_list_process(current, address);
-}
-unsigned long vtop(void *address)
-{
-        pgd_t   *pgd;
-        pud_t   *pud;
-        pmd_t   *pmd;
-        pte_t   *pte;
-        unsigned long addr, paddr;
-        addr = (unsigned long) address;
-        pgd = pgd_offset(current->mm, addr);
-        pud = pud_offset(pgd, addr);
-        pmd = pmd_offset(pud, addr);
-        pte = pte_offset(pmd, addr);
-        paddr = (CKSEG1 | (unsigned int) pte_val(*pte)) & PAGE_MASK;
-        paddr |= (addr & ~PAGE_MASK);
-        return paddr;
-}
-void dump16(unsigned long *p)
-{
-        int i;
-        for (i = 0; i < 8; i++) {
-                printk("*%08lx == %08lx, ", (unsigned long)p, *p);
-                p++;
-                printk("*%08lx == %08lx\n", (unsigned long)p, *p);
-                p++;
-        }
-}
diff --git a/arch/mips/lib-64/watch.S b/arch/mips/lib-64/watch.S
deleted file mode 100644
index f914340136..0000000000
--- a/arch/mips/lib-64/watch.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Kernel debug stuff to use the Watch registers.
- * Useful to find stack overflows, dangling pointers etc.
- *
- * Copyright (C) 1995, 1996, 1999, 2001 by Ralf Baechle
- */
-#include <asm/asm.h>
-#include <asm/mipsregs.h>
-#include <asm/regdef.h>
-                .set    noreorder
-/*
- * Parameter: a0 - physical address to watch
- *            a1 - set bit #1 to trap on load references
- *                     bit #0 to trap on store references
- * Results  : none
- */
-                LEAF(__watch_set)
-                ori     a0, 7
-                xori    a0, 7
-                or      a0, a1
-                mtc0    a0, CP0_WATCHLO
-                sd      a0, watch_savelo
-                dsrl32  a0, a0, 0
-                jr      ra
-                 mtc0   zero, CP0_WATCHHI
-                END(__watch_set)
-/*
- * Parameter: none
- * Results  : none
- */
-                LEAF(__watch_clear)
-                jr      ra
-                 mtc0   zero, CP0_WATCHLO
-                END(__watch_clear)
-/*
- * Parameter: none
- * Results  : none
- */
-                LEAF(__watch_reenable)
-                ld      t0, watch_savelo
-                jr      ra
-                 mtc0   t0, CP0_WATCHLO
-                END(__watch_reenable)
-/*
- * Saved value of the c0_watchlo register for watch_reenable()
- */
-                .local  watch_savelo
-                .comm   watch_savelo, 8, 8
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index 5dad13efba..91ed1eb331 100644
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -8,5 +8,24 @@ lib-y	+= csum_partial.o memcpy.o memcpy-inatomic.o memset.o strlen_user.o \
 obj-y                   += iomap.o
 obj-$(CONFIG_PCI)       += iomap-pci.o
+obj-$(CONFIG_CPU_LOONGSON2)     += dump_tlb.o
+obj-$(CONFIG_CPU_MIPS32)        += dump_tlb.o
+obj-$(CONFIG_CPU_MIPS64)        += dump_tlb.o
+obj-$(CONFIG_CPU_NEVADA)        += dump_tlb.o
+obj-$(CONFIG_CPU_R10000)        += dump_tlb.o
+obj-$(CONFIG_CPU_R3000)         += r3k_dump_tlb.o
+obj-$(CONFIG_CPU_R4300)         += dump_tlb.o
+obj-$(CONFIG_CPU_R4X00)         += dump_tlb.o
+obj-$(CONFIG_CPU_R5000)         += dump_tlb.o
+obj-$(CONFIG_CPU_R5432)         += dump_tlb.o
+obj-$(CONFIG_CPU_R6000)         +=
+obj-$(CONFIG_CPU_R8000)         +=
+obj-$(CONFIG_CPU_RM7000)        += dump_tlb.o
+obj-$(CONFIG_CPU_RM9000)        += dump_tlb.o
+obj-$(CONFIG_CPU_SB1)           += dump_tlb.o
+obj-$(CONFIG_CPU_TX39XX)        += r3k_dump_tlb.o
+obj-$(CONFIG_CPU_TX49XX)        += dump_tlb.o
+obj-$(CONFIG_CPU_VR41XX)        += dump_tlb.o
 # libgcc-style stuff needed in the kernel
-lib-y += ashldi3.o ashrdi3.o lshrdi3.o ucmpdi2.o
+obj-y += ashldi3.o ashrdi3.o lshrdi3.o ucmpdi2.o
diff --git a/arch/mips/lib/dump_tlb.c b/arch/mips/lib/dump_tlb.c
new file mode 100644
index 0000000000..465ff0ec85
--- /dev/null
+++ b/arch/mips/lib/dump_tlb.c
@@ -0,0 +1,101 @@
+/*
+ * Dump R4x00 TLB for debugging purposes.
+ *
+ * Copyright (C) 1994, 1995 by Waldorf Electronics, written by Ralf Baechle.
+ * Copyright (C) 1999 by Silicon Graphics, Inc.
+ */
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <asm/mipsregs.h>
+#include <asm/page.h>
+#include <asm/pgtable.h>
+#include <asm/tlbdebug.h>
+static inline const char *msk2str(unsigned int mask)
+{
+        switch (mask) {
+        case PM_4K:     return "4kb";
+        case PM_16K:    return "16kb";
+        case PM_64K:    return "64kb";
+        case PM_256K:   return "256kb";
+#ifndef CONFIG_CPU_VR41XX
+        case PM_1M:     return "1Mb";
+        case PM_4M:     return "4Mb";
+        case PM_16M:    return "16Mb";
+        case PM_64M:    return "64Mb";
+        case PM_256M:   return "256Mb";
+#endif
+        }
+        return "";
+}
+#define BARRIER()                                       \
+        __asm__ __volatile__(                           \
+                ".set\tnoreorder\n\t"                   \
+                "nop;nop;nop;nop;nop;nop;nop\n\t"       \
+                ".set\treorder");
+static void dump_tlb(int first, int last)
+{
+        unsigned long s_entryhi, entryhi, asid;
+        unsigned long long entrylo0, entrylo1;
+        unsigned int s_index, pagemask, c0, c1, i;
+        s_entryhi = read_c0_entryhi();
+        s_index = read_c0_index();
+        asid = s_entryhi & 0xff;
+        for (i = first; i <= last; i++) {
+                write_c0_index(i);
+                BARRIER();
+                tlb_read();
+                BARRIER();
+                pagemask = read_c0_pagemask();
+                entryhi  = read_c0_entryhi();
+                entrylo0 = read_c0_entrylo0();
+                entrylo1 = read_c0_entrylo1();
+                /* Unused entries have a virtual address of CKSEG0.  */
+                if ((entryhi & ~0x1ffffUL) != CKSEG0
+                    && (entryhi & 0xff) == asid) {
+#ifdef CONFIG_32BIT
+                        int width = 8;
+#else
+                        int width = 11;
+#endif
+                        /*
+                         * Only print entries in use
+                         */
+                        printk("Index: %2d pgmask=%s ", i, msk2str(pagemask));
+                        c0 = (entrylo0 >> 3) & 7;
+                        c1 = (entrylo1 >> 3) & 7;
+                        printk("va=%0*lx asid=%02lx\n",
+                               width, (entryhi & ~0x1fffUL),
+                               entryhi & 0xff);
+                        printk("\t[pa=%0*llx c=%d d=%d v=%d g=%d] ",
+                               width,
+                               (entrylo0 << 6) & PAGE_MASK, c0,
+                               (entrylo0 & 4) ? 1 : 0,
+                               (entrylo0 & 2) ? 1 : 0,
+                               (entrylo0 & 1) ? 1 : 0);
+                        printk("[pa=%0*llx c=%d d=%d v=%d g=%d]\n",
+                               width,
+                               (entrylo1 << 6) & PAGE_MASK, c1,
+                               (entrylo1 & 4) ? 1 : 0,
+                               (entrylo1 & 2) ? 1 : 0,
+                               (entrylo1 & 1) ? 1 : 0);
+                }
+        }
+        printk("\n");
+        write_c0_entryhi(s_entryhi);
+        write_c0_index(s_index);
+}
+void dump_tlb_all(void)
+{
+        dump_tlb(0, current_cpu_data.tlbsize - 1);
+}
diff --git a/arch/mips/lib/r3k_dump_tlb.c b/arch/mips/lib/r3k_dump_tlb.c
new file mode 100644
index 0000000000..9cee907975
--- /dev/null
+++ b/arch/mips/lib/r3k_dump_tlb.c
@@ -0,0 +1,63 @@
+/*
+ * Dump R3000 TLB for debugging purposes.
+ *
+ * Copyright (C) 1994, 1995 by Waldorf Electronics, written by Ralf Baechle.
+ * Copyright (C) 1999 by Silicon Graphics, Inc.
+ * Copyright (C) 1999 by Harald Koerfgen
+ */
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <asm/mipsregs.h>
+#include <asm/page.h>
+#include <asm/pgtable.h>
+#include <asm/tlbdebug.h>
+extern int r3k_have_wired_reg;  /* defined in tlb-r3k.c */
+static void dump_tlb(int first, int last)
+{
+        int     i;
+        unsigned int asid;
+        unsigned long entryhi, entrylo0;
+        asid = read_c0_entryhi() & 0xfc0;
+        for (i = first; i <= last; i++) {
+                write_c0_index(i<<8);
+                __asm__ __volatile__(
+                        ".set\tnoreorder\n\t"
+                        "tlbr\n\t"
+                        "nop\n\t"
+                        ".set\treorder");
+                entryhi  = read_c0_entryhi();
+                entrylo0 = read_c0_entrylo0();
+                /* Unused entries have a virtual address of KSEG0.  */
+                if ((entryhi & 0xffffe000) != 0x80000000
+                    && (entryhi & 0xfc0) == asid) {
+                        /*
+                         * Only print entries in use
+                         */
+                        printk("Index: %2d ", i);
+                        printk("va=%08lx asid=%08lx"
+                               "  [pa=%06lx n=%d d=%d v=%d g=%d]",
+                               (entryhi & 0xffffe000),
+                               entryhi & 0xfc0,
+                               entrylo0 & PAGE_MASK,
+                               (entrylo0 & (1 << 11)) ? 1 : 0,
+                               (entrylo0 & (1 << 10)) ? 1 : 0,
+                               (entrylo0 & (1 << 9)) ? 1 : 0,
+                               (entrylo0 & (1 << 8)) ? 1 : 0);
+                }
+        }
+        printk("\n");
+        write_c0_entryhi(asid);
+}
+void dump_tlb_all(void)
+{
+        dump_tlb(0, current_cpu_data.tlbsize - 1);
+}
diff --git a/arch/mips/lib/ucmpdi2.c b/arch/mips/lib/ucmpdi2.c
index e9ff258ef0..e2ff6072b5 100644
--- a/arch/mips/lib/ucmpdi2.c
+++ b/arch/mips/lib/ucmpdi2.c
@@ -2,7 +2,7 @@
 #include "libgcc.h"
-word_type __ucmpdi2 (unsigned long a, unsigned long b)
+word_type __ucmpdi2 (unsigned long long a, unsigned long long b)
 {
        const DWunion au = {.ll = a};
        const DWunion bu = {.ll = b};
diff --git a/arch/mips/lib/uncached.c b/arch/mips/lib/uncached.c
index 2388f7f3ff..58d14f4d93 100644
--- a/arch/mips/lib/uncached.c
+++ b/arch/mips/lib/uncached.c
@@ -12,6 +12,7 @@
 #include <asm/addrspace.h>
 #include <asm/bug.h>
+#include <asm/cacheflush.h>
 #ifndef CKSEG2
 #define CKSEG2 CKSSEG
diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
index 80531b35cd..17419e11ec 100644
--- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c
@@ -35,6 +35,7 @@
 * better performance by compiling with -msoft-float!
 */
 #include <linux/sched.h>
+#include <linux/debugfs.h>
 #include <asm/inst.h>
 #include <asm/bootinfo.h>
@@ -204,7 +205,7 @@ static int isBranchInstr(mips_instruction * i)
 static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx)
 {
        mips_instruction ir;
-        void * emulpc, *contpc;
+        unsigned long emulpc, contpc;
        unsigned int cond;
        if (get_user(ir, (mips_instruction __user *) xcp->cp0_epc)) {
@@ -229,7 +230,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx)
                 * Linux MIPS branch emulator operates on context, updating the
                 * cp0_epc.
                 */
-                emulpc = (void *) (xcp->cp0_epc + 4);   /* Snapshot emulation target */
+                emulpc = xcp->cp0_epc + 4;      /* Snapshot emulation target */
                if (__compute_return_epc(xcp)) {
 #ifdef CP1DBG
@@ -243,12 +244,12 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx)
                        return SIGBUS;
                }
                /* __compute_return_epc() will have updated cp0_epc */
-                contpc = (void *)  xcp->cp0_epc;
+                contpc = xcp->cp0_epc;
                /* In order not to confuse ptrace() et al, tweak context */
-                xcp->cp0_epc = (unsigned long) emulpc - 4;
+                xcp->cp0_epc = emulpc - 4;
        } else {
-                emulpc = (void *)  xcp->cp0_epc;
+                emulpc = xcp->cp0_epc;
-                contpc = (void *) (xcp->cp0_epc + 4);
+                contpc = xcp->cp0_epc + 4;
        }
      emul:
@@ -426,8 +427,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx)
                                 * instruction
                                 */
                                xcp->cp0_epc += 4;
-                                contpc = (void *)
+                                contpc = (xcp->cp0_epc +
-                                        (xcp->cp0_epc +
                                        (MIPSInst_SIMM(ir) << 2));
                                if (get_user(ir,
@@ -461,7 +461,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx)
                                 * Single step the non-cp1
                                 * instruction in the dslot
                                 */
-                                return mips_dsemul(xcp, ir, (unsigned long) contpc);
+                                return mips_dsemul(xcp, ir, contpc);
                        }
                        else {
                                /* branch not taken */
@@ -520,7 +520,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx)
        }
        /* we did it !! */
-        xcp->cp0_epc = (unsigned long) contpc;
+        xcp->cp0_epc = contpc;
        xcp->cp0_cause &= ~CAUSEF_BD;
        return 0;
@@ -1277,3 +1277,36 @@ int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
        return sig;
 }
+#ifdef CONFIG_DEBUG_FS
+extern struct dentry *mips_debugfs_dir;
+static int __init debugfs_fpuemu(void)
+{
+        struct dentry *d, *dir;
+        int i;
+        static struct {
+                const char *name;
+                unsigned int *v;
+        } vars[] __initdata = {
+                { "emulated", &fpuemustats.emulated },
+                { "loads",    &fpuemustats.loads },
+                { "stores",   &fpuemustats.stores },
+                { "cp1ops",   &fpuemustats.cp1ops },
+                { "cp1xops",  &fpuemustats.cp1xops },
+                { "errors",   &fpuemustats.errors },
+        };
+        if (!mips_debugfs_dir)
+                return -ENODEV;
+        dir = debugfs_create_dir("fpuemustats", mips_debugfs_dir);
+        if (IS_ERR(dir))
+                return PTR_ERR(dir);
+        for (i = 0; i < ARRAY_SIZE(vars); i++) {
+                d = debugfs_create_u32(vars[i].name, S_IRUGO, dir, vars[i].v);
+                if (IS_ERR(d))
+                        return PTR_ERR(d);
+        }
+        return 0;
+}
+__initcall(debugfs_fpuemu);
+#endif
diff --git a/arch/mips/math-emu/dsemul.c b/arch/mips/math-emu/dsemul.c
index ea6ba72484..653e325849 100644
--- a/arch/mips/math-emu/dsemul.c
+++ b/arch/mips/math-emu/dsemul.c
@@ -54,8 +54,7 @@ struct emuframe {
 int mips_dsemul(struct pt_regs *regs, mips_instruction ir, unsigned long cpc)
 {
        extern asmlinkage void handle_dsemulret(void);
-        mips_instruction *dsemul_insns;
+        struct emuframe __user *fr;
-        struct emuframe *fr;
        int err;
        if (ir == 0) {          /* a nop is easy */
@@ -87,8 +86,8 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir, unsigned long cpc)
         */
        /* Ensure that the two instructions are in the same cache line */
-        dsemul_insns = (mips_instruction *) ((regs->regs[29] - sizeof(struct emuframe)) & ~0x7);
+        fr = (struct emuframe __user *)
-        fr = (struct emuframe *) dsemul_insns;
+                ((regs->regs[29] - sizeof(struct emuframe)) & ~0x7);
        /* Verify that the stack pointer is not competely insane */
        if (unlikely(!access_ok(VERIFY_WRITE, fr, sizeof(struct emuframe))))
@@ -113,12 +112,13 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir, unsigned long cpc)
 int do_dsemulret(struct pt_regs *xcp)
 {
-        struct emuframe *fr;
+        struct emuframe __user *fr;
        unsigned long epc;
        u32 insn, cookie;
        int err = 0;
-        fr = (struct emuframe *) (xcp->cp0_epc - sizeof(mips_instruction));
+        fr = (struct emuframe __user *)
+                (xcp->cp0_epc - sizeof(mips_instruction));
        /*
         * If we can't even access the area, something is very wrong, but we'll
diff --git a/arch/mips/mips-boards/atlas/atlas_setup.c b/arch/mips/mips-boards/atlas/atlas_setup.c
index 1cc6ebbedf..c68358a476 100644
--- a/arch/mips/mips-boards/atlas/atlas_setup.c
+++ b/arch/mips/mips-boards/atlas/atlas_setup.c
@@ -22,6 +22,7 @@
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <asm/cpu.h>
 #include <asm/bootinfo.h>
diff --git a/arch/mips/mips-boards/malta/Makefile b/arch/mips/mips-boards/malta/Makefile
index 377d9e8f25..a242b0fc37 100644
--- a/arch/mips/mips-boards/malta/Makefile
+++ b/arch/mips/mips-boards/malta/Makefile
@@ -19,6 +19,7 @@
 # under Linux.
 #
-obj-y := malta_int.o malta_setup.o
+obj-y := malta_int.o malta_platform.o malta_setup.o
 obj-$(CONFIG_MTD) += malta_mtd.o
 obj-$(CONFIG_MIPS_MT_SMTC) += malta_smtc.o
diff --git a/arch/mips/mips-boards/malta/malta_platform.c b/arch/mips/mips-boards/malta/malta_platform.c
new file mode 100644
index 0000000000..83b9bab3cd
--- /dev/null
+++ b/arch/mips/mips-boards/malta/malta_platform.c
@@ -0,0 +1,65 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2007 MIPS Technologies, Inc.
+ *   written by Ralf Baechle (ralf@linux-mips.org)
+ *
+ * Probe driver for the Malta's UART ports:
+ *
+ *   o 2 ports in the SMC SuperIO
+ *   o 1 port in the CBUS UART, a discrete 16550 which normally is only used
+ *     for bringups.
+ *
+ * We don't use 8250_platform.c on Malta as it would result in the CBUS
+ * UART becoming ttyS0.
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/serial_8250.h>
+#define SMC_PORT(base, int)                                             \
+{                                                                       \
+        .iobase         = base,                                         \
+        .irq            = int,                                          \
+        .uartclk        = 1843200,                                      \
+        .iotype         = UPIO_PORT,                                    \
+        .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,            \
+        .regshift       = 0,                                            \
+}
+#define CBUS_UART_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP)
+static struct plat_serial8250_port uart8250_data[] = {
+        SMC_PORT(0x3F8, 4),
+        SMC_PORT(0x2F8, 3),
+        {
+                .mapbase        = 0x1f000900,   /* The CBUS UART */
+                .irq            = MIPS_CPU_IRQ_BASE + 2,
+                .uartclk        = 3686400,      /* Twice the usual clk! */
+                .iotype         = UPIO_MEM32,
+                .flags          = CBUS_UART_FLAGS,
+                .regshift       = 3,
+        },
+        { },
+};
+static struct platform_device uart8250_device = {
+        .name                   = "serial8250",
+        .id                     = PLAT8250_DEV_PLATFORM2,
+        .dev                    = {
+                .platform_data  = uart8250_data,
+        },
+};
+static int __init uart8250_init(void)
+{
+        return platform_device_register(&uart8250_device);
+}
+module_init(uart8250_init);
+MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("8250 UART probe driver for the Malta CBUS UART");
diff --git a/arch/mips/mips-boards/sead/sead_setup.c b/arch/mips/mips-boards/sead/sead_setup.c
index bb801409d3..5f70eaf01f 100644
--- a/arch/mips/mips-boards/sead/sead_setup.c
+++ b/arch/mips/mips-boards/sead/sead_setup.c
@@ -23,6 +23,7 @@
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <asm/cpu.h>
 #include <asm/bootinfo.h>
diff --git a/arch/mips/mips-boards/sim/Makefile b/arch/mips/mipssim/Makefile
index dc0bfda114..dc0bfda114 100644
--- a/arch/mips/mips-boards/sim/Makefile
+++ b/arch/mips/mipssim/Makefile
diff --git a/arch/mips/mips-boards/sim/sim_cmdline.c b/arch/mips/mipssim/sim_cmdline.c
index c63021a5dc..c63021a5dc 100644
--- a/arch/mips/mips-boards/sim/sim_cmdline.c
+++ b/arch/mips/mipssim/sim_cmdline.c
diff --git a/arch/mips/mips-boards/sim/sim_console.c b/arch/mips/mipssim/sim_console.c
index de595a9ccb..a2f41672cd 100644
--- a/arch/mips/mips-boards/sim/sim_console.c
+++ b/arch/mips/mipssim/sim_console.c
@@ -18,8 +18,8 @@
 *   written by Ralf Baechle
 */
 #include <linux/init.h>
+#include <linux/io.h>
 #include <linux/serial_reg.h>
-#include <asm/io.h>
 static inline unsigned int serial_in(int offset)
 {
diff --git a/arch/mips/mipssim/sim_int.c b/arch/mips/mipssim/sim_int.c
new file mode 100644
index 0000000000..5cbc3509ab
--- /dev/null
+++ b/arch/mips/mipssim/sim_int.c
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 1999, 2005 MIPS Technologies, Inc.  All rights reserved.
+ *
+ *  This program is free software; you can distribute it and/or modify it
+ *  under the terms of the GNU General Public License (Version 2) as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ *
+ */
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/kernel_stat.h>
+#include <asm/mips-boards/simint.h>
+#include <asm/irq_cpu.h>
+static inline int clz(unsigned long x)
+{
+        __asm__ (
+        "       .set    push                                    \n"
+        "       .set    mips32                                  \n"
+        "       clz     %0, %1                                  \n"
+        "       .set    pop                                     \n"
+        : "=r" (x)
+        : "r" (x));
+        return x;
+}
+/*
+ * Version of ffs that only looks at bits 12..15.
+ */
+static inline unsigned int irq_ffs(unsigned int pending)
+{
+#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64)
+        return -clz(pending) + 31 - CAUSEB_IP;
+#else
+        unsigned int a0 = 7;
+        unsigned int t0;
+        t0 = s0 & 0xf000;
+        t0 = t0 < 1;
+        t0 = t0 << 2;
+        a0 = a0 - t0;
+        s0 = s0 << t0;
+        t0 = s0 & 0xc000;
+        t0 = t0 < 1;
+        t0 = t0 << 1;
+        a0 = a0 - t0;
+        s0 = s0 << t0;
+        t0 = s0 & 0x8000;
+        t0 = t0 < 1;
+        /* t0 = t0 << 2; */
+        a0 = a0 - t0;
+        /* s0 = s0 << t0; */
+        return a0;
+#endif
+}
+asmlinkage void plat_irq_dispatch(void)
+{
+        unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM;
+        int irq;
+        irq = irq_ffs(pending);
+        if (irq > 0)
+                do_IRQ(MIPS_CPU_IRQ_BASE + irq);
+        else
+                spurious_interrupt();
+}
+void __init arch_init_irq(void)
+{
+        mips_cpu_irq_init();
+}
diff --git a/arch/mips/mips-boards/sim/sim_mem.c b/arch/mips/mipssim/sim_mem.c
index e408ef0bcd..2312483eb8 100644
--- a/arch/mips/mips-boards/sim/sim_mem.c
+++ b/arch/mips/mipssim/sim_mem.c
@@ -95,7 +95,7 @@ void __init prom_meminit(void)
                size = p->size;
                add_memory_region(base, size, type);
-                p++;
+                p++;
        }
 }
diff --git a/arch/mips/mips-boards/sim/sim_platform.c b/arch/mips/mipssim/sim_platform.c
index 53210a8c5d..53210a8c5d 100644
--- a/arch/mips/mips-boards/sim/sim_platform.c
+++ b/arch/mips/mipssim/sim_platform.c
diff --git a/arch/mips/mips-boards/sim/sim_setup.c b/arch/mips/mipssim/sim_setup.c
index b705f09e57..17819b5941 100644
--- a/arch/mips/mips-boards/sim/sim_setup.c
+++ b/arch/mips/mipssim/sim_setup.c
@@ -19,18 +19,19 @@
 #include <linux/init.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
+#include <linux/io.h>
+#include <linux/irq.h>
 #include <linux/ioport.h>
+#include <linux/serial.h>
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <asm/cpu.h>
 #include <asm/bootinfo.h>
-#include <asm/irq.h>
 #include <asm/mips-boards/generic.h>
 #include <asm/mips-boards/prom.h>
-#include <asm/serial.h>
-#include <asm/io.h>
 #include <asm/time.h>
 #include <asm/mips-boards/sim.h>
 #include <asm/mips-boards/simint.h>
@@ -62,7 +63,7 @@ void __init plat_mem_setup(void)
 #endif
 }
-void prom_init(void)
+void __init prom_init(void)
 {
        set_io_port_base(0xbfd00000);
@@ -84,7 +85,7 @@ static void __init serial_init(void)
        /* hardware int 4 - the serial int, is CPU int 6
         but poll for now */
        s.irq =  0;
-        s.uartclk = BASE_BAUD * 16;
+        s.uartclk = 1843200;
        s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
        s.iotype = UPIO_PORT;
        s.regshift = 0;
diff --git a/arch/mips/mips-boards/sim/sim_smp.c b/arch/mips/mipssim/sim_smp.c
index cb47863ecf..38fa807b99 100644
--- a/arch/mips/mips-boards/sim/sim_smp.c
+++ b/arch/mips/mipssim/sim_smp.c
@@ -22,13 +22,13 @@
 #include <linux/sched.h>
 #include <linux/cpumask.h>
 #include <linux/interrupt.h>
+#include <linux/smp.h>
 #include <asm/atomic.h>
 #include <asm/cpu.h>
 #include <asm/processor.h>
 #include <asm/system.h>
-#include <asm/hardirq.h>
 #include <asm/mmu_context.h>
-#include <asm/smp.h>
 #ifdef CONFIG_MIPS_MT_SMTC
 #include <asm/smtc_ipi.h>
 #endif /* CONFIG_MIPS_MT_SMTC */
@@ -73,11 +73,19 @@ void prom_init_secondary(void)
 #endif /* CONFIG_MIPS_MT_SMTC */
 }
+void plat_smp_setup(void)
+{
+#ifdef CONFIG_MIPS_MT_SMTC
+        if (read_c0_config3() & (1 << 2))
+                mipsmt_build_cpu_map(0);
+#endif /* CONFIG_MIPS_MT_SMTC */
+}
 /*
 * Platform SMP pre-initialization
 */
-void prom_prepare_cpus(unsigned int max_cpus)
+void plat_prepare_cpus(unsigned int max_cpus)
 {
 #ifdef CONFIG_MIPS_MT_SMTC
        /*
@@ -85,8 +93,8 @@ void prom_prepare_cpus(unsigned int max_cpus)
         * but it may be multithreaded.
         */
-        if (read_c0_config3() & (1<<2)) {
+        if (read_c0_config3() & (1 << 2)) {
-                mipsmt_prepare_cpus(max_cpus);
+                mipsmt_prepare_cpus();
        }
 #endif /* CONFIG_MIPS_MT_SMTC */
 }
diff --git a/arch/mips/mips-boards/sim/sim_time.c b/arch/mips/mipssim/sim_time.c
index 7224ffe31d..a0f5a5dca1 100644
--- a/arch/mips/mips-boards/sim/sim_time.c
+++ b/arch/mips/mipssim/sim_time.c
@@ -5,10 +5,9 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/mc146818rtc.h>
+#include <linux/smp.h>
 #include <linux/timex.h>
-#include <asm/mipsregs.h>
-#include <asm/ptrace.h>
 #include <asm/hardirq.h>
 #include <asm/div64.h>
 #include <asm/cpu.h>
@@ -16,7 +15,6 @@
 #include <asm/irq.h>
 #include <asm/mc146818-time.h>
 #include <asm/msc01_ic.h>
-#include <asm/smp.h>
 #include <asm/mips-boards/generic.h>
 #include <asm/mips-boards/prom.h>
@@ -37,8 +35,7 @@ irqreturn_t sim_timer_interrupt(int irq, void *dev_id)
 #ifndef CONFIG_MIPS_MT_SMTC
        if (cpu == 0) {
                timer_interrupt(irq, dev_id);
-        }
+        } else {
-        else {
                /* Everyone else needs to reset the timer int here as
                   ll_local_timer_interrupt doesn't */
                /*
@@ -76,8 +73,10 @@ irqreturn_t sim_timer_interrupt(int irq, void *dev_id)
        irq_enable_hazard();
        evpe(vpflags);
-        if(cpu_data[cpu].vpe_id == 0) timer_interrupt(irq, dev_id);
+        if (cpu_data[cpu].vpe_id == 0)
-        else write_c0_compare (read_c0_count() + ( mips_hpt_frequency/HZ));
+                timer_interrupt(irq, dev_id);
+        else
+                write_c0_compare (read_c0_count() + ( mips_hpt_frequency/HZ));
        smtc_timer_broadcast(cpu_data[cpu].vpe_id);
 #endif /* CONFIG_MIPS_MT_SMTC */
@@ -85,7 +84,8 @@ irqreturn_t sim_timer_interrupt(int irq, void *dev_id)
        /*
         * every CPU should do profiling and process accounting
         */
-        local_timer_interrupt (irq, dev_id);
+        local_timer_interrupt (irq, dev_id);
        return IRQ_HANDLED;
 #else
        return timer_interrupt (irq, dev_id);
@@ -152,17 +152,15 @@ void __init sim_time_init(void)
        local_irq_save(flags);
+        /* Set Data mode - binary. */
-        /* Set Data mode - binary. */
        CMOS_WRITE(CMOS_READ(RTC_CONTROL) | RTC_DM_BINARY, RTC_CONTROL);
        est_freq = estimate_cpu_frequency ();
-        printk("CPU frequency %d.%02d MHz\n", est_freq/1000000,
+        printk(KERN_INFO "CPU frequency %d.%02d MHz\n", est_freq / 1000000,
-               (est_freq%1000000)*100/1000000);
+               (est_freq % 1000000) * 100 / 1000000);
-        cpu_khz = est_freq / 1000;
+        cpu_khz = est_freq / 1000;
        local_irq_restore(flags);
 }
@@ -180,8 +178,7 @@ void __init plat_timer_setup(struct irqaction *irq)
        if (cpu_has_veic) {
                set_vi_handler(MSC01E_INT_CPUCTR, mips_timer_dispatch);
                mips_cpu_timer_irq = MSC01E_INT_BASE + MSC01E_INT_CPUCTR;
-        }
+        } else {
-        else {
                if (cpu_has_vint)
                        set_vi_handler(cp0_compare_irq, mips_timer_dispatch);
                mips_cpu_timer_irq = MIPS_CPU_IRQ_BASE + cp0_compare_irq;
diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile
index 293697b156..19a0e544c4 100644
--- a/arch/mips/mm/Makefile
+++ b/arch/mips/mm/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_32BIT)		+= ioremap.o pgtable-32.o
 obj-$(CONFIG_64BIT)             += pgtable-64.o
 obj-$(CONFIG_HIGHMEM)           += highmem.o
+obj-$(CONFIG_CPU_LOONGSON2)     += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o
 obj-$(CONFIG_CPU_MIPS32)        += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o
 obj-$(CONFIG_CPU_MIPS64)        += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o
 obj-$(CONFIG_CPU_NEVADA)        += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index df04a315d8..be96231dcc 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -335,6 +335,10 @@ static void r4k_flush_cache_all(void)
 static inline void local_r4k___flush_cache_all(void * args)
 {
+#if defined(CONFIG_CPU_LOONGSON2)
+        r4k_blast_scache();
+        return;
+#endif
        r4k_blast_dcache();
        r4k_blast_icache();
@@ -848,6 +852,24 @@ static void __init probe_pcache(void)
                c->options |= MIPS_CPU_PREFETCH;
                break;
+        case CPU_LOONGSON2:
+                icache_size = 1 << (12 + ((config & CONF_IC) >> 9));
+                c->icache.linesz = 16 << ((config & CONF_IB) >> 5);
+                if (prid & 0x3)
+                        c->icache.ways = 4;
+                else
+                        c->icache.ways = 2;
+                c->icache.waybit = 0;
+                dcache_size = 1 << (12 + ((config & CONF_DC) >> 6));
+                c->dcache.linesz = 16 << ((config & CONF_DB) >> 4);
+                if (prid & 0x3)
+                        c->dcache.ways = 4;
+                else
+                        c->dcache.ways = 2;
+                c->dcache.waybit = 0;
+                break;
        default:
                if (!(config & MIPS_CONF_M))
                        panic("Don't know how to probe P-caches on this cpu.");
@@ -963,6 +985,14 @@ static void __init probe_pcache(void)
                break;
        }
+#ifdef  CONFIG_CPU_LOONGSON2
+        /*
+         * LOONGSON2 has 4 way icache, but when using indexed cache op,
+         * one op will act on all 4 ways
+         */
+        c->icache.ways = 1;
+#endif
        printk("Primary instruction cache %ldkB, %s, %s, linesize %d bytes.\n",
               icache_size >> 10,
               cpu_has_vtag_icache ? "virtually tagged" : "physically tagged",
@@ -1036,6 +1066,24 @@ static int __init probe_scache(void)
        return 1;
 }
+#if defined(CONFIG_CPU_LOONGSON2)
+static void __init loongson2_sc_init(void)
+{
+        struct cpuinfo_mips *c = &current_cpu_data;
+        scache_size = 512*1024;
+        c->scache.linesz = 32;
+        c->scache.ways = 4;
+        c->scache.waybit = 0;
+        c->scache.waysize = scache_size / (c->scache.ways);
+        c->scache.sets = scache_size / (c->scache.linesz * c->scache.ways);
+        pr_info("Unified secondary cache %ldkB %s, linesize %d bytes.\n",
+               scache_size >> 10, way_string[c->scache.ways], c->scache.linesz);
+        c->options |= MIPS_CPU_INCLUSIVE_CACHES;
+}
+#endif
 extern int r5k_sc_init(void);
 extern int rm7k_sc_init(void);
 extern int mips_sc_init(void);
@@ -1085,6 +1133,12 @@ static void __init setup_scache(void)
 #endif
                return;
+#if defined(CONFIG_CPU_LOONGSON2)
+        case CPU_LOONGSON2:
+                loongson2_sc_init();
+                return;
+#endif
        default:
                if (c->isa_level == MIPS_CPU_ISA_M32R1 ||
                    c->isa_level == MIPS_CPU_ISA_M32R2 ||
diff --git a/arch/mips/mm/c-sb1.c b/arch/mips/mm/c-sb1.c
index 9ea460b16b..6f9bd7fbd4 100644
--- a/arch/mips/mm/c-sb1.c
+++ b/arch/mips/mm/c-sb1.c
@@ -476,7 +476,7 @@ static __init void probe_cache_sizes(void)
 * memory management function pointers, as well as initialize
 * the caches and tlbs
 */
-void sb1_cache_init(void)
+void __init sb1_cache_init(void)
 {
        extern char except_vec2_sb1;
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index abf99b1eba..81f925a9a7 100644
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -6,6 +6,8 @@
 * Copyright (C) 1994 - 2003, 07 by Ralf Baechle (ralf@linux-mips.org)
 * Copyright (C) 2007 MIPS Technologies, Inc.
 */
+#include <linux/fs.h>
+#include <linux/fcntl.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -164,3 +166,11 @@ void __init cpu_cache_init(void)
        panic(cache_panic);
 }
+int __weak __uncached_access(struct file *file, unsigned long addr)
+{
+        if (file->f_flags & O_SYNC)
+                return 1;
+        return addr >= __pa(high_memory);
+}
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
index 65160d4984..dcd6913dc1 100644
--- a/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
@@ -48,6 +48,22 @@ extern void build_tlb_refill_handler(void);
 #endif /* CONFIG_MIPS_MT_SMTC */
+#if defined(CONFIG_CPU_LOONGSON2)
+/*
+ * LOONGSON2 has a 4 entry itlb which is a subset of dtlb,
+ * unfortrunately, itlb is not totally transparent to software.
+ */
+#define FLUSH_ITLB write_c0_diag(4);
+#define FLUSH_ITLB_VM(vma) { if ((vma)->vm_flags & VM_EXEC)  write_c0_diag(4); }
+#else
+#define FLUSH_ITLB
+#define FLUSH_ITLB_VM(vma)
+#endif
 void local_flush_tlb_all(void)
 {
        unsigned long flags;
@@ -73,6 +89,7 @@ void local_flush_tlb_all(void)
        }
        tlbw_use_hazard();
        write_c0_entryhi(old_ctx);
+        FLUSH_ITLB;
        EXIT_CRITICAL(flags);
 }
@@ -136,6 +153,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
                } else {
                        drop_mmu_context(mm, cpu);
                }
+                FLUSH_ITLB;
                EXIT_CRITICAL(flags);
        }
 }
@@ -178,6 +196,7 @@ void local_flush_tlb_kernel_range(unsigned long start, unsigned long end)
        } else {
                local_flush_tlb_all();
        }
+        FLUSH_ITLB;
        EXIT_CRITICAL(flags);
 }
@@ -210,6 +229,7 @@ void local_flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
        finish:
                write_c0_entryhi(oldpid);
+                FLUSH_ITLB_VM(vma);
                EXIT_CRITICAL(flags);
        }
 }
@@ -241,7 +261,7 @@ void local_flush_tlb_one(unsigned long page)
                tlbw_use_hazard();
        }
        write_c0_entryhi(oldpid);
+        FLUSH_ITLB;
        EXIT_CRITICAL(flags);
 }
@@ -293,6 +313,7 @@ void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)
        else
                tlb_write_indexed();
        tlbw_use_hazard();
+        FLUSH_ITLB_VM(vma);
        EXIT_CRITICAL(flags);
 }
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index e7149290d1..4ec0964b83 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -893,6 +893,7 @@ static __init void build_tlb_write_entry(u32 **p, struct label **l,
        case CPU_4KSC:
        case CPU_20KC:
        case CPU_25KF:
+        case CPU_LOONGSON2:
                tlbw(p);
                break;
@@ -1276,7 +1277,8 @@ static void __init build_r4000_tlb_refill_handler(void)
         * need three, with the second nop'ed and the third being
         * unused.
         */
-#ifdef CONFIG_32BIT
+        /* Loongson2 ebase is different than r4k, we have more space */
+#if defined(CONFIG_32BIT) || defined(CONFIG_CPU_LOONGSON2)
        if ((p - tlb_handler) > 64)
                panic("TLB refill handler space exceeded");
 #else
@@ -1289,7 +1291,7 @@ static void __init build_r4000_tlb_refill_handler(void)
        /*
         * Now fold the handler in the TLB refill handler space.
         */
-#ifdef CONFIG_32BIT
+#if defined(CONFIG_32BIT) || defined(CONFIG_CPU_LOONGSON2)
        f = final_handler;
        /* Simplest case, just copy the handler. */
        copy_handler(relocs, labels, tlb_handler, p, f);
@@ -1336,7 +1338,7 @@ static void __init build_r4000_tlb_refill_handler(void)
                final_len);
        f = final_handler;
-#ifdef CONFIG_64BIT
+#if defined(CONFIG_64BIT) && !defined(CONFIG_CPU_LOONGSON2)
        if (final_len > 32)
                final_len = 64;
        else
diff --git a/arch/mips/momentum/ocelot_3/Makefile b/arch/mips/momentum/ocelot_3/Makefile
deleted file mode 100644
index d5a090a85a..0000000000
--- a/arch/mips/momentum/ocelot_3/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for Momentum Computer's Ocelot-3 board.
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-obj-y    += irq.o platform.o prom.o reset.o setup.o
diff --git a/arch/mips/momentum/ocelot_3/irq.c b/arch/mips/momentum/ocelot_3/irq.c
deleted file mode 100644
index 3862d1d1ad..0000000000
--- a/arch/mips/momentum/ocelot_3/irq.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2000 RidgeRun, Inc.
- * Author: RidgeRun, Inc.
- *   glonnon@ridgerun.com, skranz@ridgerun.com, stevej@ridgerun.com
- *
- * Copyright 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- * Copyright (C) 2000, 2001 Ralf Baechle (ralf@gnu.org)
- *
- * Copyright 2004 PMC-Sierra
- * Author: Manish Lachwani (lachwani@pmc-sierra.com)
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *  Copyright (C) 2004 MontaVista Software Inc.
- *  Author: Manish Lachwani, mlachwani@mvista.com
- *
- */
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/kernel_stat.h>
-#include <linux/module.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/timex.h>
-#include <linux/slab.h>
-#include <linux/random.h>
-#include <asm/bitops.h>
-#include <asm/bootinfo.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/mipsregs.h>
-#include <asm/system.h>
-static struct irqaction cascade_mv64340 = {
-        no_action, IRQF_DISABLED, CPU_MASK_NONE, "MV64340-Cascade", NULL, NULL
-};
-void __init arch_init_irq(void)
-{
-        /*
-         * Clear all of the interrupts while we change the able around a bit.
-         * int-handler is not on bootstrap
-         */
-        clear_c0_status(ST0_IM | ST0_BEV);
-        rm7k_cpu_irq_init();
-        /* set up the cascading interrupts */
-        setup_irq(8, &cascade_mv64340);         /* unmask intControl IM8, IRQ 9 */
-        mv64340_irq_init(16);
-        set_c0_status(ST0_IM); /* IE in the status register */
-}
-asmlinkage void plat_irq_dispatch(void)
-{
-        unsigned int pending = read_c0_cause() & read_c0_status();
-        if (pending & STATUSF_IP0)
-                do_IRQ(0);
-        else if (pending & STATUSF_IP1)
-                do_IRQ(1);
-        else if (pending & STATUSF_IP2)
-                do_IRQ(2);
-        else if (pending & STATUSF_IP3)
-                do_IRQ(3);
-        else if (pending & STATUSF_IP4)
-                do_IRQ(4);
-        else if (pending & STATUSF_IP5)
-                do_IRQ(5);
-        else if (pending & STATUSF_IP6)
-                do_IRQ(6);
-        else if (pending & STATUSF_IP7)
-                do_IRQ(7);
-        else {
-                /*
-                 * Now look at the extended interrupts
-                 */
-                pending = (read_c0_cause() & (read_c0_intcontrol() << 8)) >> 16;
-                if (pending & STATUSF_IP8)
-                        ll_mv64340_irq();
-                else
-                        spurious_interrupt();
-        }
-}
diff --git a/arch/mips/momentum/ocelot_3/platform.c b/arch/mips/momentum/ocelot_3/platform.c
deleted file mode 100644
index 44e4c3fc74..0000000000
--- a/arch/mips/momentum/ocelot_3/platform.c
+++ /dev/null
@@ -1,208 +0,0 @@
-#include <linux/delay.h>
-#include <linux/if_ether.h>
-#include <linux/ioport.h>
-#include <linux/mv643xx.h>
-#include <linux/platform_device.h>
-#include "ocelot_3_fpga.h"
-#if defined(CONFIG_MV643XX_ETH) || defined(CONFIG_MV643XX_ETH_MODULE)
-static struct resource mv643xx_eth_shared_resources[] = {
-        [0] = {
-                .name   = "ethernet shared base",
-                .start  = 0xf1000000 + MV643XX_ETH_SHARED_REGS,
-                .end    = 0xf1000000 + MV643XX_ETH_SHARED_REGS +
-                                       MV643XX_ETH_SHARED_REGS_SIZE - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-static struct platform_device mv643xx_eth_shared_device = {
-        .name           = MV643XX_ETH_SHARED_NAME,
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(mv643xx_eth_shared_resources),
-        .resource       = mv643xx_eth_shared_resources,
-};
-#define MV_SRAM_BASE                    0xfe000000UL
-#define MV_SRAM_SIZE                    (256 * 1024)
-#define MV_SRAM_RXRING_SIZE             (MV_SRAM_SIZE / 4)
-#define MV_SRAM_TXRING_SIZE             (MV_SRAM_SIZE / 4)
-#define MV_SRAM_BASE_ETH0               MV_SRAM_BASE
-#define MV_SRAM_BASE_ETH1               (MV_SRAM_BASE + (MV_SRAM_SIZE / 2))
-#define MV64x60_IRQ_ETH_0 48
-#define MV64x60_IRQ_ETH_1 49
-#define MV64x60_IRQ_ETH_2 50
-static struct resource mv64x60_eth0_resources[] = {
-        [0] = {
-                .name   = "eth0 irq",
-                .start  = MV64x60_IRQ_ETH_0,
-                .end    = MV64x60_IRQ_ETH_0,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-static struct mv643xx_eth_platform_data eth0_pd = {
-        .port_number    = 0,
-        .tx_sram_addr   = MV_SRAM_BASE_ETH0,
-        .tx_sram_size   = MV_SRAM_TXRING_SIZE,
-        .tx_queue_size  = MV_SRAM_TXRING_SIZE / 16,
-        .rx_sram_addr   = MV_SRAM_BASE_ETH0 + MV_SRAM_TXRING_SIZE,
-        .rx_sram_size   = MV_SRAM_RXRING_SIZE,
-        .rx_queue_size  = MV_SRAM_RXRING_SIZE / 16,
-};
-static struct platform_device eth0_device = {
-        .name           = MV643XX_ETH_NAME,
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(mv64x60_eth0_resources),
-        .resource       = mv64x60_eth0_resources,
-        .dev = {
-                .platform_data = &eth0_pd,
-        },
-};
-static struct resource mv64x60_eth1_resources[] = {
-        [0] = {
-                .name   = "eth1 irq",
-                .start  = MV64x60_IRQ_ETH_1,
-                .end    = MV64x60_IRQ_ETH_1,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-static struct mv643xx_eth_platform_data eth1_pd = {
-        .port_number    = 1,
-        .tx_sram_addr   = MV_SRAM_BASE_ETH1,
-        .tx_sram_size   = MV_SRAM_TXRING_SIZE,
-        .tx_queue_size  = MV_SRAM_TXRING_SIZE / 16,
-        .rx_sram_addr   = MV_SRAM_BASE_ETH1 + MV_SRAM_TXRING_SIZE,
-        .rx_sram_size   = MV_SRAM_RXRING_SIZE,
-        .rx_queue_size  = MV_SRAM_RXRING_SIZE / 16,
-};
-static struct platform_device eth1_device = {
-        .name           = MV643XX_ETH_NAME,
-        .id             = 1,
-        .num_resources  = ARRAY_SIZE(mv64x60_eth1_resources),
-        .resource       = mv64x60_eth1_resources,
-        .dev = {
-                .platform_data = &eth1_pd,
-        },
-};
-static struct resource mv64x60_eth2_resources[] = {
-        [0] = {
-                .name   = "eth2 irq",
-                .start  = MV64x60_IRQ_ETH_2,
-                .end    = MV64x60_IRQ_ETH_2,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-static struct mv643xx_eth_platform_data eth2_pd = {
-        .port_number    = 2,
-};
-static struct platform_device eth2_device = {
-        .name           = MV643XX_ETH_NAME,
-        .id             = 2,
-        .num_resources  = ARRAY_SIZE(mv64x60_eth2_resources),
-        .resource       = mv64x60_eth2_resources,
-        .dev = {
-                .platform_data = &eth2_pd,
-        },
-};
-static struct platform_device *mv643xx_eth_pd_devs[] __initdata = {
-        &mv643xx_eth_shared_device,
-        &eth0_device,
-        &eth1_device,
-        &eth2_device,
-};
-static u8 __init exchange_bit(u8 val, u8 cs)
-{
-        /* place the data */
-        OCELOT_FPGA_WRITE((val << 2) | cs, EEPROM_MODE);
-        udelay(1);
-        /* turn the clock on */
-        OCELOT_FPGA_WRITE((val << 2) | cs | 0x2, EEPROM_MODE);
-        udelay(1);
-        /* turn the clock off and read-strobe */
-        OCELOT_FPGA_WRITE((val << 2) | cs | 0x10, EEPROM_MODE);
-        /* return the data */
-        return (OCELOT_FPGA_READ(EEPROM_MODE) >> 3) & 0x1;
-}
-static void __init get_mac(char dest[6])
-{
-        u8 read_opcode[12] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-        int i,j;
-        for (i = 0; i < 12; i++)
-                exchange_bit(read_opcode[i], 1);
-        for (j = 0; j < 6; j++) {
-                dest[j] = 0;
-                for (i = 0; i < 8; i++) {
-                        dest[j] <<= 1;
-                        dest[j] |= exchange_bit(0, 1);
-                }
-        }
-        /* turn off CS */
-        exchange_bit(0,0);
-}
-/*
- * Copy and increment ethernet MAC address by a small value.
- *
- * This is useful for systems where the only one MAC address is stored in
- * non-volatile memory for multiple ports.
- */
-static inline void eth_mac_add(unsigned char *dst, unsigned char *src,
-        unsigned int add)
-{
-        int i;
-        BUG_ON(add >= 256);
-        for (i = ETH_ALEN; i >= 0; i--) {
-                dst[i] = src[i] + add;
-                add = dst[i] < src[i];          /* compute carry */
-        }
-        WARN_ON(add);
-}
-static int __init mv643xx_eth_add_pds(void)
-{
-        unsigned char mac[ETH_ALEN];
-        int ret;
-        get_mac(mac);
-        eth_mac_add(eth0_pd.mac_addr, mac, 0);
-        eth_mac_add(eth1_pd.mac_addr, mac, 1);
-        eth_mac_add(eth2_pd.mac_addr, mac, 2);
-        ret = platform_add_devices(mv643xx_eth_pd_devs,
-                        ARRAY_SIZE(mv643xx_eth_pd_devs));
-        return ret;
-}
-device_initcall(mv643xx_eth_add_pds);
-#endif /* defined(CONFIG_MV643XX_ETH) || defined(CONFIG_MV643XX_ETH_MODULE) */
diff --git a/arch/mips/momentum/ocelot_3/prom.c b/arch/mips/momentum/ocelot_3/prom.c
deleted file mode 100644
index 8e02df6357..0000000000
--- a/arch/mips/momentum/ocelot_3/prom.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright 2002 Momentum Computer Inc.
- * Author: Matthew Dharm <mdharm@momenco.com>
- *
- * Louis Hamilton, Red Hat, Inc.
- *   hamilton@redhat.com  [MIPS64 modifications]
- *
- * Copyright 2004 PMC-Sierra
- * Author: Manish Lachwani (lachwani@pmc-sierra.com)
- *
- * Based on Ocelot Linux port, which is
- * Copyright 2001 MontaVista Software Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- *
- * 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.
- *
- * Copyright (C) 2004 MontaVista Software Inc.
- * Author: Manish Lachwani, mlachwani@mvista.com
- *
- */
-#include <linux/init.h>
-#include <linux/bootmem.h>
-#include <linux/mv643xx.h>
-#include <asm/addrspace.h>
-#include <asm/bootinfo.h>
-#include <asm/pmon.h>
-#include "ocelot_3_fpga.h"
-struct callvectors* debug_vectors;
-extern unsigned long marvell_base;
-extern unsigned long cpu_clock;
-const char *get_system_type(void)
-{
-        return "Momentum Ocelot-3";
-}
-#ifdef CONFIG_64BIT
-unsigned long signext(unsigned long addr)
-{
-        addr &= 0xffffffff;
-        return (unsigned long)((int)addr);
-}
-void *get_arg(unsigned long args, int arc)
-{
-        unsigned long ul;
-        unsigned char *puc, uc;
-        args += (arc * 4);
-        ul = (unsigned long)signext(args);
-        puc = (unsigned char *)ul;
-        if (puc == 0)
-                return (void *)0;
-#ifdef CONFIG_CPU_LITTLE_ENDIAN
-        uc = *puc++;
-        ul = (unsigned long)uc;
-        uc = *puc++;
-        ul |= (((unsigned long)uc) << 8);
-        uc = *puc++;
-        ul |= (((unsigned long)uc) << 16);
-        uc = *puc++;
-        ul |= (((unsigned long)uc) << 24);
-#else  /* CONFIG_CPU_LITTLE_ENDIAN */
-        uc = *puc++;
-        ul = ((unsigned long)uc) << 24;
-        uc = *puc++;
-        ul |= (((unsigned long)uc) << 16);
-        uc = *puc++;
-        ul |= (((unsigned long)uc) << 8);
-        uc = *puc++;
-        ul |= ((unsigned long)uc);
-#endif  /* CONFIG_CPU_LITTLE_ENDIAN */
-        ul = signext(ul);
-        return (void *)ul;
-}
-char *arg64(unsigned long addrin, int arg_index)
-{
-        unsigned long args;
-        char *p;
-        args = signext(addrin);
-        p = (char *)get_arg(args, arg_index);
-        return p;
-}
-#endif  /* CONFIG_64BIT */
-void __init prom_init(void)
-{
-        int argc = fw_arg0;
-        char **arg = (char **) fw_arg1;
-        char **env = (char **) fw_arg2;
-        struct callvectors *cv = (struct callvectors *) fw_arg3;
-        int i;
-#ifdef CONFIG_64BIT
-        char *ptr;
-        printk("prom_init - MIPS64\n");
-        /* save the PROM vectors for debugging use */
-        debug_vectors = (struct callvectors *)signext((unsigned long)cv);
-        /* arg[0] is "g", the rest is boot parameters */
-        arcs_cmdline[0] = '\0';
-        for (i = 1; i < argc; i++) {
-                ptr = (char *)arg64((unsigned long)arg, i);
-                if ((strlen(arcs_cmdline) + strlen(ptr) + 1) >=
-                    sizeof(arcs_cmdline))
-                        break;
-                strcat(arcs_cmdline, ptr);
-                strcat(arcs_cmdline, " ");
-        }
-        i = 0;
-        while (1) {
-                ptr = (char *)arg64((unsigned long)env, i);
-                if (! ptr)
-                        break;
-                if (strncmp("gtbase", ptr, strlen("gtbase")) == 0) {
-                        marvell_base = simple_strtol(ptr + strlen("gtbase="),
-                                                        NULL, 16);
-                        if ((marvell_base & 0xffffffff00000000) == 0)
-                                marvell_base |= 0xffffffff00000000;
-                        printk("marvell_base set to 0x%016lx\n", marvell_base);
-                }
-                if (strncmp("cpuclock", ptr, strlen("cpuclock")) == 0) {
-                        cpu_clock = simple_strtol(ptr + strlen("cpuclock="),
-                                                        NULL, 10);
-                        printk("cpu_clock set to %d\n", cpu_clock);
-                }
-                i++;
-        }
-        printk("arcs_cmdline: %s\n", arcs_cmdline);
-#else   /* CONFIG_64BIT */
-        /* save the PROM vectors for debugging use */
-        debug_vectors = cv;
-        /* arg[0] is "g", the rest is boot parameters */
-        arcs_cmdline[0] = '\0';
-        for (i = 1; i < argc; i++) {
-                if (strlen(arcs_cmdline) + strlen(arg[i] + 1)
-                    >= sizeof(arcs_cmdline))
-                        break;
-                strcat(arcs_cmdline, arg[i]);
-                strcat(arcs_cmdline, " ");
-        }
-        while (*env) {
-                if (strncmp("gtbase", *env, strlen("gtbase")) == 0) {
-                        marvell_base = simple_strtol(*env + strlen("gtbase="),
-                                                        NULL, 16);
-                }
-                if (strncmp("cpuclock", *env, strlen("cpuclock")) == 0) {
-                        cpu_clock = simple_strtol(*env + strlen("cpuclock="),
-                                                        NULL, 10);
-                }
-                env++;
-        }
-#endif /* CONFIG_64BIT */
-        mips_machgroup = MACH_GROUP_MOMENCO;
-        mips_machtype = MACH_MOMENCO_OCELOT_3;
-#ifndef CONFIG_64BIT
-        debug_vectors->printf("Booting Linux kernel...\n");
-#endif
-}
-void __init prom_free_prom_memory(void)
-{
-}
-void __init prom_fixup_mem_map(unsigned long start, unsigned long end)
-{
-}
diff --git a/arch/mips/momentum/ocelot_3/reset.c b/arch/mips/momentum/ocelot_3/reset.c
deleted file mode 100644
index 9d86d24683..0000000000
--- a/arch/mips/momentum/ocelot_3/reset.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.
- *
- * Copyright (C) 1997, 01, 05 Ralf Baechle
- * Copyright 2001 MontaVista Software Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- *
- * Copyright (C) 2002 Momentum Computer Inc.
- * Author: Matthew Dharm <mdharm@momenco.com>
- *
- * Louis Hamilton, Red Hat, Inc.
- * hamilton@redhat.com  [MIPS64 modifications]
- *
- * Copyright 2004 PMC-Sierra
- * Author: Manish Lachwani (lachwani@pmc-sierra.com)
- *
- * Copyright (C) 2004 MontaVista Software Inc.
- * Author: Manish Lachwani, mlachwani@mvista.com
- */
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/delay.h>
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/processor.h>
-#include <asm/reboot.h>
-#include <asm/system.h>
-void momenco_ocelot_restart(char *command)
-{
-        /* base address of timekeeper portion of part */
-        void *nvram = (void *) 0xfc807000L;
-        /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */
-        writeb(0x84, nvram + 0xff7);
-        /* wait for the watchdog to go off */
-        mdelay(100+(1000/16));
-        /* if the watchdog fails for some reason, let people know */
-        printk(KERN_NOTICE "Watchdog reset failed\n");
-}
-void momenco_ocelot_halt(void)
-{
-        printk(KERN_NOTICE "\n** You can safely turn off the power\n");
-        while (1)
-                __asm__(".set\tmips3\n\t"
-                        "wait\n\t"
-                        ".set\tmips0");
-}
-void momenco_ocelot_power_off(void)
-{
-        momenco_ocelot_halt();
-}
diff --git a/arch/mips/momentum/ocelot_3/setup.c b/arch/mips/momentum/ocelot_3/setup.c
deleted file mode 100644
index ff0829f811..0000000000
--- a/arch/mips/momentum/ocelot_3/setup.c
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
- * setup.c
- *
- * BRIEF MODULE DESCRIPTION
- * Momentum Computer Ocelot-3 board dependent boot routines
- *
- * Copyright (C) 1996, 1997, 01, 05 - 06  Ralf Baechle
- * Copyright (C) 2000 RidgeRun, Inc.
- * Copyright (C) 2001 Red Hat, Inc.
- * Copyright (C) 2002 Momentum Computer
- *
- * Author: Matthew Dharm, Momentum Computer
- *   mdharm@momenco.com
- *
- * Louis Hamilton, Red Hat, Inc.
- *   hamilton@redhat.com  [MIPS64 modifications]
- *
- * Author: RidgeRun, Inc.
- *   glonnon@ridgerun.com, skranz@ridgerun.com, stevej@ridgerun.com
- *
- * Copyright 2001 MontaVista Software Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- *
- * Copyright 2004 PMC-Sierra
- * Author: Manish Lachwani (lachwani@pmc-sierra.com)
- *
- * Copyright (C) 2004 MontaVista Software Inc.
- * Author: Manish Lachwani, mlachwani@mvista.com
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/mc146818rtc.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/timex.h>
-#include <linux/bootmem.h>
-#include <linux/mv643xx.h>
-#include <linux/pm.h>
-#include <linux/bcd.h>
-#include <asm/time.h>
-#include <asm/page.h>
-#include <asm/bootinfo.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/pci.h>
-#include <asm/processor.h>
-#include <asm/reboot.h>
-#include <asm/mc146818rtc.h>
-#include <asm/tlbflush.h>
-#include "ocelot_3_fpga.h"
-/* Marvell Discovery Register Base */
-unsigned long marvell_base = (signed)0xf4000000;
-/* CPU clock */
-unsigned long cpu_clock;
-/* RTC/NVRAM */
-unsigned char* rtc_base = (unsigned char*)(signed)0xfc800000;
-/* FPGA Base */
-unsigned long ocelot_fpga_base = (signed)0xfc000000;
-/* Serial base */
-unsigned long uart_base = (signed)0xfd000000;
-/*
- * Marvell Discovery SRAM. This is one place where Ethernet
- * Tx and Rx descriptors can be placed to improve performance
- */
-extern unsigned long mv64340_sram_base;
-/* These functions are used for rebooting or halting the machine*/
-extern void momenco_ocelot_restart(char *command);
-extern void momenco_ocelot_halt(void);
-extern void momenco_ocelot_power_off(void);
-void momenco_time_init(void);
-static char reset_reason;
-void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,
-                     unsigned long entryhi, unsigned long pagemask);
-static inline unsigned long ENTRYLO(unsigned long paddr)
-{
-        return ((paddr & PAGE_MASK) |
-                (_PAGE_PRESENT | __READABLE | __WRITEABLE | _PAGE_GLOBAL |
-                _CACHE_UNCACHED)) >> 6;
-}
-void __init bus_error_init(void)
-{
-        /* nothing */
-}
-/*
- * setup code for a handoff from a version 2 PMON 2000 PROM
- */
-void setup_wired_tlb_entries(void)
-{
-        write_c0_wired(0);
-        local_flush_tlb_all();
-        /* marvell and extra space */
-        add_wired_entry(ENTRYLO(0xf4000000), ENTRYLO(0xf4010000), (signed)0xf4000000, PM_64K);
-        /* fpga, rtc, and uart */
-        add_wired_entry(ENTRYLO(0xfc000000), ENTRYLO(0xfd000000), (signed)0xfc000000, PM_16M);
-}
-unsigned long m48t37y_get_time(void)
-{
-        unsigned int year, month, day, hour, min, sec;
-        unsigned long flags;
-        spin_lock_irqsave(&rtc_lock, flags);
-        /* stop the update */
-        rtc_base[0x7ff8] = 0x40;
-        year = BCD2BIN(rtc_base[0x7fff]);
-        year += BCD2BIN(rtc_base[0x7ff1]) * 100;
-        month = BCD2BIN(rtc_base[0x7ffe]);
-        day = BCD2BIN(rtc_base[0x7ffd]);
-        hour = BCD2BIN(rtc_base[0x7ffb]);
-        min = BCD2BIN(rtc_base[0x7ffa]);
-        sec = BCD2BIN(rtc_base[0x7ff9]);
-        /* start the update */
-        rtc_base[0x7ff8] = 0x00;
-        spin_unlock_irqrestore(&rtc_lock, flags);
-        return mktime(year, month, day, hour, min, sec);
-}
-int m48t37y_set_time(unsigned long sec)
-{
-        struct rtc_time tm;
-        unsigned long flags;
-        /* convert to a more useful format -- note months count from 0 */
-        to_tm(sec, &tm);
-        tm.tm_mon += 1;
-        spin_lock_irqsave(&rtc_lock, flags);
-        /* enable writing */
-        rtc_base[0x7ff8] = 0x80;
-        /* year */
-        rtc_base[0x7fff] = BIN2BCD(tm.tm_year % 100);
-        rtc_base[0x7ff1] = BIN2BCD(tm.tm_year / 100);
-        /* month */
-        rtc_base[0x7ffe] = BIN2BCD(tm.tm_mon);
-        /* day */
-        rtc_base[0x7ffd] = BIN2BCD(tm.tm_mday);
-        /* hour/min/sec */
-        rtc_base[0x7ffb] = BIN2BCD(tm.tm_hour);
-        rtc_base[0x7ffa] = BIN2BCD(tm.tm_min);
-        rtc_base[0x7ff9] = BIN2BCD(tm.tm_sec);
-        /* day of week -- not really used, but let's keep it up-to-date */
-        rtc_base[0x7ffc] = BIN2BCD(tm.tm_wday + 1);
-        /* disable writing */
-        rtc_base[0x7ff8] = 0x00;
-        spin_unlock_irqrestore(&rtc_lock, flags);
-        return 0;
-}
-void __init plat_timer_setup(struct irqaction *irq)
-{
-        setup_irq(7, irq);      /* Timer interrupt, unmask status IM7 */
-}
-void momenco_time_init(void)
-{
-        setup_wired_tlb_entries();
-        /*
-         * Ocelot-3 board has been built with both
-         * the Rm7900 and the Rm7065C
-         */
-        mips_hpt_frequency = cpu_clock / 2;
-        rtc_mips_get_time = m48t37y_get_time;
-        rtc_mips_set_time = m48t37y_set_time;
-}
-/*
- * PCI Support for Ocelot-3
- */
-/* Bus #0 IO and MEM space */
-#define OCELOT_3_PCI_IO_0_START         0xe0000000
-#define OCELOT_3_PCI_IO_0_SIZE          0x08000000
-#define OCELOT_3_PCI_MEM_0_START        0xc0000000
-#define OCELOT_3_PCI_MEM_0_SIZE         0x10000000
-/* Bus #1 IO and MEM space */
-#define OCELOT_3_PCI_IO_1_START         0xe8000000
-#define OCELOT_3_PCI_IO_1_SIZE          0x08000000
-#define OCELOT_3_PCI_MEM_1_START        0xd0000000
-#define OCELOT_3_PCI_MEM_1_SIZE         0x10000000
-static struct resource mv_pci_io_mem0_resource = {
-        .name   = "MV64340 PCI0 IO MEM",
-        .start  = OCELOT_3_PCI_IO_0_START,
-        .end    = OCELOT_3_PCI_IO_0_START + OCELOT_3_PCI_IO_0_SIZE - 1,
-        .flags  = IORESOURCE_IO,
-};
-static struct resource mv_pci_io_mem1_resource = {
-        .name   = "MV64340 PCI1 IO MEM",
-        .start  = OCELOT_3_PCI_IO_1_START,
-        .end    = OCELOT_3_PCI_IO_1_START + OCELOT_3_PCI_IO_1_SIZE - 1,
-        .flags  = IORESOURCE_IO,
-};
-static struct resource mv_pci_mem0_resource = {
-        .name   = "MV64340 PCI0 MEM",
-        .start  = OCELOT_3_PCI_MEM_0_START,
-        .end    = OCELOT_3_PCI_MEM_0_START + OCELOT_3_PCI_MEM_0_SIZE - 1,
-        .flags  = IORESOURCE_MEM,
-};
-static struct resource mv_pci_mem1_resource = {
-        .name   = "MV64340 PCI1 MEM",
-        .start  = OCELOT_3_PCI_MEM_1_START,
-        .end    = OCELOT_3_PCI_MEM_1_START + OCELOT_3_PCI_MEM_1_SIZE - 1,
-        .flags  = IORESOURCE_MEM,
-};
-static struct mv_pci_controller mv_bus0_controller = {
-        .pcic = {
-                 .pci_ops       = &mv_pci_ops,
-                 .mem_resource  = &mv_pci_mem0_resource,
-                 .io_resource   = &mv_pci_io_mem0_resource,
-        },
-        .config_addr    = MV64340_PCI_0_CONFIG_ADDR,
-        .config_vreg    = MV64340_PCI_0_CONFIG_DATA_VIRTUAL_REG,
-};
-static struct mv_pci_controller mv_bus1_controller = {
-        .pcic = {
-                 .pci_ops       = &mv_pci_ops,
-                 .mem_resource  = &mv_pci_mem1_resource,
-                 .io_resource   = &mv_pci_io_mem1_resource,
-        },
-        .config_addr    = MV64340_PCI_1_CONFIG_ADDR,
-        .config_vreg    = MV64340_PCI_1_CONFIG_DATA_VIRTUAL_REG,
-};
-static __init int __init ja_pci_init(void)
-{
-        uint32_t enable;
-        extern int pci_probe_only;
-        /* PMON will assign PCI resources */
-        pci_probe_only = 1;
-        enable = ~MV_READ(MV64340_BASE_ADDR_ENABLE);
-        /*
-         * We require at least one enabled I/O or PCI memory window or we
-         * will ignore this PCI bus.  We ignore PCI windows 1, 2 and 3.
-         */
-        if (enable & (0x01 <<  9) || enable & (0x01 << 10))
-                register_pci_controller(&mv_bus0_controller.pcic);
-        if (enable & (0x01 << 14) || enable & (0x01 << 15))
-                register_pci_controller(&mv_bus1_controller.pcic);
-        ioport_resource.end = OCELOT_3_PCI_IO_0_START + OCELOT_3_PCI_IO_0_SIZE +
-                                        OCELOT_3_PCI_IO_1_SIZE - 1;
-        iomem_resource.end = OCELOT_3_PCI_MEM_0_START + OCELOT_3_PCI_MEM_0_SIZE +
-                                        OCELOT_3_PCI_MEM_1_SIZE - 1;
-        set_io_port_base(OCELOT_3_PCI_IO_0_START); /* mips_io_port_base */
-        return 0;
-}
-arch_initcall(ja_pci_init);
-void __init plat_mem_setup(void)
-{
-        unsigned int tmpword;
-        board_time_init = momenco_time_init;
-        _machine_restart = momenco_ocelot_restart;
-        _machine_halt = momenco_ocelot_halt;
-        pm_power_off = momenco_ocelot_power_off;
-        /* Wired TLB entries */
-        setup_wired_tlb_entries();
-        /* shut down ethernet ports, just to be sure our memory doesn't get
-         * corrupted by random ethernet traffic.
-         */
-        MV_WRITE(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(0), 0xff << 8);
-        MV_WRITE(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(1), 0xff << 8);
-        MV_WRITE(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(0), 0xff << 8);
-        MV_WRITE(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(1), 0xff << 8);
-        do {}
-          while (MV_READ(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(0)) & 0xff);
-        do {}
-          while (MV_READ(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(1)) & 0xff);
-        do {}
-          while (MV_READ(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(0)) & 0xff);
-        do {}
-          while (MV_READ(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(1)) & 0xff);
-        MV_WRITE(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(0),
-                 MV_READ(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(0)) & ~1);
-        MV_WRITE(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(1),
-                 MV_READ(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(1)) & ~1);
-        /* Turn off the Bit-Error LED */
-        OCELOT_FPGA_WRITE(0x80, CLR);
-        tmpword = OCELOT_FPGA_READ(BOARDREV);
-        if (tmpword < 26)
-                printk("Momenco Ocelot-3: Board Assembly Rev. %c\n",
-                        'A'+tmpword);
-        else
-                printk("Momenco Ocelot-3: Board Assembly Revision #0x%x\n",
-                        tmpword);
-        tmpword = OCELOT_FPGA_READ(FPGA_REV);
-        printk("FPGA Rev: %d.%d\n", tmpword>>4, tmpword&15);
-        tmpword = OCELOT_FPGA_READ(RESET_STATUS);
-        printk("Reset reason: 0x%x\n", tmpword);
-        switch (tmpword) {
-                case 0x1:
-                        printk("  - Power-up reset\n");
-                        break;
-                case 0x2:
-                        printk("  - Push-button reset\n");
-                        break;
-                case 0x4:
-                        printk("  - cPCI bus reset\n");
-                        break;
-                case 0x8:
-                        printk("  - Watchdog reset\n");
-                        break;
-                case 0x10:
-                        printk("  - Software reset\n");
-                        break;
-                default:
-                        printk("  - Unknown reset cause\n");
-        }
-        reset_reason = tmpword;
-        OCELOT_FPGA_WRITE(0xff, RESET_STATUS);
-        tmpword = OCELOT_FPGA_READ(CPCI_ID);
-        printk("cPCI ID register: 0x%02x\n", tmpword);
-        printk("  - Slot number: %d\n", tmpword & 0x1f);
-        printk("  - PCI bus present: %s\n", tmpword & 0x40 ? "yes" : "no");
-        printk("  - System Slot: %s\n", tmpword & 0x20 ? "yes" : "no");
-        tmpword = OCELOT_FPGA_READ(BOARD_STATUS);
-        printk("Board Status register: 0x%02x\n", tmpword);
-        printk("  - User jumper: %s\n", (tmpword & 0x80)?"installed":"absent");
-        printk("  - Boot flash write jumper: %s\n", (tmpword&0x40)?"installed":"absent");
-        printk("  - L3 cache size: %d MB\n", (1<<((tmpword&12) >> 2))&~1);
-        /* Support for 128 MB memory */
-        add_memory_region(0x0, 0x08000000, BOOT_MEM_RAM);
-}
diff --git a/arch/mips/momentum/ocelot_c/Makefile b/arch/mips/momentum/ocelot_c/Makefile
deleted file mode 100644
index d69161aa16..0000000000
--- a/arch/mips/momentum/ocelot_c/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for Momentum Computer's Ocelot-C and -CS boards.
-#
-obj-y                   += cpci-irq.o irq.o platform.o prom.o reset.o \
-                           setup.o uart-irq.o
-obj-$(CONFIG_KGDB)      += dbg_io.o
diff --git a/arch/mips/momentum/ocelot_c/cpci-irq.c b/arch/mips/momentum/ocelot_c/cpci-irq.c
deleted file mode 100644
index 186a140fd2..0000000000
--- a/arch/mips/momentum/ocelot_c/cpci-irq.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2002 Momentum Computer
- * Author: mdharm@momenco.com
- *
- * arch/mips/momentum/ocelot_c/cpci-irq.c
- *     Interrupt routines for cpci.  Interrupt numbers are assigned from
- *     CPCI_IRQ_BASE to CPCI_IRQ_BASE+8 (8 interrupt sources).
- *
- * Note that the high-level software will need to be careful about using
- * these interrupts.  If this board is asserting a cPCI interrupt, it will
- * also see the asserted interrupt.  Care must be taken to avoid an
- * interrupt flood.
- *
- * 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.
- */
-#include <linux/module.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/kernel_stat.h>
-#include <asm/io.h>
-#include "ocelot_c_fpga.h"
-#define CPCI_IRQ_BASE   8
-static inline int ls1bit8(unsigned int x)
-{
-        int b = 7, s;
-        s =  4; if (((unsigned char)(x <<  4)) == 0) s = 0; b -= s; x <<= s;
-        s =  2; if (((unsigned char)(x <<  2)) == 0) s = 0; b -= s; x <<= s;
-        s =  1; if (((unsigned char)(x <<  1)) == 0) s = 0; b -= s;
-        return b;
-}
-/* mask off an interrupt -- 0 is enable, 1 is disable */
-static inline void mask_cpci_irq(unsigned int irq)
-{
-        uint32_t value;
-        value = OCELOT_FPGA_READ(INTMASK);
-        value |= 1 << (irq - CPCI_IRQ_BASE);
-        OCELOT_FPGA_WRITE(value, INTMASK);
-        /* read the value back to assure that it's really been written */
-        value = OCELOT_FPGA_READ(INTMASK);
-}
-/* unmask an interrupt -- 0 is enable, 1 is disable */
-static inline void unmask_cpci_irq(unsigned int irq)
-{
-        uint32_t value;
-        value = OCELOT_FPGA_READ(INTMASK);
-        value &= ~(1 << (irq - CPCI_IRQ_BASE));
-        OCELOT_FPGA_WRITE(value, INTMASK);
-        /* read the value back to assure that it's really been written */
-        value = OCELOT_FPGA_READ(INTMASK);
-}
-/*
- * Interrupt handler for interrupts coming from the FPGA chip.
- * It could be built in ethernet ports etc...
- */
-void ll_cpci_irq(void)
-{
-        unsigned int irq_src, irq_mask;
-        /* read the interrupt status registers */
-        irq_src = OCELOT_FPGA_READ(INTSTAT);
-        irq_mask = OCELOT_FPGA_READ(INTMASK);
-        /* mask for just the interrupts we want */
-        irq_src &= ~irq_mask;
-        do_IRQ(ls1bit8(irq_src) + CPCI_IRQ_BASE);
-}
-struct irq_chip cpci_irq_type = {
-        .name = "CPCI/FPGA",
-        .ack = mask_cpci_irq,
-        .mask = mask_cpci_irq,
-        .mask_ack = mask_cpci_irq,
-        .unmask = unmask_cpci_irq,
-};
-void cpci_irq_init(void)
-{
-        int i;
-        for (i = CPCI_IRQ_BASE; i < (CPCI_IRQ_BASE + 8); i++)
-                set_irq_chip_and_handler(i, &cpci_irq_type, handle_level_irq);
-}
diff --git a/arch/mips/momentum/ocelot_c/dbg_io.c b/arch/mips/momentum/ocelot_c/dbg_io.c
deleted file mode 100644
index 32d6fb4ee6..0000000000
--- a/arch/mips/momentum/ocelot_c/dbg_io.c
+++ /dev/null
@@ -1,121 +0,0 @@
-#include <asm/serial.h> /* For the serial port location and base baud */
-/* --- CONFIG --- */
-typedef unsigned char uint8;
-typedef unsigned int uint32;
-/* --- END OF CONFIG --- */
-#define         UART16550_BAUD_2400             2400
-#define         UART16550_BAUD_4800             4800
-#define         UART16550_BAUD_9600             9600
-#define         UART16550_BAUD_19200            19200
-#define         UART16550_BAUD_38400            38400
-#define         UART16550_BAUD_57600            57600
-#define         UART16550_BAUD_115200           115200
-#define         UART16550_PARITY_NONE           0
-#define         UART16550_PARITY_ODD            0x08
-#define         UART16550_PARITY_EVEN           0x18
-#define         UART16550_PARITY_MARK           0x28
-#define         UART16550_PARITY_SPACE          0x38
-#define         UART16550_DATA_5BIT             0x0
-#define         UART16550_DATA_6BIT             0x1
-#define         UART16550_DATA_7BIT             0x2
-#define         UART16550_DATA_8BIT             0x3
-#define         UART16550_STOP_1BIT             0x0
-#define         UART16550_STOP_2BIT             0x4
-/* ----------------------------------------------------- */
-/* === CONFIG === */
-/* [jsun] we use the second serial port for kdb */
-#define         BASE                    OCELOT_SERIAL1_BASE
-#define         MAX_BAUD                OCELOT_BASE_BAUD
-/* === END OF CONFIG === */
-#define         REG_OFFSET              4
-/* register offset */
-#define         OFS_RCV_BUFFER          0
-#define         OFS_TRANS_HOLD          0
-#define         OFS_SEND_BUFFER         0
-#define         OFS_INTR_ENABLE         (1*REG_OFFSET)
-#define         OFS_INTR_ID             (2*REG_OFFSET)
-#define         OFS_DATA_FORMAT         (3*REG_OFFSET)
-#define         OFS_LINE_CONTROL        (3*REG_OFFSET)
-#define         OFS_MODEM_CONTROL       (4*REG_OFFSET)
-#define         OFS_RS232_OUTPUT        (4*REG_OFFSET)
-#define         OFS_LINE_STATUS         (5*REG_OFFSET)
-#define         OFS_MODEM_STATUS        (6*REG_OFFSET)
-#define         OFS_RS232_INPUT         (6*REG_OFFSET)
-#define         OFS_SCRATCH_PAD         (7*REG_OFFSET)
-#define         OFS_DIVISOR_LSB         (0*REG_OFFSET)
-#define         OFS_DIVISOR_MSB         (1*REG_OFFSET)
-/* memory-mapped read/write of the port */
-#define         UART16550_READ(y)    (*((volatile uint8*)(BASE + y)))
-#define         UART16550_WRITE(y, z)  ((*((volatile uint8*)(BASE + y))) = z)
-void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
-{
-        /* disable interrupts */
-        UART16550_WRITE(OFS_INTR_ENABLE, 0);
-        /* set up baud rate */
-        {
-                uint32 divisor;
-                /* set DIAB bit */
-                UART16550_WRITE(OFS_LINE_CONTROL, 0x80);
-                /* set divisor */
-                divisor = MAX_BAUD / baud;
-                UART16550_WRITE(OFS_DIVISOR_LSB, divisor & 0xff);
-                UART16550_WRITE(OFS_DIVISOR_MSB, (divisor & 0xff00) >> 8);
-                /* clear DIAB bit */
-                UART16550_WRITE(OFS_LINE_CONTROL, 0x0);
-        }
-        /* set data format */
-        UART16550_WRITE(OFS_DATA_FORMAT, data | parity | stop);
-}
-static int remoteDebugInitialized = 0;
-uint8 getDebugChar(void)
-{
-        if (!remoteDebugInitialized) {
-                remoteDebugInitialized = 1;
-                debugInit(UART16550_BAUD_38400,
-                          UART16550_DATA_8BIT,
-                          UART16550_PARITY_NONE, UART16550_STOP_1BIT);
-        }
-        while ((UART16550_READ(OFS_LINE_STATUS) & 0x1) == 0);
-        return UART16550_READ(OFS_RCV_BUFFER);
-}
-int putDebugChar(uint8 byte)
-{
-        if (!remoteDebugInitialized) {
-                remoteDebugInitialized = 1;
-                debugInit(UART16550_BAUD_38400,
-                          UART16550_DATA_8BIT,
-                          UART16550_PARITY_NONE, UART16550_STOP_1BIT);
-        }
-        while ((UART16550_READ(OFS_LINE_STATUS) & 0x20) == 0);
-        UART16550_WRITE(OFS_SEND_BUFFER, byte);
-        return 1;
-}
diff --git a/arch/mips/momentum/ocelot_c/irq.c b/arch/mips/momentum/ocelot_c/irq.c
deleted file mode 100644
index 844d566c9d..0000000000
--- a/arch/mips/momentum/ocelot_c/irq.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2000 RidgeRun, Inc.
- * Author: RidgeRun, Inc.
- *   glonnon@ridgerun.com, skranz@ridgerun.com, stevej@ridgerun.com
- *
- * Copyright 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- * Copyright (C) 2000, 01, 05 Ralf Baechle (ralf@linux-mips.org)
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/kernel_stat.h>
-#include <linux/module.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/timex.h>
-#include <linux/slab.h>
-#include <linux/random.h>
-#include <linux/bitops.h>
-#include <linux/mv643xx.h>
-#include <asm/bootinfo.h>
-#include <asm/io.h>
-#include <asm/irq_cpu.h>
-#include <asm/mipsregs.h>
-#include <asm/system.h>
-extern void uart_irq_init(void);
-extern void cpci_irq_init(void);
-static struct irqaction cascade_fpga = {
-        no_action, IRQF_DISABLED, CPU_MASK_NONE, "cascade via FPGA", NULL, NULL
-};
-static struct irqaction cascade_mv64340 = {
-        no_action, IRQF_DISABLED, CPU_MASK_NONE, "cascade via MV64340", NULL, NULL
-};
-extern void ll_uart_irq(void);
-extern void ll_cpci_irq(void);
-asmlinkage void plat_irq_dispatch(void)
-{
-        unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM;
-        if (pending & STATUSF_IP0)
-                do_IRQ(0);
-        else if (pending & STATUSF_IP1)
-                do_IRQ(1);
-        else if (pending & STATUSF_IP2)
-                do_IRQ(2);
-        else if (pending & STATUSF_IP3)
-                ll_uart_irq();
-        else if (pending & STATUSF_IP4)
-                do_IRQ(4);
-        else if (pending & STATUSF_IP5)
-                ll_cpci_irq();
-        else if (pending & STATUSF_IP6)
-                ll_mv64340_irq();
-        else if (pending & STATUSF_IP7)
-                do_IRQ(7);
-        else
-                spurious_interrupt();
-}
-void __init arch_init_irq(void)
-{
-        /*
-         * Clear all of the interrupts while we change the able around a bit.
-         * int-handler is not on bootstrap
-         */
-        clear_c0_status(ST0_IM);
-        mips_cpu_irq_init();
-        /* set up the cascading interrupts */
-        setup_irq(3, &cascade_fpga);
-        setup_irq(5, &cascade_fpga);
-        setup_irq(6, &cascade_mv64340);
-        mv64340_irq_init(16);
-        uart_irq_init();
-        cpci_irq_init();
-}
diff --git a/arch/mips/momentum/ocelot_c/platform.c b/arch/mips/momentum/ocelot_c/platform.c
deleted file mode 100644
index 7780aa0c65..0000000000
--- a/arch/mips/momentum/ocelot_c/platform.c
+++ /dev/null
@@ -1,183 +0,0 @@
-#include <linux/delay.h>
-#include <linux/if_ether.h>
-#include <linux/ioport.h>
-#include <linux/mv643xx.h>
-#include <linux/platform_device.h>
-#include "ocelot_c_fpga.h"
-#if defined(CONFIG_MV643XX_ETH) || defined(CONFIG_MV643XX_ETH_MODULE)
-static struct resource mv643xx_eth_shared_resources[] = {
-        [0] = {
-                .name   = "ethernet shared base",
-                .start  = 0xf1000000 + MV643XX_ETH_SHARED_REGS,
-                .end    = 0xf1000000 + MV643XX_ETH_SHARED_REGS +
-                                       MV643XX_ETH_SHARED_REGS_SIZE - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-static struct platform_device mv643xx_eth_shared_device = {
-        .name           = MV643XX_ETH_SHARED_NAME,
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(mv643xx_eth_shared_resources),
-        .resource       = mv643xx_eth_shared_resources,
-};
-#define MV_SRAM_BASE                    0xfe000000UL
-#define MV_SRAM_SIZE                    (256 * 1024)
-#define MV_SRAM_RXRING_SIZE             (MV_SRAM_SIZE / 4)
-#define MV_SRAM_TXRING_SIZE             (MV_SRAM_SIZE / 4)
-#define MV_SRAM_BASE_ETH0               MV_SRAM_BASE
-#define MV_SRAM_BASE_ETH1               (MV_SRAM_BASE + (MV_SRAM_SIZE / 2))
-#define MV64x60_IRQ_ETH_0 48
-#define MV64x60_IRQ_ETH_1 49
-static struct resource mv64x60_eth0_resources[] = {
-        [0] = {
-                .name   = "eth0 irq",
-                .start  = MV64x60_IRQ_ETH_0,
-                .end    = MV64x60_IRQ_ETH_0,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-static struct mv643xx_eth_platform_data eth0_pd = {
-        .port_number    = 0,
-        .tx_sram_addr   = MV_SRAM_BASE_ETH0,
-        .tx_sram_size   = MV_SRAM_TXRING_SIZE,
-        .tx_queue_size  = MV_SRAM_TXRING_SIZE / 16,
-        .rx_sram_addr   = MV_SRAM_BASE_ETH0 + MV_SRAM_TXRING_SIZE,
-        .rx_sram_size   = MV_SRAM_RXRING_SIZE,
-        .rx_queue_size  = MV_SRAM_RXRING_SIZE / 16,
-};
-static struct platform_device eth0_device = {
-        .name           = MV643XX_ETH_NAME,
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(mv64x60_eth0_resources),
-        .resource       = mv64x60_eth0_resources,
-        .dev = {
-                .platform_data = &eth0_pd,
-        },
-};
-static struct resource mv64x60_eth1_resources[] = {
-        [0] = {
-                .name   = "eth1 irq",
-                .start  = MV64x60_IRQ_ETH_1,
-                .end    = MV64x60_IRQ_ETH_1,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-static struct mv643xx_eth_platform_data eth1_pd = {
-        .port_number    = 1,
-        .tx_sram_addr   = MV_SRAM_BASE_ETH1,
-        .tx_sram_size   = MV_SRAM_TXRING_SIZE,
-        .tx_queue_size  = MV_SRAM_TXRING_SIZE / 16,
-        .rx_sram_addr   = MV_SRAM_BASE_ETH1 + MV_SRAM_TXRING_SIZE,
-        .rx_sram_size   = MV_SRAM_RXRING_SIZE,
-        .rx_queue_size  = MV_SRAM_RXRING_SIZE / 16,
-};
-static struct platform_device eth1_device = {
-        .name           = MV643XX_ETH_NAME,
-        .id             = 1,
-        .num_resources  = ARRAY_SIZE(mv64x60_eth1_resources),
-        .resource       = mv64x60_eth1_resources,
-        .dev = {
-                .platform_data = &eth1_pd,
-        },
-};
-static struct platform_device *mv643xx_eth_pd_devs[] __initdata = {
-        &mv643xx_eth_shared_device,
-        &eth0_device,
-        &eth1_device,
-        /* The third port is not wired up on the Ocelot C */
-};
-static u8 __init exchange_bit(u8 val, u8 cs)
-{
-        /* place the data */
-        OCELOT_FPGA_WRITE((val << 2) | cs, EEPROM_MODE);
-        udelay(1);
-        /* turn the clock on */
-        OCELOT_FPGA_WRITE((val << 2) | cs | 0x2, EEPROM_MODE);
-        udelay(1);
-        /* turn the clock off and read-strobe */
-        OCELOT_FPGA_WRITE((val << 2) | cs | 0x10, EEPROM_MODE);
-        /* return the data */
-        return (OCELOT_FPGA_READ(EEPROM_MODE) >> 3) & 0x1;
-}
-static void __init get_mac(char dest[6])
-{
-        u8 read_opcode[12] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-        int i,j;
-        for (i = 0; i < 12; i++)
-                exchange_bit(read_opcode[i], 1);
-        for (j = 0; j < 6; j++) {
-                dest[j] = 0;
-                for (i = 0; i < 8; i++) {
-                        dest[j] <<= 1;
-                        dest[j] |= exchange_bit(0, 1);
-                }
-        }
-        /* turn off CS */
-        exchange_bit(0,0);
-}
-/*
- * Copy and increment ethernet MAC address by a small value.
- *
- * This is useful for systems where the only one MAC address is stored in
- * non-volatile memory for multiple ports.
- */
-static inline void eth_mac_add(unsigned char *dst, unsigned char *src,
-        unsigned int add)
-{
-        int i;
-        BUG_ON(add >= 256);
-        for (i = ETH_ALEN; i >= 0; i--) {
-                dst[i] = src[i] + add;
-                add = dst[i] < src[i];          /* compute carry */
-        }
-        WARN_ON(add);
-}
-static int __init mv643xx_eth_add_pds(void)
-{
-        unsigned char mac[ETH_ALEN];
-        int ret;
-        get_mac(mac);
-        eth_mac_add(eth0_pd.mac_addr, mac, 0);
-        eth_mac_add(eth1_pd.mac_addr, mac, 1);
-        ret = platform_add_devices(mv643xx_eth_pd_devs,
-                        ARRAY_SIZE(mv643xx_eth_pd_devs));
-        return ret;
-}
-device_initcall(mv643xx_eth_add_pds);
-#endif /* defined(CONFIG_MV643XX_ETH) || defined(CONFIG_MV643XX_ETH_MODULE) */
diff --git a/arch/mips/momentum/ocelot_c/prom.c b/arch/mips/momentum/ocelot_c/prom.c
deleted file mode 100644
index b689ceea8c..0000000000
--- a/arch/mips/momentum/ocelot_c/prom.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright 2002 Momentum Computer Inc.
- * Author: Matthew Dharm <mdharm@momenco.com>
- *
- * Louis Hamilton, Red Hat, Inc.
- *   hamilton@redhat.com  [MIPS64 modifications]
- *
- * Based on Ocelot Linux port, which is
- * Copyright 2001 MontaVista Software Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- *
- * 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.
- */
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/bootmem.h>
-#include <linux/mv643xx.h>
-#include <asm/addrspace.h>
-#include <asm/bootinfo.h>
-#include <asm/pmon.h>
-#include "ocelot_c_fpga.h"
-struct callvectors* debug_vectors;
-extern unsigned long marvell_base;
-extern unsigned int cpu_clock;
-const char *get_system_type(void)
-{
-#ifdef CONFIG_CPU_SR71000
-        return "Momentum Ocelot-CS";
-#else
-        return "Momentum Ocelot-C";
-#endif
-}
-#ifdef CONFIG_64BIT
-unsigned long signext(unsigned long addr)
-{
-  addr &= 0xffffffff;
-  return (unsigned long)((int)addr);
-}
-void *get_arg(unsigned long args, int arc)
-{
-  unsigned long ul;
-  unsigned char *puc, uc;
-  args += (arc * 4);
-  ul = (unsigned long)signext(args);
-  puc = (unsigned char *)ul;
-  if (puc == 0)
-    return (void *)0;
-#ifdef CONFIG_CPU_LITTLE_ENDIAN
-  uc = *puc++;
-  ul = (unsigned long)uc;
-  uc = *puc++;
-  ul |= (((unsigned long)uc) << 8);
-  uc = *puc++;
-  ul |= (((unsigned long)uc) << 16);
-  uc = *puc++;
-  ul |= (((unsigned long)uc) << 24);
-#else  /* CONFIG_CPU_LITTLE_ENDIAN */
-  uc = *puc++;
-  ul = ((unsigned long)uc) << 24;
-  uc = *puc++;
-  ul |= (((unsigned long)uc) << 16);
-  uc = *puc++;
-  ul |= (((unsigned long)uc) << 8);
-  uc = *puc++;
-  ul |= ((unsigned long)uc);
-#endif  /* CONFIG_CPU_LITTLE_ENDIAN */
-  ul = signext(ul);
-  return (void *)ul;
-}
-char *arg64(unsigned long addrin, int arg_index)
-{
-  unsigned long args;
-  char *p;
-  args = signext(addrin);
-  p = (char *)get_arg(args, arg_index);
-  return p;
-}
-#endif  /* CONFIG_64BIT */
-void __init prom_init(void)
-{
-        int argc = fw_arg0;
-        char **arg = (char **) fw_arg1;
-        char **env = (char **) fw_arg2;
-        struct callvectors *cv = (struct callvectors *) fw_arg3;
-        int i;
-#ifdef CONFIG_64BIT
-        char *ptr;
-        printk("prom_init - MIPS64\n");
-        /* save the PROM vectors for debugging use */
-        debug_vectors = (struct callvectors *)signext((unsigned long)cv);
-        /* arg[0] is "g", the rest is boot parameters */
-        arcs_cmdline[0] = '\0';
-        for (i = 1; i < argc; i++) {
-                ptr = (char *)arg64((unsigned long)arg, i);
-                if ((strlen(arcs_cmdline) + strlen(ptr) + 1) >=
-                    sizeof(arcs_cmdline))
-                        break;
-                strcat(arcs_cmdline, ptr);
-                strcat(arcs_cmdline, " ");
-        }
-        i = 0;
-        while (1) {
-                ptr = (char *)arg64((unsigned long)env, i);
-                if (! ptr)
-                        break;
-                if (strncmp("gtbase", ptr, strlen("gtbase")) == 0) {
-                        marvell_base = simple_strtol(ptr + strlen("gtbase="),
-                                                        NULL, 16);
-                        if ((marvell_base & 0xffffffff00000000) == 0)
-                                marvell_base |= 0xffffffff00000000;
-                        printk("marvell_base set to 0x%016lx\n", marvell_base);
-                }
-                if (strncmp("cpuclock", ptr, strlen("cpuclock")) == 0) {
-                        cpu_clock = simple_strtol(ptr + strlen("cpuclock="),
-                                                        NULL, 10);
-                        printk("cpu_clock set to %d\n", cpu_clock);
-                }
-                i++;
-        }
-        printk("arcs_cmdline: %s\n", arcs_cmdline);
-#else   /* CONFIG_64BIT */
-        /* save the PROM vectors for debugging use */
-        debug_vectors = cv;
-        /* arg[0] is "g", the rest is boot parameters */
-        arcs_cmdline[0] = '\0';
-        for (i = 1; i < argc; i++) {
-                if (strlen(arcs_cmdline) + strlen(arg[i] + 1)
-                    >= sizeof(arcs_cmdline))
-                        break;
-                strcat(arcs_cmdline, arg[i]);
-                strcat(arcs_cmdline, " ");
-        }
-        while (*env) {
-                if (strncmp("gtbase", *env, strlen("gtbase")) == 0) {
-                        marvell_base = simple_strtol(*env + strlen("gtbase="),
-                                                        NULL, 16);
-                }
-                if (strncmp("cpuclock", *env, strlen("cpuclock")) == 0) {
-                        cpu_clock = simple_strtol(*env + strlen("cpuclock="),
-                                                        NULL, 10);
-                }
-                env++;
-        }
-#endif /* CONFIG_64BIT */
-        mips_machgroup = MACH_GROUP_MOMENCO;
-        mips_machtype = MACH_MOMENCO_OCELOT_C;
-#ifndef CONFIG_64BIT
-        debug_vectors->printf("Booting Linux kernel...\n");
-#endif
-}
-void __init prom_free_prom_memory(void)
-{
-}
diff --git a/arch/mips/momentum/ocelot_c/reset.c b/arch/mips/momentum/ocelot_c/reset.c
deleted file mode 100644
index 3fdcb64ff1..0000000000
--- a/arch/mips/momentum/ocelot_c/reset.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.
- *
- * Copyright (C) 1997, 2001 Ralf Baechle
- * Copyright 2001 MontaVista Software Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- *
- * Copyright (C) 2002 Momentum Computer Inc.
- * Author: Matthew Dharm <mdharm@momenco.com>
- *
- * Louis Hamilton, Red Hat, Inc.
- * hamilton@redhat.com  [MIPS64 modifications]
- */
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/processor.h>
-#include <asm/reboot.h>
-#include <asm/system.h>
-#include <linux/delay.h>
-void momenco_ocelot_restart(char *command)
-{
-        /* base address of timekeeper portion of part */
-        void *nvram = (void *)
-#ifdef CONFIG_64BIT
-                0xfffffffffc807000;
-#else
-                0xfc807000;
-#endif
-        /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */
-        writeb(0x84, nvram + 0xff7);
-        /* wait for the watchdog to go off */
-        mdelay(100+(1000/16));
-        /* if the watchdog fails for some reason, let people know */
-        printk(KERN_NOTICE "Watchdog reset failed\n");
-}
-void momenco_ocelot_halt(void)
-{
-        printk(KERN_NOTICE "\n** You can safely turn off the power\n");
-        while (1)
-                __asm__(".set\tmips3\n\t"
-                        "wait\n\t"
-                        ".set\tmips0");
-}
-void momenco_ocelot_power_off(void)
-{
-        momenco_ocelot_halt();
-}
diff --git a/arch/mips/momentum/ocelot_c/setup.c b/arch/mips/momentum/ocelot_c/setup.c
deleted file mode 100644
index 0b6b2338cf..0000000000
--- a/arch/mips/momentum/ocelot_c/setup.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * BRIEF MODULE DESCRIPTION
- * Momentum Computer Ocelot-C and -CS board dependent boot routines
- *
- * Copyright (C) 1996, 1997, 2001  Ralf Baechle
- * Copyright (C) 2000 RidgeRun, Inc.
- * Copyright (C) 2001 Red Hat, Inc.
- * Copyright (C) 2002 Momentum Computer
- *
- * Author: Matthew Dharm, Momentum Computer
- *   mdharm@momenco.com
- *
- * Louis Hamilton, Red Hat, Inc.
- *   hamilton@redhat.com  [MIPS64 modifications]
- *
- * Author: RidgeRun, Inc.
- *   glonnon@ridgerun.com, skranz@ridgerun.com, stevej@ridgerun.com
- *
- * Copyright 2001 MontaVista Software Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-#include <linux/bcd.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/swap.h>
-#include <linux/ioport.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/pm.h>
-#include <linux/timex.h>
-#include <linux/vmalloc.h>
-#include <linux/mv643xx.h>
-#include <asm/time.h>
-#include <asm/bootinfo.h>
-#include <asm/page.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/pci.h>
-#include <asm/processor.h>
-#include <asm/reboot.h>
-#include <asm/marvell.h>
-#include <linux/bootmem.h>
-#include <linux/blkdev.h>
-#include "ocelot_c_fpga.h"
-unsigned long marvell_base;
-unsigned int cpu_clock;
-/* These functions are used for rebooting or halting the machine*/
-extern void momenco_ocelot_restart(char *command);
-extern void momenco_ocelot_halt(void);
-extern void momenco_ocelot_power_off(void);
-void momenco_time_init(void);
-static char reset_reason;
-void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1, unsigned long entryhi, unsigned long pagemask);
-static unsigned long ENTRYLO(unsigned long paddr)
-{
-        return ((paddr & PAGE_MASK) |
-               (_PAGE_PRESENT | __READABLE | __WRITEABLE | _PAGE_GLOBAL |
-                _CACHE_UNCACHED)) >> 6;
-}
-/* setup code for a handoff from a version 2 PMON 2000 PROM */
-void PMON_v2_setup(void)
-{
-        /* Some wired TLB entries for the MV64340 and perhiperals. The
-           MV64340 is going to be hit on every IRQ anyway - there's
-           absolutely no point in letting it be a random TLB entry, as
-           it'll just cause needless churning of the TLB. And we use
-           the other half for the serial port, which is just a PITA
-           otherwise :)
-                Device                  Physical        Virtual
-                MV64340 Internal Regs   0xf4000000      0xf4000000
-                Ocelot-C[S] PLD (CS0)   0xfc000000      0xfc000000
-                NVRAM (CS1)             0xfc800000      0xfc800000
-                UARTs (CS2)             0xfd000000      0xfd000000
-                Internal SRAM           0xfe000000      0xfe000000
-                M-Systems DOC (CS3)     0xff000000      0xff000000
-        */
-  printk("PMON_v2_setup\n");
-#ifdef CONFIG_64BIT
-        /* marvell and extra space */
-        add_wired_entry(ENTRYLO(0xf4000000), ENTRYLO(0xf4010000), 0xfffffffff4000000, PM_64K);
-        /* fpga, rtc, and uart */
-        add_wired_entry(ENTRYLO(0xfc000000), ENTRYLO(0xfd000000), 0xfffffffffc000000, PM_16M);
-        /* m-sys and internal SRAM */
-        add_wired_entry(ENTRYLO(0xfe000000), ENTRYLO(0xff000000), 0xfffffffffe000000, PM_16M);
-        marvell_base = 0xfffffffff4000000;
-#else
-        /* marvell and extra space */
-        add_wired_entry(ENTRYLO(0xf4000000), ENTRYLO(0xf4010000), 0xf4000000, PM_64K);
-        /* fpga, rtc, and uart */
-        add_wired_entry(ENTRYLO(0xfc000000), ENTRYLO(0xfd000000), 0xfc000000, PM_16M);
-        /* m-sys and internal SRAM */
-        add_wired_entry(ENTRYLO(0xfe000000), ENTRYLO(0xff000000), 0xfe000000, PM_16M);
-        marvell_base = 0xf4000000;
-#endif
-}
-unsigned long m48t37y_get_time(void)
-{
-#ifdef CONFIG_64BIT
-        unsigned char *rtc_base = (unsigned char*)0xfffffffffc800000;
-#else
-        unsigned char* rtc_base = (unsigned char*)0xfc800000;
-#endif
-        unsigned int year, month, day, hour, min, sec;
-        unsigned long flags;
-        spin_lock_irqsave(&rtc_lock, flags);
-        /* stop the update */
-        rtc_base[0x7ff8] = 0x40;
-        year = BCD2BIN(rtc_base[0x7fff]);
-        year += BCD2BIN(rtc_base[0x7ff1]) * 100;
-        month = BCD2BIN(rtc_base[0x7ffe]);
-        day = BCD2BIN(rtc_base[0x7ffd]);
-        hour = BCD2BIN(rtc_base[0x7ffb]);
-        min = BCD2BIN(rtc_base[0x7ffa]);
-        sec = BCD2BIN(rtc_base[0x7ff9]);
-        /* start the update */
-        rtc_base[0x7ff8] = 0x00;
-        spin_unlock_irqrestore(&rtc_lock, flags);
-        return mktime(year, month, day, hour, min, sec);
-}
-int m48t37y_set_time(unsigned long sec)
-{
-#ifdef CONFIG_64BIT
-        unsigned char* rtc_base = (unsigned char*)0xfffffffffc800000;
-#else
-        unsigned char* rtc_base = (unsigned char*)0xfc800000;
-#endif
-        struct rtc_time tm;
-        unsigned long flags;
-        /* convert to a more useful format -- note months count from 0 */
-        to_tm(sec, &tm);
-        tm.tm_mon += 1;
-        spin_lock_irqsave(&rtc_lock, flags);
-        /* enable writing */
-        rtc_base[0x7ff8] = 0x80;
-        /* year */
-        rtc_base[0x7fff] = BIN2BCD(tm.tm_year % 100);
-        rtc_base[0x7ff1] = BIN2BCD(tm.tm_year / 100);
-        /* month */
-        rtc_base[0x7ffe] = BIN2BCD(tm.tm_mon);
-        /* day */
-        rtc_base[0x7ffd] = BIN2BCD(tm.tm_mday);
-        /* hour/min/sec */
-        rtc_base[0x7ffb] = BIN2BCD(tm.tm_hour);
-        rtc_base[0x7ffa] = BIN2BCD(tm.tm_min);
-        rtc_base[0x7ff9] = BIN2BCD(tm.tm_sec);
-        /* day of week -- not really used, but let's keep it up-to-date */
-        rtc_base[0x7ffc] = BIN2BCD(tm.tm_wday + 1);
-        /* disable writing */
-        rtc_base[0x7ff8] = 0x00;
-        spin_unlock_irqrestore(&rtc_lock, flags);
-        return 0;
-}
-void __init plat_timer_setup(struct irqaction *irq)
-{
-        setup_irq(7, irq);
-}
-void momenco_time_init(void)
-{
-#ifdef CONFIG_CPU_SR71000
-        mips_hpt_frequency = cpu_clock;
-#elif defined(CONFIG_CPU_RM7000)
-        mips_hpt_frequency = cpu_clock / 2;
-#else
-#error Unknown CPU for this board
-#endif
-        printk("momenco_time_init cpu_clock=%d\n", cpu_clock);
-        rtc_mips_get_time = m48t37y_get_time;
-        rtc_mips_set_time = m48t37y_set_time;
-}
-void __init plat_mem_setup(void)
-{
-        unsigned int tmpword;
-        board_time_init = momenco_time_init;
-        _machine_restart = momenco_ocelot_restart;
-        _machine_halt = momenco_ocelot_halt;
-        pm_power_off = momenco_ocelot_power_off;
-        /*
-         * initrd_start = (unsigned long)ocelot_initrd_start;
-         * initrd_end = (unsigned long)ocelot_initrd_start + (ulong)ocelot_initrd_size;
-         * initrd_below_start_ok = 1;
-         */
-        /* do handoff reconfiguration */
-        PMON_v2_setup();
-        /* shut down ethernet ports, just to be sure our memory doesn't get
-         * corrupted by random ethernet traffic.
-         */
-        MV_WRITE(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(0), 0xff << 8);
-        MV_WRITE(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(1), 0xff << 8);
-        MV_WRITE(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(0), 0xff << 8);
-        MV_WRITE(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(1), 0xff << 8);
-        do {}
-          while (MV_READ(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(0)) & 0xff);
-        do {}
-          while (MV_READ(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(1)) & 0xff);
-        do {}
-          while (MV_READ(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(0)) & 0xff);
-        do {}
-          while (MV_READ(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(1)) & 0xff);
-        MV_WRITE(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(0),
-                 MV_READ(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(0)) & ~1);
-        MV_WRITE(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(1),
-                 MV_READ(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(1)) & ~1);
-        /* Turn off the Bit-Error LED */
-        OCELOT_FPGA_WRITE(0x80, CLR);
-        tmpword = OCELOT_FPGA_READ(BOARDREV);
-#ifdef CONFIG_CPU_SR71000
-        if (tmpword < 26)
-                printk("Momenco Ocelot-CS: Board Assembly Rev. %c\n",
-                        'A'+tmpword);
-        else
-                printk("Momenco Ocelot-CS: Board Assembly Revision #0x%x\n",
-                        tmpword);
-#else
-        if (tmpword < 26)
-                printk("Momenco Ocelot-C: Board Assembly Rev. %c\n",
-                        'A'+tmpword);
-        else
-                printk("Momenco Ocelot-C: Board Assembly Revision #0x%x\n",
-                        tmpword);
-#endif
-        tmpword = OCELOT_FPGA_READ(FPGA_REV);
-        printk("FPGA Rev: %d.%d\n", tmpword>>4, tmpword&15);
-        tmpword = OCELOT_FPGA_READ(RESET_STATUS);
-        printk("Reset reason: 0x%x\n", tmpword);
-        switch (tmpword) {
-                case 0x1:
-                        printk("  - Power-up reset\n");
-                        break;
-                case 0x2:
-                        printk("  - Push-button reset\n");
-                        break;
-                case 0x4:
-                        printk("  - cPCI bus reset\n");
-                        break;
-                case 0x8:
-                        printk("  - Watchdog reset\n");
-                        break;
-                case 0x10:
-                        printk("  - Software reset\n");
-                        break;
-                default:
-                        printk("  - Unknown reset cause\n");
-        }
-        reset_reason = tmpword;
-        OCELOT_FPGA_WRITE(0xff, RESET_STATUS);
-        tmpword = OCELOT_FPGA_READ(CPCI_ID);
-        printk("cPCI ID register: 0x%02x\n", tmpword);
-        printk("  - Slot number: %d\n", tmpword & 0x1f);
-        printk("  - PCI bus present: %s\n", tmpword & 0x40 ? "yes" : "no");
-        printk("  - System Slot: %s\n", tmpword & 0x20 ? "yes" : "no");
-        tmpword = OCELOT_FPGA_READ(BOARD_STATUS);
-        printk("Board Status register: 0x%02x\n", tmpword);
-        printk("  - User jumper: %s\n", (tmpword & 0x80)?"installed":"absent");
-        printk("  - Boot flash write jumper: %s\n", (tmpword&0x40)?"installed":"absent");
-        printk("  - L3 Cache size: %d MiB\n", (1<<((tmpword&12) >> 2))&~1);
-        printk("  - SDRAM size: %d MiB\n", 1<<(6+(tmpword&3)));
-        switch(tmpword &3) {
-        case 3:
-                /* 512MiB */
-                add_memory_region(0x0, 0x200<<20, BOOT_MEM_RAM);
-                break;
-        case 2:
-                /* 256MiB */
-                add_memory_region(0x0, 0x100<<20, BOOT_MEM_RAM);
-                break;
-        case 1:
-                /* 128MiB */
-                add_memory_region(0x0,  0x80<<20, BOOT_MEM_RAM);
-                break;
-        case 0:
-                /* 1GiB -- needs CONFIG_HIGHMEM */
-                add_memory_region(0x0, 0x400<<20, BOOT_MEM_RAM);
-                break;
-        }
-}
-/*
- * This needs to be one of the first initcalls, because no I/O port access
- * can work before this
- */
-static int io_base_ioremap(void)
-{
-        void __iomem * io_remap_range = ioremap(0xc0000000UL, 0x10000);
-        if (!io_remap_range)
-                panic("Could not ioremap I/O port range");
-        set_io_port_base((unsigned long) io_remap_range);
-        return 0;
-}
-module_init(io_base_ioremap);
diff --git a/arch/mips/momentum/ocelot_c/uart-irq.c b/arch/mips/momentum/ocelot_c/uart-irq.c
deleted file mode 100644
index de1a31ee52..0000000000
--- a/arch/mips/momentum/ocelot_c/uart-irq.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2002 Momentum Computer
- * Author: mdharm@momenco.com
- *
- * arch/mips/momentum/ocelot_c/uart-irq.c
- *     Interrupt routines for UARTs.  Interrupt numbers are assigned from
- *     80 to 81 (2 interrupt sources).
- *
- * 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.
- */
-#include <linux/module.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/kernel_stat.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include "ocelot_c_fpga.h"
-static inline int ls1bit8(unsigned int x)
-{
-        int b = 7, s;
-        s =  4; if (((unsigned char)(x << 4)) == 0) s = 0; b -= s; x <<= s;
-        s =  2; if (((unsigned char)(x << 2)) == 0) s = 0; b -= s; x <<= s;
-        s =  1; if (((unsigned char)(x << 1)) == 0) s = 0; b -= s;
-        return b;
-}
-/* mask off an interrupt -- 0 is enable, 1 is disable */
-static inline void mask_uart_irq(unsigned int irq)
-{
-        uint8_t value;
-        value = OCELOT_FPGA_READ(UART_INTMASK);
-        value |= 1 << (irq - 74);
-        OCELOT_FPGA_WRITE(value, UART_INTMASK);
-        /* read the value back to assure that it's really been written */
-        value = OCELOT_FPGA_READ(UART_INTMASK);
-}
-/* unmask an interrupt -- 0 is enable, 1 is disable */
-static inline void unmask_uart_irq(unsigned int irq)
-{
-        uint8_t value;
-        value = OCELOT_FPGA_READ(UART_INTMASK);
-        value &= ~(1 << (irq - 74));
-        OCELOT_FPGA_WRITE(value, UART_INTMASK);
-        /* read the value back to assure that it's really been written */
-        value = OCELOT_FPGA_READ(UART_INTMASK);
-}
-/*
- * Interrupt handler for interrupts coming from the FPGA chip.
- */
-void ll_uart_irq(void)
-{
-        unsigned int irq_src, irq_mask;
-        /* read the interrupt status registers */
-        irq_src = OCELOT_FPGA_READ(UART_INTSTAT);
-        irq_mask = OCELOT_FPGA_READ(UART_INTMASK);
-        /* mask for just the interrupts we want */
-        irq_src &= ~irq_mask;
-        do_IRQ(ls1bit8(irq_src) + 74);
-}
-struct irq_chip uart_irq_type = {
-        .name = "UART/FPGA",
-        .ack = mask_uart_irq,
-        .mask = mask_uart_irq,
-        .mask_ack = mask_uart_irq,
-        .unmask = unmask_uart_irq,
-};
-void uart_irq_init(void)
-{
-        set_irq_chip_and_handler(80, &uart_irq_type, handle_level_irq);
-        set_irq_chip_and_handler(81, &uart_irq_type, handle_level_irq);
-}
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index aba3dbf47e..c58bd3d036 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -2,16 +2,14 @@
 # Makefile for the PCI specific kernel interface routines under Linux.
 #
-obj-y                           += pci.o pci-dac.o
+obj-y                           += pci.o
 #
 # PCI bus host bridge specific code
 #
 obj-$(CONFIG_MIPS_BONITO64)     += ops-bonito64.o
 obj-$(CONFIG_PCI_GT64XXX_PCI0)  += ops-gt64xxx_pci0.o
-obj-$(CONFIG_PCI_MARVELL)       += ops-marvell.o
 obj-$(CONFIG_MIPS_MSC)          += ops-msc.o
-obj-$(CONFIG_MIPS_NILE4)        += ops-nile4.o
 obj-$(CONFIG_MIPS_TX3927)       += ops-tx3927.o
 obj-$(CONFIG_PCI_VR41XX)        += ops-vr41xx.o pci-vr41xx.o
 obj-$(CONFIG_NEC_CMBVR4133)     += fixup-vr4133.o
@@ -22,17 +20,17 @@ obj-$(CONFIG_MARKEINS)		+= ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o
 #
 obj-$(CONFIG_BASLER_EXCITE)     += ops-titan.o pci-excite.o fixup-excite.o
 obj-$(CONFIG_DDB5477)           += fixup-ddb5477.o pci-ddb5477.o ops-ddb5477.o
-obj-$(CONFIG_LASAT)             += pci-lasat.o
 obj-$(CONFIG_MIPS_ATLAS)        += fixup-atlas.o
 obj-$(CONFIG_MIPS_COBALT)       += fixup-cobalt.o
-obj-$(CONFIG_MIPS_EV64120)      += pci-ev64120.o
 obj-$(CONFIG_SOC_AU1500)        += fixup-au1000.o ops-au1000.o
 obj-$(CONFIG_SOC_AU1550)        += fixup-au1000.o ops-au1000.o
 obj-$(CONFIG_SOC_PNX8550)       += fixup-pnx8550.o ops-pnx8550.o
+obj-$(CONFIG_LEMOTE_FULONG)     += fixup-lm2e.o ops-bonito64.o
 obj-$(CONFIG_MIPS_MALTA)        += fixup-malta.o
 obj-$(CONFIG_MOMENCO_OCELOT)    += fixup-ocelot.o pci-ocelot.o
-obj-$(CONFIG_MOMENCO_OCELOT_3)  += fixup-ocelot3.o
+obj-$(CONFIG_PMC_MSP7120_GW)    += fixup-pmcmsp.o ops-pmcmsp.o
-obj-$(CONFIG_MOMENCO_OCELOT_C)  += fixup-ocelot-c.o pci-ocelot-c.o
+obj-$(CONFIG_PMC_MSP7120_EVAL)  += fixup-pmcmsp.o ops-pmcmsp.o
+obj-$(CONFIG_PMC_MSP7120_FPGA)  += fixup-pmcmsp.o ops-pmcmsp.o
 obj-$(CONFIG_PMC_YOSEMITE)      += fixup-yosemite.o ops-titan.o ops-titan-ht.o \
                                   pci-yosemite.o
 obj-$(CONFIG_SGI_IP27)          += ops-bridge.o pci-ip27.o
diff --git a/arch/mips/pci/fixup-atlas.c b/arch/mips/pci/fixup-atlas.c
index c6cd6e9cdf..45224fd2c7 100644
--- a/arch/mips/pci/fixup-atlas.c
+++ b/arch/mips/pci/fixup-atlas.c
@@ -58,7 +58,7 @@ static char irq_tab[][5] __initdata = {
        {0,     0,      0,      0,      0 }     /* 21: Unused */
 };
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        return irq_tab[slot][pin];
 }
diff --git a/arch/mips/pci/fixup-au1000.c b/arch/mips/pci/fixup-au1000.c
index c2f8304fe5..ca0276c807 100644
--- a/arch/mips/pci/fixup-au1000.c
+++ b/arch/mips/pci/fixup-au1000.c
@@ -35,7 +35,7 @@
 extern char irq_tab_alchemy[][5];
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        return irq_tab_alchemy[slot][pin];
 }
diff --git a/arch/mips/pci/fixup-capcella.c b/arch/mips/pci/fixup-capcella.c
index 1e53075193..1416bca6d1 100644
--- a/arch/mips/pci/fixup-capcella.c
+++ b/arch/mips/pci/fixup-capcella.c
@@ -38,7 +38,7 @@ static char irq_tab_capcella[][5] __initdata = {
 [14] = { -1, INTA, INTB, INTC, INTD }
 };
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        return irq_tab_capcella[slot][pin];
 }
diff --git a/arch/mips/pci/fixup-cobalt.c b/arch/mips/pci/fixup-cobalt.c
index d57ffd7242..76b4f0ffb1 100644
--- a/arch/mips/pci/fixup-cobalt.c
+++ b/arch/mips/pci/fixup-cobalt.c
@@ -58,8 +58,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1,
 static void qube_raq_galileo_fixup(struct pci_dev *dev)
 {
-        unsigned short galileo_id;
        if (dev->devfn != PCI_DEVFN(0, 0))
                return;
@@ -84,16 +82,14 @@ static void qube_raq_galileo_fixup(struct pci_dev *dev)
         * Therefore we must set the disconnect/retry cycle values to
         * something sensible when using the new Galileo.
         */
-        pci_read_config_word(dev, PCI_REVISION_ID, &galileo_id);
-        galileo_id &= 0xff;     /* mask off class info */
-        printk(KERN_INFO "Galileo: revision %u\n", galileo_id);
+        printk(KERN_INFO "Galileo: revision %u\n", dev->revision);
 #if 0
-        if (galileo_id >= 0x10) {
+        if (dev->revision >= 0x10) {
                /* New Galileo, assumes PCI stop line to VIA is connected. */
                GT_WRITE(GT_PCI0_TOR_OFS, 0x4020);
-        } else if (galileo_id == 0x1 || galileo_id == 0x2)
+        } else if (dev->revision == 0x1 || dev->revision == 0x2)
 #endif
        {
                signed int timeo;
@@ -161,7 +157,7 @@ static char irq_tab_raq2[] __initdata = {
  [COBALT_PCICONF_ETH1]    = COBALT_ETH1_IRQ
 };
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        if (cobalt_board_id < COBALT_BRD_ID_QUBE2)
                return irq_tab_qube1[slot];
diff --git a/arch/mips/pci/fixup-emma2rh.c b/arch/mips/pci/fixup-emma2rh.c
index 7abcfd175d..a270589556 100644
--- a/arch/mips/pci/fixup-emma2rh.c
+++ b/arch/mips/pci/fixup-emma2rh.c
@@ -89,7 +89,7 @@ static void __devinit emma2rh_pci_host_fixup(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_EMMA2RH,
                         emma2rh_pci_host_fixup);
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        return irq_map[slot][pin];
 }
diff --git a/arch/mips/pci/fixup-excite.c b/arch/mips/pci/fixup-excite.c
index 1da696d43f..cd64d9f177 100644
--- a/arch/mips/pci/fixup-excite.c
+++ b/arch/mips/pci/fixup-excite.c
@@ -21,7 +21,7 @@
 #include <linux/pci.h>
 #include <excite.h>
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        if (pin == 0)
                return -1;
diff --git a/arch/mips/pci/fixup-ip32.c b/arch/mips/pci/fixup-ip32.c
index 3e66b0aa63..190fffd08d 100644
--- a/arch/mips/pci/fixup-ip32.c
+++ b/arch/mips/pci/fixup-ip32.c
@@ -39,7 +39,7 @@ static char irq_tab_mace[][5] __initdata = {
 * irqs.  I suppose a device without a pin A will thank us for doing it
 * right if there exists such a broken piece of crap.
 */
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        return irq_tab_mace[slot][pin];
 }
diff --git a/arch/mips/pci/fixup-jmr3927.c b/arch/mips/pci/fixup-jmr3927.c
index 73d1850351..e974394be7 100644
--- a/arch/mips/pci/fixup-jmr3927.c
+++ b/arch/mips/pci/fixup-jmr3927.c
@@ -33,7 +33,7 @@
 #include <asm/jmr3927/jmr3927.h>
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        unsigned char irq = pin;
diff --git a/arch/mips/pci/fixup-lm2e.c b/arch/mips/pci/fixup-lm2e.c
new file mode 100644
index 0000000000..e18ae4f574
--- /dev/null
+++ b/arch/mips/pci/fixup-lm2e.c
@@ -0,0 +1,242 @@
+/*
+ * fixup-lm2e.c
+ *
+ * Copyright (C) 2004 ICT CAS
+ * Author: Li xiaoyu, ICT CAS
+ *   lixy@ict.ac.cn
+ *
+ * Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology
+ * Author: Fuxin Zhang, zhangfx@lemote.com
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <asm/mips-boards/bonito64.h>
+/* South bridge slot number is set by the pci probe process */
+static u8 sb_slot = 5;
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+{
+        int irq = 0;
+        if (slot == sb_slot) {
+                switch (PCI_FUNC(dev->devfn)) {
+                case 2:
+                        irq = 10;
+                        break;
+                case 3:
+                        irq = 11;
+                        break;
+                case 5:
+                        irq = 9;
+                        break;
+                }
+        } else {
+                irq = BONITO_IRQ_BASE + 25 + pin;
+        }
+        return irq;
+}
+/* Do platform specific device initialization at pci_enable_device() time */
+int pcibios_plat_dev_init(struct pci_dev *dev)
+{
+        return 0;
+}
+static void __init loongson2e_nec_fixup(struct pci_dev *pdev)
+{
+        unsigned int val;
+        /* Configues port 1, 2, 3, 4 to be validate*/
+        pci_read_config_dword(pdev, 0xe0, &val);
+        pci_write_config_dword(pdev, 0xe0, (val & ~7) | 0x4);
+        /* System clock is 48-MHz Oscillator. */
+        pci_write_config_dword(pdev, 0xe4, 1 << 5);
+}
+static void __init loongson2e_686b_func0_fixup(struct pci_dev *pdev)
+{
+        unsigned char c;
+        sb_slot = PCI_SLOT(pdev->devfn);
+        printk(KERN_INFO "via686b fix: ISA bridge\n");
+        /*  Enable I/O Recovery time */
+        pci_write_config_byte(pdev, 0x40, 0x08);
+        /*  Enable ISA refresh */
+        pci_write_config_byte(pdev, 0x41, 0x01);
+        /*  disable ISA line buffer */
+        pci_write_config_byte(pdev, 0x45, 0x00);
+        /*  Gate INTR, and flush line buffer */
+        pci_write_config_byte(pdev, 0x46, 0xe0);
+        /*  Disable PCI Delay Transaction, Enable EISA ports 4D0/4D1. */
+        /* pci_write_config_byte(pdev, 0x47, 0x20); */
+        /*
+         *  enable PCI Delay Transaction, Enable EISA ports 4D0/4D1.
+         *  enable time-out timer
+         */
+        pci_write_config_byte(pdev, 0x47, 0xe6);
+        /*
+         * enable level trigger on pci irqs: 9,10,11,13
+         * important! without this PCI interrupts won't work
+         */
+        outb(0x2e, 0x4d1);
+        /*  512 K PCI Decode */
+        pci_write_config_byte(pdev, 0x48, 0x01);
+        /*  Wait for PGNT before grant to ISA Master/DMA */
+        pci_write_config_byte(pdev, 0x4a, 0x84);
+        /*
+         * Plug'n'Play
+         *
+         *  Parallel DRQ 3, Floppy DRQ 2 (default)
+         */
+        pci_write_config_byte(pdev, 0x50, 0x0e);
+        /*
+         * IRQ Routing for Floppy and Parallel port
+         *
+         *  IRQ 6 for floppy, IRQ 7 for parallel port
+         */
+        pci_write_config_byte(pdev, 0x51, 0x76);
+        /* IRQ Routing for serial ports (take IRQ 3 and 4) */
+        pci_write_config_byte(pdev, 0x52, 0x34);
+        /*  All IRQ's level triggered. */
+        pci_write_config_byte(pdev, 0x54, 0x00);
+        /* route PIRQA-D irq */
+        pci_write_config_byte(pdev, 0x55, 0x90);        /* bit 7-4, PIRQA */
+        pci_write_config_byte(pdev, 0x56, 0xba);        /* bit 7-4, PIRQC; */
+                                                        /* 3-0, PIRQB */
+        pci_write_config_byte(pdev, 0x57, 0xd0);        /* bit 7-4, PIRQD */
+        /* enable function 5/6, audio/modem */
+        pci_read_config_byte(pdev, 0x85, &c);
+        c &= ~(0x3 << 2);
+        pci_write_config_byte(pdev, 0x85, c);
+        printk(KERN_INFO"via686b fix: ISA bridge done\n");
+}
+static void __init loongson2e_686b_func1_fixup(struct pci_dev *pdev)
+{
+        printk(KERN_INFO"via686b fix: IDE\n");
+        /* Modify IDE controller setup */
+        pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 48);
+        pci_write_config_byte(pdev, PCI_COMMAND,
+                              PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
+                              PCI_COMMAND_MASTER);
+        pci_write_config_byte(pdev, 0x40, 0x0b);
+        /* legacy mode */
+        pci_write_config_byte(pdev, 0x42, 0x09);
+#if 1/* play safe, otherwise we may see notebook's usb keyboard lockup */
+        /* disable read prefetch/write post buffers */
+        pci_write_config_byte(pdev, 0x41, 0x02);
+        /* use 3/4 as fifo thresh hold  */
+        pci_write_config_byte(pdev, 0x43, 0x0a);
+        pci_write_config_byte(pdev, 0x44, 0x00);
+        pci_write_config_byte(pdev, 0x45, 0x00);
+#else
+        pci_write_config_byte(pdev, 0x41, 0xc2);
+        pci_write_config_byte(pdev, 0x43, 0x35);
+        pci_write_config_byte(pdev, 0x44, 0x1c);
+        pci_write_config_byte(pdev, 0x45, 0x10);
+#endif
+        printk(KERN_INFO"via686b fix: IDE done\n");
+}
+static void __init loongson2e_686b_func2_fixup(struct pci_dev *pdev)
+{
+        /* irq routing */
+        pci_write_config_byte(pdev, PCI_INTERRUPT_LINE, 10);
+}
+static void __init loongson2e_686b_func3_fixup(struct pci_dev *pdev)
+{
+        /* irq routing */
+        pci_write_config_byte(pdev, PCI_INTERRUPT_LINE, 11);
+}
+static void __init loongson2e_686b_func5_fixup(struct pci_dev *pdev)
+{
+        unsigned int val;
+        unsigned char c;
+        /* enable IO */
+        pci_write_config_byte(pdev, PCI_COMMAND,
+                              PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
+                              PCI_COMMAND_MASTER);
+        pci_read_config_dword(pdev, 0x4, &val);
+        pci_write_config_dword(pdev, 0x4, val | 1);
+        /* route ac97 IRQ */
+        pci_write_config_byte(pdev, 0x3c, 9);
+        pci_read_config_byte(pdev, 0x8, &c);
+        /* link control: enable link & SGD PCM output */
+        pci_write_config_byte(pdev, 0x41, 0xcc);
+        /* disable game port, FM, midi, sb, enable write to reg2c-2f */
+        pci_write_config_byte(pdev, 0x42, 0x20);
+        /* we are using Avance logic codec */
+        pci_write_config_word(pdev, 0x2c, 0x1005);
+        pci_write_config_word(pdev, 0x2e, 0x4710);
+        pci_read_config_dword(pdev, 0x2c, &val);
+        pci_write_config_byte(pdev, 0x42, 0x0);
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686,
+                         loongson2e_686b_func0_fixup);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1,
+                         loongson2e_686b_func1_fixup);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_2,
+                         loongson2e_686b_func2_fixup);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3,
+                         loongson2e_686b_func3_fixup);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5,
+                         loongson2e_686b_func5_fixup);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_USB,
+                         loongson2e_nec_fixup);
diff --git a/arch/mips/pci/fixup-malta.c b/arch/mips/pci/fixup-malta.c
index bf2c41d1e9..0f48498bc2 100644
--- a/arch/mips/pci/fixup-malta.c
+++ b/arch/mips/pci/fixup-malta.c
@@ -36,7 +36,7 @@ static char irq_tab[][5] __initdata = {
        {0,     PCID,   PCIA,   PCIB,   PCIC }  /* 21: PCI Slot 4 */
 };
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        int virq;
        virq = irq_tab[slot][pin];
diff --git a/arch/mips/pci/fixup-mpc30x.c b/arch/mips/pci/fixup-mpc30x.c
index 3c9ae41f75..5911596257 100644
--- a/arch/mips/pci/fixup-mpc30x.c
+++ b/arch/mips/pci/fixup-mpc30x.c
@@ -34,7 +34,7 @@ static const int irq_tab_mpc30x[] __initdata = {
 [29] = MQ200_IRQ,
 };
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        if (slot == 30)
                return internal_func_irqs[PCI_FUNC(dev->devfn)];
diff --git a/arch/mips/pci/fixup-ocelot-c.c b/arch/mips/pci/fixup-ocelot-c.c
deleted file mode 100644
index d45494807a..0000000000
--- a/arch/mips/pci/fixup-ocelot-c.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2002 Momentum Computer Inc.
- * Author: Matthew Dharm <mdharm@momenco.com>
- *
- * Based on work for the Linux port to the Ocelot board, which is
- * Copyright 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- * arch/mips/momentum/ocelot_g/pci.c
- *     Board-specific PCI routines for mv64340 controller.
- *
- * 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.
- */
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-        int bus = dev->bus->number;
-        if (bus == 0 && slot == 1)
-                return 2;       /* PCI-X A */
-        if (bus == 1 && slot == 1)
-                return 12;      /* PCI-X B */
-        if (bus == 1 && slot == 2)
-                return 4;       /* PCI B */
-return 0;
-        panic("Whooops in pcibios_map_irq");
-}
-/* Do platform specific device initialization at pci_enable_device() time */
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
-        return 0;
-}
diff --git a/arch/mips/pci/fixup-ocelot3.c b/arch/mips/pci/fixup-ocelot3.c
deleted file mode 100644
index ececc03ec6..0000000000
--- a/arch/mips/pci/fixup-ocelot3.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2004 Montavista Software Inc.
- * Author: Manish Lachwani (mlachwani@mvista.com)
- *
- * Looking at the schematics for the Ocelot-3 board, there are
- * two PCI busses and each bus has two PCI slots.
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <asm/mipsregs.h>
-/*
- * Do platform specific device initialization at
- * pci_enable_device() time
- */
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
-        return 0;
-}
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-        int bus = dev->bus->number;
-        if (bus == 0 && slot == 1)
-                return 2;       /* PCI-X A */
-        if (bus == 0 && slot == 2)
-                return 3;       /* PCI-X B */
-        if (bus == 1 && slot == 1)
-                return 4;       /* PCI A */
-        if (bus == 1 && slot == 2)
-                return 5;       /* PCI B */
-return 0;
-        panic("Whooops in pcibios_map_irq");
-}
diff --git a/arch/mips/pci/fixup-pmcmsp.c b/arch/mips/pci/fixup-pmcmsp.c
new file mode 100644
index 0000000000..00261211db
--- /dev/null
+++ b/arch/mips/pci/fixup-pmcmsp.c
@@ -0,0 +1,216 @@
+/*
+ * PMC-Sierra MSP board specific pci fixups.
+ *
+ * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2005-2007 PMC-Sierra, Inc
+ *
+ * Author: MontaVista Software, Inc.
+ *              ppopov@mvista.com or source@mvista.com
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifdef CONFIG_PCI
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <asm/byteorder.h>
+#include <msp_pci.h>
+#include <msp_cic_int.h>
+/* PCI interrupt pins */
+#define IRQ4    MSP_INT_EXT4
+#define IRQ5    MSP_INT_EXT5
+#define IRQ6    MSP_INT_EXT6
+#if defined(CONFIG_PMC_MSP7120_GW)
+/* Garibaldi Board IRQ wiring to PCI slots */
+static char irq_tab[][5] __initdata = {
+        /* INTA    INTB    INTC    INTD */
+        {0,     0,      0,      0,      0 },    /*    (AD[0]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[1]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[2]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[3]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[4]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[5]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[6]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[7]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[8]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[9]): Unused */
+        {0,     0,      0,      0,      0 },    /*  0 (AD[10]): Unused */
+        {0,     0,      0,      0,      0 },    /*  1 (AD[11]): Unused */
+        {0,     0,      0,      0,      0 },    /*  2 (AD[12]): Unused */
+        {0,     0,      0,      0,      0 },    /*  3 (AD[13]): Unused */
+        {0,     0,      0,      0,      0 },    /*  4 (AD[14]): Unused */
+        {0,     0,      0,      0,      0 },    /*  5 (AD[15]): Unused */
+        {0,     0,      0,      0,      0 },    /*  6 (AD[16]): Unused */
+        {0,     0,      0,      0,      0 },    /*  7 (AD[17]): Unused */
+        {0,     0,      0,      0,      0 },    /*  8 (AD[18]): Unused */
+        {0,     0,      0,      0,      0 },    /*  9 (AD[19]): Unused */
+        {0,     0,      0,      0,      0 },    /* 10 (AD[20]): Unused */
+        {0,     0,      0,      0,      0 },    /* 11 (AD[21]): Unused */
+        {0,     0,      0,      0,      0 },    /* 12 (AD[22]): Unused */
+        {0,     0,      0,      0,      0 },    /* 13 (AD[23]): Unused */
+        {0,     0,      0,      0,      0 },    /* 14 (AD[24]): Unused */
+        {0,     0,      0,      0,      0 },    /* 15 (AD[25]): Unused */
+        {0,     0,      0,      0,      0 },    /* 16 (AD[26]): Unused */
+        {0,     0,      0,      0,      0 },    /* 17 (AD[27]): Unused */
+        {0,     IRQ4,   IRQ4,   0,      0 },    /* 18 (AD[28]): slot 0 */
+        {0,     0,      0,      0,      0 },    /* 19 (AD[29]): Unused */
+        {0,     IRQ5,   IRQ5,   0,      0 },    /* 20 (AD[30]): slot 1 */
+        {0,     IRQ6,   IRQ6,   0,      0 }     /* 21 (AD[31]): slot 2 */
+};
+#elif defined(CONFIG_PMC_MSP7120_EVAL)
+/* MSP7120 Eval Board IRQ wiring to PCI slots */
+static char irq_tab[][5] __initdata = {
+        /* INTA    INTB    INTC    INTD */
+        {0,     0,      0,      0,      0 },    /*    (AD[0]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[1]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[2]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[3]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[4]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[5]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[6]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[7]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[8]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[9]): Unused */
+        {0,     0,      0,      0,      0 },    /*  0 (AD[10]): Unused */
+        {0,     0,      0,      0,      0 },    /*  1 (AD[11]): Unused */
+        {0,     0,      0,      0,      0 },    /*  2 (AD[12]): Unused */
+        {0,     0,      0,      0,      0 },    /*  3 (AD[13]): Unused */
+        {0,     0,      0,      0,      0 },    /*  4 (AD[14]): Unused */
+        {0,     0,      0,      0,      0 },    /*  5 (AD[15]): Unused */
+        {0,     IRQ6,   IRQ6,   0,      0 },    /*  6 (AD[16]): slot 3 (mini) */
+        {0,     IRQ5,   IRQ5,   0,      0 },    /*  7 (AD[17]): slot 2 (mini) */
+        {0,     IRQ4,   IRQ4,   IRQ4,   IRQ4},  /*  8 (AD[18]): slot 0 (PCI) */
+        {0,     IRQ5,   IRQ5,   IRQ5,   IRQ5},  /*  9 (AD[19]): slot 1 (PCI) */
+        {0,     0,      0,      0,      0 },    /* 10 (AD[20]): Unused */
+        {0,     0,      0,      0,      0 },    /* 11 (AD[21]): Unused */
+        {0,     0,      0,      0,      0 },    /* 12 (AD[22]): Unused */
+        {0,     0,      0,      0,      0 },    /* 13 (AD[23]): Unused */
+        {0,     0,      0,      0,      0 },    /* 14 (AD[24]): Unused */
+        {0,     0,      0,      0,      0 },    /* 15 (AD[25]): Unused */
+        {0,     0,      0,      0,      0 },    /* 16 (AD[26]): Unused */
+        {0,     0,      0,      0,      0 },    /* 17 (AD[27]): Unused */
+        {0,     0,      0,      0,      0 },    /* 18 (AD[28]): Unused */
+        {0,     0,      0,      0,      0 },    /* 19 (AD[29]): Unused */
+        {0,     0,      0,      0,      0 },    /* 20 (AD[30]): Unused */
+        {0,     0,      0,      0,      0 }     /* 21 (AD[31]): Unused */
+};
+#else
+/* Unknown board -- don't assign any IRQs */
+static char irq_tab[][5] __initdata = {
+        /* INTA    INTB    INTC    INTD */
+        {0,     0,      0,      0,      0 },    /*    (AD[0]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[1]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[2]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[3]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[4]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[5]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[6]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[7]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[8]): Unused */
+        {0,     0,      0,      0,      0 },    /*    (AD[9]): Unused */
+        {0,     0,      0,      0,      0 },    /*  0 (AD[10]): Unused */
+        {0,     0,      0,      0,      0 },    /*  1 (AD[11]): Unused */
+        {0,     0,      0,      0,      0 },    /*  2 (AD[12]): Unused */
+        {0,     0,      0,      0,      0 },    /*  3 (AD[13]): Unused */
+        {0,     0,      0,      0,      0 },    /*  4 (AD[14]): Unused */
+        {0,     0,      0,      0,      0 },    /*  5 (AD[15]): Unused */
+        {0,     0,      0,      0,      0 },    /*  6 (AD[16]): Unused */
+        {0,     0,      0,      0,      0 },    /*  7 (AD[17]): Unused */
+        {0,     0,      0,      0,      0 },    /*  8 (AD[18]): Unused */
+        {0,     0,      0,      0,      0 },    /*  9 (AD[19]): Unused */
+        {0,     0,      0,      0,      0 },    /* 10 (AD[20]): Unused */
+        {0,     0,      0,      0,      0 },    /* 11 (AD[21]): Unused */
+        {0,     0,      0,      0,      0 },    /* 12 (AD[22]): Unused */
+        {0,     0,      0,      0,      0 },    /* 13 (AD[23]): Unused */
+        {0,     0,      0,      0,      0 },    /* 14 (AD[24]): Unused */
+        {0,     0,      0,      0,      0 },    /* 15 (AD[25]): Unused */
+        {0,     0,      0,      0,      0 },    /* 16 (AD[26]): Unused */
+        {0,     0,      0,      0,      0 },    /* 17 (AD[27]): Unused */
+        {0,     0,      0,      0,      0 },    /* 18 (AD[28]): Unused */
+        {0,     0,      0,      0,      0 },    /* 19 (AD[29]): Unused */
+        {0,     0,      0,      0,      0 },    /* 20 (AD[30]): Unused */
+        {0,     0,      0,      0,      0 }     /* 21 (AD[31]): Unused */
+};
+#endif
+/*****************************************************************************
+ *
+ *  FUNCTION: pcibios_plat_dev_init
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: Perform platform specific device initialization at
+ *               pci_enable_device() time.
+ *               None are needed for the MSP7120 PCI Controller.
+ *
+ *  INPUTS:      dev     - structure describing the PCI device
+ *
+ *  OUTPUTS:     none
+ *
+ *  RETURNS:     PCIBIOS_SUCCESSFUL
+ *
+ ****************************************************************************/
+int pcibios_plat_dev_init(struct pci_dev *dev)
+{
+        return PCIBIOS_SUCCESSFUL;
+}
+/*****************************************************************************
+ *
+ *  FUNCTION: pcibios_map_irq
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: Perform board supplied PCI IRQ mapping routine.
+ *
+ *  INPUTS:      dev     - unused
+ *               slot    - PCI slot. Identified by which bit of the AD[] bus
+ *                         drives the IDSEL line. AD[10] is 0, AD[31] is
+ *                         slot 21.
+ *               pin     - numbered using the scheme of the PCI_INTERRUPT_PIN
+ *                         field of the config header.
+ *
+ *  OUTPUTS:     none
+ *
+ *  RETURNS:     IRQ number
+ *
+ ****************************************************************************/
+int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+#if !defined(CONFIG_PMC_MSP7120_GW) && !defined(CONFIG_PMC_MSP7120_EVAL)
+        printk(KERN_WARNING "PCI: unknown board, no PCI IRQs assigned.\n");
+#endif
+        printk(KERN_WARNING "PCI: irq_tab returned %d for slot=%d pin=%d\n",
+                irq_tab[slot][pin], slot, pin);
+        return irq_tab[slot][pin];
+}
+#endif  /* CONFIG_PCI */
diff --git a/arch/mips/pci/fixup-pnx8550.c b/arch/mips/pci/fixup-pnx8550.c
index 50546dab66..96857ac63b 100644
--- a/arch/mips/pci/fixup-pnx8550.c
+++ b/arch/mips/pci/fixup-pnx8550.c
@@ -45,7 +45,7 @@ void __init pcibios_fixup(void)
        /* nothing to do here */
 }
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        return pnx8550_irq_tab[slot][pin];
 }
diff --git a/arch/mips/pci/fixup-rbtx4927.c b/arch/mips/pci/fixup-rbtx4927.c
index ceeb186089..3cdbecb8e7 100644
--- a/arch/mips/pci/fixup-rbtx4927.c
+++ b/arch/mips/pci/fixup-rbtx4927.c
@@ -119,7 +119,7 @@ int pci_get_irq(struct pci_dev *dev, int pin)
        return irq;
 }
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        unsigned char irq;
diff --git a/arch/mips/pci/fixup-sni.c b/arch/mips/pci/fixup-sni.c
index 36e5fb1b37..a45bedd172 100644
--- a/arch/mips/pci/fixup-sni.c
+++ b/arch/mips/pci/fixup-sni.c
@@ -120,7 +120,7 @@ static inline int is_rm300_revd(void)
        return (csmsr & 0xa0) == 0x20;
 }
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        switch (sni_brd_type) {
        case SNI_BRD_PCI_TOWER:
diff --git a/arch/mips/pci/fixup-tb0219.c b/arch/mips/pci/fixup-tb0219.c
index 734f2b71e1..720a2b720c 100644
--- a/arch/mips/pci/fixup-tb0219.c
+++ b/arch/mips/pci/fixup-tb0219.c
@@ -23,7 +23,7 @@
 #include <asm/vr41xx/tb0219.h>
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        int irq = -1;
diff --git a/arch/mips/pci/fixup-tb0226.c b/arch/mips/pci/fixup-tb0226.c
index c9e7cb4361..e3eedf4bf9 100644
--- a/arch/mips/pci/fixup-tb0226.c
+++ b/arch/mips/pci/fixup-tb0226.c
@@ -23,7 +23,7 @@
 #include <asm/vr41xx/giu.h>
 #include <asm/vr41xx/tb0226.h>
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        int irq = -1;
diff --git a/arch/mips/pci/fixup-tb0287.c b/arch/mips/pci/fixup-tb0287.c
index fbe6bcb281..267ab3dc3d 100644
--- a/arch/mips/pci/fixup-tb0287.c
+++ b/arch/mips/pci/fixup-tb0287.c
@@ -22,7 +22,7 @@
 #include <asm/vr41xx/tb0287.h>
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        unsigned char bus;
        int irq = -1;
diff --git a/arch/mips/pci/fixup-tx4938.c b/arch/mips/pci/fixup-tx4938.c
index f455520ada..2485f47dfe 100644
--- a/arch/mips/pci/fixup-tx4938.c
+++ b/arch/mips/pci/fixup-tx4938.c
@@ -69,7 +69,7 @@ int pci_get_irq(struct pci_dev *dev, int pin)
        return irq;
 }
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        unsigned char irq = 0;
diff --git a/arch/mips/pci/fixup-vr4133.c b/arch/mips/pci/fixup-vr4133.c
index a8d9d22b13..de5e5f6bbf 100644
--- a/arch/mips/pci/fixup-vr4133.c
+++ b/arch/mips/pci/fixup-vr4133.c
@@ -169,7 +169,7 @@ void i8259_init(void)
 }
 #endif
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        extern int pci_probe_only;
        pci_probe_only = 1;
diff --git a/arch/mips/pci/fixup-wrppmc.c b/arch/mips/pci/fixup-wrppmc.c
index 3357c1300b..3d277549d5 100644
--- a/arch/mips/pci/fixup-wrppmc.c
+++ b/arch/mips/pci/fixup-wrppmc.c
@@ -25,7 +25,7 @@ static char pci_irq_tab[PCI_SLOT_MAXNR][5] __initdata = {
        [6] = {0, WRPPMC_PCI_INTA_IRQ, 0, 0, 0},
 };
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        return pci_irq_tab[slot][pin];
 }
diff --git a/arch/mips/pci/fixup-yosemite.c b/arch/mips/pci/fixup-yosemite.c
index 81d77a587a..fdafb13a79 100644
--- a/arch/mips/pci/fixup-yosemite.c
+++ b/arch/mips/pci/fixup-yosemite.c
@@ -26,7 +26,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        if (pin == 0)
                return -1;
diff --git a/arch/mips/pci/ops-bonito64.c b/arch/mips/pci/ops-bonito64.c
index dc35270b65..f742c51acf 100644
--- a/arch/mips/pci/ops-bonito64.c
+++ b/arch/mips/pci/ops-bonito64.c
@@ -29,83 +29,60 @@
 #define PCI_ACCESS_READ  0
 #define PCI_ACCESS_WRITE 1
-/*
+#ifdef CONFIG_LEMOTE_FULONG
- *  PCI configuration cycle AD bus definition
+#define CFG_SPACE_REG(offset) (void *)CKSEG1ADDR(BONITO_PCICFG_BASE | (offset))
- */
+#define ID_SEL_BEGIN 11
-/* Type 0 */
+#else
-#define PCI_CFG_TYPE0_REG_SHF           0
+#define CFG_SPACE_REG(offset) (void *)CKSEG1ADDR(_pcictrl_bonito_pcicfg + (offset))
-#define PCI_CFG_TYPE0_FUNC_SHF          8
+#define ID_SEL_BEGIN 10
+#endif
+#define MAX_DEV_NUM (31 - ID_SEL_BEGIN)
-/* Type 1 */
-#define PCI_CFG_TYPE1_REG_SHF           0
-#define PCI_CFG_TYPE1_FUNC_SHF          8
-#define PCI_CFG_TYPE1_DEV_SHF           11
-#define PCI_CFG_TYPE1_BUS_SHF           16
 static int bonito64_pcibios_config_access(unsigned char access_type,
                                      struct pci_bus *bus,
                                      unsigned int devfn, int where,
                                      u32 * data)
 {
-        unsigned char busnum = bus->number;
+        u32 busnum = bus->number;
+        u32 addr, type;
        u32 dummy;
-        u64 pci_addr;
+        void *addrp;
+        int device = PCI_SLOT(devfn);
-        /* Algorithmics Bonito64 system controller. */
+        int function = PCI_FUNC(devfn);
+        int reg = where & ~3;
-        if ((busnum == 0) && (PCI_SLOT(devfn) > 21)) {
-                /* We number bus 0 devices from 0..21 */
-                return -1;
-        }
-        /* Clear cause register bits */
-        BONITO_PCICMD |= (BONITO_PCICMD_MABORT_CLR |
-                          BONITO_PCICMD_MTABORT_CLR);
-        /*
-         * Setup pattern to be used as PCI "address" for
-         * Type 0 cycle
-         */
        if (busnum == 0) {
-                /* IDSEL */
+                /* Type 0 configuration for onboard PCI bus */
-                pci_addr = (u64) 1 << (PCI_SLOT(devfn) + 10);
+                if (device > MAX_DEV_NUM)
-        } else {
+                        return -1;
-                /* Bus number */
-                pci_addr = busnum << PCI_CFG_TYPE1_BUS_SHF;
-                /* Device number */
-                pci_addr |=
-                    PCI_SLOT(devfn) << PCI_CFG_TYPE1_DEV_SHF;
-        }
-        /* Function (same for Type 0/1) */
-        pci_addr |= PCI_FUNC(devfn) << PCI_CFG_TYPE0_FUNC_SHF;
-        /* Register number (same for Type 0/1) */
-        pci_addr |= (where & ~0x3) << PCI_CFG_TYPE0_REG_SHF;
-        if (busnum == 0) {
+                addr = (1 << (device + ID_SEL_BEGIN)) | (function << 8) | reg;
-                /* Type 0 */
+                type = 0;
-                BONITO_PCIMAP_CFG = pci_addr >> 16;
        } else {
-                /* Type 1 */
+                /* Type 1 configuration for offboard PCI bus */
-                BONITO_PCIMAP_CFG = (pci_addr >> 16) | 0x10000;
+                addr = (busnum << 16) | (device << 11) | (function << 8) | reg;
+                type = 0x10000;
        }
-        pci_addr &= 0xffff;
+        /* Clear aborts */
+        BONITO_PCICMD |= BONITO_PCICMD_MABORT_CLR | BONITO_PCICMD_MTABORT_CLR;
+        BONITO_PCIMAP_CFG = (addr >> 16) | type;
        /* Flush Bonito register block */
        dummy = BONITO_PCIMAP_CFG;
-        iob();          /* sync */
+        mmiowb();
-        /* Perform access */
+        addrp = CFG_SPACE_REG(addr & 0xffff);
        if (access_type == PCI_ACCESS_WRITE) {
-                *(volatile u32 *) (_pcictrl_bonito_pcicfg + (u32)pci_addr) = *(u32 *) data;
+                writel(cpu_to_le32(*data), addrp);
+#ifndef CONFIG_LEMOTE_FULONG
                /* Wait till done */
                while (BONITO_PCIMSTAT & 0xF);
+#endif
        } else {
-                *(u32 *) data = *(volatile u32 *) (_pcictrl_bonito_pcicfg + (u32)pci_addr);
+                *data = le32_to_cpu(readl(addrp));
        }
        /* Detect Master/Target abort */
@@ -121,6 +98,7 @@ static int bonito64_pcibios_config_access(unsigned char access_type,
        }
        return 0;
 }
diff --git a/arch/mips/pci/ops-marvell.c b/arch/mips/pci/ops-marvell.c
deleted file mode 100644
index 1ac5c59199..0000000000
--- a/arch/mips/pci/ops-marvell.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2003, 2004 Ralf Baechle (ralf@linux-mips.org)
- */
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <asm/marvell.h>
-static int mv_read_config(struct pci_bus *bus, unsigned int devfn,
-        int where, int size, u32 * val)
-{
-        struct mv_pci_controller *mvbc = bus->sysdata;
-        unsigned long address_reg, data_reg;
-        u32 address;
-        address_reg = mvbc->config_addr;
-        data_reg = mvbc->config_vreg;
-        /* Accessing device 31 crashes those Marvells.  Since years.
-           Will they ever make sane controllers ... */
-        if (PCI_SLOT(devfn) == 31)
-                return PCIBIOS_DEVICE_NOT_FOUND;
-        address = (bus->number << 16) | (devfn << 8) |
-                  (where & 0xfc) | 0x80000000;
-        /* start the configuration cycle */
-        MV_WRITE(address_reg, address);
-        switch (size) {
-        case 1:
-                *val = MV_READ_8(data_reg + (where & 0x3));
-                break;
-        case 2:
-                *val = MV_READ_16(data_reg + (where & 0x3));
-                break;
-        case 4:
-                *val = MV_READ(data_reg);
-                break;
-        }
-        return PCIBIOS_SUCCESSFUL;
-}
-static int mv_write_config(struct pci_bus *bus, unsigned int devfn,
-        int where, int size, u32 val)
-{
-        struct mv_pci_controller *mvbc = bus->sysdata;
-        unsigned long address_reg, data_reg;
-        u32 address;
-        address_reg = mvbc->config_addr;
-        data_reg = mvbc->config_vreg;
-        /* Accessing device 31 crashes those Marvells.  Since years.
-           Will they ever make sane controllers ... */
-        if (PCI_SLOT(devfn) == 31)
-                return PCIBIOS_DEVICE_NOT_FOUND;
-        address = (bus->number << 16) | (devfn << 8) |
-                  (where & 0xfc) | 0x80000000;
-        /* start the configuration cycle */
-        MV_WRITE(address_reg, address);
-        switch (size) {
-        case 1:
-                MV_WRITE_8(data_reg + (where & 0x3), val);
-                break;
-        case 2:
-                MV_WRITE_16(data_reg + (where & 0x3), val);
-                break;
-        case 4:
-                MV_WRITE(data_reg, val);
-                break;
-        }
-        return PCIBIOS_SUCCESSFUL;
-}
-struct pci_ops mv_pci_ops = {
-        .read   = mv_read_config,
-        .write  = mv_write_config
-};
diff --git a/arch/mips/pci/ops-nile4.c b/arch/mips/pci/ops-nile4.c
deleted file mode 100644
index a8d38dc8c5..0000000000
--- a/arch/mips/pci/ops-nile4.c
+++ /dev/null
@@ -1,147 +0,0 @@
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <asm/bootinfo.h>
-#include <asm/lasat/lasat.h>
-#include <asm/gt64120.h>
-#include <asm/nile4.h>
-#define PCI_ACCESS_READ  0
-#define PCI_ACCESS_WRITE 1
-#define LO(reg) (reg / 4)
-#define HI(reg) (reg / 4 + 1)
-volatile unsigned long *const vrc_pciregs = (void *) Vrc5074_BASE;
-static DEFINE_SPINLOCK(nile4_pci_lock);
-static int nile4_pcibios_config_access(unsigned char access_type,
-        struct pci_bus *bus, unsigned int devfn, int where, u32 * val)
-{
-        unsigned char busnum = bus->number;
-        u32 adr, mask, err;
-        if ((busnum == 0) && (PCI_SLOT(devfn) > 8))
-                /* The addressing scheme chosen leaves room for just
-                 * 8 devices on the first busnum (besides the PCI
-                 * controller itself) */
-                return PCIBIOS_DEVICE_NOT_FOUND;
-        if ((busnum == 0) && (devfn == PCI_DEVFN(0, 0))) {
-                /* Access controller registers directly */
-                if (access_type == PCI_ACCESS_WRITE) {
-                        vrc_pciregs[(0x200 + where) >> 2] = *val;
-                } else {
-                        *val = vrc_pciregs[(0x200 + where) >> 2];
-                }
-                return PCIBIOS_SUCCESSFUL;
-        }
-        /* Temporarily map PCI Window 1 to config space */
-        mask = vrc_pciregs[LO(NILE4_PCIINIT1)];
-        vrc_pciregs[LO(NILE4_PCIINIT1)] = 0x0000001a | (busnum ? 0x200 : 0);
-        /* Clear PCI Error register. This also clears the Error Type
-         * bits in the Control register */
-        vrc_pciregs[LO(NILE4_PCIERR)] = 0;
-        vrc_pciregs[HI(NILE4_PCIERR)] = 0;
-        /* Setup address */
-        if (busnum == 0)
-                adr =
-                    KSEG1ADDR(PCI_WINDOW1) +
-                    ((1 << (PCI_SLOT(devfn) + 15)) | (PCI_FUNC(devfn) << 8)
-                     | (where & ~3));
-        else
-                adr = KSEG1ADDR(PCI_WINDOW1) | (busnum << 16) | (devfn << 8) |
-                      (where & ~3);
-        if (access_type == PCI_ACCESS_WRITE)
-                *(u32 *) adr = *val;
-        else
-                *val = *(u32 *) adr;
-        /* Check for master or target abort */
-        err = (vrc_pciregs[HI(NILE4_PCICTRL)] >> 5) & 0x7;
-        /* Restore PCI Window 1 */
-        vrc_pciregs[LO(NILE4_PCIINIT1)] = mask;
-        if (err)
-                return PCIBIOS_DEVICE_NOT_FOUND;
-        return PCIBIOS_SUCCESSFUL;
-}
-static int nile4_pcibios_read(struct pci_bus *bus, unsigned int devfn,
-        int where, int size, u32 * val)
-{
-        unsigned long flags;
-        u32 data = 0;
-        int err;
-        if ((size == 2) && (where & 1))
-                return PCIBIOS_BAD_REGISTER_NUMBER;
-        else if ((size == 4) && (where & 3))
-                return PCIBIOS_BAD_REGISTER_NUMBER;
-        spin_lock_irqsave(&nile4_pci_lock, flags);
-        err = nile4_pcibios_config_access(PCI_ACCESS_READ, bus, devfn, where,
-                                        &data);
-        spin_unlock_irqrestore(&nile4_pci_lock, flags);
-        if (err)
-                return err;
-        if (size == 1)
-                *val = (data >> ((where & 3) << 3)) & 0xff;
-        else if (size == 2)
-                *val = (data >> ((where & 3) << 3)) & 0xffff;
-        else
-                *val = data;
-        return PCIBIOS_SUCCESSFUL;
-}
-static int nile4_pcibios_write(struct pci_bus *bus, unsigned int devfn,
-        int where, int size, u32 val)
-{
-        unsigned long flags;
-        u32 data = 0;
-        int err;
-        if ((size == 2) && (where & 1))
-                return PCIBIOS_BAD_REGISTER_NUMBER;
-        else if ((size == 4) && (where & 3))
-                return PCIBIOS_BAD_REGISTER_NUMBER;
-        spin_lock_irqsave(&nile4_pci_lock, flags);
-        err = nile4_pcibios_config_access(PCI_ACCESS_READ, bus, devfn, where,
-                                          &data);
-        spin_unlock_irqrestore(&nile4_pci_lock, flags);
-        if (err)
-                return err;
-        if (size == 1)
-                data = (data & ~(0xff << ((where & 3) << 3))) |
-                    (val << ((where & 3) << 3));
-        else if (size == 2)
-                data = (data & ~(0xffff << ((where & 3) << 3))) |
-                    (val << ((where & 3) << 3));
-        else
-                data = val;
-        if (nile4_pcibios_config_access
-            (PCI_ACCESS_WRITE, bus, devfn, where, &data))
-                return -1;
-        return PCIBIOS_SUCCESSFUL;
-}
-struct pci_ops nile4_pci_ops = {
-        .read = nile4_pcibios_read,
-        .write = nile4_pcibios_write,
-};
diff --git a/arch/mips/pci/ops-pmcmsp.c b/arch/mips/pci/ops-pmcmsp.c
new file mode 100644
index 0000000000..09fa007c1d
--- /dev/null
+++ b/arch/mips/pci/ops-pmcmsp.c
@@ -0,0 +1,994 @@
+/*
+ * PMC-Sierra MSP board specific pci_ops
+ *
+ * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2005-2007 PMC-Sierra, Inc
+ *
+ * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
+ *
+ * Much of the code is derived from the original DDB5074 port by
+ * Geert Uytterhoeven <geert@sonycom.com>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+#define PCI_COUNTERS    1
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/interrupt.h>
+#if defined(CONFIG_PROC_FS) && defined(PCI_COUNTERS)
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
+#endif /* CONFIG_PROC_FS && PCI_COUNTERS */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <asm/byteorder.h>
+#if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL)
+#include <asm/mipsmtregs.h>
+#endif
+#include <msp_prom.h>
+#include <msp_cic_int.h>
+#include <msp_pci.h>
+#include <msp_regs.h>
+#include <msp_regops.h>
+#define PCI_ACCESS_READ         0
+#define PCI_ACCESS_WRITE        1
+#if defined(CONFIG_PROC_FS) && defined(PCI_COUNTERS)
+static char proc_init;
+extern struct proc_dir_entry *proc_bus_pci_dir;
+unsigned int pci_int_count[32];
+static void pci_proc_init(void);
+/*****************************************************************************
+ *
+ *  FUNCTION: read_msp_pci_counts
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: Prints the count of how many times each PCI
+ *               interrupt has asserted. Can be invoked by the
+ *               /proc filesystem.
+ *
+ *  INPUTS:      page    - part of STDOUT calculation
+ *               off     - part of STDOUT calculation
+ *               count   - part of STDOUT calculation
+ *               data    - unused
+ *
+ *  OUTPUTS:     start   - new start location
+ *               eof     - end of file pointer
+ *
+ *  RETURNS:     len     - STDOUT length
+ *
+ ****************************************************************************/
+static int read_msp_pci_counts(char *page, char **start, off_t off,
+                                int count, int *eof, void *data)
+{
+        int i;
+        int len = 0;
+        unsigned int intcount, total = 0;
+        for (i = 0; i < 32; ++i) {
+                intcount = pci_int_count[i];
+                if (intcount != 0) {
+                        len += sprintf(page + len, "[%d] = %u\n", i, intcount);
+                        total += intcount;
+                }
+        }
+        len += sprintf(page + len, "total = %u\n", total);
+        if (len <= off+count)
+                *eof = 1;
+        *start = page + off;
+        len -= off;
+        if (len > count)
+                len = count;
+        if (len < 0)
+                len = 0;
+        return len;
+}
+/*****************************************************************************
+ *
+ *  FUNCTION: gen_pci_cfg_wr
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: Generates a configuration write cycle for debug purposes.
+ *               The IDSEL line asserted and location and data written are
+ *               immaterial. Just want to be able to prove that a
+ *               configuration write can be correctly generated on the
+ *               PCI bus.  Intent is that this function by invocable from
+ *               the /proc filesystem.
+ *
+ *  INPUTS:      page    - part of STDOUT calculation
+ *               off     - part of STDOUT calculation
+ *               count   - part of STDOUT calculation
+ *               data    - unused
+ *
+ *  OUTPUTS:     start   - new start location
+ *               eof     - end of file pointer
+ *
+ *  RETURNS:     len     - STDOUT length
+ *
+ ****************************************************************************/
+static int gen_pci_cfg_wr(char *page, char **start, off_t off,
+                                int count, int *eof, void *data)
+{
+        unsigned char where = 0; /* Write to static Device/Vendor ID */
+        unsigned char bus_num = 0; /* Bus 0 */
+        unsigned char dev_fn = 0xF; /* Arbitrary device number */
+        u32 wr_data = 0xFF00AA00; /* Arbitrary data */
+        struct msp_pci_regs *preg = (void *)PCI_BASE_REG;
+        int len = 0;
+        unsigned long value;
+        int intr;
+        len += sprintf(page + len, "PMC MSP PCI: Beginning\n");
+        if (proc_init == 0) {
+                pci_proc_init();
+                proc_init = ~0;
+        }
+        len += sprintf(page + len, "PMC MSP PCI: Before Cfg Wr\n");
+        /*
+         * Generate PCI Configuration Write Cycle
+         */
+        /* Clear cause register bits */
+        preg->if_status = ~(BPCI_IFSTATUS_BC0F | BPCI_IFSTATUS_BC1F);
+        /* Setup address that is to appear on PCI bus */
+        preg->config_addr = BPCI_CFGADDR_ENABLE |
+                (bus_num << BPCI_CFGADDR_BUSNUM_SHF) |
+                (dev_fn << BPCI_CFGADDR_FUNCTNUM_SHF) |
+                (where & 0xFC);
+        value = cpu_to_le32(wr_data);
+        /* Launch the PCI configuration write cycle */
+        *PCI_CONFIG_SPACE_REG = value;
+        /*
+         * Check if the PCI configuration cycle (rd or wr) succeeded, by
+         * checking the status bits for errors like master or target abort.
+         */
+        intr = preg->if_status;
+        len += sprintf(page + len, "PMC MSP PCI: After Cfg Wr\n");
+        /* Handle STDOUT calculations */
+        if (len <= off+count)
+                *eof = 1;
+        *start = page + off;
+        len -= off;
+        if (len > count)
+                len = count;
+        if (len < 0)
+                len = 0;
+        return len;
+}
+/*****************************************************************************
+ *
+ *  FUNCTION: pci_proc_init
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: Create entries in the /proc filesystem for debug access.
+ *
+ *  INPUTS:      none
+ *
+ *  OUTPUTS:     none
+ *
+ *  RETURNS:     none
+ *
+ ****************************************************************************/
+static void pci_proc_init(void)
+{
+        create_proc_read_entry("pmc_msp_pci_rd_cnt", 0, NULL,
+                                read_msp_pci_counts, NULL);
+        create_proc_read_entry("pmc_msp_pci_cfg_wr", 0, NULL,
+                                gen_pci_cfg_wr, NULL);
+}
+#endif /* CONFIG_PROC_FS && PCI_COUNTERS */
+spinlock_t bpci_lock = SPIN_LOCK_UNLOCKED;
+/*****************************************************************************
+ *
+ *  STRUCT: pci_io_resource
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: Defines the address range that pciauto() will use to
+ *               assign to the I/O BARs of PCI devices.
+ *
+ *               Use the start and end addresses of the MSP7120 PCI Host
+ *               Controller I/O space, in the form that they appear on the
+ *               PCI bus AFTER MSP7120 has performed address translation.
+ *
+ *               For I/O accesses, MSP7120 ignores OATRAN and maps I/O
+ *               accesses into the bottom 0xFFF region of address space,
+ *               so that is the range to put into the pci_io_resource
+ *               struct.
+ *
+ *               In MSP4200, the start address was 0x04 instead of the
+ *               expected 0x00. Will just assume there was a good reason
+ *               for this!
+ *
+ *  NOTES:       Linux, by default, will assign I/O space to the lowest
+ *               region of address space. Since MSP7120 and Linux,
+ *               by default, have no offset in between how they map, the
+ *               io_offset element of pci_controller struct should be set
+ *               to zero.
+ *  ELEMENTS:
+ *    name       - String used for a meaningful name.
+ *
+ *    start      - Start address of MSP7120's I/O space, as MSP7120 presents
+ *                 the address on the PCI bus.
+ *
+ *    end        - End address of MSP7120's I/O space, as MSP7120 presents
+ *                 the address on the PCI bus.
+ *
+ *    flags      - Attributes indicating the type of resource. In this case,
+ *                 indicate I/O space.
+ *
+ ****************************************************************************/
+static struct resource pci_io_resource = {
+        .name   = "pci IO space",
+        .start  = 0x04,
+        .end    = 0x0FFF,
+        .flags  = IORESOURCE_IO /* I/O space */
+};
+/*****************************************************************************
+ *
+ *  STRUCT: pci_mem_resource
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: Defines the address range that pciauto() will use to
+ *               assign to the memory BARs of PCI devices.
+ *
+ *               The .start and .end values are dependent upon how address
+ *               translation is performed by the OATRAN regiser.
+ *
+ *               The values to use for .start and .end are the values
+ *               in the form they appear on the PCI bus AFTER MSP7120 has
+ *               performed OATRAN address translation.
+ *
+ *  ELEMENTS:
+ *    name       - String used for a meaningful name.
+ *
+ *    start      - Start address of MSP7120's memory space, as MSP7120 presents
+ *                 the address on the PCI bus.
+ *
+ *    end        - End address of MSP7120's memory space, as MSP7120 presents
+ *                 the address on the PCI bus.
+ *
+ *    flags      - Attributes indicating the type of resource. In this case,
+ *                 indicate memory space.
+ *
+ ****************************************************************************/
+static struct resource pci_mem_resource = {
+        .name   = "pci memory space",
+        .start  = MSP_PCI_SPACE_BASE,
+        .end    = MSP_PCI_SPACE_END,
+        .flags  = IORESOURCE_MEM         /* memory space */
+};
+/*****************************************************************************
+ *
+ *  FUNCTION: bpci_interrupt
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: PCI status interrupt handler. Updates the count of how
+ *               many times each status bit has been set, then clears
+ *               the status bits. If the appropriate macros are defined,
+ *               these counts can be viewed via the /proc filesystem.
+ *
+ *  INPUTS:      irq     - unused
+ *               dev_id  - unused
+ *               pt_regs - unused
+ *
+ *  OUTPUTS:     none
+ *
+ *  RETURNS:     PCIBIOS_SUCCESSFUL  - success
+ *
+ ****************************************************************************/
+static int bpci_interrupt(int irq, void *dev_id)
+{
+        struct msp_pci_regs *preg = (void *)PCI_BASE_REG;
+        unsigned int stat = preg->if_status;
+#if defined(CONFIG_PROC_FS) && defined(PCI_COUNTERS)
+        int i;
+        for (i = 0; i < 32; ++i) {
+                if ((1 << i) & stat)
+                        ++pci_int_count[i];
+        }
+#endif /* PROC_FS && PCI_COUNTERS */
+        /* printk("PCI ISR: Status=%08X\n", stat); */
+        /* write to clear all asserted interrupts */
+        preg->if_status = stat;
+        return PCIBIOS_SUCCESSFUL;
+}
+/*****************************************************************************
+ *
+ *  FUNCTION: msp_pcibios_config_access
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: Performs a PCI configuration access (rd or wr), then
+ *               checks that the access succeeded by querying MSP7120's
+ *               PCI status bits.
+ *
+ *  INPUTS:
+ *               access_type  - kind of PCI configuration cycle to perform
+ *                              (read or write). Legal values are
+ *                              PCI_ACCESS_WRITE and PCI_ACCESS_READ.
+ *
+ *               bus          - pointer to the bus number of the device to
+ *                              be targetted for the configuration cycle.
+ *                              The only element of the pci_bus structure
+ *                              used is bus->number. This argument determines
+ *                              if the configuration access will be Type 0 or
+ *                              Type 1. Since MSP7120 assumes itself to be the
+ *                              PCI Host, any non-zero bus->number generates
+ *                              a Type 1 access.
+ *
+ *               devfn        - this is an 8-bit field. The lower three bits
+ *                              specify the function number of the device to
+ *                              be targetted for the configuration cycle, with
+ *                              all three-bit combinations being legal. The
+ *                              upper five bits specify the device number,
+ *                              with legal values being 10 to 31.
+ *
+ *               where        - address within the Configuration Header
+ *                              space to access.
+ *
+ *               data         - for write accesses, contains the data to
+ *                              write.
+ *
+ *  OUTPUTS:
+ *               data         - for read accesses, contains the value read.
+ *
+ *  RETURNS:     PCIBIOS_SUCCESSFUL  - success
+ *               -1                  - access failure
+ *
+ ****************************************************************************/
+int msp_pcibios_config_access(unsigned char access_type,
+                                struct pci_bus *bus,
+                                unsigned int devfn,
+                                unsigned char where,
+                                u32 *data)
+{
+        struct msp_pci_regs *preg = (void *)PCI_BASE_REG;
+        unsigned char bus_num = bus->number;
+        unsigned char dev_fn = (unsigned char)devfn;
+        unsigned long flags;
+        unsigned long intr;
+        unsigned long value;
+        static char pciirqflag;
+#if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL)
+        unsigned int    vpe_status;
+#endif
+#if defined(CONFIG_PROC_FS) && defined(PCI_COUNTERS)
+        if (proc_init == 0) {
+                pci_proc_init();
+                proc_init = ~0;
+        }
+#endif /* CONFIG_PROC_FS && PCI_COUNTERS */
+        /*
+         * Just the first time this function invokes, allocate
+         * an interrupt line for PCI host status interrupts. The
+         * allocation assigns an interrupt handler to the interrupt.
+         */
+        if (pciirqflag == 0) {
+                request_irq(MSP_INT_PCI,/* Hardcoded internal MSP7120 wiring */
+                                bpci_interrupt,
+                                SA_SHIRQ | SA_INTERRUPT,
+                                "PMC MSP PCI Host",
+                                preg);
+                pciirqflag = ~0;
+        }
+#if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL)
+        local_irq_save(flags);
+        vpe_status = dvpe();
+#else
+        spin_lock_irqsave(&bpci_lock, flags);
+#endif
+        /*
+         * Clear PCI cause register bits.
+         *
+         * In Polo, the PCI Host had a dedicated DMA called the
+         * Block Copy (not to be confused with the general purpose Block
+         * Copy Engine block). There appear to have been special interrupts
+         * for this Block Copy, called Block Copy 0 Fault (BC0F) and
+         * Block Copy 1 Fault (BC1F). MSP4200 and MSP7120 don't have this
+         * dedicated Block Copy block, so these two interrupts are now
+         * marked reserved. In case the  Block Copy is resurrected in a
+         * future design, maintain the code that treats these two interrupts
+         * specially.
+         *
+         * Write to clear all interrupts in the PCI status register, aside
+         * from BC0F and BC1F.
+         */
+        preg->if_status = ~(BPCI_IFSTATUS_BC0F | BPCI_IFSTATUS_BC1F);
+        /* Setup address that is to appear on PCI bus */
+        preg->config_addr = BPCI_CFGADDR_ENABLE |
+                (bus_num << BPCI_CFGADDR_BUSNUM_SHF) |
+                (dev_fn << BPCI_CFGADDR_FUNCTNUM_SHF) |
+                (where & 0xFC);
+        /* IF access is a PCI configuration write */
+        if (access_type == PCI_ACCESS_WRITE) {
+                value = cpu_to_le32(*data);
+                *PCI_CONFIG_SPACE_REG = value;
+        } else {
+                /* ELSE access is a PCI configuration read */
+                value = le32_to_cpu(*PCI_CONFIG_SPACE_REG);
+                *data = value;
+        }
+        /*
+         * Check if the PCI configuration cycle (rd or wr) succeeded, by
+         * checking the status bits for errors like master or target abort.
+         */
+        intr = preg->if_status;
+        /* Clear config access */
+        preg->config_addr = 0;
+        /* IF error occurred */
+        if (intr & ~(BPCI_IFSTATUS_BC0F | BPCI_IFSTATUS_BC1F)) {
+                /* Clear status bits */
+                preg->if_status = ~(BPCI_IFSTATUS_BC0F | BPCI_IFSTATUS_BC1F);
+#if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL)
+                evpe(vpe_status);
+                local_irq_restore(flags);
+#else
+                spin_unlock_irqrestore(&bpci_lock, flags);
+#endif
+                return -1;
+        }
+#if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL)
+        evpe(vpe_status);
+        local_irq_restore(flags);
+#else
+        spin_unlock_irqrestore(&bpci_lock, flags);
+#endif
+        return PCIBIOS_SUCCESSFUL;
+}
+/*****************************************************************************
+ *
+ *  FUNCTION: msp_pcibios_read_config_byte
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: Read a byte from PCI configuration address spac
+ *               Since the hardware can't address 8 bit chunks
+ *               directly, read a 32-bit chunk, then mask off extraneous
+ *               bits.
+ *
+ *  INPUTS       bus    - structure containing attributes for the PCI bus
+ *                        that the read is destined for.
+ *               devfn  - device/function combination that the read is
+ *                        destined for.
+ *               where  - register within the Configuration Header space
+ *                        to access.
+ *
+ *  OUTPUTS      val    - read data
+ *
+ *  RETURNS:     PCIBIOS_SUCCESSFUL  - success
+ *               -1                  - read access failure
+ *
+ ****************************************************************************/
+static int
+msp_pcibios_read_config_byte(struct pci_bus *bus,
+                                unsigned int devfn,
+                                int where,
+                                u32 *val)
+{
+        u32 data = 0;
+        /*
+         * If the config access did not complete normally (e.g., underwent
+         * master abort) do the PCI compliant thing, which is to supply an
+         * all ones value.
+         */
+        if (msp_pcibios_config_access(PCI_ACCESS_READ, bus, devfn,
+                                        where, &data)) {
+                *val = 0xFFFFFFFF;
+                return -1;
+        }
+        *val = (data >> ((where & 3) << 3)) & 0x0ff;
+        return PCIBIOS_SUCCESSFUL;
+}
+/*****************************************************************************
+ *
+ *  FUNCTION: msp_pcibios_read_config_word
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: Read a word (16 bits) from PCI configuration address space.
+ *               Since the hardware can't address 16 bit chunks
+ *               directly, read a 32-bit chunk, then mask off extraneous
+ *               bits.
+ *
+ *  INPUTS       bus    - structure containing attributes for the PCI bus
+ *                        that the read is destined for.
+ *               devfn  - device/function combination that the read is
+ *                        destined for.
+ *               where  - register within the Configuration Header space
+ *                        to access.
+ *
+ *  OUTPUTS      val    - read data
+ *
+ *  RETURNS:     PCIBIOS_SUCCESSFUL           - success
+ *               PCIBIOS_BAD_REGISTER_NUMBER  - bad register address
+ *               -1                           - read access failure
+ *
+ ****************************************************************************/
+static int
+msp_pcibios_read_config_word(struct pci_bus *bus,
+                                unsigned int devfn,
+                                int where,
+                                u32 *val)
+{
+        u32 data = 0;
+        /* if (where & 1) */    /* Commented out non-compliant code.
+                                 * Should allow word access to configuration
+                                 * registers, with only exception being when
+                                 * the word access would wrap around into
+                                 * the next dword.
+                                 */
+        if ((where & 3) == 3) {
+                *val = 0xFFFFFFFF;
+                return PCIBIOS_BAD_REGISTER_NUMBER;
+        }
+        /*
+         * If the config access did not complete normally (e.g., underwent
+         * master abort) do the PCI compliant thing, which is to supply an
+         * all ones value.
+         */
+        if (msp_pcibios_config_access(PCI_ACCESS_READ, bus, devfn,
+                                        where, &data)) {
+                *val = 0xFFFFFFFF;
+                return -1;
+        }
+        *val = (data >> ((where & 3) << 3)) & 0x0ffff;
+        return PCIBIOS_SUCCESSFUL;
+}
+/*****************************************************************************
+ *
+ *  FUNCTION: msp_pcibios_read_config_dword
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: Read a double word (32 bits) from PCI configuration
+ *               address space.
+ *
+ *  INPUTS       bus    - structure containing attributes for the PCI bus
+ *                        that the read is destined for.
+ *               devfn  - device/function combination that the read is
+ *                        destined for.
+ *               where  - register within the Configuration Header space
+ *                        to access.
+ *
+ *  OUTPUTS      val    - read data
+ *
+ *  RETURNS:     PCIBIOS_SUCCESSFUL           - success
+ *               PCIBIOS_BAD_REGISTER_NUMBER  - bad register address
+ *               -1                           - read access failure
+ *
+ ****************************************************************************/
+static int
+msp_pcibios_read_config_dword(struct pci_bus *bus,
+                                unsigned int devfn,
+                                int where,
+                                u32 *val)
+{
+        u32 data = 0;
+        /* Address must be dword aligned. */
+        if (where & 3) {
+                *val = 0xFFFFFFFF;
+                return PCIBIOS_BAD_REGISTER_NUMBER;
+        }
+        /*
+         * If the config access did not complete normally (e.g., underwent
+         * master abort) do the PCI compliant thing, which is to supply an
+         * all ones value.
+         */
+        if (msp_pcibios_config_access(PCI_ACCESS_READ, bus, devfn,
+                                        where, &data)) {
+                *val = 0xFFFFFFFF;
+                return -1;
+        }
+        *val = data;
+        return PCIBIOS_SUCCESSFUL;
+}
+/*****************************************************************************
+ *
+ *  FUNCTION: msp_pcibios_write_config_byte
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: Write a byte to PCI configuration address space.
+ *               Since the hardware can't address 8 bit chunks
+ *               directly, a read-modify-write is performed.
+ *
+ *  INPUTS       bus    - structure containing attributes for the PCI bus
+ *                        that the write is destined for.
+ *               devfn  - device/function combination that the write is
+ *                        destined for.
+ *               where  - register within the Configuration Header space
+ *                        to access.
+ *               val    - value to write
+ *
+ *  OUTPUTS      none
+ *
+ *  RETURNS:     PCIBIOS_SUCCESSFUL  - success
+ *               -1                  - write access failure
+ *
+ ****************************************************************************/
+static int
+msp_pcibios_write_config_byte(struct pci_bus *bus,
+                                unsigned int devfn,
+                                int where,
+                                u8 val)
+{
+        u32 data = 0;
+        /* read config space */
+        if (msp_pcibios_config_access(PCI_ACCESS_READ, bus, devfn,
+                                        where, &data))
+                return -1;
+        /* modify the byte within the dword */
+        data = (data & ~(0xff << ((where & 3) << 3))) |
+                        (val << ((where & 3) << 3));
+        /* write back the full dword */
+        if (msp_pcibios_config_access(PCI_ACCESS_WRITE, bus, devfn,
+                                        where, &data))
+                return -1;
+        return PCIBIOS_SUCCESSFUL;
+}
+/*****************************************************************************
+ *
+ *  FUNCTION: msp_pcibios_write_config_word
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: Write a word (16-bits) to PCI configuration address space.
+ *               Since the hardware can't address 16 bit chunks
+ *               directly, a read-modify-write is performed.
+ *
+ *  INPUTS       bus    - structure containing attributes for the PCI bus
+ *                        that the write is destined for.
+ *               devfn  - device/function combination that the write is
+ *                        destined for.
+ *               where  - register within the Configuration Header space
+ *                        to access.
+ *               val    - value to write
+ *
+ *  OUTPUTS      none
+ *
+ *  RETURNS:     PCIBIOS_SUCCESSFUL           - success
+ *               PCIBIOS_BAD_REGISTER_NUMBER  - bad register address
+ *               -1                           - write access failure
+ *
+ ****************************************************************************/
+static int
+msp_pcibios_write_config_word(struct pci_bus *bus,
+                                unsigned int devfn,
+                                int where,
+                                u16 val)
+{
+        u32 data = 0;
+        /* Fixed non-compliance: if (where & 1) */
+        if ((where & 3) == 3)
+                return PCIBIOS_BAD_REGISTER_NUMBER;
+        /* read config space */
+        if (msp_pcibios_config_access(PCI_ACCESS_READ, bus, devfn,
+                                        where, &data))
+                return -1;
+        /* modify the word within the dword */
+        data = (data & ~(0xffff << ((where & 3) << 3))) |
+                        (val << ((where & 3) << 3));
+        /* write back the full dword */
+        if (msp_pcibios_config_access(PCI_ACCESS_WRITE, bus, devfn,
+                                        where, &data))
+                return -1;
+        return PCIBIOS_SUCCESSFUL;
+}
+/*****************************************************************************
+ *
+ *  FUNCTION: msp_pcibios_write_config_dword
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: Write a double word (32-bits) to PCI configuration address
+ *               space.
+ *
+ *  INPUTS       bus    - structure containing attributes for the PCI bus
+ *                        that the write is destined for.
+ *               devfn  - device/function combination that the write is
+ *                        destined for.
+ *               where  - register within the Configuration Header space
+ *                        to access.
+ *               val    - value to write
+ *
+ *  OUTPUTS      none
+ *
+ *  RETURNS:     PCIBIOS_SUCCESSFUL           - success
+ *               PCIBIOS_BAD_REGISTER_NUMBER  - bad register address
+ *               -1                           - write access failure
+ *
+ ****************************************************************************/
+static int
+msp_pcibios_write_config_dword(struct pci_bus *bus,
+                                unsigned int devfn,
+                                int where,
+                                u32 val)
+{
+        /* check that address is dword aligned */
+        if (where & 3)
+                return PCIBIOS_BAD_REGISTER_NUMBER;
+        /* perform write */
+        if (msp_pcibios_config_access(PCI_ACCESS_WRITE, bus, devfn,
+                                        where, &val))
+                return -1;
+        return PCIBIOS_SUCCESSFUL;
+}
+/*****************************************************************************
+ *
+ *  FUNCTION: msp_pcibios_read_config
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: Interface the PCI configuration read request with
+ *               the appropriate function, based on how many bytes
+ *               the read request is.
+ *
+ *  INPUTS       bus    - structure containing attributes for the PCI bus
+ *                        that the write is destined for.
+ *               devfn  - device/function combination that the write is
+ *                        destined for.
+ *               where  - register within the Configuration Header space
+ *                        to access.
+ *               size   - in units of bytes, should be 1, 2, or 4.
+ *
+ *  OUTPUTS      val    - value read, with any extraneous bytes masked
+ *                        to zero.
+ *
+ *  RETURNS:     PCIBIOS_SUCCESSFUL   - success
+ *               -1                   - failure
+ *
+ ****************************************************************************/
+int
+msp_pcibios_read_config(struct pci_bus *bus,
+                        unsigned int    devfn,
+                        int where,
+                        int size,
+                        u32 *val)
+{
+        if (size == 1) {
+                if (msp_pcibios_read_config_byte(bus, devfn, where, val)) {
+                        return -1;
+                }
+        } else if (size == 2) {
+                if (msp_pcibios_read_config_word(bus, devfn, where, val)) {
+                        return -1;
+                }
+        } else if (size == 4) {
+                if (msp_pcibios_read_config_dword(bus, devfn, where, val)) {
+                        return -1;
+                }
+        } else {
+                *val = 0xFFFFFFFF;
+                return -1;
+        }
+        return PCIBIOS_SUCCESSFUL;
+}
+/*****************************************************************************
+ *
+ *  FUNCTION: msp_pcibios_write_config
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: Interface the PCI configuration write request with
+ *               the appropriate function, based on how many bytes
+ *               the read request is.
+ *
+ *  INPUTS       bus    - structure containing attributes for the PCI bus
+ *                        that the write is destined for.
+ *               devfn  - device/function combination that the write is
+ *                        destined for.
+ *               where  - register within the Configuration Header space
+ *                        to access.
+ *               size   - in units of bytes, should be 1, 2, or 4.
+ *               val    - value to write
+ *
+ *  OUTPUTS:     none
+ *
+ *  RETURNS:     PCIBIOS_SUCCESSFUL   - success
+ *               -1                   - failure
+ *
+ ****************************************************************************/
+int
+msp_pcibios_write_config(struct pci_bus *bus,
+                        unsigned int devfn,
+                        int where,
+                        int size,
+                        u32 val)
+{
+        if (size == 1) {
+                if (msp_pcibios_write_config_byte(bus, devfn,
+                                                where, (u8)(0xFF & val))) {
+                        return -1;
+                }
+        } else if (size == 2) {
+                if (msp_pcibios_write_config_word(bus, devfn,
+                                                where, (u16)(0xFFFF & val))) {
+                        return -1;
+                }
+        } else if (size == 4) {
+                if (msp_pcibios_write_config_dword(bus, devfn, where, val)) {
+                        return -1;
+                }
+        } else {
+                return -1;
+        }
+        return PCIBIOS_SUCCESSFUL;
+}
+/*****************************************************************************
+ *
+ *  STRUCTURE: msp_pci_ops
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: structure to abstract the hardware specific PCI
+ *               configuration accesses.
+ *
+ *  ELEMENTS:
+ *    read      - function for Linux to generate PCI Configuration reads.
+ *    write     - function for Linux to generate PCI Configuration writes.
+ *
+ ****************************************************************************/
+struct pci_ops msp_pci_ops = {
+        .read = msp_pcibios_read_config,
+        .write = msp_pcibios_write_config
+};
+/*****************************************************************************
+ *
+ *  STRUCTURE: msp_pci_controller
+ *  _________________________________________________________________________
+ *
+ *  Describes the attributes of the MSP7120 PCI Host Controller
+ *
+ *  ELEMENTS:
+ *    pci_ops      - abstracts the hardware specific PCI configuration
+ *                   accesses.
+ *
+ *    mem_resource - address range pciauto() uses to assign to PCI device
+ *                   memory BARs.
+ *
+ *    mem_offset   - offset between how MSP7120 outbound PCI memory
+ *                   transaction addresses appear on the PCI bus and how Linux
+ *                   wants to configure memory BARs of the PCI devices.
+ *                   MSP7120 does nothing funky, so just set to zero.
+ *
+ *    io_resource  - address range pciauto() uses to assign to PCI device
+ *                   I/O BARs.
+ *
+ *    io_offset    - offset between how MSP7120 outbound PCI I/O
+ *                   transaction addresses appear on the PCI bus and how
+ *                   Linux defaults to configure I/O BARs of the PCI devices.
+ *                   MSP7120 maps outbound I/O accesses into the bottom
+ *                   bottom 4K of PCI address space (and ignores OATRAN).
+ *                   Since the Linux default is to configure I/O BARs to the
+ *                   bottom 4K, no special offset is needed. Just set to zero.
+ *
+ ****************************************************************************/
+static struct pci_controller msp_pci_controller = {
+        .pci_ops        = &msp_pci_ops,
+        .mem_resource   = &pci_mem_resource,
+        .mem_offset     = 0,
+        .io_resource    = &pci_io_resource,
+        .io_offset      = 0
+};
+/*****************************************************************************
+ *
+ *  FUNCTION: msp_pci_init
+ *  _________________________________________________________________________
+ *
+ *  DESCRIPTION: Initialize the PCI Host Controller and register it with
+ *               Linux so Linux can seize control of the PCI bus.
+ *
+ ****************************************************************************/
+void __init msp_pci_init(void)
+{
+        struct msp_pci_regs *preg = (void *)PCI_BASE_REG;
+        u32 id;
+        /* Extract Device ID */
+        id = read_reg32(PCI_JTAG_DEVID_REG, 0xFFFF) >> 12;
+        /* Check if JTAG ID identifies MSP7120 */
+        if (!MSP_HAS_PCI(id)) {
+                printk(KERN_WARNING "PCI: No PCI; id reads as %x\n", id);
+                goto no_pci;
+        }
+        /*
+         * Enable flushing of the PCI-SDRAM queue upon a read
+         * of the SDRAM's Memory Configuration Register.
+         */
+        *(unsigned long *)QFLUSH_REG_1 = 3;
+        /* Configure PCI Host Controller. */
+        preg->if_status = ~0;           /* Clear cause register bits */
+        preg->config_addr = 0;          /* Clear config access */
+        preg->oatran    = MSP_PCI_OATRAN; /* PCI outbound addr translation */
+        preg->if_mask   = 0xF8BF87C0;   /* Enable all PCI status interrupts */
+        /* configure so inb(), outb(), and family are functional */
+        set_io_port_base(MSP_PCI_IOSPACE_BASE);
+        /* Tell Linux the details of the MSP7120 PCI Host Controller */
+        register_pci_controller(&msp_pci_controller);
+        return;
+no_pci:
+        /* Disable PCI channel */
+        printk(KERN_WARNING "PCI: no host PCI bus detected\n");
+}
diff --git a/arch/mips/pci/ops-tx4938.c b/arch/mips/pci/ops-tx4938.c
index 4450070845..a450c40620 100644
--- a/arch/mips/pci/ops-tx4938.c
+++ b/arch/mips/pci/ops-tx4938.c
@@ -46,50 +46,63 @@ struct resource tx4938_pcic1_pci_mem_resource = {
        .flags  = IORESOURCE_MEM
 };
-static int mkaddr(int bus, int dev_fn, int where, int *flagsp)
+static int mkaddr(int bus, int dev_fn, int where,
+                  struct tx4938_pcic_reg *pcicptr)
 {
        if (bus > 0) {
                /* Type 1 configuration */
-                tx4938_pcicptr->g2pcfgadrs = ((bus & 0xff) << 0x10) |
+                pcicptr->g2pcfgadrs = ((bus & 0xff) << 0x10) |
                    ((dev_fn & 0xff) << 0x08) | (where & 0xfc) | 1;
        } else {
                if (dev_fn >= PCI_DEVFN(TX4938_PCIC_MAX_DEVNU, 0))
                        return -1;
                /* Type 0 configuration */
-                tx4938_pcicptr->g2pcfgadrs = ((bus & 0xff) << 0x10) |
+                pcicptr->g2pcfgadrs = ((bus & 0xff) << 0x10) |
                    ((dev_fn & 0xff) << 0x08) | (where & 0xfc);
        }
        /* clear M_ABORT and Disable M_ABORT Int. */
-        tx4938_pcicptr->pcistatus =
+        pcicptr->pcistatus =
-            (tx4938_pcicptr->pcistatus & 0x0000ffff) |
+            (pcicptr->pcistatus & 0x0000ffff) |
            (PCI_STATUS_REC_MASTER_ABORT << 16);
-        tx4938_pcicptr->pcimask &= ~PCI_STATUS_REC_MASTER_ABORT;
+        pcicptr->pcimask &= ~PCI_STATUS_REC_MASTER_ABORT;
        return 0;
 }
-static int check_abort(int flags)
+static int check_abort(struct tx4938_pcic_reg *pcicptr)
 {
        int code = PCIBIOS_SUCCESSFUL;
        /* wait write cycle completion before checking error status */
-        while (tx4938_pcicptr->pcicstatus & TX4938_PCIC_PCICSTATUS_IWB)
+        while (pcicptr->pcicstatus & TX4938_PCIC_PCICSTATUS_IWB)
                                ;
-        if (tx4938_pcicptr->pcistatus & (PCI_STATUS_REC_MASTER_ABORT << 16)) {
+        if (pcicptr->pcistatus & (PCI_STATUS_REC_MASTER_ABORT << 16)) {
-                tx4938_pcicptr->pcistatus =
+                pcicptr->pcistatus =
-                    (tx4938_pcicptr->
+                    (pcicptr->
                     pcistatus & 0x0000ffff) | (PCI_STATUS_REC_MASTER_ABORT
                                                << 16);
-                tx4938_pcicptr->pcimask |= PCI_STATUS_REC_MASTER_ABORT;
+                pcicptr->pcimask |= PCI_STATUS_REC_MASTER_ABORT;
                code = PCIBIOS_DEVICE_NOT_FOUND;
        }
        return code;
 }
+extern struct pci_controller tx4938_pci_controller[];
+extern struct tx4938_pcic_reg *get_tx4938_pcicptr(int ch);
+static struct tx4938_pcic_reg *pci_bus_to_pcicptr(struct pci_bus *bus)
+{
+        struct pci_controller *channel = bus->sysdata;
+        return get_tx4938_pcicptr(channel - &tx4938_pci_controller[0]);
+}
 static int tx4938_pcibios_read_config(struct pci_bus *bus, unsigned int devfn,
                                        int where, int size, u32 * val)
 {
-        int flags, retval, dev, busno, func;
+        int retval, dev, busno, func;
+        struct tx4938_pcic_reg *pcicptr = pci_bus_to_pcicptr(bus);
+        void __iomem *cfgdata =
+                (void __iomem *)(unsigned long)&pcicptr->g2pcfgdata;
        dev = PCI_SLOT(devfn);
        func = PCI_FUNC(devfn);
@@ -101,32 +114,32 @@ static int tx4938_pcibios_read_config(struct pci_bus *bus, unsigned int devfn,
                busno = 0;
        }
-        if (mkaddr(busno, devfn, where, &flags))
+        if (mkaddr(busno, devfn, where, pcicptr))
                return -1;
        switch (size) {
        case 1:
-                *val = *(volatile u8 *) ((unsigned long) & tx4938_pcicptr->g2pcfgdata |
 #ifdef __BIG_ENDIAN
-                              ((where & 3) ^ 3));
+                cfgdata += (where & 3) ^ 3;
 #else
-                              (where & 3));
+                cfgdata += where & 3;
 #endif
+                *val = __raw_readb(cfgdata);
                break;
        case 2:
-                *val = *(volatile u16 *) ((unsigned long) & tx4938_pcicptr->g2pcfgdata |
 #ifdef __BIG_ENDIAN
-                                ((where & 3) ^ 2));
+                cfgdata += (where & 2) ^ 2;
 #else
-                                (where & 3));
+                cfgdata += where & 2;
 #endif
+                *val = __raw_readw(cfgdata);
                break;
        case 4:
-                *val = tx4938_pcicptr->g2pcfgdata;
+                *val = __raw_readl(cfgdata);
                break;
        }
-        retval = check_abort(flags);
+        retval = check_abort(pcicptr);
        if (retval == PCIBIOS_DEVICE_NOT_FOUND)
                *val = 0xffffffff;
@@ -136,7 +149,10 @@ static int tx4938_pcibios_read_config(struct pci_bus *bus, unsigned int devfn,
 static int tx4938_pcibios_write_config(struct pci_bus *bus, unsigned int devfn, int where,
                                                int size, u32 val)
 {
-        int flags, dev, busno, func;
+        int dev, busno, func;
+        struct tx4938_pcic_reg *pcicptr = pci_bus_to_pcicptr(bus);
+        void __iomem *cfgdata =
+                (void __iomem *)(unsigned long)&pcicptr->g2pcfgdata;
        busno = bus->number;
        dev = PCI_SLOT(devfn);
@@ -149,32 +165,32 @@ static int tx4938_pcibios_write_config(struct pci_bus *bus, unsigned int devfn,
                busno = 0;
        }
-        if (mkaddr(busno, devfn, where, &flags))
+        if (mkaddr(busno, devfn, where, pcicptr))
                return -1;
        switch (size) {
        case 1:
-                *(volatile u8 *) ((unsigned long) & tx4938_pcicptr->g2pcfgdata |
 #ifdef __BIG_ENDIAN
-                          ((where & 3) ^ 3)) = val;
+                cfgdata += (where & 3) ^ 3;
 #else
-                          (where & 3)) = val;
+                cfgdata += where & 3;
 #endif
+                __raw_writeb(val, cfgdata);
                break;
        case 2:
-                *(volatile u16 *) ((unsigned long) & tx4938_pcicptr->g2pcfgdata |
 #ifdef __BIG_ENDIAN
-                        ((where & 0x3) ^ 0x2)) = val;
+                cfgdata += (where & 2) ^ 2;
 #else
-                        (where & 3)) = val;
+                cfgdata += where & 2;
 #endif
+                __raw_writew(val, cfgdata);
                break;
        case 4:
-                tx4938_pcicptr->g2pcfgdata = val;
+                __raw_writel(val, cfgdata);
                break;
        }
-        return check_abort(flags);
+        return check_abort(pcicptr);
 }
 struct pci_ops tx4938_pci_ops = {
diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c
index d7b9e1349f..2b4e30c7d1 100644
--- a/arch/mips/pci/pci-bcm1480.c
+++ b/arch/mips/pci/pci-bcm1480.c
@@ -74,8 +74,9 @@ static inline void WRITECFG32(u32 addr, u32 data)
        *(u32 *)(cfg_space + (addr & ~3)) = data;
 }
-int pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
+        This is b0rked.
        return dev->irq;
 }
diff --git a/arch/mips/pci/pci-dac.c b/arch/mips/pci/pci-dac.c
deleted file mode 100644
index 0f0ea1b7d4..0000000000
--- a/arch/mips/pci/pci-dac.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2000  Ani Joshi <ajoshi@unixbox.com>
- * Copyright (C) 2000, 2001, 06  Ralf Baechle <ralf@linux-mips.org>
- * swiped from i386, and cloned for MIPS by Geert, polished by Ralf.
- */
-#include <linux/types.h>
-#include <linux/dma-mapping.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/string.h>
-#include <asm/cache.h>
-#include <asm/io.h>
-#include <dma-coherence.h>
-#include <linux/pci.h>
-dma64_addr_t pci_dac_page_to_dma(struct pci_dev *pdev,
-        struct page *page, unsigned long offset, int direction)
-{
-        struct device *dev = &pdev->dev;
-        BUG_ON(direction == DMA_NONE);
-        if (!plat_device_is_coherent(dev)) {
-                unsigned long addr;
-                addr = (unsigned long) page_address(page) + offset;
-                dma_cache_wback_inv(addr, PAGE_SIZE);
-        }
-        return plat_map_dma_mem_page(dev, page) + offset;
-}
-EXPORT_SYMBOL(pci_dac_page_to_dma);
-struct page *pci_dac_dma_to_page(struct pci_dev *pdev,
-        dma64_addr_t dma_addr)
-{
-        return pfn_to_page(plat_dma_addr_to_phys(dma_addr) >> PAGE_SHIFT);
-}
-EXPORT_SYMBOL(pci_dac_dma_to_page);
-unsigned long pci_dac_dma_to_offset(struct pci_dev *pdev,
-        dma64_addr_t dma_addr)
-{
-        return dma_addr & ~PAGE_MASK;
-}
-EXPORT_SYMBOL(pci_dac_dma_to_offset);
-void pci_dac_dma_sync_single_for_cpu(struct pci_dev *pdev,
-        dma64_addr_t dma_addr, size_t len, int direction)
-{
-        BUG_ON(direction == PCI_DMA_NONE);
-        if (!plat_device_is_coherent(&pdev->dev))
-                dma_cache_wback_inv(dma_addr + PAGE_OFFSET, len);
-}
-EXPORT_SYMBOL(pci_dac_dma_sync_single_for_cpu);
-void pci_dac_dma_sync_single_for_device(struct pci_dev *pdev,
-        dma64_addr_t dma_addr, size_t len, int direction)
-{
-        BUG_ON(direction == PCI_DMA_NONE);
-        if (!plat_device_is_coherent(&pdev->dev))
-                dma_cache_wback_inv(dma_addr + PAGE_OFFSET, len);
-}
-EXPORT_SYMBOL(pci_dac_dma_sync_single_for_device);
diff --git a/arch/mips/pci/pci-ddb5477.c b/arch/mips/pci/pci-ddb5477.c
index d071bc375b..7363e18778 100644
--- a/arch/mips/pci/pci-ddb5477.c
+++ b/arch/mips/pci/pci-ddb5477.c
@@ -131,7 +131,7 @@ static unsigned char rockhopperII_irq_map[MAX_SLOT_NUM] = {
        /* SLOT: 20, AD:31 */ VRC5477_IRQ_IOPCI_INTA, /* vrc5477 usb host */
 };
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        int slot_num;
        unsigned char *slot_irq_map;
diff --git a/arch/mips/pci/pci-ev64120.c b/arch/mips/pci/pci-ev64120.c
deleted file mode 100644
index a84f594b5a..0000000000
--- a/arch/mips/pci/pci-ev64120.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <linux/pci.h>
-#include <asm/irq.h>
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-        int irq;
-        if (!pin)
-                return 0;
-        irq = allocate_irqno();
-        if (irq < 0)
-                return 0;
-        return irq;
-}
-/* Do platform specific device initialization at pci_enable_device() time */
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
-        return 0;
-}
diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c
index 405ce01527..a322543ac3 100644
--- a/arch/mips/pci/pci-ip27.c
+++ b/arch/mips/pci/pci-ip27.c
@@ -134,7 +134,7 @@ int __init bridge_probe(nasid_t nasid, int widget_id, int masterwid)
 * A given PCI device, in general, should be able to intr any of the cpus
 * on any one of the hubs connected to its xbow.
 */
-int __devinit pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __devinit pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        struct bridge_controller *bc = BRIDGE_CONTROLLER(dev->bus);
        int irq = bc->pci_int[slot];
diff --git a/arch/mips/pci/pci-lasat.c b/arch/mips/pci/pci-lasat.c
deleted file mode 100644
index 985784a3e6..0000000000
--- a/arch/mips/pci/pci-lasat.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2000, 2001, 04 Keith M Wesolowski
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/types.h>
-#include <asm/bootinfo.h>
-extern struct pci_ops nile4_pci_ops;
-extern struct pci_ops gt64xxx_pci0_ops;
-static struct resource lasat_pci_mem_resource = {
-        .name   = "LASAT PCI MEM",
-        .start  = 0x18000000,
-        .end    = 0x19ffffff,
-        .flags  = IORESOURCE_MEM,
-};
-static struct resource lasat_pci_io_resource = {
-        .name   = "LASAT PCI IO",
-        .start  = 0x1a000000,
-        .end    = 0x1bffffff,
-        .flags  = IORESOURCE_IO,
-};
-static struct pci_controller lasat_pci_controller = {
-        .mem_resource   = &lasat_pci_mem_resource,
-        .io_resource    = &lasat_pci_io_resource,
-};
-static int __init lasat_pci_setup(void)
-{
-        printk("PCI: starting\n");
-        switch (mips_machtype) {
-        case MACH_LASAT_100:
-                lasat_pci_controller.pci_ops = &gt64xxx_pci0_ops;
-                break;
-        case MACH_LASAT_200:
-                lasat_pci_controller.pci_ops = &nile4_pci_ops;
-                break;
-        default:
-                panic("pcibios_init: mips_machtype incorrect");
-        }
-        register_pci_controller(&lasat_pci_controller);
-        return 0;
-}
-arch_initcall(lasat_pci_setup);
-#define LASATINT_ETH1   0
-#define LASATINT_ETH0   1
-#define LASATINT_HDC    2
-#define LASATINT_COMP   3
-#define LASATINT_HDLC   4
-#define LASATINT_PCIA   5
-#define LASATINT_PCIB   6
-#define LASATINT_PCIC   7
-#define LASATINT_PCID   8
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-        switch (slot) {
-        case 1:
-        case 2:
-        case 3:
-                return LASATINT_PCIA + (((slot-1) + (pin-1)) % 4);
-        case 4:
-                return LASATINT_ETH1;   /* Ethernet 1 (LAN 2) */
-        case 5:
-                return LASATINT_ETH0;   /* Ethernet 0 (LAN 1) */
-        case 6:
-                return LASATINT_HDC;    /* IDE controller */
-        default:
-                return 0xff;            /* Illegal */
-        }
-        return -1;
-}
-/* Do platform specific device initialization at pci_enable_device() time */
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
-        return 0;
-}
diff --git a/arch/mips/pci/pci-ocelot-c.c b/arch/mips/pci/pci-ocelot-c.c
deleted file mode 100644
index 027759f7c9..0000000000
--- a/arch/mips/pci/pci-ocelot-c.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2004, 06 by Ralf Baechle (ralf@linux-mips.org)
- */
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/mv643xx.h>
-#include <linux/init.h>
-#include <asm/marvell.h>
-/*
- * We assume the address ranges have already been setup appropriately by
- * the firmware.  PMON in case of the Ocelot C does that.
- */
-static struct resource mv_pci_io_mem0_resource = {
-        .name   = "MV64340 PCI0 IO MEM",
-        .flags  = IORESOURCE_IO
-};
-static struct resource mv_pci_mem0_resource = {
-        .name   = "MV64340 PCI0 MEM",
-        .flags  = IORESOURCE_MEM
-};
-static struct mv_pci_controller mv_bus0_controller = {
-        .pcic = {
-                .pci_ops        = &mv_pci_ops,
-                .mem_resource   = &mv_pci_mem0_resource,
-                .io_resource    = &mv_pci_io_mem0_resource,
-        },
-        .config_addr    = MV64340_PCI_0_CONFIG_ADDR,
-        .config_vreg    = MV64340_PCI_0_CONFIG_DATA_VIRTUAL_REG,
-};
-static uint32_t mv_io_base, mv_io_size;
-static void mv64340_pci0_init(void)
-{
-        uint32_t mem0_base, mem0_size;
-        uint32_t io_base, io_size;
-        io_base = MV_READ(MV64340_PCI_0_IO_BASE_ADDR) << 16;
-        io_size = (MV_READ(MV64340_PCI_0_IO_SIZE) + 1) << 16;
-        mem0_base = MV_READ(MV64340_PCI_0_MEMORY0_BASE_ADDR) << 16;
-        mem0_size = (MV_READ(MV64340_PCI_0_MEMORY0_SIZE) + 1) << 16;
-        mv_pci_io_mem0_resource.start           = 0;
-        mv_pci_io_mem0_resource.end             = io_size - 1;
-        mv_pci_mem0_resource.start              = mem0_base;
-        mv_pci_mem0_resource.end                = mem0_base + mem0_size - 1;
-        mv_bus0_controller.pcic.mem_offset      = mem0_base;
-        mv_bus0_controller.pcic.io_offset       = 0;
-        ioport_resource.end             = io_size - 1;
-        register_pci_controller(&mv_bus0_controller.pcic);
-        mv_io_base = io_base;
-        mv_io_size = io_size;
-}
-static struct resource mv_pci_io_mem1_resource = {
-        .name   = "MV64340 PCI1 IO MEM",
-        .flags  = IORESOURCE_IO
-};
-static struct resource mv_pci_mem1_resource = {
-        .name   = "MV64340 PCI1 MEM",
-        .flags  = IORESOURCE_MEM
-};
-static struct mv_pci_controller mv_bus1_controller = {
-        .pcic = {
-                .pci_ops        = &mv_pci_ops,
-                .mem_resource   = &mv_pci_mem1_resource,
-                .io_resource    = &mv_pci_io_mem1_resource,
-        },
-        .config_addr    = MV64340_PCI_1_CONFIG_ADDR,
-        .config_vreg    = MV64340_PCI_1_CONFIG_DATA_VIRTUAL_REG,
-};
-static __init void mv64340_pci1_init(void)
-{
-        uint32_t mem0_base, mem0_size;
-        uint32_t io_base, io_size;
-        io_base = MV_READ(MV64340_PCI_1_IO_BASE_ADDR) << 16;
-        io_size = (MV_READ(MV64340_PCI_1_IO_SIZE) + 1) << 16;
-        mem0_base = MV_READ(MV64340_PCI_1_MEMORY0_BASE_ADDR) << 16;
-        mem0_size = (MV_READ(MV64340_PCI_1_MEMORY0_SIZE) + 1) << 16;
-        /*
-         * Here we assume the I/O window of second bus to be contiguous with
-         * the first.  A gap is no problem but would waste address space for
-         * remapping the port space.
-         */
-        mv_pci_io_mem1_resource.start           = mv_io_size;
-        mv_pci_io_mem1_resource.end             = mv_io_size + io_size - 1;
-        mv_pci_mem1_resource.start              = mem0_base;
-        mv_pci_mem1_resource.end                = mem0_base + mem0_size - 1;
-        mv_bus1_controller.pcic.mem_offset      = mem0_base;
-        mv_bus1_controller.pcic.io_offset       = 0;
-        ioport_resource.end             = io_base + io_size -mv_io_base - 1;
-        register_pci_controller(&mv_bus1_controller.pcic);
-        mv_io_size = io_base + io_size - mv_io_base;
-}
-static __init int __init ocelot_c_pci_init(void)
-{
-        unsigned long io_v_base;
-        uint32_t enable;
-        enable = ~MV_READ(MV64340_BASE_ADDR_ENABLE);
-        /*
-         * We require at least one enabled I/O or PCI memory window or we
-         * will ignore this PCI bus.  We ignore PCI windows 1, 2 and 3.
-         */
-        if (enable & (0x01 <<  9) || enable & (0x01 << 10))
-                mv64340_pci0_init();
-        if (enable & (0x01 << 14) || enable & (0x01 << 15))
-                mv64340_pci1_init();
-        if (mv_io_size) {
-                io_v_base = (unsigned long) ioremap(mv_io_base, mv_io_size);
-                if (!io_v_base)
-                        panic("Could not ioremap I/O port range");
-                set_io_port_base(io_v_base);
-        }
-        return 0;
-}
-arch_initcall(ocelot_c_pci_init);
diff --git a/arch/mips/pci/pci-sb1250.c b/arch/mips/pci/pci-sb1250.c
index 75c1246ced..c1ac649315 100644
--- a/arch/mips/pci/pci-sb1250.c
+++ b/arch/mips/pci/pci-sb1250.c
@@ -84,7 +84,7 @@ static inline void WRITECFG32(u32 addr, u32 data)
        *(u32 *) (cfg_space + (addr & ~3)) = data;
 }
-int pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        return dev->irq;
 }
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 8108231f2e..99d8f4fd3f 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -269,7 +269,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
        }
        for (ln = bus->devices.next; ln != &bus->devices; ln = ln->next) {
-                struct pci_dev *dev = pci_dev_b(ln);
+                dev = pci_dev_b(ln);
                if ((dev->class >> 8) != PCI_CLASS_BRIDGE_PCI)
                        pcibios_fixup_device_resources(dev, bus);
diff --git a/arch/mips/philips/pnx8550/common/platform.c b/arch/mips/philips/pnx8550/common/platform.c
index d43f56e2cd..c839436bd0 100644
--- a/arch/mips/philips/pnx8550/common/platform.c
+++ b/arch/mips/philips/pnx8550/common/platform.c
@@ -123,7 +123,7 @@ static struct platform_device *pnx8550_platform_devices[] __initdata = {
        &pnx8550_uart_device,
 };
-int pnx8550_platform_init(void)
+static int __init pnx8550_platform_init(void)
 {
        return platform_add_devices(pnx8550_platform_devices,
                                    ARRAY_SIZE(pnx8550_platform_devices));
diff --git a/arch/mips/philips/pnx8550/common/proc.c b/arch/mips/philips/pnx8550/common/proc.c
index 3f097558ef..92311e95b7 100644
--- a/arch/mips/philips/pnx8550/common/proc.c
+++ b/arch/mips/philips/pnx8550/common/proc.c
@@ -78,29 +78,33 @@ static int pnx8550_proc_init( void )
 {
        // Create /proc/pnx8550
-        pnx8550_dir = create_proc_entry("pnx8550", S_IFDIR|S_IRUGO, NULL);
+        pnx8550_dir = proc_mkdir("pnx8550", NULL);
        if (!pnx8550_dir) {
                printk(KERN_ERR "Can't create pnx8550 proc dir\n");
                return -1;
        }
        // Create /proc/pnx8550/timers
-        pnx8550_timers = create_proc_entry("timers", S_IFREG|S_IRUGO, pnx8550_dir );
+        pnx8550_timers = create_proc_read_entry(
-        if (pnx8550_timers){
+                "timers",
-                pnx8550_timers->read_proc = pnx8550_timers_read;
+                0,
-        }
+                pnx8550_dir,
-        else {
+                pnx8550_timers_read,
+                NULL);
+        if (!pnx8550_timers)
                printk(KERN_ERR "Can't create pnx8550 timers proc file\n");
-        }
        // Create /proc/pnx8550/registers
-        pnx8550_registers = create_proc_entry("registers", S_IFREG|S_IRUGO, pnx8550_dir );
+        pnx8550_registers = create_proc_read_entry(
-        if (pnx8550_registers){
+                "registers",
-                pnx8550_registers->read_proc = pnx8550_registers_read;
+                0,
-        }
+                pnx8550_dir,
-        else {
+                pnx8550_registers_read,
+                NULL);
+        if (!pnx8550_registers)
                printk(KERN_ERR "Can't create pnx8550 registers proc file\n");
-        }
        return 0;
 }
diff --git a/arch/mips/pmc-sierra/Kconfig b/arch/mips/pmc-sierra/Kconfig
index 24d514c9df..abbd0bbfab 100644
--- a/arch/mips/pmc-sierra/Kconfig
+++ b/arch/mips/pmc-sierra/Kconfig
@@ -1,3 +1,49 @@
+choice
+        prompt "PMC-Sierra MSP SOC type"
+        depends on PMC_MSP
+config PMC_MSP4200_EVAL
+        bool "PMC-Sierra MSP4200 Eval Board"
+        select IRQ_MSP_SLP
+        select HW_HAS_PCI
+config PMC_MSP4200_GW
+        bool "PMC-Sierra MSP4200 VoIP Gateway"
+        select IRQ_MSP_SLP
+        select HW_HAS_PCI
+config PMC_MSP7120_EVAL
+        bool "PMC-Sierra MSP7120 Eval Board"
+        select SYS_SUPPORTS_MULTITHREADING
+        select IRQ_MSP_CIC
+        select HW_HAS_PCI
+config PMC_MSP7120_GW
+        bool "PMC-Sierra MSP7120 Residential Gateway"
+        select SYS_SUPPORTS_MULTITHREADING
+        select IRQ_MSP_CIC
+        select HW_HAS_PCI
+config PMC_MSP7120_FPGA
+        bool "PMC-Sierra MSP7120 FPGA"
+        select SYS_SUPPORTS_MULTITHREADING
+        select IRQ_MSP_CIC
+        select HW_HAS_PCI
+endchoice
+menu "Options for PMC-Sierra MSP chipsets"
+        depends on PMC_MSP
+config PMC_MSP_EMBEDDED_ROOTFS
+        bool "Root filesystem embedded in kernel image"
+        select MTD
+        select MTD_BLOCK
+        select MTD_PMC_MSP_RAMROOT
+        select MTD_RAM
+endmenu
 config HYPERTRANSPORT
        bool "Hypertransport Support for PMC-Sierra Yosemite"
        depends on PMC_YOSEMITE
diff --git a/arch/mips/pmc-sierra/msp71xx/Makefile b/arch/mips/pmc-sierra/msp71xx/Makefile
new file mode 100644
index 0000000000..4bba79c1cc
--- /dev/null
+++ b/arch/mips/pmc-sierra/msp71xx/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for the PMC-Sierra MSP SOCs
+#
+obj-y += msp_prom.o msp_setup.o msp_irq.o \
+         msp_time.o msp_serial.o msp_elb.o
+obj-$(CONFIG_PMC_MSP7120_GW) += msp_hwbutton.o
+obj-$(CONFIG_IRQ_MSP_SLP) += msp_irq_slp.o
+obj-$(CONFIG_IRQ_MSP_CIC) += msp_irq_cic.o
+obj-$(CONFIG_PCI) += msp_pci.o
+obj-$(CONFIG_MSPETH) += msp_eth.o
+obj-$(CONFIG_USB_MSP71XX) += msp_usb.o
diff --git a/arch/mips/momentum/ocelot_c/ocelot_c_fpga.h b/arch/mips/pmc-sierra/msp71xx/msp_elb.c
index f0f5581dcb..3e96410072 100644
--- a/arch/mips/momentum/ocelot_c/ocelot_c_fpga.h
+++ b/arch/mips/pmc-sierra/msp71xx/msp_elb.c
@@ -1,7 +1,9 @@
 /*
- * Ocelot-C Board Register Definitions
+ * Sets up the proper Chip Select configuration registers.  It is assumed that
+ * PMON sets up the ADDR and MASK registers properly.
 *
- * (C) 2002 Momentum Computer Inc.
+ * Copyright 2005-2006 PMC-Sierra, Inc.
+ * Author: Marc St-Jean, Marc_St-Jean@pmc-sierra.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -22,40 +24,23 @@
 *  You should have received a copy of the  GNU General Public License along
 *  with this program; if not, write  to the Free Software Foundation, Inc.,
 *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *  Louis Hamilton, Red Hat, Inc.
- *    hamilton@redhat.com  [MIPS64 modifications]
 */
-#ifndef __OCELOT_C_FPGA_H__
+#include <linux/kernel.h>
-#define __OCELOT_C_FPGA_H__
+#include <linux/init.h>
+#include <msp_regs.h>
-#ifdef CONFIG_64BIT
+static int __init msp_elb_setup(void)
-#define OCELOT_C_CS0_ADDR       (0xfffffffffc000000)
+{
-#else
+#if defined(CONFIG_PMC_MSP7120_GW) \
-#define OCELOT_C_CS0_ADDR               (0xfc000000)
+ || defined(CONFIG_PMC_MSP7120_EVAL)
+        /*
+         * Force all CNFG to be identical and equal to CS0,
+         * according to OPS doc
+         */
+        *CS1_CNFG_REG = *CS2_CNFG_REG = *CS3_CNFG_REG = *CS0_CNFG_REG;
 #endif
+        return 0;
+}
-#define OCELOT_C_REG_BOARDREV           0x0
+subsys_initcall(msp_elb_setup);
-#define OCELOT_C_REG_FPGA_REV           0x1
-#define OCELOT_C_REG_FPGA_TYPE          0x2
-#define OCELOT_C_REG_RESET_STATUS       0x3
-#define OCELOT_C_REG_BOARD_STATUS       0x4
-#define OCELOT_C_REG_CPCI_ID            0x5
-#define OCELOT_C_REG_SET                0x6
-#define OCELOT_C_REG_CLR                0x7
-#define OCELOT_C_REG_EEPROM_MODE        0x9
-#define OCELOT_C_REG_INTMASK            0xa
-#define OCELOT_C_REG_INTSTAT            0xb
-#define OCELOT_C_REG_UART_INTMASK       0xc
-#define OCELOT_C_REG_UART_INTSTAT       0xd
-#define OCELOT_C_REG_INTSET             0xe
-#define OCELOT_C_REG_INTCLR             0xf
-#define __FPGA_REG_TO_ADDR(reg)                                         \
-        ((void *) OCELOT_C_CS0_ADDR + OCELOT_C_REG_##reg)
-#define OCELOT_FPGA_WRITE(x, reg) writeb(x, __FPGA_REG_TO_ADDR(reg))
-#define OCELOT_FPGA_READ(reg) readb(__FPGA_REG_TO_ADDR(reg))
-#endif
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
new file mode 100644
index 0000000000..6fa8572815
--- /dev/null
+++ b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
@@ -0,0 +1,179 @@
+/*
+ * Sets up interrupt handlers for various hardware switches which are
+ * connected to interrupt lines.
+ *
+ * Copyright 2005-2207 PMC-Sierra, Inc.
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <msp_int.h>
+#include <msp_regs.h>
+#include <msp_regops.h>
+#ifdef CONFIG_PMCTWILED
+#include <msp_led_macros.h>
+#endif
+/* For hwbutton_interrupt->initial_state */
+#define HWBUTTON_HI     0x1
+#define HWBUTTON_LO     0x2
+/*
+ * This struct describes a hardware button
+ */
+struct hwbutton_interrupt {
+        char *name;                     /* Name of button */
+        int irq;                        /* Actual LINUX IRQ */
+        int eirq;                       /* Extended IRQ number (0-7) */
+        int initial_state;              /* The "normal" state of the switch */
+        void (*handle_hi)(void *);      /* Handler: switch input has gone HI */
+        void (*handle_lo)(void *);      /* Handler: switch input has gone LO */
+        void *data;                     /* Optional data to pass to handler */
+};
+#ifdef CONFIG_PMC_MSP7120_GW
+extern void msp_restart(char *);
+static void softreset_push(void *data)
+{
+        printk(KERN_WARNING "SOFTRESET switch was pushed\n");
+        /*
+         * In the future you could move this to the release handler,
+         * timing the difference between the 'push' and 'release', and only
+         * doing this ungraceful restart if the button has been down for
+         * a certain amount of time; otherwise doing a graceful restart.
+         */
+        msp_restart(NULL);
+}
+static void softreset_release(void *data)
+{
+        printk(KERN_WARNING "SOFTRESET switch was released\n");
+        /* Do nothing */
+}
+static void standby_on(void *data)
+{
+        printk(KERN_WARNING "STANDBY switch was set to ON (not implemented)\n");
+        /* TODO: Put board in standby mode */
+#ifdef CONFIG_PMCTWILED
+        msp_led_turn_off(MSP_LED_PWRSTANDBY_GREEN);
+        msp_led_turn_on(MSP_LED_PWRSTANDBY_RED);
+#endif
+}
+static void standby_off(void *data)
+{
+        printk(KERN_WARNING
+                "STANDBY switch was set to OFF (not implemented)\n");
+        /* TODO: Take out of standby mode */
+#ifdef CONFIG_PMCTWILED
+        msp_led_turn_on(MSP_LED_PWRSTANDBY_GREEN);
+        msp_led_turn_off(MSP_LED_PWRSTANDBY_RED);
+#endif
+}
+static struct hwbutton_interrupt softreset_sw = {
+        .name = "Softreset button",
+        .irq = MSP_INT_EXT0,
+        .eirq = 0,
+        .initial_state = HWBUTTON_HI,
+        .handle_hi = softreset_release,
+        .handle_lo = softreset_push,
+        .data = NULL,
+};
+static struct hwbutton_interrupt standby_sw = {
+        .name = "Standby switch",
+        .irq = MSP_INT_EXT1,
+        .eirq = 1,
+        .initial_state = HWBUTTON_HI,
+        .handle_hi = standby_off,
+        .handle_lo = standby_on,
+        .data = NULL,
+};
+#endif /* CONFIG_PMC_MSP7120_GW */
+static irqreturn_t hwbutton_handler(int irq, void *data)
+{
+        struct hwbutton_interrupt *hirq = data;
+        unsigned long cic_ext = *CIC_EXT_CFG_REG;
+        if (irq != hirq->irq)
+                return IRQ_NONE;
+        if (CIC_EXT_IS_ACTIVE_HI(cic_ext, hirq->eirq)) {
+                /* Interrupt: pin is now HI */
+                CIC_EXT_SET_ACTIVE_LO(cic_ext, hirq->eirq);
+                hirq->handle_hi(hirq->data);
+        } else {
+                /* Interrupt: pin is now LO */
+                CIC_EXT_SET_ACTIVE_HI(cic_ext, hirq->eirq);
+                hirq->handle_lo(hirq->data);
+        }
+        /*
+         * Invert the POLARITY of this level interrupt to ack the interrupt
+         * Thus next state change will invoke the opposite message
+         */
+        *CIC_EXT_CFG_REG = cic_ext;
+        return IRQ_HANDLED;
+}
+static int msp_hwbutton_register(struct hwbutton_interrupt *hirq)
+{
+        unsigned long cic_ext;
+        if (hirq->handle_hi == NULL || hirq->handle_lo == NULL)
+                return -EINVAL;
+        cic_ext = *CIC_EXT_CFG_REG;
+        CIC_EXT_SET_TRIGGER_LEVEL(cic_ext, hirq->eirq);
+        if (hirq->initial_state == HWBUTTON_HI)
+                CIC_EXT_SET_ACTIVE_LO(cic_ext, hirq->eirq);
+        else
+                CIC_EXT_SET_ACTIVE_HI(cic_ext, hirq->eirq);
+        *CIC_EXT_CFG_REG = cic_ext;
+        return request_irq(hirq->irq, hwbutton_handler, SA_INTERRUPT,
+                                hirq->name, (void *)hirq);
+}
+static int __init msp_hwbutton_setup(void)
+{
+#ifdef CONFIG_PMC_MSP7120_GW
+        msp_hwbutton_register(&softreset_sw);
+        msp_hwbutton_register(&standby_sw);
+#endif
+        return 0;
+}
+subsys_initcall(msp_hwbutton_setup);
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq.c b/arch/mips/pmc-sierra/msp71xx/msp_irq.c
new file mode 100644
index 0000000000..734d598a2e
--- /dev/null
+++ b/arch/mips/pmc-sierra/msp71xx/msp_irq.c
@@ -0,0 +1,124 @@
+/*
+ * IRQ vector handles
+ *
+ * Copyright (C) 1995, 1996, 1997, 2003 by Ralf Baechle
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <linux/ptrace.h>
+#include <linux/time.h>
+#include <asm/irq_cpu.h>
+#include <msp_int.h>
+extern void msp_int_handle(void);
+/* SLP bases systems */
+extern void msp_slp_irq_init(void);
+extern void msp_slp_irq_dispatch(void);
+/* CIC based systems */
+extern void msp_cic_irq_init(void);
+extern void msp_cic_irq_dispatch(void);
+/*
+ * The PMC-Sierra MSP interrupts are arranged in a 3 level cascaded
+ * hierarchical system.  The first level are the direct MIPS interrupts
+ * and are assigned the interrupt range 0-7.  The second level is the SLM
+ * interrupt controller and is assigned the range 8-39.  The third level
+ * comprises the Peripherial block, the PCI block, the PCI MSI block and
+ * the SLP.  The PCI interrupts and the SLP errors are handled by the
+ * relevant subsystems so the core interrupt code needs only concern
+ * itself with the Peripheral block.  These are assigned interrupts in
+ * the range 40-71.
+ */
+asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
+{
+        u32 pending;
+        pending = read_c0_status() & read_c0_cause();
+        /*
+         * jump to the correct interrupt routine
+         * These are arranged in priority order and the timer
+         * comes first!
+         */
+#ifdef CONFIG_IRQ_MSP_CIC       /* break out the CIC stuff for now */
+        if (pending & C_IRQ4)   /* do the peripherals first, that's the timer */
+                msp_cic_irq_dispatch();
+        else if (pending & C_IRQ0)
+                do_IRQ(MSP_INT_MAC0);
+        else if (pending & C_IRQ1)
+                do_IRQ(MSP_INT_MAC1);
+        else if (pending & C_IRQ2)
+                do_IRQ(MSP_INT_USB);
+        else if (pending & C_IRQ3)
+                do_IRQ(MSP_INT_SAR);
+        else if (pending & C_IRQ5)
+                do_IRQ(MSP_INT_SEC);
+#else
+        if (pending & C_IRQ5)
+                do_IRQ(MSP_INT_TIMER);
+        else if (pending & C_IRQ0)
+                do_IRQ(MSP_INT_MAC0);
+        else if (pending & C_IRQ1)
+                do_IRQ(MSP_INT_MAC1);
+        else if (pending & C_IRQ3)
+                do_IRQ(MSP_INT_VE);
+        else if (pending & C_IRQ4)
+                msp_slp_irq_dispatch();
+#endif
+        else if (pending & C_SW0)       /* do software after hardware */
+                do_IRQ(MSP_INT_SW0);
+        else if (pending & C_SW1)
+                do_IRQ(MSP_INT_SW1);
+}
+static struct irqaction cascade_msp = {
+        .handler = no_action,
+        .name    = "MSP cascade"
+};
+void __init arch_init_irq(void)
+{
+        /* initialize the 1st-level CPU based interrupt controller */
+        mips_cpu_irq_init();
+#ifdef CONFIG_IRQ_MSP_CIC
+        msp_cic_irq_init();
+        /* setup the cascaded interrupts */
+        setup_irq(MSP_INT_CIC, &cascade_msp);
+        setup_irq(MSP_INT_PER, &cascade_msp);
+#else
+        /* setup the 2nd-level SLP register based interrupt controller */
+        msp_slp_irq_init();
+        /* setup the cascaded SLP/PER interrupts */
+        setup_irq(MSP_INT_SLP, &cascade_msp);
+        setup_irq(MSP_INT_PER, &cascade_msp);
+#endif
+}
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c b/arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c
new file mode 100644
index 0000000000..5175357d0a
--- /dev/null
+++ b/arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c
@@ -0,0 +1,134 @@
+/*
+ * This file define the irq handler for MSP SLM subsystem interrupts.
+ *
+ * Copyright 2005-2007 PMC-Sierra, Inc, derived from irq_cpu.c
+ * Author: Andrew Hughes, Andrew_Hughes@pmc-sierra.com
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/bitops.h>
+#include <asm/system.h>
+#include <msp_cic_int.h>
+#include <msp_regs.h>
+/*
+ * NOTE: We are only enabling support for VPE0 right now.
+ */
+static inline void unmask_msp_cic_irq(unsigned int irq)
+{
+        /* check for PER interrupt range */
+        if (irq < MSP_PER_INTBASE)
+                *CIC_VPE0_MSK_REG |= (1 << (irq - MSP_CIC_INTBASE));
+        else
+                *PER_INT_MSK_REG |= (1 << (irq - MSP_PER_INTBASE));
+}
+static inline void mask_msp_cic_irq(unsigned int irq)
+{
+        /* check for PER interrupt range */
+        if (irq < MSP_PER_INTBASE)
+                *CIC_VPE0_MSK_REG &= ~(1 << (irq - MSP_CIC_INTBASE));
+        else
+                *PER_INT_MSK_REG &= ~(1 << (irq - MSP_PER_INTBASE));
+}
+/*
+ * While we ack the interrupt interrupts are disabled and thus we don't need
+ * to deal with concurrency issues.  Same for msp_cic_irq_end.
+ */
+static inline void ack_msp_cic_irq(unsigned int irq)
+{
+        mask_msp_cic_irq(irq);
+        /*
+         * only really necessary for 18, 16-14 and sometimes 3:0 (since
+         * these can be edge sensitive) but it doesn't hurt for the others.
+         */
+        /* check for PER interrupt range */
+        if (irq < MSP_PER_INTBASE)
+                *CIC_STS_REG = (1 << (irq - MSP_CIC_INTBASE));
+        else
+                *PER_INT_STS_REG = (1 << (irq - MSP_PER_INTBASE));
+}
+static struct irq_chip msp_cic_irq_controller = {
+        .name = "MSP_CIC",
+        .ack = ack_msp_cic_irq,
+        .mask = ack_msp_cic_irq,
+        .mask_ack = ack_msp_cic_irq,
+        .unmask = unmask_msp_cic_irq,
+};
+void __init msp_cic_irq_init(void)
+{
+        int i;
+        /* Mask/clear interrupts. */
+        *CIC_VPE0_MSK_REG = 0x00000000;
+        *PER_INT_MSK_REG  = 0x00000000;
+        *CIC_STS_REG      = 0xFFFFFFFF;
+        *PER_INT_STS_REG  = 0xFFFFFFFF;
+#if defined(CONFIG_PMC_MSP7120_GW) || \
+    defined(CONFIG_PMC_MSP7120_EVAL)
+        /*
+         * The MSP7120 RG and EVBD boards use IRQ[6:4] for PCI.
+         * These inputs map to EXT_INT_POL[6:4] inside the CIC.
+         * They are to be active low, level sensitive.
+         */
+        *CIC_EXT_CFG_REG &= 0xFFFF8F8F;
+#endif
+        /* initialize all the IRQ descriptors */
+        for (i = MSP_CIC_INTBASE; i < MSP_PER_INTBASE + 32; i++)
+                set_irq_chip_and_handler(i, &msp_cic_irq_controller,
+                                         handle_level_irq);
+}
+void msp_cic_irq_dispatch(void)
+{
+        u32 pending;
+        int intbase;
+        intbase = MSP_CIC_INTBASE;
+        pending = *CIC_STS_REG & *CIC_VPE0_MSK_REG;
+        /* check for PER interrupt */
+        if (pending == (1 << (MSP_INT_PER - MSP_CIC_INTBASE))) {
+                intbase = MSP_PER_INTBASE;
+                pending = *PER_INT_STS_REG & *PER_INT_MSK_REG;
+        }
+        /* check for spurious interrupt */
+        if (pending == 0x00000000) {
+                printk(KERN_ERR
+                        "Spurious %s interrupt? status %08x, mask %08x\n",
+                        (intbase == MSP_CIC_INTBASE) ? "CIC" : "PER",
+                        (intbase == MSP_CIC_INTBASE) ?
+                                *CIC_STS_REG : *PER_INT_STS_REG,
+                        (intbase == MSP_CIC_INTBASE) ?
+                                *CIC_VPE0_MSK_REG : *PER_INT_MSK_REG);
+                return;
+        }
+        /* check for the timer and dispatch it first */
+        if ((intbase == MSP_CIC_INTBASE) &&
+            (pending & (1 << (MSP_INT_VPE0_TIMER - MSP_CIC_INTBASE))))
+                do_IRQ(MSP_INT_VPE0_TIMER);
+        else
+                do_IRQ(ffs(pending) + intbase - 1);
+}
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c b/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
new file mode 100644
index 0000000000..f5f1b8d2bb
--- /dev/null
+++ b/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
@@ -0,0 +1,109 @@
+/*
+ * This file define the irq handler for MSP SLM subsystem interrupts.
+ *
+ * Copyright 2005-2006 PMC-Sierra, Inc, derived from irq_cpu.c
+ * Author: Andrew Hughes, Andrew_Hughes@pmc-sierra.com
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/bitops.h>
+#include <asm/mipsregs.h>
+#include <asm/system.h>
+#include <msp_slp_int.h>
+#include <msp_regs.h>
+static inline void unmask_msp_slp_irq(unsigned int irq)
+{
+        /* check for PER interrupt range */
+        if (irq < MSP_PER_INTBASE)
+                *SLP_INT_MSK_REG |= (1 << (irq - MSP_SLP_INTBASE));
+        else
+                *PER_INT_MSK_REG |= (1 << (irq - MSP_PER_INTBASE));
+}
+static inline void mask_msp_slp_irq(unsigned int irq)
+{
+        /* check for PER interrupt range */
+        if (irq < MSP_PER_INTBASE)
+                *SLP_INT_MSK_REG &= ~(1 << (irq - MSP_SLP_INTBASE));
+        else
+                *PER_INT_MSK_REG &= ~(1 << (irq - MSP_PER_INTBASE));
+}
+/*
+ * While we ack the interrupt interrupts are disabled and thus we don't need
+ * to deal with concurrency issues.  Same for msp_slp_irq_end.
+ */
+static inline void ack_msp_slp_irq(unsigned int irq)
+{
+        mask_slp_irq(irq);
+        /*
+         * only really necessary for 18, 16-14 and sometimes 3:0 (since
+         * these can be edge sensitive) but it doesn't hurt  for the others.
+         */
+        /* check for PER interrupt range */
+        if (irq < MSP_PER_INTBASE)
+                *SLP_INT_STS_REG = (1 << (irq - MSP_SLP_INTBASE));
+        else
+                *PER_INT_STS_REG = (1 << (irq - MSP_PER_INTBASE));
+}
+static struct irq_chip msp_slp_irq_controller = {
+        .name = "MSP_SLP",
+        .ack = ack_msp_slp_irq,
+        .mask = ack_msp_slp_irq,
+        .mask_ack = ack_msp_slp_irq,
+        .unmask = unmask_msp_slp_irq,
+};
+void __init msp_slp_irq_init(void)
+{
+        int i;
+        /* Mask/clear interrupts. */
+        *SLP_INT_MSK_REG = 0x00000000;
+        *PER_INT_MSK_REG = 0x00000000;
+        *SLP_INT_STS_REG = 0xFFFFFFFF;
+        *PER_INT_STS_REG = 0xFFFFFFFF;
+        /* initialize all the IRQ descriptors */
+        for (i = MSP_SLP_INTBASE; i < MSP_PER_INTBASE + 32; i++)
+                set_irq_chip_and_handler(i, &msp_slp_irq_controller
+                                         handle_level_irq);
+}
+void msp_slp_irq_dispatch(void)
+{
+        u32 pending;
+        int intbase;
+        intbase = MSP_SLP_INTBASE;
+        pending = *SLP_INT_STS_REG & *SLP_INT_MSK_REG;
+        /* check for PER interrupt */
+        if (pending == (1 << (MSP_INT_PER - MSP_SLP_INTBASE))) {
+                intbase = MSP_PER_INTBASE;
+                pending = *PER_INT_STS_REG & *PER_INT_MSK_REG;
+        }
+        /* check for spurious interrupt */
+        if (pending == 0x00000000) {
+                printk(KERN_ERR "Spurious %s interrupt?\n",
+                        (intbase == MSP_SLP_INTBASE) ? "SLP" : "PER");
+                return;
+        }
+        /* dispatch the irq */
+        do_IRQ(ffs(pending) + intbase - 1);
+}
diff --git a/arch/mips/momentum/ocelot_3/ocelot_3_fpga.h b/arch/mips/pmc-sierra/msp71xx/msp_pci.c
index 5710a9029f..f764fe7748 100644
--- a/arch/mips/momentum/ocelot_3/ocelot_3_fpga.h
+++ b/arch/mips/pmc-sierra/msp71xx/msp_pci.c
@@ -1,7 +1,7 @@
 /*
- * Ocelot-3 Board Register Definitions
+ * The setup file for PCI related hardware on PMC-Sierra MSP processors.
 *
- * (C) 2002 Momentum Computer Inc.
+ * Copyright 2005-2006 PMC-Sierra, Inc.
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -22,38 +22,29 @@
 *  You should have received a copy of the  GNU General Public License along
 *  with this program; if not, write  to the Free Software Foundation, Inc.,
 *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *  Louis Hamilton, Red Hat, Inc.
- *    hamilton@redhat.com  [MIPS64 modifications]
- *
- * Copyright (C) 2004 MontaVista Software Inc.
- * Author: Manish Lachwani, mlachwani@mvista.com
 */
-#ifndef __OCELOT_3_FPGA_H__
+#include <linux/init.h>
-#define __OCELOT_3_FPGA_H__
+#include <msp_prom.h>
-#define OCELOT_3_REG_BOARDREV           0x0
+#include <msp_regs.h>
-#define OCELOT_3_REG_FPGA_REV           0x1
-#define OCELOT_3_REG_FPGA_TYPE          0x2
+extern void msp_pci_init(void);
-#define OCELOT_3_REG_RESET_STATUS       0x3
-#define OCELOT_3_REG_BOARD_STATUS       0x4
-#define OCELOT_3_REG_CPCI_ID            0x5
-#define OCELOT_3_REG_SET                0x6
-#define OCELOT_3_REG_CLR                0x7
-#define OCELOT_3_REG_EEPROM_MODE        0x9
-#define OCELOT_3_REG_INTMASK            0xa
-#define OCELOT_3_REG_INTSTAT            0xb
-#define OCELOT_3_REG_UART_INTMASK       0xc
-#define OCELOT_3_REG_UART_INTSTAT       0xd
-#define OCELOT_3_REG_INTSET             0xe
-#define OCELOT_3_REG_INTCLR             0xf
-extern unsigned long ocelot_fpga_base;
-#define __FPGA_REG_TO_ADDR(reg)                                         \
-        ((void *) ocelot_fpga_base + OCELOT_3_REG_##reg)
-#define OCELOT_FPGA_WRITE(x, reg) writeb(x, __FPGA_REG_TO_ADDR(reg))
-#define OCELOT_FPGA_READ(reg) readb(__FPGA_REG_TO_ADDR(reg))
+static int __init msp_pci_setup(void)
+{
+#if 0 /* Linux 2.6 initialization code to be completed */
+        if (getdeviceid() & DEV_ID_SINGLE_PC) {
+                /* If single card mode */
+                slmRegs *sreg = (slmRegs *) SREG_BASE;
+                sreg->single_pc_enable = SINGLE_PCCARD;
+        }
 #endif
+        msp_pci_init();
+        return 0;
+}
+subsys_initcall(msp_pci_setup);
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_prom.c b/arch/mips/pmc-sierra/msp71xx/msp_prom.c
new file mode 100644
index 0000000000..e5bd5481d8
--- /dev/null
+++ b/arch/mips/pmc-sierra/msp71xx/msp_prom.c
@@ -0,0 +1,566 @@
+/*
+ * BRIEF MODULE DESCRIPTION
+ *    PROM library initialisation code, assuming a version of
+ *    pmon is the boot code.
+ *
+ * Copyright 2000,2001 MontaVista Software Inc.
+ * Author: MontaVista Software, Inc.
+ *              ppopov@mvista.com or source@mvista.com
+ *
+ * This file was derived from Carsten Langgaard's
+ * arch/mips/mips-boards/xx files.
+ *
+ * Carsten Langgaard, carstenl@mips.com
+ * Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/interrupt.h>
+#include <linux/mm.h>
+#ifdef CONFIG_CRAMFS
+#include <linux/cramfs_fs.h>
+#endif
+#ifdef CONFIG_SQUASHFS
+#include <linux/squashfs_fs.h>
+#endif
+#include <asm/addrspace.h>
+#include <asm/bootinfo.h>
+#include <asm-generic/sections.h>
+#include <asm/page.h>
+#include <msp_prom.h>
+#include <msp_regs.h>
+/* global PROM environment variables and pointers */
+int prom_argc;
+char **prom_argv, **prom_envp;
+int *prom_vec;
+/* debug flag */
+int init_debug = 1;
+/* memory blocks */
+struct prom_pmemblock mdesc[PROM_MAX_PMEMBLOCKS];
+/* default feature sets */
+static char msp_default_features[] =
+#if defined(CONFIG_PMC_MSP4200_EVAL) \
+ || defined(CONFIG_PMC_MSP4200_GW)
+        "ERER";
+#elif defined(CONFIG_PMC_MSP7120_EVAL) \
+ || defined(CONFIG_PMC_MSP7120_GW)
+        "EMEMSP";
+#elif defined(CONFIG_PMC_MSP7120_FPGA)
+        "EMEM";
+#endif
+/* conversion functions */
+static inline unsigned char str2hexnum(unsigned char c)
+{
+        if (c >= '0' && c <= '9')
+                return c - '0';
+        if (c >= 'a' && c <= 'f')
+                return c - 'a' + 10;
+        return 0; /* foo */
+}
+static inline int str2eaddr(unsigned char *ea, unsigned char *str)
+{
+        int index = 0;
+        unsigned char num = 0;
+        while (*str != '\0') {
+                if ((*str == '.') || (*str == ':')) {
+                        ea[index++] = num;
+                        num = 0;
+                        str++;
+                } else {
+                        num = num << 4;
+                        num |= str2hexnum(*str++);
+                }
+        }
+        if (index == 5) {
+                ea[index++] = num;
+                return 0;
+        } else
+                return -1;
+}
+EXPORT_SYMBOL(str2eaddr);
+static inline unsigned long str2hex(unsigned char *str)
+{
+        int value = 0;
+        while (*str) {
+                value = value << 4;
+                value |= str2hexnum(*str++);
+        }
+        return value;
+}
+/* function to query the system information */
+const char *get_system_type(void)
+{
+#if defined(CONFIG_PMC_MSP4200_EVAL)
+        return "PMC-Sierra MSP4200 Eval Board";
+#elif defined(CONFIG_PMC_MSP4200_GW)
+        return "PMC-Sierra MSP4200 VoIP Gateway";
+#elif defined(CONFIG_PMC_MSP7120_EVAL)
+        return "PMC-Sierra MSP7120 Eval Board";
+#elif defined(CONFIG_PMC_MSP7120_GW)
+        return "PMC-Sierra MSP7120 Residential Gateway";
+#elif defined(CONFIG_PMC_MSP7120_FPGA)
+        return "PMC-Sierra MSP7120 FPGA";
+#else
+        #error "What is the type of *your* MSP?"
+#endif
+}
+int get_ethernet_addr(char *ethaddr_name, char *ethernet_addr)
+{
+        char *ethaddr_str;
+        ethaddr_str = prom_getenv(ethaddr_name);
+        if (!ethaddr_str) {
+                printk(KERN_WARNING "%s not set in boot prom\n", ethaddr_name);
+                return -1;
+        }
+        if (str2eaddr(ethernet_addr, ethaddr_str) == -1) {
+                printk(KERN_WARNING "%s badly formatted-<%s>\n",
+                        ethaddr_name, ethaddr_str);
+                return -1;
+        }
+        if (init_debug > 1) {
+                int i;
+                printk(KERN_DEBUG "get_ethernet_addr: for %s ", ethaddr_name);
+                for (i = 0; i < 5; i++)
+                        printk(KERN_DEBUG "%02x:",
+                                (unsigned char)*(ethernet_addr+i));
+                printk(KERN_DEBUG "%02x\n", *(ethernet_addr+i));
+        }
+        return 0;
+}
+EXPORT_SYMBOL(get_ethernet_addr);
+static char *get_features(void)
+{
+        char *feature = prom_getenv(FEATURES);
+        if (feature == NULL) {
+                /* default features based on MACHINE_TYPE */
+                feature = msp_default_features;
+        }
+        return feature;
+}
+static char test_feature(char c)
+{
+        char *feature = get_features();
+        while (*feature) {
+                if (*feature++ == c)
+                        return *feature;
+                feature++;
+        }
+        return FEATURE_NOEXIST;
+}
+unsigned long get_deviceid(void)
+{
+        char *deviceid = prom_getenv(DEVICEID);
+        if (deviceid == NULL)
+                return *DEV_ID_REG;
+        else
+                return str2hex(deviceid);
+}
+char identify_pci(void)
+{
+        return test_feature(PCI_KEY);
+}
+EXPORT_SYMBOL(identify_pci);
+char identify_pcimux(void)
+{
+        return test_feature(PCIMUX_KEY);
+}
+char identify_sec(void)
+{
+        return test_feature(SEC_KEY);
+}
+EXPORT_SYMBOL(identify_sec);
+char identify_spad(void)
+{
+        return test_feature(SPAD_KEY);
+}
+EXPORT_SYMBOL(identify_spad);
+char identify_tdm(void)
+{
+        return test_feature(TDM_KEY);
+}
+EXPORT_SYMBOL(identify_tdm);
+char identify_zsp(void)
+{
+        return test_feature(ZSP_KEY);
+}
+EXPORT_SYMBOL(identify_zsp);
+static char identify_enetfeature(char key, unsigned long interface_num)
+{
+        char *feature = get_features();
+        while (*feature) {
+                if (*feature++ == key && interface_num-- == 0)
+                        return *feature;
+                feature++;
+        }
+        return FEATURE_NOEXIST;
+}
+char identify_enet(unsigned long interface_num)
+{
+        return identify_enetfeature(ENET_KEY, interface_num);
+}
+EXPORT_SYMBOL(identify_enet);
+char identify_enetTxD(unsigned long interface_num)
+{
+        return identify_enetfeature(ENETTXD_KEY, interface_num);
+}
+EXPORT_SYMBOL(identify_enetTxD);
+unsigned long identify_family(void)
+{
+        unsigned long deviceid;
+        deviceid = get_deviceid();
+        return deviceid & CPU_DEVID_FAMILY;
+}
+EXPORT_SYMBOL(identify_family);
+unsigned long identify_revision(void)
+{
+        unsigned long deviceid;
+        deviceid = get_deviceid();
+        return deviceid & CPU_DEVID_REVISION;
+}
+EXPORT_SYMBOL(identify_revision);
+/* PROM environment functions */
+char *prom_getenv(char *env_name)
+{
+        /*
+         * Return a pointer to the given environment variable.  prom_envp
+         * points to a null terminated array of pointers to variables.
+         * Environment variables are stored in the form of "memsize=64"
+         */
+        char **var = prom_envp;
+        int i = strlen(env_name);
+        while (*var) {
+                if (strncmp(env_name, *var, i) == 0) {
+                        return (*var + strlen(env_name) + 1);
+                }
+                var++;
+        }
+        return NULL;
+}
+/* PROM commandline functions */
+char *prom_getcmdline(void)
+{
+        return &(arcs_cmdline[0]);
+}
+EXPORT_SYMBOL(prom_getcmdline);
+void  __init prom_init_cmdline(void)
+{
+        char *cp;
+        int actr;
+        actr = 1; /* Always ignore argv[0] */
+        cp = &(arcs_cmdline[0]);
+        while (actr < prom_argc) {
+                strcpy(cp, prom_argv[actr]);
+                cp += strlen(prom_argv[actr]);
+                *cp++ = ' ';
+                actr++;
+        }
+        if (cp != &(arcs_cmdline[0])) /* get rid of trailing space */
+                --cp;
+        *cp = '\0';
+}
+/* memory allocation functions */
+static int __init prom_memtype_classify(unsigned int type)
+{
+        switch (type) {
+        case yamon_free:
+                return BOOT_MEM_RAM;
+        case yamon_prom:
+                return BOOT_MEM_ROM_DATA;
+        default:
+                return BOOT_MEM_RESERVED;
+        }
+}
+void __init prom_meminit(void)
+{
+        struct prom_pmemblock *p;
+        p = prom_getmdesc();
+        while (p->size) {
+                long type;
+                unsigned long base, size;
+                type = prom_memtype_classify(p->type);
+                base = p->base;
+                size = p->size;
+                add_memory_region(base, size, type);
+                p++;
+        }
+}
+void __init prom_free_prom_memory(void)
+{
+        int     argc;
+        char    **argv;
+        char    **envp;
+        char    *ptr;
+        int     len = 0;
+        int     i;
+        unsigned long addr;
+        /*
+         * preserve environment variables and command line from pmon/bbload
+         * first preserve the command line
+         */
+        for (argc = 0; argc < prom_argc; argc++) {
+                len += sizeof(char *);                  /* length of pointer */
+                len += strlen(prom_argv[argc]) + 1;     /* length of string */
+        }
+        len += sizeof(char *);          /* plus length of null pointer */
+        argv = kmalloc(len, GFP_KERNEL);
+        ptr = (char *) &argv[prom_argc + 1];    /* strings follow array */
+        for (argc = 0; argc < prom_argc; argc++) {
+                argv[argc] = ptr;
+                strcpy(ptr, prom_argv[argc]);
+                ptr += strlen(prom_argv[argc]) + 1;
+        }
+        argv[prom_argc] = NULL;         /* end array with null pointer */
+        prom_argv = argv;
+        /* next preserve the environment variables */
+        len = 0;
+        i = 0;
+        for (envp = prom_envp; *envp != NULL; envp++) {
+                i++;            /* count number of environment variables */
+                len += sizeof(char *);          /* length of pointer */
+                len += strlen(*envp) + 1;       /* length of string */
+        }
+        len += sizeof(char *);          /* plus length of null pointer */
+        envp = kmalloc(len, GFP_KERNEL);
+        ptr = (char *) &envp[i+1];
+        for (argc = 0; argc < i; argc++) {
+                envp[argc] = ptr;
+                strcpy(ptr, prom_envp[argc]);
+                ptr += strlen(prom_envp[argc]) + 1;
+        }
+        envp[i] = NULL;                 /* end array with null pointer */
+        prom_envp = envp;
+        for (i = 0; i < boot_mem_map.nr_map; i++) {
+                if (boot_mem_map.map[i].type != BOOT_MEM_ROM_DATA)
+                        continue;
+                addr = boot_mem_map.map[i].addr;
+                free_init_pages("prom memory",
+                                addr, addr + boot_mem_map.map[i].size);
+        }
+}
+struct prom_pmemblock *__init prom_getmdesc(void)
+{
+        static char     memsz_env[] __initdata = "memsize";
+        static char     heaptop_env[] __initdata = "heaptop";
+        char            *str;
+        unsigned int    memsize;
+        unsigned int    heaptop;
+#ifdef CONFIG_MTD_PMC_MSP_RAMROOT
+        void            *ramroot_start;
+        unsigned long   ramroot_size;
+#endif
+        int i;
+        str = prom_getenv(memsz_env);
+        if (!str) {
+                ppfinit("memsize not set in boot prom, "
+                        "set to default (32Mb)\n");
+                memsize = 0x02000000;
+        } else {
+                memsize = simple_strtol(str, NULL, 0);
+                if (memsize == 0) {
+                        /* if memsize is a bad size, use reasonable default */
+                        memsize = 0x02000000;
+                }
+                /* convert to physical address (removing caching bits, etc) */
+                memsize = CPHYSADDR(memsize);
+        }
+        str = prom_getenv(heaptop_env);
+        if (!str) {
+                heaptop = CPHYSADDR((u32)&_text);
+                ppfinit("heaptop not set in boot prom, "
+                        "set to default 0x%08x\n", heaptop);
+        } else {
+                heaptop = simple_strtol(str, NULL, 16);
+                if (heaptop == 0) {
+                        /* heaptop conversion bad, might have 0xValue */
+                        heaptop = simple_strtol(str, NULL, 0);
+                        if (heaptop == 0) {
+                                /* heaptop still bad, use reasonable default */
+                                heaptop = CPHYSADDR((u32)&_text);
+                        }
+                }
+                /* convert to physical address (removing caching bits, etc) */
+                heaptop = CPHYSADDR((u32)heaptop);
+        }
+        /* the base region */
+        i = 0;
+        mdesc[i].type = BOOT_MEM_RESERVED;
+        mdesc[i].base = 0x00000000;
+        mdesc[i].size = PAGE_ALIGN(0x300 + 0x80);
+                /* jtag interrupt vector + sizeof vector */
+        /* PMON data */
+        if (heaptop > mdesc[i].base + mdesc[i].size) {
+                i++;                    /* 1 */
+                mdesc[i].type = BOOT_MEM_ROM_DATA;
+                mdesc[i].base = mdesc[i-1].base + mdesc[i-1].size;
+                mdesc[i].size = heaptop - mdesc[i].base;
+        }
+        /* end of PMON data to start of kernel -- probably zero .. */
+        if (heaptop != CPHYSADDR((u32)_text)) {
+                i++;    /* 2 */
+                mdesc[i].type = BOOT_MEM_RAM;
+                mdesc[i].base = heaptop;
+                mdesc[i].size = CPHYSADDR((u32)_text) - mdesc[i].base;
+        }
+        /*  kernel proper */
+        i++;                    /* 3 */
+        mdesc[i].type = BOOT_MEM_RESERVED;
+        mdesc[i].base = CPHYSADDR((u32)_text);
+#ifdef CONFIG_MTD_PMC_MSP_RAMROOT
+        if (get_ramroot(&ramroot_start, &ramroot_size)) {
+                /*
+                 * Rootfs in RAM -- follows kernel
+                 * Combine rootfs image with kernel block so a
+                 * page (4k) isn't wasted between memory blocks
+                 */
+                mdesc[i].size = CPHYSADDR(PAGE_ALIGN(
+                        (u32)ramroot_start + ramroot_size)) - mdesc[i].base;
+        } else
+#endif
+                mdesc[i].size = CPHYSADDR(PAGE_ALIGN(
+                        (u32)_end)) - mdesc[i].base;
+        /* Remainder of RAM -- under memsize */
+        i++;                    /* 5 */
+        mdesc[i].type = yamon_free;
+        mdesc[i].base = mdesc[i-1].base + mdesc[i-1].size;
+        mdesc[i].size = memsize - mdesc[i].base;
+        return &mdesc[0];
+}
+/* rootfs functions */
+#ifdef CONFIG_MTD_PMC_MSP_RAMROOT
+bool get_ramroot(void **start, unsigned long *size)
+{
+        extern char _end[];
+        /* Check for start following the end of the kernel */
+        void *check_start = (void *)_end;
+        /* Check for supported rootfs types */
+#ifdef CONFIG_CRAMFS
+        if (*(__u32 *)check_start == CRAMFS_MAGIC) {
+                /* Get CRAMFS size */
+                *start = check_start;
+                *size = PAGE_ALIGN(((struct cramfs_super *)
+                                   check_start)->size);
+                return true;
+        }
+#endif
+#ifdef CONFIG_SQUASHFS
+        if (*((unsigned int *)check_start) == SQUASHFS_MAGIC) {
+                /* Get SQUASHFS size */
+                *start = check_start;
+                *size = PAGE_ALIGN(((struct squashfs_super_block *)
+                                   check_start)->bytes_used);
+                return true;
+        }
+#endif
+        return false;
+}
+EXPORT_SYMBOL(get_ramroot);
+#endif
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_serial.c b/arch/mips/pmc-sierra/msp71xx/msp_serial.c
index c41b53faa8..e25bac537d 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_serial.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_serial.c
@@ -32,6 +32,7 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/serial.h>
+#include <linux/serial_8250.h>
 #include <msp_prom.h>
 #include <msp_int.h>
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_setup.c b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
new file mode 100644
index 0000000000..8f69b789be
--- /dev/null
+++ b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
@@ -0,0 +1,256 @@
+/*
+ * The generic setup file for PMC-Sierra MSP processors
+ *
+ * Copyright 2005-2007 PMC-Sierra, Inc,
+ * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
+ *
+ * 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.
+ */
+#include <asm/bootinfo.h>
+#include <asm/cacheflush.h>
+#include <asm/r4kcache.h>
+#include <asm/reboot.h>
+#include <asm/time.h>
+#include <msp_prom.h>
+#include <msp_regs.h>
+#if defined(CONFIG_PMC_MSP7120_GW)
+#include <msp_regops.h>
+#include <msp_gpio.h>
+#define MSP_BOARD_RESET_GPIO    9
+#endif
+extern void msp_timer_init(void);
+extern void msp_serial_setup(void);
+extern void pmctwiled_setup(void);
+#if defined(CONFIG_PMC_MSP7120_EVAL) || \
+    defined(CONFIG_PMC_MSP7120_GW) || \
+    defined(CONFIG_PMC_MSP7120_FPGA)
+/*
+ * Performs the reset for MSP7120-based boards
+ */
+void msp7120_reset(void)
+{
+        void *start, *end, *iptr;
+        register int i;
+        /* Diasble all interrupts */
+        local_irq_disable();
+#ifdef CONFIG_SYS_SUPPORTS_MULTITHREADING
+        dvpe();
+#endif
+        /* Cache the reset code of this function */
+        __asm__ __volatile__ (
+                "       .set    push                            \n"
+                "       .set    mips3                           \n"
+                "       la      %0,startpoint                   \n"
+                "       la      %1,endpoint                     \n"
+                "       .set    pop                             \n"
+                : "=r" (start), "=r" (end)
+                :
+        );
+        for (iptr = (void *)((unsigned int)start & ~(L1_CACHE_BYTES - 1));
+             iptr < end; iptr += L1_CACHE_BYTES)
+                cache_op(Fill, iptr);
+        __asm__ __volatile__ (
+                "startpoint:                                    \n"
+        );
+        /* Put the DDRC into self-refresh mode */
+        DDRC_INDIRECT_WRITE(DDRC_CTL(10), 0xb, 1 << 16);
+        /*
+         * IMPORTANT!
+         * DO NOT do anything from here on out that might even
+         * think about fetching from RAM - i.e., don't call any
+         * non-inlined functions, and be VERY sure that any inline
+         * functions you do call do NOT access any sort of RAM
+         * anywhere!
+         */
+        /* Wait a bit for the DDRC to settle */
+        for (i = 0; i < 100000000; i++);
+#if defined(CONFIG_PMC_MSP7120_GW)
+        /*
+         * Set GPIO 9 HI, (tied to board reset logic)
+         * GPIO 9 is the 4th GPIO of register 3
+         *
+         * NOTE: We cannot use the higher-level msp_gpio_mode()/out()
+         * as GPIO char driver may not be enabled and it would look up
+         * data inRAM!
+         */
+        set_value_reg32(GPIO_CFG3_REG,
+                        basic_mode_mask(MSP_BOARD_RESET_GPIO),
+                        basic_mode(MSP_GPIO_OUTPUT, MSP_BOARD_RESET_GPIO));
+        set_reg32(GPIO_DATA3_REG,
+                        basic_data_mask(MSP_BOARD_RESET_GPIO));
+        /*
+         * In case GPIO9 doesn't reset the board (jumper configurable!)
+         * fallback to device reset below.
+         */
+#endif
+        /* Set bit 1 of the MSP7120 reset register */
+        *RST_SET_REG = 0x00000001;
+        __asm__ __volatile__ (
+                "endpoint:                                      \n"
+        );
+}
+#endif
+void msp_restart(char *command)
+{
+        printk(KERN_WARNING "Now rebooting .......\n");
+#if defined(CONFIG_PMC_MSP7120_EVAL) || \
+    defined(CONFIG_PMC_MSP7120_GW) || \
+    defined(CONFIG_PMC_MSP7120_FPGA)
+        msp7120_reset();
+#else
+        /* No chip-specific reset code, just jump to the ROM reset vector */
+        set_c0_status(ST0_BEV | ST0_ERL);
+        change_c0_config(CONF_CM_CMASK, CONF_CM_UNCACHED);
+        flush_cache_all();
+        write_c0_wired(0);
+        __asm__ __volatile__("jr\t%0"::"r"(0xbfc00000));
+#endif
+}
+void msp_halt(void)
+{
+        printk(KERN_WARNING "\n** You can safely turn off the power\n");
+        while (1)
+                /* If possible call official function to get CPU WARs */
+                if (cpu_wait)
+                        (*cpu_wait)();
+                else
+                        __asm__(".set\tmips3\n\t" "wait\n\t" ".set\tmips0");
+}
+void msp_power_off(void)
+{
+        msp_halt();
+}
+void __init plat_mem_setup(void)
+{
+        _machine_restart = msp_restart;
+        _machine_halt = msp_halt;
+        pm_power_off = msp_power_off;
+        board_time_init = msp_timer_init;
+}
+void __init prom_init(void)
+{
+        unsigned long family;
+        unsigned long revision;
+        prom_argc = fw_arg0;
+        prom_argv = (char **)fw_arg1;
+        prom_envp = (char **)fw_arg2;
+        /*
+         * Someday we can use this with PMON2000 to get a
+         * platform call prom routines for output etc. without
+         * having to use grody hacks.  For now it's unused.
+         *
+         * struct callvectors *cv = (struct callvectors *) fw_arg3;
+         */
+        family = identify_family();
+        revision = identify_revision();
+        switch (family) {
+        case FAMILY_FPGA:
+                if (FPGA_IS_MSP4200(revision)) {
+                        /* Old-style revision ID */
+                        mips_machgroup = MACH_GROUP_MSP;
+                        mips_machtype = MACH_MSP4200_FPGA;
+                } else {
+                        mips_machgroup = MACH_GROUP_MSP;
+                        mips_machtype = MACH_MSP_OTHER;
+                }
+                break;
+        case FAMILY_MSP4200:
+                mips_machgroup = MACH_GROUP_MSP;
+#if defined(CONFIG_PMC_MSP4200_EVAL)
+                mips_machtype  = MACH_MSP4200_EVAL;
+#elif defined(CONFIG_PMC_MSP4200_GW)
+                mips_machtype  = MACH_MSP4200_GW;
+#else
+                mips_machtype = MACH_MSP_OTHER;
+#endif
+                break;
+        case FAMILY_MSP4200_FPGA:
+                mips_machgroup = MACH_GROUP_MSP;
+                mips_machtype  = MACH_MSP4200_FPGA;
+                break;
+        case FAMILY_MSP7100:
+                mips_machgroup = MACH_GROUP_MSP;
+#if defined(CONFIG_PMC_MSP7120_EVAL)
+                mips_machtype = MACH_MSP7120_EVAL;
+#elif defined(CONFIG_PMC_MSP7120_GW)
+                mips_machtype = MACH_MSP7120_GW;
+#else
+                mips_machtype = MACH_MSP_OTHER;
+#endif
+                break;
+        case FAMILY_MSP7100_FPGA:
+                mips_machgroup = MACH_GROUP_MSP;
+                mips_machtype  = MACH_MSP7120_FPGA;
+                break;
+        default:
+                /* we don't recognize the machine */
+                mips_machgroup = MACH_GROUP_UNKNOWN;
+                mips_machtype  = MACH_UNKNOWN;
+                break;
+        }
+        /* make sure we have the right initialization routine - sanity */
+        if (mips_machgroup != MACH_GROUP_MSP) {
+                ppfinit("Unknown machine group in a "
+                        "MSP initialization routine\n");
+                panic("***Bogosity factor five***, exiting\n");
+        }
+        prom_init_cmdline();
+        prom_meminit();
+        /*
+         * Sub-system setup follows.
+         * Setup functions can  either be called here or using the
+         * subsys_initcall mechanism (i.e. see msp_pci_setup). The
+         * order in which they are called can be changed by using the
+         * link order in arch/mips/pmc-sierra/msp71xx/Makefile.
+         *
+         * NOTE: Please keep sub-system specific initialization code
+         * in separate specific files.
+         */
+        msp_serial_setup();
+#ifdef CONFIG_PMCTWILED
+        /*
+         * Setup LED states before the subsys_initcall loads other
+         * dependant drivers/modules.
+         */
+        pmctwiled_setup();
+#endif
+}
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_time.c b/arch/mips/pmc-sierra/msp71xx/msp_time.c
new file mode 100644
index 0000000000..2a2beac5a4
--- /dev/null
+++ b/arch/mips/pmc-sierra/msp71xx/msp_time.c
@@ -0,0 +1,94 @@
+/*
+ * Setting up the clock on MSP SOCs.  No RTC typically.
+ *
+ * Carsten Langgaard, carstenl@mips.com
+ * Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.
+ *
+ * ########################################################################
+ *
+ *  This program is free software; you can distribute it and/or modify it
+ *  under the terms of the GNU General Public License (Version 2) as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ *
+ * ########################################################################
+ */
+#include <linux/init.h>
+#include <linux/kernel_stat.h>
+#include <linux/sched.h>
+#include <linux/spinlock.h>
+#include <linux/module.h>
+#include <linux/ptrace.h>
+#include <asm/mipsregs.h>
+#include <asm/time.h>
+#include <msp_prom.h>
+#include <msp_int.h>
+#include <msp_regs.h>
+void __init msp_timer_init(void)
+{
+        char    *endp, *s;
+        unsigned long cpu_rate = 0;
+        if (cpu_rate == 0) {
+                s = prom_getenv("clkfreqhz");
+                cpu_rate = simple_strtoul(s, &endp, 10);
+                if (endp != NULL && *endp != 0) {
+                        printk(KERN_ERR
+                                "Clock rate in Hz parse error: %s\n", s);
+                        cpu_rate = 0;
+                }
+        }
+        if (cpu_rate == 0) {
+                s = prom_getenv("clkfreq");
+                cpu_rate = 1000 * simple_strtoul(s, &endp, 10);
+                if (endp != NULL && *endp != 0) {
+                        printk(KERN_ERR
+                                "Clock rate in MHz parse error: %s\n", s);
+                        cpu_rate = 0;
+                }
+        }
+        if (cpu_rate == 0) {
+#if defined(CONFIG_PMC_MSP7120_EVAL) \
+ || defined(CONFIG_PMC_MSP7120_GW)
+                cpu_rate = 400000000;
+#elif defined(CONFIG_PMC_MSP7120_FPGA)
+                cpu_rate = 25000000;
+#else
+                cpu_rate = 150000000;
+#endif
+                printk(KERN_ERR
+                        "Failed to determine CPU clock rate, "
+                        "assuming %ld hz ...\n", cpu_rate);
+        }
+        printk(KERN_WARNING "Clock rate set to %ld\n", cpu_rate);
+        /* timer frequency is 1/2 clock rate */
+        mips_hpt_frequency = cpu_rate/2;
+}
+void __init plat_timer_setup(struct irqaction *irq)
+{
+#ifdef CONFIG_IRQ_MSP_CIC
+        /* we are using the vpe0 counter for timer interrupts */
+        setup_irq(MSP_INT_VPE0_TIMER, irq);
+#else
+        /* we are using the mips counter for timer interrupts */
+        setup_irq(MSP_INT_TIMER, irq);
+#endif
+}
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_usb.c b/arch/mips/pmc-sierra/msp71xx/msp_usb.c
new file mode 100644
index 0000000000..21f9c70b69
--- /dev/null
+++ b/arch/mips/pmc-sierra/msp71xx/msp_usb.c
@@ -0,0 +1,150 @@
+/*
+ * The setup file for USB related hardware on PMC-Sierra MSP processors.
+ *
+ * Copyright 2006-2007 PMC-Sierra, Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include <linux/dma-mapping.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <asm/mipsregs.h>
+#include <msp_regs.h>
+#include <msp_int.h>
+#include <msp_prom.h>
+#if defined(CONFIG_USB_EHCI_HCD)
+static struct resource msp_usbhost_resources [] = {
+        [0] = {
+                .start  = MSP_USB_BASE_START,
+                .end    = MSP_USB_BASE_END,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = MSP_INT_USB,
+                .end    = MSP_INT_USB,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static u64 msp_usbhost_dma_mask = DMA_32BIT_MASK;
+static struct platform_device msp_usbhost_device = {
+        .name   = "pmcmsp-ehci",
+        .id     = 0,
+        .dev    = {
+                .dma_mask = &msp_usbhost_dma_mask,
+                .coherent_dma_mask = DMA_32BIT_MASK,
+        },
+        .num_resources  = ARRAY_SIZE (msp_usbhost_resources),
+        .resource       = msp_usbhost_resources,
+};
+#endif /* CONFIG_USB_EHCI_HCD */
+#if defined(CONFIG_USB_GADGET)
+static struct resource msp_usbdev_resources [] = {
+        [0] = {
+                .start  = MSP_USB_BASE,
+                .end    = MSP_USB_BASE_END,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = MSP_INT_USB,
+                .end    = MSP_INT_USB,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static u64 msp_usbdev_dma_mask = DMA_32BIT_MASK;
+static struct platform_device msp_usbdev_device = {
+        .name   = "msp71xx_udc",
+        .id     = 0,
+        .dev    = {
+                .dma_mask = &msp_usbdev_dma_mask,
+                .coherent_dma_mask = DMA_32BIT_MASK,
+        },
+        .num_resources  = ARRAY_SIZE (msp_usbdev_resources),
+        .resource       = msp_usbdev_resources,
+};
+#endif /* CONFIG_USB_GADGET */
+#if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_GADGET)
+static struct platform_device *msp_devs[1];
+#endif
+static int __init msp_usb_setup(void)
+{
+#if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_GADGET)
+        char *strp;
+        char envstr[32];
+        unsigned int val = 0;
+        int result = 0;
+        /*
+         * construct environment name usbmode
+         * set usbmode <host/device> as pmon environment var
+         */
+        snprintf((char *)&envstr[0], sizeof(envstr), "usbmode");
+#if defined(CONFIG_USB_EHCI_HCD)
+        /* default to host mode */
+        val = 1;
+#endif
+        /* get environment string */
+        strp = prom_getenv((char *)&envstr[0]);
+        if (strp) {
+                if (!strcmp(strp, "device"))
+                        val = 0;
+        }
+        if (val) {
+#if defined(CONFIG_USB_EHCI_HCD)
+                /* get host mode device */
+                msp_devs[0] = &msp_usbhost_device;
+                ppfinit("platform add USB HOST done %s.\n",
+                            msp_devs[0]->name);
+                result = platform_add_devices(msp_devs, ARRAY_SIZE (msp_devs));
+#endif /* CONFIG_USB_EHCI_HCD */
+        }
+#if defined(CONFIG_USB_GADGET)
+        else {
+                /* get device mode structure */
+                msp_devs[0] = &msp_usbdev_device;
+                ppfinit("platform add USB DEVICE done %s.\n",
+                            msp_devs[0]->name);
+                result = platform_add_devices(msp_devs, ARRAY_SIZE (msp_devs));
+        }
+#endif /* CONFIG_USB_GADGET */
+#endif /* CONFIG_USB_EHCI_HCD || CONFIG_USB_GADGET */
+        return result;
+}
+subsys_initcall(msp_usb_setup);
diff --git a/arch/mips/pmc-sierra/yosemite/setup.c b/arch/mips/pmc-sierra/yosemite/setup.c
index 6a6e15e400..f7f93ae24c 100644
--- a/arch/mips/pmc-sierra/yosemite/setup.c
+++ b/arch/mips/pmc-sierra/yosemite/setup.c
@@ -39,6 +39,7 @@
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <asm/time.h>
 #include <asm/bootinfo.h>
diff --git a/arch/mips/pmc-sierra/yosemite/smp.c b/arch/mips/pmc-sierra/yosemite/smp.c
index 305491e74d..d83c4ada14 100644
--- a/arch/mips/pmc-sierra/yosemite/smp.c
+++ b/arch/mips/pmc-sierra/yosemite/smp.c
@@ -77,7 +77,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
 * stack so the first thing we do is throw away that stuff and load useful
 * values into the registers ...
 */
-void prom_boot_secondary(int cpu, struct task_struct *idle)
+void __init prom_boot_secondary(int cpu, struct task_struct *idle)
 {
        unsigned long gp = (unsigned long) task_thread_info(idle);
        unsigned long sp = __KSTK_TOS(idle);
diff --git a/arch/mips/sgi-ip22/ip22-reset.c b/arch/mips/sgi-ip22/ip22-reset.c
index 66df5ac8f0..63afd7e444 100644
--- a/arch/mips/sgi-ip22/ip22-reset.c
+++ b/arch/mips/sgi-ip22/ip22-reset.c
@@ -46,7 +46,7 @@ static struct timer_list power_timer, blink_timer, debounce_timer, volume_timer;
 static int machine_state;
-static void ATTRIB_NORET sgi_machine_power_off(void)
+static void __noreturn sgi_machine_power_off(void)
 {
        unsigned int tmp;
@@ -68,7 +68,7 @@ static void ATTRIB_NORET sgi_machine_power_off(void)
        }
 }
-static void ATTRIB_NORET sgi_machine_restart(char *command)
+static void __noreturn sgi_machine_restart(char *command)
 {
        if (machine_state & MACHINE_SHUTTING_DOWN)
                sgi_machine_power_off();
@@ -76,7 +76,7 @@ static void ATTRIB_NORET sgi_machine_restart(char *command)
        while (1);
 }
-static void ATTRIB_NORET sgi_machine_halt(void)
+static void __noreturn sgi_machine_halt(void)
 {
        if (machine_state & MACHINE_SHUTTING_DOWN)
                sgi_machine_power_off();
diff --git a/arch/mips/sgi-ip27/ip27-berr.c b/arch/mips/sgi-ip27/ip27-berr.c
index ce907eda22..123141ab21 100644
--- a/arch/mips/sgi-ip27/ip27-berr.c
+++ b/arch/mips/sgi-ip27/ip27-berr.c
@@ -21,7 +21,6 @@
 #include <asm/traps.h>
 #include <asm/uaccess.h>
-extern void dump_tlb_addr(unsigned long addr);
 extern void dump_tlb_all(void);
 static void dump_hub_information(unsigned long errst0, unsigned long errst1)
diff --git a/arch/mips/sgi-ip32/ip32-platform.c b/arch/mips/sgi-ip32/ip32-platform.c
index 120b15932c..ba3697ee7f 100644
--- a/arch/mips/sgi-ip32/ip32-platform.c
+++ b/arch/mips/sgi-ip32/ip32-platform.c
@@ -1,5 +1,53 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org)
+ */
+#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/serial_8250.h>
+#include <asm/ip32/mace.h>
+#include <asm/ip32/ip32_ints.h>
+/*
+ * .iobase isn't a constant (in the sense of C) so we fill it in at runtime.
+ */
+#define MACE_PORT(int)                                                  \
+{                                                                       \
+        .irq            = int,                                          \
+        .uartclk        = 1843200,                                      \
+        .iotype         = UPIO_MEM,                                     \
+        .flags          = UPF_SKIP_TEST,                                \
+        .regshift       = 8,                                            \
+}
+static struct plat_serial8250_port uart8250_data[] = {
+        MACE_PORT(MACEISA_SERIAL1_IRQ),
+        MACE_PORT(MACEISA_SERIAL2_IRQ),
+        { },
+};
+static struct platform_device uart8250_device = {
+        .name                   = "serial8250",
+        .id                     = PLAT8250_DEV_PLATFORM,
+        .dev                    = {
+                .platform_data  = uart8250_data,
+        },
+};
+static int __init uart8250_init(void)
+{
+        uart8250_data[0].iobase = (unsigned long) &mace->isa.serial1;
+        uart8250_data[1].iobase = (unsigned long) &mace->isa.serial1;
+        return platform_device_register(&uart8250_device);
+}
+device_initcall(uart8250_init);
 static __init int meth_devinit(void)
 {
@@ -18,3 +66,7 @@ static __init int meth_devinit(void)
 }
 device_initcall(meth_devinit);
+MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("8250 UART probe driver for SGI IP32 aka O2");
diff --git a/arch/mips/sgi-ip32/ip32-setup.c b/arch/mips/sgi-ip32/ip32-setup.c
index 57708fe28b..bbba066cb4 100644
--- a/arch/mips/sgi-ip32/ip32-setup.c
+++ b/arch/mips/sgi-ip32/ip32-setup.c
@@ -62,12 +62,6 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str)
 }
 #endif
-#ifdef CONFIG_SERIAL_8250
-#include <linux/tty.h>
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-#endif /* CONFIG_SERIAL_8250 */
 /* An arbitrary time; this can be decreased if reliability looks good */
 #define WAIT_MS 10
@@ -96,36 +90,6 @@ void __init plat_mem_setup(void)
        board_time_init = ip32_time_init;
-#ifdef CONFIG_SERIAL_8250
-        {
-                static struct uart_port o2_serial[2];
-                memset(o2_serial, 0, sizeof(o2_serial));
-                o2_serial[0].type       = PORT_16550A;
-                o2_serial[0].line       = 0;
-                o2_serial[0].irq        = MACEISA_SERIAL1_IRQ;
-                o2_serial[0].flags      = UPF_SKIP_TEST;
-                o2_serial[0].uartclk    = 1843200;
-                o2_serial[0].iotype     = UPIO_MEM;
-                o2_serial[0].membase    = (char *)&mace->isa.serial1;
-                o2_serial[0].fifosize   = 14;
-                /* How much to shift register offset by. Each UART register
-                 * is replicated over 256 byte space */
-                o2_serial[0].regshift   = 8;
-                o2_serial[1].type       = PORT_16550A;
-                o2_serial[1].line       = 1;
-                o2_serial[1].irq        = MACEISA_SERIAL2_IRQ;
-                o2_serial[1].flags      = UPF_SKIP_TEST;
-                o2_serial[1].uartclk    = 1843200;
-                o2_serial[1].iotype     = UPIO_MEM;
-                o2_serial[1].membase    = (char *)&mace->isa.serial2;
-                o2_serial[1].fifosize   = 14;
-                o2_serial[1].regshift   = 8;
-                early_serial_setup(&o2_serial[0]);
-                early_serial_setup(&o2_serial[1]);
-        }
-#endif
 #ifdef CONFIG_SGI_O2MACE_ETH
        {
                char *mac = ArcGetEnvironmentVariable("eaddr");
diff --git a/arch/mips/sibyte/bcm1480/setup.c b/arch/mips/sibyte/bcm1480/setup.c
index bdaac34ae7..89f29233ca 100644
--- a/arch/mips/sibyte/bcm1480/setup.c
+++ b/arch/mips/sibyte/bcm1480/setup.c
@@ -31,6 +31,7 @@
 unsigned int sb1_pass;
 unsigned int soc_pass;
 unsigned int soc_type;
+EXPORT_SYMBOL(soc_type);
 unsigned int periph_rev;
 unsigned int zbbus_mhz;
diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c
index ae4a92c3e5..51898dd130 100644
--- a/arch/mips/sibyte/cfe/setup.c
+++ b/arch/mips/sibyte/cfe/setup.c
@@ -62,7 +62,7 @@ extern unsigned long initrd_start, initrd_end;
 extern int kgdb_port;
 #endif
-static void ATTRIB_NORET cfe_linux_exit(void *arg)
+static void __noreturn cfe_linux_exit(void *arg)
 {
        int warm = *(int *)arg;
@@ -83,14 +83,14 @@ static void ATTRIB_NORET cfe_linux_exit(void *arg)
        while (1);
 }
-static void ATTRIB_NORET cfe_linux_restart(char *command)
+static void __noreturn cfe_linux_restart(char *command)
 {
        static const int zero;
        cfe_linux_exit((void *)&zero);
 }
-static void ATTRIB_NORET cfe_linux_halt(void)
+static void __noreturn cfe_linux_halt(void)
 {
        static const int one = 1;
diff --git a/arch/mips/sibyte/sb1250/setup.c b/arch/mips/sibyte/sb1250/setup.c
index f4a6169aa0..2d5c6d8b41 100644
--- a/arch/mips/sibyte/sb1250/setup.c
+++ b/arch/mips/sibyte/sb1250/setup.c
@@ -31,6 +31,7 @@
 unsigned int sb1_pass;
 unsigned int soc_pass;
 unsigned int soc_type;
+EXPORT_SYMBOL(soc_type);
 unsigned int periph_rev;
 unsigned int zbbus_mhz;
 EXPORT_SYMBOL(zbbus_mhz);
diff --git a/arch/mips/sibyte/swarm/time.c b/arch/mips/sibyte/swarm/time.c
deleted file mode 100644
index 97c73c793c..0000000000
--- a/arch/mips/sibyte/swarm/time.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright (C) 2000, 2001 Broadcom 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-/*
- * Time routines for the swarm board.  We pass all the hard stuff
- * through to the sb1250 handling code.  Only thing we really keep
- * track of here is what time of day we think it is.  And we don't
- * really even do a good job of that...
- */
-#include <linux/bcd.h>
-#include <linux/init.h>
-#include <linux/time.h>
-#include <linux/sched.h>
-#include <linux/spinlock.h>
-#include <asm/system.h>
-#include <asm/addrspace.h>
-#include <asm/io.h>
-#include <asm/sibyte/sb1250.h>
-#include <asm/sibyte/sb1250_regs.h>
-#include <asm/sibyte/sb1250_smbus.h>
-static unsigned long long sec_bias = 0;
-static unsigned int usec_bias = 0;
-/* Xicor 1241 definitions */
-/*
- * Register bits
- */
-#define X1241REG_SR_BAT 0x80            /* currently on battery power */
-#define X1241REG_SR_RWEL 0x04           /* r/w latch is enabled, can write RTC */
-#define X1241REG_SR_WEL 0x02            /* r/w latch is unlocked, can enable r/w now */
-#define X1241REG_SR_RTCF 0x01           /* clock failed */
-#define X1241REG_BL_BP2 0x80            /* block protect 2 */
-#define X1241REG_BL_BP1 0x40            /* block protect 1 */
-#define X1241REG_BL_BP0 0x20            /* block protect 0 */
-#define X1241REG_BL_WD1 0x10
-#define X1241REG_BL_WD0 0x08
-#define X1241REG_HR_MIL 0x80            /* military time format */
-/*
- * Register numbers
- */
-#define X1241REG_BL     0x10            /* block protect bits */
-#define X1241REG_INT    0x11            /*  */
-#define X1241REG_SC     0x30            /* Seconds */
-#define X1241REG_MN     0x31            /* Minutes */
-#define X1241REG_HR     0x32            /* Hours */
-#define X1241REG_DT     0x33            /* Day of month */
-#define X1241REG_MO     0x34            /* Month */
-#define X1241REG_YR     0x35            /* Year */
-#define X1241REG_DW     0x36            /* Day of Week */
-#define X1241REG_Y2K    0x37            /* Year 2K */
-#define X1241REG_SR     0x3F            /* Status register */
-#define X1241_CCR_ADDRESS       0x6F
-#define SMB_CSR(reg) (IOADDR(A_SMB_REGISTER(1, reg)))
-static int xicor_read(uint8_t addr)
-{
-        while (__raw_readq(SMB_CSR(R_SMB_STATUS)) & M_SMB_BUSY)
-                ;
-        __raw_writeq((addr >> 8) & 0x7, SMB_CSR(R_SMB_CMD));
-        __raw_writeq(addr & 0xff, SMB_CSR(R_SMB_DATA));
-        __raw_writeq(V_SMB_ADDR(X1241_CCR_ADDRESS) | V_SMB_TT_WR2BYTE,
-                     SMB_CSR(R_SMB_START));
-        while (__raw_readq(SMB_CSR(R_SMB_STATUS)) & M_SMB_BUSY)
-                ;
-        __raw_writeq(V_SMB_ADDR(X1241_CCR_ADDRESS) | V_SMB_TT_RD1BYTE,
-                     SMB_CSR(R_SMB_START));
-        while (__raw_readq(SMB_CSR(R_SMB_STATUS)) & M_SMB_BUSY)
-                ;
-        if (__raw_readq(SMB_CSR(R_SMB_STATUS)) & M_SMB_ERROR) {
-                /* Clear error bit by writing a 1 */
-                __raw_writeq(M_SMB_ERROR, SMB_CSR(R_SMB_STATUS));
-                return -1;
-        }
-        return (__raw_readq(SMB_CSR(R_SMB_DATA)) & 0xff);
-}
-static int xicor_write(uint8_t addr, int b)
-{
-        while (__raw_readq(SMB_CSR(R_SMB_STATUS)) & M_SMB_BUSY)
-                ;
-        __raw_writeq(addr, SMB_CSR(R_SMB_CMD));
-        __raw_writeq((addr & 0xff) | ((b & 0xff) << 8), SMB_CSR(R_SMB_DATA));
-        __raw_writeq(V_SMB_ADDR(X1241_CCR_ADDRESS) | V_SMB_TT_WR3BYTE,
-                     SMB_CSR(R_SMB_START));
-        while (__raw_readq(SMB_CSR(R_SMB_STATUS)) & M_SMB_BUSY)
-                ;
-        if (__raw_readq(SMB_CSR(R_SMB_STATUS)) & M_SMB_ERROR) {
-                /* Clear error bit by writing a 1 */
-                __raw_writeq(M_SMB_ERROR, SMB_CSR(R_SMB_STATUS));
-                return -1;
-        } else {
-                return 0;
-        }
-}
-/*
- * In order to set the CMOS clock precisely, set_rtc_mmss has to be
- * called 500 ms after the second nowtime has started, because when
- * nowtime is written into the registers of the CMOS clock, it will
- * jump to the next second precisely 500 ms later. Check the Motorola
- * MC146818A or Dallas DS12887 data sheet for details.
- *
- * BUG: This routine does not handle hour overflow properly; it just
- *      sets the minutes. Usually you'll only notice that after reboot!
- */
-int set_rtc_mmss(unsigned long nowtime)
-{
-        int retval = 0;
-        int real_seconds, real_minutes, cmos_minutes;
-        cmos_minutes = xicor_read(X1241REG_MN);
-        cmos_minutes = BCD2BIN(cmos_minutes);
-        /*
-         * since we're only adjusting minutes and seconds,
-         * don't interfere with hour overflow. This avoids
-         * messing with unknown time zones but requires your
-         * RTC not to be off by more than 15 minutes
-         */
-        real_seconds = nowtime % 60;
-        real_minutes = nowtime / 60;
-        if (((abs(real_minutes - cmos_minutes) + 15)/30) & 1)
-                real_minutes += 30;             /* correct for half hour time zone */
-        real_minutes %= 60;
-        /* unlock writes to the CCR */
-        xicor_write(X1241REG_SR, X1241REG_SR_WEL);
-        xicor_write(X1241REG_SR, X1241REG_SR_WEL | X1241REG_SR_RWEL);
-        if (abs(real_minutes - cmos_minutes) < 30) {
-                real_seconds = BIN2BCD(real_seconds);
-                real_minutes = BIN2BCD(real_minutes);
-                xicor_write(X1241REG_SC, real_seconds);
-                xicor_write(X1241REG_MN, real_minutes);
-        } else {
-                printk(KERN_WARNING
-                       "set_rtc_mmss: can't update from %d to %d\n",
-                       cmos_minutes, real_minutes);
-                retval = -1;
-        }
-        xicor_write(X1241REG_SR, 0);
-        printk("set_rtc_mmss: %02d:%02d\n", real_minutes, real_seconds);
-        return retval;
-}
-static unsigned long __init get_swarm_time(void)
-{
-        unsigned int year, mon, day, hour, min, sec, y2k;
-        sec = xicor_read(X1241REG_SC);
-        min = xicor_read(X1241REG_MN);
-        hour = xicor_read(X1241REG_HR);
-        if (hour & X1241REG_HR_MIL) {
-                hour &= 0x3f;
-        } else {
-                if (hour & 0x20)
-                        hour = (hour & 0xf) + 0x12;
-        }
-        sec = BCD2BIN(sec);
-        min = BCD2BIN(min);
-        hour = BCD2BIN(hour);
-        day = xicor_read(X1241REG_DT);
-        mon = xicor_read(X1241REG_MO);
-        year = xicor_read(X1241REG_YR);
-        y2k = xicor_read(X1241REG_Y2K);
-        day = BCD2BIN(day);
-        mon = BCD2BIN(mon);
-        year = BCD2BIN(year);
-        y2k = BCD2BIN(y2k);
-        year += (y2k * 100);
-        return mktime(year, mon, day, hour, min, sec);
-}
-/*
- *  Bring up the timer at 100 Hz.
- */
-void __init swarm_time_init(void)
-{
-        unsigned int flags;
-        int status;
-        /* Set up the scd general purpose timer 0 to cpu 0 */
-        sb1250_time_init();
-        /* Establish communication with the Xicor 1241 RTC */
-        /* XXXKW how do I share the SMBus with the I2C subsystem? */
-        __raw_writeq(K_SMB_FREQ_400KHZ, SMB_CSR(R_SMB_FREQ));
-        __raw_writeq(0, SMB_CSR(R_SMB_CONTROL));
-        if ((status = xicor_read(X1241REG_SR_RTCF)) < 0) {
-                printk("x1241: couldn't detect on SWARM SMBus 1\n");
-        } else {
-                if (status & X1241REG_SR_RTCF)
-                        printk("x1241: battery failed -- time is probably wrong\n");
-                write_seqlock_irqsave(&xtime_lock, flags);
-                xtime.tv_sec = get_swarm_time();
-                xtime.tv_nsec = 0;
-                write_sequnlock_irqrestore(&xtime_lock, flags);
-        }
-}
diff --git a/arch/mips/sni/Makefile b/arch/mips/sni/Makefile
index e5777b7e2b..471418e4f4 100644
--- a/arch/mips/sni/Makefile
+++ b/arch/mips/sni/Makefile
@@ -2,5 +2,5 @@
 # Makefile for the SNI specific part of the kernel
 #
-obj-y += irq.o reset.o setup.o ds1216.o a20r.o rm200.o pcimt.o pcit.o time.o
+obj-y += irq.o reset.o setup.o a20r.o rm200.o pcimt.o pcit.o time.o
 obj-$(CONFIG_CPU_BIG_ENDIAN) += sniprom.o
diff --git a/arch/mips/sni/a20r.c b/arch/mips/sni/a20r.c
index 31ab80f1be..acc9ba76c1 100644
--- a/arch/mips/sni/a20r.c
+++ b/arch/mips/sni/a20r.c
@@ -15,7 +15,6 @@
 #include <asm/sni.h>
 #include <asm/time.h>
-#include <asm/ds1216.h>
 #define PORT(_base,_irq)                                \
        {                                               \
@@ -40,20 +39,34 @@ static struct platform_device a20r_serial8250_device = {
        },
 };
+static struct resource a20r_ds1216_rsrc[] = {
+        {
+                .start = 0x1c081ffc,
+                .end   = 0x1c081fff,
+                .flags = IORESOURCE_MEM
+        }
+};
+static struct platform_device a20r_ds1216_device = {
+        .name           = "rtc-ds1216",
+        .num_resources  = ARRAY_SIZE(a20r_ds1216_rsrc),
+        .resource       = a20r_ds1216_rsrc
+};
 static struct resource snirm_82596_rsrc[] = {
        {
-                .start = 0xb8000000,
+                .start = 0x18000000,
-                .end   = 0xb8000004,
+                .end   = 0x18000004,
                .flags = IORESOURCE_MEM
        },
        {
-                .start = 0xb8010000,
+                .start = 0x18010000,
-                .end   = 0xb8010004,
+                .end   = 0x18010004,
                .flags = IORESOURCE_MEM
        },
        {
-                .start = 0xbff00000,
+                .start = 0x1ff00000,
-                .end   = 0xbff00020,
+                .end   = 0x1ff00020,
                .flags = IORESOURCE_MEM
        },
        {
@@ -74,8 +87,8 @@ static struct platform_device snirm_82596_pdev = {
 static struct resource snirm_53c710_rsrc[] = {
        {
-                .start = 0xb9000000,
+                .start = 0x19000000,
-                .end   = 0xb90fffff,
+                .end   = 0x190fffff,
                .flags = IORESOURCE_MEM
        },
        {
@@ -93,8 +106,8 @@ static struct platform_device snirm_53c710_pdev = {
 static struct resource sc26xx_rsrc[] = {
        {
-                .start = 0xbc070000,
+                .start = 0x1c070000,
-                .end   = 0xbc0700ff,
+                .end   = 0x1c0700ff,
                .flags = IORESOURCE_MEM
        },
        {
@@ -205,8 +218,7 @@ void __init sni_a20r_irq_init(void)
 void sni_a20r_init(void)
 {
-        ds1216_base = (volatile unsigned char *) SNI_DS1216_A20R_BASE;
+        /* FIXME, remove if not needed */
-        rtc_mips_get_time = ds1216_get_cmos_time;
 }
 static int __init snirm_a20r_setup_devinit(void)
@@ -218,6 +230,7 @@ static int __init snirm_a20r_setup_devinit(void)
                platform_device_register(&snirm_53c710_pdev);
                platform_device_register(&sc26xx_pdev);
                platform_device_register(&a20r_serial8250_device);
+                platform_device_register(&a20r_ds1216_device);
                break;
        }
diff --git a/arch/mips/sni/ds1216.c b/arch/mips/sni/ds1216.c
deleted file mode 100644
index 1d92732c14..0000000000
--- a/arch/mips/sni/ds1216.c
+++ /dev/null
@@ -1,81 +0,0 @@
-#include <linux/bcd.h>
-#include <linux/time.h>
-#include <asm/ds1216.h>
-volatile unsigned char *ds1216_base;
-/*
- * Read the 64 bit we'd like to have - It a series
- * of 64 bits showing up in the LSB of the base register.
- *
- */
-static unsigned char *ds1216_read(void)
-{
-        static unsigned char    rdbuf[8];
-        unsigned char           c;
-        int                     i, j;
-        for (i = 0; i < 8; i++) {
-                c = 0x0;
-                for (j = 0; j < 8; j++) {
-                        c |= (*ds1216_base & 0x1) << j;
-                }
-                rdbuf[i] = c;
-        }
-        return rdbuf;
-}
-static void ds1216_switch_ds_to_clock(void)
-{
-        unsigned char magic[] = {
-                0xc5, 0x3a, 0xa3, 0x5c, 0xc5, 0x3a, 0xa3, 0x5c
-        };
-        int i,j,c;
-        /* Reset magic pointer */
-        c = *ds1216_base;
-        /* Write 64 bit magic to DS1216 */
-        for (i = 0; i < 8; i++) {
-                c = magic[i];
-                for (j = 0; j < 8; j++) {
-                        *ds1216_base = c;
-                        c = c >> 1;
-                }
-        }
-}
-unsigned long ds1216_get_cmos_time(void)
-{
-        unsigned char   *rdbuf;
-        unsigned int    year, month, date, hour, min, sec;
-        ds1216_switch_ds_to_clock();
-        rdbuf = ds1216_read();
-        sec = BCD2BIN(DS1216_SEC(rdbuf));
-        min = BCD2BIN(DS1216_MIN(rdbuf));
-        hour = BCD2BIN(DS1216_HOUR(rdbuf));
-        date = BCD2BIN(DS1216_DATE(rdbuf));
-        month = BCD2BIN(DS1216_MONTH(rdbuf));
-        year = BCD2BIN(DS1216_YEAR(rdbuf));
-        if (DS1216_1224(rdbuf) && DS1216_AMPM(rdbuf))
-                hour+=12;
-        if (year < 70)
-                year += 2000;
-        else
-                year += 1900;
-        return mktime(year, month, date, hour, min, sec);
-}
-int ds1216_set_rtc_mmss(unsigned long nowtime)
-{
-        printk("ds1216_set_rtc_mmss called but not implemented\n");
-        return -1;
-}
diff --git a/arch/mips/sni/pcimt.c b/arch/mips/sni/pcimt.c
index 97b234361b..44b1ae62aa 100644
--- a/arch/mips/sni/pcimt.c
+++ b/arch/mips/sni/pcimt.c
@@ -14,7 +14,6 @@
 #include <linux/pci.h>
 #include <linux/serial_8250.h>
-#include <asm/mc146818-time.h>
 #include <asm/sni.h>
 #include <asm/time.h>
 #include <asm/i8259.h>
@@ -90,6 +89,26 @@ static struct platform_device pcimt_serial8250_device = {
        },
 };
+static struct resource pcimt_cmos_rsrc[] = {
+        {
+                .start = 0x70,
+                .end   = 0x71,
+                .flags = IORESOURCE_IO
+        },
+        {
+                .start = 8,
+                .end   = 8,
+                .flags = IORESOURCE_IRQ
+        }
+};
+static struct platform_device pcimt_cmos_device = {
+        .name           = "rtc_cmos",
+        .num_resources  = ARRAY_SIZE(pcimt_cmos_rsrc),
+        .resource       = pcimt_cmos_rsrc
+};
 static struct resource sni_io_resource = {
        .start  = 0x00000000UL,
        .end    = 0x03bfffffUL,
@@ -290,12 +309,10 @@ void __init sni_pcimt_irq_init(void)
        change_c0_status(ST0_IM, IE_IRQ1|IE_IRQ3);
 }
-void sni_pcimt_init(void)
+void __init sni_pcimt_init(void)
 {
        sni_pcimt_detect();
        sni_pcimt_sc_init();
-        rtc_mips_get_time = mc146818_get_cmos_time;
-        rtc_mips_set_time = mc146818_set_rtc_mmss;
        board_time_init = sni_cpu_time_init;
        ioport_resource.end = sni_io_resource.end;
 #ifdef CONFIG_PCI
@@ -312,6 +329,7 @@ static int __init snirm_pcimt_setup_devinit(void)
        case SNI_BRD_PCI_DESKTOP:
        case SNI_BRD_PCI_MTOWER_CPLUS:
                platform_device_register(&pcimt_serial8250_device);
+                platform_device_register(&pcimt_cmos_device);
                break;
        }
diff --git a/arch/mips/sni/pcit.c b/arch/mips/sni/pcit.c
index 00d151f4d1..2480c478dc 100644
--- a/arch/mips/sni/pcit.c
+++ b/arch/mips/sni/pcit.c
@@ -13,7 +13,6 @@
 #include <linux/pci.h>
 #include <linux/serial_8250.h>
-#include <asm/mc146818-time.h>
 #include <asm/sni.h>
 #include <asm/time.h>
 #include <asm/irq_cpu.h>
@@ -58,6 +57,25 @@ static struct platform_device pcit_cplus_serial8250_device = {
        },
 };
+static struct resource pcit_cmos_rsrc[] = {
+        {
+                .start = 0x70,
+                .end   = 0x71,
+                .flags = IORESOURCE_IO
+        },
+        {
+                .start = 8,
+                .end   = 8,
+                .flags = IORESOURCE_IRQ
+        }
+};
+static struct platform_device pcit_cmos_device = {
+        .name           = "rtc_cmos",
+        .num_resources  = ARRAY_SIZE(pcit_cmos_rsrc),
+        .resource       = pcit_cmos_rsrc
+};
 static struct resource sni_io_resource = {
        .start  = 0x00000000UL,
        .end    = 0x03bfffffUL,
@@ -243,10 +261,8 @@ void __init sni_pcit_cplus_irq_init(void)
        setup_irq (MIPS_CPU_IRQ_BASE + 3, &sni_isa_irq);
 }
-void sni_pcit_init(void)
+void __init sni_pcit_init(void)
 {
-        rtc_mips_get_time = mc146818_get_cmos_time;
-        rtc_mips_set_time = mc146818_set_rtc_mmss;
        board_time_init = sni_cpu_time_init;
        ioport_resource.end = sni_io_resource.end;
 #ifdef CONFIG_PCI
@@ -261,10 +277,12 @@ static int __init snirm_pcit_setup_devinit(void)
        switch (sni_brd_type) {
        case SNI_BRD_PCI_TOWER:
                platform_device_register(&pcit_serial8250_device);
+                platform_device_register(&pcit_cmos_device);
                break;
        case SNI_BRD_PCI_TOWER_CPLUS:
                platform_device_register(&pcit_cplus_serial8250_device);
+                platform_device_register(&pcit_cmos_device);
                break;
        }
        return 0;
diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
index b82ff129f5..28a11d8605 100644
--- a/arch/mips/sni/rm200.c
+++ b/arch/mips/sni/rm200.c
@@ -15,7 +15,6 @@
 #include <asm/sni.h>
 #include <asm/time.h>
-#include <asm/ds1216.h>
 #include <asm/irq_cpu.h>
 #define PORT(_base,_irq)                                \
@@ -41,20 +40,34 @@ static struct platform_device rm200_serial8250_device = {
        },
 };
+static struct resource rm200_ds1216_rsrc[] = {
+        {
+                .start = 0x1cd41ffc,
+                .end   = 0x1cd41fff,
+                .flags = IORESOURCE_MEM
+        }
+};
+static struct platform_device rm200_ds1216_device = {
+        .name           = "rtc-ds1216",
+        .num_resources  = ARRAY_SIZE(rm200_ds1216_rsrc),
+        .resource       = rm200_ds1216_rsrc
+};
 static struct resource snirm_82596_rm200_rsrc[] = {
        {
-                .start = 0xb8000000,
+                .start = 0x18000000,
-                .end   = 0xb80fffff,
+                .end   = 0x180fffff,
                .flags = IORESOURCE_MEM
        },
        {
-                .start = 0xbb000000,
+                .start = 0x1b000000,
-                .end   = 0xbb000004,
+                .end   = 0x1b000004,
                .flags = IORESOURCE_MEM
        },
        {
-                .start = 0xbff00000,
+                .start = 0x1ff00000,
-                .end   = 0xbff00020,
+                .end   = 0x1ff00020,
                .flags = IORESOURCE_MEM
        },
        {
@@ -75,8 +88,8 @@ static struct platform_device snirm_82596_rm200_pdev = {
 static struct resource snirm_53c710_rm200_rsrc[] = {
        {
-                .start = 0xb9000000,
+                .start = 0x19000000,
-                .end   = 0xb90fffff,
+                .end   = 0x190fffff,
                .flags = IORESOURCE_MEM
        },
        {
@@ -96,6 +109,7 @@ static int __init snirm_setup_devinit(void)
 {
        if (sni_brd_type == SNI_BRD_RM200) {
                platform_device_register(&rm200_serial8250_device);
+                platform_device_register(&rm200_ds1216_device);
                platform_device_register(&snirm_82596_rm200_pdev);
                platform_device_register(&snirm_53c710_rm200_pdev);
        }
@@ -176,11 +190,9 @@ void __init sni_rm200_irq_init(void)
        setup_irq (SNI_RM200_INT_START + 0, &sni_isa_irq);
 }
-void sni_rm200_init(void)
+void __init sni_rm200_init(void)
 {
        set_io_port_base(SNI_PORT_BASE + 0x02000000);
        ioport_resource.end += 0x02000000;
-        ds1216_base = (volatile unsigned char *) SNI_DS1216_RM200_BASE;
-        rtc_mips_get_time = ds1216_get_cmos_time;
        board_time_init = sni_cpu_time_init;
 }
diff --git a/arch/mips/sni/sniprom.c b/arch/mips/sni/sniprom.c
index 643366eb85..00a03a6e8f 100644
--- a/arch/mips/sni/sniprom.c
+++ b/arch/mips/sni/sniprom.c
@@ -146,7 +146,10 @@ static void __init sni_console_setup(void)
                }
                if (baud)
                        strcpy(options, baud);
-                add_preferred_console("ttyS", port, baud ? options : NULL);
+                if (strncmp (cdev, "tty552", 6) == 0)
+                        add_preferred_console("ttyS", port, baud ? options : NULL);
+                else
+                        add_preferred_console("ttySC", port, baud ? options : NULL);
        }
 }
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
index a0c11efeae..40c7c3eeaf 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
@@ -138,7 +138,6 @@ extern void toshiba_rbtx4927_irq_setup(void);
 char *prom_getcmdline(void);
 #ifdef CONFIG_PCI
-#define CONFIG_TX4927BUG_WORKAROUND
 #undef TX4927_SUPPORT_COMMAND_IO
 #undef  TX4927_SUPPORT_PCI_66
 int tx4927_cpu_clock = 100000000;       /* 100MHz */
@@ -669,15 +668,7 @@ void tx4927_pci_setup(void)
        /* PCI->GB mappings (MEM 16MB) -not used */
        tx4927_pcicptr->p2gm1plbase = 0xffffffff;
-#ifdef CONFIG_TX4927BUG_WORKAROUND
-        /*
-         * TX4927-PCIC-BUG: P2GM1PUBASE must be 0
-         * if P2GM0PUBASE was 0.
-         */
-        tx4927_pcicptr->p2gm1pubase = 0;
-#else
        tx4927_pcicptr->p2gm1pubase = 0xffffffff;
-#endif
        tx4927_pcicptr->p2gmgbase[1] = 0;
        /* PCI->GB mappings (MEM 1MB) -not used */
@@ -910,16 +901,6 @@ void __init toshiba_rbtx4927_setup(void)
        if (tx4927_ccfg_toeon)
                tx4927_ccfgptr->ccfg |= TX4927_CCFG_TOE;
-        /* SDRAMC fixup */
-#ifdef CONFIG_TX4927BUG_WORKAROUND
-        /*
-         * TX4927-BUG: INF 01-01-18/ BUG 01-01-22
-         * G-bus timeout error detection is incorrect
-         */
-        if (tx4927_ccfg_toeon)
-                tx4927_sdramcptr->tr |= 0x02000000;     /* RCD:3tck */
-#endif
        tx4927_pci_setup();
        if (tx4927_using_backplane == 1)
                printk("backplane board IS installed\n");
diff --git a/arch/mips/tx4938/common/Makefile b/arch/mips/tx4938/common/Makefile
index 2033ae77f6..83cda518f2 100644
--- a/arch/mips/tx4938/common/Makefile
+++ b/arch/mips/tx4938/common/Makefile
@@ -6,6 +6,6 @@
 # unless it's something special (ie not a .c file).
 #
-obj-y   += prom.o setup.o irq.o rtc_rx5c348.o
+obj-y   += prom.o setup.o irq.o
 obj-$(CONFIG_KGDB) += dbgio.o
diff --git a/arch/mips/tx4938/common/rtc_rx5c348.c b/arch/mips/tx4938/common/rtc_rx5c348.c
deleted file mode 100644
index 07f782fc07..0000000000
--- a/arch/mips/tx4938/common/rtc_rx5c348.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * RTC routines for RICOH Rx5C348 SPI chip.
- * Copyright (C) 2000-2001 Toshiba Corporation
- *
- * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the
- * terms of the GNU General Public License version 2. This program is
- * licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/rtc.h>
-#include <linux/time.h>
-#include <linux/bcd.h>
-#include <asm/time.h>
-#include <asm/tx4938/spi.h>
-#define EPOCH           2000
-/* registers */
-#define Rx5C348_REG_SECOND      0
-#define Rx5C348_REG_MINUTE      1
-#define Rx5C348_REG_HOUR        2
-#define Rx5C348_REG_WEEK        3
-#define Rx5C348_REG_DAY 4
-#define Rx5C348_REG_MONTH       5
-#define Rx5C348_REG_YEAR        6
-#define Rx5C348_REG_ADJUST      7
-#define Rx5C348_REG_ALARM_W_MIN 8
-#define Rx5C348_REG_ALARM_W_HOUR        9
-#define Rx5C348_REG_ALARM_W_WEEK        10
-#define Rx5C348_REG_ALARM_D_MIN 11
-#define Rx5C348_REG_ALARM_D_HOUR        12
-#define Rx5C348_REG_CTL1        14
-#define Rx5C348_REG_CTL2        15
-/* register bits */
-#define Rx5C348_BIT_PM  0x20    /* REG_HOUR */
-#define Rx5C348_BIT_Y2K 0x80    /* REG_MONTH */
-#define Rx5C348_BIT_24H 0x20    /* REG_CTL1 */
-#define Rx5C348_BIT_XSTP        0x10    /* REG_CTL2 */
-/* commands */
-#define Rx5C348_CMD_W(addr)     (((addr) << 4) | 0x08)  /* single write */
-#define Rx5C348_CMD_R(addr)     (((addr) << 4) | 0x0c)  /* single read */
-#define Rx5C348_CMD_MW(addr)    (((addr) << 4) | 0x00)  /* burst write */
-#define Rx5C348_CMD_MR(addr)    (((addr) << 4) | 0x04)  /* burst read */
-static struct spi_dev_desc srtc_dev_desc = {
-        .baud           = 1000000,      /* 1.0Mbps @ Vdd 2.0V */
-        .tcss           = 31,
-        .tcsh           = 1,
-        .tcsr           = 62,
-        /* 31us for Tcss (62us for Tcsr) is required for carry operation) */
-        .byteorder      = 1,            /* MSB-First */
-        .polarity       = 0,            /* High-Active */
-        .phase          = 1,            /* Shift-Then-Sample */
-};
-static int srtc_chipid;
-static int srtc_24h;
-static inline int
-spi_rtc_io(unsigned char *inbuf, unsigned char *outbuf, unsigned int count)
-{
-        unsigned char *inbufs[1], *outbufs[1];
-        unsigned int incounts[2], outcounts[2];
-        inbufs[0] = inbuf;
-        incounts[0] = count;
-        incounts[1] = 0;
-        outbufs[0] = outbuf;
-        outcounts[0] = count;
-        outcounts[1] = 0;
-        return txx9_spi_io(srtc_chipid, &srtc_dev_desc,
-                           inbufs, incounts, outbufs, outcounts, 0);
-}
-/* RTC-dependent code for time.c */
-static int
-rtc_rx5c348_set_time(unsigned long t)
-{
-        unsigned char inbuf[8];
-        struct rtc_time tm;
-        u8 year, month, day, hour, minute, second, century;
-        /* convert */
-        to_tm(t, &tm);
-        year = tm.tm_year % 100;
-        month = tm.tm_mon+1;    /* tm_mon starts from 0 to 11 */
-        day = tm.tm_mday;
-        hour = tm.tm_hour;
-        minute = tm.tm_min;
-        second = tm.tm_sec;
-        century = tm.tm_year / 100;
-        inbuf[0] = Rx5C348_CMD_MW(Rx5C348_REG_SECOND);
-        BIN_TO_BCD(second);
-        inbuf[1] = second;
-        BIN_TO_BCD(minute);
-        inbuf[2] = minute;
-        if (srtc_24h) {
-                BIN_TO_BCD(hour);
-                inbuf[3] = hour;
-        } else {
-                /* hour 0 is AM12, noon is PM12 */
-                inbuf[3] = 0;
-                if (hour >= 12)
-                        inbuf[3] = Rx5C348_BIT_PM;
-                hour = (hour + 11) % 12 + 1;
-                BIN_TO_BCD(hour);
-                inbuf[3] |= hour;
-        }
-        inbuf[4] = 0;   /* ignore week */
-        BIN_TO_BCD(day);
-        inbuf[5] = day;
-        BIN_TO_BCD(month);
-        inbuf[6] = month;
-        if (century >= 20)
-                inbuf[6] |= Rx5C348_BIT_Y2K;
-        BIN_TO_BCD(year);
-        inbuf[7] = year;
-        /* write in one transfer to avoid data inconsistency */
-        return spi_rtc_io(inbuf, NULL, 8);
-}
-static unsigned long
-rtc_rx5c348_get_time(void)
-{
-        unsigned char inbuf[8], outbuf[8];
-        unsigned int year, month, day, hour, minute, second;
-        inbuf[0] = Rx5C348_CMD_MR(Rx5C348_REG_SECOND);
-        memset(inbuf + 1, 0, 7);
-        /* read in one transfer to avoid data inconsistency */
-        if (spi_rtc_io(inbuf, outbuf, 8))
-                return 0;
-        second = outbuf[1];
-        BCD_TO_BIN(second);
-        minute = outbuf[2];
-        BCD_TO_BIN(minute);
-        if (srtc_24h) {
-                hour = outbuf[3];
-                BCD_TO_BIN(hour);
-        } else {
-                hour = outbuf[3] & ~Rx5C348_BIT_PM;
-                BCD_TO_BIN(hour);
-                hour %= 12;
-                if (outbuf[3] & Rx5C348_BIT_PM)
-                        hour += 12;
-        }
-        day = outbuf[5];
-        BCD_TO_BIN(day);
-        month = outbuf[6] & ~Rx5C348_BIT_Y2K;
-        BCD_TO_BIN(month);
-        year = outbuf[7];
-        BCD_TO_BIN(year);
-        year += EPOCH;
-        return mktime(year, month, day, hour, minute, second);
-}
-void __init
-rtc_rx5c348_init(int chipid)
-{
-        unsigned char inbuf[2], outbuf[2];
-        srtc_chipid = chipid;
-        /* turn on RTC if it is not on */
-        inbuf[0] = Rx5C348_CMD_R(Rx5C348_REG_CTL2);
-        inbuf[1] = 0;
-        spi_rtc_io(inbuf, outbuf, 2);
-        if (outbuf[1] & Rx5C348_BIT_XSTP) {
-                inbuf[0] = Rx5C348_CMD_W(Rx5C348_REG_CTL2);
-                inbuf[1] = 0;
-                spi_rtc_io(inbuf, NULL, 2);
-        }
-        inbuf[0] = Rx5C348_CMD_R(Rx5C348_REG_CTL1);
-        inbuf[1] = 0;
-        spi_rtc_io(inbuf, outbuf, 2);
-        if (outbuf[1] & Rx5C348_BIT_24H)
-                srtc_24h = 1;
-        /* set the function pointers */
-        rtc_mips_get_time = rtc_rx5c348_get_time;
-        rtc_mips_set_time = rtc_rx5c348_set_time;
-}
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/Makefile b/arch/mips/tx4938/toshiba_rbtx4938/Makefile
index 226941279d..10c94e62bf 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/Makefile
+++ b/arch/mips/tx4938/toshiba_rbtx4938/Makefile
@@ -6,4 +6,4 @@
 # unless it's something special (ie not a .c file).
 #
-obj-y   += prom.o setup.o irq.o spi_eeprom.o spi_txx9.o
+obj-y   += prom.o setup.o irq.o spi_eeprom.o
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/irq.c b/arch/mips/tx4938/toshiba_rbtx4938/irq.c
index 2e96dbb248..91aea7aff5 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/irq.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/irq.c
@@ -165,8 +165,6 @@ toshiba_rbtx4938_irq_ioc_disable(unsigned int irq)
        TX4938_RD08(TOSHIBA_RBTX4938_IOC_INTR_ENAB);
 }
-extern void __init txx9_spi_irqinit(int irc_irq);
 void __init arch_init_irq(void)
 {
        extern void tx4938_irq_init(void);
@@ -185,9 +183,5 @@ void __init arch_init_irq(void)
        /* Onboard 10M Ether: High Active */
        TX4938_WR(TX4938_MKA(TX4938_IRC_IRDM0), 0x00000040);
-        if (tx4938_ccfgptr->pcfg & TX4938_PCFG_SPI_SEL) {
-                txx9_spi_irqinit(RBTX4938_IRQ_IRC_SPI);
-        }
        wbflush();
 }
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
index f5d1ce739f..6ed39a5aea 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/setup.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
@@ -14,13 +14,13 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/ioport.h>
-#include <linux/proc_fs.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/console.h>
 #include <linux/pci.h>
 #include <linux/pm.h>
 #include <linux/platform_device.h>
+#include <linux/clk.h>
 #include <asm/wbflush.h>
 #include <asm/reboot.h>
@@ -35,6 +35,9 @@
 #include <linux/serial.h>
 #include <linux/serial_core.h>
 #endif
+#include <linux/spi/spi.h>
+#include <asm/tx4938/spi.h>
+#include <asm/gpio.h>
 extern void rbtx4938_time_init(void) __init;
 extern char * __init prom_getcmdline(void);
@@ -349,7 +352,7 @@ static struct pci_dev *fake_pci_dev(struct pci_controller *hose,
        static struct pci_dev dev;
        static struct pci_bus bus;
-        dev.sysdata = (void *)hose;
+        dev.sysdata = bus.sysdata = hose;
        dev.devfn = devfn;
        bus.number = busnr;
        bus.ops = hose->pci_ops;
@@ -382,8 +385,10 @@ int txboard_pci66_check(struct pci_controller *hose, int top_bus, int current_bu
        printk("PCI: Checking 66MHz capabilities...\n");
        for (pci_devfn=devfn_start; pci_devfn<devfn_stop; pci_devfn++) {
-                early_read_config_word(hose, top_bus, current_bus, pci_devfn,
+                if (early_read_config_word(hose, top_bus, current_bus,
-                                       PCI_VENDOR_ID, &vid);
+                                           pci_devfn, PCI_VENDOR_ID,
+                                           &vid) != PCIBIOS_SUCCESSFUL)
+                        continue;
                if (vid == 0xffff) continue;
@@ -460,7 +465,6 @@ static int __init tx4938_pcibios_init(void)
        int extarb = !(tx4938_ccfgptr->ccfg & TX4938_CCFG_PCIXARB);
        PCIBIOS_MIN_IO = 0x00001000UL;
-        PCIBIOS_MIN_MEM = 0x01000000UL;
        mem_base[0] = txboard_request_phys_region_shrink(&mem_size[0]);
        io_base[0] = txboard_request_phys_region_shrink(&io_size[0]);
@@ -574,82 +578,43 @@ arch_initcall(tx4938_pcibios_init);
 #define SEEPROM3_CS     1       /* IOC */
 #define SRTC_CS 2       /* IOC */
-static int rbtx4938_spi_cs_func(int chipid, int on)
-{
-        unsigned char bit;
-        switch (chipid) {
-        case RBTX4938_SEEPROM1_CHIPID:
-                if (on)
-                        tx4938_pioptr->dout &= ~(1 << SEEPROM1_CS);
-                else
-                        tx4938_pioptr->dout |= (1 << SEEPROM1_CS);
-                return 0;
-                break;
-        case RBTX4938_SEEPROM2_CHIPID:
-                bit = (1 << SEEPROM2_CS);
-                break;
-        case RBTX4938_SEEPROM3_CHIPID:
-                bit = (1 << SEEPROM3_CS);
-                break;
-        case RBTX4938_SRTC_CHIPID:
-                bit = (1 << SRTC_CS);
-                break;
-        default:
-                return -ENODEV;
-        }
-        /* bit1,2,4 are low active, bit3 is high active */
-        *rbtx4938_spics_ptr =
-                (*rbtx4938_spics_ptr & ~bit) |
-                ((on ? (bit ^ 0x0b) : ~(bit ^ 0x0b)) & bit);
-        return 0;
-}
 #ifdef CONFIG_PCI
-extern int spi_eeprom_read(int chipid, int address, unsigned char *buf, int len);
+static int __init rbtx4938_ethaddr_init(void)
-int rbtx4938_get_tx4938_ethaddr(struct pci_dev *dev, unsigned char *addr)
 {
-        struct pci_controller *channel = (struct pci_controller *)dev->bus->sysdata;
+        unsigned char dat[17];
-        static unsigned char dat[17];
+        unsigned char sum;
-        static int read_dat = 0;
+        int i;
-        int ch = 0;
-        if (channel != &tx4938_pci_controller[1])
+        /* 0-3: "MAC\0", 4-9:eth0, 10-15:eth1, 16:sum */
-                return -ENODEV;
+        if (spi_eeprom_read(SEEPROM1_CS, 0, dat, sizeof(dat))) {
-        /* TX4938 PCIC1 */
+                printk(KERN_ERR "seeprom: read error.\n");
-        switch (PCI_SLOT(dev->devfn)) {
-        case TX4938_PCIC_IDSEL_AD_TO_SLOT(31):
-                ch = 0;
-                break;
-        case TX4938_PCIC_IDSEL_AD_TO_SLOT(30):
-                ch = 1;
-                break;
-        default:
                return -ENODEV;
+        } else {
+                if (strcmp(dat, "MAC") != 0)
+                        printk(KERN_WARNING "seeprom: bad signature.\n");
+                for (i = 0, sum = 0; i < sizeof(dat); i++)
+                        sum += dat[i];
+                if (sum)
+                        printk(KERN_WARNING "seeprom: bad checksum.\n");
        }
-        if (!read_dat) {
+        for (i = 0; i < 2; i++) {
-                unsigned char sum;
+                unsigned int slot = TX4938_PCIC_IDSEL_AD_TO_SLOT(31 - i);
-                int i;
+                unsigned int id = (1 << 8) | PCI_DEVFN(slot, 0); /* bus 1 */
-                read_dat = 1;
+                struct platform_device *pdev;
-                /* 0-3: "MAC\0", 4-9:eth0, 10-15:eth1, 16:sum */
+                if (!(tx4938_ccfgptr->pcfg &
-                if (spi_eeprom_read(RBTX4938_SEEPROM1_CHIPID,
+                      (i ? TX4938_PCFG_ETH1_SEL : TX4938_PCFG_ETH0_SEL)))
-                                    0, dat, sizeof(dat))) {
+                        continue;
-                        printk(KERN_ERR "seeprom: read error.\n");
+                pdev = platform_device_alloc("tc35815-mac", id);
-                } else {
+                if (!pdev ||
-                        if (strcmp(dat, "MAC") != 0)
+                    platform_device_add_data(pdev, &dat[4 + 6 * i], 6) ||
-                                printk(KERN_WARNING "seeprom: bad signature.\n");
+                    platform_device_add(pdev))
-                        for (i = 0, sum = 0; i < sizeof(dat); i++)
+                        platform_device_put(pdev);
-                                sum += dat[i];
-                        if (sum)
-                                printk(KERN_WARNING "seeprom: bad checksum.\n");
-                }
        }
-        memcpy(addr, &dat[4 + 6 * ch], 6);
        return 0;
 }
+device_initcall(rbtx4938_ethaddr_init);
 #endif /* CONFIG_PCI */
-extern void __init txx9_spi_init(unsigned long base, int (*cs_func)(int chipid, int on));
 static void __init rbtx4938_spi_setup(void)
 {
        /* set SPI_SEL */
@@ -657,7 +622,6 @@ static void __init rbtx4938_spi_setup(void)
        /* chip selects for SPI devices */
        tx4938_pioptr->dout |= (1 << SEEPROM1_CS);
        tx4938_pioptr->dir |= (1 << SEEPROM1_CS);
-        txx9_spi_init(TX4938_SPI_REG, rbtx4938_spi_cs_func);
 }
 static struct resource rbtx4938_fpga_resource;
@@ -896,10 +860,8 @@ void tx4938_report_pcic_status(void)
 /* We use onchip r4k counter or TMR timer as our system wide timer
 * interrupt running at 100HZ. */
-extern void __init rtc_rx5c348_init(int chipid);
 void __init rbtx4938_time_init(void)
 {
-        rtc_rx5c348_init(RBTX4938_SRTC_CHIPID);
        mips_hpt_frequency = txx9_cpu_clock / 2;
 }
@@ -1016,29 +978,6 @@ void __init toshiba_rbtx4938_setup(void)
               *rbtx4938_dipsw_ptr, *rbtx4938_bdipsw_ptr);
 }
-#ifdef CONFIG_PROC_FS
-extern void spi_eeprom_proc_create(struct proc_dir_entry *dir, int chipid);
-static int __init tx4938_spi_proc_setup(void)
-{
-        struct proc_dir_entry *tx4938_spi_eeprom_dir;
-        tx4938_spi_eeprom_dir = proc_mkdir("spi_eeprom", 0);
-        if (!tx4938_spi_eeprom_dir)
-                return -ENOMEM;
-        /* don't allow user access to RBTX4938_SEEPROM1_CHIPID
-         * as it contains eth0 and eth1 MAC addresses
-         */
-        spi_eeprom_proc_create(tx4938_spi_eeprom_dir, RBTX4938_SEEPROM2_CHIPID);
-        spi_eeprom_proc_create(tx4938_spi_eeprom_dir, RBTX4938_SEEPROM3_CHIPID);
-        return 0;
-}
-__initcall(tx4938_spi_proc_setup);
-#endif
 static int __init rbtx4938_ne_init(void)
 {
        struct resource res[] = {
@@ -1057,3 +996,176 @@ static int __init rbtx4938_ne_init(void)
        return IS_ERR(dev) ? PTR_ERR(dev) : 0;
 }
 device_initcall(rbtx4938_ne_init);
+/* GPIO support */
+static DEFINE_SPINLOCK(rbtx4938_spi_gpio_lock);
+static void rbtx4938_spi_gpio_set(unsigned gpio, int value)
+{
+        u8 val;
+        unsigned long flags;
+        gpio -= 16;
+        spin_lock_irqsave(&rbtx4938_spi_gpio_lock, flags);
+        val = *rbtx4938_spics_ptr;
+        if (value)
+                val |= 1 << gpio;
+        else
+                val &= ~(1 << gpio);
+        *rbtx4938_spics_ptr = val;
+        mmiowb();
+        spin_unlock_irqrestore(&rbtx4938_spi_gpio_lock, flags);
+}
+static int rbtx4938_spi_gpio_dir_out(unsigned gpio, int value)
+{
+        rbtx4938_spi_gpio_set(gpio, value);
+        return 0;
+}
+static DEFINE_SPINLOCK(tx4938_gpio_lock);
+static int tx4938_gpio_get(unsigned gpio)
+{
+        return tx4938_pioptr->din & (1 << gpio);
+}
+static void tx4938_gpio_set_raw(unsigned gpio, int value)
+{
+        u32 val;
+        val = tx4938_pioptr->dout;
+        if (value)
+                val |= 1 << gpio;
+        else
+                val &= ~(1 << gpio);
+        tx4938_pioptr->dout = val;
+}
+static void tx4938_gpio_set(unsigned gpio, int value)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&tx4938_gpio_lock, flags);
+        tx4938_gpio_set_raw(gpio, value);
+        mmiowb();
+        spin_unlock_irqrestore(&tx4938_gpio_lock, flags);
+}
+static int tx4938_gpio_dir_in(unsigned gpio)
+{
+        spin_lock_irq(&tx4938_gpio_lock);
+        tx4938_pioptr->dir &= ~(1 << gpio);
+        mmiowb();
+        spin_unlock_irq(&tx4938_gpio_lock);
+        return 0;
+}
+static int tx4938_gpio_dir_out(unsigned int gpio, int value)
+{
+        spin_lock_irq(&tx4938_gpio_lock);
+        tx4938_gpio_set_raw(gpio, value);
+        tx4938_pioptr->dir |= 1 << gpio;
+        mmiowb();
+        spin_unlock_irq(&tx4938_gpio_lock);
+        return 0;
+}
+int gpio_direction_input(unsigned gpio)
+{
+        if (gpio < 16)
+                return tx4938_gpio_dir_in(gpio);
+        return -EINVAL;
+}
+int gpio_direction_output(unsigned gpio, int value)
+{
+        if (gpio < 16)
+                return tx4938_gpio_dir_out(gpio, value);
+        if (gpio < 16 + 3)
+                return rbtx4938_spi_gpio_dir_out(gpio, value);
+        return -EINVAL;
+}
+int gpio_get_value(unsigned gpio)
+{
+        if (gpio < 16)
+                return tx4938_gpio_get(gpio);
+        return 0;
+}
+void gpio_set_value(unsigned gpio, int value)
+{
+        if (gpio < 16)
+                tx4938_gpio_set(gpio, value);
+        else
+                rbtx4938_spi_gpio_set(gpio, value);
+}
+/* SPI support */
+static void __init txx9_spi_init(unsigned long base, int irq)
+{
+        struct resource res[] = {
+                {
+                        .start  = base,
+                        .end    = base + 0x20 - 1,
+                        .flags  = IORESOURCE_MEM,
+                        .parent = &tx4938_reg_resource,
+                }, {
+                        .start  = irq,
+                        .flags  = IORESOURCE_IRQ,
+                },
+        };
+        platform_device_register_simple("txx9spi", 0,
+                                        res, ARRAY_SIZE(res));
+}
+static int __init rbtx4938_spi_init(void)
+{
+        struct spi_board_info srtc_info = {
+                .modalias = "rs5c348",
+                .max_speed_hz = 1000000, /* 1.0Mbps @ Vdd 2.0V */
+                .bus_num = 0,
+                .chip_select = 16 + SRTC_CS,
+                /* Mode 1 (High-Active, Shift-Then-Sample), High Avtive CS  */
+                .mode = SPI_MODE_1 | SPI_CS_HIGH,
+        };
+        spi_register_board_info(&srtc_info, 1);
+        spi_eeprom_register(SEEPROM1_CS);
+        spi_eeprom_register(16 + SEEPROM2_CS);
+        spi_eeprom_register(16 + SEEPROM3_CS);
+        txx9_spi_init(TX4938_SPI_REG & 0xfffffffffULL, RBTX4938_IRQ_IRC_SPI);
+        return 0;
+}
+arch_initcall(rbtx4938_spi_init);
+/* Minimum CLK support */
+struct clk *clk_get(struct device *dev, const char *id)
+{
+        if (!strcmp(id, "spi-baseclk"))
+                return (struct clk *)(txx9_gbus_clock / 2 / 4);
+        return ERR_PTR(-ENOENT);
+}
+EXPORT_SYMBOL(clk_get);
+int clk_enable(struct clk *clk)
+{
+        return 0;
+}
+EXPORT_SYMBOL(clk_enable);
+void clk_disable(struct clk *clk)
+{
+}
+EXPORT_SYMBOL(clk_disable);
+unsigned long clk_get_rate(struct clk *clk)
+{
+        return (unsigned long)clk;
+}
+EXPORT_SYMBOL(clk_get_rate);
+void clk_put(struct clk *clk)
+{
+}
+EXPORT_SYMBOL(clk_put);
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c b/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c
index 89596e62f9..4d6b4ade5e 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c
@@ -10,209 +10,90 @@
 * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
 */
 #include <linux/init.h>
-#include <linux/delay.h>
+#include <linux/device.h>
-#include <linux/proc_fs.h>
+#include <linux/spi/spi.h>
-#include <linux/spinlock.h>
+#include <linux/spi/eeprom.h>
 #include <asm/tx4938/spi.h>
-#include <asm/tx4938/tx4938.h>
-/* ATMEL 250x0 instructions */
+#define AT250X0_PAGE_SIZE       8
-#define ATMEL_WREN      0x06
-#define ATMEL_WRDI      0x04
-#define ATMEL_RDSR      0x05
-#define ATMEL_WRSR      0x01
-#define ATMEL_READ      0x03
-#define ATMEL_WRITE     0x02
-#define ATMEL_SR_BSY    0x01
+/* register board information for at25 driver */
-#define ATMEL_SR_WEN    0x02
+int __init spi_eeprom_register(int chipid)
-#define ATMEL_SR_BP0    0x04
-#define ATMEL_SR_BP1    0x08
-DEFINE_SPINLOCK(spi_eeprom_lock);
-static struct spi_dev_desc seeprom_dev_desc = {
-        .baud           = 1500000,      /* 1.5Mbps */
-        .tcss           = 1,
-        .tcsh           = 1,
-        .tcsr           = 1,
-        .byteorder      = 1,            /* MSB-First */
-        .polarity       = 0,            /* High-Active */
-        .phase          = 0,            /* Sample-Then-Shift */
-};
-static inline int
-spi_eeprom_io(int chipid,
-              unsigned char **inbufs, unsigned int *incounts,
-              unsigned char **outbufs, unsigned int *outcounts)
-{
-        return txx9_spi_io(chipid, &seeprom_dev_desc,
-                           inbufs, incounts, outbufs, outcounts, 0);
-}
-int spi_eeprom_write_enable(int chipid, int enable)
 {
-        unsigned char inbuf[1];
+        static struct spi_eeprom eeprom = {
-        unsigned char *inbufs[1];
+                .name = "at250x0",
-        unsigned int incounts[2];
+                .byte_len = 128,
-        unsigned long flags;
+                .page_size = AT250X0_PAGE_SIZE,
-        int stat;
+                .flags = EE_ADDR1,
-        inbuf[0] = enable ? ATMEL_WREN : ATMEL_WRDI;
+        };
-        inbufs[0] = inbuf;
+        struct spi_board_info info = {
-        incounts[0] = sizeof(inbuf);
+                .modalias = "at25",
-        incounts[1] = 0;
+                .max_speed_hz = 1500000,        /* 1.5Mbps */
-        spin_lock_irqsave(&spi_eeprom_lock, flags);
+                .bus_num = 0,
-        stat = spi_eeprom_io(chipid, inbufs, incounts, NULL, NULL);
+                .chip_select = chipid,
-        spin_unlock_irqrestore(&spi_eeprom_lock, flags);
+                .platform_data = &eeprom,
-        return stat;
+                /* Mode 0: High-Active, Sample-Then-Shift */
-}
+        };
-static int spi_eeprom_read_status_nolock(int chipid)
+        return spi_register_board_info(&info, 1);
-{
-        unsigned char inbuf[2], outbuf[2];
-        unsigned char *inbufs[1], *outbufs[1];
-        unsigned int incounts[2], outcounts[2];
-        int stat;
-        inbuf[0] = ATMEL_RDSR;
-        inbuf[1] = 0;
-        inbufs[0] = inbuf;
-        incounts[0] = sizeof(inbuf);
-        incounts[1] = 0;
-        outbufs[0] = outbuf;
-        outcounts[0] = sizeof(outbuf);
-        outcounts[1] = 0;
-        stat = spi_eeprom_io(chipid, inbufs, incounts, outbufs, outcounts);
-        if (stat < 0)
-                return stat;
-        return outbuf[1];
 }
-int spi_eeprom_read_status(int chipid)
+/* simple temporary spi driver to provide early access to seeprom. */
-{
-        unsigned long flags;
-        int stat;
-        spin_lock_irqsave(&spi_eeprom_lock, flags);
-        stat = spi_eeprom_read_status_nolock(chipid);
-        spin_unlock_irqrestore(&spi_eeprom_lock, flags);
-        return stat;
-}
-int spi_eeprom_read(int chipid, int address, unsigned char *buf, int len)
+static struct read_param {
-{
+        int chipid;
-        unsigned char inbuf[2];
+        int address;
-        unsigned char *inbufs[2], *outbufs[2];
+        unsigned char *buf;
-        unsigned int incounts[2], outcounts[3];
+        int len;
-        unsigned long flags;
+} *read_param;
-        int stat;
-        inbuf[0] = ATMEL_READ;
-        inbuf[1] = address;
-        inbufs[0] = inbuf;
-        inbufs[1] = NULL;
-        incounts[0] = sizeof(inbuf);
-        incounts[1] = 0;
-        outbufs[0] = NULL;
-        outbufs[1] = buf;
-        outcounts[0] = 2;
-        outcounts[1] = len;
-        outcounts[2] = 0;
-        spin_lock_irqsave(&spi_eeprom_lock, flags);
-        stat = spi_eeprom_io(chipid, inbufs, incounts, outbufs, outcounts);
-        spin_unlock_irqrestore(&spi_eeprom_lock, flags);
-        return stat;
-}
-int spi_eeprom_write(int chipid, int address, unsigned char *buf, int len)
+static int __init early_seeprom_probe(struct spi_device *spi)
 {
-        unsigned char inbuf[2];
+        int stat = 0;
-        unsigned char *inbufs[2];
+        u8 cmd[2];
-        unsigned int incounts[3];
+        int len = read_param->len;
-        unsigned long flags;
+        char *buf = read_param->buf;
-        int i, stat;
+        int address = read_param->address;
-        if (address / 8 != (address + len - 1) / 8)
+        dev_info(&spi->dev, "spiclk %u KHz.\n",
-                return -EINVAL;
+                 (spi->max_speed_hz + 500) / 1000);
-        stat = spi_eeprom_write_enable(chipid, 1);
+        if (read_param->chipid != spi->chip_select)
-        if (stat < 0)
+                return -ENODEV;
-                return stat;
+        while (len > 0) {
-        stat = spi_eeprom_read_status(chipid);
+                /* spi_write_then_read can only work with small chunk */
-        if (stat < 0)
+                int c = len < AT250X0_PAGE_SIZE ? len : AT250X0_PAGE_SIZE;
-                return stat;
+                cmd[0] = 0x03;  /* AT25_READ */
-        if (!(stat & ATMEL_SR_WEN))
+                cmd[1] = address;
-                return -EPERM;
+                stat = spi_write_then_read(spi, cmd, sizeof(cmd), buf, c);
+                buf += c;
-        inbuf[0] = ATMEL_WRITE;
+                len -= c;
-        inbuf[1] = address;
+                address += c;
-        inbufs[0] = inbuf;
-        inbufs[1] = buf;
-        incounts[0] = sizeof(inbuf);
-        incounts[1] = len;
-        incounts[2] = 0;
-        spin_lock_irqsave(&spi_eeprom_lock, flags);
-        stat = spi_eeprom_io(chipid, inbufs, incounts, NULL, NULL);
-        if (stat < 0)
-                goto unlock_return;
-        /* write start.  max 10ms */
-        for (i = 10; i > 0; i--) {
-                int stat = spi_eeprom_read_status_nolock(chipid);
-                if (stat < 0)
-                        goto unlock_return;
-                if (!(stat & ATMEL_SR_BSY))
-                        break;
-                mdelay(1);
        }
-        spin_unlock_irqrestore(&spi_eeprom_lock, flags);
-        if (i == 0)
-                return -EIO;
-        return len;
- unlock_return:
-        spin_unlock_irqrestore(&spi_eeprom_lock, flags);
        return stat;
 }
-#ifdef CONFIG_PROC_FS
+static struct spi_driver early_seeprom_driver __initdata = {
-#define MAX_SIZE        0x80    /* for ATMEL 25010 */
+        .driver = {
-static int spi_eeprom_read_proc(char *page, char **start, off_t off,
+                .name   = "at25",
-                                int count, int *eof, void *data)
+                .owner  = THIS_MODULE,
-{
+        },
-        unsigned int size = MAX_SIZE;
+        .probe  = early_seeprom_probe,
-        if (spi_eeprom_read((int)data, 0, (unsigned char *)page, size) < 0)
+};
-                size = 0;
-        return size;
-}
-static int spi_eeprom_write_proc(struct file *file, const char *buffer,
-                                 unsigned long count, void *data)
-{
-        unsigned int size = MAX_SIZE;
-        int i;
-        if (file->f_pos >= size)
-                return -EIO;
-        if (file->f_pos + count > size)
-                count = size - file->f_pos;
-        for (i = 0; i < count; i += 8) {
-                int len = count - i < 8 ? count - i : 8;
-                if (spi_eeprom_write((int)data, file->f_pos,
-                                     (unsigned char *)buffer, len) < 0) {
-                        count = -EIO;
-                        break;
-                }
-                buffer += len;
-                file->f_pos += len;
-        }
-        return count;
-}
-__init void spi_eeprom_proc_create(struct proc_dir_entry *dir, int chipid)
+int __init spi_eeprom_read(int chipid, int address,
+                           unsigned char *buf, int len)
 {
-        struct proc_dir_entry *entry;
+        int ret;
-        char name[128];
+        struct read_param param = {
-        sprintf(name, "seeprom-%d", chipid);
+                .chipid = chipid,
-        entry = create_proc_entry(name, 0600, dir);
+                .address = address,
-        if (entry) {
+                .buf = buf,
-                entry->read_proc = spi_eeprom_read_proc;
+                .len = len
-                entry->write_proc = spi_eeprom_write_proc;
+        };
-                entry->data = (void *)chipid;
-        }
+        read_param = &param;
+        ret = spi_register_driver(&early_seeprom_driver);
+        if (!ret)
+                spi_unregister_driver(&early_seeprom_driver);
+        return ret;
 }
-#endif /* CONFIG_PROC_FS */
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/spi_txx9.c b/arch/mips/tx4938/toshiba_rbtx4938/spi_txx9.c
deleted file mode 100644
index 08b20cdfd7..0000000000
--- a/arch/mips/tx4938/toshiba_rbtx4938/spi_txx9.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * linux/arch/mips/tx4938/toshiba_rbtx4938/spi_txx9.c
- * Copyright (C) 2000-2001 Toshiba Corporation
- *
- * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the
- * terms of the GNU General Public License version 2. This program is
- * licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
- */
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/spinlock.h>
-#include <linux/wait.h>
-#include <asm/tx4938/spi.h>
-#include <asm/tx4938/tx4938.h>
-static int (*txx9_spi_cs_func)(int chipid, int on);
-static DEFINE_SPINLOCK(txx9_spi_lock);
-extern unsigned int txx9_gbus_clock;
-#define SPI_FIFO_SIZE   4
-void __init txx9_spi_init(unsigned long base, int (*cs_func)(int chipid, int on))
-{
-        txx9_spi_cs_func = cs_func;
-        /* enter config mode */
-        tx4938_spiptr->mcr = TXx9_SPMCR_CONFIG | TXx9_SPMCR_BCLR;
-}
-static DECLARE_WAIT_QUEUE_HEAD(txx9_spi_wait);
-static irqreturn_t txx9_spi_interrupt(int irq, void *dev_id)
-{
-        /* disable rx intr */
-        tx4938_spiptr->cr0 &= ~TXx9_SPCR0_RBSIE;
-        wake_up(&txx9_spi_wait);
-        return IRQ_HANDLED;
-}
-static struct irqaction txx9_spi_action = {
-        .handler        = txx9_spi_interrupt,
-        .name           = "spi",
-};
-void __init txx9_spi_irqinit(int irc_irq)
-{
-        setup_irq(irc_irq, &txx9_spi_action);
-}
-int txx9_spi_io(int chipid, struct spi_dev_desc *desc,
-                unsigned char **inbufs, unsigned int *incounts,
-                unsigned char **outbufs, unsigned int *outcounts,
-                int cansleep)
-{
-        unsigned int incount, outcount;
-        unsigned char *inp, *outp;
-        int ret;
-        unsigned long flags;
-        spin_lock_irqsave(&txx9_spi_lock, flags);
-        if ((tx4938_spiptr->mcr & TXx9_SPMCR_OPMODE) == TXx9_SPMCR_ACTIVE) {
-                spin_unlock_irqrestore(&txx9_spi_lock, flags);
-                return -EBUSY;
-        }
-        /* enter config mode */
-        tx4938_spiptr->mcr = TXx9_SPMCR_CONFIG | TXx9_SPMCR_BCLR;
-        tx4938_spiptr->cr0 =
-                (desc->byteorder ? TXx9_SPCR0_SBOS : 0) |
-                (desc->polarity ? TXx9_SPCR0_SPOL : 0) |
-                (desc->phase ? TXx9_SPCR0_SPHA : 0) |
-                0x08;
-        tx4938_spiptr->cr1 =
-                (((TXX9_IMCLK + desc->baud) / (2 * desc->baud) - 1) << 8) |
-                0x08 /* 8 bit only */;
-        /* enter active mode */
-        tx4938_spiptr->mcr = TXx9_SPMCR_ACTIVE;
-        spin_unlock_irqrestore(&txx9_spi_lock, flags);
-        /* CS ON */
-        if ((ret = txx9_spi_cs_func(chipid, 1)) < 0) {
-                spin_unlock_irqrestore(&txx9_spi_lock, flags);
-                return ret;
-        }
-        udelay(desc->tcss);
-        /* do scatter IO */
-        inp = inbufs ? *inbufs : NULL;
-        outp = outbufs ? *outbufs : NULL;
-        incount = 0;
-        outcount = 0;
-        while (1) {
-                unsigned char data;
-                unsigned int count;
-                int i;
-                if (!incount) {
-                        incount = incounts ? *incounts++ : 0;
-                        inp = (incount && inbufs) ? *inbufs++ : NULL;
-                }
-                if (!outcount) {
-                        outcount = outcounts ? *outcounts++ : 0;
-                        outp = (outcount && outbufs) ? *outbufs++ : NULL;
-                }
-                if (!inp && !outp)
-                        break;
-                count = SPI_FIFO_SIZE;
-                if (incount)
-                        count = min(count, incount);
-                if (outcount)
-                        count = min(count, outcount);
-                /* now tx must be idle... */
-                while (!(tx4938_spiptr->sr & TXx9_SPSR_SIDLE))
-                        ;
-                tx4938_spiptr->cr0 =
-                        (tx4938_spiptr->cr0 & ~TXx9_SPCR0_RXIFL_MASK) |
-                        ((count - 1) << 12);
-                if (cansleep) {
-                        /* enable rx intr */
-                        tx4938_spiptr->cr0 |= TXx9_SPCR0_RBSIE;
-                }
-                /* send */
-                for (i = 0; i < count; i++)
-                        tx4938_spiptr->dr = inp ? *inp++ : 0;
-                /* wait all rx data */
-                if (cansleep) {
-                        wait_event(txx9_spi_wait,
-                                   tx4938_spiptr->sr & TXx9_SPSR_SRRDY);
-                } else {
-                        while (!(tx4938_spiptr->sr & TXx9_SPSR_RBSI))
-                                ;
-                }
-                /* receive */
-                for (i = 0; i < count; i++) {
-                        data = tx4938_spiptr->dr;
-                        if (outp)
-                                *outp++ = data;
-                }
-                if (incount)
-                        incount -= count;
-                if (outcount)
-                        outcount -= count;
-        }
-        /* CS OFF */
-        udelay(desc->tcsh);
-        txx9_spi_cs_func(chipid, 0);
-        udelay(desc->tcsr);
-        spin_lock_irqsave(&txx9_spi_lock, flags);
-        /* enter config mode */
-        tx4938_spiptr->mcr = TXx9_SPMCR_CONFIG | TXx9_SPMCR_BCLR;
-        spin_unlock_irqrestore(&txx9_spi_lock, flags);
-        return 0;
-}
diff --git a/arch/mips/vr41xx/common/Makefile b/arch/mips/vr41xx/common/Makefile
index f842783acd..d0d84ec8d6 100644
--- a/arch/mips/vr41xx/common/Makefile
+++ b/arch/mips/vr41xx/common/Makefile
@@ -2,4 +2,4 @@
 # Makefile for common code of the NEC VR4100 series.
 #
-obj-y   += bcu.o cmu.o icu.o init.o irq.o pmu.o type.o
+obj-y   += bcu.o cmu.o giu.o icu.o init.o irq.o pmu.o rtc.o siu.o type.o
diff --git a/arch/mips/vr41xx/common/giu.c b/arch/mips/vr41xx/common/giu.c
new file mode 100644
index 0000000000..d21f6f2d22
--- /dev/null
+++ b/arch/mips/vr41xx/common/giu.c
@@ -0,0 +1,122 @@
+/*
+ *  NEC VR4100 series GIU platform device.
+ *
+ *  Copyright (C) 2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <asm/cpu.h>
+#include <asm/vr41xx/giu.h>
+#include <asm/vr41xx/irq.h>
+static struct resource giu_50pins_pullupdown_resource[] __initdata = {
+        {
+                .start  = 0x0b000100,
+                .end    = 0x0b00011f,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = 0x0b0002e0,
+                .end    = 0x0b0002e3,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = GIUINT_IRQ,
+                .end    = GIUINT_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static struct resource giu_36pins_resource[] __initdata = {
+        {
+                .start  = 0x0f000140,
+                .end    = 0x0f00015f,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = GIUINT_IRQ,
+                .end    = GIUINT_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static struct resource giu_48pins_resource[] __initdata = {
+        {
+                .start  = 0x0f000140,
+                .end    = 0x0f000167,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = GIUINT_IRQ,
+                .end    = GIUINT_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static int __init vr41xx_giu_add(void)
+{
+        struct platform_device *pdev;
+        struct resource *res;
+        unsigned int num;
+        int retval;
+        pdev = platform_device_alloc("GIU", -1);
+        if (!pdev)
+                return -ENOMEM;
+        switch (current_cpu_data.cputype) {
+        case CPU_VR4111:
+        case CPU_VR4121:
+                pdev->id = GPIO_50PINS_PULLUPDOWN;
+                res = giu_50pins_pullupdown_resource;
+                num = ARRAY_SIZE(giu_50pins_pullupdown_resource);
+                break;
+        case CPU_VR4122:
+        case CPU_VR4131:
+                pdev->id = GPIO_36PINS;
+                res = giu_36pins_resource;
+                num = ARRAY_SIZE(giu_36pins_resource);
+                break;
+        case CPU_VR4133:
+                pdev->id = GPIO_48PINS_EDGE_SELECT;
+                res = giu_48pins_resource;
+                num = ARRAY_SIZE(giu_48pins_resource);
+                break;
+        default:
+                retval = -ENODEV;
+                goto err_free_device;
+        }
+        retval = platform_device_add_resources(pdev, res, num);
+        if (retval)
+                goto err_free_device;
+        retval = platform_device_add(pdev);
+        if (retval)
+                goto err_free_device;
+        return 0;
+err_free_device:
+        platform_device_put(pdev);
+        return retval;
+}
+device_initcall(vr41xx_giu_add);
diff --git a/arch/mips/vr41xx/common/rtc.c b/arch/mips/vr41xx/common/rtc.c
new file mode 100644
index 0000000000..cce605b3d6
--- /dev/null
+++ b/arch/mips/vr41xx/common/rtc.c
@@ -0,0 +1,117 @@
+/*
+ *  NEC VR4100 series RTC platform device.
+ *
+ *  Copyright (C) 2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <asm/cpu.h>
+#include <asm/vr41xx/irq.h>
+static struct resource rtc_type1_resource[] __initdata = {
+        {
+                .start  = 0x0b0000c0,
+                .end    = 0x0b0000df,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = 0x0b0001c0,
+                .end    = 0x0b0001df,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = ELAPSEDTIME_IRQ,
+                .end    = ELAPSEDTIME_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = RTCLONG1_IRQ,
+                .end    = RTCLONG1_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static struct resource rtc_type2_resource[] __initdata = {
+        {
+                .start  = 0x0f000100,
+                .end    = 0x0f00011f,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = 0x0f000120,
+                .end    = 0x0f00013f,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = ELAPSEDTIME_IRQ,
+                .end    = ELAPSEDTIME_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = RTCLONG1_IRQ,
+                .end    = RTCLONG1_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static int __init vr41xx_rtc_add(void)
+{
+        struct platform_device *pdev;
+        struct resource *res;
+        unsigned int num;
+        int retval;
+        pdev = platform_device_alloc("RTC", -1);
+        if (!pdev)
+                return -ENOMEM;
+        switch (current_cpu_data.cputype) {
+        case CPU_VR4111:
+        case CPU_VR4121:
+                res = rtc_type1_resource;
+                num = ARRAY_SIZE(rtc_type1_resource);
+                break;
+        case CPU_VR4122:
+        case CPU_VR4131:
+        case CPU_VR4133:
+                res = rtc_type2_resource;
+                num = ARRAY_SIZE(rtc_type2_resource);
+                break;
+        default:
+                retval = -ENODEV;
+                goto err_free_device;
+        }
+        retval = platform_device_add_resources(pdev, res, num);
+        if (retval)
+                goto err_free_device;
+        retval = platform_device_add(pdev);
+        if (retval)
+                goto err_free_device;
+        return 0;
+err_free_device:
+        platform_device_put(pdev);
+        return retval;
+}
+device_initcall(vr41xx_rtc_add);
diff --git a/arch/mips/vr41xx/common/siu.c b/arch/mips/vr41xx/common/siu.c
new file mode 100644
index 0000000000..a1e7741421
--- /dev/null
+++ b/arch/mips/vr41xx/common/siu.c
@@ -0,0 +1,120 @@
+/*
+ *  NEC VR4100 series SIU platform device.
+ *
+ *  Copyright (C) 2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <linux/serial_core.h>
+#include <asm/cpu.h>
+#include <asm/vr41xx/siu.h>
+static unsigned int siu_type1_ports[SIU_PORTS_MAX] __initdata = {
+        PORT_VR41XX_SIU,
+        PORT_UNKNOWN,
+};
+static struct resource siu_type1_resource[] __initdata = {
+        {
+                .start  = 0x0c000000,
+                .end    = 0x0c00000a,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = SIU_IRQ,
+                .end    = SIU_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static unsigned int siu_type2_ports[SIU_PORTS_MAX] __initdata = {
+        PORT_VR41XX_SIU,
+        PORT_VR41XX_DSIU,
+};
+static struct resource siu_type2_resource[] __initdata = {
+        {
+                .start  = 0x0f000800,
+                .end    = 0x0f00080a,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = 0x0f000820,
+                .end    = 0x0f000829,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = SIU_IRQ,
+                .end    = SIU_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = DSIU_IRQ,
+                .end    = DSIU_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static int __init vr41xx_siu_add(void)
+{
+        struct platform_device *pdev;
+        struct resource *res;
+        unsigned int num;
+        int retval;
+        pdev = platform_device_alloc("SIU", -1);
+        if (!pdev)
+                return -ENOMEM;
+        switch (current_cpu_data.cputype) {
+        case CPU_VR4111:
+        case CPU_VR4121:
+                pdev->dev.platform_data = siu_type1_ports;
+                res = siu_type1_resource;
+                num = ARRAY_SIZE(siu_type1_resource);
+                break;
+        case CPU_VR4122:
+        case CPU_VR4131:
+        case CPU_VR4133:
+                pdev->dev.platform_data = siu_type2_ports;
+                res = siu_type2_resource;
+                num = ARRAY_SIZE(siu_type2_resource);
+                break;
+        default:
+                retval = -ENODEV;
+                goto err_free_device;
+        }
+        retval = platform_device_add_resources(pdev, res, num);
+        if (retval)
+                goto err_free_device;
+        retval = platform_device_add(pdev);
+        if (retval)
+                goto err_free_device;
+        return 0;
+err_free_device:
+        platform_device_put(pdev);
+        return retval;
+}
+device_initcall(vr41xx_siu_add);
diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c
index 8a0db376e9..26ec774c50 100644
--- a/arch/parisc/kernel/ptrace.c
+++ b/arch/parisc/kernel/ptrace.c
@@ -87,10 +87,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        switch (request) {
        case PTRACE_PEEKTEXT: /* read word at location addr. */ 
        case PTRACE_PEEKDATA: {
-                int copied;
 #ifdef CONFIG_64BIT
                if (__is_compat_task(child)) {
+                        int copied;
                        unsigned int tmp;
                        addr &= 0xffffffffL;
@@ -105,15 +104,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                }
                else
 #endif
-                {
+                        ret = generic_ptrace_peekdata(child, addr, data);
-                        unsigned long tmp;
-                        copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
-                        ret = -EIO;
-                        if (copied != sizeof(tmp))
-                                goto out_tsk;
-                        ret = put_user(tmp,(unsigned long *) data);
-                }
                goto out_tsk;
        }
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index c3ec9f1ec0..bbf029a184 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -264,6 +264,7 @@ KERN_CRIT "                     ||     ||\n");
        show_regs(regs);
        dump_stack();
+        add_taint(TAINT_DIE);
        if (in_interrupt())
                panic("Fatal exception in interrupt");
@@ -302,7 +303,7 @@ static void handle_break(struct pt_regs *regs)
        if (unlikely(iir == PARISC_BUG_BREAK_INSN && !user_mode(regs))) {
                /* check if a BUG() or WARN() trapped here.  */
                enum bug_trap_type tt;
-                tt = report_bug(regs->iaoq[0] & ~3);
+                tt = report_bug(regs->iaoq[0] & ~3, regs);
                if (tt == BUG_TRAP_TYPE_WARN) {
                        regs->iaoq[0] += 4;
                        regs->iaoq[1] += 4;
diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c
index 322167737d..cf780cb3b9 100644
--- a/arch/parisc/kernel/unwind.c
+++ b/arch/parisc/kernel/unwind.c
@@ -242,7 +242,7 @@ static void unwind_frame_regs(struct unwind_frame_info *info)
 #ifdef CONFIG_KALLSYMS
                /* Handle some frequent special cases.... */
                {
-                        char symname[KSYM_NAME_LEN+1];
+                        char symname[KSYM_NAME_LEN];
                        char *modname;
                        kallsyms_lookup(info->ip, NULL, NULL, &modname,
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 5eaeafd30b..d860b640a1 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -4,17 +4,7 @@
 mainmenu "Linux/PowerPC Kernel Configuration"
-config PPC64
+source "arch/powerpc/platforms/Kconfig.cputype"
-        bool "64-bit kernel"
-        default n
-        help
-          This option selects whether a 32-bit or a 64-bit kernel
-          will be built.
-config PPC_PM_NEEDS_RTC_LIB
-        bool
-        select RTC_LIB
-        default y if PM
 config PPC32
        bool
@@ -66,6 +56,9 @@ config GENERIC_FIND_NEXT_BIT
        bool
        default y
+config ARCH_NO_VIRT_TO_BUS
+        def_bool PPC64
 config PPC
        bool
        default y
@@ -132,123 +125,6 @@ config PPC64_SWSUSP
        depends on PPC64 && (BROKEN || (PPC_PMAC64 && EXPERIMENTAL))
        default y
-menu "Processor support"
-choice
-        prompt "Processor Type"
-        depends on PPC32
-        default 6xx
-config CLASSIC32
-        bool "52xx/6xx/7xx/74xx"
-        select PPC_FPU
-        select 6xx
-        help
-          There are four families of PowerPC chips supported.  The more common
-          types (601, 603, 604, 740, 750, 7400), the Motorola embedded
-          versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the AMCC
-          embedded versions (403 and 405) and the high end 64 bit Power
-          processors (POWER 3, POWER4, and IBM PPC970 also known as G5).
-          This option is the catch-all for 6xx types, including some of the
-          embedded versions.  Unless there is see an option for the specific
-          chip family you are using, you want this option.
-          
-          You do not want this if you are building a kernel for a 64 bit
-          IBM RS/6000 or an Apple G5, choose 6xx.
-          
-          If unsure, select this option
-          
-          Note that the kernel runs in 32-bit mode even on 64-bit chips.
-config PPC_82xx
-        bool "Freescale 82xx"
-        select 6xx
-        select PPC_FPU
-config PPC_83xx
-        bool "Freescale 83xx"
-        select 6xx
-        select FSL_SOC
-        select 83xx
-        select PPC_FPU
-        select WANT_DEVICE_TREE
-config PPC_85xx
-        bool "Freescale 85xx"
-        select E500
-        select FSL_SOC
-        select 85xx
-        select WANT_DEVICE_TREE
-config PPC_86xx
-        bool "Freescale 86xx"
-        select 6xx
-        select FSL_SOC
-        select FSL_PCIE
-        select PPC_FPU
-        select ALTIVEC
-        help
-          The Freescale E600 SoCs have 74xx cores.
-config PPC_8xx
-        bool "Freescale 8xx"
-        select FSL_SOC
-        select 8xx
-config 40x
-        bool "AMCC 40x"
-        select PPC_DCR_NATIVE
-config 44x
-        bool "AMCC 44x"
-        select PPC_DCR_NATIVE
-        select WANT_DEVICE_TREE
-config E200
-        bool "Freescale e200"
-endchoice
-config POWER4_ONLY
-        bool "Optimize for POWER4"
-        depends on PPC64
-        default n
-        ---help---
-          Cause the compiler to optimize for POWER4/POWER5/PPC970 processors.
-          The resulting binary will not work on POWER3 or RS64 processors
-          when compiled with binutils 2.15 or later.
-config POWER3
-        bool
-        depends on PPC64
-        default y if !POWER4_ONLY
-config POWER4
-        depends on PPC64
-        def_bool y
-config 6xx
-        bool
-# this is temp to handle compat with arch=ppc
-config 8xx
-        bool
-# this is temp to handle compat with arch=ppc
-config 83xx
-        bool
-# this is temp to handle compat with arch=ppc
-config 85xx
-        bool
-config E500
-        bool
-config PPC_FPU
-        bool
-        default y if PPC64
 config PPC_DCR_NATIVE
        bool
        default n
@@ -267,134 +143,6 @@ config PPC_OF_PLATFORM_PCI
        depends on PPC64 # not supported on 32 bits yet
        default n
-config 4xx
-        bool
-        depends on 40x || 44x
-        default y
-config BOOKE
-        bool
-        depends on E200 || E500 || 44x
-        default y
-config FSL_BOOKE
-        bool
-        depends on E200 || E500
-        default y
-config PTE_64BIT
-        bool
-        depends on 44x || E500
-        default y if 44x
-        default y if E500 && PHYS_64BIT
-config PHYS_64BIT
-        bool 'Large physical address support' if E500
-        depends on 44x || E500
-        select RESOURCES_64BIT
-        default y if 44x
-        ---help---
-          This option enables kernel support for larger than 32-bit physical
-          addresses.  This features is not be available on all e500 cores.
-          If in doubt, say N here.
-config ALTIVEC
-        bool "AltiVec Support"
-        depends on CLASSIC32 || POWER4
-        ---help---
-          This option enables kernel support for the Altivec extensions to the
-          PowerPC processor. The kernel currently supports saving and restoring
-          altivec registers, and turning on the 'altivec enable' bit so user
-          processes can execute altivec instructions.
-          This option is only usefully if you have a processor that supports
-          altivec (G4, otherwise known as 74xx series), but does not have
-          any affect on a non-altivec cpu (it does, however add code to the
-          kernel).
-          If in doubt, say Y here.
-config SPE
-        bool "SPE Support"
-        depends on E200 || E500
-        default y
-        ---help---
-          This option enables kernel support for the Signal Processing
-          Extensions (SPE) to the PowerPC processor. The kernel currently
-          supports saving and restoring SPE registers, and turning on the
-          'spe enable' bit so user processes can execute SPE instructions.
-          This option is only useful if you have a processor that supports
-          SPE (e500, otherwise known as 85xx series), but does not have any
-          effect on a non-spe cpu (it does, however add code to the kernel).
-          If in doubt, say Y here.
-config PPC_STD_MMU
-        bool
-        depends on 6xx || POWER3 || POWER4 || PPC64
-        default y
-config PPC_STD_MMU_32
-        def_bool y
-        depends on PPC_STD_MMU && PPC32
-config PPC_MM_SLICES
-        bool
-        default y if HUGETLB_PAGE
-        default n
-config VIRT_CPU_ACCOUNTING
-        bool "Deterministic task and CPU time accounting"
-        depends on PPC64
-        default y
-        help
-          Select this option to enable more accurate task and CPU time
-          accounting.  This is done by reading a CPU counter on each
-          kernel entry and exit and on transitions within the kernel
-          between system, softirq and hardirq state, so there is a
-          small performance impact.  This also enables accounting of
-          stolen time on logically-partitioned systems running on
-          IBM POWER5-based machines.
-          If in doubt, say Y here.
-config SMP
-        depends on PPC_STD_MMU
-        bool "Symmetric multi-processing support"
-        ---help---
-          This enables support for systems with more than one CPU. If you have
-          a system with only one CPU, say N. If you have a system with more
-          than one CPU, say Y.  Note that the kernel does not currently
-          support SMP machines with 603/603e/603ev or PPC750 ("G3") processors
-          since they have inadequate hardware support for multiprocessor
-          operation.
-          If you say N here, the kernel will run on single and multiprocessor
-          machines, but will use only one CPU of a multiprocessor machine. If
-          you say Y here, the kernel will run on single-processor machines.
-          On a single-processor machine, the kernel will run faster if you say
-          N here.
-          If you don't know what to do here, say N.
-config NR_CPUS
-        int "Maximum number of CPUs (2-128)"
-        range 2 128
-        depends on SMP
-        default "32" if PPC64
-        default "4"
-config NOT_COHERENT_CACHE
-        bool
-        depends on 4xx || 8xx || E200
-        default y
-config CONFIG_CHECK_CACHE_COHERENCY
-        bool
-endmenu
 source "init/Kconfig"
 source "arch/powerpc/platforms/Kconfig"
@@ -674,10 +422,6 @@ config SBUS
 config FSL_SOC
        bool
-config FSL_PCIE
-        bool
-        depends on PPC_86xx
 # Yes MCA RS/6000s exist but Linux-PPC does not currently support any
 config MCA
        bool
@@ -685,10 +429,10 @@ config MCA
 config PCI
        bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
                || PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \
-                || MPC7448HPC2 || PPC_PS3 || PPC_HOLLY
+                || PPC_PS3
-        default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx \
+        default y if !40x && !CPM2 && !8xx && !PPC_83xx \
                && !PPC_85xx && !PPC_86xx
-        default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS
+        default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
        default PCI_QSPAN if !4xx && !CPM2 && 8xx
        select ARCH_SUPPORTS_MSI
        help
@@ -698,8 +442,10 @@ config PCI
          infrastructure code to support PCI bus devices.
 config PCI_DOMAINS
-        bool
+        def_bool PCI
-        default PCI
+config PCI_SYSCALL
+        def_bool PCI
 config PCI_QSPAN
        bool "QSpan PCI"
@@ -894,8 +640,8 @@ menu "Instrumentation Support"
 source "arch/powerpc/oprofile/Kconfig"
 config KPROBES
-        bool "Kprobes (EXPERIMENTAL)"
+        bool "Kprobes"
-        depends on !BOOKE && !4xx && KALLSYMS && EXPERIMENTAL && MODULES
+        depends on !BOOKE && !4xx && KALLSYMS && MODULES
        help
          Kprobes allows you to trap at almost any kernel address and
          execute a callback function.  register_kprobe() establishes
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index fbafd965dc..187a39af3e 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -148,7 +148,7 @@ all: $(KBUILD_IMAGE)
 CPPFLAGS_vmlinux.lds    := -Upowerpc
-BOOT_TARGETS = zImage zImage.initrd zImage.dts zImage.dts_initrd uImage
+BOOT_TARGETS = zImage zImage.initrd uImage
 PHONY += $(BOOT_TARGETS)
diff --git a/arch/powerpc/boot/44x.c b/arch/powerpc/boot/44x.c
index d51377d902..9f64e840be 100644
--- a/arch/powerpc/boot/44x.c
+++ b/arch/powerpc/boot/44x.c
@@ -38,3 +38,48 @@ void ibm44x_fixup_memsize(void)
        dt_fixup_memory(0, memsize);
 }
+#define SPRN_DBCR0              0x134
+#define   DBCR0_RST_SYSTEM      0x30000000
+void ibm44x_dbcr_reset(void)
+{
+        unsigned long tmp;
+        asm volatile (
+                "mfspr  %0,%1\n"
+                "oris   %0,%0,%2@h\n"
+                "mtspr  %1,%0"
+                : "=&r"(tmp) : "i"(SPRN_DBCR0), "i"(DBCR0_RST_SYSTEM)
+                );
+}
+/* Read 4xx EBC bus bridge registers to get mappings of the peripheral
+ * banks into the OPB address space */
+void ibm4xx_fixup_ebc_ranges(const char *ebc)
+{
+        void *devp;
+        u32 bxcr;
+        u32 ranges[EBC_NUM_BANKS*4];
+        u32 *p = ranges;
+        int i;
+        for (i = 0; i < EBC_NUM_BANKS; i++) {
+                mtdcr(DCRN_EBC0_CFGADDR, EBC_BXCR(i));
+                bxcr = mfdcr(DCRN_EBC0_CFGDATA);
+                if ((bxcr & EBC_BXCR_BU) != EBC_BXCR_BU_OFF) {
+                        *p++ = i;
+                        *p++ = 0;
+                        *p++ = bxcr & EBC_BXCR_BAS;
+                        *p++ = EBC_BXCR_BANK_SIZE(bxcr);
+                }
+        }
+        devp = finddevice(ebc);
+        if (! devp)
+                fatal("Couldn't locate EBC node %s\n\r", ebc);
+        setprop(devp, "ranges", ranges, (p - ranges) * sizeof(u32));
+}
diff --git a/arch/powerpc/boot/44x.h b/arch/powerpc/boot/44x.h
index 7b129ad043..577982c9a3 100644
--- a/arch/powerpc/boot/44x.h
+++ b/arch/powerpc/boot/44x.h
@@ -11,6 +11,9 @@
 #define _PPC_BOOT_44X_H_
 void ibm44x_fixup_memsize(void);
+void ibm4xx_fixup_ebc_ranges(const char *ebc);
+void ibm44x_dbcr_reset(void);
 void ebony_init(void *mac0, void *mac1);
 #endif /* _PPC_BOOT_44X_H_ */
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index ff2701949e..61a6f34ca5 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -43,10 +43,11 @@ $(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \
 src-wlib := string.S crt0.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \
                ns16550.c serial.c simple_alloc.c div64.S util.S \
-                gunzip_util.c elf_util.c $(zlib) devtree.c \
+                gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
-                44x.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c
+                44x.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c
 src-plat := of.c cuboot-83xx.c cuboot-85xx.c holly.c \
-                cuboot-ebony.c treeboot-ebony.c prpmc2800.c
+                cuboot-ebony.c treeboot-ebony.c prpmc2800.c \
+                ps3-head.S ps3-hvcall.S ps3.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -75,11 +76,11 @@ $(addprefix $(obj)/,$(zliblinuxheader)): $(obj)/%: $(srctree)/include/linux/%
 $(obj)/empty.c:
        @touch $@
-$(obj)/zImage.lds $(obj)/zImage.coff.lds: $(obj)/%: $(srctree)/$(src)/%.S
+$(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds: $(obj)/%: $(srctree)/$(src)/%.S
        @cp $< $@
 clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \
-                empty.c zImage.coff.lds zImage.lds
+                empty.c zImage zImage.coff.lds zImage.ps3.lds zImage.lds
 quiet_cmd_bootcc = BOOTCC  $@
      cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<
@@ -102,7 +103,7 @@ hostprogs-y	:= addnote addRamDisk hack-coff mktree
 targets         += $(patsubst $(obj)/%,%,$(obj-boot) wrapper.a)
 extra-y         := $(obj)/wrapper.a $(obj-plat) $(obj)/empty.o \
-                   $(obj)/zImage.lds $(obj)/zImage.coff.lds
+                   $(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds
 wrapper         :=$(srctree)/$(src)/wrapper
 wrapperbits     := $(extra-y) $(addprefix $(obj)/,addnote hack-coff mktree) \
@@ -132,7 +133,7 @@ image-$(CONFIG_PPC_CELLEB)		+= zImage.pseries
 image-$(CONFIG_PPC_CHRP)                += zImage.chrp
 image-$(CONFIG_PPC_EFIKA)               += zImage.chrp
 image-$(CONFIG_PPC_PMAC)                += zImage.pmac
-image-$(CONFIG_PPC_HOLLY)               += zImage.holly-elf
+image-$(CONFIG_PPC_HOLLY)               += zImage.holly
 image-$(CONFIG_PPC_PRPMC2800)           += zImage.prpmc2800
 image-$(CONFIG_PPC_ISERIES)             += zImage.iseries
 image-$(CONFIG_DEFAULT_UIMAGE)          += uImage
@@ -157,55 +158,43 @@ targets	+= $(image-y) $(initrd-y)
 $(addprefix $(obj)/, $(initrd-y)): $(obj)/ramdisk.image.gz
-dts-  := $(patsubst zImage%, zImage.dts%, $(image-n) $(image-))
+# If CONFIG_WANT_DEVICE_TREE is set and CONFIG_DEVICE_TREE isn't an
-dts-y := $(patsubst zImage%, zImage.dts%, $(image-y))
+# empty string, define 'dts' to be path to the dts
-dts-y := $(filter-out $(image-y), $(dts-y))
+# CONFIG_DEVICE_TREE will have "" around it, make sure to strip them
-targets += $(image-y) $(dts-y)
+ifeq ($(CONFIG_WANT_DEVICE_TREE),y)
+ifneq ($(CONFIG_DEVICE_TREE),"")
-dts_initrd-  := $(patsubst zImage%, zImage.dts_initrd%, $(image-n) $(image-))
+dts = $(if $(shell echo $(CONFIG_DEVICE_TREE) | grep '^/'),\
-dts_initrd-y := $(patsubst zImage%, zImage.dts_initrd%, $(image-y))
+        ,$(srctree)/$(src)/dts/)$(CONFIG_DEVICE_TREE:"%"=%)
-dts_initrd-y := $(filter-out $(image-y), $(dts_initrd-y))
+endif
-targets += $(image-y) $(dts_initrd-y)
+endif
-$(addprefix $(obj)/, $(dts_initrd-y)): $(obj)/ramdisk.image.gz
 # Don't put the ramdisk on the pattern rule; when its missing make will try
 # the pattern rule with less dependencies that also matches (even with the
 # hard dependency listed).
-$(obj)/zImage.dts_initrd.%: vmlinux $(wrapperbits) $(dts) $(obj)/ramdisk.image.gz
+$(obj)/zImage.initrd.%: vmlinux $(wrapperbits) $(dts)
        $(call if_changed,wrap,$*,$(dts),,$(obj)/ramdisk.image.gz)
-$(obj)/zImage.dts.%: vmlinux $(wrapperbits) $(dts)
+$(obj)/zImage.%: vmlinux $(wrapperbits) $(dts)
        $(call if_changed,wrap,$*,$(dts))
-$(obj)/zImage.initrd.%: vmlinux $(wrapperbits)
+# This cannot be in the root of $(src) as the zImage rule always adds a $(obj)
-        $(call if_changed,wrap,$*,,,$(obj)/ramdisk.image.gz)
+# prefix
+$(obj)/vmlinux.strip: vmlinux
-$(obj)/zImage.%: vmlinux $(wrapperbits)
-        $(call if_changed,wrap,$*)
-$(obj)/zImage.iseries: vmlinux
        $(STRIP) -s -R .comment $< -o $@
-$(obj)/zImage.ps3: vmlinux
+$(obj)/zImage.iseries: vmlinux
        $(STRIP) -s -R .comment $< -o $@
-$(obj)/zImage.initrd.ps3: vmlinux
+$(obj)/zImage.ps3: vmlinux  $(wrapper) $(wrapperbits) $(srctree)/$(src)/dts/ps3.dts
-        @echo "  WARNING zImage.initrd.ps3 not supported (yet)"
+        $(STRIP) -s -R .comment $< -o vmlinux.strip
+        $(call cmd,wrap,ps3,$(srctree)/$(src)/dts/ps3.dts,,)
-$(obj)/zImage.holly-elf: vmlinux $(wrapperbits)
-        $(call if_changed,wrap,holly,$(obj)/dts/holly.dts,,)
-$(obj)/zImage.initrd.holly-elf: vmlinux $(wrapperbits) $(obj)/ramdisk.image.gz
+$(obj)/zImage.initrd.ps3: vmlinux  $(wrapper) $(wrapperbits) $(srctree)/$(src)/dts/ps3.dts $(obj)/ramdisk.image.gz
-        $(call if_changed,wrap,holly,$(obj)/dts/holly.dts,,$(obj)/ramdisk.image.gz)
+        $(call cmd,wrap,ps3,$(srctree)/$(src)/dts/ps3.dts,,$(obj)/ramdisk.image.gz)
 $(obj)/uImage: vmlinux $(wrapperbits)
        $(call if_changed,wrap,uboot)
-# CONFIG_DEVICE_TREE will have "" around it, make sure to strip them
-dts = $(if $(shell echo $(CONFIG_DEVICE_TREE) | grep '^/'),\
-        ,$(srctree)/$(src)/dts/)$(CONFIG_DEVICE_TREE:"%"=%)
 $(obj)/cuImage.%: vmlinux $(dts) $(wrapperbits)
        $(call if_changed,wrap,cuboot-$*,$(dts))
@@ -215,22 +204,22 @@ $(obj)/treeImage.initrd.%: vmlinux $(dts) $(wrapperbits)
 $(obj)/treeImage.%: vmlinux $(dts) $(wrapperbits)
        $(call if_changed,wrap,treeboot-$*,$(dts))
+# If there isn't a platform selected then just strip the vmlinux.
+ifeq (,$(image-y))
+image-y := vmlinux.strip
+endif
 $(obj)/zImage:          $(addprefix $(obj)/, $(image-y))
        @rm -f $@; ln $< $@
 $(obj)/zImage.initrd:   $(addprefix $(obj)/, $(initrd-y))
        @rm -f $@; ln $< $@
-$(obj)/zImage.dts:      $(addprefix $(obj)/, $(dts-y))
-        @rm -f $@; ln $< $@
-$(obj)/zImage.dts_initrd:       $(addprefix $(obj)/, $(dts_initrd-y))
-        @rm -f $@; ln $< $@
 install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
        sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $<
 # anything not in $(targets)
-clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* \
+clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.* \
-        treeImage.* zImage.dts zImage.dts_initrd
+        otheros.bld
 # clean up files cached by wrapper
 clean-kernel := vmlinux.strip vmlinux.bin
diff --git a/arch/powerpc/boot/cuboot-83xx.c b/arch/powerpc/boot/cuboot-83xx.c
index 9af554eea5..296025d8b2 100644
--- a/arch/powerpc/boot/cuboot-83xx.c
+++ b/arch/powerpc/boot/cuboot-83xx.c
@@ -12,12 +12,12 @@
 #include "ops.h"
 #include "stdio.h"
+#include "cuboot.h"
 #define TARGET_83xx
 #include "ppcboot.h"
 static bd_t bd;
-extern char _end[];
 extern char _dtb_start[], _dtb_end[];
 static void platform_fixups(void)
@@ -52,16 +52,7 @@ static void platform_fixups(void)
 void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                   unsigned long r6, unsigned long r7)
 {
-        unsigned long end_of_ram = bd.bi_memstart + bd.bi_memsize;
+        CUBOOT_INIT();
-        unsigned long avail_ram = end_of_ram - (unsigned long)_end;
-        memcpy(&bd, (bd_t *)r3, sizeof(bd));
-        loader_info.initrd_addr = r4;
-        loader_info.initrd_size = r4 ? r5 - r4 : 0;
-        loader_info.cmdline = (char *)r6;
-        loader_info.cmdline_len = r7 - r6;
-        simple_alloc_init(_end, avail_ram - 1024*1024, 32, 64);
        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
        serial_console_init();
        platform_ops.fixups = platform_fixups;
diff --git a/arch/powerpc/boot/cuboot-85xx.c b/arch/powerpc/boot/cuboot-85xx.c
index e2560317f2..10f0f697c9 100644
--- a/arch/powerpc/boot/cuboot-85xx.c
+++ b/arch/powerpc/boot/cuboot-85xx.c
@@ -12,12 +12,12 @@
 #include "ops.h"
 #include "stdio.h"
+#include "cuboot.h"
 #define TARGET_85xx
 #include "ppcboot.h"
 static bd_t bd;
-extern char _end[];
 extern char _dtb_start[], _dtb_end[];
 static void platform_fixups(void)
@@ -53,16 +53,7 @@ static void platform_fixups(void)
 void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                   unsigned long r6, unsigned long r7)
 {
-        unsigned long end_of_ram = bd.bi_memstart + bd.bi_memsize;
+        CUBOOT_INIT();
-        unsigned long avail_ram = end_of_ram - (unsigned long)_end;
-        memcpy(&bd, (bd_t *)r3, sizeof(bd));
-        loader_info.initrd_addr = r4;
-        loader_info.initrd_size = r4 ? r5 - r4 : 0;
-        loader_info.cmdline = (char *)r6;
-        loader_info.cmdline_len = r7 - r6;
-        simple_alloc_init(_end, avail_ram - 1024*1024, 32, 64);
        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
        serial_console_init();
        platform_ops.fixups = platform_fixups;
diff --git a/arch/powerpc/boot/cuboot-ebony.c b/arch/powerpc/boot/cuboot-ebony.c
index 4464c5f67a..c5f37ce172 100644
--- a/arch/powerpc/boot/cuboot-ebony.c
+++ b/arch/powerpc/boot/cuboot-ebony.c
@@ -15,28 +15,16 @@
 #include "ops.h"
 #include "stdio.h"
 #include "44x.h"
+#include "cuboot.h"
 #define TARGET_44x
 #include "ppcboot.h"
 static bd_t bd;
-extern char _end[];
-BSS_STACK(4096);
 void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                   unsigned long r6, unsigned long r7)
 {
-        unsigned long end_of_ram = bd.bi_memstart + bd.bi_memsize;
+        CUBOOT_INIT();
-        unsigned long avail_ram = end_of_ram - (unsigned long)_end;
-        memcpy(&bd, (bd_t *)r3, sizeof(bd));
-        loader_info.initrd_addr = r4;
-        loader_info.initrd_size = r4 ? r5 : 0;
-        loader_info.cmdline = (char *)r6;
-        loader_info.cmdline_len = r7 - r6;
-        simple_alloc_init(_end, avail_ram, 32, 64);
        ebony_init(&bd.bi_enetaddr, &bd.bi_enet1addr);
 }
diff --git a/arch/powerpc/boot/cuboot.c b/arch/powerpc/boot/cuboot.c
new file mode 100644
index 0000000000..65795468ad
--- /dev/null
+++ b/arch/powerpc/boot/cuboot.c
@@ -0,0 +1,35 @@
+/*
+ * Compatibility for old (not device tree aware) U-Boot versions
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ * Consolidated using macros by David Gibson <david@gibson.dropbear.id.au>
+ *
+ * Copyright 2007 David Gibson, IBM Corporation.
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+#include "ops.h"
+#include "stdio.h"
+#include "ppcboot.h"
+extern char _end[];
+extern char _dtb_start[], _dtb_end[];
+void cuboot_init(unsigned long r4, unsigned long r5,
+                 unsigned long r6, unsigned long r7,
+                 unsigned long end_of_ram)
+{
+        unsigned long avail_ram = end_of_ram - (unsigned long)_end;
+        loader_info.initrd_addr = r4;
+        loader_info.initrd_size = r4 ? r5 - r4 : 0;
+        loader_info.cmdline = (char *)r6;
+        loader_info.cmdline_len = r7 - r6;
+        simple_alloc_init(_end, avail_ram - 1024*1024, 32, 64);
+}
diff --git a/arch/powerpc/boot/cuboot.h b/arch/powerpc/boot/cuboot.h
new file mode 100644
index 0000000000..cd2aa7f348
--- /dev/null
+++ b/arch/powerpc/boot/cuboot.h
@@ -0,0 +1,14 @@
+#ifndef _PPC_BOOT_CUBOOT_H_
+#define _PPC_BOOT_CUBOOT_H_
+void cuboot_init(unsigned long r4, unsigned long r5,
+                 unsigned long r6, unsigned long r7,
+                 unsigned long end_of_ram);
+#define CUBOOT_INIT() \
+        do { \
+                memcpy(&bd, (bd_t *)r3, sizeof(bd)); \
+                cuboot_init(r4, r5, r6, r7, bd.bi_memstart + bd.bi_memsize); \
+        } while (0)
+#endif /* _PPC_BOOT_CUBOOT_H_ */
diff --git a/arch/powerpc/boot/dcr.h b/arch/powerpc/boot/dcr.h
index 877bc97b1e..14b44aa96f 100644
--- a/arch/powerpc/boot/dcr.h
+++ b/arch/powerpc/boot/dcr.h
@@ -26,6 +26,43 @@ static const unsigned long sdram_bxcr[] = { SDRAM0_B0CR, SDRAM0_B1CR, SDRAM0_B2C
 #define                 SDRAM_CONFIG_BANK_SIZE(reg)     \
        (0x00400000 << ((reg & SDRAM_CONFIG_SIZE_MASK) >> 17))
+/* 440GP External Bus Controller (EBC) */
+#define DCRN_EBC0_CFGADDR                               0x012
+#define DCRN_EBC0_CFGDATA                               0x013
+#define   EBC_NUM_BANKS                                   8
+#define   EBC_B0CR                                        0x00
+#define   EBC_B1CR                                        0x01
+#define   EBC_B2CR                                        0x02
+#define   EBC_B3CR                                        0x03
+#define   EBC_B4CR                                        0x04
+#define   EBC_B5CR                                        0x05
+#define   EBC_B6CR                                        0x06
+#define   EBC_B7CR                                        0x07
+#define   EBC_BXCR(n)                                     (n)
+#define     EBC_BXCR_BAS                                    0xfff00000
+#define     EBC_BXCR_BS                                     0x000e0000
+#define     EBC_BXCR_BANK_SIZE(reg) \
+        (0x100000 << (((reg) & EBC_BXCR_BS) >> 17))
+#define     EBC_BXCR_BU                                     0x00018000
+#define       EBC_BXCR_BU_OFF                                 0x00000000
+#define       EBC_BXCR_BU_RO                                  0x00008000
+#define       EBC_BXCR_BU_WO                                  0x00010000
+#define       EBC_BXCR_BU_RW                                  0x00018000
+#define     EBC_BXCR_BW                                     0x00006000
+#define   EBC_B0AP                                        0x10
+#define   EBC_B1AP                                        0x11
+#define   EBC_B2AP                                        0x12
+#define   EBC_B3AP                                        0x13
+#define   EBC_B4AP                                        0x14
+#define   EBC_B5AP                                        0x15
+#define   EBC_B6AP                                        0x16
+#define   EBC_B7AP                                        0x17
+#define   EBC_BXAP(n)                                     (0x10+(n))
+#define   EBC_BEAR                                        0x20
+#define   EBC_BESR                                        0x21
+#define   EBC_CFG                                         0x23
+#define   EBC_CID                                         0x24
 /* 440GP Clock, PM, chip control */
 #define DCRN_CPC0_SR                                    0x0b0
 #define DCRN_CPC0_ER                                    0x0b1
diff --git a/arch/powerpc/boot/dts/ebony.dts b/arch/powerpc/boot/dts/ebony.dts
index 0ec02f4726..c5f99613fc 100644
--- a/arch/powerpc/boot/dts/ebony.dts
+++ b/arch/powerpc/boot/dts/ebony.dts
@@ -31,8 +31,8 @@
                        reg = <0>;
                        clock-frequency = <0>; // Filled in by zImage
                        timebase-frequency = <0>; // Filled in by zImage
-                        i-cache-line-size = <32>;
+                        i-cache-line-size = <20>;
-                        d-cache-line-size = <32>;
+                        d-cache-line-size = <20>;
                        i-cache-size = <8000>; /* 32 kB */
                        d-cache-size = <8000>; /* 32 kB */
                        dcr-controller;
@@ -135,11 +135,9 @@
                                #address-cells = <2>;
                                #size-cells = <1>;
                                clock-frequency = <0>; // Filled in by zImage
-                                ranges = <0 00000000 fff00000 100000
+                                // ranges property is supplied by zImage
-                                          1 00000000 48000000 100000
+                                // based on firmware's configuration of the
-                                          2 00000000 ff800000 400000
+                                // EBC bridge
-                                          3 00000000 48200000 100000
-                                          7 00000000 48300000 100000>;
                                interrupts = <5 4>;
                                interrupt-parent = <&UIC1>;
diff --git a/arch/powerpc/boot/dts/holly.dts b/arch/powerpc/boot/dts/holly.dts
index 254499b107..80a4fab8ee 100644
--- a/arch/powerpc/boot/dts/holly.dts
+++ b/arch/powerpc/boot/dts/holly.dts
@@ -46,7 +46,7 @@
        tsi109@c0000000 {
                device_type = "tsi-bridge";
-                compatible = "tsi-bridge";
+                compatible = "tsi109-bridge", "tsi108-bridge";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <00000000 c0000000 00010000>;
@@ -54,52 +54,55 @@
                i2c@7000 {
                        device_type = "i2c";
-                        compatible  = "tsi-i2c";
+                        compatible  = "tsi109-i2c", "tsi108-i2c";
-                        interrupt-parent = < &/tsi109@c0000000/pic@7400 >;
+                        interrupt-parent = <&MPIC>;
                        interrupts = <e 2>;
                        reg = <7000 400>;
                };
-                mdio@6000 {
+                MDIO: mdio@6000 {
                        device_type = "mdio";
-                        compatible = "tsi-ethernet";
+                        compatible = "tsi109-mdio", "tsi108-mdio";
+                        reg = <6000 50>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
-                        PHY1: ethernet-phy@6000 {
+                        PHY1: ethernet-phy@1 {
-                                device_type = "ethernet-phy";
+                                compatible = "bcm5461a";
-                                compatible = "bcm54xx";
+                                reg = <1>;
-                                reg = <6000 50>;
+                                txc-rxc-delay-disable;
-                                phy-id = <1>;
                        };
-                        PHY2: ethernet-phy@6400 {
+                        PHY2: ethernet-phy@2 {
-                                device_type = "ethernet-phy";
+                                compatible = "bcm5461a";
-                                compatible = "bcm54xx";
+                                reg = <2>;
-                                reg = <6000 50>;
+                                txc-rxc-delay-disable;
-                                phy-id = <2>;
                        };
                };
                ethernet@6200 {
                        device_type = "network";
-                        compatible = "tsi-ethernet";
+                        compatible = "tsi109-ethernet", "tsi108-ethernet";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <6000 200>;
                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupt-parent = < &/tsi109@c0000000/pic@7400 >;
+                        interrupt-parent = <&MPIC>;
                        interrupts = <10 2>;
+                        mdio-handle = <&MDIO>;
                        phy-handle = <&PHY1>;
                };
                ethernet@6600 {
                        device_type = "network";
-                        compatible = "tsi-ethernet";
+                        compatible = "tsi109-ethernet", "tsi108-ethernet";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <6400 200>;
                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupt-parent = < &/tsi109@c0000000/pic@7400 >;
+                        interrupt-parent = <&MPIC>;
                        interrupts = <11 2>;
+                        mdio-handle = <&MDIO>;
                        phy-handle = <&PHY2>;
                };
@@ -110,7 +113,7 @@
                        virtual-reg = <c0007808>;
                        clock-frequency = <3F9C6000>;
                        current-speed = <1c200>;
-                        interrupt-parent = < &/tsi109@c0000000/pic@7400 >;
+                        interrupt-parent = <&MPIC>;
                        interrupts = <c 2>;
                };
@@ -121,7 +124,7 @@
                        virtual-reg = <c0007c08>;
                        clock-frequency = <3F9C6000>;
                        current-speed = <1c200>;
-                        interrupt-parent = < &/tsi109@c0000000/pic@7400 >;
+                        interrupt-parent = <&MPIC>;
                        interrupts = <d 2>;
                };
@@ -136,7 +139,7 @@
                pci@1000 {
                        device_type = "pci";
-                        compatible = "tsi109";
+                        compatible = "tsi109-pci", "tsi108-pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
                        #address-cells = <3>;
@@ -150,7 +153,7 @@
                        ranges = <02000000 0 40000000 40000000 0 10000000
                                  01000000 0 00000000 7e000000 0 00010000>;
                        clock-frequency = <7f28154>;
-                        interrupt-parent = < &/tsi109@c0000000/pic@7400 >;
+                        interrupt-parent = <&MPIC>;
                        interrupts = <17 2>;
                        interrupt-map-mask = <f800 0 0 7>;
                        /*----------------------------------------------------+
@@ -186,13 +189,12 @@
                                #address-cells = <0>;
                                #interrupt-cells = <2>;
                                interrupts = <17 2>;
-                                interrupt-parent = < &/tsi109@c0000000/pic@7400 >;
+                                interrupt-parent = <&MPIC>;
                        };
                };
        };
        chosen {
                linux,stdout-path = "/tsi109@c0000000/serial@7808";
-                bootargs = "console=ttyS0,115200";
        };
 };
diff --git a/arch/powerpc/boot/dts/mpc7448hpc2.dts b/arch/powerpc/boot/dts/mpc7448hpc2.dts
index 765c306ecf..0e3d314a71 100644
--- a/arch/powerpc/boot/dts/mpc7448hpc2.dts
+++ b/arch/powerpc/boot/dts/mpc7448hpc2.dts
@@ -45,7 +45,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                #interrupt-cells = <2>;
-                device_type = "tsi-bridge";
+                device_type = "tsi108-bridge";
                ranges = <00000000 c0000000 00010000>;
                reg = <c0000000 00010000>;
                bus-frequency = <0>;
@@ -55,27 +55,26 @@
                        interrupts = <E 0>;
                        reg = <7000 400>;
                        device_type = "i2c";
-                        compatible  = "tsi-i2c";
+                        compatible  = "tsi108-i2c";
                };
-                mdio@6000 {
+                MDIO: mdio@6000 {
                        device_type = "mdio";
-                        compatible = "tsi-ethernet";
+                        compatible = "tsi108-mdio";
+                        reg = <6000 50>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
-                        phy8: ethernet-phy@6000 {
+                        phy8: ethernet-phy@8 {
                                interrupt-parent = <&mpic>;
                                interrupts = <2 1>;
-                                reg = <6000 50>;
+                                reg = <8>;
-                                phy-id = <8>;
-                                device_type = "ethernet-phy";
                        };
-                        phy9: ethernet-phy@6400 {
+                        phy9: ethernet-phy@9 {
                                interrupt-parent = <&mpic>;
                                interrupts = <2 1>;
-                                reg = <6000 50>;
+                                reg = <9>;
-                                phy-id = <9>;
-                                device_type = "ethernet-phy";
                        };
                };
@@ -83,12 +82,12 @@
                ethernet@6200 {
                        #size-cells = <0>;
                        device_type = "network";
-                        model = "TSI-ETH";
+                        compatible = "tsi108-ethernet";
-                        compatible = "tsi-ethernet";
                        reg = <6000 200>;
                        address = [ 00 06 D2 00 00 01 ];
                        interrupts = <10 2>;
                        interrupt-parent = <&mpic>;
+                        mdio-handle = <&MDIO>;
                        phy-handle = <&phy8>;
                };
@@ -96,12 +95,12 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        device_type = "network";
-                        model = "TSI-ETH";
+                        compatible = "tsi108-ethernet";
-                        compatible = "tsi-ethernet";
                        reg = <6400 200>;
                        address = [ 00 06 D2 00 00 02 ];
                        interrupts = <11 2>;
                        interrupt-parent = <&mpic>;
+                        mdio-handle = <&MDIO>;
                        phy-handle = <&phy9>;
                };
@@ -135,7 +134,7 @@
                        big-endian;
                };
                pci@1000 {
-                        compatible = "tsi10x";
+                        compatible = "tsi108-pci";
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
diff --git a/arch/powerpc/boot/dts/mpc8272ads.dts b/arch/powerpc/boot/dts/mpc8272ads.dts
index 423eedcf63..1934b80027 100644
--- a/arch/powerpc/boot/dts/mpc8272ads.dts
+++ b/arch/powerpc/boot/dts/mpc8272ads.dts
@@ -14,12 +14,10 @@
       compatible = "MPC8260ADS";
       #address-cells = <1>;
       #size-cells = <1>;
-       linux,phandle = <100>;
       cpus {
               #address-cells = <1>;
               #size-cells = <0>;
-               linux,phandle = <200>;
               PowerPC,8272@0 {
                       device_type = "cpu";
@@ -32,12 +30,10 @@
                       bus-frequency = <0>;
                       clock-frequency = <0>;
                       32-bit;
-                       linux,phandle = <201>;
               };
       };
-       interrupt-controller@f8200000 {
+                pci_pic: interrupt-controller@f8200000 {
-               linux,phandle = <f8200000>;
               #address-cells = <0>;
               #interrupt-cells = <2>;
               interrupt-controller;
@@ -47,15 +43,13 @@
       };
       memory {
               device_type = "memory";
-               linux,phandle = <300>;
               reg = <00000000 4000000 f4500000 00000020>;
       };
       chosen {
               name = "chosen";
               linux,platform = <0>;
-               interrupt-controller = <10c00>;
+                interrupt-controller = <&Cpm_pic>;
-               linux,phandle = <400>;
       };
       soc8272@f0000000 {
@@ -70,20 +64,17 @@
                       device_type = "mdio";
                       compatible = "fs_enet";
                       reg = <0 0>;
-                       linux,phandle = <24520>;
                       #address-cells = <1>;
                       #size-cells = <0>;
-                       ethernet-phy@0 {
+                        phy0:ethernet-phy@0 {
-                               linux,phandle = <2452000>;
+                                interrupt-parent = <&Cpm_pic>;
-                               interrupt-parent = <10c00>;
                               interrupts = <17 4>;
                               reg = <0>;
                               bitbang = [ 12 12 13 02 02 01 ];
                               device_type = "ethernet-phy";
                       };
-                       ethernet-phy@1 {
+                        phy1:ethernet-phy@1 {
-                               linux,phandle = <2452001>;
+                                interrupt-parent = <&Cpm_pic>;
-                               interrupt-parent = <10c00>;
                               interrupts = <17 4>;
                               bitbang = [ 12 12 13 02 02 01 ];
                               reg = <3>;
@@ -101,8 +92,8 @@
                       reg = <11300 20 8400 100 11380 30>;
                       mac-address = [ 00 11 2F 99 43 54 ];
                       interrupts = <20 2>;
-                       interrupt-parent = <10c00>;
+                        interrupt-parent = <&Cpm_pic>;
-                       phy-handle = <2452000>;
+                        phy-handle = <&Phy0>;
                       rx-clock = <13>;
                       tx-clock = <12>;
               };
@@ -115,14 +106,13 @@
                       reg = <11320 20 8500 100 113b0 30>;
                       mac-address = [ 00 11 2F 99 44 54 ];
                       interrupts = <21 2>;
-                       interrupt-parent = <10c00>;
+                        interrupt-parent = <&Cpm_pic>;
-                       phy-handle = <2452001>;
+                        phy-handle = <&Phy1>;
                       rx-clock = <17>;
                       tx-clock = <18>;
               };
               cpm@f0000000 {
-                       linux,phandle = <f0000000>;
                       #address-cells = <1>;
                       #size-cells = <1>;
                       #interrupt-cells = <2>;
@@ -142,7 +132,7 @@
                               reg = <11a00 20 8000 100>;
                               current-speed = <1c200>;
                               interrupts = <28 2>;
-                               interrupt-parent = <10c00>;
+                                interrupt-parent = <&Cpm_pic>;
                               clock-setup = <0 00ffffff>;
                               rx-clock = <1>;
                               tx-clock = <1>;
@@ -156,15 +146,14 @@
                               reg = <11a60 20 8300 100>;
                               current-speed = <1c200>;
                               interrupts = <2b 2>;
-                               interrupt-parent = <10c00>;
+                                interrupt-parent = <&Cpm_pic>;
                               clock-setup = <1b ffffff00>;
                               rx-clock = <4>;
                               tx-clock = <4>;
                       };
               };
-               interrupt-controller@10c00 {
+                        cpm_pic:interrupt-controller@10c00 {
-                       linux,phandle = <10c00>;
                       #address-cells = <0>;
                       #interrupt-cells = <2>;
                       interrupt-controller;
@@ -174,7 +163,6 @@
                       compatible = "CPM2";
               };
               pci@0500 {
-                       linux,phandle = <0500>;
                       #interrupt-cells = <1>;
                       #size-cells = <2>;
                       #address-cells = <3>;
@@ -202,7 +190,7 @@
                                        c000 0 0 2 f8200000 43 8
                                        c000 0 0 3 f8200000 40 8
                                        c000 0 0 4 f8200000 41 8>;
-                       interrupt-parent = <10c00>;
+                        interrupt-parent = <&Cpm_pic>;
                       interrupts = <14 8>;
                       bus-range = <0 0>;
                       ranges = <02000000 0 80000000 80000000 0 40000000
@@ -216,7 +204,7 @@
                       compatible = "talitos";
                       reg = <30000 10000>;
                       interrupts = <b 2>;
-                       interrupt-parent = <10c00>;
+                        interrupt-parent = <&Cpm_pic>;
                       num-channels = <4>;
                       channel-fifo-len = <18>;
                       exec-units-mask = <0000007e>;
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 112dd5198f..4fc0c4d34a 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -272,7 +272,13 @@
                        reg = <2200 200>;
                        interrupts = <22>;
                        interrupt-parent = < &qeic >;
-                        mac-address = [ 00 04 9f 00 23 23 ];
+                        /*
+                         * mac-address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        mac-address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
                        rx-clock = <19>;
                        tx-clock = <1a>;
                        phy-handle = < &phy3 >;
@@ -287,7 +293,13 @@
                        reg = <3000 200>;
                        interrupts = <23>;
                        interrupt-parent = < &qeic >;
-                        mac-address = [ 00 11 22 33 44 55 ];
+                        /*
+                         * mac-address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        mac-address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
                        rx-clock = <17>;
                        tx-clock = <18>;
                        phy-handle = < &phy4 >;
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index be4c35784e..447c03ffab 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -231,7 +231,13 @@
                        reg = <3000 200>;
                        interrupts = <21>;
                        interrupt-parent = <&qeic>;
-                        mac-address = [ 00 04 9f ef 03 02 ];
+                        /*
+                         * mac-address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        mac-address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
                        rx-clock = <20>;
                        tx-clock = <13>;
                        phy-handle = <&phy00>;
@@ -246,7 +252,13 @@
                        reg = <2200 200>;
                        interrupts = <22>;
                        interrupt-parent = <&qeic>;
-                        mac-address = [ 00 04 9f ef 03 01 ];
+                        /*
+                         * mac-address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        mac-address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
                        rx-clock = <19>;
                        tx-clock = <1a>;
                        phy-handle = <&phy04>;
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index db0d003032..ae9bca5754 100644
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -131,6 +131,11 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
+                        /*
+                         * address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
                        address = [ 00 00 00 00 00 00 ];
                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <20 8 21 8 22 8>;
@@ -145,6 +150,11 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
+                        /*
+                         * address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
                        address = [ 00 00 00 00 00 00 ];
                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <23 8 24 8 25 8>;
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts
index df773fafe9..310e877826 100644
--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc834x_mds.dts
@@ -136,6 +136,11 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
+                        /*
+                         * address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
                        address = [ 00 00 00 00 00 00 ];
                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <20 8 21 8 22 8>;
@@ -150,6 +155,11 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
+                        /*
+                         * address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
                        address = [ 00 00 00 00 00 00 ];
                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <23 8 24 8 25 8>;
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index 38c8594df3..1e914f31dd 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -301,7 +301,13 @@
                        reg = <2000 200>;
                        interrupts = <20>;
                        interrupt-parent = < &qeic >;
-                        mac-address = [ 00 04 9f 00 23 23 ];
+                        /*
+                         * mac-address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        mac-address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
                        rx-clock = <0>;
                        tx-clock = <19>;
                        phy-handle = < &phy0 >;
@@ -317,7 +323,13 @@
                        reg = <3000 200>;
                        interrupts = <21>;
                        interrupt-parent = < &qeic >;
-                        mac-address = [ 00 11 22 33 44 55 ];
+                        /*
+                         * mac-address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        mac-address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
                        rx-clock = <0>;
                        tx-clock = <14>;
                        phy-handle = < &phy1 >;
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts
index d91e81c009..364a969f5c 100644
--- a/arch/powerpc/boot/dts/mpc8540ads.dts
+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -52,7 +52,7 @@
                        compatible = "fsl,8540-memory-controller";
                        reg = <2000 1000>;
                        interrupt-parent = <&mpic>;
-                        interrupts = <2 2>;
+                        interrupts = <12 2>;
                };
                l2-cache-controller@20000 {
@@ -61,14 +61,14 @@
                        cache-line-size = <20>; // 32 bytes
                        cache-size = <40000>;   // L2, 256K
                        interrupt-parent = <&mpic>;
-                        interrupts = <0 2>;
+                        interrupts = <10 2>;
                };
                i2c@3000 {
                        device_type = "i2c";
                        compatible = "fsl-i2c";
                        reg = <3000 100>;
-                        interrupts = <1b 2>;
+                        interrupts = <2b 2>;
                        interrupt-parent = <&mpic>;
                        dfsrr;
                };
@@ -81,19 +81,19 @@
                        reg = <24520 20>;
                        phy0: ethernet-phy@0 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <35 1>;
+                                interrupts = <5 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
                        phy1: ethernet-phy@1 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <35 1>;
+                                interrupts = <5 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
                        phy3: ethernet-phy@3 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <37 1>;
+                                interrupts = <7 1>;
                                reg = <3>;
                                device_type = "ethernet-phy";
                        };
@@ -106,9 +106,14 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
-                        address = [ 00 E0 0C 00 73 00 ];
+                        /*
-                        local-mac-address = [ 00 E0 0C 00 73 00 ];
+                         * address is deprecated and will be removed
-                        interrupts = <d 2 e 2 12 2>;
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <1d 2 1e 2 22 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy0>;
                };
@@ -120,9 +125,14 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
-                        address = [ 00 E0 0C 00 73 01 ];
+                        /*
-                        local-mac-address = [ 00 E0 0C 00 73 01 ];
+                         * address is deprecated and will be removed
-                        interrupts = <13 2 14 2 18 2>;
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <23 2 24 2 28 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy1>;
                };
@@ -134,9 +144,14 @@
                        model = "FEC";
                        compatible = "gianfar";
                        reg = <26000 1000>;
-                        address = [ 00 E0 0C 00 73 02 ];
+                        /*
-                        local-mac-address = [ 00 E0 0C 00 73 02 ];
+                         * address is deprecated and will be removed
-                        interrupts = <19 2>;
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <29 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy3>;
                };
@@ -146,7 +161,7 @@
                        compatible = "ns16550";
                        reg = <4500 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
-                        interrupts = <1a 2>;
+                        interrupts = <2a 2>;
                        interrupt-parent = <&mpic>;
                };
@@ -155,7 +170,7 @@
                        compatible = "ns16550";
                        reg = <4600 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
-                        interrupts = <1a 2>;
+                        interrupts = <2a 2>;
                        interrupt-parent = <&mpic>;
                };
                pci@8000 {
@@ -163,78 +178,78 @@
                        interrupt-map = <
                                /* IDSEL 0x02 */
-                                1000 0 0 1 &mpic 31 1
+                                1000 0 0 1 &mpic 1 1
-                                1000 0 0 2 &mpic 32 1
+                                1000 0 0 2 &mpic 2 1
-                                1000 0 0 3 &mpic 33 1
+                                1000 0 0 3 &mpic 3 1
-                                1000 0 0 4 &mpic 34 1
+                                1000 0 0 4 &mpic 4 1
                                /* IDSEL 0x03 */
-                                1800 0 0 1 &mpic 34 1
+                                1800 0 0 1 &mpic 4 1
-                                1800 0 0 2 &mpic 31 1
+                                1800 0 0 2 &mpic 1 1
-                                1800 0 0 3 &mpic 32 1
+                                1800 0 0 3 &mpic 2 1
-                                1800 0 0 4 &mpic 33 1
+                                1800 0 0 4 &mpic 3 1
                                /* IDSEL 0x04 */
-                                2000 0 0 1 &mpic 33 1
+                                2000 0 0 1 &mpic 3 1
-                                2000 0 0 2 &mpic 34 1
+                                2000 0 0 2 &mpic 4 1
-                                2000 0 0 3 &mpic 31 1
+                                2000 0 0 3 &mpic 1 1
-                                2000 0 0 4 &mpic 32 1
+                                2000 0 0 4 &mpic 2 1
                                /* IDSEL 0x05 */
-                                2800 0 0 1 &mpic 32 1
+                                2800 0 0 1 &mpic 2 1
-                                2800 0 0 2 &mpic 33 1
+                                2800 0 0 2 &mpic 3 1
-                                2800 0 0 3 &mpic 34 1
+                                2800 0 0 3 &mpic 4 1
-                                2800 0 0 4 &mpic 31 1
+                                2800 0 0 4 &mpic 1 1
                                /* IDSEL 0x0c */
-                                6000 0 0 1 &mpic 31 1
+                                6000 0 0 1 &mpic 1 1
-                                6000 0 0 2 &mpic 32 1
+                                6000 0 0 2 &mpic 2 1
-                                6000 0 0 3 &mpic 33 1
+                                6000 0 0 3 &mpic 3 1
-                                6000 0 0 4 &mpic 34 1
+                                6000 0 0 4 &mpic 4 1
                                /* IDSEL 0x0d */
-                                6800 0 0 1 &mpic 34 1
+                                6800 0 0 1 &mpic 4 1
-                                6800 0 0 2 &mpic 31 1
+                                6800 0 0 2 &mpic 1 1
-                                6800 0 0 3 &mpic 32 1
+                                6800 0 0 3 &mpic 2 1
-                                6800 0 0 4 &mpic 33 1
+                                6800 0 0 4 &mpic 3 1
                                /* IDSEL 0x0e */
-                                7000 0 0 1 &mpic 33 1
+                                7000 0 0 1 &mpic 3 1
-                                7000 0 0 2 &mpic 34 1
+                                7000 0 0 2 &mpic 4 1
-                                7000 0 0 3 &mpic 31 1
+                                7000 0 0 3 &mpic 1 1
-                                7000 0 0 4 &mpic 32 1
+                                7000 0 0 4 &mpic 2 1
                                /* IDSEL 0x0f */
-                                7800 0 0 1 &mpic 32 1
+                                7800 0 0 1 &mpic 2 1
-                                7800 0 0 2 &mpic 33 1
+                                7800 0 0 2 &mpic 3 1
-                                7800 0 0 3 &mpic 34 1
+                                7800 0 0 3 &mpic 4 1
-                                7800 0 0 4 &mpic 31 1
+                                7800 0 0 4 &mpic 1 1
                                /* IDSEL 0x12 */
-                                9000 0 0 1 &mpic 31 1
+                                9000 0 0 1 &mpic 1 1
-                                9000 0 0 2 &mpic 32 1
+                                9000 0 0 2 &mpic 2 1
-                                9000 0 0 3 &mpic 33 1
+                                9000 0 0 3 &mpic 3 1
-                                9000 0 0 4 &mpic 34 1
+                                9000 0 0 4 &mpic 4 1
                                /* IDSEL 0x13 */
-                                9800 0 0 1 &mpic 34 1
+                                9800 0 0 1 &mpic 4 1
-                                9800 0 0 2 &mpic 31 1
+                                9800 0 0 2 &mpic 1 1
-                                9800 0 0 3 &mpic 32 1
+                                9800 0 0 3 &mpic 2 1
-                                9800 0 0 4 &mpic 33 1
+                                9800 0 0 4 &mpic 3 1
                                /* IDSEL 0x14 */
-                                a000 0 0 1 &mpic 33 1
+                                a000 0 0 1 &mpic 3 1
-                                a000 0 0 2 &mpic 34 1
+                                a000 0 0 2 &mpic 4 1
-                                a000 0 0 3 &mpic 31 1
+                                a000 0 0 3 &mpic 1 1
-                                a000 0 0 4 &mpic 32 1
+                                a000 0 0 4 &mpic 2 1
                                /* IDSEL 0x15 */
-                                a800 0 0 1 &mpic 32 1
+                                a800 0 0 1 &mpic 2 1
-                                a800 0 0 2 &mpic 33 1
+                                a800 0 0 2 &mpic 3 1
-                                a800 0 0 3 &mpic 34 1
+                                a800 0 0 3 &mpic 4 1
-                                a800 0 0 4 &mpic 31 1>;
+                                a800 0 0 4 &mpic 1 1>;
                        interrupt-parent = <&mpic>;
-                        interrupts = <08 2>;
+                        interrupts = <18 2>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 80000000 80000000 0 20000000
                                  01000000 0 00000000 e2000000 0 00100000>;
diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts
index 4f2c3af2e0..070206fffe 100644
--- a/arch/powerpc/boot/dts/mpc8541cds.dts
+++ b/arch/powerpc/boot/dts/mpc8541cds.dts
@@ -52,7 +52,7 @@
                        compatible = "fsl,8541-memory-controller";
                        reg = <2000 1000>;
                        interrupt-parent = <&mpic>;
-                        interrupts = <2 2>;
+                        interrupts = <12 2>;
                };
                l2-cache-controller@20000 {
@@ -61,14 +61,14 @@
                        cache-line-size = <20>; // 32 bytes
                        cache-size = <40000>;   // L2, 256K
                        interrupt-parent = <&mpic>;
-                        interrupts = <0 2>;
+                        interrupts = <10 2>;
                };
                i2c@3000 {
                        device_type = "i2c";
                        compatible = "fsl-i2c";
                        reg = <3000 100>;
-                        interrupts = <1b 2>;
+                        interrupts = <2b 2>;
                        interrupt-parent = <&mpic>;
                        dfsrr;
                };
@@ -81,13 +81,13 @@
                        reg = <24520 20>;
                        phy0: ethernet-phy@0 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <35 0>;
+                                interrupts = <5 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
                        phy1: ethernet-phy@1 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <35 0>;
+                                interrupts = <5 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
@@ -100,8 +100,8 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
-                        local-mac-address = [ 00 E0 0C 00 73 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <d 2 e 2 12 2>;
+                        interrupts = <1d 2 1e 2 22 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy0>;
                };
@@ -113,8 +113,8 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
-                        local-mac-address = [ 00 E0 0C 00 73 01 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <13 2 14 2 18 2>;
+                        interrupts = <23 2 24 2 28 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy1>;
                };
@@ -124,7 +124,7 @@
                        compatible = "ns16550";
                        reg = <4500 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
-                        interrupts = <1a 2>;
+                        interrupts = <2a 2>;
                        interrupt-parent = <&mpic>;
                };
@@ -133,7 +133,7 @@
                        compatible = "ns16550";
                        reg = <4600 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
-                        interrupts = <1a 2>;
+                        interrupts = <2a 2>;
                        interrupt-parent = <&mpic>;
                };
@@ -142,49 +142,49 @@
                        interrupt-map = <
                                /* IDSEL 0x10 */
-                                08000 0 0 1 &mpic 30 1
+                                08000 0 0 1 &mpic 0 1
-                                08000 0 0 2 &mpic 31 1
+                                08000 0 0 2 &mpic 1 1
-                                08000 0 0 3 &mpic 32 1
+                                08000 0 0 3 &mpic 2 1
-                                08000 0 0 4 &mpic 33 1
+                                08000 0 0 4 &mpic 3 1
                                /* IDSEL 0x11 */
-                                08800 0 0 1 &mpic 30 1
+                                08800 0 0 1 &mpic 0 1
-                                08800 0 0 2 &mpic 31 1
+                                08800 0 0 2 &mpic 1 1
-                                08800 0 0 3 &mpic 32 1
+                                08800 0 0 3 &mpic 2 1
-                                08800 0 0 4 &mpic 33 1
+                                08800 0 0 4 &mpic 3 1
                                /* IDSEL 0x12 (Slot 1) */
-                                09000 0 0 1 &mpic 30 1
+                                09000 0 0 1 &mpic 0 1
-                                09000 0 0 2 &mpic 31 1
+                                09000 0 0 2 &mpic 1 1
-                                09000 0 0 3 &mpic 32 1
+                                09000 0 0 3 &mpic 2 1
-                                09000 0 0 4 &mpic 33 1
+                                09000 0 0 4 &mpic 3 1
                                /* IDSEL 0x13 (Slot 2) */
-                                09800 0 0 1 &mpic 31 1
+                                09800 0 0 1 &mpic 1 1
-                                09800 0 0 2 &mpic 32 1
+                                09800 0 0 2 &mpic 2 1
-                                09800 0 0 3 &mpic 33 1
+                                09800 0 0 3 &mpic 3 1
-                                09800 0 0 4 &mpic 30 1
+                                09800 0 0 4 &mpic 0 1
                                /* IDSEL 0x14 (Slot 3) */
-                                0a000 0 0 1 &mpic 32 1
+                                0a000 0 0 1 &mpic 2 1
-                                0a000 0 0 2 &mpic 33 1
+                                0a000 0 0 2 &mpic 3 1
-                                0a000 0 0 3 &mpic 30 1
+                                0a000 0 0 3 &mpic 0 1
-                                0a000 0 0 4 &mpic 31 1
+                                0a000 0 0 4 &mpic 1 1
                                /* IDSEL 0x15 (Slot 4) */
-                                0a800 0 0 1 &mpic 33 1
+                                0a800 0 0 1 &mpic 3 1
-                                0a800 0 0 2 &mpic 30 1
+                                0a800 0 0 2 &mpic 0 1
-                                0a800 0 0 3 &mpic 31 1
+                                0a800 0 0 3 &mpic 1 1
-                                0a800 0 0 4 &mpic 32 1
+                                0a800 0 0 4 &mpic 2 1
                                /* Bus 1 (Tundra Bridge) */
                                /* IDSEL 0x12 (ISA bridge) */
-                                19000 0 0 1 &mpic 30 1
+                                19000 0 0 1 &mpic 0 1
-                                19000 0 0 2 &mpic 31 1
+                                19000 0 0 2 &mpic 1 1
-                                19000 0 0 3 &mpic 32 1
+                                19000 0 0 3 &mpic 2 1
-                                19000 0 0 4 &mpic 33 1>;
+                                19000 0 0 4 &mpic 3 1>;
                        interrupt-parent = <&mpic>;
-                        interrupts = <08 2>;
+                        interrupts = <18 2>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 80000000 80000000 0 20000000
                                  01000000 0 00000000 e2000000 0 00100000>;
@@ -216,12 +216,12 @@
                        interrupt-map = <
                                /* IDSEL 0x15 */
-                                a800 0 0 1 &mpic 3b 1
+                                a800 0 0 1 &mpic b 1
-                                a800 0 0 2 &mpic 3b 1
+                                a800 0 0 2 &mpic b 1
-                                a800 0 0 3 &mpic 3b 1
+                                a800 0 0 3 &mpic b 1
-                                a800 0 0 4 &mpic 3b 1>;
+                                a800 0 0 4 &mpic b 1>;
                        interrupt-parent = <&mpic>;
-                        interrupts = <09 2>;
+                        interrupts = <19 2>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 a0000000 a0000000 0 20000000
                                  01000000 0 00000000 e3000000 0 00100000>;
diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts
index 3033599e74..8285925924 100644
--- a/arch/powerpc/boot/dts/mpc8544ds.dts
+++ b/arch/powerpc/boot/dts/mpc8544ds.dts
@@ -52,7 +52,7 @@
                        compatible = "fsl,8544-memory-controller";
                        reg = <2000 1000>;
                        interrupt-parent = <&mpic>;
-                        interrupts = <2 2>;
+                        interrupts = <12 2>;
                };
                l2-cache-controller@20000 {
@@ -61,14 +61,14 @@
                        cache-line-size = <20>; // 32 bytes
                        cache-size = <40000>;   // L2, 256K
                        interrupt-parent = <&mpic>;
-                        interrupts = <0 2>;
+                        interrupts = <10 2>;
                };
                i2c@3000 {
                        device_type = "i2c";
                        compatible = "fsl-i2c";
                        reg = <3000 100>;
-                        interrupts = <1b 2>;
+                        interrupts = <2b 2>;
                        interrupt-parent = <&mpic>;
                        dfsrr;
                };
@@ -81,13 +81,13 @@
                        reg = <24520 20>;
                        phy0: ethernet-phy@0 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <3a 1>;
+                                interrupts = <a 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
                        phy1: ethernet-phy@1 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <3a 1>;
+                                interrupts = <a 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
@@ -101,7 +101,7 @@
                        compatible = "gianfar";
                        reg = <24000 1000>;
                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <d 2 e 2 12 2>;
+                        interrupts = <1d 2 1e 2 22 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy0>;
                };
@@ -114,7 +114,7 @@
                        compatible = "gianfar";
                        reg = <26000 1000>;
                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <f 2 10 2 11 2>;
+                        interrupts = <1f 2 20 2 21 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy1>;
                };
@@ -124,7 +124,7 @@
                        compatible = "ns16550";
                        reg = <4500 100>;
                        clock-frequency = <0>;
-                        interrupts = <1a 2>;
+                        interrupts = <2a 2>;
                        interrupt-parent = <&mpic>;
                };
@@ -133,7 +133,7 @@
                        compatible = "ns16550";
                        reg = <4600 100>;
                        clock-frequency = <0>;
-                        interrupts = <1a 2>;
+                        interrupts = <2a 2>;
                        interrupt-parent = <&mpic>;
                };
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts
index ad96381033..9d0b84b66c 100644
--- a/arch/powerpc/boot/dts/mpc8548cds.dts
+++ b/arch/powerpc/boot/dts/mpc8548cds.dts
@@ -52,7 +52,7 @@
                        compatible = "fsl,8548-memory-controller";
                        reg = <2000 1000>;
                        interrupt-parent = <&mpic>;
-                        interrupts = <2 2>;
+                        interrupts = <12 2>;
                };
                l2-cache-controller@20000 {
@@ -61,14 +61,14 @@
                        cache-line-size = <20>; // 32 bytes
                        cache-size = <80000>;   // L2, 512K
                        interrupt-parent = <&mpic>;
-                        interrupts = <0 2>;
+                        interrupts = <10 2>;
                };
                i2c@3000 {
                        device_type = "i2c";
                        compatible = "fsl-i2c";
                        reg = <3000 100>;
-                        interrupts = <1b 2>;
+                        interrupts = <2b 2>;
                        interrupt-parent = <&mpic>;
                        dfsrr;
                };
@@ -81,25 +81,25 @@
                        reg = <24520 20>;
                        phy0: ethernet-phy@0 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <35 0>;
+                                interrupts = <5 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
                        phy1: ethernet-phy@1 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <35 0>;
+                                interrupts = <5 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
                        phy2: ethernet-phy@2 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <35 0>;
+                                interrupts = <5 1>;
                                reg = <2>;
                                device_type = "ethernet-phy";
                        };
                        phy3: ethernet-phy@3 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <35 0>;
+                                interrupts = <5 1>;
                                reg = <3>;
                                device_type = "ethernet-phy";
                        };
@@ -112,8 +112,8 @@
                        model = "eTSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
-                        local-mac-address = [ 00 E0 0C 00 73 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <d 2 e 2 12 2>;
+                        interrupts = <1d 2 1e 2 22 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy0>;
                };
@@ -125,8 +125,8 @@
                        model = "eTSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
-                        local-mac-address = [ 00 E0 0C 00 73 01 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <13 2 14 2 18 2>;
+                        interrupts = <23 2 24 2 28 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy1>;
                };
@@ -139,8 +139,8 @@
                        model = "eTSEC";
                        compatible = "gianfar";
                        reg = <26000 1000>;
-                        local-mac-address = [ 00 E0 0C 00 73 02 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <f 2 10 2 11 2>;
+                        interrupts = <1f 2 20 2 21 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy2>;
                };
@@ -152,8 +152,8 @@
                        model = "eTSEC";
                        compatible = "gianfar";
                        reg = <27000 1000>;
-                        local-mac-address = [ 00 E0 0C 00 73 03 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <15 2 16 2 17 2>;
+                        interrupts = <25 2 26 2 27 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy3>;
                };
@@ -164,7 +164,7 @@
                        compatible = "ns16550";
                        reg = <4500 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
-                        interrupts = <1a 2>;
+                        interrupts = <2a 2>;
                        interrupt-parent = <&mpic>;
                };
@@ -173,58 +173,64 @@
                        compatible = "ns16550";
                        reg = <4600 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
-                        interrupts = <1a 2>;
+                        interrupts = <2a 2>;
                        interrupt-parent = <&mpic>;
                };
+                global-utilities@e0000 {        //global utilities reg
+                        compatible = "fsl,mpc8548-guts";
+                        reg = <e0000 1000>;
+                        fsl,has-rstcr;
+                };
                pci1: pci@8000 {
                        interrupt-map-mask = <1f800 0 0 7>;
                        interrupt-map = <
                                /* IDSEL 0x10 */
-                                08000 0 0 1 &mpic 30 1
+                                08000 0 0 1 &mpic 0 1
-                                08000 0 0 2 &mpic 31 1
+                                08000 0 0 2 &mpic 1 1
-                                08000 0 0 3 &mpic 32 1
+                                08000 0 0 3 &mpic 2 1
-                                08000 0 0 4 &mpic 33 1
+                                08000 0 0 4 &mpic 3 1
                                /* IDSEL 0x11 */
-                                08800 0 0 1 &mpic 30 1
+                                08800 0 0 1 &mpic 0 1
-                                08800 0 0 2 &mpic 31 1
+                                08800 0 0 2 &mpic 1 1
-                                08800 0 0 3 &mpic 32 1
+                                08800 0 0 3 &mpic 2 1
-                                08800 0 0 4 &mpic 33 1
+                                08800 0 0 4 &mpic 3 1
                                /* IDSEL 0x12 (Slot 1) */
-                                09000 0 0 1 &mpic 30 1
+                                09000 0 0 1 &mpic 0 1
-                                09000 0 0 2 &mpic 31 1
+                                09000 0 0 2 &mpic 1 1
-                                09000 0 0 3 &mpic 32 1
+                                09000 0 0 3 &mpic 2 1
-                                09000 0 0 4 &mpic 33 1
+                                09000 0 0 4 &mpic 3 1
                                /* IDSEL 0x13 (Slot 2) */
-                                09800 0 0 1 &mpic 31 1
+                                09800 0 0 1 &mpic 1 1
-                                09800 0 0 2 &mpic 32 1
+                                09800 0 0 2 &mpic 2 1
-                                09800 0 0 3 &mpic 33 1
+                                09800 0 0 3 &mpic 3 1
-                                09800 0 0 4 &mpic 30 1
+                                09800 0 0 4 &mpic 0 1
                                /* IDSEL 0x14 (Slot 3) */
-                                0a000 0 0 1 &mpic 32 1
+                                0a000 0 0 1 &mpic 2 1
-                                0a000 0 0 2 &mpic 33 1
+                                0a000 0 0 2 &mpic 3 1
-                                0a000 0 0 3 &mpic 30 1
+                                0a000 0 0 3 &mpic 0 1
-                                0a000 0 0 4 &mpic 31 1
+                                0a000 0 0 4 &mpic 1 1
                                /* IDSEL 0x15 (Slot 4) */
-                                0a800 0 0 1 &mpic 33 1
+                                0a800 0 0 1 &mpic 3 1
-                                0a800 0 0 2 &mpic 30 1
+                                0a800 0 0 2 &mpic 0 1
-                                0a800 0 0 3 &mpic 31 1
+                                0a800 0 0 3 &mpic 1 1
-                                0a800 0 0 4 &mpic 32 1
+                                0a800 0 0 4 &mpic 2 1
                                /* Bus 1 (Tundra Bridge) */
                                /* IDSEL 0x12 (ISA bridge) */
-                                19000 0 0 1 &mpic 30 1
+                                19000 0 0 1 &mpic 0 1
-                                19000 0 0 2 &mpic 31 1
+                                19000 0 0 2 &mpic 1 1
-                                19000 0 0 3 &mpic 32 1
+                                19000 0 0 3 &mpic 2 1
-                                19000 0 0 4 &mpic 33 1>;
+                                19000 0 0 4 &mpic 3 1>;
                        interrupt-parent = <&mpic>;
-                        interrupts = <08 2>;
+                        interrupts = <18 2>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 80000000 80000000 0 20000000
                                  01000000 0 00000000 e2000000 0 00100000>;
@@ -256,12 +262,12 @@
                        interrupt-map = <
                                /* IDSEL 0x15 */
-                                a800 0 0 1 &mpic 3b 1
+                                a800 0 0 1 &mpic b 1
-                                a800 0 0 2 &mpic 3b 1
+                                a800 0 0 2 &mpic b 1
-                                a800 0 0 3 &mpic 3b 1
+                                a800 0 0 3 &mpic b 1
-                                a800 0 0 4 &mpic 3b 1>;
+                                a800 0 0 4 &mpic b 1>;
                        interrupt-parent = <&mpic>;
-                        interrupts = <09 2>;
+                        interrupts = <19 2>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 a0000000 a0000000 0 20000000
                                  01000000 0 00000000 e3000000 0 00100000>;
diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts
index 951ed92f11..17e45d9a38 100644
--- a/arch/powerpc/boot/dts/mpc8555cds.dts
+++ b/arch/powerpc/boot/dts/mpc8555cds.dts
@@ -52,7 +52,7 @@
                        compatible = "fsl,8555-memory-controller";
                        reg = <2000 1000>;
                        interrupt-parent = <&mpic>;
-                        interrupts = <2 2>;
+                        interrupts = <12 2>;
                };
                l2-cache-controller@20000 {
@@ -61,14 +61,14 @@
                        cache-line-size = <20>; // 32 bytes
                        cache-size = <40000>;   // L2, 256K
                        interrupt-parent = <&mpic>;
-                        interrupts = <0 2>;
+                        interrupts = <10 2>;
                };
                i2c@3000 {
                        device_type = "i2c";
                        compatible = "fsl-i2c";
                        reg = <3000 100>;
-                        interrupts = <1b 2>;
+                        interrupts = <2b 2>;
                        interrupt-parent = <&mpic>;
                        dfsrr;
                };
@@ -81,13 +81,13 @@
                        reg = <24520 20>;
                        phy0: ethernet-phy@0 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <35 0>;
+                                interrupts = <5 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
                        phy1: ethernet-phy@1 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <35 0>;
+                                interrupts = <5 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
@@ -100,8 +100,8 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
-                        local-mac-address = [ 00 E0 0C 00 73 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <0d 2 0e 2 12 2>;
+                        interrupts = <1d 2 1e 2 22 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy0>;
                };
@@ -113,8 +113,8 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
-                        local-mac-address = [ 00 E0 0C 00 73 01 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <13 2 14 2 18 2>;
+                        interrupts = <23 2 24 2 28 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy1>;
                };
@@ -124,7 +124,7 @@
                        compatible = "ns16550";
                        reg = <4500 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
-                        interrupts = <1a 2>;
+                        interrupts = <2a 2>;
                        interrupt-parent = <&mpic>;
                };
@@ -133,7 +133,7 @@
                        compatible = "ns16550";
                        reg = <4600 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
-                        interrupts = <1a 2>;
+                        interrupts = <2a 2>;
                        interrupt-parent = <&mpic>;
                };
@@ -142,49 +142,49 @@
                        interrupt-map = <
                                /* IDSEL 0x10 */
-                                08000 0 0 1 &mpic 30 1
+                                08000 0 0 1 &mpic 0 1
-                                08000 0 0 2 &mpic 31 1
+                                08000 0 0 2 &mpic 1 1
-                                08000 0 0 3 &mpic 32 1
+                                08000 0 0 3 &mpic 2 1
-                                08000 0 0 4 &mpic 33 1
+                                08000 0 0 4 &mpic 3 1
                                /* IDSEL 0x11 */
-                                08800 0 0 1 &mpic 30 1
+                                08800 0 0 1 &mpic 0 1
-                                08800 0 0 2 &mpic 31 1
+                                08800 0 0 2 &mpic 1 1
-                                08800 0 0 3 &mpic 32 1
+                                08800 0 0 3 &mpic 2 1
-                                08800 0 0 4 &mpic 33 1
+                                08800 0 0 4 &mpic 3 1
                                /* IDSEL 0x12 (Slot 1) */
-                                09000 0 0 1 &mpic 30 1
+                                09000 0 0 1 &mpic 0 1
-                                09000 0 0 2 &mpic 31 1
+                                09000 0 0 2 &mpic 1 1
-                                09000 0 0 3 &mpic 32 1
+                                09000 0 0 3 &mpic 2 1
-                                09000 0 0 4 &mpic 33 1
+                                09000 0 0 4 &mpic 3 1
                                /* IDSEL 0x13 (Slot 2) */
-                                09800 0 0 1 &mpic 31 1
+                                09800 0 0 1 &mpic 1 1
-                                09800 0 0 2 &mpic 32 1
+                                09800 0 0 2 &mpic 2 1
-                                09800 0 0 3 &mpic 33 1
+                                09800 0 0 3 &mpic 3 1
-                                09800 0 0 4 &mpic 30 1
+                                09800 0 0 4 &mpic 0 1
                                /* IDSEL 0x14 (Slot 3) */
-                                0a000 0 0 1 &mpic 32 1
+                                0a000 0 0 1 &mpic 2 1
-                                0a000 0 0 2 &mpic 33 1
+                                0a000 0 0 2 &mpic 3 1
-                                0a000 0 0 3 &mpic 30 1
+                                0a000 0 0 3 &mpic 0 1
-                                0a000 0 0 4 &mpic 31 1
+                                0a000 0 0 4 &mpic 1 1
                                /* IDSEL 0x15 (Slot 4) */
-                                0a800 0 0 1 &mpic 33 1
+                                0a800 0 0 1 &mpic 3 1
-                                0a800 0 0 2 &mpic 30 1
+                                0a800 0 0 2 &mpic 0 1
-                                0a800 0 0 3 &mpic 31 1
+                                0a800 0 0 3 &mpic 1 1
-                                0a800 0 0 4 &mpic 32 1
+                                0a800 0 0 4 &mpic 2 1
                                /* Bus 1 (Tundra Bridge) */
                                /* IDSEL 0x12 (ISA bridge) */
-                                19000 0 0 1 &mpic 30 1
+                                19000 0 0 1 &mpic 0 1
-                                19000 0 0 2 &mpic 31 1
+                                19000 0 0 2 &mpic 1 1
-                                19000 0 0 3 &mpic 32 1
+                                19000 0 0 3 &mpic 2 1
-                                19000 0 0 4 &mpic 33 1>;
+                                19000 0 0 4 &mpic 3 1>;
                        interrupt-parent = <&mpic>;
-                        interrupts = <08 2>;
+                        interrupts = <18 2>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 80000000 80000000 0 20000000
                                  01000000 0 00000000 e2000000 0 00100000>;
@@ -216,12 +216,12 @@
                        interrupt-map = <
                                /* IDSEL 0x15 */
-                                a800 0 0 1 &mpic 3b 1
+                                a800 0 0 1 &mpic b 1
-                                a800 0 0 2 &mpic 3b 1
+                                a800 0 0 2 &mpic b 1
-                                a800 0 0 3 &mpic 3b 1
+                                a800 0 0 3 &mpic b 1
-                                a800 0 0 4 &mpic 3b 1>;
+                                a800 0 0 4 &mpic b 1>;
                        interrupt-parent = <&mpic>;
-                        interrupts = <09 2>;
+                        interrupts = <19 2>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 a0000000 a0000000 0 20000000
                                  01000000 0 00000000 e3000000 0 00100000>;
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts
index 80682152b0..21ccaaa279 100644
--- a/arch/powerpc/boot/dts/mpc8560ads.dts
+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -52,7 +52,7 @@
                        compatible = "fsl,8540-memory-controller";
                        reg = <2000 1000>;
                        interrupt-parent = <&mpic>;
-                        interrupts = <2 2>;
+                        interrupts = <12 2>;
                };
                l2-cache-controller@20000 {
@@ -61,7 +61,7 @@
                        cache-line-size = <20>; // 32 bytes
                        cache-size = <40000>;   // L2, 256K
                        interrupt-parent = <&mpic>;
-                        interrupts = <0 2>;
+                        interrupts = <10 2>;
                };
                mdio@24520 {
@@ -72,25 +72,25 @@
                        #size-cells = <0>;
                        phy0: ethernet-phy@0 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <35 1>;
+                                interrupts = <5 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
                        phy1: ethernet-phy@1 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <35 1>;
+                                interrupts = <5 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
                        phy2: ethernet-phy@2 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <37 1>;
+                                interrupts = <7 1>;
                                reg = <2>;
                                device_type = "ethernet-phy";
                        };
                        phy3: ethernet-phy@3 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <37 1>;
+                                interrupts = <7 1>;
                                reg = <3>;
                                device_type = "ethernet-phy";
                        };
@@ -101,8 +101,14 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
-                        address = [ 00 00 0C 00 00 FD ];
+                        /*
-                        interrupts = <d 2 e 2 12 2>;
+                         * address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <1d 2 1e 2 22 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy0>;
                };
@@ -114,8 +120,14 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
-                        address = [ 00 00 0C 00 01 FD ];
+                        /*
-                        interrupts = <13 2 14 2 18 2>;
+                         * address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <23 2 24 2 28 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy1>;
                };
@@ -132,79 +144,79 @@
                        interrupt-map = <
                                        /* IDSEL 0x2 */
-                                         1000 0 0 1 &mpic 31 1
+                                         1000 0 0 1 &mpic 1 1
-                                         1000 0 0 2 &mpic 32 1
+                                         1000 0 0 2 &mpic 2 1
-                                         1000 0 0 3 &mpic 33 1
+                                         1000 0 0 3 &mpic 3 1
-                                         1000 0 0 4 &mpic 34 1
+                                         1000 0 0 4 &mpic 4 1
                                        /* IDSEL 0x3 */
-                                         1800 0 0 1 &mpic 34 1
+                                         1800 0 0 1 &mpic 4 1
-                                         1800 0 0 2 &mpic 31 1
+                                         1800 0 0 2 &mpic 1 1
-                                         1800 0 0 3 &mpic 32 1
+                                         1800 0 0 3 &mpic 2 1
-                                         1800 0 0 4 &mpic 33 1
+                                         1800 0 0 4 &mpic 3 1
                                        /* IDSEL 0x4 */
-                                         2000 0 0 1 &mpic 33 1
+                                         2000 0 0 1 &mpic 3 1
-                                         2000 0 0 2 &mpic 34 1
+                                         2000 0 0 2 &mpic 4 1
-                                         2000 0 0 3 &mpic 31 1
+                                         2000 0 0 3 &mpic 1 1
-                                         2000 0 0 4 &mpic 32 1
+                                         2000 0 0 4 &mpic 2 1
                                        /* IDSEL 0x5  */
-                                         2800 0 0 1 &mpic 32 1
+                                         2800 0 0 1 &mpic 2 1
-                                         2800 0 0 2 &mpic 33 1
+                                         2800 0 0 2 &mpic 3 1
-                                         2800 0 0 3 &mpic 34 1
+                                         2800 0 0 3 &mpic 4 1
-                                         2800 0 0 4 &mpic 31 1
+                                         2800 0 0 4 &mpic 1 1
                                        /* IDSEL 12 */
-                                         6000 0 0 1 &mpic 31 1
+                                         6000 0 0 1 &mpic 1 1
-                                         6000 0 0 2 &mpic 32 1
+                                         6000 0 0 2 &mpic 2 1
-                                         6000 0 0 3 &mpic 33 1
+                                         6000 0 0 3 &mpic 3 1
-                                         6000 0 0 4 &mpic 34 1
+                                         6000 0 0 4 &mpic 4 1
                                        /* IDSEL 13 */
-                                         6800 0 0 1 &mpic 34 1
+                                         6800 0 0 1 &mpic 4 1
-                                         6800 0 0 2 &mpic 31 1
+                                         6800 0 0 2 &mpic 1 1
-                                         6800 0 0 3 &mpic 32 1
+                                         6800 0 0 3 &mpic 2 1
-                                         6800 0 0 4 &mpic 33 1
+                                         6800 0 0 4 &mpic 3 1
                                        /* IDSEL 14*/
-                                         7000 0 0 1 &mpic 33 1
+                                         7000 0 0 1 &mpic 3 1
-                                         7000 0 0 2 &mpic 34 1
+                                         7000 0 0 2 &mpic 4 1
-                                         7000 0 0 3 &mpic 31 1
+                                         7000 0 0 3 &mpic 1 1
-                                         7000 0 0 4 &mpic 32 1
+                                         7000 0 0 4 &mpic 2 1
                                        /* IDSEL 15 */
-                                         7800 0 0 1 &mpic 32 1
+                                         7800 0 0 1 &mpic 2 1
-                                         7800 0 0 2 &mpic 33 1
+                                         7800 0 0 2 &mpic 3 1
-                                         7800 0 0 3 &mpic 34 1
+                                         7800 0 0 3 &mpic 4 1
-                                         7800 0 0 4 &mpic 31 1
+                                         7800 0 0 4 &mpic 1 1
                                        /* IDSEL 18 */
-                                         9000 0 0 1 &mpic 31 1
+                                         9000 0 0 1 &mpic 1 1
-                                         9000 0 0 2 &mpic 32 1
+                                         9000 0 0 2 &mpic 2 1
-                                         9000 0 0 3 &mpic 33 1
+                                         9000 0 0 3 &mpic 3 1
-                                         9000 0 0 4 &mpic 34 1
+                                         9000 0 0 4 &mpic 4 1
                                        /* IDSEL 19 */
-                                         9800 0 0 1 &mpic 34 1
+                                         9800 0 0 1 &mpic 4 1
-                                         9800 0 0 2 &mpic 31 1
+                                         9800 0 0 2 &mpic 1 1
-                                         9800 0 0 3 &mpic 32 1
+                                         9800 0 0 3 &mpic 2 1
-                                         9800 0 0 4 &mpic 33 1
+                                         9800 0 0 4 &mpic 3 1
                                        /* IDSEL 20 */
-                                         a000 0 0 1 &mpic 33 1
+                                         a000 0 0 1 &mpic 3 1
-                                         a000 0 0 2 &mpic 34 1
+                                         a000 0 0 2 &mpic 4 1
-                                         a000 0 0 3 &mpic 31 1
+                                         a000 0 0 3 &mpic 1 1
-                                         a000 0 0 4 &mpic 32 1
+                                         a000 0 0 4 &mpic 2 1
                                        /* IDSEL 21 */
-                                         a800 0 0 1 &mpic 32 1
+                                         a800 0 0 1 &mpic 2 1
-                                         a800 0 0 2 &mpic 33 1
+                                         a800 0 0 2 &mpic 3 1
-                                         a800 0 0 3 &mpic 34 1
+                                         a800 0 0 3 &mpic 4 1
-                                         a800 0 0 4 &mpic 31 1>;
+                                         a800 0 0 4 &mpic 1 1>;
                        interrupt-parent = <&mpic>;
-                        interrupts = <8 0>;
+                        interrupts = <18 2>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 80000000 80000000 0 20000000
                                  01000000 0 00000000 e2000000 0 01000000>;
@@ -234,7 +246,7 @@
                                interrupt-controller;
                                #address-cells = <0>;
                                #interrupt-cells = <2>;
-                                interrupts = <1e 0>;
+                                interrupts = <2e 2>;
                                interrupt-parent = <&mpic>;
                                reg = <90c00 80>;
                                built-in;
@@ -275,7 +287,13 @@
                                model = "FCC";
                                device-id = <2>;
                                reg = <91320 20 88500 100 913a0 30>;
-                                mac-address = [ 00 00 0C 00 02 FD ];
+                                /*
+                                 * mac-address is deprecated and will be removed
+                                 * in 2.6.25.  Only recent versions of
+                                 * U-Boot support local-mac-address, however.
+                                 */
+                                mac-address = [ 00 00 00 00 00 00 ];
+                                local-mac-address = [ 00 00 00 00 00 00 ];
                                clock-setup = <ff00ffff 250000>;
                                rx-clock = <15>;
                                tx-clock = <16>;
@@ -290,7 +308,13 @@
                                model = "FCC";
                                device-id = <3>;
                                reg = <91340 20 88600 100 913d0 30>;
-                                mac-address = [ 00 00 0C 00 03 FD ];
+                                /*
+                                 * mac-address is deprecated and will be removed
+                                 * in 2.6.25.  Only recent versions of
+                                 * U-Boot support local-mac-address, however.
+                                 */
+                                mac-address = [ 00 00 00 00 00 00 ];
+                                local-mac-address = [ 00 00 00 00 00 00 ];
                                clock-setup = <ffff00ff 3700>;
                                rx-clock = <17>;
                                tx-clock = <18>;
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index a123ec9456..6bb18f2807 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -61,7 +61,7 @@
                        compatible = "fsl,8568-memory-controller";
                        reg = <2000 1000>;
                        interrupt-parent = <&mpic>;
-                        interrupts = <2 2>;
+                        interrupts = <12 2>;
                };
                l2-cache-controller@20000 {
@@ -70,14 +70,14 @@
                        cache-line-size = <20>; // 32 bytes
                        cache-size = <80000>;   // L2, 512K
                        interrupt-parent = <&mpic>;
-                        interrupts = <0 2>;
+                        interrupts = <10 2>;
                };
                i2c@3000 {
                        device_type = "i2c";
                        compatible = "fsl-i2c";
                        reg = <3000 100>;
-                        interrupts = <1b 2>;
+                        interrupts = <2b 2>;
                        interrupt-parent = <&mpic>;
                        dfsrr;
                };
@@ -86,7 +86,7 @@
                        device_type = "i2c";
                        compatible = "fsl-i2c";
                        reg = <3100 100>;
-                        interrupts = <1b 2>;
+                        interrupts = <2b 2>;
                        interrupt-parent = <&mpic>;
                        dfsrr;
                };
@@ -99,25 +99,25 @@
                        reg = <24520 20>;
                        phy0: ethernet-phy@0 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <31 1>;
+                                interrupts = <1 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
                        phy1: ethernet-phy@1 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <32 1>;
+                                interrupts = <2 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
                        phy2: ethernet-phy@2 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <31 1>;
+                                interrupts = <1 1>;
                                reg = <2>;
                                device_type = "ethernet-phy";
                        };
                        phy3: ethernet-phy@3 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <32 1>;
+                                interrupts = <2 1>;
                                reg = <3>;
                                device_type = "ethernet-phy";
                        };
@@ -130,8 +130,14 @@
                        model = "eTSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
+                        /*
+                         * mac-address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
                        mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <d 2 e 2 12 2>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <1d 2 1e 2 22 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy2>;
                };
@@ -143,8 +149,14 @@
                        model = "eTSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
-                        mac-address = [ 00 00 00 00 00 00];
+                        /*
-                        interrupts = <13 2 14 2 18 2>;
+                         * mac-address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        mac-address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <23 2 24 2 28 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy3>;
                };
@@ -154,7 +166,7 @@
                        compatible = "ns16550";
                        reg = <4500 100>;
                        clock-frequency = <0>;
-                        interrupts = <1a 2>;
+                        interrupts = <2a 2>;
                        interrupt-parent = <&mpic>;
                };
@@ -163,7 +175,7 @@
                        compatible = "ns16550";
                        reg = <4600 100>;
                        clock-frequency = <0>;
-                        interrupts = <1a 2>;
+                        interrupts = <2a 2>;
                        interrupt-parent = <&mpic>;
                };
@@ -172,7 +184,7 @@
                        model = "SEC2";
                        compatible = "talitos";
                        reg = <30000 f000>;
-                        interrupts = <1d 2>;
+                        interrupts = <2d 2>;
                        interrupt-parent = <&mpic>;
                        num-channels = <4>;
                        channel-fifo-len = <18>;
@@ -300,7 +312,13 @@
                        reg = <2000 200>;
                        interrupts = <20>;
                        interrupt-parent = <&qeic>;
-                        mac-address = [ 00 04 9f 00 23 23 ];
+                        /*
+                         * mac-address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        mac-address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
                        rx-clock = <0>;
                        tx-clock = <19>;
                        phy-handle = <&qe_phy0>;
@@ -316,7 +334,13 @@
                        reg = <3000 200>;
                        interrupts = <21>;
                        interrupt-parent = <&qeic>;
-                        mac-address = [ 00 11 22 33 44 55 ];
+                        /*
+                         * mac-address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        mac-address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
                        rx-clock = <0>;
                        tx-clock = <14>;
                        phy-handle = <&qe_phy1>;
@@ -335,25 +359,25 @@
                         * gianfar's MDIO bus */
                        qe_phy0: ethernet-phy@00 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <31 1>;
+                                interrupts = <1 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
                        qe_phy1: ethernet-phy@01 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <32 1>;
+                                interrupts = <2 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
                        qe_phy2: ethernet-phy@02 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <31 1>;
+                                interrupts = <1 1>;
                                reg = <2>;
                                device_type = "ethernet-phy";
                        };
                        qe_phy3: ethernet-phy@03 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <32 1>;
+                                interrupts = <2 1>;
                                reg = <3>;
                                device_type = "ethernet-phy";
                        };
@@ -367,7 +391,7 @@
                        reg = <80 80>;
                        built-in;
                        big-endian;
-                        interrupts = <1e 2 1e 2>; //high:30 low:30
+                        interrupts = <2e 2 2e 2>; //high:30 low:30
                        interrupt-parent = <&mpic>;
                };
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index 260b264c86..db56a02b74 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -56,8 +56,12 @@
                #size-cells = <1>;
                #interrupt-cells = <2>;
                device_type = "soc";
-                ranges = <0 f8000000 00100000>;
+                ranges = <00001000 f8001000 000ff000
-                reg = <f8000000 00100000>;      // CCSRBAR 1M
+                          80000000 80000000 20000000
+                          e2000000 e2000000 00100000
+                          a0000000 a0000000 20000000
+                          e3000000 e3000000 00100000>;
+                reg = <f8000000 00001000>;      // CCSRBAR
                bus-frequency = <0>;
                i2c@3000 {
@@ -86,25 +90,25 @@
                        reg = <24520 20>;
                        phy0: ethernet-phy@0 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <4a 1>;
+                                interrupts = <a 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
                        phy1: ethernet-phy@1 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <4a 1>;
+                                interrupts = <a 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
                        phy2: ethernet-phy@2 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <4a 1>;
+                                interrupts = <a 1>;
                                reg = <2>;
                                device_type = "ethernet-phy";
                        };
                        phy3: ethernet-phy@3 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <4a 1>;
+                                interrupts = <a 1>;
                                reg = <3>;
                                device_type = "ethernet-phy";
                        };
@@ -117,7 +121,13 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
-                        mac-address = [ 00 E0 0C 00 73 00 ];
+                        /*
+                         * mac-address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        mac-address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <1d 2 1e 2 22 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy0>;
@@ -130,7 +140,13 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
-                        mac-address = [ 00 E0 0C 00 73 01 ];
+                        /*
+                         * mac-address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        mac-address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <23 2 24 2 28 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy1>;
@@ -143,7 +159,13 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <26000 1000>;
-                        mac-address = [ 00 E0 0C 00 02 FD ];
+                        /*
+                         * mac-address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        mac-address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <1F 2 20 2 21 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy2>;
@@ -156,7 +178,13 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <27000 1000>;
-                        mac-address = [ 00 E0 0C 00 03 FD ];
+                        /*
+                         * mac-address is deprecated and will be removed
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        mac-address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <25 2 26 2 27 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy3>;
@@ -186,7 +214,7 @@
                        #size-cells = <2>;
                        #address-cells = <3>;
                        reg = <8000 1000>;
-                        bus-range = <0 fe>;
+                        bus-range = <0 ff>;
                        ranges = <02000000 0 80000000 80000000 0 20000000
                                  01000000 0 00000000 e2000000 0 00100000>;
                        clock-frequency = <1fca055>;
@@ -285,17 +313,84 @@
                                f800 0 0 3 &i8259 0 0
                                f800 0 0 4 &i8259 0 0
                                >;
-                        i8259: i8259@4d0 {
+                        uli1575@0 {
-                                clock-frequency = <0>;
+                                reg = <0 0 0 0 0>;
-                                interrupt-controller;
+                                #size-cells = <2>;
-                                device_type = "interrupt-controller";
+                                #address-cells = <3>;
-                                #address-cells = <0>;
+                                ranges = <02000000 0 80000000
-                                #interrupt-cells = <2>;
+                                          02000000 0 80000000
-                                built-in;
+                                          0 20000000
-                                compatible = "chrp,iic";
+                                          01000000 0 00000000
-                                big-endian;
+                                          01000000 0 00000000
-                                interrupts = <49 2>;
+                                          0 00100000>;
-                                interrupt-parent = <&mpic>;
+                                pci_bridge@0 {
+                                        reg = <0 0 0 0 0>;
+                                        #size-cells = <2>;
+                                        #address-cells = <3>;
+                                        ranges = <02000000 0 80000000
+                                                  02000000 0 80000000
+                                                  0 20000000
+                                                  01000000 0 00000000
+                                                  01000000 0 00000000
+                                                  0 00100000>;
+                                        isa@1e {
+                                                device_type = "isa";
+                                                #interrupt-cells = <2>;
+                                                #size-cells = <1>;
+                                                #address-cells = <2>;
+                                                reg = <f000 0 0 0 0>;
+                                                ranges = <1 0 01000000 0 0
+                                                          00001000>;
+                                                interrupt-parent = <&i8259>;
+                                                i8259: interrupt-controller@20 {
+                                                        reg = <1 20 2
+                                                               1 a0 2
+                                                               1 4d0 2>;
+                                                        clock-frequency = <0>;
+                                                        interrupt-controller;
+                                                        device_type = "interrupt-controller";
+                                                        #address-cells = <0>;
+                                                        #interrupt-cells = <2>;
+                                                        built-in;
+                                                        compatible = "chrp,iic";
+                                                        interrupts = <9 2>;
+                                                        interrupt-parent =
+                                                                <&mpic>;
+                                                };
+                                                i8042@60 {
+                                                        #size-cells = <0>;
+                                                        #address-cells = <1>;
+                                                        reg = <1 60 1 1 64 1>;
+                                                        interrupts = <1 3 c 3>;
+                                                        interrupt-parent =
+                                                                <&i8259>;
+                                                        keyboard@0 {
+                                                                reg = <0>;
+                                                                compatible = "pnpPNP,303";
+                                                        };
+                                                        mouse@1 {
+                                                                reg = <1>;
+                                                                compatible = "pnpPNP,f03";
+                                                        };
+                                                };
+                                                rtc@70 {
+                                                        compatible =
+                                                                "pnpPNP,b00";
+                                                        reg = <1 70 2>;
+                                                };
+                                                gpio@400 {
+                                                        reg = <1 400 80>;
+                                                };
+                                        };
+                                };
                        };
                };
@@ -316,10 +411,10 @@
                        interrupt-map-mask = <f800 0 0 7>;
                        interrupt-map = <
                                /* IDSEL 0x0 */
-                                0000 0 0 1 &mpic 44 1
+                                0000 0 0 1 &mpic 4 1
-                                0000 0 0 2 &mpic 45 1
+                                0000 0 0 2 &mpic 5 1
-                                0000 0 0 3 &mpic 46 1
+                                0000 0 0 3 &mpic 6 1
-                                0000 0 0 4 &mpic 47 1
+                                0000 0 0 4 &mpic 7 1
                                >;
                };
diff --git a/arch/powerpc/boot/dts/mpc866ads.dts b/arch/powerpc/boot/dts/mpc866ads.dts
index c0d06fd129..e5e7726ddb 100644
--- a/arch/powerpc/boot/dts/mpc866ads.dts
+++ b/arch/powerpc/boot/dts/mpc866ads.dts
@@ -15,12 +15,10 @@
        compatible = "mpc8xx";
        #address-cells = <1>;
        #size-cells = <1>;
-        linux,phandle = <100>;
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
-                linux,phandle = <200>;
                PowerPC,866@0 {
                        device_type = "cpu";
@@ -34,14 +32,12 @@
                        clock-frequency = <0>;
                        32-bit;
                        interrupts = <f 2>;     // decrementer interrupt
-                        interrupt-parent = <ff000000>;
+                        interrupt-parent = <&Mpc8xx_pic>;
-                        linux,phandle = <201>;
                };
        };
        memory {
                device_type = "memory";
-                linux,phandle = <300>;
                reg = <00000000 800000>;
        };
@@ -57,11 +53,9 @@
                        device_type = "mdio";
                        compatible = "fs_enet";
                        reg = <e80 8>;
-                        linux,phandle = <e80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                        ethernet-phy@f {
+                        phy: ethernet-phy@f {
-                                linux,phandle = <e800f>;
                                reg = <f>;
                                device_type = "ethernet-phy";
                        };
@@ -75,12 +69,11 @@
                        reg = <e00 188>;
                        mac-address = [ 00 00 0C 00 01 FD ];
                        interrupts = <3 1>;
-                        interrupt-parent = <ff000000>;
+                        interrupt-parent = <&Mpc8xx_pic>;
-                        phy-handle = <e800f>;
+                        phy-handle = <&Phy>;
                };
-                pic@ff000000 {
+                mpc8xx_pic: pic@ff000000 {
-                        linux,phandle = <ff000000>;
                        interrupt-controller;
                        #address-cells = <0>;
                        #interrupt-cells = <2>;
@@ -91,7 +84,6 @@
                };
                cpm@ff000000 {
-                        linux,phandle = <ff000000>;
                        #address-cells = <1>;
                        #size-cells = <1>;
                        #interrupt-cells = <2>;
@@ -102,15 +94,14 @@
                        command-proc = <9c0>;
                        brg-frequency = <0>;
                        interrupts = <0 2>;     // cpm error interrupt
-                        interrupt-parent = <930>;
+                        interrupt-parent = <&Cpm_pic>;
-                        pic@930 {
+                        cpm_pic: pic@930 {
-                                linux,phandle = <930>;
                                interrupt-controller;
                                #address-cells = <0>;
                                #interrupt-cells = <2>;
                                interrupts = <5 2 0 2>;
-                                interrupt-parent = <ff000000>;
+                                interrupt-parent = <&Mpc8xx_pic>;
                                reg = <930 20>;
                                built-in;
                                device_type = "cpm-pic";
@@ -128,7 +119,7 @@
                                tx-clock = <1>;
                                current-speed = <0>;
                                interrupts = <4 3>;
-                                interrupt-parent = <930>;
+                                interrupt-parent = <&Cpm_pic>;
                        };
                        smc@a90 {
@@ -142,7 +133,7 @@
                                tx-clock = <2>;
                                current-speed = <0>;
                                interrupts = <3 3>;
-                                interrupt-parent = <930>;
+                                interrupt-parent = <&Cpm_pic>;
                        };
                        scc@a00 {
@@ -153,7 +144,7 @@
                                reg = <a00 18 3c00 80>;
                                mac-address = [ 00 00 0C 00 03 FD ];
                                interrupts = <1e 3>;
-                                interrupt-parent = <930>;
+                                interrupt-parent = <&Cpm_pic>;
                        };
                };
        };
diff --git a/arch/powerpc/boot/dts/mpc885ads.dts b/arch/powerpc/boot/dts/mpc885ads.dts
index 110bf61706..dc7ab9c806 100644
--- a/arch/powerpc/boot/dts/mpc885ads.dts
+++ b/arch/powerpc/boot/dts/mpc885ads.dts
@@ -15,12 +15,10 @@
        compatible = "mpc8xx";
        #address-cells = <1>;
        #size-cells = <1>;
-        linux,phandle = <100>;
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
-                linux,phandle = <200>;
                PowerPC,885@0 {
                        device_type = "cpu";
@@ -34,14 +32,12 @@
                        clock-frequency = <0>;
                        32-bit;
                        interrupts = <f 2>;     // decrementer interrupt
-                        interrupt-parent = <ff000000>;
+                        interrupt-parent = <&Mpc8xx_pic>;
-                        linux,phandle = <201>;
                };
        };
        memory {
                device_type = "memory";
-                linux,phandle = <300>;
                reg = <00000000 800000>;
        };
@@ -57,21 +53,17 @@
                        device_type = "mdio";
                        compatible = "fs_enet";
                        reg = <e80 8>;
-                        linux,phandle = <e80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                        ethernet-phy@0 {
+                        Phy0: ethernet-phy@0 {
-                                linux,phandle = <e8000>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
-                        ethernet-phy@1 {
+                        Phy1: ethernet-phy@1 {
-                                linux,phandle = <e8001>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
-                        ethernet-phy@2 {
+                        Phy2: ethernet-phy@2 {
-                                linux,phandle = <e8002>;
                                reg = <2>;
                                device_type = "ethernet-phy";
                        };
@@ -85,8 +77,8 @@
                        reg = <e00 188>;
                        mac-address = [ 00 00 0C 00 01 FD ];
                        interrupts = <3 1>;
-                        interrupt-parent = <ff000000>;
+                        interrupt-parent = <&Mpc8xx_pic>;
-                        phy-handle = <e8000>;
+                        phy-handle = <&Phy1>;
                };
                fec@1e00 {
@@ -97,12 +89,11 @@
                        reg = <1e00 188>;
                        mac-address = [ 00 00 0C 00 02 FD ];
                        interrupts = <7 1>;
-                        interrupt-parent = <ff000000>;
+                        interrupt-parent = <&Mpc8xx_pic>;
-                        phy-handle = <e8001>;
+                        phy-handle = <&Phy2>;
                };
-                pic@ff000000 {
+                Mpc8xx_pic: pic@ff000000 {
-                        linux,phandle = <ff000000>;
                        interrupt-controller;
                        #address-cells = <0>;
                        #interrupt-cells = <2>;
@@ -112,8 +103,18 @@
                        compatible = "CPM";
                };
+                pcmcia@0080 {
+                        #address-cells = <3>;
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        compatible = "fsl,pq-pcmcia";
+                        device_type = "pcmcia";
+                        reg = <80 80>;
+                        interrupt-parent = <&Mpc8xx_pic>;
+                        interrupts = <d 1>;
+                };
                cpm@ff000000 {
-                        linux,phandle = <ff000000>;
                        #address-cells = <1>;
                        #size-cells = <1>;
                        #interrupt-cells = <2>;
@@ -124,15 +125,14 @@
                        command-proc = <9c0>;
                        brg-frequency = <0>;
                        interrupts = <0 2>;     // cpm error interrupt
-                        interrupt-parent = <930>;
+                        interrupt-parent = <&Cpm_pic>;
-                        pic@930 {
+                        Cpm_pic: pic@930 {
-                                linux,phandle = <930>;
                                interrupt-controller;
                                #address-cells = <0>;
                                #interrupt-cells = <2>;
                                interrupts = <5 2 0 2>;
-                                interrupt-parent = <ff000000>;
+                                interrupt-parent = <&Mpc8xx_pic>;
                                reg = <930 20>;
                                built-in;
                                device_type = "cpm-pic";
@@ -150,7 +150,7 @@
                                tx-clock = <1>;
                                current-speed = <0>;
                                interrupts = <4 3>;
-                                interrupt-parent = <930>;
+                                interrupt-parent = <&Cpm_pic>;
                        };
                        smc@a90 {
@@ -164,7 +164,7 @@
                                tx-clock = <2>;
                                current-speed = <0>;
                                interrupts = <3 3>;
-                                interrupt-parent = <930>;
+                                interrupt-parent = <&Cpm_pic>;
                        };
                        scc@a40 {
@@ -175,8 +175,8 @@
                                reg = <a40 18 3e00 80>;
                                mac-address = [ 00 00 0C 00 03 FD ];
                                interrupts = <1c 3>;
-                                interrupt-parent = <930>;
+                                interrupt-parent = <&Cpm_pic>;
-                                phy-handle = <e8002>;
+                                phy-handle = <&Phy2>;
                        };
                };
        };
diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts
index 568965a022..699d0df574 100644
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -309,7 +309,7 @@
        };
        chosen {
-                bootargs = "ip=on console=ttyMM0";
+                bootargs = "ip=on";
                linux,stdout-path = "/mv64x60@f1000000/mpsc@8000";
        };
 };
diff --git a/arch/powerpc/boot/dts/ps3.dts b/arch/powerpc/boot/dts/ps3.dts
new file mode 100644
index 0000000000..379ded282d
--- /dev/null
+++ b/arch/powerpc/boot/dts/ps3.dts
@@ -0,0 +1,68 @@
+/*
+ *  PS3 Game Console device tree.
+ *
+ *  Copyright (C) 2007 Sony Computer Entertainment Inc.
+ *  Copyright 2007 Sony Corp.
+ *
+ *  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; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+/ {
+        model = "SonyPS3";
+        compatible = "sony,ps3";
+        #size-cells = <2>;
+        #address-cells = <2>;
+        chosen {
+        };
+        /*
+         * We'll get the size of the bootmem block from lv1 after startup,
+         * so we'll put a null entry here.
+         */
+        memory {
+                device_type = "memory";
+                reg = <0 0 0 0>;
+        };
+        /*
+         * The boot cpu is always zero for PS3.
+         *
+         * dtc expects a clock-frequency and timebase-frequency entries, so
+         * we'll put a null entries here.  These will be initialized after
+         * startup with data from lv1.
+         *
+         * Seems the only way currently to indicate a processor has multiple
+         * threads is with an ibm,ppc-interrupt-server#s entry.  We'll put one
+         * here so we can bring up both of ours.  See smp_setup_cpu_maps().
+         */
+        cpus {
+                #size-cells = <0>;
+                #address-cells = <1>;
+                cpu@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        ibm,ppc-interrupt-server#s = <0 1>;
+                        clock-frequency = <0>;
+                        timebase-frequency = <0>;
+                        i-cache-size = <8000>;
+                        d-cache-size = <8000>;
+                        i-cache-line-size = <80>;
+                        d-cache-line-size = <80>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/ebony.c b/arch/powerpc/boot/ebony.c
index b1251ee7a1..75daedafd0 100644
--- a/arch/powerpc/boot/ebony.c
+++ b/arch/powerpc/boot/ebony.c
@@ -100,28 +100,13 @@ static void ebony_fixups(void)
        ibm440gp_fixup_clocks(sysclk, 6 * 1843200);
        ibm44x_fixup_memsize();
        dt_fixup_mac_addresses(ebony_mac0, ebony_mac1);
-}
+        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
-#define SPRN_DBCR0              0x134
-#define   DBCR0_RST_SYSTEM      0x30000000
-static void ebony_exit(void)
-{
-        unsigned long tmp;
-        asm volatile (
-                "mfspr  %0,%1\n"
-                "oris   %0,%0,%2@h\n"
-                "mtspr  %1,%0"
-                : "=&r"(tmp) : "i"(SPRN_DBCR0), "i"(DBCR0_RST_SYSTEM)
-                );
 }
 void ebony_init(void *mac0, void *mac1)
 {
        platform_ops.fixups = ebony_fixups;
-        platform_ops.exit = ebony_exit;
+        platform_ops.exit = ibm44x_dbcr_reset;
        ebony_mac0 = mac0;
        ebony_mac1 = mac1;
        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
diff --git a/arch/powerpc/boot/main.c b/arch/powerpc/boot/main.c
index 56b56a8d4b..416dc3857b 100644
--- a/arch/powerpc/boot/main.c
+++ b/arch/powerpc/boot/main.c
@@ -36,8 +36,6 @@ struct addr_range {
        unsigned long size;
 };
-typedef void (*kernel_entry_t)(unsigned long, unsigned long, void *);
 #undef DEBUG
 static struct addr_range prep_kernel(void)
diff --git a/arch/powerpc/boot/of.c b/arch/powerpc/boot/of.c
index d16ee3e3f8..385e08b83b 100644
--- a/arch/powerpc/boot/of.c
+++ b/arch/powerpc/boot/of.c
@@ -15,8 +15,7 @@
 #include "page.h"
 #include "ops.h"
-typedef void *ihandle;
+#include "of.h"
-typedef void *phandle;
 extern char _end[];
@@ -25,154 +24,10 @@ extern char _end[];
 #define RAM_END         (512<<20)       /* Fixme: use OF */
 #define ONE_MB          0x100000
-int (*prom) (void *);
 static unsigned long claim_base;
-static int call_prom(const char *service, int nargs, int nret, ...)
-{
-        int i;
-        struct prom_args {
-                const char *service;
-                int nargs;
-                int nret;
-                unsigned int args[12];
-        } args;
-        va_list list;
-        args.service = service;
-        args.nargs = nargs;
-        args.nret = nret;
-        va_start(list, nret);
-        for (i = 0; i < nargs; i++)
-                args.args[i] = va_arg(list, unsigned int);
-        va_end(list);
-        for (i = 0; i < nret; i++)
-                args.args[nargs+i] = 0;
-        if (prom(&args) < 0)
-                return -1;
-        return (nret > 0)? args.args[nargs]: 0;
-}
-static int call_prom_ret(const char *service, int nargs, int nret,
-                  unsigned int *rets, ...)
-{
-        int i;
-        struct prom_args {
-                const char *service;
-                int nargs;
-                int nret;
-                unsigned int args[12];
-        } args;
-        va_list list;
-        args.service = service;
-        args.nargs = nargs;
-        args.nret = nret;
-        va_start(list, rets);
-        for (i = 0; i < nargs; i++)
-                args.args[i] = va_arg(list, unsigned int);
-        va_end(list);
-        for (i = 0; i < nret; i++)
-                args.args[nargs+i] = 0;
-        if (prom(&args) < 0)
-                return -1;
-        if (rets != (void *) 0)
-                for (i = 1; i < nret; ++i)
-                        rets[i-1] = args.args[nargs+i];
-        return (nret > 0)? args.args[nargs]: 0;
-}
-/*
- * Older OF's require that when claiming a specific range of addresses,
- * we claim the physical space in the /memory node and the virtual
- * space in the chosen mmu node, and then do a map operation to
- * map virtual to physical.
- */
-static int need_map = -1;
-static ihandle chosen_mmu;
-static phandle memory;
-/* returns true if s2 is a prefix of s1 */
-static int string_match(const char *s1, const char *s2)
-{
-        for (; *s2; ++s2)
-                if (*s1++ != *s2)
-                        return 0;
-        return 1;
-}
-static int check_of_version(void)
-{
-        phandle oprom, chosen;
-        char version[64];
-        oprom = finddevice("/openprom");
-        if (oprom == (phandle) -1)
-                return 0;
-        if (getprop(oprom, "model", version, sizeof(version)) <= 0)
-                return 0;
-        version[sizeof(version)-1] = 0;
-        printf("OF version = '%s'\r\n", version);
-        if (!string_match(version, "Open Firmware, 1.")
-            && !string_match(version, "FirmWorks,3."))
-                return 0;
-        chosen = finddevice("/chosen");
-        if (chosen == (phandle) -1) {
-                chosen = finddevice("/chosen@0");
-                if (chosen == (phandle) -1) {
-                        printf("no chosen\n");
-                        return 0;
-                }
-        }
-        if (getprop(chosen, "mmu", &chosen_mmu, sizeof(chosen_mmu)) <= 0) {
-                printf("no mmu\n");
-                return 0;
-        }
-        memory = (ihandle) call_prom("open", 1, 1, "/memory");
-        if (memory == (ihandle) -1) {
-                memory = (ihandle) call_prom("open", 1, 1, "/memory@0");
-                if (memory == (ihandle) -1) {
-                        printf("no memory node\n");
-                        return 0;
-                }
-        }
-        printf("old OF detected\r\n");
-        return 1;
-}
-static void *claim(unsigned long virt, unsigned long size, unsigned long align)
-{
-        int ret;
-        unsigned int result;
-        if (need_map < 0)
-                need_map = check_of_version();
-        if (align || !need_map)
-                return (void *) call_prom("claim", 3, 1, virt, size, align);
-        ret = call_prom_ret("call-method", 5, 2, &result, "claim", memory,
-                            align, size, virt);
-        if (ret != 0 || result == -1)
-                return (void *) -1;
-        ret = call_prom_ret("call-method", 5, 2, &result, "claim", chosen_mmu,
-                            align, size, virt);
-        /* 0x12 == coherent + read/write */
-        ret = call_prom("call-method", 6, 1, "map", chosen_mmu,
-                        0x12, size, virt, virt);
-        return (void *) virt;
-}
 static void *of_try_claim(unsigned long size)
 {
        unsigned long addr = 0;
@@ -184,7 +39,7 @@ static void *of_try_claim(unsigned long size)
 #ifdef DEBUG
                printf("    trying: 0x%08lx\n\r", claim_base);
 #endif
-                addr = (unsigned long)claim(claim_base, size, 0);
+                addr = (unsigned long)of_claim(claim_base, size, 0);
                if ((void *)addr != (void *)-1)
                        break;
        }
@@ -208,64 +63,6 @@ static void of_image_hdr(const void *hdr)
        }
 }
-static void *of_vmlinux_alloc(unsigned long size)
-{
-        void *p = malloc(size);
-        if (!p)
-                fatal("Can't allocate memory for kernel image!\n\r");
-        return p;
-}
-static void of_exit(void)
-{
-        call_prom("exit", 0, 0);
-}
-/*
- * OF device tree routines
- */
-static void *of_finddevice(const char *name)
-{
-        return (phandle) call_prom("finddevice", 1, 1, name);
-}
-static int of_getprop(const void *phandle, const char *name, void *buf,
-                const int buflen)
-{
-        return call_prom("getprop", 4, 1, phandle, name, buf, buflen);
-}
-static int of_setprop(const void *phandle, const char *name, const void *buf,
-                const int buflen)
-{
-        return call_prom("setprop", 4, 1, phandle, name, buf, buflen);
-}
-/*
- * OF console routines
- */
-static void *of_stdout_handle;
-static int of_console_open(void)
-{
-        void *devp;
-        if (((devp = finddevice("/chosen")) != NULL)
-                        && (getprop(devp, "stdout", &of_stdout_handle,
-                                sizeof(of_stdout_handle))
-                                == sizeof(of_stdout_handle)))
-                return 0;
-        return -1;
-}
-static void of_console_write(char *buf, int len)
-{
-        call_prom("write", 3, 1, of_stdout_handle, buf, len);
-}
 void platform_init(unsigned long a1, unsigned long a2, void *promptr)
 {
        platform_ops.image_hdr = of_image_hdr;
@@ -277,10 +74,9 @@ void platform_init(unsigned long a1, unsigned long a2, void *promptr)
        dt_ops.getprop = of_getprop;
        dt_ops.setprop = of_setprop;
-        console_ops.open = of_console_open;
+        of_console_init();
-        console_ops.write = of_console_write;
-        prom = (int (*)(void *))promptr;
+        of_init(promptr);
        loader_info.promptr = promptr;
        if (a1 && a2 && a2 != 0xdeadbeef) {
                loader_info.initrd_addr = a1;
diff --git a/arch/powerpc/boot/of.h b/arch/powerpc/boot/of.h
new file mode 100644
index 0000000000..e4c68f7391
--- /dev/null
+++ b/arch/powerpc/boot/of.h
@@ -0,0 +1,21 @@
+#ifndef _PPC_BOOT_OF_H_
+#define _PPC_BOOT_OF_H_
+typedef void *phandle;
+typedef void *ihandle;
+void of_init(void *promptr);
+int of_call_prom(const char *service, int nargs, int nret, ...);
+void *of_claim(unsigned long virt, unsigned long size, unsigned long align);
+void *of_vmlinux_alloc(unsigned long size);
+void of_exit(void);
+void *of_finddevice(const char *name);
+int of_getprop(const void *phandle, const char *name, void *buf,
+               const int buflen);
+int of_setprop(const void *phandle, const char *name, const void *buf,
+               const int buflen);
+/* Console functions */
+void of_console_init(void);
+#endif /* _PPC_BOOT_OF_H_ */
diff --git a/arch/powerpc/boot/ofconsole.c b/arch/powerpc/boot/ofconsole.c
new file mode 100644
index 0000000000..ce0e024244
--- /dev/null
+++ b/arch/powerpc/boot/ofconsole.c
@@ -0,0 +1,45 @@
+/*
+ * OF console routines
+ *
+ * Copyright (C) Paul Mackerras 1997.
+ *
+ * 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.
+ */
+#include <stddef.h>
+#include "types.h"
+#include "elf.h"
+#include "string.h"
+#include "stdio.h"
+#include "page.h"
+#include "ops.h"
+#include "of.h"
+static void *of_stdout_handle;
+static int of_console_open(void)
+{
+        void *devp;
+        if (((devp = of_finddevice("/chosen")) != NULL)
+            && (of_getprop(devp, "stdout", &of_stdout_handle,
+                           sizeof(of_stdout_handle))
+                == sizeof(of_stdout_handle)))
+                return 0;
+        return -1;
+}
+static void of_console_write(const char *buf, int len)
+{
+        of_call_prom("write", 3, 1, of_stdout_handle, buf, len);
+}
+void of_console_init(void)
+{
+        console_ops.open = of_console_open;
+        console_ops.write = of_console_write;
+}
diff --git a/arch/powerpc/boot/oflib.c b/arch/powerpc/boot/oflib.c
new file mode 100644
index 0000000000..95b8fd69a4
--- /dev/null
+++ b/arch/powerpc/boot/oflib.c
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) Paul Mackerras 1997.
+ *
+ * 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.
+ */
+#include <stddef.h>
+#include "types.h"
+#include "elf.h"
+#include "string.h"
+#include "stdio.h"
+#include "page.h"
+#include "ops.h"
+#include "of.h"
+static int (*prom) (void *);
+void of_init(void *promptr)
+{
+        prom = (int (*)(void *))promptr;
+}
+int of_call_prom(const char *service, int nargs, int nret, ...)
+{
+        int i;
+        struct prom_args {
+                const char *service;
+                int nargs;
+                int nret;
+                unsigned int args[12];
+        } args;
+        va_list list;
+        args.service = service;
+        args.nargs = nargs;
+        args.nret = nret;
+        va_start(list, nret);
+        for (i = 0; i < nargs; i++)
+                args.args[i] = va_arg(list, unsigned int);
+        va_end(list);
+        for (i = 0; i < nret; i++)
+                args.args[nargs+i] = 0;
+        if (prom(&args) < 0)
+                return -1;
+        return (nret > 0)? args.args[nargs]: 0;
+}
+static int of_call_prom_ret(const char *service, int nargs, int nret,
+                            unsigned int *rets, ...)
+{
+        int i;
+        struct prom_args {
+                const char *service;
+                int nargs;
+                int nret;
+                unsigned int args[12];
+        } args;
+        va_list list;
+        args.service = service;
+        args.nargs = nargs;
+        args.nret = nret;
+        va_start(list, rets);
+        for (i = 0; i < nargs; i++)
+                args.args[i] = va_arg(list, unsigned int);
+        va_end(list);
+        for (i = 0; i < nret; i++)
+                args.args[nargs+i] = 0;
+        if (prom(&args) < 0)
+                return -1;
+        if (rets != (void *) 0)
+                for (i = 1; i < nret; ++i)
+                        rets[i-1] = args.args[nargs+i];
+        return (nret > 0)? args.args[nargs]: 0;
+}
+/* returns true if s2 is a prefix of s1 */
+static int string_match(const char *s1, const char *s2)
+{
+        for (; *s2; ++s2)
+                if (*s1++ != *s2)
+                        return 0;
+        return 1;
+}
+/*
+ * Older OF's require that when claiming a specific range of addresses,
+ * we claim the physical space in the /memory node and the virtual
+ * space in the chosen mmu node, and then do a map operation to
+ * map virtual to physical.
+ */
+static int need_map = -1;
+static ihandle chosen_mmu;
+static phandle memory;
+static int check_of_version(void)
+{
+        phandle oprom, chosen;
+        char version[64];
+        oprom = of_finddevice("/openprom");
+        if (oprom == (phandle) -1)
+                return 0;
+        if (of_getprop(oprom, "model", version, sizeof(version)) <= 0)
+                return 0;
+        version[sizeof(version)-1] = 0;
+        printf("OF version = '%s'\r\n", version);
+        if (!string_match(version, "Open Firmware, 1.")
+            && !string_match(version, "FirmWorks,3."))
+                return 0;
+        chosen = of_finddevice("/chosen");
+        if (chosen == (phandle) -1) {
+                chosen = of_finddevice("/chosen@0");
+                if (chosen == (phandle) -1) {
+                        printf("no chosen\n");
+                        return 0;
+                }
+        }
+        if (of_getprop(chosen, "mmu", &chosen_mmu, sizeof(chosen_mmu)) <= 0) {
+                printf("no mmu\n");
+                return 0;
+        }
+        memory = (ihandle) of_call_prom("open", 1, 1, "/memory");
+        if (memory == (ihandle) -1) {
+                memory = (ihandle) of_call_prom("open", 1, 1, "/memory@0");
+                if (memory == (ihandle) -1) {
+                        printf("no memory node\n");
+                        return 0;
+                }
+        }
+        printf("old OF detected\r\n");
+        return 1;
+}
+void *of_claim(unsigned long virt, unsigned long size, unsigned long align)
+{
+        int ret;
+        unsigned int result;
+        if (need_map < 0)
+                need_map = check_of_version();
+        if (align || !need_map)
+                return (void *) of_call_prom("claim", 3, 1, virt, size, align);
+        ret = of_call_prom_ret("call-method", 5, 2, &result, "claim", memory,
+                               align, size, virt);
+        if (ret != 0 || result == -1)
+                return (void *) -1;
+        ret = of_call_prom_ret("call-method", 5, 2, &result, "claim", chosen_mmu,
+                               align, size, virt);
+        /* 0x12 == coherent + read/write */
+        ret = of_call_prom("call-method", 6, 1, "map", chosen_mmu,
+                           0x12, size, virt, virt);
+        return (void *) virt;
+}
+void *of_vmlinux_alloc(unsigned long size)
+{
+        void *p = malloc(size);
+        if (!p)
+                fatal("Can't allocate memory for kernel image!\n\r");
+        return p;
+}
+void of_exit(void)
+{
+        of_call_prom("exit", 0, 0);
+}
+/*
+ * OF device tree routines
+ */
+void *of_finddevice(const char *name)
+{
+        return (phandle) of_call_prom("finddevice", 1, 1, name);
+}
+int of_getprop(const void *phandle, const char *name, void *buf,
+               const int buflen)
+{
+        return of_call_prom("getprop", 4, 1, phandle, name, buf, buflen);
+}
+int of_setprop(const void *phandle, const char *name, const void *buf,
+               const int buflen)
+{
+        return of_call_prom("setprop", 4, 1, phandle, name, buf, buflen);
+}
diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h
index 959124f3f9..86077066cd 100644
--- a/arch/powerpc/boot/ops.h
+++ b/arch/powerpc/boot/ops.h
@@ -19,6 +19,8 @@
 #define MAX_PATH_LEN            256
 #define MAX_PROP_LEN            256 /* What should this be? */
+typedef void (*kernel_entry_t)(unsigned long r3, unsigned long r4, void *r5);
 /* Platform specific operations */
 struct platform_ops {
        void    (*fixups)(void);
@@ -51,7 +53,7 @@ extern struct dt_ops dt_ops;
 /* Console operations */
 struct console_ops {
        int     (*open)(void);
-        void    (*write)(char *buf, int len);
+        void    (*write)(const char *buf, int len);
        void    (*edit_cmdline)(char *buf, int len);
        void    (*close)(void);
        void    *data;
diff --git a/arch/powerpc/boot/ps3-head.S b/arch/powerpc/boot/ps3-head.S
new file mode 100644
index 0000000000..1a6d64a68d
--- /dev/null
+++ b/arch/powerpc/boot/ps3-head.S
@@ -0,0 +1,80 @@
+/*
+ *  PS3 bootwrapper entry.
+ *
+ *  Copyright (C) 2007 Sony Computer Entertainment Inc.
+ *  Copyright 2007 Sony Corp.
+ *
+ *  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; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include "ppc_asm.h"
+        .text
+/*
+ * __system_reset_overlay - The PS3 first stage entry.
+ *
+ * The bootwraper build script copies the 0x100 bytes at symbol
+ * __system_reset_overlay to offset 0x100 of the rom image.
+ *
+ * The PS3 has a single processor with two threads.
+ */
+        .globl __system_reset_overlay
+__system_reset_overlay:
+        /* Switch to 32-bit mode. */
+        mfmsr   r9
+        clrldi  r9,r9,1
+        mtmsrd  r9
+        nop
+        /* Get thread number in r3 and branch. */
+        mfspr   r3, 0x88
+        cntlzw. r3, r3
+        li      r4, 0
+        li      r5, 0
+        beq     1f
+        /* Secondary goes to __secondary_hold in kernel. */
+        li      r4, 0x60
+        mtctr   r4
+        bctr
+        /* Primary delays then goes to _zimage_start in wrapper. */
+1:
+        or      31, 31, 31 /* db16cyc */
+        or      31, 31, 31 /* db16cyc */
+        lis     r4, _zimage_start@ha
+        addi    r4, r4, _zimage_start@l
+        mtctr   r4
+        bctr
+/*
+ * __system_reset_kernel - Place holder for the kernel reset vector.
+ *
+ * The bootwrapper build script copies 0x100 bytes from offset 0x100
+ * of the rom image to the symbol __system_reset_kernel.  At runtime
+ * the bootwrapper program copies the 0x100 bytes at __system_reset_kernel
+ * to ram address 0x100.  This symbol must occupy 0x100 bytes.
+ */
+        .globl __system_reset_kernel
+__system_reset_kernel:
+        . = __system_reset_kernel + 0x100
diff --git a/arch/powerpc/boot/ps3-hvcall.S b/arch/powerpc/boot/ps3-hvcall.S
new file mode 100644
index 0000000000..c8b7df3210
--- /dev/null
+++ b/arch/powerpc/boot/ps3-hvcall.S
@@ -0,0 +1,184 @@
+/*
+ *  PS3 bootwrapper hvcalls.
+ *
+ *  Copyright (C) 2007 Sony Computer Entertainment Inc.
+ *  Copyright 2007 Sony Corp.
+ *
+ *  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; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include "ppc_asm.h"
+/*
+ * The PS3 hypervisor uses a 64 bit "C" language calling convention.
+ * The routines here marshal arguments between the 32 bit wrapper
+ * program and the 64 bit hvcalls.
+ *
+ *  wrapper           lv1
+ *  32-bit (h,l)      64-bit
+ *
+ *  1: r3,r4          <-> r3
+ *  2: r5,r6          <-> r4
+ *  3: r7,r8          <-> r5
+ *  4: r9,r10         <-> r6
+ *  5: 8(r1),12(r1)   <-> r7
+ *  6: 16(r1),20(r1)  <-> r8
+ *  7: 24(r1),28(r1)  <-> r9
+ *  8: 32(r1),36(r1)  <-> r10
+ *
+ */
+.macro GLOBAL name
+        .section ".text"
+        .balign 4
+        .globl \name
+\name:
+.endm
+.macro NO_SUPPORT name
+        GLOBAL \name
+        b ps3_no_support
+.endm
+.macro HVCALL num
+        li r11, \num
+        .long 0x44000022
+        extsw r3, r3
+.endm
+.macro SAVE_LR offset=4
+        mflr r0
+        stw r0, \offset(r1)
+.endm
+.macro LOAD_LR offset=4
+        lwz r0, \offset(r1)
+        mtlr r0
+.endm
+.macro LOAD_64_REG target,high,low
+        sldi r11, \high, 32
+        or \target, r11, \low
+.endm
+.macro LOAD_64_STACK target,offset
+        ld \target, \offset(r1)
+.endm
+.macro LOAD_R3
+        LOAD_64_REG r3,r3,r4
+.endm
+.macro LOAD_R4
+        LOAD_64_REG r4,r5,r6
+.endm
+.macro LOAD_R5
+        LOAD_64_REG r5,r7,r8
+.endm
+.macro LOAD_R6
+        LOAD_64_REG r6,r9,r10
+.endm
+.macro LOAD_R7
+        LOAD_64_STACK r7,8
+.endm
+.macro LOAD_R8
+        LOAD_64_STACK r8,16
+.endm
+.macro LOAD_R9
+        LOAD_64_STACK r9,24
+.endm
+.macro LOAD_R10
+        LOAD_64_STACK r10,32
+.endm
+.macro LOAD_REGS_0
+        stwu 1,-16(1)
+        stw 3, 8(1)
+.endm
+.macro LOAD_REGS_5
+        LOAD_R3
+        LOAD_R4
+        LOAD_R5
+        LOAD_R6
+        LOAD_R7
+.endm
+.macro LOAD_REGS_6
+        LOAD_REGS_5
+        LOAD_R8
+.endm
+.macro LOAD_REGS_8
+        LOAD_REGS_6
+        LOAD_R9
+        LOAD_R10
+.endm
+.macro STORE_REGS_0_1
+        lwz r11, 8(r1)
+        std r4, 0(r11)
+        mr r4, r3
+        li r3, 0
+        addi r1,r1,16
+.endm
+.macro STORE_REGS_5_2
+        lwz r11, 16(r1)
+        std r4, 0(r11)
+        lwz r11, 24(r1)
+        std r5, 0(r11)
+.endm
+.macro STORE_REGS_6_1
+        lwz r11, 24(r1)
+        std r4, 0(r11)
+.endm
+GLOBAL lv1_get_logical_ppe_id
+        SAVE_LR
+        LOAD_REGS_0
+        HVCALL 69
+        STORE_REGS_0_1
+        LOAD_LR
+        blr
+GLOBAL lv1_get_logical_partition_id
+        SAVE_LR
+        LOAD_REGS_0
+        HVCALL 74
+        STORE_REGS_0_1
+        LOAD_LR
+        blr
+GLOBAL lv1_get_repository_node_value
+        SAVE_LR
+        LOAD_REGS_5
+        HVCALL 91
+        STORE_REGS_5_2
+        LOAD_LR
+        blr
+GLOBAL lv1_panic
+        SAVE_LR
+        LOAD_REGS_8
+        HVCALL 255
+        LOAD_LR
+        blr
diff --git a/arch/powerpc/boot/ps3.c b/arch/powerpc/boot/ps3.c
new file mode 100644
index 0000000000..893d59339c
--- /dev/null
+++ b/arch/powerpc/boot/ps3.c
@@ -0,0 +1,161 @@
+/*
+ *  PS3 bootwrapper support.
+ *
+ *  Copyright (C) 2007 Sony Computer Entertainment Inc.
+ *  Copyright 2007 Sony Corp.
+ *
+ *  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; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <stdarg.h>
+#include <stddef.h>
+#include "types.h"
+#include "elf.h"
+#include "string.h"
+#include "stdio.h"
+#include "page.h"
+#include "ops.h"
+extern s64 lv1_panic(u64 in_1);
+extern s64 lv1_get_logical_partition_id(u64 *out_1);
+extern s64 lv1_get_logical_ppe_id(u64 *out_1);
+extern s64 lv1_get_repository_node_value(u64 in_1, u64 in_2, u64 in_3,
+        u64 in_4, u64 in_5, u64 *out_1, u64 *out_2);
+#ifdef DEBUG
+#define DBG(fmt...) printf(fmt)
+#else
+static inline int __attribute__ ((format (printf, 1, 2))) DBG(
+        const char *fmt, ...) {return 0;}
+#endif
+BSS_STACK(4096);
+/* A buffer that may be edited by tools operating on a zImage binary so as to
+ * edit the command line passed to vmlinux (by setting /chosen/bootargs).
+ * The buffer is put in it's own section so that tools may locate it easier.
+ */
+static char cmdline[COMMAND_LINE_SIZE]
+        __attribute__((__section__("__builtin_cmdline")));
+static void prep_cmdline(void *chosen)
+{
+        if (cmdline[0] == '\0')
+                getprop(chosen, "bootargs", cmdline, COMMAND_LINE_SIZE-1);
+        else
+                setprop_str(chosen, "bootargs", cmdline);
+        printf("cmdline: '%s'\n", cmdline);
+}
+static void ps3_console_write(const char *buf, int len)
+{
+}
+static void ps3_exit(void)
+{
+        printf("ps3_exit\n");
+        /* lv1_panic will shutdown the lpar. */
+        lv1_panic(0); /* zero = do not reboot */
+        while (1);
+}
+static int ps3_repository_read_rm_size(u64 *rm_size)
+{
+        s64 result;
+        u64 lpar_id;
+        u64 ppe_id;
+        u64 v2;
+        result = lv1_get_logical_partition_id(&lpar_id);
+        if (result)
+                return -1;
+        result = lv1_get_logical_ppe_id(&ppe_id);
+        if (result)
+                return -1;
+        /*
+         * n1: 0000000062690000 : ....bi..
+         * n2: 7075000000000000 : pu......
+         * n3: 0000000000000001 : ........
+         * n4: 726d5f73697a6500 : rm_size.
+        */
+        result = lv1_get_repository_node_value(lpar_id, 0x0000000062690000ULL,
+                0x7075000000000000ULL, ppe_id, 0x726d5f73697a6500ULL, rm_size,
+                &v2);
+        printf("%s:%d: ppe_id  %lu \n", __func__, __LINE__,
+                (unsigned long)ppe_id);
+        printf("%s:%d: lpar_id %lu \n", __func__, __LINE__,
+                (unsigned long)lpar_id);
+        printf("%s:%d: rm_size %llxh \n", __func__, __LINE__, *rm_size);
+        return result ? -1 : 0;
+}
+void ps3_copy_vectors(void)
+{
+        extern char __system_reset_kernel[];
+        memcpy((void *)0x100, __system_reset_kernel, 0x100);
+        flush_cache((void *)0x100, 0x100);
+}
+void platform_init(void)
+{
+        extern char _end[];
+        extern char _dtb_start[];
+        extern char _initrd_start[];
+        extern char _initrd_end[];
+        const u32 heapsize = 0x1000000 - (u32)_end; /* 16MiB */
+        void *chosen;
+        unsigned long ft_addr;
+        u64 rm_size;
+        console_ops.write = ps3_console_write;
+        platform_ops.exit = ps3_exit;
+        printf("\n-- PS3 bootwrapper --\n");
+        simple_alloc_init(_end, heapsize, 32, 64);
+        ft_init(_dtb_start, 0, 4);
+        chosen = finddevice("/chosen");
+        ps3_repository_read_rm_size(&rm_size);
+        dt_fixup_memory(0, rm_size);
+        if (_initrd_end > _initrd_start) {
+                setprop_val(chosen, "linux,initrd-start", (u32)(_initrd_start));
+                setprop_val(chosen, "linux,initrd-end", (u32)(_initrd_end));
+        }
+        prep_cmdline(chosen);
+        ft_addr = dt_ops.finalize();
+        ps3_copy_vectors();
+        printf(" flat tree at 0x%lx\n\r", ft_addr);
+        ((kernel_entry_t)0)(ft_addr, 0, NULL);
+        ps3_exit();
+}
diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index 7fd32330a9..eaa0d3ae35 100644
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
@@ -27,7 +27,7 @@ static int serial_open(void)
        return scdp->open();
 }
-static void serial_write(char *buf, int len)
+static void serial_write(const char *buf, int len)
 {
        struct serial_console_data *scdp = console_ops.data;
diff --git a/arch/powerpc/boot/stdio.c b/arch/powerpc/boot/stdio.c
index 0a9feeb983..5b57800bbc 100644
--- a/arch/powerpc/boot/stdio.c
+++ b/arch/powerpc/boot/stdio.c
@@ -190,7 +190,11 @@ int vsprintf(char *buf, const char *fmt, va_list args)
                /* get the conversion qualifier */
                qualifier = -1;
-                if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt =='Z') {
+                if (*fmt == 'l' && *(fmt + 1) == 'l') {
+                        qualifier = 'q';
+                        fmt += 2;
+                } else if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L'
+                        || *fmt == 'Z') {
                        qualifier = *fmt;
                        ++fmt;
                }
@@ -281,6 +285,10 @@ int vsprintf(char *buf, const char *fmt, va_list args)
                        num = va_arg(args, unsigned long);
                        if (flags & SIGN)
                                num = (signed long) num;
+                } else if (qualifier == 'q') {
+                        num = va_arg(args, unsigned long long);
+                        if (flags & SIGN)
+                                num = (signed long long) num;
                } else if (qualifier == 'Z') {
                        num = va_arg(args, size_t);
                } else if (qualifier == 'h') {
diff --git a/arch/powerpc/boot/types.h b/arch/powerpc/boot/types.h
index 79d26e7086..31393d17a9 100644
--- a/arch/powerpc/boot/types.h
+++ b/arch/powerpc/boot/types.h
@@ -7,6 +7,10 @@ typedef unsigned char		u8;
 typedef unsigned short          u16;
 typedef unsigned int            u32;
 typedef unsigned long long      u64;
+typedef signed char             s8;
+typedef short                   s16;
+typedef int                     s32;
+typedef long long               s64;
 #define min(x,y) ({ \
        typeof(x) _x = (x);     \
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index da77adc730..65f6854791 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -144,6 +144,15 @@ miboot|uboot)
 cuboot*)
    gzip=
    ;;
+ps3)
+    platformo="$object/ps3-head.o $object/ps3-hvcall.o $object/ps3.o"
+    lds=$object/zImage.ps3.lds
+    gzip=
+    ext=bin
+    objflags="-O binary --set-section-flags=.bss=contents,alloc,load,data"
+    ksection=.kernel:vmlinux.bin
+    isection=.kernel:initrd
+    ;;
 esac
 vmz="$tmpdir/`basename \"$kernel\"`.$ext"
@@ -239,4 +248,50 @@ treeboot*)
    fi
    exit 0
    ;;
+ps3)
+    # The ps3's loader supports loading gzipped binary images from flash
+    # rom to addr zero. The loader enters the image at addr 0x100.  A
+    # bootwrapper overlay is use to arrange for the kernel to be loaded
+    # to addr zero and to have a suitable bootwrapper entry at 0x100.
+    # To construct the rom image, 0x100 bytes from offset 0x100 in the
+    # kernel is copied to the bootwrapper symbol __system_reset_kernel.
+    # The 0x100 bytes at the bootwrapper symbol __system_reset_overlay is
+    # then copied to offset 0x100.  At runtime the bootwrapper program
+    # copies the 0x100 bytes at __system_reset_kernel to addr 0x100.
+    system_reset_overlay=0x`${CROSS}nm "$ofile" \
+        | grep ' __system_reset_overlay$'       \
+        | cut -d' ' -f1`
+    system_reset_overlay=`printf "%d" $system_reset_overlay`
+    system_reset_kernel=0x`${CROSS}nm "$ofile" \
+        | grep ' __system_reset_kernel$'       \
+        | cut -d' ' -f1`
+    system_reset_kernel=`printf "%d" $system_reset_kernel`
+    overlay_dest="256"
+    overlay_size="256"
+    rm -f "$object/otheros.bld"
+    ${CROSS}objcopy -O binary "$ofile" "$ofile.bin"
+    msg=$(dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \
+        skip=$overlay_dest seek=$system_reset_kernel      \
+        count=$overlay_size bs=1 2>&1)
+    if [ $? -ne "0" ]; then
+       echo $msg
+       exit 1
+    fi
+    msg=$(dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \
+        skip=$system_reset_overlay seek=$overlay_dest     \
+        count=$overlay_size bs=1 2>&1)
+    if [ $? -ne "0" ]; then
+       echo $msg
+       exit 2
+    fi
+    gzip --force -9 --stdout "$ofile.bin" > "$object/otheros.bld"
+    ;;
 esac
diff --git a/arch/powerpc/boot/zImage.ps3.lds.S b/arch/powerpc/boot/zImage.ps3.lds.S
new file mode 100644
index 0000000000..aaa469c1e6
--- /dev/null
+++ b/arch/powerpc/boot/zImage.ps3.lds.S
@@ -0,0 +1,50 @@
+OUTPUT_ARCH(powerpc:common)
+ENTRY(_zimage_start)
+EXTERN(_zimage_start)
+SECTIONS
+{
+  _vmlinux_start =  .;
+  .kernel:vmlinux.bin : { *(.kernel:vmlinux.bin) }
+  _vmlinux_end =  .;
+  . = ALIGN(4096);
+  _dtb_start = .;
+  .kernel:dtb : { *(.kernel:dtb) }
+  _dtb_end = .;
+  . = ALIGN(4096);
+  _initrd_start =  .;
+  .kernel:initrd : { *(.kernel:initrd) }
+  _initrd_end =  .;
+  _start = .;
+  .text      :
+  {
+    *(.text)
+    *(.fixup)
+  }
+  _etext = .;
+  . = ALIGN(4096);
+  .data    :
+  {
+    *(.rodata*)
+    *(.data*)
+    *(.sdata*)
+    __got2_start = .;
+    *(.got2)
+    __got2_end = .;
+  }
+  . = ALIGN(4096);
+  _edata  =  .;
+  . = ALIGN(4096);
+  __bss_start = .;
+  .bss       :
+  {
+   *(.sbss)
+   *(.bss)
+  }
+  . = ALIGN(4096);
+  _end = . ;
+}
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig
index 02c428affc..74f83f4a4e 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc6
+# Linux kernel version: 2.6.22-rc6
-# Mon Apr 23 20:46:48 2007
+# Tue Jun 26 12:32:34 2007
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -41,6 +41,7 @@ CONFIG_PPC_DCR=y
 CONFIG_PPC_OF_PLATFORM_PCI=y
 CONFIG_ALTIVEC=y
 CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_MM_SLICES=y
 CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=4
@@ -69,6 +70,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
@@ -87,14 +89,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -163,9 +170,14 @@ CONFIG_SPU_FS=m
 CONFIG_SPU_BASE=y
 CONFIG_CBE_RAS=y
 CONFIG_CBE_THERM=m
+CONFIG_CBE_CPUFREQ=m
+# CONFIG_PQ2ADS is not set
 CONFIG_PPC_NATIVE=y
 CONFIG_UDBG_RTAS_CONSOLE=y
 CONFIG_PPC_UDBG_BEAT=y
+CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
 # CONFIG_U3_DART is not set
 CONFIG_PPC_RTAS=y
 # CONFIG_RTAS_ERROR_LOGGING is not set
@@ -177,9 +189,23 @@ CONFIG_MMIO_NVRAM=y
 # CONFIG_PPC_970_NAP is not set
 CONFIG_PPC_INDIRECT_IO=y
 CONFIG_GENERIC_IOMAP=y
-# CONFIG_CPU_FREQ_PMAC64 is not set
+CONFIG_CPU_FREQ=y
-# CONFIG_WANT_EARLY_SERIAL is not set
+CONFIG_CPU_FREQ_TABLE=y
-CONFIG_MPIC=y
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+#
+# CPU Frequency drivers
+#
+# CONFIG_CPM2 is not set
 #
 # Kernel options
@@ -224,12 +250,14 @@ CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_ARCH_MEMORY_PROBE=y
 CONFIG_NODES_SPAN_OTHER_NODES=y
+CONFIG_PPC_HAS_HASH_64K=y
 CONFIG_PPC_64K_PAGES=y
 CONFIG_SCHED_SMT=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
+# CONFIG_WANT_DEVICE_TREE is not set
 CONFIG_ISA_DMA_API=y
 #
@@ -237,22 +265,18 @@ CONFIG_ISA_DMA_API=y
 #
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_PPC_I8259 is not set
 # CONFIG_PPC_INDIRECT_PCI is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEPORTBUS=y
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 # CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 CONFIG_KERNEL_START=0xc000000000000000
@@ -264,7 +288,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -300,14 +323,11 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-#
-# IP: Virtual Server Configuration
-#
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
@@ -332,6 +352,7 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 # CONFIG_NF_CONNTRACK_ENABLED is not set
+# CONFIG_NF_CONNTRACK is not set
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
@@ -389,20 +410,8 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 # CONFIG_IP6_NF_QUEUE is not set
 # CONFIG_IP6_NF_IPTABLES is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -429,7 +438,16 @@ CONFIG_NET_CLS_ROUTE=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -449,10 +467,6 @@ CONFIG_FW_LOADER=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -489,12 +503,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
@@ -509,6 +521,7 @@ CONFIG_IDEDISK_MULTI_MODE=y
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 #
 # IDE chipset support/bugfixes
@@ -516,6 +529,7 @@ CONFIG_IDEDISK_MULTI_MODE=y
 CONFIG_IDE_GENERIC=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=y
 # CONFIG_BLK_DEV_OPTI621 is not set
@@ -580,6 +594,7 @@ CONFIG_CHR_DEV_SG=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -626,10 +641,6 @@ CONFIG_SCSI_SAS_ATTRS=y
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_SATA_AHCI is not set
@@ -652,6 +663,7 @@ CONFIG_SATA_PROMISE=y
 # CONFIG_PATA_AMD is not set
 # CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CS5520 is not set
 # CONFIG_PATA_CS5530 is not set
@@ -705,6 +717,7 @@ CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 # CONFIG_DM_MULTIPATH_EMC is not set
+# CONFIG_DM_DELAY is not set
 #
 # Fusion MPT device support
@@ -719,18 +732,14 @@ CONFIG_FUSION_MAX_SGE=128
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -740,15 +749,7 @@ CONFIG_NETDEVICES=y
 CONFIG_BONDING=m
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=y
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 #
@@ -767,10 +768,7 @@ CONFIG_MII=y
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=m
@@ -784,15 +782,13 @@ CONFIG_E1000_NAPI=y
 CONFIG_SKGE=m
 CONFIG_SKY2=m
 # CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
 CONFIG_TIGON3=y
 # CONFIG_BNX2 is not set
 CONFIG_SPIDER_NET=y
 # CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
-#
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
@@ -800,20 +796,24 @@ CONFIG_SPIDER_NET=y
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
 # CONFIG_PASEMI_MAC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-# CONFIG_NET_RADIO is not set
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 #
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -840,6 +840,7 @@ CONFIG_SPIDER_NET=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -859,6 +860,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -933,10 +935,6 @@ CONFIG_IPMI_DEVICE_INTERFACE=m
 CONFIG_IPMI_SI=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
-#
-# Watchdog Cards
-#
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -959,7 +957,6 @@ CONFIG_WATCHDOG=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -971,11 +968,9 @@ CONFIG_GEN_RTC=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 # CONFIG_I2C_CHARDEV is not set
 #
@@ -999,17 +994,17 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PASEMI is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_PCA_ISA is not set
 #
 # Miscellaneous I2C Chip support
@@ -1036,12 +1031,7 @@ CONFIG_I2C_ALGOBIT=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 # CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multifunction device drivers
@@ -1052,17 +1042,19 @@ CONFIG_I2C_ALGOBIT=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_USB_DABUSB is not set
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
@@ -1084,6 +1076,17 @@ CONFIG_HID=m
 # CONFIG_HID_DEBUG is not set
 #
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -1096,6 +1099,7 @@ CONFIG_USB=m
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_OTG is not set
@@ -1147,44 +1151,10 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_LIBUSUAL is not set
 #
-# USB Input Devices
-#
-# CONFIG_USB_HID is not set
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-# CONFIG_USB_GTCO is not set
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 #
@@ -1228,10 +1198,6 @@ CONFIG_USB_MON=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -1253,10 +1219,12 @@ CONFIG_USB_MON=y
 CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
 # CONFIG_INFINIBAND_AMSO1100 is not set
+# CONFIG_MLX4_INFINIBAND is not set
 CONFIG_INFINIBAND_IPOIB=m
 # CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
@@ -1287,14 +1255,6 @@ CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
 #
 #
-# Auxiliary Display support
-#
-#
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1389,6 +1349,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1418,6 +1379,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -1468,7 +1430,6 @@ CONFIG_NLS_ISO8859_15=m
 #
 # CONFIG_DLM is not set
 # CONFIG_UCC_SLOW is not set
-# CONFIG_UCC_FAST is not set
 #
 # Library routines
@@ -1476,6 +1437,7 @@ CONFIG_NLS_ISO8859_15=m
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=m
@@ -1487,6 +1449,7 @@ CONFIG_TEXTSEARCH_FSM=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -1506,7 +1469,6 @@ CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
-CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_DETECT_SOFTLOCKUP is not set
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
@@ -1565,6 +1527,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/arch/powerpc/configs/celleb_defconfig b/arch/powerpc/configs/celleb_defconfig
index 91b657b339..0dc9874b46 100644
--- a/arch/powerpc/configs/celleb_defconfig
+++ b/arch/powerpc/configs/celleb_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21
+# Linux kernel version: 2.6.22-rc6
-# Tue May  8 12:32:16 2007
+# Tue Jun 26 12:33:17 2007
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -40,6 +40,7 @@ CONFIG_PPC_FPU=y
 CONFIG_PPC_OF_PLATFORM_PCI=y
 CONFIG_ALTIVEC=y
 CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_MM_SLICES=y
 CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=4
@@ -68,6 +69,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_CPUSETS is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
@@ -86,14 +88,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -148,6 +155,7 @@ CONFIG_PPC_CELL=y
 # Cell Broadband Engine options
 #
 CONFIG_SPU_FS=y
+CONFIG_SPU_FS_64K_LS=y
 CONFIG_SPU_BASE=y
 # CONFIG_PQ2ADS is not set
 CONFIG_PPC_UDBG_BEAT=y
@@ -206,6 +214,7 @@ CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_ARCH_MEMORY_PROBE=y
 CONFIG_NODES_SPAN_OTHER_NODES=y
+CONFIG_PPC_HAS_HASH_64K=y
 # CONFIG_PPC_64K_PAGES is not set
 # CONFIG_SCHED_SMT is not set
 CONFIG_PROC_DEVICETREE=y
@@ -224,16 +233,14 @@ CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 # CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 CONFIG_KERNEL_START=0xc000000000000000
@@ -277,10 +284,6 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-#
-# IP: Virtual Server Configuration
-#
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
@@ -323,20 +326,8 @@ CONFIG_IP_NF_QUEUE=m
 #
 # CONFIG_IP6_NF_QUEUE is not set
 # CONFIG_IP6_NF_IPTABLES is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -369,7 +360,9 @@ CONFIG_IP_NF_QUEUE=m
 #
 # CONFIG_CFG80211 is not set
 # CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -425,12 +418,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
@@ -445,6 +436,7 @@ CONFIG_BLK_DEV_IDECD=m
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 #
 # IDE chipset support/bugfixes
@@ -452,6 +444,7 @@ CONFIG_BLK_DEV_IDECD=m
 CONFIG_IDE_GENERIC=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=y
 # CONFIG_BLK_DEV_OPTI621 is not set
@@ -516,6 +509,7 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -560,12 +554,7 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_ESP_CORE is not set
 # CONFIG_SCSI_SRP is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -588,6 +577,7 @@ CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 # CONFIG_DM_MULTIPATH_EMC is not set
+# CONFIG_DM_DELAY is not set
 #
 # Fusion MPT device support
@@ -600,6 +590,7 @@ CONFIG_DM_MULTIPATH=m
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
@@ -616,15 +607,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 #
@@ -643,10 +626,7 @@ CONFIG_MII=y
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -658,15 +638,13 @@ CONFIG_MII=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 CONFIG_SPIDER_NET=y
 # CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
-#
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
@@ -674,10 +652,7 @@ CONFIG_SPIDER_NET=y
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
 # CONFIG_PASEMI_MAC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
@@ -687,8 +662,14 @@ CONFIG_SPIDER_NET=y
 # CONFIG_WLAN_80211 is not set
 #
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -715,6 +696,7 @@ CONFIG_SPIDER_NET=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -734,6 +716,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -797,10 +780,6 @@ CONFIG_HVC_BEAT=y
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -822,7 +801,6 @@ CONFIG_WATCHDOG=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -834,11 +812,9 @@ CONFIG_GEN_RTC=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 # CONFIG_I2C_CHARDEV is not set
 #
@@ -864,14 +840,15 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_PCA_ISA is not set
 #
 # Miscellaneous I2C Chip support
@@ -898,12 +875,7 @@ CONFIG_I2C_ALGOBIT=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 # CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multifunction device drivers
@@ -914,17 +886,19 @@ CONFIG_I2C_ALGOBIT=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_USB_DABUSB is not set
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
@@ -1015,37 +989,10 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_LIBUSUAL is not set
 #
-# USB Input Devices
-#
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-# CONFIG_USB_GTCO is not set
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 #
@@ -1089,10 +1036,6 @@ CONFIG_USB_MON=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -1136,14 +1079,6 @@ CONFIG_USB_MON=y
 #
 #
-# Auxiliary Display support
-#
-#
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1246,6 +1181,7 @@ CONFIG_EXPORTFS=m
 CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1275,6 +1211,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -1325,7 +1262,6 @@ CONFIG_NLS_ISO8859_15=m
 #
 # CONFIG_DLM is not set
 # CONFIG_UCC_SLOW is not set
-# CONFIG_UCC_FAST is not set
 #
 # Library routines
@@ -1333,6 +1269,7 @@ CONFIG_NLS_ISO8859_15=m
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=m
@@ -1340,6 +1277,7 @@ CONFIG_ZLIB_DEFLATE=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -1358,7 +1296,6 @@ CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
-CONFIG_LOG_BUF_SHIFT=15
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
@@ -1395,6 +1332,7 @@ CONFIG_PPC_EARLY_DEBUG=y
 # CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
 # CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
 CONFIG_PPC_EARLY_DEBUG_BEAT=y
+# CONFIG_PPC_EARLY_DEBUG_44x is not set
 #
 # Security options
@@ -1425,6 +1363,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_FCRYPT is not set
 CONFIG_CRYPTO_BLOWFISH=m
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
index 029c9a0e73..7a747c4385 100644
--- a/arch/powerpc/configs/chrp32_defconfig
+++ b/arch/powerpc/configs/chrp32_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-rc5
+# Linux kernel version: 2.6.22-rc6
-# Mon Jan 22 22:12:58 2007
+# Tue Jun 26 12:36:45 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -34,9 +34,9 @@ CONFIG_CLASSIC32=y
 # CONFIG_PPC_83xx is not set
 # CONFIG_PPC_85xx is not set
 # CONFIG_PPC_86xx is not set
+# CONFIG_PPC_8xx is not set
 # CONFIG_40x is not set
 # CONFIG_44x is not set
-# CONFIG_8xx is not set
 # CONFIG_E200 is not set
 CONFIG_6xx=y
 CONFIG_PPC_FPU=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
 # CONFIG_ALTIVEC is not set
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
 CONFIG_SMP=y
 CONFIG_NR_CPUS=4
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -64,6 +65,7 @@ CONFIG_LOCALVERSION=""
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
@@ -71,9 +73,11 @@ CONFIG_POSIX_MQUEUE=y
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_CPUSETS is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -88,14 +92,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -137,13 +146,18 @@ CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_APUS is not set
 CONFIG_PPC_CHRP=y
 # CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_EFIKA is not set
 # CONFIG_PPC_LITE5200 is not set
 # CONFIG_PPC_PMAC is not set
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
 CONFIG_PPC_NATIVE=y
 # CONFIG_UDBG_RTAS_CONSOLE is not set
+CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+CONFIG_PPC_I8259=y
 CONFIG_PPC_RTAS=y
 # CONFIG_RTAS_ERROR_LOGGING is not set
 CONFIG_RTAS_PROC=y
@@ -154,8 +168,7 @@ CONFIG_PPC_MPC106=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_TAU is not set
-# CONFIG_WANT_EARLY_SERIAL is not set
+# CONFIG_CPM2 is not set
-CONFIG_MPIC=y
 #
 # Kernel options
@@ -186,33 +199,33 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
+# CONFIG_WANT_DEVICE_TREE is not set
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
 CONFIG_ISA=y
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-CONFIG_PPC_I8259=y
 CONFIG_PPC_INDIRECT_PCI=y
+# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 # CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
@@ -237,7 +250,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -266,10 +278,6 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-#
-# IP: Virtual Server Configuration
-#
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
@@ -283,8 +291,6 @@ CONFIG_NETFILTER=y
 #
 # CONFIG_NETFILTER_NETLINK is not set
 CONFIG_NF_CONNTRACK_ENABLED=m
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
 CONFIG_NF_CONNTRACK=m
 # CONFIG_NF_CT_ACCT is not set
 # CONFIG_NF_CONNTRACK_MARK is not set
@@ -296,9 +302,37 @@ CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_IRC=m
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 # CONFIG_NF_CONNTRACK_PPTP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
-# CONFIG_NETFILTER_XTABLES is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATE is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 #
 # IP: Netfilter Configuration
@@ -306,20 +340,38 @@ CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 # CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=m
-#
+# CONFIG_IP_NF_MATCH_IPRANGE is not set
-# DCCP Configuration (EXPERIMENTAL)
+# CONFIG_IP_NF_MATCH_TOS is not set
-#
+# CONFIG_IP_NF_MATCH_RECENT is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_AH is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+# CONFIG_IP_NF_MATCH_OWNER is not set
+# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+# CONFIG_IP_NF_TARGET_ULOG is not set
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+# CONFIG_IP_NF_TARGET_NETMAP is not set
+# CONFIG_IP_NF_TARGET_SAME is not set
+# CONFIG_NF_NAT_SNMP_BASIC is not set
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_PPTP is not set
+# CONFIG_NF_NAT_H323 is not set
+CONFIG_NF_NAT_SIP=m
+# CONFIG_IP_NF_MANGLE is not set
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -345,7 +397,16 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -358,16 +419,13 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 #
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -379,6 +437,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Plug and Play support
 #
 # CONFIG_PNP is not set
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -399,19 +458,16 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
@@ -426,6 +482,7 @@ CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 #
 # IDE chipset support/bugfixes
@@ -433,12 +490,12 @@ CONFIG_BLK_DEV_IDECD=y
 CONFIG_IDE_GENERIC=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=y
 # CONFIG_BLK_DEV_OPTI621 is not set
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_IDEDMA_ONLYDISK is not set
 # CONFIG_BLK_DEV_AEC62XX is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
@@ -453,6 +510,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_BLK_DEV_JMICRON is not set
 # CONFIG_BLK_DEV_SC1200 is not set
 # CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT8213 is not set
 # CONFIG_BLK_DEV_IT821X is not set
 # CONFIG_BLK_DEV_NS87415 is not set
 # CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -463,11 +521,11 @@ CONFIG_BLK_DEV_SL82C105=y
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_BLK_DEV_TC86C001 is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_IDE_CHIPSETS is not set
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
-CONFIG_IDEDMA_AUTO=y
 # CONFIG_BLK_DEV_HD is not set
 #
@@ -497,6 +555,7 @@ CONFIG_CHR_DEV_SG=y
 CONFIG_SCSI_CONSTANTS=y
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -562,10 +621,6 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -589,18 +644,14 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -610,15 +661,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 #
@@ -677,10 +720,8 @@ CONFIG_8139TOO=y
 CONFIG_VIA_RHINE=y
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_VIA_RHINE_NAPI is not set
+# CONFIG_SC92031 is not set
-#
+CONFIG_NETDEV_1000=y
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -696,33 +737,33 @@ CONFIG_VIA_RHINE=y
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 CONFIG_MV643XX_ETH=y
-# CONFIG_MV643XX_ETH_0 is not set
-# CONFIG_MV643XX_ETH_1 is not set
-# CONFIG_MV643XX_ETH_2 is not set
 # CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
-#
+CONFIG_NETDEV_10000=y
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-# CONFIG_NET_RADIO is not set
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 #
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -758,6 +799,7 @@ CONFIG_SLHC=m
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -783,15 +825,28 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
 # CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_PCSPKR is not set
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
 CONFIG_INPUT_UINPUT=y
 #
@@ -831,6 +886,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -841,10 +897,6 @@ CONFIG_BRIQ_PANEL=m
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_NVRAM=y
@@ -861,11 +913,9 @@ CONFIG_GEN_RTC=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 # CONFIG_I2C_CHARDEV is not set
 #
@@ -893,10 +943,12 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
@@ -928,37 +980,56 @@ CONFIG_I2C_ALGOBIT=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
+# CONFIG_HWMON is not set
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
+# CONFIG_MFD_SM501 is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_USB_DABUSB is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_LCD_CLASS_DEVICE=m
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+CONFIG_DISPLAY_SUPPORT=m
+#
+# Display hardware drivers
+#
+# CONFIG_VGASTATE is not set
 CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
 CONFIG_FB_MACMODES=y
-# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
+#
+# Frame buffer hardware drivers
+#
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_CYBER2000 is not set
@@ -978,12 +1049,15 @@ CONFIG_FB_MATROX_G=y
 # CONFIG_FB_MATROX_MULTIHEAD is not set
 CONFIG_FB_RADEON=y
 CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
 # CONFIG_FB_RADEON_DEBUG is not set
 # CONFIG_FB_ATY128 is not set
 CONFIG_FB_ATY=y
 CONFIG_FB_ATY_CT=y
 # CONFIG_FB_ATY_GENERIC_LCD is not set
 CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+# CONFIG_FB_S3 is not set
 # CONFIG_FB_SAVAGE is not set
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_NEOMAGIC is not set
@@ -991,7 +1065,10 @@ CONFIG_FB_ATY_GX=y
 CONFIG_FB_3DFX=y
 # CONFIG_FB_3DFX_ACCEL is not set
 # CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
 # CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_VIRTUAL is not set
@@ -1007,15 +1084,10 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 CONFIG_LOGO_LINUX_CLUT224=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
 # Sound
@@ -1026,6 +1098,15 @@ CONFIG_LOGO_LINUX_CLUT224=y
 # HID Devices
 #
 CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
 #
 # USB support
@@ -1040,9 +1121,8 @@ CONFIG_USB=y
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_MULTITHREAD_PROBE is not set
 # CONFIG_USB_OTG is not set
 #
@@ -1052,9 +1132,12 @@ CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_SL811_HCD is not set
@@ -1088,40 +1171,10 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_LIBUSUAL is not set
 #
-# USB Input Devices
-#
-CONFIG_USB_HID=y
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-# CONFIG_HID_FF is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 #
@@ -1143,6 +1196,7 @@ CONFIG_USB_MON=y
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
@@ -1153,6 +1207,7 @@ CONFIG_USB_MON=y
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 #
@@ -1163,10 +1218,6 @@ CONFIG_USB_MON=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -1210,10 +1261,6 @@ CONFIG_USB_MON=y
 #
 #
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1323,6 +1370,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -1372,6 +1420,7 @@ CONFIG_NLS_ISO8859_1=m
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
@@ -1379,17 +1428,21 @@ CONFIG_NLS_ISO8859_1=m
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
 #
 # CONFIG_PROFILING is not set
+# CONFIG_KPROBES is not set
 #
 # Kernel hacking
@@ -1401,15 +1454,15 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=15
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_RWSEMS is not set
 CONFIG_DEBUG_SPINLOCK_SLEEP=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -1420,6 +1473,10 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_LIST is not set
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_DEBUGGER=y
 CONFIG_XMON=y
 CONFIG_XMON_DEFAULT=y
@@ -1454,8 +1511,11 @@ CONFIG_CRYPTO_SHA1=m
 # CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 # CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
@@ -1469,6 +1529,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_DEFLATE is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
 #
diff --git a/arch/powerpc/configs/ebony_defconfig b/arch/powerpc/configs/ebony_defconfig
index c3b96ef3c2..5762cddfc1 100644
--- a/arch/powerpc/configs/ebony_defconfig
+++ b/arch/powerpc/configs/ebony_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21
+# Linux kernel version: 2.6.22-rc6
-# Fri May  4 13:47:08 2007
+# Tue Jun 26 12:38:33 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -45,6 +45,7 @@ CONFIG_4xx=y
 CONFIG_BOOKE=y
 CONFIG_PTE_64BIT=y
 CONFIG_PHYS_64BIT=y
+# CONFIG_PPC_MM_SLICES is not set
 CONFIG_NOT_COHERENT_CACHE=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -70,6 +71,7 @@ CONFIG_POSIX_MQUEUE=y
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -87,14 +89,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -193,16 +200,14 @@ CONFIG_PPC_INDIRECT_PCI=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 # CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
@@ -264,20 +269,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -310,7 +303,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 #
 # CONFIG_CFG80211 is not set
 # CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -365,12 +360,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -379,10 +372,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -398,6 +387,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
@@ -414,35 +404,21 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
 #
-# PHY device support
-#
-#
 # Ethernet (10 or 100Mbit)
 #
 # CONFIG_NET_ETHERNET is not set
-CONFIG_IBM_NEW_EMAC=y
+CONFIG_IBM_EMAC=y
-CONFIG_IBM_NEW_EMAC_RXB=128
+CONFIG_IBM_EMAC_RXB=128
-CONFIG_IBM_NEW_EMAC_TXB=64
+CONFIG_IBM_EMAC_TXB=64
-CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
+CONFIG_IBM_EMAC_POLL_WEIGHT=32
-CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
+CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
-CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
+CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0
-# CONFIG_IBM_NEW_EMAC_DEBUG is not set
+# CONFIG_IBM_EMAC_DEBUG is not set
-CONFIG_IBM_NEW_EMAC_ZMII=y
+CONFIG_IBM_EMAC_ZMII=y
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
+CONFIG_NETDEV_1000=y
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-#
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -454,24 +430,19 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
-#
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
@@ -479,10 +450,6 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
 #
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -550,15 +517,10 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_NVRAM is not set
 # CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -569,10 +531,7 @@ CONFIG_LEGACY_PTY_COUNT=256
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -585,12 +544,7 @@ CONFIG_LEGACY_PTY_COUNT=256
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 # CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multifunction device drivers
@@ -601,16 +555,19 @@ CONFIG_LEGACY_PTY_COUNT=256
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
@@ -635,10 +592,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -682,14 +635,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 #
-# Auxiliary Display support
-#
-#
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -770,6 +715,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -795,7 +741,6 @@ CONFIG_MSDOS_PARTITION=y
 #
 # CONFIG_DLM is not set
 # CONFIG_UCC_SLOW is not set
-# CONFIG_UCC_FAST is not set
 #
 # Library routines
@@ -803,12 +748,14 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -826,7 +773,6 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
@@ -851,7 +797,6 @@ CONFIG_FORCED_INLINING=y
 # CONFIG_DEBUGGER is not set
 # CONFIG_BDI_SWITCH is not set
 # CONFIG_BOOTX_TEXT is not set
-# CONFIG_SERIAL_TEXT_DEBUG is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 #
@@ -882,6 +827,7 @@ CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_PCBC=y
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index 3ccf19d8da..a217f4ebcf 100644
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-rc5
+# Linux kernel version: 2.6.22-rc6
-# Mon Jan 22 22:15:04 2007
+# Tue Jun 26 12:38:34 2007
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -27,6 +27,7 @@ CONFIG_GENERIC_TBSYNC=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
+CONFIG_PPC64_SWSUSP=y
 #
 # Processor support
@@ -39,6 +40,7 @@ CONFIG_PPC_FPU=y
 # CONFIG_PPC_OF_PLATFORM_PCI is not set
 CONFIG_ALTIVEC=y
 CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_MM_SLICES=y
 CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=4
@@ -59,6 +61,7 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
@@ -66,9 +69,11 @@ CONFIG_POSIX_MQUEUE=y
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_CPUSETS is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
@@ -83,14 +88,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -131,15 +141,21 @@ CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_PPC_PSERIES is not set
 # CONFIG_PPC_ISERIES is not set
 # CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
 CONFIG_PPC_PMAC=y
 CONFIG_PPC_PMAC64=y
 # CONFIG_PPC_MAPLE is not set
 # CONFIG_PPC_PASEMI is not set
+# CONFIG_PPC_CELLEB is not set
+# CONFIG_PPC_PS3 is not set
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_IBM_CELL_BLADE is not set
-# CONFIG_PPC_PS3 is not set
+# CONFIG_PQ2ADS is not set
 CONFIG_PPC_NATIVE=y
+CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
 CONFIG_U3_DART=y
 # CONFIG_PPC_RTAS is not set
 # CONFIG_MMIO_NVRAM is not set
@@ -160,9 +176,12 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 # CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+#
+# CPU Frequency drivers
+#
 CONFIG_CPU_FREQ_PMAC64=y
-# CONFIG_WANT_EARLY_SERIAL is not set
+# CONFIG_CPM2 is not set
-CONFIG_MPIC=y
 #
 # Kernel options
@@ -199,34 +218,34 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+# CONFIG_PPC_HAS_HASH_64K is not set
 # CONFIG_PPC_64K_PAGES is not set
 # CONFIG_SCHED_SMT is not set
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
+# CONFIG_WANT_DEVICE_TREE is not set
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_PPC_I8259 is not set
 # CONFIG_PPC_INDIRECT_PCI is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 CONFIG_KERNEL_START=0xc000000000000000
@@ -238,14 +257,15 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
@@ -270,10 +290,6 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-#
-# IP: Virtual Server Configuration
-#
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
@@ -287,8 +303,6 @@ CONFIG_NETFILTER=y
 #
 # CONFIG_NETFILTER_NETLINK is not set
 CONFIG_NF_CONNTRACK_ENABLED=m
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
 CONFIG_NF_CONNTRACK=m
 # CONFIG_NF_CT_ACCT is not set
 CONFIG_NF_CONNTRACK_MARK=y
@@ -300,6 +314,7 @@ CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_IRC=m
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 # CONFIG_NF_CONNTRACK_PPTP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
 # CONFIG_NF_CONNTRACK_SIP is not set
 CONFIG_NF_CONNTRACK_TFTP=m
 # CONFIG_NETFILTER_XTABLES is not set
@@ -310,20 +325,10 @@ CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
+# CONFIG_IP_NF_IPTABLES is not set
-#
+# CONFIG_IP_NF_ARPTABLES is not set
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -350,7 +355,16 @@ CONFIG_LLC=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -363,16 +377,13 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 #
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -383,6 +394,7 @@ CONFIG_FW_LOADER=y
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -402,7 +414,6 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=65536
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -411,12 +422,10 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
@@ -431,6 +440,7 @@ CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 #
 # IDE chipset support/bugfixes
@@ -438,12 +448,12 @@ CONFIG_BLK_DEV_IDECD=y
 CONFIG_IDE_GENERIC=y
 CONFIG_BLK_DEV_IDEPCI=y
 # CONFIG_IDEPCI_SHARE_IRQ is not set
+CONFIG_IDEPCI_PCIBUS_ORDER=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 # CONFIG_BLK_DEV_GENERIC is not set
 # CONFIG_BLK_DEV_OPTI621 is not set
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_IDEDMA_ONLYDISK is not set
 # CONFIG_BLK_DEV_AEC62XX is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
@@ -458,6 +468,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_BLK_DEV_JMICRON is not set
 # CONFIG_BLK_DEV_SC1200 is not set
 # CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT8213 is not set
 # CONFIG_BLK_DEV_IT821X is not set
 # CONFIG_BLK_DEV_NS87415 is not set
 # CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -468,13 +479,13 @@ CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
 CONFIG_BLK_DEV_IDE_PMAC=y
 CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
 CONFIG_BLK_DEV_IDEDMA_PMAC=y
 # CONFIG_IDE_ARM is not set
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
-CONFIG_IDEDMA_AUTO=y
 # CONFIG_BLK_DEV_HD is not set
 #
@@ -504,6 +515,7 @@ CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -550,11 +562,8 @@ CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_SATA_AHCI is not set
 CONFIG_SATA_SVW=y
 # CONFIG_ATA_PIIX is not set
@@ -570,10 +579,12 @@ CONFIG_SATA_SVW=y
 # CONFIG_SATA_ULI is not set
 # CONFIG_SATA_VIA is not set
 # CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
 # CONFIG_PATA_ALI is not set
 # CONFIG_PATA_AMD is not set
 # CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CS5520 is not set
 # CONFIG_PATA_CS5530 is not set
@@ -585,6 +596,7 @@ CONFIG_SATA_SVW=y
 # CONFIG_PATA_HPT3X2N is not set
 # CONFIG_PATA_HPT3X3 is not set
 # CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
 # CONFIG_PATA_JMICRON is not set
 # CONFIG_PATA_TRIFLEX is not set
 # CONFIG_PATA_MARVELL is not set
@@ -624,6 +636,7 @@ CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 # CONFIG_DM_MULTIPATH is not set
+# CONFIG_DM_DELAY is not set
 #
 # Fusion MPT device support
@@ -636,28 +649,26 @@ CONFIG_DM_ZERO=m
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 CONFIG_IEEE1394=y
 #
 # Subsystem Options
 #
 # CONFIG_IEEE1394_VERBOSEDEBUG is not set
-CONFIG_IEEE1394_OUI_DB=y
-CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
-CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
-# CONFIG_IEEE1394_EXPORT_FULL_API is not set
 #
-# Device Drivers
+# Controllers
 #
 # CONFIG_IEEE1394_PCILYNX is not set
 CONFIG_IEEE1394_OHCI1394=y
 #
-# Protocol Drivers
+# Protocols
 #
 CONFIG_IEEE1394_VIDEO1394=m
 CONFIG_IEEE1394_SBP2=m
+CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
 CONFIG_IEEE1394_ETH1394=m
 CONFIG_IEEE1394_DV1394=m
 CONFIG_IEEE1394_RAWIO=y
@@ -666,10 +677,7 @@ CONFIG_IEEE1394_RAWIO=y
 # I2O device support
 #
 # CONFIG_I2O is not set
+CONFIG_MACINTOSH_DRIVERS=y
-#
-# Macintosh device drivers
-#
 CONFIG_ADB_PMU=y
 # CONFIG_ADB_PMU_LED is not set
 CONFIG_PMAC_SMU=y
@@ -689,15 +697,7 @@ CONFIG_DUMMY=m
 CONFIG_BONDING=m
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 #
@@ -716,10 +716,7 @@ CONFIG_SUNGEM=y
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 CONFIG_ACENIC=y
 CONFIG_ACENIC_OMIT_TIGON_I=y
 # CONFIG_DL2K is not set
@@ -734,35 +731,50 @@ CONFIG_E1000=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
 CONFIG_TIGON3=y
 # CONFIG_BNX2 is not set
 # CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
-#
+CONFIG_NETDEV_10000=y
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_PASEMI_MAC is not set
-#
+# CONFIG_MLX4_CORE is not set
-# Token Ring devices
-#
 CONFIG_TR=y
 CONFIG_IBMOL=y
 # CONFIG_3C359 is not set
 # CONFIG_TMS380TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-# CONFIG_NET_RADIO is not set
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 #
-# Wan interfaces
+# USB Network Adapters
 #
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+# CONFIG_USB_USBNET_MII is not set
+CONFIG_USB_USBNET=m
+# CONFIG_USB_NET_AX8817X is not set
+CONFIG_USB_NET_CDCETHER=m
+# CONFIG_USB_NET_DM9601 is not set
+# CONFIG_USB_NET_GL620A is not set
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+# CONFIG_USB_NET_ZAURUS is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -798,6 +810,7 @@ CONFIG_SLHC=m
 #
 CONFIG_INPUT=y
 CONFIG_INPUT_FF_MEMLESS=y
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -824,8 +837,10 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_INPUT_MOUSE=y
 # CONFIG_MOUSE_PS2 is not set
 # CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -866,15 +881,10 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 CONFIG_AGP=m
@@ -888,11 +898,9 @@ CONFIG_MAX_RAW_DEVS=256
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 #
@@ -919,14 +927,15 @@ CONFIG_I2C_POWERMAC=y
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_PCA_ISA is not set
 #
 # Miscellaneous I2C Chip support
@@ -953,37 +962,53 @@ CONFIG_I2C_POWERMAC=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
+# CONFIG_HWMON is not set
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
+# CONFIG_MFD_SM501 is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
+# CONFIG_USB_DABUSB is not set
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_USB_DABUSB is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_LCD_CLASS_DEVICE=m
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+CONFIG_VGASTATE=y
 CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
 CONFIG_FB_MACMODES=y
-# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
+#
+# Frame buffer hardware drivers
+#
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_CYBER2000 is not set
@@ -994,20 +1019,27 @@ CONFIG_FB_OF=y
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_NVIDIA=y
 CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
 # CONFIG_FB_RIVA is not set
 # CONFIG_FB_MATROX is not set
 CONFIG_FB_RADEON=y
 CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
 # CONFIG_FB_RADEON_DEBUG is not set
 # CONFIG_FB_ATY128 is not set
 # CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
 # CONFIG_FB_SAVAGE is not set
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
 # CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_VIRTUAL is not set
@@ -1021,19 +1053,10 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 #
 # Sound
@@ -1152,6 +1175,12 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m
 #
 CONFIG_SND_USB_AUDIO=m
 # CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_USB_CAIAQ is not set
+#
+# System on Chip audio support
+#
+# CONFIG_SND_SOC is not set
 #
 # Open Sound System
@@ -1162,6 +1191,20 @@ CONFIG_SND_USB_AUDIO=m
 # HID Devices
 #
 CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+CONFIG_HID_FF=y
+CONFIG_HID_PID=y
+CONFIG_LOGITECH_FF=y
+# CONFIG_PANTHERLORD_FF is not set
+CONFIG_THRUSTMASTER_FF=y
+# CONFIG_ZEROPLUS_FF is not set
+CONFIG_USB_HIDDEV=y
 #
 # USB support
@@ -1176,9 +1219,8 @@ CONFIG_USB=y
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_MULTITHREAD_PROBE is not set
 # CONFIG_USB_OTG is not set
 #
@@ -1188,9 +1230,15 @@ CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+CONFIG_USB_OHCI_HCD_PPC_OF=y
+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
@@ -1224,53 +1272,10 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
 # CONFIG_USB_LIBUSUAL is not set
 #
-# USB Input Devices
-#
-CONFIG_USB_HID=y
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-CONFIG_HID_FF=y
-CONFIG_HID_PID=y
-CONFIG_LOGITECH_FF=y
-CONFIG_THRUSTMASTER_FF=y
-# CONFIG_ZEROPLUS_FF is not set
-CONFIG_USB_HIDDEV=y
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-# CONFIG_USB_USBNET_MII is not set
-CONFIG_USB_USBNET=m
-# CONFIG_USB_NET_AX8817X is not set
-CONFIG_USB_NET_CDCETHER=m
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-# CONFIG_USB_NET_ZAURUS is not set
 CONFIG_USB_MON=y
 #
@@ -1343,6 +1348,7 @@ CONFIG_USB_EZUSB=y
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
@@ -1353,6 +1359,7 @@ CONFIG_USB_APPLEDISPLAY=m
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 #
@@ -1363,10 +1370,6 @@ CONFIG_USB_APPLEDISPLAY=m
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -1410,10 +1413,6 @@ CONFIG_USB_APPLEDISPLAY=m
 #
 #
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1461,7 +1460,6 @@ CONFIG_AUTOFS_FS=m
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 CONFIG_UDF_NLS=y
@@ -1527,6 +1525,7 @@ CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1561,6 +1560,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -1610,6 +1610,7 @@ CONFIG_NLS_UTF8=y
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
@@ -1617,12 +1618,15 @@ CONFIG_NLS_UTF8=y
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -1641,15 +1645,15 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=17
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -1659,8 +1663,10 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_LIST is not set
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
 CONFIG_IRQSTACKS=y
 CONFIG_BOOTX_TEXT=y
@@ -1693,8 +1699,11 @@ CONFIG_CRYPTO_WP512=m
 # CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1709,6 +1718,7 @@ CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_CAMELLIA is not set
 CONFIG_CRYPTO_TEST=m
 #
diff --git a/arch/powerpc/configs/holly_defconfig b/arch/powerpc/configs/holly_defconfig
index be633b9b57..04b94f884a 100644
--- a/arch/powerpc/configs/holly_defconfig
+++ b/arch/powerpc/configs/holly_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21
+# Linux kernel version: 2.6.22-rc6
-# Sat May  5 11:02:35 2007
+# Tue Jun 26 13:22:36 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
 # CONFIG_ALTIVEC is not set
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
 # CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -70,6 +71,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -87,14 +89,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -140,6 +147,7 @@ CONFIG_EMBEDDED6xx=y
 # CONFIG_LINKSTATION is not set
 # CONFIG_MPC7448HPC2 is not set
 CONFIG_PPC_HOLLY=y
+# CONFIG_PPC_PRPMC2800 is not set
 CONFIG_TSI108_BRIDGE=y
 CONFIG_MPIC=y
 CONFIG_MPIC_WEIRD=y
@@ -182,10 +190,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_PROC_DEVICETREE=y
-# CONFIG_CMDLINE_BOOL is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttyS0,115200"
 # CONFIG_PM is not set
 # CONFIG_SECCOMP is not set
-# CONFIG_WANT_DEVICE_TREE is not set
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE="holly.dts"
 CONFIG_ISA_DMA_API=y
 #
@@ -197,16 +207,14 @@ CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 # CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
@@ -271,20 +279,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -317,7 +313,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 #
 # CONFIG_CFG80211 is not set
 # CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -372,12 +370,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -406,6 +402,7 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -453,12 +450,7 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_ESP_CORE is not set
 # CONFIG_SCSI_SRP is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_SATA_AHCI is not set
@@ -531,6 +523,7 @@ CONFIG_ATA=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
@@ -547,15 +540,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -589,10 +574,7 @@ CONFIG_VORTEX=y
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -604,25 +586,20 @@ CONFIG_VORTEX=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 CONFIG_TSI108_ETH=y
 # CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
-#
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
@@ -630,10 +607,6 @@ CONFIG_TSI108_ETH=y
 #
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -660,6 +633,7 @@ CONFIG_TSI108_ETH=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -676,6 +650,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -721,16 +696,11 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_NVRAM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -741,10 +711,7 @@ CONFIG_GEN_RTC=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -757,16 +724,15 @@ CONFIG_GEN_RTC=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 #
@@ -778,16 +744,19 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
@@ -818,10 +787,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -865,14 +830,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 #
-# Auxiliary Display support
-#
-#
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -957,6 +914,7 @@ CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -986,6 +944,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -997,7 +956,6 @@ CONFIG_MSDOS_PARTITION=y
 #
 # CONFIG_DLM is not set
 # CONFIG_UCC_SLOW is not set
-# CONFIG_UCC_FAST is not set
 #
 # Library routines
@@ -1005,11 +963,13 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -1028,7 +988,6 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig
index af25118c8f..8e33674524 100644
--- a/arch/powerpc/configs/iseries_defconfig
+++ b/arch/powerpc/configs/iseries_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc1
+# Linux kernel version: 2.6.22-rc6
-# Mon May 14 14:27:46 2007
+# Tue Jun 26 13:22:39 2007
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -281,10 +281,6 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-#
-# IP: Virtual Server Configuration
-#
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
@@ -387,25 +383,13 @@ CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -501,10 +485,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
 # CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -581,7 +561,6 @@ CONFIG_SCSI_IBMVSCSI=m
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_ESP_CORE is not set
 # CONFIG_SCSI_SRP is not set
 # CONFIG_ATA is not set
@@ -634,10 +613,6 @@ CONFIG_DUMMY=m
 CONFIG_BONDING=m
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
 # CONFIG_PHYLIB is not set
@@ -705,11 +680,6 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETXEN_NIC is not set
 # CONFIG_PASEMI_MAC is not set
 # CONFIG_MLX4_CORE is not set
-CONFIG_MLX4_DEBUG=y
-#
-# Token Ring devices
-#
 CONFIG_TR=y
 CONFIG_IBMOL=y
 # CONFIG_3C359 is not set
@@ -757,6 +727,7 @@ CONFIG_NET_POLL_CONTROLLER=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -1139,7 +1110,6 @@ CONFIG_NLS_ISO8859_1=y
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
 # CONFIG_UCC_SLOW is not set
-# CONFIG_UCC_FAST is not set
 #
 # Library routines
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig
index dde66a597a..78fd07c5f4 100644
--- a/arch/powerpc/configs/linkstation_defconfig
+++ b/arch/powerpc/configs/linkstation_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-rc6
+# Linux kernel version: 2.6.22-rc6
-# Sun Jan 28 23:13:56 2007
+# Tue Jun 26 13:25:19 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -24,7 +24,7 @@ CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
-# CONFIG_DEFAULT_UIMAGE is not set
+CONFIG_DEFAULT_UIMAGE=y
 #
 # Processor support
@@ -34,9 +34,9 @@ CONFIG_CLASSIC32=y
 # CONFIG_PPC_83xx is not set
 # CONFIG_PPC_85xx is not set
 # CONFIG_PPC_86xx is not set
+# CONFIG_PPC_8xx is not set
 # CONFIG_40x is not set
 # CONFIG_44x is not set
-# CONFIG_8xx is not set
 # CONFIG_E200 is not set
 CONFIG_6xx=y
 CONFIG_PPC_FPU=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
 # CONFIG_ALTIVEC is not set
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
 # CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -63,6 +64,7 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
@@ -70,8 +72,10 @@ CONFIG_POSIX_MQUEUE=y
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -86,14 +90,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -133,8 +142,20 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 CONFIG_EMBEDDED6xx=y
 # CONFIG_APUS is not set
 # CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+CONFIG_LINKSTATION=y
+# CONFIG_MPC7448HPC2 is not set
+# CONFIG_PPC_HOLLY is not set
+# CONFIG_PPC_PRPMC2800 is not set
+CONFIG_MPC10X_BRIDGE=y
+CONFIG_MPC10X_OPENPIC=y
+# CONFIG_MPC10X_STORE_GATHERING is not set
+CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
 # CONFIG_PPC_RTAS is not set
 # CONFIG_MMIO_NVRAM is not set
 # CONFIG_PPC_MPC106 is not set
@@ -143,39 +164,7 @@ CONFIG_EMBEDDED6xx=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_TAU is not set
-# CONFIG_KATANA is not set
+# CONFIG_CPM2 is not set
-# CONFIG_WILLOW is not set
-# CONFIG_CPCI690 is not set
-# CONFIG_POWERPMC250 is not set
-# CONFIG_CHESTNUT is not set
-# CONFIG_SPRUCE is not set
-# CONFIG_HDPU is not set
-# CONFIG_EV64260 is not set
-# CONFIG_LOPEC is not set
-# CONFIG_MVME5100 is not set
-# CONFIG_PPLUS is not set
-# CONFIG_PRPMC750 is not set
-# CONFIG_PRPMC800 is not set
-# CONFIG_SANDPOINT is not set
-CONFIG_LINKSTATION=y
-# CONFIG_MPC7448HPC2 is not set
-# CONFIG_RADSTONE_PPC7D is not set
-# CONFIG_PAL4 is not set
-# CONFIG_GEMINI is not set
-# CONFIG_EST8260 is not set
-# CONFIG_SBC82xx is not set
-# CONFIG_SBS8260 is not set
-# CONFIG_RPX8260 is not set
-# CONFIG_TQM8260 is not set
-# CONFIG_ADS8272 is not set
-# CONFIG_PQ2FADS is not set
-# CONFIG_EV64360 is not set
-CONFIG_PPC_GEN550=y
-CONFIG_MPC10X_BRIDGE=y
-CONFIG_MPC10X_OPENPIC=y
-# CONFIG_MPC10X_STORE_GATHERING is not set
-# CONFIG_WANT_EARLY_SERIAL is not set
-CONFIG_MPIC=y
 #
 # Kernel options
@@ -203,33 +192,33 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
+# CONFIG_WANT_DEVICE_TREE is not set
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_PPC_I8259 is not set
 CONFIG_PPC_INDIRECT_PCI=y
+# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 # CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
@@ -254,13 +243,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -289,10 +278,6 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-#
-# IP: Virtual Server Configuration
-#
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
@@ -306,8 +291,6 @@ CONFIG_NETFILTER=y
 #
 # CONFIG_NETFILTER_NETLINK is not set
 CONFIG_NF_CONNTRACK_ENABLED=m
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
 CONFIG_NF_CONNTRACK=m
 # CONFIG_NF_CT_ACCT is not set
 # CONFIG_NF_CONNTRACK_MARK is not set
@@ -320,16 +303,21 @@ CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+# CONFIG_NF_CONNTRACK_SANE is not set
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NETFILTER_XTABLES=m
 # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
 # CONFIG_NETFILTER_XT_TARGET_DSCP is not set
 # CONFIG_NETFILTER_XT_TARGET_MARK is not set
 # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
 # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
 # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
 # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
 # CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
 # CONFIG_NETFILTER_XT_MATCH_DCCP is not set
 # CONFIG_NETFILTER_XT_MATCH_DSCP is not set
@@ -370,7 +358,6 @@ CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
 # CONFIG_IP_NF_TARGET_LOG is not set
 # CONFIG_IP_NF_TARGET_ULOG is not set
-# CONFIG_IP_NF_TARGET_TCPMSS is not set
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_NEEDED=y
 CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -390,24 +377,13 @@ CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_TTL=m
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
 CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -433,6 +409,14 @@ CONFIG_IP_NF_ARP_MANGLE=m
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 is not set
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_DEBUG=y
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -440,7 +424,7 @@ CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
-CONFIG_WIRELESS_EXT=y
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -453,16 +437,13 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 #
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_CONCAT=y
@@ -511,7 +492,6 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 #
 # Mapping drivers for chip access
@@ -539,17 +519,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_ONENAND is not set
 #
-# OneNAND Flash Device Drivers
+# UBI - Unsorted block images
 #
-# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_UBI is not set
 #
 # Parallel port support
@@ -559,6 +535,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -578,19 +555,16 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=2
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -619,6 +593,7 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -667,11 +642,8 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_SATA_AHCI is not set
 # CONFIG_SATA_SVW is not set
 # CONFIG_ATA_PIIX is not set
@@ -687,10 +659,12 @@ CONFIG_ATA=y
 # CONFIG_SATA_ULI is not set
 # CONFIG_SATA_VIA is not set
 # CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
 # CONFIG_PATA_ALI is not set
 # CONFIG_PATA_AMD is not set
 # CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CS5520 is not set
 # CONFIG_PATA_CS5530 is not set
@@ -702,6 +676,7 @@ CONFIG_ATA=y
 # CONFIG_PATA_HPT3X2N is not set
 # CONFIG_PATA_HPT3X3 is not set
 CONFIG_PATA_IT821X=y
+# CONFIG_PATA_IT8213 is not set
 # CONFIG_PATA_JMICRON is not set
 # CONFIG_PATA_TRIFLEX is not set
 # CONFIG_PATA_MARVELL is not set
@@ -738,18 +713,14 @@ CONFIG_PATA_SIL680=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -759,15 +730,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 #
@@ -795,10 +758,7 @@ CONFIG_TULIP_MMIO=y
 # CONFIG_ULI526X is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -811,58 +771,36 @@ CONFIG_R8169=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 # CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
-#
+CONFIG_NETDEV_10000=y
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
-#
-CONFIG_NET_RADIO=y
-# CONFIG_NET_WIRELESS_RTNETLINK is not set
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-# CONFIG_IPW2100 is not set
-# CONFIG_IPW2200 is not set
-# CONFIG_AIRO is not set
-# CONFIG_HERMES is not set
-# CONFIG_ATMEL is not set
-#
-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
 #
-# CONFIG_PRISM54 is not set
+# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_USB_ZD1201 is not set
+# CONFIG_WLAN_80211 is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_BCM43XX is not set
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_NET_WIRELESS=y
 #
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -872,7 +810,6 @@ CONFIG_NET_WIRELESS=y
 # CONFIG_SHAPER is not set
 CONFIG_NETCONSOLE=y
 CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_RX is not set
 # CONFIG_NETPOLL_TRAP is not set
 CONFIG_NET_POLL_CONTROLLER=y
@@ -891,6 +828,7 @@ CONFIG_NET_POLL_CONTROLLER=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -910,8 +848,14 @@ CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
 CONFIG_INPUT_UINPUT=m
 #
@@ -950,6 +894,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -958,15 +903,10 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
 # CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -977,11 +917,9 @@ CONFIG_HW_RANDOM=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 #
@@ -1008,14 +946,15 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_PCA_ISA is not set
 #
 # Miscellaneous I2C Chip support
@@ -1043,16 +982,14 @@ CONFIG_SENSORS_EEPROM=m
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
 # CONFIG_SENSORS_ADM1031 is not set
 # CONFIG_SENSORS_ADM9240 is not set
 # CONFIG_SENSORS_ASB100 is not set
@@ -1075,6 +1012,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
@@ -1094,20 +1032,27 @@ CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 #
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_USB_DABUSB is not set
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
@@ -1116,7 +1061,6 @@ CONFIG_FIRMWARE_EDID=y
 #
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
 # Sound
@@ -1127,6 +1071,18 @@ CONFIG_DUMMY_CONSOLE=y
 # HID Devices
 #
 CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
+#
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
 #
 # USB support
@@ -1141,7 +1097,7 @@ CONFIG_USB=y
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_OTG is not set
@@ -1152,9 +1108,15 @@ CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+CONFIG_USB_OHCI_HCD_PPC_OF=y
+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
@@ -1187,43 +1149,10 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_LIBUSUAL is not set
 #
-# USB Input Devices
-#
-# CONFIG_USB_HID is not set
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 #
@@ -1283,6 +1212,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=y
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
@@ -1293,6 +1223,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=y
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 #
@@ -1303,10 +1234,6 @@ CONFIG_USB_SERIAL_FTDI_SIO=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -1347,24 +1274,37 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
 #
-# RTC drivers
+# I2C RTC drivers
 #
-# CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+CONFIG_RTC_DRV_RS5C372=y
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
-CONFIG_RTC_DRV_RS5C372=y
+#
+# SPI RTC drivers
+#
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_TEST is not set
 # CONFIG_RTC_DRV_V3020 is not set
 #
+# on-CPU RTC drivers
+#
+#
 # DMA Engine support
 #
 # CONFIG_DMA_ENGINE is not set
@@ -1378,10 +1318,6 @@ CONFIG_RTC_DRV_RS5C372=y
 #
 #
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1421,7 +1357,6 @@ CONFIG_DNOTIFY=y
 CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=m
 CONFIG_UDF_FS=m
 CONFIG_UDF_NLS=y
@@ -1489,6 +1424,7 @@ CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1557,6 +1493,7 @@ CONFIG_NLS_UTF8=m
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
@@ -1564,6 +1501,7 @@ CONFIG_NLS_UTF8=m
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=m
@@ -1571,13 +1509,16 @@ CONFIG_ZLIB_DEFLATE=m
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
 #
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
+# CONFIG_KPROBES is not set
 #
 # Kernel hacking
@@ -1589,15 +1530,15 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -1607,10 +1548,13 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_LIST is not set
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_BDI_SWITCH is not set
 # CONFIG_BOOTX_TEXT is not set
-# CONFIG_SERIAL_TEXT_DEBUG is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 #
@@ -1639,8 +1583,11 @@ CONFIG_CRYPTO_SHA1=m
 # CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1655,6 +1602,7 @@ CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
 #
diff --git a/arch/powerpc/configs/lite5200_defconfig b/arch/powerpc/configs/lite5200_defconfig
index 8cbd87ded6..d12a981398 100644
--- a/arch/powerpc/configs/lite5200_defconfig
+++ b/arch/powerpc/configs/lite5200_defconfig
@@ -1,9 +1,10 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-rc5
+# Linux kernel version: 2.6.22-rc6
-# Mon Jan 22 22:18:18 2007
+# Tue Jun 26 13:26:09 2007
 #
 # CONFIG_PPC64 is not set
+CONFIG_PPC_PM_NEEDS_RTC_LIB=y
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -34,9 +35,9 @@ CONFIG_CLASSIC32=y
 # CONFIG_PPC_83xx is not set
 # CONFIG_PPC_85xx is not set
 # CONFIG_PPC_86xx is not set
+# CONFIG_PPC_8xx is not set
 # CONFIG_40x is not set
 # CONFIG_44x is not set
-# CONFIG_8xx is not set
 # CONFIG_E200 is not set
 CONFIG_6xx=y
 CONFIG_PPC_FPU=y
@@ -45,6 +46,7 @@ CONFIG_PPC_FPU=y
 # CONFIG_ALTIVEC is not set
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
 # CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -63,14 +65,17 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -83,14 +88,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -131,11 +141,17 @@ CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_APUS is not set
 # CONFIG_PPC_CHRP is not set
 CONFIG_PPC_MPC52xx=y
+CONFIG_PPC_MPC5200=y
+CONFIG_PPC_MPC5200_BUGFIX=y
 # CONFIG_PPC_EFIKA is not set
 CONFIG_PPC_LITE5200=y
 # CONFIG_PPC_PMAC is not set
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
 # CONFIG_PPC_RTAS is not set
 # CONFIG_MMIO_NVRAM is not set
 # CONFIG_PPC_MPC106 is not set
@@ -144,8 +160,7 @@ CONFIG_PPC_LITE5200=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_TAU is not set
-# CONFIG_WANT_EARLY_SERIAL is not set
+# CONFIG_CPM2 is not set
-# CONFIG_MPIC is not set
 #
 # Kernel options
@@ -174,6 +189,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_PM=y
@@ -182,28 +198,27 @@ CONFIG_PM=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
 # CONFIG_SOFTWARE_SUSPEND is not set
 CONFIG_SECCOMP=y
+# CONFIG_WANT_DEVICE_TREE is not set
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_PPC_I8259 is not set
 # CONFIG_PPC_INDIRECT_PCI is not set
+CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 # CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
@@ -228,13 +243,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -268,20 +283,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -307,7 +310,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -320,16 +332,13 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 #
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -340,6 +349,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -358,19 +368,16 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -399,6 +406,7 @@ CONFIG_SCSI=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -447,11 +455,8 @@ CONFIG_SCSI=y
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_SATA_AHCI is not set
 # CONFIG_SATA_SVW is not set
 # CONFIG_ATA_PIIX is not set
@@ -467,10 +472,12 @@ CONFIG_ATA=y
 # CONFIG_SATA_ULI is not set
 # CONFIG_SATA_VIA is not set
 # CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
 # CONFIG_PATA_ALI is not set
 # CONFIG_PATA_AMD is not set
 # CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CS5520 is not set
 # CONFIG_PATA_CS5530 is not set
@@ -482,9 +489,11 @@ CONFIG_ATA=y
 # CONFIG_PATA_HPT3X2N is not set
 # CONFIG_PATA_HPT3X3 is not set
 # CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
 # CONFIG_PATA_JMICRON is not set
 # CONFIG_PATA_TRIFLEX is not set
 # CONFIG_PATA_MARVELL is not set
+CONFIG_PATA_MPC52xx=y
 # CONFIG_PATA_MPIIX is not set
 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_NETCELL is not set
@@ -519,18 +528,14 @@ CONFIG_ATA=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -540,24 +545,13 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
 #
-# PHY device support
-#
-#
 # Ethernet (10 or 100Mbit)
 #
 # CONFIG_NET_ETHERNET is not set
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -569,33 +563,27 @@ CONFIG_NETDEVICES=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 # CONFIG_MV643XX_ETH is not set
 # CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
-#
+CONFIG_NETDEV_10000=y
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -657,15 +645,10 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_NVRAM is not set
 # CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -676,10 +659,7 @@ CONFIG_LEGACY_PTY_COUNT=256
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -692,30 +672,32 @@ CONFIG_LEGACY_PTY_COUNT=256
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
+# CONFIG_HWMON is not set
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
+# CONFIG_MFD_SM501 is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
 # Sound
@@ -738,10 +720,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -769,6 +747,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 # Real Time Clock
 #
+CONFIG_RTC_LIB=y
 # CONFIG_RTC_CLASS is not set
 #
@@ -785,10 +764,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 #
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -888,16 +863,20 @@ CONFIG_MSDOS_PARTITION=y
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
 #
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 # CONFIG_CRC32 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -914,15 +893,15 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -932,10 +911,13 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_LIST is not set
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_BDI_SWITCH is not set
 # CONFIG_BOOTX_TEXT is not set
-# CONFIG_SERIAL_TEXT_DEBUG is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 #
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index 15366f0e48..eb3d9ad655 100644
--- a/arch/powerpc/configs/maple_defconfig
+++ b/arch/powerpc/configs/maple_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-rc5
+# Linux kernel version: 2.6.22-rc6
-# Mon Jan 22 22:19:02 2007
+# Tue Jun 26 13:27:35 2007
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -39,6 +39,7 @@ CONFIG_PPC_FPU=y
 # CONFIG_PPC_OF_PLATFORM_PCI is not set
 # CONFIG_ALTIVEC is not set
 CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_MM_SLICES=y
 CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=4
@@ -59,6 +60,7 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
@@ -66,10 +68,11 @@ CONFIG_POSIX_MQUEUE=y
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_CPUSETS is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
@@ -83,14 +86,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -131,29 +139,34 @@ CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_PPC_PSERIES is not set
 # CONFIG_PPC_ISERIES is not set
 # CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_PMAC is not set
 CONFIG_PPC_MAPLE=y
 # CONFIG_PPC_PASEMI is not set
+# CONFIG_PPC_CELLEB is not set
+# CONFIG_PPC_PS3 is not set
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_IBM_CELL_BLADE is not set
-# CONFIG_PPC_PS3 is not set
+# CONFIG_PQ2ADS is not set
 CONFIG_PPC_NATIVE=y
 CONFIG_UDBG_RTAS_CONSOLE=y
+CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
 CONFIG_U3_DART=y
 CONFIG_PPC_RTAS=y
 # CONFIG_RTAS_ERROR_LOGGING is not set
 CONFIG_RTAS_PROC=y
 # CONFIG_RTAS_FLASH is not set
-# CONFIG_MMIO_NVRAM is not set
+CONFIG_MMIO_NVRAM=y
 CONFIG_MPIC_U3_HT_IRQS=y
 # CONFIG_PPC_MPC106 is not set
 CONFIG_PPC_970_NAP=y
 # CONFIG_PPC_INDIRECT_IO is not set
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
-# CONFIG_WANT_EARLY_SERIAL is not set
+# CONFIG_CPM2 is not set
-CONFIG_MPIC=y
 #
 # Kernel options
@@ -189,34 +202,34 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+# CONFIG_PPC_HAS_HASH_64K is not set
 # CONFIG_PPC_64K_PAGES is not set
 # CONFIG_SCHED_SMT is not set
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
+# CONFIG_WANT_DEVICE_TREE is not set
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_PPC_I8259 is not set
 # CONFIG_PPC_INDIRECT_PCI is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 CONFIG_KERNEL_START=0xc000000000000000
@@ -228,13 +241,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -268,20 +281,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -307,7 +308,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -320,16 +330,13 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 #
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -340,6 +347,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -358,19 +366,16 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
@@ -384,6 +389,7 @@ CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 CONFIG_IDE_TASK_IOCTL=y
+CONFIG_IDE_PROC_FS=y
 #
 # IDE chipset support/bugfixes
@@ -391,12 +397,12 @@ CONFIG_IDE_TASK_IOCTL=y
 CONFIG_IDE_GENERIC=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=y
 # CONFIG_BLK_DEV_OPTI621 is not set
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_IDEDMA_ONLYDISK is not set
 # CONFIG_BLK_DEV_AEC62XX is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
@@ -411,6 +417,7 @@ CONFIG_BLK_DEV_AMD74XX=y
 # CONFIG_BLK_DEV_JMICRON is not set
 # CONFIG_BLK_DEV_SC1200 is not set
 # CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT8213 is not set
 # CONFIG_BLK_DEV_IT821X is not set
 # CONFIG_BLK_DEV_NS87415 is not set
 # CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -421,10 +428,10 @@ CONFIG_BLK_DEV_AMD74XX=y
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
 # CONFIG_IDE_ARM is not set
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
-CONFIG_IDEDMA_AUTO=y
 # CONFIG_BLK_DEV_HD is not set
 #
@@ -433,10 +440,6 @@ CONFIG_IDEDMA_AUTO=y
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -452,18 +455,14 @@ CONFIG_IDEDMA_AUTO=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -473,15 +472,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 #
@@ -518,10 +509,8 @@ CONFIG_AMD8111_ETH=y
 # CONFIG_EPIC100 is not set
 # CONFIG_SUNDANCE is not set
 # CONFIG_VIA_RHINE is not set
+# CONFIG_SC92031 is not set
-#
+CONFIG_NETDEV_1000=y
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
@@ -539,29 +528,33 @@ CONFIG_E1000=y
 CONFIG_TIGON3=y
 # CONFIG_BNX2 is not set
 # CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
-#
+CONFIG_NETDEV_10000=y
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_PASEMI_MAC is not set
-#
+# CONFIG_MLX4_CORE is not set
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-# CONFIG_NET_RADIO is not set
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 #
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+CONFIG_USB_PEGASUS=y
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -587,6 +580,7 @@ CONFIG_TIGON3=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -606,6 +600,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1200
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -640,6 +635,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -650,15 +646,10 @@ CONFIG_HVC_RTAS=y
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -670,11 +661,9 @@ CONFIG_GEN_RTC=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 #
@@ -700,14 +689,15 @@ CONFIG_I2C_AMD8111=y
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_PCA_ISA is not set
 #
 # Miscellaneous I2C Chip support
@@ -734,28 +724,30 @@ CONFIG_I2C_AMD8111=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
+# CONFIG_HWMON is not set
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
+# CONFIG_MFD_SM501 is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_USB_DABUSB is not set
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
@@ -764,7 +756,6 @@ CONFIG_FIRMWARE_EDID=y
 #
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
 # Sound
@@ -775,6 +766,15 @@ CONFIG_DUMMY_CONSOLE=y
 # HID Devices
 #
 CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
 #
 # USB support
@@ -789,9 +789,8 @@ CONFIG_USB=y
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_MULTITHREAD_PROBE is not set
 # CONFIG_USB_OTG is not set
 #
@@ -801,9 +800,12 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_SPLIT_ISO=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_SL811_HCD is not set
@@ -824,39 +826,9 @@ CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_LIBUSUAL is not set
 #
-# USB Input Devices
-#
-CONFIG_USB_HID=y
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-# CONFIG_HID_FF is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-CONFIG_USB_PEGASUS=y
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 #
@@ -929,6 +901,7 @@ CONFIG_USB_EZUSB=y
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
@@ -939,6 +912,7 @@ CONFIG_USB_EZUSB=y
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 #
@@ -949,10 +923,6 @@ CONFIG_USB_EZUSB=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -996,10 +966,6 @@ CONFIG_USB_EZUSB=y
 #
 #
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1090,6 +1056,7 @@ CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1119,6 +1086,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -1168,6 +1136,7 @@ CONFIG_NLS_UTF8=y
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
@@ -1175,11 +1144,14 @@ CONFIG_NLS_UTF8=y
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=y
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -1197,16 +1169,16 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=17
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 CONFIG_DEBUG_SLAB=y
 # CONFIG_DEBUG_SLAB_LEAK is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RWSEMS is not set
 CONFIG_DEBUG_SPINLOCK_SLEEP=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -1216,8 +1188,10 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_FORCED_INLINING is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
 CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_DEBUG_STACK_USAGE=y
+# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_DEBUGGER=y
 CONFIG_XMON=y
 CONFIG_XMON_DEFAULT=y
@@ -1252,8 +1226,11 @@ CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
@@ -1267,6 +1244,7 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_DEFLATE is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
 #
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig
index fdf09eabe6..174a290ee7 100644
--- a/arch/powerpc/configs/mpc7448_hpc2_defconfig
+++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-rc5
+# Linux kernel version: 2.6.22-rc7
-# Mon Jan 22 22:20:53 2007
+# Sun Jul  1 23:56:54 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -34,9 +34,9 @@ CONFIG_CLASSIC32=y
 # CONFIG_PPC_83xx is not set
 # CONFIG_PPC_85xx is not set
 # CONFIG_PPC_86xx is not set
+# CONFIG_PPC_8xx is not set
 # CONFIG_40x is not set
 # CONFIG_44x is not set
-# CONFIG_8xx is not set
 # CONFIG_E200 is not set
 CONFIG_6xx=y
 CONFIG_PPC_FPU=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
 # CONFIG_ALTIVEC is not set
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
 # CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -63,14 +64,17 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -84,14 +88,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -126,8 +135,18 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 CONFIG_EMBEDDED6xx=y
 # CONFIG_APUS is not set
 # CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+# CONFIG_LINKSTATION is not set
+CONFIG_MPC7448HPC2=y
+# CONFIG_PPC_HOLLY is not set
+# CONFIG_PPC_PRPMC2800 is not set
+CONFIG_TSI108_BRIDGE=y
+CONFIG_MPIC=y
+CONFIG_MPIC_WEIRD=y
+# CONFIG_PPC_I8259 is not set
 # CONFIG_PPC_RTAS is not set
 # CONFIG_MMIO_NVRAM is not set
 # CONFIG_PPC_MPC106 is not set
@@ -136,36 +155,7 @@ CONFIG_EMBEDDED6xx=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_TAU is not set
-# CONFIG_KATANA is not set
+# CONFIG_CPM2 is not set
-# CONFIG_WILLOW is not set
-# CONFIG_CPCI690 is not set
-# CONFIG_POWERPMC250 is not set
-# CONFIG_CHESTNUT is not set
-# CONFIG_SPRUCE is not set
-# CONFIG_HDPU is not set
-# CONFIG_EV64260 is not set
-# CONFIG_LOPEC is not set
-# CONFIG_MVME5100 is not set
-# CONFIG_PPLUS is not set
-# CONFIG_PRPMC750 is not set
-# CONFIG_PRPMC800 is not set
-# CONFIG_SANDPOINT is not set
-# CONFIG_LINKSTATION is not set
-CONFIG_MPC7448HPC2=y
-# CONFIG_RADSTONE_PPC7D is not set
-# CONFIG_PAL4 is not set
-# CONFIG_GEMINI is not set
-# CONFIG_EST8260 is not set
-# CONFIG_SBC82xx is not set
-# CONFIG_SBS8260 is not set
-# CONFIG_RPX8260 is not set
-# CONFIG_TQM8260 is not set
-# CONFIG_ADS8272 is not set
-# CONFIG_PQ2FADS is not set
-# CONFIG_EV64360 is not set
-CONFIG_TSI108_BRIDGE=y
-# CONFIG_WANT_EARLY_SERIAL is not set
-CONFIG_MPIC=y
 #
 # Kernel options
@@ -193,31 +183,30 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 # CONFIG_SECCOMP is not set
+# CONFIG_WANT_DEVICE_TREE is not set
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
-CONFIG_MPIC_WEIRD=y
-# CONFIG_PPC_I8259 is not set
 # CONFIG_PPC_INDIRECT_PCI is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
@@ -242,13 +231,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -282,20 +271,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -321,7 +298,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -339,10 +325,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -353,6 +335,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -371,19 +354,16 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=131072
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -460,11 +440,8 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_SATA_AHCI is not set
 # CONFIG_SATA_SVW is not set
 # CONFIG_ATA_PIIX is not set
@@ -480,10 +457,12 @@ CONFIG_SATA_MV=y
 # CONFIG_SATA_ULI is not set
 # CONFIG_SATA_VIA is not set
 # CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
 # CONFIG_PATA_ALI is not set
 # CONFIG_PATA_AMD is not set
 # CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CS5520 is not set
 # CONFIG_PATA_CS5530 is not set
@@ -495,6 +474,7 @@ CONFIG_SATA_MV=y
 # CONFIG_PATA_HPT3X2N is not set
 # CONFIG_PATA_HPT3X3 is not set
 # CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
 # CONFIG_PATA_JMICRON is not set
 # CONFIG_PATA_TRIFLEX is not set
 # CONFIG_PATA_MARVELL is not set
@@ -532,18 +512,14 @@ CONFIG_SATA_MV=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -553,15 +529,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -615,10 +583,8 @@ CONFIG_8139TOO=y
 # CONFIG_SUNDANCE is not set
 # CONFIG_TLAN is not set
 # CONFIG_VIA_RHINE is not set
+# CONFIG_SC92031 is not set
-#
+CONFIG_NETDEV_1000=y
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -635,29 +601,22 @@ CONFIG_8139TOO=y
 # CONFIG_BNX2 is not set
 CONFIG_TSI108_ETH=y
 # CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
-#
+CONFIG_NETDEV_10000=y
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -684,6 +643,7 @@ CONFIG_TSI108_ETH=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -700,6 +660,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -732,6 +693,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -740,16 +702,11 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_NVRAM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -760,10 +717,7 @@ CONFIG_GEN_RTC=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -776,35 +730,41 @@ CONFIG_GEN_RTC=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 #
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
 # Sound
@@ -815,6 +775,7 @@ CONFIG_FIRMWARE_EDID=y
 # HID Devices
 #
 CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
 #
 # USB support
@@ -832,10 +793,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -879,10 +836,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 #
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -967,6 +920,7 @@ CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -996,6 +950,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -1006,6 +961,7 @@ CONFIG_MSDOS_PARTITION=y
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
@@ -1013,10 +969,13 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -1033,7 +992,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig
index 2af4502508..4a429294e4 100644
--- a/arch/powerpc/configs/mpc8272_ads_defconfig
+++ b/arch/powerpc/configs/mpc8272_ads_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.17-rc5
+# Linux kernel version: 2.6.22-rc7
-# Fri Jul 14 20:36:35 2006
+# Sun Jul  1 23:56:55 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -10,6 +10,7 @@ CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_IRQ_PER_CPU=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -21,25 +22,31 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
 # CONFIG_PPC_UDBG_16550 is not set
 # CONFIG_GENERIC_TBSYNC is not set
-# CONFIG_DEFAULT_UIMAGE is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+CONFIG_DEFAULT_UIMAGE=y
 #
 # Processor support
 #
 # CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_52xx is not set
 CONFIG_PPC_82xx=y
 # CONFIG_PPC_83xx is not set
 # CONFIG_PPC_85xx is not set
+# CONFIG_PPC_86xx is not set
+# CONFIG_PPC_8xx is not set
 # CONFIG_40x is not set
 # CONFIG_44x is not set
-# CONFIG_8xx is not set
 # CONFIG_E200 is not set
 CONFIG_6xx=y
 CONFIG_PPC_FPU=y
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
 # CONFIG_SMP is not set
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 #
 # Code maturity level options
@@ -55,14 +62,21 @@ CONFIG_LOCALVERSION="powerpc8272"
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_EXTRA_PASS=y
@@ -72,12 +86,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -87,6 +108,7 @@ CONFIG_BASE_SMALL=0
 #
 # Block layer
 #
+CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
@@ -103,17 +125,29 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-CONFIG_PQ2ADS=y
-CONFIG_8260=y
-CONFIG_8272=y
-CONFIG_CPM2=y
-# CONFIG_WANT_EARLY_SERIAL is not set
-CONFIG_EMBEDDEDBOOT=y
 #
 # Platform support
 #
-CONFIG_ADS8272=y
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+CONFIG_MPC82xx_ADS=y
+CONFIG_PQ2ADS=y
+CONFIG_8260=y
+CONFIG_8272=y
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+CONFIG_CPM2=y
 #
 # Kernel options
@@ -121,6 +155,7 @@ CONFIG_ADS8272=y
 # CONFIG_HIGHMEM is not set
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
@@ -128,26 +163,30 @@ CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT is not set
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=y
-# CONFIG_PC_KEYBOARD is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
-# CONFIG_SOFTWARE_SUSPEND is not set
 CONFIG_SECCOMP=y
+# CONFIG_WANT_DEVICE_TREE is not set
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
-# CONFIG_PPC_I8259 is not set
+CONFIG_ZONE_DMA=y
 CONFIG_FSL_SOC=y
 # CONFIG_PCI is not set
 # CONFIG_PCI_DOMAINS is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -155,10 +194,6 @@ CONFIG_FSL_SOC=y
 # CONFIG_PCCARD is not set
 #
-# PCI Hotplug Support
-#
-#
 # Advanced setup
 #
 # CONFIG_ADVANCED_OPTIONS is not set
@@ -180,10 +215,11 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -201,15 +237,15 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_TUNNEL=y
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
-#
-# IP: Virtual Server Configuration
-#
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
@@ -219,7 +255,12 @@ CONFIG_IPV6=y
 # CONFIG_INET6_IPCOMP is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
+CONFIG_INET6_XFRM_MODE_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_BEET=y
+CONFIG_IPV6_SIT=y
 # CONFIG_IPV6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
@@ -227,13 +268,16 @@ CONFIG_NETFILTER=y
 # Core Netfilter Configuration
 #
 # CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NF_CONNTRACK_ENABLED is not set
+# CONFIG_NF_CONNTRACK is not set
 # CONFIG_NETFILTER_XTABLES is not set
 #
 # IP: Netfilter Configuration
 #
-# CONFIG_IP_NF_CONNTRACK is not set
 # CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
@@ -253,7 +297,14 @@ CONFIG_NETFILTER=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -266,15 +317,13 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
 #
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -285,6 +334,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -295,14 +345,15 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
-# ATA/ATAPI/MFM/RLL support
+# Misc devices
 #
+# CONFIG_BLINK is not set
 CONFIG_IDE=y
+CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
 #
@@ -314,14 +365,15 @@ CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_BLK_DEV_IDECD is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 #
 # IDE chipset support/bugfixes
 #
 # CONFIG_IDE_GENERIC is not set
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
 #
@@ -329,29 +381,14 @@ CONFIG_BLK_DEV_IDEDISK=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
 #
 # Multi-device support (RAID and LVM)
 #
 # CONFIG_MD is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-#
-# IEEE 1394 (FireWire) support
-#
-#
-# I2O device support
-#
-#
-# Macintosh device drivers
-#
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -361,10 +398,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=y
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -375,6 +408,9 @@ CONFIG_DAVICOM_PHY=y
 # CONFIG_QSEMI_PHY is not set
 # CONFIG_LXT_PHY is not set
 # CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
 # CONFIG_FIXED_PHY is not set
 #
@@ -385,27 +421,14 @@ CONFIG_MII=y
 CONFIG_FS_ENET=y
 # CONFIG_FS_ENET_HAS_SCC is not set
 CONFIG_FS_ENET_HAS_FCC=y
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 #
-# Ethernet (1000 Mbit)
+# Wireless LAN
-#
-#
-# Ethernet (10000 Mbit)
-#
-#
-# Token Ring devices
-#
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 CONFIG_PPP=y
 # CONFIG_PPP_FILTER is not set
@@ -414,6 +437,7 @@ CONFIG_PPP_SYNC_TTY=y
 CONFIG_PPP_DEFLATE=y
 # CONFIG_PPP_BSDCOMP is not set
 # CONFIG_SLIP is not set
+CONFIG_SLHC=y
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
@@ -431,6 +455,8 @@ CONFIG_PPP_DEFLATE=y
 # Input device support
 #
 CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -453,11 +479,19 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -485,6 +519,7 @@ CONFIG_SERIO_LIBPS2=y
 #
 # Non-8250 serial port support
 #
+# CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_CPM=y
@@ -503,29 +538,16 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
 # CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_AGP is not set
 # CONFIG_RAW_DRIVER is not set
 #
 # TPM devices
 #
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -538,32 +560,32 @@ CONFIG_LEGACY_PTY_COUNT=256
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 # CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
 #
-# Misc devices
+# Multifunction device drivers
 #
+# CONFIG_MFD_SM501 is not set
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
+# CONFIG_FB_IBM_GXT4500 is not set
 #
 # Sound
@@ -571,6 +593,12 @@ CONFIG_VIDEO_V4L2=y
 # CONFIG_SOUND is not set
 #
+# HID Devices
+#
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+#
 # USB support
 #
 # CONFIG_USB_ARCH_HAS_HCD is not set
@@ -586,6 +614,7 @@ CONFIG_VIDEO_V4L2=y
 #
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_FSL_USB2 is not set
 # CONFIG_USB_GADGET_NET2280 is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_GOKU is not set
@@ -594,10 +623,6 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_AT91 is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 # CONFIG_USB_GADGET_DUALSPEED is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -626,6 +651,19 @@ CONFIG_USB_GADGET=y
 #
 #
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+#
+# DMA Clients
+#
+#
+# DMA Devices
+#
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -645,9 +683,12 @@ CONFIG_XFS_FS=y
 # CONFIG_XFS_QUOTA is not set
 # CONFIG_XFS_SECURITY is not set
 # CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
@@ -672,8 +713,10 @@ CONFIG_AUTOFS4_FS=y
 #
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
@@ -694,6 +737,7 @@ CONFIG_CRAMFS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
+# CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
@@ -727,6 +771,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -771,37 +816,55 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NLS_KOI8_U is not set
 CONFIG_NLS_UTF8=y
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=y
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_VM is not set
-# CONFIG_UNWIND_INFO is not set
+# CONFIG_DEBUG_LIST is not set
 CONFIG_FORCED_INLINING=y
-# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_KGDB_CONSOLE is not set
 CONFIG_BDI_SWITCH=y
@@ -818,6 +881,9 @@ CONFIG_BDI_SWITCH=y
 # Cryptographic options
 #
 CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_MANAGER=y
 # CONFIG_CRYPTO_HMAC is not set
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_MD4 is not set
@@ -827,7 +893,12 @@ CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_SHA512 is not set
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=y
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
@@ -841,7 +912,7 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_DEFLATE is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
 #
 # Hardware crypto devices
diff --git a/arch/powerpc/configs/mpc8313_rdb_defconfig b/arch/powerpc/configs/mpc8313_rdb_defconfig
index f87523716c..b7d3dffc98 100644
--- a/arch/powerpc/configs/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/mpc8313_rdb_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
+# Linux kernel version: 2.6.22-rc7
-# Wed Feb  7 22:08:04 2007
+# Sun Jul  1 23:56:55 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_MMIO is not set
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
 # CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -63,14 +64,17 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -83,14 +87,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -122,19 +131,33 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-CONFIG_PPC_GEN550=y
-# CONFIG_WANT_EARLY_SERIAL is not set
 #
 # Platform support
 #
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
 CONFIG_MPC8313_RDB=y
 # CONFIG_MPC832x_MDS is not set
-# CONFIG_MPC834x_SYS is not set
+# CONFIG_MPC832x_RDB is not set
+# CONFIG_MPC834x_MDS is not set
 # CONFIG_MPC834x_ITX is not set
-# CONFIG_MPC8360E_PB is not set
+# CONFIG_MPC836x_MDS is not set
 CONFIG_PPC_MPC831x=y
 # CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
 #
 # Kernel options
@@ -162,33 +185,34 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE=""
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_PPC_I8259 is not set
 CONFIG_PPC_INDIRECT_PCI=y
+# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 # CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
@@ -213,13 +237,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -253,20 +277,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -292,7 +304,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -305,16 +326,13 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 #
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -357,7 +375,6 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 #
 # Mapping drivers for chip access
@@ -387,17 +404,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_ONENAND is not set
 #
-# OneNAND Flash Device Drivers
+# UBI - Unsorted block images
 #
-# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_UBI is not set
 #
 # Parallel port support
@@ -407,6 +420,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -426,19 +440,16 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -467,6 +478,7 @@ CONFIG_CHR_DEV_SG=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -514,10 +526,6 @@ CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -545,18 +553,14 @@ CONFIG_MD_RAID1=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -566,15 +570,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -624,10 +620,8 @@ CONFIG_E100=y
 # CONFIG_SUNDANCE is not set
 # CONFIG_TLAN is not set
 # CONFIG_VIA_RHINE is not set
+# CONFIG_SC92031 is not set
-#
+CONFIG_NETDEV_1000=y
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -645,29 +639,32 @@ CONFIG_E100=y
 CONFIG_GIANFAR=y
 CONFIG_GFAR_NAPI=y
 # CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
-#
+CONFIG_NETDEV_10000=y
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-# CONFIG_NET_RADIO is not set
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 #
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -694,6 +691,7 @@ CONFIG_GFAR_NAPI=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -710,6 +708,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -742,6 +741,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -750,10 +750,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -776,7 +772,6 @@ CONFIG_83xx_WDT=y
 CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
 # CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -787,11 +782,9 @@ CONFIG_HW_RANDOM=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 #
@@ -818,14 +811,15 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_PCA_ISA is not set
 #
 # Miscellaneous I2C Chip support
@@ -859,21 +853,21 @@ CONFIG_SPI_MPC83xx=y
 #
 # SPI Protocol Masters
 #
+# CONFIG_SPI_AT25 is not set
+# CONFIG_SPI_SPIDEV is not set
 #
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
 # CONFIG_SENSORS_ADM1031 is not set
 # CONFIG_SENSORS_ADM9240 is not set
 # CONFIG_SENSORS_ASB100 is not set
@@ -897,6 +891,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
@@ -916,23 +911,30 @@ CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 #
-# Multimedia devices
+# Multifunction device drivers
 #
-# CONFIG_VIDEO_DEV is not set
+# CONFIG_MFD_SM501 is not set
 #
-# Digital Video Broadcasting Devices
+# Multimedia devices
 #
-# CONFIG_DVB is not set
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 # CONFIG_USB_DABUSB is not set
 #
 # Graphics support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
 # Sound
@@ -943,6 +945,18 @@ CONFIG_FIRMWARE_EDID=y
 # HID Devices
 #
 CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+#
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
 #
 # USB support
@@ -957,7 +971,7 @@ CONFIG_USB=y
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_OTG is not set
@@ -968,9 +982,15 @@ CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+CONFIG_USB_OHCI_HCD_PPC_OF=y
+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_SL811_HCD is not set
@@ -1002,43 +1022,10 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_LIBUSUAL is not set
 #
-# USB Input Devices
-#
-# CONFIG_USB_HID is not set
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 #
@@ -1060,6 +1047,7 @@ CONFIG_USB_MON=y
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
@@ -1070,6 +1058,7 @@ CONFIG_USB_MON=y
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 #
@@ -1082,6 +1071,7 @@ CONFIG_USB_MON=y
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_FSL_USB2 is not set
 CONFIG_USB_GADGET_NET2280=y
 CONFIG_USB_NET2280=y
 # CONFIG_USB_GADGET_PXA2XX is not set
@@ -1098,10 +1088,6 @@ CONFIG_USB_ETH_RNDIS=y
 # CONFIG_USB_FILE_STORAGE is not set
 # CONFIG_USB_G_SERIAL is not set
 # CONFIG_USB_MIDI_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -1142,26 +1128,39 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+# CONFIG_RTC_DRV_TEST is not set
 #
-# RTC drivers
+# I2C RTC drivers
 #
-# CONFIG_RTC_DRV_X1205 is not set
 CONFIG_RTC_DRV_DS1307=y
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
+#
+# SPI RTC drivers
+#
 # CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_TEST is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 #
+# on-CPU RTC drivers
+#
+#
 # DMA Engine support
 #
 CONFIG_DMA_ENGINE=y
@@ -1177,10 +1176,6 @@ CONFIG_NET_DMA=y
 CONFIG_INTEL_IOATDMA=y
 #
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1269,6 +1264,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1298,6 +1294,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -1308,6 +1305,7 @@ CONFIG_MSDOS_PARTITION=y
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
@@ -1315,10 +1313,13 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -1335,15 +1336,15 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -1353,12 +1354,13 @@ CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_DEBUG_LIST is not set
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_BDI_SWITCH is not set
 # CONFIG_BOOTX_TEXT is not set
-# CONFIG_SERIAL_TEXT_DEBUG is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 #
@@ -1387,8 +1389,11 @@ CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_ECB is not set
 CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
@@ -1402,6 +1407,7 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_DEFLATE is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
 #
diff --git a/arch/powerpc/configs/mpc832x_mds_defconfig b/arch/powerpc/configs/mpc832x_mds_defconfig
index 83192c0dc5..75ce78139a 100644
--- a/arch/powerpc/configs/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/mpc832x_mds_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc5
+# Linux kernel version: 2.6.22-rc7
-# Mon Apr  9 16:09:16 2007
+# Sun Jul  1 23:56:55 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_MMIO is not set
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
 # CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -70,6 +71,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -85,14 +87,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -124,12 +131,15 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-CONFIG_QUICC_ENGINE=y
-# CONFIG_WANT_EARLY_SERIAL is not set
 #
 # Platform support
 #
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
 # CONFIG_MPC8313_RDB is not set
 CONFIG_MPC832x_MDS=y
 # CONFIG_MPC832x_RDB is not set
@@ -138,6 +148,17 @@ CONFIG_MPC832x_MDS=y
 # CONFIG_MPC836x_MDS is not set
 CONFIG_PPC_MPC832x=y
 # CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+CONFIG_QUICC_ENGINE=y
+# CONFIG_CPM2 is not set
 #
 # Kernel options
@@ -171,6 +192,8 @@ CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE=""
 CONFIG_ISA_DMA_API=y
 #
@@ -178,22 +201,19 @@ CONFIG_ISA_DMA_API=y
 #
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_PPC_I8259 is not set
 CONFIG_PPC_INDIRECT_PCI=y
+# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
@@ -218,7 +238,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -259,20 +278,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -298,7 +305,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -316,10 +332,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -355,12 +367,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -389,6 +399,7 @@ CONFIG_SCSI_PROC_FS=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -436,10 +447,6 @@ CONFIG_SCSI_PROC_FS=y
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -458,18 +465,14 @@ CONFIG_SCSI_PROC_FS=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -479,15 +482,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -501,7 +496,6 @@ CONFIG_DAVICOM_PHY=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
-# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
 #
@@ -520,10 +514,7 @@ CONFIG_MII=y
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -535,6 +526,7 @@ CONFIG_MII=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 # CONFIG_GIANFAR is not set
@@ -542,33 +534,24 @@ CONFIG_UCC_GETH=y
 # CONFIG_UGETH_NAPI is not set
 # CONFIG_UGETH_MAGIC_PACKET is not set
 # CONFIG_UGETH_FILTERING is not set
-# CONFIG_UGETH_TX_ON_DEMOND is not set
+# CONFIG_UGETH_TX_ON_DEMAND is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
-#
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -595,6 +578,7 @@ CONFIG_UCC_GETH=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -611,6 +595,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -652,10 +637,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -674,7 +655,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -685,11 +665,9 @@ CONFIG_GEN_RTC=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 #
@@ -714,9 +692,9 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PASEMI is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
@@ -724,7 +702,6 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_PCA_ISA is not set
 #
 # Miscellaneous I2C Chip support
@@ -752,13 +729,10 @@ CONFIG_I2C_MPC=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -785,6 +759,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
@@ -812,16 +787,19 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
@@ -852,10 +830,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -899,14 +873,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 #
-# Auxiliary Display support
-#
-#
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -994,6 +960,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1019,6 +986,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -1039,11 +1007,13 @@ CONFIG_UCC=y
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -1060,7 +1030,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
@@ -1093,6 +1062,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/arch/powerpc/configs/mpc832x_rdb_defconfig b/arch/powerpc/configs/mpc832x_rdb_defconfig
index 4a4da875fa..6a83b66dd9 100644
--- a/arch/powerpc/configs/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/mpc832x_rdb_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc5
+# Linux kernel version: 2.6.22-rc7
-# Mon Apr  9 16:12:43 2007
+# Sun Jul  1 23:56:56 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_MMIO is not set
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
 # CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -70,6 +71,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -85,14 +87,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -124,12 +131,15 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-CONFIG_QUICC_ENGINE=y
-# CONFIG_WANT_EARLY_SERIAL is not set
 #
 # Platform support
 #
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
 # CONFIG_MPC8313_RDB is not set
 # CONFIG_MPC832x_MDS is not set
 CONFIG_MPC832x_RDB=y
@@ -138,6 +148,17 @@ CONFIG_MPC832x_RDB=y
 # CONFIG_MPC836x_MDS is not set
 CONFIG_PPC_MPC832x=y
 # CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+CONFIG_QUICC_ENGINE=y
+# CONFIG_CPM2 is not set
 #
 # Kernel options
@@ -171,6 +192,8 @@ CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE=""
 CONFIG_ISA_DMA_API=y
 #
@@ -178,22 +201,19 @@ CONFIG_ISA_DMA_API=y
 #
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_PPC_I8259 is not set
 CONFIG_PPC_INDIRECT_PCI=y
+# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
@@ -218,7 +238,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -259,20 +278,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -298,7 +305,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -316,10 +332,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -356,12 +368,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -390,6 +400,7 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -437,10 +448,6 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -459,18 +466,14 @@ CONFIG_BLK_DEV_SD=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -480,15 +483,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -502,7 +497,6 @@ CONFIG_PHYLIB=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
-CONFIG_ICPLUS_PHY=y
 # CONFIG_FIXED_PHY is not set
 #
@@ -521,10 +515,7 @@ CONFIG_MII=y
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
@@ -538,6 +529,7 @@ CONFIG_E1000=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 # CONFIG_GIANFAR is not set
@@ -545,33 +537,34 @@ CONFIG_UCC_GETH=y
 CONFIG_UGETH_NAPI=y
 # CONFIG_UGETH_MAGIC_PACKET is not set
 # CONFIG_UGETH_FILTERING is not set
-# CONFIG_UGETH_TX_ON_DEMOND is not set
+# CONFIG_UGETH_TX_ON_DEMAND is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
-#
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-# CONFIG_NET_RADIO is not set
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 #
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -598,6 +591,7 @@ CONFIG_UGETH_NAPI=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -614,6 +608,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -655,10 +650,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -682,7 +673,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -693,11 +683,9 @@ CONFIG_GEN_RTC=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 #
@@ -722,17 +710,17 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PASEMI is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_PCA_ISA is not set
 #
 # Miscellaneous I2C Chip support
@@ -760,13 +748,10 @@ CONFIG_I2C_MPC=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -793,6 +778,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
@@ -820,17 +806,20 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
-#
+CONFIG_DAB=y
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
 # CONFIG_USB_DABUSB is not set
 #
 # Graphics support
 #
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
@@ -846,6 +835,17 @@ CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
 #
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -858,6 +858,7 @@ CONFIG_USB=y
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_OTG is not set
@@ -908,44 +909,10 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_LIBUSUAL is not set
 #
-# USB Input Devices
-#
-# CONFIG_USB_HID is not set
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-# CONFIG_USB_GTCO is not set
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 #
@@ -989,10 +956,6 @@ CONFIG_USB_MON=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -1036,14 +999,6 @@ CONFIG_USB_MON=y
 #
 #
-# Auxiliary Display support
-#
-#
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1134,6 +1089,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1164,6 +1120,7 @@ CONFIG_LDM_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -1223,11 +1180,13 @@ CONFIG_UCC=y
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -1244,7 +1203,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
@@ -1277,6 +1235,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/arch/powerpc/configs/mpc834x_itx_defconfig b/arch/powerpc/configs/mpc834x_itx_defconfig
index 23d8964846..85470b8cae 100644
--- a/arch/powerpc/configs/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/mpc834x_itx_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
+# Linux kernel version: 2.6.22-rc7
-# Wed Feb  7 13:12:18 2007
+# Sun Jul  1 23:56:56 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_MMIO is not set
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
 # CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -63,14 +64,17 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -83,14 +87,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -122,18 +131,33 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-CONFIG_PPC_GEN550=y
-# CONFIG_WANT_EARLY_SERIAL is not set
 #
 # Platform support
 #
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+# CONFIG_MPC8313_RDB is not set
 # CONFIG_MPC832x_MDS is not set
-# CONFIG_MPC834x_SYS is not set
+# CONFIG_MPC832x_RDB is not set
+# CONFIG_MPC834x_MDS is not set
 CONFIG_MPC834x_ITX=y
-# CONFIG_MPC8360E_PB is not set
+# CONFIG_MPC836x_MDS is not set
 CONFIG_MPC834x=y
 # CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
 #
 # Kernel options
@@ -161,32 +185,33 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE=""
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_PPC_I8259 is not set
 CONFIG_PPC_INDIRECT_PCI=y
+# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
@@ -211,13 +236,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -251,20 +276,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -290,7 +303,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -308,10 +330,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -354,7 +372,6 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 #
 # Mapping drivers for chip access
@@ -384,17 +401,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_ONENAND is not set
 #
-# OneNAND Flash Device Drivers
+# UBI - Unsorted block images
 #
-# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_UBI is not set
 #
 # Parallel port support
@@ -404,6 +417,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -423,19 +437,16 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 # CONFIG_BLK_DEV_IDE is not set
@@ -468,6 +479,7 @@ CONFIG_CHR_DEV_SG=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -516,10 +528,6 @@ CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_SATA_AHCI is not set
@@ -537,10 +545,12 @@ CONFIG_SATA_SIL=y
 # CONFIG_SATA_ULI is not set
 # CONFIG_SATA_VIA is not set
 # CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
 # CONFIG_PATA_ALI is not set
 # CONFIG_PATA_AMD is not set
 # CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CS5520 is not set
 # CONFIG_PATA_CS5530 is not set
@@ -552,6 +562,7 @@ CONFIG_SATA_SIL=y
 # CONFIG_PATA_HPT3X2N is not set
 # CONFIG_PATA_HPT3X3 is not set
 # CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
 # CONFIG_PATA_JMICRON is not set
 # CONFIG_PATA_TRIFLEX is not set
 # CONFIG_PATA_MARVELL is not set
@@ -598,18 +609,14 @@ CONFIG_MD_RAID1=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -619,15 +626,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -647,10 +646,7 @@ CONFIG_CICADA_PHY=y
 # Ethernet (10 or 100Mbit)
 #
 # CONFIG_NET_ETHERNET is not set
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -662,34 +658,38 @@ CONFIG_CICADA_PHY=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 CONFIG_GIANFAR=y
 CONFIG_GFAR_NAPI=y
 # CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
-#
+CONFIG_NETDEV_10000=y
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-# CONFIG_NET_RADIO is not set
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 #
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -745,6 +745,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -753,10 +754,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -779,7 +776,6 @@ CONFIG_83xx_WDT=y
 CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
 # CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -790,11 +786,9 @@ CONFIG_HW_RANDOM=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 #
@@ -821,14 +815,15 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_PCA_ISA is not set
 #
 # Miscellaneous I2C Chip support
@@ -861,36 +856,40 @@ CONFIG_SPI_MPC83xx=y
 #
 # SPI Protocol Masters
 #
+# CONFIG_SPI_AT25 is not set
+# CONFIG_SPI_SPIDEV is not set
 #
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
+# CONFIG_HWMON is not set
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
+# CONFIG_MFD_SM501 is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
+# CONFIG_USB_DABUSB is not set
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_USB_DABUSB is not set
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
 # Sound
@@ -910,7 +909,7 @@ CONFIG_USB=y
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_OTG is not set
@@ -921,6 +920,7 @@ CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_OHCI_HCD is not set
 # CONFIG_USB_UHCI_HCD is not set
@@ -953,28 +953,10 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_LIBUSUAL is not set
 #
-# USB Input Devices
-#
-#
-# USB HID Boot Protocol drivers
-#
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 #
@@ -996,6 +978,7 @@ CONFIG_USB_MON=y
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
@@ -1006,6 +989,7 @@ CONFIG_USB_MON=y
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 #
@@ -1016,10 +1000,6 @@ CONFIG_USB_MON=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -1060,26 +1040,39 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+# CONFIG_RTC_DRV_TEST is not set
 #
-# RTC drivers
+# I2C RTC drivers
 #
-# CONFIG_RTC_DRV_X1205 is not set
 CONFIG_RTC_DRV_DS1307=y
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
+#
+# SPI RTC drivers
+#
 # CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_TEST is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 #
+# on-CPU RTC drivers
+#
+#
 # DMA Engine support
 #
 CONFIG_DMA_ENGINE=y
@@ -1095,10 +1088,6 @@ CONFIG_NET_DMA=y
 CONFIG_INTEL_IOATDMA=y
 #
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1190,6 +1179,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1219,6 +1209,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -1268,6 +1259,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
@@ -1275,10 +1267,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -1295,10 +1290,8 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_BOOTX_TEXT is not set
-# CONFIG_SERIAL_TEXT_DEBUG is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 #
@@ -1327,8 +1320,11 @@ CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_ECB is not set
 CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
@@ -1342,6 +1338,7 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_DEFLATE is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
 #
diff --git a/arch/powerpc/configs/mpc834x_itxgp_defconfig b/arch/powerpc/configs/mpc834x_itxgp_defconfig
index 4aa666c9cb..704ee8b285 100644
--- a/arch/powerpc/configs/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/mpc834x_itxgp_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
+# Linux kernel version: 2.6.22-rc7
-# Fri Feb  9 13:28:19 2007
+# Sun Jul  1 23:56:56 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_MMIO is not set
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
 # CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -63,14 +64,17 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -83,14 +87,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -122,18 +131,33 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-CONFIG_PPC_GEN550=y
-# CONFIG_WANT_EARLY_SERIAL is not set
 #
 # Platform support
 #
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+# CONFIG_MPC8313_RDB is not set
 # CONFIG_MPC832x_MDS is not set
-# CONFIG_MPC834x_SYS is not set
+# CONFIG_MPC832x_RDB is not set
+# CONFIG_MPC834x_MDS is not set
 CONFIG_MPC834x_ITX=y
-# CONFIG_MPC8360E_PB is not set
+# CONFIG_MPC836x_MDS is not set
 CONFIG_MPC834x=y
 # CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
 #
 # Kernel options
@@ -161,32 +185,33 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE=""
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_PPC_I8259 is not set
 CONFIG_PPC_INDIRECT_PCI=y
+# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
@@ -211,13 +236,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -251,20 +276,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -290,7 +303,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -308,10 +330,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -354,7 +372,6 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 #
 # Mapping drivers for chip access
@@ -384,17 +401,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_ONENAND is not set
 #
-# OneNAND Flash Device Drivers
+# UBI - Unsorted block images
 #
-# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_UBI is not set
 #
 # Parallel port support
@@ -404,6 +417,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -422,19 +436,16 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -463,6 +474,7 @@ CONFIG_CHR_DEV_SG=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -510,10 +522,6 @@ CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -532,18 +540,14 @@ CONFIG_SCSI_SPI_ATTRS=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -553,15 +557,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -581,10 +577,7 @@ CONFIG_CICADA_PHY=y
 # Ethernet (10 or 100Mbit)
 #
 # CONFIG_NET_ETHERNET is not set
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -596,34 +589,28 @@ CONFIG_CICADA_PHY=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 CONFIG_GIANFAR=y
 CONFIG_GFAR_NAPI=y
 # CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
-#
+CONFIG_NETDEV_10000=y
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -679,6 +666,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -687,10 +675,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -708,7 +692,6 @@ CONFIG_83xx_WDT=y
 CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
 # CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -719,11 +702,9 @@ CONFIG_HW_RANDOM=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 #
@@ -750,6 +731,7 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
@@ -757,7 +739,6 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_PCA_ISA is not set
 #
 # Miscellaneous I2C Chip support
@@ -790,35 +771,39 @@ CONFIG_SPI_MPC83xx=y
 #
 # SPI Protocol Masters
 #
+# CONFIG_SPI_AT25 is not set
+# CONFIG_SPI_SPIDEV is not set
 #
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
+# CONFIG_HWMON is not set
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
+# CONFIG_MFD_SM501 is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
 # Sound
@@ -841,10 +826,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -885,26 +866,39 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+# CONFIG_RTC_DRV_TEST is not set
 #
-# RTC drivers
+# I2C RTC drivers
 #
-# CONFIG_RTC_DRV_X1205 is not set
 CONFIG_RTC_DRV_DS1307=y
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
+#
+# SPI RTC drivers
+#
 # CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_TEST is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 #
+# on-CPU RTC drivers
+#
+#
 # DMA Engine support
 #
 CONFIG_DMA_ENGINE=y
@@ -920,10 +914,6 @@ CONFIG_NET_DMA=y
 CONFIG_INTEL_IOATDMA=y
 #
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1015,6 +1005,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1044,6 +1035,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -1093,6 +1085,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
@@ -1100,10 +1093,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -1120,10 +1116,8 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_BOOTX_TEXT is not set
-# CONFIG_SERIAL_TEXT_DEBUG is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 #
@@ -1152,8 +1146,11 @@ CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_ECB is not set
 CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
@@ -1167,6 +1164,7 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_DEFLATE is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
 #
diff --git a/arch/powerpc/configs/mpc834x_mds_defconfig b/arch/powerpc/configs/mpc834x_mds_defconfig
index 2e3f8efb6a..c28b3ee3cb 100644
--- a/arch/powerpc/configs/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/mpc834x_mds_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
+# Linux kernel version: 2.6.22-rc7
-# Thu Feb  8 01:00:48 2007
+# Sun Jul  1 23:56:57 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_MMIO is not set
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
 # CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -63,14 +64,17 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -83,14 +87,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -122,19 +131,33 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-CONFIG_PPC_GEN550=y
-# CONFIG_WANT_EARLY_SERIAL is not set
 #
 # Platform support
 #
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
 # CONFIG_MPC8313_RDB is not set
 # CONFIG_MPC832x_MDS is not set
+# CONFIG_MPC832x_RDB is not set
 CONFIG_MPC834x_MDS=y
 # CONFIG_MPC834x_ITX is not set
-# CONFIG_MPC8360E_PB is not set
+# CONFIG_MPC836x_MDS is not set
 CONFIG_MPC834x=y
 # CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
 #
 # Kernel options
@@ -162,32 +185,33 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE=""
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_PPC_I8259 is not set
 CONFIG_PPC_INDIRECT_PCI=y
+# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
@@ -212,13 +236,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -252,20 +276,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -291,7 +303,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -309,10 +330,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -323,6 +340,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -341,19 +359,16 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -362,10 +377,6 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -381,18 +392,14 @@ CONFIG_BLK_DEV_INITRD=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -402,15 +409,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -460,10 +459,8 @@ CONFIG_E100=y
 # CONFIG_SUNDANCE is not set
 # CONFIG_TLAN is not set
 # CONFIG_VIA_RHINE is not set
+# CONFIG_SC92031 is not set
-#
+CONFIG_NETDEV_1000=y
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -481,29 +478,22 @@ CONFIG_E100=y
 CONFIG_GIANFAR=y
 # CONFIG_GFAR_NAPI is not set
 # CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
-#
+CONFIG_NETDEV_10000=y
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -529,6 +519,7 @@ CONFIG_GIANFAR=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -545,6 +536,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -577,6 +569,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -585,10 +578,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -607,7 +596,6 @@ CONFIG_83xx_WDT=y
 # CONFIG_NVRAM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -618,11 +606,9 @@ CONFIG_GEN_RTC=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 #
@@ -649,6 +635,7 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
@@ -656,7 +643,6 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_PCA_ISA is not set
 #
 # Miscellaneous I2C Chip support
@@ -684,16 +670,14 @@ CONFIG_I2C_MPC=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
 # CONFIG_SENSORS_ADM1031 is not set
 # CONFIG_SENSORS_ADM9240 is not set
 # CONFIG_SENSORS_ASB100 is not set
@@ -716,6 +700,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
@@ -735,22 +720,29 @@ CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 #
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
 # Sound
@@ -761,6 +753,7 @@ CONFIG_FIRMWARE_EDID=y
 # HID Devices
 #
 CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
 #
 # USB support
@@ -778,10 +771,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -825,10 +814,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 #
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -916,6 +901,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -941,6 +927,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -951,6 +938,7 @@ CONFIG_PARTITION_ADVANCED=y
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
@@ -958,10 +946,13 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -978,10 +969,8 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_BOOTX_TEXT is not set
-# CONFIG_SERIAL_TEXT_DEBUG is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 #
@@ -1010,8 +999,11 @@ CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
@@ -1025,6 +1017,7 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_DEFLATE is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
 #
diff --git a/arch/powerpc/configs/mpc836x_mds_defconfig b/arch/powerpc/configs/mpc836x_mds_defconfig
index 921a151dc7..bcbbc167f9 100644
--- a/arch/powerpc/configs/mpc836x_mds_defconfig
+++ b/arch/powerpc/configs/mpc836x_mds_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc5
+# Linux kernel version: 2.6.22-rc7
-# Mon Apr  9 16:14:05 2007
+# Sun Jul  1 23:56:57 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_MMIO is not set
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
 # CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -70,6 +71,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -85,14 +87,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -124,12 +131,15 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-CONFIG_QUICC_ENGINE=y
-# CONFIG_WANT_EARLY_SERIAL is not set
 #
 # Platform support
 #
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
 # CONFIG_MPC8313_RDB is not set
 # CONFIG_MPC832x_MDS is not set
 # CONFIG_MPC832x_RDB is not set
@@ -138,6 +148,17 @@ CONFIG_QUICC_ENGINE=y
 CONFIG_MPC836x_MDS=y
 CONFIG_PPC_MPC836x=y
 # CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+CONFIG_QUICC_ENGINE=y
+# CONFIG_CPM2 is not set
 #
 # Kernel options
@@ -170,6 +191,8 @@ CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE=""
 CONFIG_ISA_DMA_API=y
 #
@@ -177,22 +200,19 @@ CONFIG_ISA_DMA_API=y
 #
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_PPC_I8259 is not set
 CONFIG_PPC_INDIRECT_PCI=y
+# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
@@ -217,7 +237,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -258,20 +277,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -297,7 +304,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -315,10 +331,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -354,12 +366,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -388,6 +398,7 @@ CONFIG_SCSI_PROC_FS=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -435,10 +446,6 @@ CONFIG_SCSI_PROC_FS=y
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -457,18 +464,14 @@ CONFIG_SCSI_PROC_FS=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -478,15 +481,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -500,7 +495,6 @@ CONFIG_MARVELL_PHY=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
-# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
 #
@@ -519,10 +513,7 @@ CONFIG_MII=y
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -534,6 +525,7 @@ CONFIG_MII=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 # CONFIG_GIANFAR is not set
@@ -541,33 +533,24 @@ CONFIG_UCC_GETH=y
 # CONFIG_UGETH_NAPI is not set
 # CONFIG_UGETH_MAGIC_PACKET is not set
 # CONFIG_UGETH_FILTERING is not set
-# CONFIG_UGETH_TX_ON_DEMOND is not set
+# CONFIG_UGETH_TX_ON_DEMAND is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
-#
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -594,6 +577,7 @@ CONFIG_UCC_GETH=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -610,6 +594,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -651,10 +636,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -673,7 +654,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -684,11 +664,9 @@ CONFIG_GEN_RTC=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 #
@@ -713,9 +691,9 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PASEMI is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
@@ -723,7 +701,6 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_PCA_ISA is not set
 #
 # Miscellaneous I2C Chip support
@@ -751,13 +728,10 @@ CONFIG_I2C_MPC=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -784,6 +758,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
@@ -811,16 +786,19 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
@@ -851,10 +829,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -898,14 +872,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 #
-# Auxiliary Display support
-#
-#
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -993,6 +959,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1018,6 +985,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -1038,11 +1006,13 @@ CONFIG_UCC=y
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -1059,7 +1029,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
@@ -1092,6 +1061,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/arch/powerpc/configs/mpc8540_ads_defconfig b/arch/powerpc/configs/mpc8540_ads_defconfig
index 17120c4723..faedcf8d64 100644
--- a/arch/powerpc/configs/mpc8540_ads_defconfig
+++ b/arch/powerpc/configs/mpc8540_ads_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-rc5
+# Linux kernel version: 2.6.22-rc7
-# Mon Jan 22 22:25:24 2007
+# Sun Jul  1 23:56:58 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -34,9 +34,9 @@ CONFIG_DEFAULT_UIMAGE=y
 # CONFIG_PPC_83xx is not set
 CONFIG_PPC_85xx=y
 # CONFIG_PPC_86xx is not set
+# CONFIG_PPC_8xx is not set
 # CONFIG_40x is not set
 # CONFIG_44x is not set
-# CONFIG_8xx is not set
 # CONFIG_E200 is not set
 CONFIG_85xx=y
 CONFIG_E500=y
@@ -46,6 +46,7 @@ CONFIG_BOOKE=y
 CONFIG_FSL_BOOKE=y
 # CONFIG_PHYS_64BIT is not set
 CONFIG_SPE=y
+# CONFIG_PPC_MM_SLICES is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 #
@@ -63,14 +64,17 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -85,14 +89,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -119,17 +128,33 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-# CONFIG_WANT_EARLY_SERIAL is not set
 #
 # Platform support
 #
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
 CONFIG_MPC8540_ADS=y
 # CONFIG_MPC8560_ADS is not set
 # CONFIG_MPC85xx_CDS is not set
+# CONFIG_MPC85xx_MDS is not set
+# CONFIG_MPC8544_DS is not set
 CONFIG_MPC8540=y
-CONFIG_PPC_INDIRECT_PCI_BE=y
+CONFIG_MPC85xx=y
 CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
 #
 # Kernel options
@@ -158,21 +183,25 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 # CONFIG_SECCOMP is not set
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE=""
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
-# CONFIG_MPIC_WEIRD is not set
+CONFIG_ZONE_DMA=y
-# CONFIG_PPC_I8259 is not set
 CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_PPC_INDIRECT_PCI_BE=y
 CONFIG_FSL_SOC=y
 # CONFIG_PCI is not set
 # CONFIG_PCI_DOMAINS is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -180,10 +209,6 @@ CONFIG_FSL_SOC=y
 # CONFIG_PCCARD is not set
 #
-# PCI Hotplug Support
-#
-#
 # Advanced setup
 #
 # CONFIG_ADVANCED_OPTIONS is not set
@@ -205,13 +230,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -245,20 +270,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -284,7 +297,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -297,16 +319,13 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 #
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -317,6 +336,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -330,18 +350,13 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
-# CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -350,35 +365,13 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
 # Multi-device support (RAID and LVM)
 #
 # CONFIG_MD is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-#
-# IEEE 1394 (FireWire) support
-#
-#
-# I2O device support
-#
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -388,10 +381,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -412,29 +401,16 @@ CONFIG_PHYLIB=y
 #
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 CONFIG_GIANFAR=y
 CONFIG_GFAR_NAPI=y
+CONFIG_NETDEV_10000=y
 #
-# Ethernet (10000 Mbit)
+# Wireless LAN
-#
-#
-# Token Ring devices
-#
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -458,6 +434,7 @@ CONFIG_GFAR_NAPI=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -474,6 +451,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -497,6 +475,7 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_SHARE_IRQ=y
 #
 # Non-8250 serial port support
@@ -504,6 +483,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_OF_PLATFORM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -512,16 +492,11 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_NVRAM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
@@ -529,10 +504,6 @@ CONFIG_GEN_RTC=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -545,35 +516,41 @@ CONFIG_GEN_RTC=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 #
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
 # Sound
@@ -584,6 +561,7 @@ CONFIG_FIRMWARE_EDID=y
 # HID Devices
 #
 CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
 #
 # USB support
@@ -600,10 +578,6 @@ CONFIG_HID=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -646,10 +620,6 @@ CONFIG_HID=y
 #
 #
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -734,6 +704,7 @@ CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -759,6 +730,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -769,6 +741,7 @@ CONFIG_PARTITION_ADVANCED=y
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
@@ -776,10 +749,13 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -796,15 +772,15 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -813,7 +789,10 @@ CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
 CONFIG_FORCED_INLINING=y
-# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_BDI_SWITCH is not set
 # CONFIG_BOOTX_TEXT is not set
diff --git a/arch/powerpc/configs/mpc8544_ds_defconfig b/arch/powerpc/configs/mpc8544_ds_defconfig
index b563513cc9..c40a25a79c 100644
--- a/arch/powerpc/configs/mpc8544_ds_defconfig
+++ b/arch/powerpc/configs/mpc8544_ds_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc3
+# Linux kernel version: 2.6.22-rc7
-# Mon Mar 19 17:18:49 2007
+# Sun Jul  1 23:56:58 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -46,6 +46,7 @@ CONFIG_BOOKE=y
 CONFIG_FSL_BOOKE=y
 # CONFIG_PHYS_64BIT is not set
 # CONFIG_SPE is not set
+# CONFIG_PPC_MM_SLICES is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 #
@@ -73,6 +74,7 @@ CONFIG_AUDIT=y
 # CONFIG_AUDITSYSCALL is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -90,14 +92,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -129,19 +136,32 @@ CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
-# CONFIG_WANT_EARLY_SERIAL is not set
 #
 # Platform support
 #
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
 # CONFIG_MPC8540_ADS is not set
 # CONFIG_MPC8560_ADS is not set
 # CONFIG_MPC85xx_CDS is not set
 # CONFIG_MPC85xx_MDS is not set
 CONFIG_MPC8544_DS=y
 CONFIG_MPC85xx=y
-CONFIG_PPC_INDIRECT_PCI_BE=y
 CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
 #
 # Kernel options
@@ -176,28 +196,26 @@ CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="root=/dev/sda3 rw console=ttyS0,115200"
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE=""
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
 CONFIG_ZONE_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_PPC_I8259 is not set
 CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_PPC_INDIRECT_PCI_BE=y
 CONFIG_FSL_SOC=y
 # CONFIG_PCI is not set
 # CONFIG_PCI_DOMAINS is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 #
-# PCI Hotplug Support
-#
-#
 # Advanced setup
 #
 # CONFIG_ADVANCED_OPTIONS is not set
@@ -219,7 +237,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -270,25 +287,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -314,10 +319,19 @@ CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
-# CONFIG_IEEE80211 is not set
+# CONFIG_AF_RXRPC is not set
 CONFIG_FIB_RULES=y
 #
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+#
 # Device Drivers
 #
@@ -334,10 +348,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -368,10 +378,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # Misc devices
 #
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -400,6 +407,7 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 CONFIG_SCSI_LOGGING=y
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -415,10 +423,6 @@ CONFIG_SCSI_LOGGING=y
 #
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_DEBUG is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_PATA_PLATFORM is not set
@@ -427,25 +431,7 @@ CONFIG_ATA=y
 # Multi-device support (RAID and LVM)
 #
 # CONFIG_MD is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-#
-# IEEE 1394 (FireWire) support
-#
-#
-# I2O device support
-#
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -455,10 +441,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -479,29 +461,16 @@ CONFIG_VITESSE_PHY=y
 #
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 CONFIG_GIANFAR=y
 CONFIG_GFAR_NAPI=y
+CONFIG_NETDEV_10000=y
 #
-# Ethernet (10000 Mbit)
+# Wireless LAN
-#
-#
-# Token Ring devices
-#
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -525,6 +494,7 @@ CONFIG_GFAR_NAPI=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -541,6 +511,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -571,6 +542,7 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_SHARE_IRQ=y
 #
 # Non-8250 serial port support
@@ -587,16 +559,11 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_NVRAM=y
 CONFIG_GEN_RTC=y
 CONFIG_GEN_RTC_X=y
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
@@ -604,10 +571,6 @@ CONFIG_GEN_RTC_X=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -620,12 +583,7 @@ CONFIG_GEN_RTC_X=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 # CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multifunction device drivers
@@ -636,13 +594,9 @@ CONFIG_GEN_RTC_X=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-#
-# Digital Video Broadcasting Devices
-#
-CONFIG_DVB=y
 CONFIG_DVB_CORE=m
 # CONFIG_DVB_CORE_ATTACH is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
 #
 # Supported DVB Frontends
@@ -676,11 +630,18 @@ CONFIG_DVB_CORE=m
 #
 # Miscellaneous devices
 #
+CONFIG_DAB=y
 #
 # Graphics support
 #
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
@@ -716,10 +677,6 @@ CONFIG_HID=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -759,17 +716,29 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+#
+# I2C RTC drivers
+#
 #
-# RTC drivers
+# SPI RTC drivers
+#
+#
+# Platform RTC drivers
 #
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_TEST is not set
 # CONFIG_RTC_DRV_V3020 is not set
 #
+# on-CPU RTC drivers
+#
+#
 # DMA Engine support
 #
 # CONFIG_DMA_ENGINE is not set
@@ -783,14 +752,6 @@ CONFIG_RTC_INTF_DEV=y
 #
 #
-# Auxiliary Display support
-#
-#
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -890,6 +851,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -919,6 +881,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -968,6 +931,7 @@ CONFIG_NLS_UTF8=m
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
@@ -975,12 +939,14 @@ CONFIG_NLS_UTF8=m
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -998,7 +964,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
@@ -1020,6 +985,7 @@ CONFIG_FORCED_INLINING=y
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_BDI_SWITCH is not set
 # CONFIG_BOOTX_TEXT is not set
@@ -1054,6 +1020,7 @@ CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/arch/powerpc/configs/mpc8560_ads_defconfig b/arch/powerpc/configs/mpc8560_ads_defconfig
index ecaa267a85..a30bc6f621 100644
--- a/arch/powerpc/configs/mpc8560_ads_defconfig
+++ b/arch/powerpc/configs/mpc8560_ads_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-rc5
+# Linux kernel version: 2.6.22-rc7
-# Mon Jan 22 22:25:53 2007
+# Sun Jul  1 23:56:58 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -20,7 +20,7 @@ CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
-# CONFIG_PPC_UDBG_16550 is not set
+CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
@@ -34,9 +34,9 @@ CONFIG_DEFAULT_UIMAGE=y
 # CONFIG_PPC_83xx is not set
 CONFIG_PPC_85xx=y
 # CONFIG_PPC_86xx is not set
+# CONFIG_PPC_8xx is not set
 # CONFIG_40x is not set
 # CONFIG_44x is not set
-# CONFIG_8xx is not set
 # CONFIG_E200 is not set
 CONFIG_85xx=y
 CONFIG_E500=y
@@ -46,6 +46,7 @@ CONFIG_BOOKE=y
 CONFIG_FSL_BOOKE=y
 # CONFIG_PHYS_64BIT is not set
 CONFIG_SPE=y
+# CONFIG_PPC_MM_SLICES is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 #
@@ -63,14 +64,17 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -85,14 +89,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -119,18 +128,33 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-CONFIG_CPM2=y
-# CONFIG_WANT_EARLY_SERIAL is not set
 #
 # Platform support
 #
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
 # CONFIG_MPC8540_ADS is not set
 CONFIG_MPC8560_ADS=y
 # CONFIG_MPC85xx_CDS is not set
+# CONFIG_MPC85xx_MDS is not set
+# CONFIG_MPC8544_DS is not set
 CONFIG_MPC8560=y
-CONFIG_PPC_INDIRECT_PCI_BE=y
+CONFIG_MPC85xx=y
 CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+CONFIG_CPM2=y
 #
 # Kernel options
@@ -148,7 +172,6 @@ CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=y
 # CONFIG_MATH_EMULATION is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-# CONFIG_PC_KEYBOARD is not set
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_SELECT_MEMORY_MODEL=y
@@ -160,32 +183,33 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
 # CONFIG_PROC_DEVICETREE is not set
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 # CONFIG_SECCOMP is not set
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE=""
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
-# CONFIG_MPIC_WEIRD is not set
+CONFIG_ZONE_DMA=y
-# CONFIG_PPC_I8259 is not set
 CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_PPC_INDIRECT_PCI_BE=y
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 CONFIG_PCI_DEBUG=y
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
@@ -210,13 +234,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -250,20 +274,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -289,7 +301,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -302,16 +323,13 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 #
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -322,6 +340,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -340,19 +359,16 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -361,10 +377,6 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -380,18 +392,14 @@ CONFIG_BLK_DEV_INITRD=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -401,15 +409,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -444,10 +444,7 @@ CONFIG_MII=y
 CONFIG_FS_ENET=y
 # CONFIG_FS_ENET_HAS_SCC is not set
 CONFIG_FS_ENET_HAS_FCC=y
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
@@ -461,34 +458,28 @@ CONFIG_E1000_NAPI=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 CONFIG_GIANFAR=y
 CONFIG_GFAR_NAPI=y
 # CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
-#
+CONFIG_NETDEV_10000=y
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -514,6 +505,7 @@ CONFIG_GFAR_NAPI=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -530,6 +522,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -573,16 +566,11 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -593,10 +581,7 @@ CONFIG_GEN_RTC=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -609,35 +594,41 @@ CONFIG_GEN_RTC=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 #
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
 # Sound
@@ -648,6 +639,7 @@ CONFIG_FIRMWARE_EDID=y
 # HID Devices
 #
 CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
 #
 # USB support
@@ -665,10 +657,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -712,10 +700,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 #
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -800,6 +784,7 @@ CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -825,6 +810,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -835,6 +821,7 @@ CONFIG_PARTITION_ADVANCED=y
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
@@ -842,10 +829,13 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -862,15 +852,15 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -879,7 +869,10 @@ CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
 CONFIG_FORCED_INLINING=y
-# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_KGDB_CONSOLE is not set
 # CONFIG_BDI_SWITCH is not set
diff --git a/arch/powerpc/configs/mpc8568mds_defconfig b/arch/powerpc/configs/mpc8568mds_defconfig
index 7b3800674c..6451d4dd28 100644
--- a/arch/powerpc/configs/mpc8568mds_defconfig
+++ b/arch/powerpc/configs/mpc8568mds_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
+# Linux kernel version: 2.6.22-rc7
-# Sat Feb 17 16:26:53 2007
+# Sun Jul  1 23:56:59 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -46,6 +46,7 @@ CONFIG_BOOKE=y
 CONFIG_FSL_BOOKE=y
 # CONFIG_PHYS_64BIT is not set
 CONFIG_SPE=y
+# CONFIG_PPC_MM_SLICES is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 #
@@ -70,8 +71,10 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -84,14 +87,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -123,18 +131,32 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-# CONFIG_WANT_EARLY_SERIAL is not set
 #
 # Platform support
 #
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
 # CONFIG_MPC8540_ADS is not set
 # CONFIG_MPC8560_ADS is not set
 # CONFIG_MPC85xx_CDS is not set
 CONFIG_MPC85xx_MDS=y
+# CONFIG_MPC8544_DS is not set
 CONFIG_MPC85xx=y
-CONFIG_PPC_INDIRECT_PCI_BE=y
 CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
 #
 # Kernel options
@@ -168,18 +190,20 @@ CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE=""
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
 CONFIG_ZONE_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_PPC_I8259 is not set
 CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_PPC_INDIRECT_PCI_BE=y
 CONFIG_FSL_SOC=y
 # CONFIG_PCI is not set
 # CONFIG_PCI_DOMAINS is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -187,10 +211,6 @@ CONFIG_FSL_SOC=y
 # CONFIG_PCCARD is not set
 #
-# PCI Hotplug Support
-#
-#
 # Advanced setup
 #
 # CONFIG_ADVANCED_OPTIONS is not set
@@ -212,7 +232,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -253,20 +272,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -292,7 +299,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -312,10 +328,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -326,6 +338,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -339,17 +352,13 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -378,6 +387,7 @@ CONFIG_SCSI_PROC_FS=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -393,35 +403,13 @@ CONFIG_SCSI_PROC_FS=y
 #
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_DEBUG is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
 # Multi-device support (RAID and LVM)
 #
 # CONFIG_MD is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-#
-# IEEE 1394 (FireWire) support
-#
-#
-# I2O device support
-#
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -431,10 +419,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -455,29 +439,16 @@ CONFIG_MARVELL_PHY=y
 #
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 CONFIG_GIANFAR=y
 CONFIG_GFAR_NAPI=y
+CONFIG_NETDEV_10000=y
 #
-# Ethernet (10000 Mbit)
+# Wireless LAN
-#
-#
-# Token Ring devices
-#
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -501,6 +472,7 @@ CONFIG_GFAR_NAPI=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -517,6 +489,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -540,6 +513,7 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_SHARE_IRQ=y
 #
 # Non-8250 serial port support
@@ -556,10 +530,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -572,7 +542,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
@@ -580,11 +549,8 @@ CONFIG_GEN_RTC=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 #
@@ -600,8 +566,8 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MPC=y
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_STUB is not set
-# CONFIG_I2C_PCA_ISA is not set
 #
 # Miscellaneous I2C Chip support
@@ -629,16 +595,14 @@ CONFIG_I2C_MPC=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
 # CONFIG_SENSORS_ADM1031 is not set
 # CONFIG_SENSORS_ADM9240 is not set
 # CONFIG_SENSORS_ASB100 is not set
@@ -661,6 +625,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
@@ -677,22 +642,29 @@ CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 #
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
 # Sound
@@ -720,10 +692,6 @@ CONFIG_HID=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -766,14 +734,6 @@ CONFIG_HID=y
 #
 #
-# Auxiliary Display support
-#
-#
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -861,6 +821,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -886,6 +847,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -896,6 +858,7 @@ CONFIG_PARTITION_ADVANCED=y
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
@@ -903,11 +866,13 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -926,9 +891,9 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
@@ -943,8 +908,10 @@ CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_DEBUG_LIST is not set
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_DEBUGGER=y
 # CONFIG_XMON is not set
 # CONFIG_BDI_SWITCH is not set
@@ -958,6 +925,7 @@ CONFIG_PPC_EARLY_DEBUG=y
 # CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
 # CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
 # CONFIG_PPC_EARLY_DEBUG_BEAT is not set
+# CONFIG_PPC_EARLY_DEBUG_44x is not set
 #
 # Security options
@@ -987,6 +955,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/arch/powerpc/configs/mpc85xx_cds_defconfig b/arch/powerpc/configs/mpc85xx_cds_defconfig
index 1f61bce33e..d9afe7009d 100644
--- a/arch/powerpc/configs/mpc85xx_cds_defconfig
+++ b/arch/powerpc/configs/mpc85xx_cds_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-rc5
+# Linux kernel version: 2.6.22-rc7
-# Mon Jan 22 22:26:46 2007
+# Sun Jul  1 23:56:59 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -34,9 +34,9 @@ CONFIG_DEFAULT_UIMAGE=y
 # CONFIG_PPC_83xx is not set
 CONFIG_PPC_85xx=y
 # CONFIG_PPC_86xx is not set
+# CONFIG_PPC_8xx is not set
 # CONFIG_40x is not set
 # CONFIG_44x is not set
-# CONFIG_8xx is not set
 # CONFIG_E200 is not set
 CONFIG_85xx=y
 CONFIG_E500=y
@@ -46,6 +46,7 @@ CONFIG_BOOKE=y
 CONFIG_FSL_BOOKE=y
 # CONFIG_PHYS_64BIT is not set
 CONFIG_SPE=y
+# CONFIG_PPC_MM_SLICES is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 #
@@ -63,14 +64,17 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -85,14 +89,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -119,17 +128,33 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-# CONFIG_WANT_EARLY_SERIAL is not set
 #
 # Platform support
 #
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
 # CONFIG_MPC8540_ADS is not set
 # CONFIG_MPC8560_ADS is not set
 CONFIG_MPC85xx_CDS=y
+# CONFIG_MPC85xx_MDS is not set
+# CONFIG_MPC8544_DS is not set
 CONFIG_MPC8540=y
-CONFIG_PPC_INDIRECT_PCI_BE=y
+CONFIG_MPC85xx=y
 CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
 #
 # Kernel options
@@ -158,32 +183,33 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 # CONFIG_SECCOMP is not set
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE=""
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
-# CONFIG_MPIC_WEIRD is not set
+CONFIG_ZONE_DMA=y
-# CONFIG_PPC_I8259 is not set
 CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_PPC_INDIRECT_PCI_BE=y
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 # CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
@@ -208,13 +234,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -248,20 +274,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -287,7 +301,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -300,16 +323,13 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 #
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -320,6 +340,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -338,19 +359,16 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -365,6 +383,7 @@ CONFIG_BLK_DEV_IDE=y
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 #
 # IDE chipset support/bugfixes
@@ -372,12 +391,13 @@ CONFIG_BLK_DEV_IDE=y
 CONFIG_IDE_GENERIC=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=y
 # CONFIG_BLK_DEV_OPTI621 is not set
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_IDEDMA_PCI_AUTO is not set
+# CONFIG_IDEDMA_ONLYDISK is not set
 # CONFIG_BLK_DEV_AEC62XX is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
 # CONFIG_BLK_DEV_AMD74XX is not set
@@ -391,6 +411,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_JMICRON is not set
 # CONFIG_BLK_DEV_SC1200 is not set
 # CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT8213 is not set
 # CONFIG_BLK_DEV_IT821X is not set
 # CONFIG_BLK_DEV_NS87415 is not set
 # CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -401,10 +422,10 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_BLK_DEV_TC86C001 is not set
 # CONFIG_IDE_ARM is not set
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
-# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
 #
@@ -413,10 +434,6 @@ CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -432,18 +449,14 @@ CONFIG_BLK_DEV_IDEDMA=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -453,15 +466,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -493,10 +498,7 @@ CONFIG_MII=y
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
@@ -510,34 +512,28 @@ CONFIG_E1000_NAPI=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 CONFIG_GIANFAR=y
 CONFIG_GFAR_NAPI=y
 # CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
-#
+CONFIG_NETDEV_10000=y
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -563,6 +559,7 @@ CONFIG_GFAR_NAPI=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -579,6 +576,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -603,6 +601,7 @@ CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_SHARE_IRQ=y
 #
 # Non-8250 serial port support
@@ -611,6 +610,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -619,16 +619,11 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_NVRAM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -639,10 +634,7 @@ CONFIG_GEN_RTC=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -655,35 +647,41 @@ CONFIG_GEN_RTC=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 #
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
 # Sound
@@ -694,6 +692,7 @@ CONFIG_FIRMWARE_EDID=y
 # HID Devices
 #
 CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
 #
 # USB support
@@ -711,10 +710,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -758,10 +753,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 #
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -846,6 +837,7 @@ CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -871,6 +863,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -881,6 +874,7 @@ CONFIG_PARTITION_ADVANCED=y
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
@@ -888,10 +882,13 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -908,15 +905,15 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -925,7 +922,10 @@ CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
 CONFIG_FORCED_INLINING=y
-# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_BDI_SWITCH is not set
 # CONFIG_BOOTX_TEXT is not set
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig
index 53fcd6932f..1ac94a605b 100644
--- a/arch/powerpc/configs/mpc8641_hpcn_defconfig
+++ b/arch/powerpc/configs/mpc8641_hpcn_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-rc5
+# Linux kernel version: 2.6.22-rc7
-# Mon Jan 22 22:27:14 2007
+# Sun Jul  1 23:57:00 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -24,7 +24,7 @@ CONFIG_PPC_UDBG_16550=y
 CONFIG_GENERIC_TBSYNC=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
-# CONFIG_DEFAULT_UIMAGE is not set
+CONFIG_DEFAULT_UIMAGE=y
 #
 # Processor support
@@ -34,9 +34,9 @@ CONFIG_GENERIC_BUG=y
 # CONFIG_PPC_83xx is not set
 # CONFIG_PPC_85xx is not set
 CONFIG_PPC_86xx=y
+# CONFIG_PPC_8xx is not set
 # CONFIG_40x is not set
 # CONFIG_44x is not set
-# CONFIG_8xx is not set
 # CONFIG_E200 is not set
 CONFIG_6xx=y
 CONFIG_PPC_FPU=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
 CONFIG_ALTIVEC=y
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
 CONFIG_SMP=y
 CONFIG_NR_CPUS=2
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -70,9 +71,11 @@ CONFIG_LOCALVERSION=""
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_CPUSETS is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -87,14 +90,19 @@ CONFIG_BUG=y
 # CONFIG_ELF_CORE is not set
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -121,15 +129,28 @@ CONFIG_DEFAULT_DEADLINE=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="deadline"
-# CONFIG_WANT_EARLY_SERIAL is not set
-CONFIG_PPC_INDIRECT_PCI_BE=y
-CONFIG_MPIC=y
 #
-# Platform Support
+# Platform support
 #
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
 CONFIG_MPC8641_HPCN=y
 CONFIG_MPC8641=y
+CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+CONFIG_PPC_I8259=y
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
 #
 # Kernel options
@@ -159,33 +180,34 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 # CONFIG_SECCOMP is not set
+# CONFIG_WANT_DEVICE_TREE is not set
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-CONFIG_PPC_I8259=y
 CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_PPC_INDIRECT_PCI_BE=y
 CONFIG_FSL_SOC=y
+CONFIG_FSL_PCIE=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 # CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
@@ -210,13 +232,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -234,7 +256,7 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_TUNNEL=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_INET_XFRM_MODE_BEET=y
@@ -247,6 +269,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set
 # CONFIG_INET6_IPCOMP is not set
@@ -262,20 +285,8 @@ CONFIG_IPV6_SIT=y
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -301,7 +312,16 @@ CONFIG_IPV6_SIT=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -314,16 +334,13 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 #
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -334,6 +351,7 @@ CONFIG_FW_LOADER=y
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -352,19 +370,16 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=131072
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -373,10 +388,6 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -392,18 +403,14 @@ CONFIG_BLK_DEV_INITRD=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -413,15 +420,7 @@ CONFIG_DUMMY=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -453,10 +452,7 @@ CONFIG_MII=y
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -468,34 +464,28 @@ CONFIG_MII=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 CONFIG_GIANFAR=y
 # CONFIG_GFAR_NAPI is not set
 # CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
-#
+CONFIG_NETDEV_10000=y
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -521,6 +511,7 @@ CONFIG_GIANFAR=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -537,6 +528,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -581,6 +573,7 @@ CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
@@ -588,15 +581,10 @@ CONFIG_UNIX98_PTYS=y
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_NVRAM is not set
 # CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -607,11 +595,9 @@ CONFIG_UNIX98_PTYS=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 # CONFIG_I2C_CHARDEV is not set
 #
@@ -638,13 +624,13 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_PCA_ISA is not set
 #
 # Miscellaneous I2C Chip support
@@ -672,27 +658,30 @@ CONFIG_SENSORS_EEPROM=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
+# CONFIG_HWMON is not set
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
+# CONFIG_MFD_SM501 is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
@@ -702,7 +691,6 @@ CONFIG_FIRMWARE_EDID=y
 CONFIG_VGA_CONSOLE=y
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
 # Sound
@@ -713,6 +701,7 @@ CONFIG_DUMMY_CONSOLE=y
 # HID Devices
 #
 CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
 #
 # USB support
@@ -730,10 +719,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -777,10 +762,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 #
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -869,6 +850,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -899,6 +881,7 @@ CONFIG_LDM_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -948,6 +931,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
@@ -955,10 +939,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -975,15 +962,15 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -993,7 +980,10 @@ CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
 CONFIG_FORCED_INLINING=y
-# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_BDI_SWITCH is not set
 # CONFIG_BOOTX_TEXT is not set
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig
index 539d9e3d36..e6b18ea8f6 100644
--- a/arch/powerpc/configs/mpc866_ads_defconfig
+++ b/arch/powerpc/configs/mpc866_ads_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19-rc6
+# Linux kernel version: 2.6.22-rc7
-# Fri Nov 24 21:13:55 2006
+# Sun Jul  1 23:57:00 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -10,6 +10,7 @@ CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_IRQ_PER_CPU=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -28,7 +29,6 @@ CONFIG_AUDIT_ARCH=y
 # Processor support
 #
 # CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_52xx is not set
 # CONFIG_PPC_82xx is not set
 # CONFIG_PPC_83xx is not set
 # CONFIG_PPC_85xx is not set
@@ -40,6 +40,7 @@ CONFIG_PPC_8xx=y
 CONFIG_8xx=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
+# CONFIG_PPC_MM_SLICES is not set
 CONFIG_NOT_COHERENT_CACHE=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -58,14 +59,17 @@ CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -78,14 +82,19 @@ CONFIG_PRINTK=y
 CONFIG_ELF_CORE=y
 # CONFIG_BASE_FULL is not set
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 # CONFIG_VM_EVENT_COUNTERS is not set
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=1
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -112,13 +121,14 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-# CONFIG_WANT_EARLY_SERIAL is not set
-CONFIG_EMBEDDEDBOOT=y
-# CONFIG_MPIC is not set
 #
 # Platform support
 #
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
 CONFIG_CPM1=y
 # CONFIG_MPC8XXFADS is not set
 CONFIG_MPC86XADS=y
@@ -137,6 +147,18 @@ CONFIG_NO_UCODE_PATCH=y
 # CONFIG_USB_SOF_UCODE_PATCH is not set
 # CONFIG_I2C_SPI_UCODE_PATCH is not set
 # CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set
+# CONFIG_PQ2ADS is not set
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
 #
 # Kernel options
@@ -144,6 +166,7 @@ CONFIG_NO_UCODE_PATCH=y
 # CONFIG_HIGHMEM is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
 CONFIG_HZ_1000=y
 CONFIG_HZ=1000
 CONFIG_PREEMPT_NONE=y
@@ -164,31 +187,29 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
 # CONFIG_PROC_DEVICETREE is not set
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 # CONFIG_SECCOMP is not set
+# CONFIG_WANT_DEVICE_TREE is not set
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
-# CONFIG_MPIC_WEIRD is not set
+CONFIG_ZONE_DMA=y
-# CONFIG_PPC_I8259 is not set
 CONFIG_FSL_SOC=y
 # CONFIG_PCI is not set
 # CONFIG_PCI_DOMAINS is not set
 # CONFIG_PCI_QSPAN is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 #
-# PCI Hotplug Support
-#
-#
 # Advanced setup
 #
 # CONFIG_ADVANCED_OPTIONS is not set
@@ -212,13 +233,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -246,25 +267,14 @@ CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -290,7 +300,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -307,10 +326,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -321,6 +336,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -331,18 +347,13 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
-# CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -351,34 +362,13 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
 # Multi-device support (RAID and LVM)
 #
 # CONFIG_MD is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-#
-# IEEE 1394 (FireWire) support
-#
-#
-# I2O device support
-#
-#
-# Macintosh device drivers
-#
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -388,10 +378,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -404,6 +390,7 @@ CONFIG_PHYLIB=y
 # CONFIG_CICADA_PHY is not set
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FIXED_MII_10_FDX=y
 CONFIG_FIXED_MII_100_FDX=y
@@ -417,27 +404,14 @@ CONFIG_MII=y
 CONFIG_FS_ENET=y
 CONFIG_FS_ENET_HAS_SCC=y
 CONFIG_FS_ENET_HAS_FEC=y
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 #
-# Ethernet (1000 Mbit)
+# Wireless LAN
-#
-#
-# Ethernet (10000 Mbit)
-#
-#
-# Token Ring devices
-#
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -461,6 +435,7 @@ CONFIG_FS_ENET_HAS_FEC=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -486,9 +461,16 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -516,6 +498,7 @@ CONFIG_SERIO_LIBPS2=y
 #
 # Non-8250 serial port support
 #
+# CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_CPM=y
@@ -533,31 +516,18 @@ CONFIG_UNIX98_PTYS=y
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_RAW_DRIVER is not set
 #
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -570,33 +540,41 @@ CONFIG_GEN_RTC=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 #
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_FB_IBM_GXT4500 is not set
 #
 # Sound
@@ -604,6 +582,12 @@ CONFIG_FIRMWARE_EDID=y
 # CONFIG_SOUND is not set
 #
+# HID Devices
+#
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+#
 # USB support
 #
 # CONFIG_USB_ARCH_HAS_HCD is not set
@@ -618,10 +602,6 @@ CONFIG_FIRMWARE_EDID=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -752,6 +732,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -781,6 +762,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -788,14 +770,25 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_NLS is not set
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
+#
 # Library routines
 #
+CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=y
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -809,11 +802,9 @@ CONFIG_PLIST=y
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_FS is not set
-# CONFIG_UNWIND_INFO is not set
 # CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
 # CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
index e2c17d8da4..fc4f9b766a 100644
--- a/arch/powerpc/configs/mpc885_ads_defconfig
+++ b/arch/powerpc/configs/mpc885_ads_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19-rc4
+# Linux kernel version: 2.6.22-rc7
-# Fri Nov 10 21:30:40 2006
+# Sun Jul  1 23:57:01 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -10,6 +10,7 @@ CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_IRQ_PER_CPU=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -28,7 +29,6 @@ CONFIG_AUDIT_ARCH=y
 # Processor support
 #
 # CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_52xx is not set
 # CONFIG_PPC_82xx is not set
 # CONFIG_PPC_83xx is not set
 # CONFIG_PPC_85xx is not set
@@ -38,6 +38,9 @@ CONFIG_PPC_8xx=y
 # CONFIG_44x is not set
 # CONFIG_E200 is not set
 CONFIG_8xx=y
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+# CONFIG_PPC_MM_SLICES is not set
 CONFIG_NOT_COHERENT_CACHE=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -56,14 +59,17 @@ CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -76,14 +82,19 @@ CONFIG_PRINTK=y
 CONFIG_ELF_CORE=y
 # CONFIG_BASE_FULL is not set
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 # CONFIG_VM_EVENT_COUNTERS is not set
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=1
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -110,19 +121,27 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-# CONFIG_WANT_EARLY_SERIAL is not set
-CONFIG_EMBEDDEDBOOT=y
-# CONFIG_MPIC is not set
 #
 # Platform support
 #
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
 CONFIG_CPM1=y
 # CONFIG_MPC8XXFADS is not set
 # CONFIG_MPC86XADS is not set
 CONFIG_MPC885ADS=y
 #
+# Freescale Ethernet driver platform-specific options
+#
+CONFIG_MPC8xx_SECOND_ETH=y
+CONFIG_MPC8xx_SECOND_ETH_FEC2=y
+# CONFIG_MPC8xx_SECOND_ETH_SCC3 is not set
+#
 # MPC8xx CPM Options
 #
@@ -135,6 +154,18 @@ CONFIG_NO_UCODE_PATCH=y
 # CONFIG_USB_SOF_UCODE_PATCH is not set
 # CONFIG_I2C_SPI_UCODE_PATCH is not set
 # CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set
+# CONFIG_PQ2ADS is not set
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
 #
 # Kernel options
@@ -142,6 +173,7 @@ CONFIG_NO_UCODE_PATCH=y
 # CONFIG_HIGHMEM is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
 CONFIG_HZ_1000=y
 CONFIG_HZ=1000
 CONFIG_PREEMPT_NONE=y
@@ -162,31 +194,29 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
 # CONFIG_PROC_DEVICETREE is not set
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 # CONFIG_SECCOMP is not set
+# CONFIG_WANT_DEVICE_TREE is not set
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
-# CONFIG_MPIC_WEIRD is not set
+CONFIG_ZONE_DMA=y
-# CONFIG_PPC_I8259 is not set
 CONFIG_FSL_SOC=y
 # CONFIG_PCI is not set
 # CONFIG_PCI_DOMAINS is not set
 # CONFIG_PCI_QSPAN is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 #
-# PCI Hotplug Support
-#
-#
 # Advanced setup
 #
 # CONFIG_ADVANCED_OPTIONS is not set
@@ -210,13 +240,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -244,25 +274,14 @@ CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -288,7 +307,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -305,10 +333,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -319,6 +343,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -329,18 +354,13 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
-# CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -349,34 +369,13 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
 # Multi-device support (RAID and LVM)
 #
 # CONFIG_MD is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-#
-# IEEE 1394 (FireWire) support
-#
-#
-# I2O device support
-#
-#
-# Macintosh device drivers
-#
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -386,10 +385,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -402,6 +397,7 @@ CONFIG_DAVICOM_PHY=y
 # CONFIG_CICADA_PHY is not set
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FIXED_MII_10_FDX=y
 # CONFIG_FIXED_MII_100_FDX is not set
@@ -415,27 +411,14 @@ CONFIG_MII=y
 CONFIG_FS_ENET=y
 CONFIG_FS_ENET_HAS_SCC=y
 CONFIG_FS_ENET_HAS_FEC=y
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 #
-# Ethernet (1000 Mbit)
+# Wireless LAN
-#
-#
-# Ethernet (10000 Mbit)
-#
-#
-# Token Ring devices
-#
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -459,6 +442,7 @@ CONFIG_FS_ENET_HAS_FEC=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -484,9 +468,16 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -514,6 +505,7 @@ CONFIG_SERIO_LIBPS2=y
 #
 # Non-8250 serial port support
 #
+# CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_CPM=y
@@ -531,31 +523,18 @@ CONFIG_UNIX98_PTYS=y
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_RAW_DRIVER is not set
 #
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -568,33 +547,41 @@ CONFIG_GEN_RTC=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 #
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_FB_IBM_GXT4500 is not set
 #
 # Sound
@@ -602,6 +589,12 @@ CONFIG_FIRMWARE_EDID=y
 # CONFIG_SOUND is not set
 #
+# HID Devices
+#
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+#
 # USB support
 #
 # CONFIG_USB_ARCH_HAS_HCD is not set
@@ -616,10 +609,6 @@ CONFIG_FIRMWARE_EDID=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -750,6 +739,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -779,6 +769,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -786,14 +777,25 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_NLS is not set
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
+#
 # Library routines
 #
+CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=y
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -807,11 +809,9 @@ CONFIG_PLIST=y
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_FS is not set
-# CONFIG_UNWIND_INFO is not set
 # CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
 # CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig
index 0507c8f7bf..905998b925 100644
--- a/arch/powerpc/configs/pasemi_defconfig
+++ b/arch/powerpc/configs/pasemi_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21
+# Linux kernel version: 2.6.22-rc6
-# Mon May 14 12:55:04 2007
+# Tue Jun 26 13:51:39 2007
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -295,20 +295,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -466,10 +454,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
 # CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
@@ -571,7 +555,6 @@ CONFIG_SCSI_3W_9XXX=y
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_ESP_CORE is not set
 # CONFIG_SCSI_SRP is not set
 #
@@ -580,10 +563,6 @@ CONFIG_SCSI_3W_9XXX=y
 # CONFIG_PCMCIA_FDOMAIN is not set
 # CONFIG_PCMCIA_QLOGIC is not set
 # CONFIG_PCMCIA_SYM53C500 is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_SATA_AHCI is not set
@@ -694,15 +673,7 @@ CONFIG_DUMMY=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -752,10 +723,7 @@ CONFIG_NET_PCI=y
 # CONFIG_SUNDANCE is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_SC92031 is not set
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
@@ -774,10 +742,7 @@ CONFIG_TIGON3=y
 # CONFIG_BNX2 is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
-#
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
@@ -786,11 +751,6 @@ CONFIG_TIGON3=y
 # CONFIG_NETXEN_NIC is not set
 CONFIG_PASEMI_MAC=y
 # CONFIG_MLX4_CORE is not set
-CONFIG_MLX4_DEBUG=y
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
@@ -808,15 +768,7 @@ CONFIG_MLX4_DEBUG=y
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_USBNET_MII is not set
 # CONFIG_USB_USBNET is not set
-#
-# PCMCIA network device support
-#
 # CONFIG_NET_PCMCIA is not set
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -843,6 +795,7 @@ CONFIG_MLX4_DEBUG=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -1661,7 +1614,6 @@ CONFIG_NLS_ISO8859_1=y
 #
 # CONFIG_DLM is not set
 # CONFIG_UCC_SLOW is not set
-# CONFIG_UCC_FAST is not set
 #
 # Library routines
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index f611df480f..0d8ba623e2 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -1,9 +1,10 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-rc5
+# Linux kernel version: 2.6.22-rc6
-# Mon Jan 22 22:28:56 2007
+# Tue Jun 26 14:11:36 2007
 #
 # CONFIG_PPC64 is not set
+CONFIG_PPC_PM_NEEDS_RTC_LIB=y
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -24,6 +25,7 @@ CONFIG_PPC_OF=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_DEFAULT_UIMAGE is not set
 #
@@ -34,9 +36,9 @@ CONFIG_CLASSIC32=y
 # CONFIG_PPC_83xx is not set
 # CONFIG_PPC_85xx is not set
 # CONFIG_PPC_86xx is not set
+# CONFIG_PPC_8xx is not set
 # CONFIG_40x is not set
 # CONFIG_44x is not set
-# CONFIG_8xx is not set
 # CONFIG_E200 is not set
 CONFIG_6xx=y
 CONFIG_PPC_FPU=y
@@ -45,6 +47,7 @@ CONFIG_PPC_FPU=y
 CONFIG_ALTIVEC=y
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
 # CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -63,6 +66,7 @@ CONFIG_LOCALVERSION=""
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
@@ -70,8 +74,10 @@ CONFIG_POSIX_MQUEUE=y
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -86,14 +92,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -134,12 +145,17 @@ CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_APUS is not set
 # CONFIG_PPC_CHRP is not set
 # CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_EFIKA is not set
 # CONFIG_PPC_LITE5200 is not set
 CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
 CONFIG_PPC_NATIVE=y
+CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
 # CONFIG_PPC_RTAS is not set
 # CONFIG_MMIO_NVRAM is not set
 CONFIG_PPC_MPC106=y
@@ -158,11 +174,14 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 # CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+#
+# CPU Frequency drivers
+#
 CONFIG_CPU_FREQ_PMAC=y
 CONFIG_PPC601_SYNC_FIX=y
 # CONFIG_TAU is not set
-# CONFIG_WANT_EARLY_SERIAL is not set
+# CONFIG_CPM2 is not set
-CONFIG_MPIC=y
 #
 # Kernel options
@@ -191,6 +210,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_PM=y
@@ -200,19 +220,23 @@ CONFIG_PM_DEBUG=y
 CONFIG_PM_SYSFS_DEPRECATED=y
 CONFIG_SOFTWARE_SUSPEND=y
 CONFIG_PM_STD_PARTITION=""
+CONFIG_APM_EMULATION=y
 CONFIG_SECCOMP=y
+# CONFIG_WANT_DEVICE_TREE is not set
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_PPC_I8259 is not set
 CONFIG_PPC_INDIRECT_PCI=y
+# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
 # CONFIG_PCI_DEBUG is not set
 #
@@ -237,10 +261,6 @@ CONFIG_YENTA_TOSHIBA=y
 # CONFIG_PD6729 is not set
 # CONFIG_I82092 is not set
 CONFIG_PCCARD_NONSTATIC=m
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
@@ -265,14 +285,15 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 CONFIG_NET_KEY=y
+# CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
@@ -297,10 +318,6 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-#
-# IP: Virtual Server Configuration
-#
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
@@ -314,8 +331,6 @@ CONFIG_NETFILTER=y
 #
 # CONFIG_NETFILTER_NETLINK is not set
 CONFIG_NF_CONNTRACK_ENABLED=m
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
 CONFIG_NF_CONNTRACK=m
 # CONFIG_NF_CT_ACCT is not set
 # CONFIG_NF_CONNTRACK_MARK is not set
@@ -327,16 +342,21 @@ CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_IRC=m
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 # CONFIG_NF_CONNTRACK_PPTP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
 # CONFIG_NF_CONNTRACK_SIP is not set
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
 # CONFIG_NETFILTER_XT_TARGET_DSCP is not set
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
@@ -377,7 +397,6 @@ CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_NEEDED=y
 CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -396,14 +415,11 @@ CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_TTL=m
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
 CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 CONFIG_IP_DCCP=m
 CONFIG_INET_DCCP_DIAG=m
 CONFIG_IP_DCCP_ACKVEC=y
@@ -422,15 +438,7 @@ CONFIG_IP_DCCP_CCID3_RTO=100
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -448,6 +456,7 @@ CONFIG_IP_DCCP_CCID3_RTO=100
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
+CONFIG_NET_SCH_FIFO=y
 CONFIG_NET_CLS_ROUTE=y
 #
@@ -485,6 +494,7 @@ CONFIG_IRTTY_SIR=m
 # Dongle support
 #
 # CONFIG_DONGLE is not set
+# CONFIG_KINGSUN_DONGLE is not set
 #
 # Old SIR device drivers
@@ -532,13 +542,23 @@ CONFIG_BT_HCIBFUSB=m
 # CONFIG_BT_HCIBLUECARD is not set
 # CONFIG_BT_HCIBTUART is not set
 # CONFIG_BT_HCIVHCI is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+CONFIG_CFG80211=m
+CONFIG_WIRELESS_EXT=y
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
 # CONFIG_IEEE80211_SOFTMAC is not set
-CONFIG_WIRELESS_EXT=y
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -551,6 +571,7 @@ CONFIG_WIRELESS_EXT=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 #
@@ -558,10 +579,6 @@ CONFIG_FW_LOADER=y
 #
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -572,6 +589,7 @@ CONFIG_PROC_EVENTS=y
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -592,19 +610,16 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
@@ -615,11 +630,13 @@ CONFIG_BLK_DEV_IDE=y
 CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_BLK_DEV_IDECS=m
+# CONFIG_BLK_DEV_DELKIN is not set
 CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDETAPE is not set
 CONFIG_BLK_DEV_IDEFLOPPY=y
 CONFIG_BLK_DEV_IDESCSI=y
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 #
 # IDE chipset support/bugfixes
@@ -627,12 +644,12 @@ CONFIG_BLK_DEV_IDESCSI=y
 # CONFIG_IDE_GENERIC is not set
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=y
 # CONFIG_BLK_DEV_OPTI621 is not set
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_IDEDMA_ONLYDISK is not set
 # CONFIG_BLK_DEV_AEC62XX is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
@@ -647,6 +664,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_BLK_DEV_JMICRON is not set
 # CONFIG_BLK_DEV_SC1200 is not set
 # CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT8213 is not set
 # CONFIG_BLK_DEV_IT821X is not set
 # CONFIG_BLK_DEV_NS87415 is not set
 # CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -657,13 +675,13 @@ CONFIG_BLK_DEV_SL82C105=y
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
 CONFIG_BLK_DEV_IDE_PMAC=y
 CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
 CONFIG_BLK_DEV_IDEDMA_PMAC=y
 # CONFIG_IDE_ARM is not set
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
-CONFIG_IDEDMA_AUTO=y
 # CONFIG_BLK_DEV_HD is not set
 #
@@ -693,6 +711,7 @@ CONFIG_CHR_DEV_SG=y
 CONFIG_SCSI_CONSTANTS=y
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -762,10 +781,6 @@ CONFIG_SCSI_MAC53C94=y
 # CONFIG_PCMCIA_NINJA_SCSI is not set
 # CONFIG_PCMCIA_QLOGIC is not set
 # CONFIG_PCMCIA_SYM53C500 is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -787,6 +802,7 @@ CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 # CONFIG_DM_MULTIPATH is not set
+# CONFIG_DM_DELAY is not set
 #
 # Fusion MPT device support
@@ -799,28 +815,26 @@ CONFIG_DM_ZERO=m
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 CONFIG_IEEE1394=m
 #
 # Subsystem Options
 #
 # CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_OUI_DB is not set
-CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
-CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
-# CONFIG_IEEE1394_EXPORT_FULL_API is not set
 #
-# Device Drivers
+# Controllers
 #
 # CONFIG_IEEE1394_PCILYNX is not set
 CONFIG_IEEE1394_OHCI1394=m
 #
-# Protocol Drivers
+# Protocols
 #
 CONFIG_IEEE1394_VIDEO1394=m
 CONFIG_IEEE1394_SBP2=m
+# CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set
 # CONFIG_IEEE1394_ETH1394 is not set
 CONFIG_IEEE1394_DV1394=m
 CONFIG_IEEE1394_RAWIO=m
@@ -829,10 +843,7 @@ CONFIG_IEEE1394_RAWIO=m
 # I2O device support
 #
 # CONFIG_I2O is not set
+CONFIG_MACINTOSH_DRIVERS=y
-#
-# Macintosh device drivers
-#
 CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
@@ -858,15 +869,7 @@ CONFIG_DUMMY=m
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 #
@@ -907,10 +910,8 @@ CONFIG_PCNET32=y
 # CONFIG_SUNDANCE is not set
 # CONFIG_TLAN is not set
 # CONFIG_VIA_RHINE is not set
+# CONFIG_SC92031 is not set
-#
+CONFIG_NETDEV_1000=y
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -927,77 +928,62 @@ CONFIG_PCNET32=y
 # CONFIG_BNX2 is not set
 # CONFIG_MV643XX_ETH is not set
 # CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
-#
+CONFIG_NETDEV_10000=y
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
-#
-CONFIG_NET_RADIO=y
-# CONFIG_NET_WIRELESS_RTNETLINK is not set
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-#
-# Wireless 802.11 Frequency Hopping cards support
 #
+# CONFIG_WLAN_PRE80211 is not set
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
-#
-# Wireless 802.11b ISA/PCI cards support
-#
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
+# CONFIG_LIBERTAS is not set
 # CONFIG_AIRO is not set
 CONFIG_HERMES=m
 CONFIG_APPLE_AIRPORT=m
 # CONFIG_PLX_HERMES is not set
 # CONFIG_TMD_HERMES is not set
 # CONFIG_NORTEL_HERMES is not set
-# CONFIG_PCI_HERMES is not set
+CONFIG_PCI_HERMES=m
 # CONFIG_ATMEL is not set
+CONFIG_PCMCIA_HERMES=m
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-# CONFIG_PCMCIA_HERMES is not set
 # CONFIG_PCMCIA_SPECTRUM is not set
 # CONFIG_AIRO_CS is not set
 # CONFIG_PCMCIA_WL3501 is not set
-#
-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
-#
 CONFIG_PRISM54=m
 # CONFIG_USB_ZD1201 is not set
 # CONFIG_HOSTAP is not set
-CONFIG_NET_WIRELESS=y
 #
-# PCMCIA network device support
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+CONFIG_USB_USBNET_MII=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+# CONFIG_USB_NET_DM9601 is not set
+# CONFIG_USB_NET_GL620A is not set
+CONFIG_USB_NET_NET1080=m
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+CONFIG_USB_NET_ZAURUS=m
 # CONFIG_NET_PCMCIA is not set
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -1033,6 +1019,7 @@ CONFIG_SLHC=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -1059,8 +1046,10 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_INPUT_MOUSE=y
 # CONFIG_MOUSE_PS2 is not set
 # CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -1100,6 +1089,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_CORE=m
 CONFIG_SERIAL_PMACZILOG=m
 # CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -1108,16 +1098,11 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_NVRAM=y
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 CONFIG_AGP=m
@@ -1143,11 +1128,9 @@ CONFIG_DRM_RADEON=m
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=m
 #
@@ -1175,14 +1158,15 @@ CONFIG_I2C_POWERMAC=y
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_PCA_ISA is not set
 #
 # Miscellaneous I2C Chip support
@@ -1210,37 +1194,56 @@ CONFIG_I2C_POWERMAC=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
+# CONFIG_HWMON is not set
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
+# CONFIG_MFD_SM501 is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_USB_DABUSB is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_LCD_CLASS_DEVICE=m
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_FIRMWARE_EDID is not set
+CONFIG_DISPLAY_SUPPORT=y
+#
+# Display hardware drivers
+#
+CONFIG_VGASTATE=y
 CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
 CONFIG_FB_DDC=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
 CONFIG_FB_MACMODES=y
 CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
+#
+# Frame buffer hardware drivers
+#
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_CYBER2000 is not set
@@ -1255,6 +1258,7 @@ CONFIG_FB_IMSTT=y
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_NVIDIA=y
 CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
 CONFIG_FB_NVIDIA_BACKLIGHT=y
 # CONFIG_FB_RIVA is not set
 CONFIG_FB_MATROX=y
@@ -1274,6 +1278,7 @@ CONFIG_FB_ATY_CT=y
 # CONFIG_FB_ATY_GENERIC_LCD is not set
 CONFIG_FB_ATY_GX=y
 CONFIG_FB_ATY_BACKLIGHT=y
+# CONFIG_FB_S3 is not set
 # CONFIG_FB_SAVAGE is not set
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_NEOMAGIC is not set
@@ -1281,7 +1286,10 @@ CONFIG_FB_ATY_BACKLIGHT=y
 CONFIG_FB_3DFX=y
 # CONFIG_FB_3DFX_ACCEL is not set
 # CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
 # CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_VIRTUAL is not set
@@ -1295,26 +1303,15 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_DEVICE=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 #
 # Sound
 #
 CONFIG_SOUND=m
-CONFIG_DMASOUND_PMAC=m
-CONFIG_DMASOUND=m
 #
 # Advanced Linux Sound Architecture
@@ -1428,6 +1425,7 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m
 #
 CONFIG_SND_USB_AUDIO=m
 # CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_USB_CAIAQ is not set
 #
 # PCMCIA devices
@@ -1436,6 +1434,11 @@ CONFIG_SND_USB_AUDIO=m
 # CONFIG_SND_PDAUDIOCF is not set
 #
+# System on Chip audio support
+#
+# CONFIG_SND_SOC is not set
+#
 # Open Sound System
 #
 # CONFIG_SOUND_PRIME is not set
@@ -1444,6 +1447,15 @@ CONFIG_SND_USB_AUDIO=m
 # HID Devices
 #
 CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+CONFIG_USB_HIDINPUT_POWERBOOK=y
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
 #
 # USB support
@@ -1458,10 +1470,9 @@ CONFIG_USB=y
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
+CONFIG_USB_DEVICE_CLASS=y
 CONFIG_USB_DYNAMIC_MINORS=y
 # CONFIG_USB_SUSPEND is not set
-# CONFIG_USB_MULTITHREAD_PROBE is not set
 # CONFIG_USB_OTG is not set
 #
@@ -1471,9 +1482,12 @@ CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_SPLIT_ISO=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
@@ -1506,49 +1520,10 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_LIBUSUAL is not set
 #
-# USB Input Devices
-#
-CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT_POWERBOOK=y
-# CONFIG_HID_FF is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-CONFIG_USB_APPLETOUCH=y
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-CONFIG_USB_USBNET_MII=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-# CONFIG_USB_NET_GL620A is not set
-CONFIG_USB_NET_NET1080=m
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_MON=y
 #
@@ -1620,6 +1595,7 @@ CONFIG_USB_EZUSB=y
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
@@ -1630,6 +1606,7 @@ CONFIG_USB_APPLEDISPLAY=m
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 #
@@ -1640,10 +1617,6 @@ CONFIG_USB_APPLEDISPLAY=m
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -1676,6 +1649,7 @@ CONFIG_LEDS_TRIGGER_IDE_DISK=y
 #
 # Real Time Clock
 #
+CONFIG_RTC_LIB=y
 # CONFIG_RTC_CLASS is not set
 #
@@ -1692,10 +1666,6 @@ CONFIG_LEDS_TRIGGER_IDE_DISK=y
 #
 #
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1731,7 +1701,6 @@ CONFIG_FUSE_FS=m
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 CONFIG_UDF_NLS=y
@@ -1796,6 +1765,7 @@ CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
@@ -1826,6 +1796,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -1875,6 +1846,7 @@ CONFIG_NLS_UTF8=m
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
@@ -1882,6 +1854,7 @@ CONFIG_NLS_UTF8=m
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
@@ -1891,13 +1864,16 @@ CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
 #
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=y
+# CONFIG_KPROBES is not set
 #
 # Kernel hacking
@@ -1909,15 +1885,15 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -1927,6 +1903,9 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_FORCED_INLINING is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
 CONFIG_DEBUGGER=y
 CONFIG_XMON=y
 CONFIG_XMON_DEFAULT=y
@@ -1962,8 +1941,11 @@ CONFIG_CRYPTO_TGR192=m
 # CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1978,6 +1960,7 @@ CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
 #
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 126b9f87df..6e503d98da 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-rc5
+# Linux kernel version: 2.6.22-rc6
-# Mon Jan 22 22:28:58 2007
+# Tue Jun 26 14:15:02 2007
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -27,6 +27,7 @@ CONFIG_GENERIC_TBSYNC=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
+CONFIG_PPC64_SWSUSP=y
 #
 # Processor support
@@ -41,6 +42,7 @@ CONFIG_PPC_DCR=y
 CONFIG_PPC_OF_PLATFORM_PCI=y
 CONFIG_ALTIVEC=y
 CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_MM_SLICES=y
 CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=32
@@ -61,20 +63,23 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
+# CONFIG_TASK_XACCT is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=17
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_TASK_XACCT is not set
 CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
 CONFIG_SYSCTL_SYSCALL=y
@@ -87,14 +92,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -133,24 +143,54 @@ CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_EMBEDDED6xx is not set
 # CONFIG_APUS is not set
 CONFIG_PPC_PSERIES=y
+CONFIG_PPC_SPLPAR=y
+CONFIG_EEH=y
+CONFIG_SCANLOG=m
+CONFIG_LPARCFG=y
 CONFIG_PPC_ISERIES=y
+#
+# iSeries device drivers
+#
+CONFIG_VIODASD=y
+CONFIG_VIOCD=m
+CONFIG_VIOTAPE=m
+CONFIG_VIOPATH=y
 # CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
 CONFIG_PPC_PMAC=y
 CONFIG_PPC_PMAC64=y
 CONFIG_PPC_MAPLE=y
 # CONFIG_PPC_PASEMI is not set
+CONFIG_PPC_CELLEB=y
+# CONFIG_PPC_PS3 is not set
 CONFIG_PPC_CELL=y
 CONFIG_PPC_CELL_NATIVE=y
 CONFIG_PPC_IBM_CELL_BLADE=y
-# CONFIG_PPC_PS3 is not set
+#
+# Cell Broadband Engine options
+#
+CONFIG_SPU_FS=m
+CONFIG_SPU_FS_64K_LS=y
+CONFIG_SPU_BASE=y
+CONFIG_CBE_RAS=y
+CONFIG_CBE_THERM=m
+CONFIG_CBE_CPUFREQ=m
+# CONFIG_PQ2ADS is not set
 CONFIG_PPC_NATIVE=y
 CONFIG_UDBG_RTAS_CONSOLE=y
+CONFIG_PPC_UDBG_BEAT=y
 CONFIG_XICS=y
+CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+CONFIG_PPC_I8259=y
 CONFIG_U3_DART=y
 CONFIG_PPC_RTAS=y
 CONFIG_RTAS_ERROR_LOGGING=y
 CONFIG_RTAS_PROC=y
 CONFIG_RTAS_FLASH=m
+CONFIG_PPC_PMI=m
 CONFIG_MMIO_NVRAM=y
 CONFIG_MPIC_U3_HT_IRQS=y
 CONFIG_IBMVIO=y
@@ -171,18 +211,12 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 # CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_PMAC64=y
-# CONFIG_WANT_EARLY_SERIAL is not set
-CONFIG_MPIC=y
 #
-# Cell Broadband Engine options
+# CPU Frequency drivers
 #
-CONFIG_SPU_FS=m
+CONFIG_CPU_FREQ_PMAC64=y
-CONFIG_SPU_BASE=y
+# CONFIG_CPM2 is not set
-CONFIG_CBE_RAS=y
-CONFIG_CBE_THERM=m
-CONFIG_CBE_CPUFREQ=m
 #
 # Kernel options
@@ -205,10 +239,6 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_KEXEC=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_IRQ_ALL_CPUS=y
-CONFIG_PPC_SPLPAR=y
-CONFIG_EEH=y
-CONFIG_SCANLOG=m
-CONFIG_LPARCFG=y
 # CONFIG_NUMA is not set
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -227,35 +257,35 @@ CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTPLUG_SPARSE=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_PPC_HAS_HASH_64K=y
 # CONFIG_PPC_64K_PAGES is not set
 # CONFIG_SCHED_SMT is not set
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
+# CONFIG_WANT_DEVICE_TREE is not set
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-CONFIG_PPC_I8259=y
 # CONFIG_PPC_INDIRECT_PCI is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 CONFIG_HOTPLUG_PCI=m
 # CONFIG_HOTPLUG_PCI_FAKE is not set
 # CONFIG_HOTPLUG_PCI_CPCI is not set
@@ -272,14 +302,15 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
@@ -304,10 +335,6 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-#
-# IP: Virtual Server Configuration
-#
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
@@ -323,8 +350,6 @@ CONFIG_NETFILTER_NETLINK=y
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK_ENABLED=m
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
@@ -337,10 +362,42 @@ CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+# CONFIG_NF_CONNTRACK_SANE is not set
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
-# CONFIG_NETFILTER_XTABLES is not set
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 #
 # IP: Netfilter Configuration
@@ -348,20 +405,45 @@ CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
-#
+CONFIG_IP_NF_MATCH_IPRANGE=m
-# DCCP Configuration (EXPERIMENTAL)
+CONFIG_IP_NF_MATCH_TOS=m
-#
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -380,6 +462,7 @@ CONFIG_LLC=y
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
+CONFIG_NET_CLS_ROUTE=y
 #
 # Network testing
@@ -388,7 +471,16 @@ CONFIG_LLC=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -401,16 +493,13 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 #
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -421,6 +510,7 @@ CONFIG_FW_LOADER=y
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -440,19 +530,16 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=65536
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
@@ -467,6 +554,7 @@ CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 #
 # IDE chipset support/bugfixes
@@ -474,12 +562,12 @@ CONFIG_BLK_DEV_IDECD=y
 CONFIG_IDE_GENERIC=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=y
 # CONFIG_BLK_DEV_OPTI621 is not set
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_IDEDMA_ONLYDISK is not set
 # CONFIG_BLK_DEV_AEC62XX is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
@@ -494,6 +582,7 @@ CONFIG_BLK_DEV_AMD74XX=y
 # CONFIG_BLK_DEV_JMICRON is not set
 # CONFIG_BLK_DEV_SC1200 is not set
 # CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT8213 is not set
 # CONFIG_BLK_DEV_IT821X is not set
 # CONFIG_BLK_DEV_NS87415 is not set
 # CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -504,13 +593,14 @@ CONFIG_BLK_DEV_AMD74XX=y
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+CONFIG_BLK_DEV_CELLEB=y
 CONFIG_BLK_DEV_IDE_PMAC=y
 CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
 CONFIG_BLK_DEV_IDEDMA_PMAC=y
 # CONFIG_IDE_ARM is not set
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
-CONFIG_IDEDMA_AUTO=y
 # CONFIG_BLK_DEV_HD is not set
 #
@@ -540,6 +630,7 @@ CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -593,11 +684,8 @@ CONFIG_SCSI_LPFC=m
 # CONFIG_SCSI_DC390T is not set
 CONFIG_SCSI_DEBUG=m
 # CONFIG_SCSI_SRP is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=y
+CONFIG_ATA_NONSTANDARD=y
 # CONFIG_SATA_AHCI is not set
 CONFIG_SATA_SVW=y
 # CONFIG_ATA_PIIX is not set
@@ -613,10 +701,12 @@ CONFIG_SATA_SVW=y
 # CONFIG_SATA_ULI is not set
 # CONFIG_SATA_VIA is not set
 # CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
 # CONFIG_PATA_ALI is not set
 # CONFIG_PATA_AMD is not set
 # CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CS5520 is not set
 # CONFIG_PATA_CS5530 is not set
@@ -628,6 +718,7 @@ CONFIG_SATA_SVW=y
 # CONFIG_PATA_HPT3X2N is not set
 # CONFIG_PATA_HPT3X3 is not set
 # CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
 # CONFIG_PATA_JMICRON is not set
 # CONFIG_PATA_TRIFLEX is not set
 # CONFIG_PATA_MARVELL is not set
@@ -647,6 +738,7 @@ CONFIG_SATA_SVW=y
 # CONFIG_PATA_SIS is not set
 # CONFIG_PATA_VIA is not set
 CONFIG_PATA_WINBOND=y
+CONFIG_PATA_SCC=y
 #
 # Multi-device support (RAID and LVM)
@@ -669,6 +761,7 @@ CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
+# CONFIG_DM_DELAY is not set
 #
 # Fusion MPT device support
@@ -681,28 +774,26 @@ CONFIG_DM_MULTIPATH_EMC=m
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 CONFIG_IEEE1394=y
 #
 # Subsystem Options
 #
 # CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_OUI_DB is not set
-CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
-CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
-# CONFIG_IEEE1394_EXPORT_FULL_API is not set
 #
-# Device Drivers
+# Controllers
 #
 # CONFIG_IEEE1394_PCILYNX is not set
 CONFIG_IEEE1394_OHCI1394=y
 #
-# Protocol Drivers
+# Protocols
 #
 CONFIG_IEEE1394_VIDEO1394=m
 CONFIG_IEEE1394_SBP2=m
+CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
 CONFIG_IEEE1394_ETH1394=m
 CONFIG_IEEE1394_DV1394=m
 CONFIG_IEEE1394_RAWIO=y
@@ -711,10 +802,7 @@ CONFIG_IEEE1394_RAWIO=y
 # I2O device support
 #
 # CONFIG_I2O is not set
+CONFIG_MACINTOSH_DRIVERS=y
-#
-# Macintosh device drivers
-#
 CONFIG_ADB_PMU=y
 # CONFIG_ADB_PMU_LED is not set
 CONFIG_PMAC_SMU=y
@@ -734,16 +822,23 @@ CONFIG_DUMMY=m
 CONFIG_BONDING=m
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
+CONFIG_PHYLIB=m
 #
-# PHY device support
+# MII PHY device drivers
 #
-# CONFIG_PHYLIB is not set
+CONFIG_MARVELL_PHY=m
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+CONFIG_BROADCOM_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y
 #
 # Ethernet (10 or 100Mbit)
@@ -782,10 +877,8 @@ CONFIG_E100=y
 # CONFIG_EPIC100 is not set
 # CONFIG_SUNDANCE is not set
 # CONFIG_VIA_RHINE is not set
+# CONFIG_SC92031 is not set
-#
+CONFIG_NETDEV_1000=y
-# Ethernet (1000 Mbit)
-#
 CONFIG_ACENIC=y
 CONFIG_ACENIC_OMIT_TIGON_I=y
 # CONFIG_DL2K is not set
@@ -805,33 +898,37 @@ CONFIG_TIGON3=y
 # CONFIG_BNX2 is not set
 CONFIG_SPIDER_NET=m
 # CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
-#
+CONFIG_NETDEV_10000=y
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
 CONFIG_IXGB=m
 # CONFIG_IXGB_NAPI is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+CONFIG_PASEMI_MAC=m
-#
+# CONFIG_MLX4_CORE is not set
-# Token Ring devices
-#
 CONFIG_TR=y
 CONFIG_IBMOL=y
 # CONFIG_3C359 is not set
 # CONFIG_TMS380TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-# CONFIG_NET_RADIO is not set
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 #
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 CONFIG_ISERIES_VETH=m
 # CONFIG_FDDI is not set
@@ -851,7 +948,6 @@ CONFIG_SLHC=m
 # CONFIG_SHAPER is not set
 CONFIG_NETCONSOLE=y
 CONFIG_NETPOLL=y
-CONFIG_NETPOLL_RX=y
 CONFIG_NETPOLL_TRAP=y
 CONFIG_NET_POLL_CONTROLLER=y
@@ -870,6 +966,7 @@ CONFIG_NET_POLL_CONTROLLER=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -895,12 +992,25 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
 # CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_UINPUT is not set
 #
@@ -940,7 +1050,12 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_PMACZILOG is not set
 CONFIG_SERIAL_ICOM=m
+CONFIG_SERIAL_TXX9=y
+CONFIG_HAS_TXX9_SERIAL=y
+CONFIG_SERIAL_TXX9_NR_UARTS=6
+CONFIG_SERIAL_TXX9_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -948,21 +1063,17 @@ CONFIG_HVC_DRIVER=y
 CONFIG_HVC_CONSOLE=y
 CONFIG_HVC_ISERIES=y
 CONFIG_HVC_RTAS=y
+CONFIG_HVC_BEAT=y
 CONFIG_HVCS=m
 #
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -975,11 +1086,9 @@ CONFIG_MAX_RAW_DEVS=256
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 #
@@ -1006,14 +1115,15 @@ CONFIG_I2C_POWERMAC=y
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_PCA_ISA is not set
 #
 # Miscellaneous I2C Chip support
@@ -1040,37 +1150,56 @@ CONFIG_I2C_POWERMAC=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
+# CONFIG_HWMON is not set
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
+# CONFIG_MFD_SM501 is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_USB_DABUSB is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_LCD_CLASS_DEVICE=y
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+CONFIG_DISPLAY_SUPPORT=y
+#
+# Display hardware drivers
+#
+# CONFIG_VGASTATE is not set
 CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
 CONFIG_FB_MACMODES=y
-# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
+#
+# Frame buffer hardware drivers
+#
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_CYBER2000 is not set
@@ -1090,16 +1219,21 @@ CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_RADEON=y
 CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
 # CONFIG_FB_RADEON_DEBUG is not set
 # CONFIG_FB_ATY128 is not set
 # CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
 # CONFIG_FB_SAVAGE is not set
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
 # CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
 CONFIG_FB_IBM_GXT4500=y
 # CONFIG_FB_VIRTUAL is not set
@@ -1113,19 +1247,10 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_DEVICE=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_DEVICE=y
 #
 # Sound
@@ -1242,6 +1367,12 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m
 #
 # CONFIG_SND_USB_AUDIO is not set
 # CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_USB_CAIAQ is not set
+#
+# System on Chip audio support
+#
+# CONFIG_SND_SOC is not set
 #
 # Open Sound System
@@ -1252,6 +1383,15 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m
 # HID Devices
 #
 CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
 #
 # USB support
@@ -1266,9 +1406,8 @@ CONFIG_USB=y
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_MULTITHREAD_PROBE is not set
 # CONFIG_USB_OTG is not set
 #
@@ -1278,9 +1417,12 @@ CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
@@ -1314,40 +1456,10 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_LIBUSUAL is not set
 #
-# USB Input Devices
-#
-CONFIG_USB_HID=y
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-# CONFIG_HID_FF is not set
-CONFIG_USB_HIDDEV=y
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_USBNET is not set
 # CONFIG_USB_MON is not set
 #
@@ -1369,6 +1481,7 @@ CONFIG_USB_HIDDEV=y
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
@@ -1379,6 +1492,7 @@ CONFIG_USB_APPLEDISPLAY=m
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 #
@@ -1389,10 +1503,6 @@ CONFIG_USB_APPLEDISPLAY=m
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -1417,8 +1527,11 @@ CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
+# CONFIG_INFINIBAND_IPATH is not set
 # CONFIG_INFINIBAND_AMSO1100 is not set
+# CONFIG_MLX4_INFINIBAND is not set
 CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
 # CONFIG_INFINIBAND_SRP is not set
@@ -1447,10 +1560,6 @@ CONFIG_INFINIBAND_ISER=m
 #
 #
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1567,6 +1676,7 @@ CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 CONFIG_RPCSEC_GSS_SPKM3=m
 # CONFIG_SMB_FS is not set
@@ -1602,6 +1712,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 #
 # Native Language Support
@@ -1651,15 +1762,7 @@ CONFIG_NLS_UTF8=m
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
-#
-# iSeries device drivers
-#
-# CONFIG_VIOCONS is not set
-CONFIG_VIODASD=y
-CONFIG_VIOCD=m
-CONFIG_VIOTAPE=m
-CONFIG_VIOPATH=y
 #
 # Library routines
@@ -1667,14 +1770,19 @@ CONFIG_VIOPATH=y
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -1693,15 +1801,15 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=17
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -1711,8 +1819,10 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_LIST is not set
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
 CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_DEBUG_STACK_USAGE=y
+# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_HCALL_STATS is not set
 CONFIG_DEBUGGER=y
 CONFIG_XMON=y
@@ -1749,8 +1859,11 @@ CONFIG_CRYPTO_TGR192=m
 # CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1765,6 +1878,7 @@ CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_CAMELLIA is not set
 CONFIG_CRYPTO_TEST=m
 #
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig
index c70a730820..fb504a7146 100644
--- a/arch/powerpc/configs/prpmc2800_defconfig
+++ b/arch/powerpc/configs/prpmc2800_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21
+# Linux kernel version: 2.6.22-rc6
-# Wed May  9 09:42:46 2007
+# Tue Jun 26 14:15:11 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -90,7 +90,11 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLAB=y
@@ -274,20 +278,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -383,7 +375,6 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 #
 # Mapping drivers for chip access
@@ -454,10 +445,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
 # CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
@@ -472,6 +459,7 @@ CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 #
 # IDE chipset support/bugfixes
@@ -479,6 +467,7 @@ CONFIG_BLK_DEV_IDEDISK=y
 CONFIG_IDE_GENERIC=y
 CONFIG_BLK_DEV_IDEPCI=y
 # CONFIG_IDEPCI_SHARE_IRQ is not set
+CONFIG_IDEPCI_PCIBUS_ORDER=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=y
 # CONFIG_BLK_DEV_OPTI621 is not set
@@ -588,12 +577,7 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_ESP_CORE is not set
 # CONFIG_SCSI_SRP is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_SATA_AHCI is not set
@@ -665,6 +649,7 @@ CONFIG_SATA_MV=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
@@ -683,15 +668,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 CONFIG_PHYLIB=y
 #
@@ -746,10 +723,7 @@ CONFIG_8139TOO=y
 # CONFIG_TLAN is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_SC92031 is not set
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
@@ -769,20 +743,14 @@ CONFIG_E1000=y
 CONFIG_MV643XX_ETH=y
 # CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
-#
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
@@ -792,8 +760,14 @@ CONFIG_MV643XX_ETH=y
 # CONFIG_WLAN_80211 is not set
 #
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -820,6 +794,7 @@ CONFIG_MV643XX_ETH=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -880,16 +855,11 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_NVRAM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -1023,12 +993,8 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
-#
+# CONFIG_DAB is not set
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-# CONFIG_USB_DABUSB is not set
 #
 # Graphics support
@@ -1124,16 +1090,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 #
@@ -1261,14 +1217,6 @@ CONFIG_RTC_DRV_MAX6900=y
 #
 #
-# Auxiliary Display support
-#
-#
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1396,7 +1344,6 @@ CONFIG_MSDOS_PARTITION=y
 #
 # CONFIG_DLM is not set
 # CONFIG_UCC_SLOW is not set
-# CONFIG_UCC_FAST is not set
 #
 # Library routines
@@ -1404,6 +1351,7 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index 477934558f..d0b43df444 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21
+# Linux kernel version: 2.6.22-rc6
-# Fri May 11 10:16:27 2007
+# Tue Jun 26 14:15:19 2007
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -87,7 +87,11 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLAB=y
@@ -152,7 +156,11 @@ CONFIG_PS3_HTAB_SIZE=20
 CONFIG_PS3_USE_LPAR_ADDR=y
 CONFIG_PS3_VUART=y
 CONFIG_PS3_PS3AV=y
-CONFIG_PS3_SYS_MANAGER=y
+CONFIG_PS3_SYS_MANAGER=m
+CONFIG_PS3_STORAGE=y
+CONFIG_PS3_DISK=y
+CONFIG_PS3_ROM=y
+CONFIG_PS3_FLASH=y
 CONFIG_PPC_CELL=y
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_IBM_CELL_BLADE is not set
@@ -301,20 +309,8 @@ CONFIG_IPV6_SIT=y
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -343,7 +339,7 @@ CONFIG_BT=m
 CONFIG_BT_L2CAP=m
 CONFIG_BT_SCO=m
 CONFIG_BT_RFCOMM=m
-# CONFIG_BT_RFCOMM_TTY is not set
+CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=m
@@ -352,7 +348,9 @@ CONFIG_BT_HIDP=m
 #
 CONFIG_BT_HCIUSB=m
 CONFIG_BT_HCIUSB_SCO=y
-# CONFIG_BT_HCIUART is not set
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIBCM203X is not set
 # CONFIG_BT_HCIBPA10X is not set
 # CONFIG_BT_HCIBFUSB is not set
@@ -418,10 +416,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # Misc devices
 #
 # CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -447,7 +441,7 @@ CONFIG_CHR_DEV_SG=m
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
 #
-# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
@@ -467,11 +461,6 @@ CONFIG_SCSI_WAIT_SCAN=m
 #
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_ESP_CORE is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -490,27 +479,13 @@ CONFIG_NETDEVICES=y
 # CONFIG_TUN is not set
 #
-# PHY device support
-#
-#
 # Ethernet (10 or 100Mbit)
 #
 # CONFIG_NET_ETHERNET is not set
 CONFIG_MII=m
+CONFIG_NETDEV_1000=y
-#
+CONFIG_NETDEV_10000=y
-# Ethernet (1000 Mbit)
+CONFIG_GELIC_NET=y
-#
-#
-# Ethernet (10000 Mbit)
-#
-CONFIG_MLX4_DEBUG=y
-#
-# Token Ring devices
-#
 #
 # Wireless LAN
@@ -536,10 +511,6 @@ CONFIG_USB_NET_MCS7830=m
 # CONFIG_USB_NET_RNDIS_HOST is not set
 # CONFIG_USB_NET_CDC_SUBSET is not set
 # CONFIG_USB_NET_ZAURUS is not set
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -563,6 +534,7 @@ CONFIG_USB_NET_MCS7830=m
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -581,7 +553,27 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 #
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
+CONFIG_INPUT_JOYSTICK=y
+# CONFIG_JOYSTICK_ANALOG is not set
+# CONFIG_JOYSTICK_A3D is not set
+# CONFIG_JOYSTICK_ADI is not set
+# CONFIG_JOYSTICK_COBRA is not set
+# CONFIG_JOYSTICK_GF2K is not set
+# CONFIG_JOYSTICK_GRIP is not set
+# CONFIG_JOYSTICK_GRIP_MP is not set
+# CONFIG_JOYSTICK_GUILLEMOT is not set
+# CONFIG_JOYSTICK_INTERACT is not set
+# CONFIG_JOYSTICK_SIDEWINDER is not set
+# CONFIG_JOYSTICK_TMDC is not set
+# CONFIG_JOYSTICK_IFORCE is not set
+# CONFIG_JOYSTICK_WARRIOR is not set
+# CONFIG_JOYSTICK_MAGELLAN is not set
+# CONFIG_JOYSTICK_SPACEORB is not set
+# CONFIG_JOYSTICK_SPACEBALL is not set
+# CONFIG_JOYSTICK_STINGER is not set
+# CONFIG_JOYSTICK_TWIDJOY is not set
+# CONFIG_JOYSTICK_JOYDUMP is not set
+# CONFIG_JOYSTICK_XPAD is not set
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -598,7 +590,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 #
@@ -652,12 +644,8 @@ CONFIG_GEN_RTC=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
-#
+# CONFIG_DAB is not set
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-# CONFIG_USB_DABUSB is not set
 #
 # Graphics support
@@ -672,13 +660,13 @@ CONFIG_GEN_RTC=y
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
-CONFIG_FB_CFB_FILLRECT=y
+# CONFIG_FB_CFB_FILLRECT is not set
-CONFIG_FB_CFB_COPYAREA=y
+# CONFIG_FB_CFB_COPYAREA is not set
-CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_SYS_FILLRECT is not set
+CONFIG_FB_SYS_FILLRECT=y
-# CONFIG_FB_SYS_COPYAREA is not set
+CONFIG_FB_SYS_COPYAREA=y
-# CONFIG_FB_SYS_IMAGEBLIT is not set
+CONFIG_FB_SYS_IMAGEBLIT=y
-# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
@@ -751,9 +739,10 @@ CONFIG_SND_VERBOSE_PROCFS=y
 #
 # CONFIG_SND_USB_AUDIO is not set
 # CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_USB_CAIAQ is not set
 #
-# SoC audio support
+# System on Chip audio support
 #
 # CONFIG_SND_SOC is not set
@@ -1098,7 +1087,6 @@ CONFIG_NLS_ISO8859_1=y
 #
 # CONFIG_DLM is not set
 # CONFIG_UCC_SLOW is not set
-# CONFIG_UCC_FAST is not set
 #
 # Library routines
@@ -1125,7 +1113,7 @@ CONFIG_HAS_DMA=y
 #
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
@@ -1155,16 +1143,7 @@ CONFIG_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUGGER is not set
 CONFIG_IRQSTACKS=y
 # CONFIG_BOOTX_TEXT is not set
-CONFIG_PPC_EARLY_DEBUG=y
+# CONFIG_PPC_EARLY_DEBUG is not set
-# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
-# CONFIG_PPC_EARLY_DEBUG_G5 is not set
-# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
-# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
-# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
-# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
-# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
-# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
-# CONFIG_PPC_EARLY_DEBUG_44x is not set
 #
 # Security options
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 6e96e50c36..0caf0dd5ea 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-rc5
+# Linux kernel version: 2.6.22-rc6
-# Mon Jan 22 22:31:27 2007
+# Tue Jun 26 14:17:45 2007
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -40,6 +40,7 @@ CONFIG_PPC_FPU=y
 # CONFIG_PPC_OF_PLATFORM_PCI is not set
 CONFIG_ALTIVEC=y
 CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_MM_SLICES=y
 CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=128
@@ -60,16 +61,23 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 # CONFIG_UTS_NS is not set
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=17
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
@@ -84,14 +92,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -130,18 +143,28 @@ CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_EMBEDDED6xx is not set
 # CONFIG_APUS is not set
 CONFIG_PPC_PSERIES=y
+CONFIG_PPC_SPLPAR=y
+CONFIG_EEH=y
+CONFIG_SCANLOG=m
+CONFIG_LPARCFG=y
 # CONFIG_PPC_ISERIES is not set
 # CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_PMAC is not set
 # CONFIG_PPC_MAPLE is not set
 # CONFIG_PPC_PASEMI is not set
+# CONFIG_PPC_CELLEB is not set
+# CONFIG_PPC_PS3 is not set
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_IBM_CELL_BLADE is not set
-# CONFIG_PPC_PS3 is not set
+# CONFIG_PQ2ADS is not set
 CONFIG_PPC_NATIVE=y
 # CONFIG_UDBG_RTAS_CONSOLE is not set
 CONFIG_XICS=y
+CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+CONFIG_PPC_I8259=y
 # CONFIG_U3_DART is not set
 CONFIG_PPC_RTAS=y
 CONFIG_RTAS_ERROR_LOGGING=y
@@ -155,8 +178,7 @@ CONFIG_IBMEBUS=y
 # CONFIG_PPC_INDIRECT_IO is not set
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
-# CONFIG_WANT_EARLY_SERIAL is not set
+# CONFIG_CPM2 is not set
-CONFIG_MPIC=y
 #
 # Kernel options
@@ -179,10 +201,6 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_KEXEC=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_IRQ_ALL_CPUS=y
-CONFIG_PPC_SPLPAR=y
-CONFIG_EEH=y
-CONFIG_SCANLOG=m
-CONFIG_LPARCFG=y
 CONFIG_NUMA=y
 CONFIG_NODES_SHIFT=4
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -202,35 +220,35 @@ CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MIGRATION=y
 CONFIG_RESOURCES_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_NODES_SPAN_OTHER_NODES=y
+# CONFIG_PPC_HAS_HASH_64K is not set
 # CONFIG_PPC_64K_PAGES is not set
 CONFIG_SCHED_SMT=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
+# CONFIG_WANT_DEVICE_TREE is not set
 CONFIG_ISA_DMA_API=y
 #
 # Bus options
 #
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_MPIC_WEIRD is not set
-CONFIG_PPC_I8259=y
 # CONFIG_PPC_INDIRECT_PCI is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 CONFIG_HOTPLUG_PCI=m
 # CONFIG_HOTPLUG_PCI_FAKE is not set
 # CONFIG_HOTPLUG_PCI_CPCI is not set
@@ -247,14 +265,15 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
@@ -279,10 +298,6 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-#
-# IP: Virtual Server Configuration
-#
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
@@ -298,10 +313,8 @@ CONFIG_NETFILTER_NETLINK=y
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK_ENABLED=m
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
 CONFIG_NF_CONNTRACK=m
-# CONFIG_NF_CT_ACCT is not set
+CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 # CONFIG_NF_CT_PROTO_SCTP is not set
@@ -311,10 +324,39 @@ CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_IRC=m
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 # CONFIG_NF_CONNTRACK_PPTP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
 # CONFIG_NF_CONNTRACK_SIP is not set
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
-# CONFIG_NETFILTER_XTABLES is not set
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 #
 # IP: Netfilter Configuration
@@ -322,20 +364,38 @@ CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
-#
+CONFIG_IP_NF_MATCH_IPRANGE=m
-# DCCP Configuration (EXPERIMENTAL)
+CONFIG_IP_NF_MATCH_TOS=m
-#
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_PPTP is not set
+# CONFIG_NF_NAT_H323 is not set
+# CONFIG_NF_NAT_SIP is not set
+# CONFIG_IP_NF_MANGLE is not set
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -354,6 +414,7 @@ CONFIG_LLC=y
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
+CONFIG_NET_CLS_ROUTE=y
 #
 # Network testing
@@ -363,7 +424,16 @@ CONFIG_LLC=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -376,16 +446,13 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 #
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -403,6 +470,7 @@ CONFIG_PARPORT_PC=m
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -423,19 +491,16 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=65536
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
@@ -450,6 +515,7 @@ CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 #
 # IDE chipset support/bugfixes
@@ -457,12 +523,12 @@ CONFIG_BLK_DEV_IDECD=y
 CONFIG_IDE_GENERIC=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=y
 # CONFIG_BLK_DEV_OPTI621 is not set
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_IDEDMA_ONLYDISK is not set
 # CONFIG_BLK_DEV_AEC62XX is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
@@ -477,6 +543,7 @@ CONFIG_BLK_DEV_AMD74XX=y
 # CONFIG_BLK_DEV_JMICRON is not set
 # CONFIG_BLK_DEV_SC1200 is not set
 # CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT8213 is not set
 # CONFIG_BLK_DEV_IT821X is not set
 # CONFIG_BLK_DEV_NS87415 is not set
 # CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -487,10 +554,10 @@ CONFIG_BLK_DEV_AMD74XX=y
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
 # CONFIG_IDE_ARM is not set
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
-CONFIG_IDEDMA_AUTO=y
 # CONFIG_BLK_DEV_HD is not set
 #
@@ -520,6 +587,7 @@ CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -575,11 +643,8 @@ CONFIG_SCSI_LPFC=m
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_SATA_AHCI is not set
 # CONFIG_SATA_SVW is not set
 # CONFIG_ATA_PIIX is not set
@@ -595,10 +660,12 @@ CONFIG_ATA=y
 # CONFIG_SATA_ULI is not set
 # CONFIG_SATA_VIA is not set
 # CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
 # CONFIG_PATA_ALI is not set
 # CONFIG_PATA_AMD is not set
 # CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CS5520 is not set
 # CONFIG_PATA_CS5530 is not set
@@ -610,6 +677,7 @@ CONFIG_ATA=y
 # CONFIG_PATA_HPT3X2N is not set
 # CONFIG_PATA_HPT3X3 is not set
 # CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
 # CONFIG_PATA_JMICRON is not set
 # CONFIG_PATA_TRIFLEX is not set
 # CONFIG_PATA_MARVELL is not set
@@ -650,6 +718,7 @@ CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
+# CONFIG_DM_DELAY is not set
 #
 # Fusion MPT device support
@@ -662,18 +731,14 @@ CONFIG_DM_MULTIPATH_EMC=m
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
 # I2O device support
 #
 # CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_WINDFARM is not set
 #
 # Network device support
@@ -683,15 +748,7 @@ CONFIG_DUMMY=m
 CONFIG_BONDING=m
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 #
@@ -731,11 +788,9 @@ CONFIG_E100=y
 # CONFIG_EPIC100 is not set
 # CONFIG_SUNDANCE is not set
 # CONFIG_VIA_RHINE is not set
+# CONFIG_SC92031 is not set
 # CONFIG_NET_POCKET is not set
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 CONFIG_ACENIC=y
 CONFIG_ACENIC_OMIT_TIGON_I=y
 # CONFIG_DL2K is not set
@@ -754,11 +809,10 @@ CONFIG_E1000=y
 CONFIG_TIGON3=y
 # CONFIG_BNX2 is not set
 # CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
-#
+CONFIG_NETDEV_10000=y
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
 CONFIG_EHEA=m
 CONFIG_IXGB=m
 # CONFIG_IXGB_NAPI is not set
@@ -766,23 +820,28 @@ CONFIG_S2IO=m
 # CONFIG_S2IO_NAPI is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_PASEMI_MAC is not set
-#
+# CONFIG_MLX4_CORE is not set
-# Token Ring devices
-#
 CONFIG_TR=y
 CONFIG_IBMOL=y
 # CONFIG_3C359 is not set
 # CONFIG_TMS380TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-# CONFIG_NET_RADIO is not set
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 #
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -802,7 +861,6 @@ CONFIG_SLHC=m
 # CONFIG_SHAPER is not set
 CONFIG_NETCONSOLE=y
 CONFIG_NETPOLL=y
-CONFIG_NETPOLL_RX=y
 CONFIG_NETPOLL_TRAP=y
 CONFIG_NET_POLL_CONTROLLER=y
@@ -821,6 +879,7 @@ CONFIG_NET_POLL_CONTROLLER=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -846,12 +905,25 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
 # CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_UINPUT is not set
 #
@@ -892,6 +964,7 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_ICOM=m
 CONFIG_SERIAL_JSM=m
+# CONFIG_SERIAL_OF_PLATFORM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -907,15 +980,10 @@ CONFIG_HVCS=m
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
@@ -928,11 +996,9 @@ CONFIG_MAX_RAW_DEVS=1024
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 # CONFIG_I2C_CHARDEV is not set
 #
@@ -959,14 +1025,15 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_PCA_ISA is not set
 #
 # Miscellaneous I2C Chip support
@@ -993,37 +1060,56 @@ CONFIG_I2C_ALGOBIT=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
+# CONFIG_HWMON is not set
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
+# CONFIG_MFD_SM501 is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_USB_DABUSB is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_LCD_CLASS_DEVICE=m
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+CONFIG_DISPLAY_SUPPORT=y
+#
+# Display hardware drivers
+#
+# CONFIG_VGASTATE is not set
 CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
 CONFIG_FB_MACMODES=y
-# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
+#
+# Frame buffer hardware drivers
+#
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_CYBER2000 is not set
@@ -1042,16 +1128,21 @@ CONFIG_FB_MATROX_G=y
 CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_RADEON=y
 CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
 # CONFIG_FB_RADEON_DEBUG is not set
 # CONFIG_FB_ATY128 is not set
 # CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
 # CONFIG_FB_SAVAGE is not set
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
 # CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
 CONFIG_FB_IBM_GXT4500=y
 # CONFIG_FB_VIRTUAL is not set
@@ -1065,19 +1156,10 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 #
 # Sound
@@ -1088,6 +1170,15 @@ CONFIG_LCD_DEVICE=y
 # HID Devices
 #
 CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
 #
 # USB support
@@ -1102,9 +1193,8 @@ CONFIG_USB=y
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_MULTITHREAD_PROBE is not set
 # CONFIG_USB_OTG is not set
 #
@@ -1114,9 +1204,12 @@ CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
@@ -1149,40 +1242,10 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_LIBUSUAL is not set
 #
-# USB Input Devices
-#
-CONFIG_USB_HID=y
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-# CONFIG_HID_FF is not set
-CONFIG_USB_HIDDEV=y
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 #
@@ -1205,6 +1268,7 @@ CONFIG_USB_MON=y
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
@@ -1215,6 +1279,7 @@ CONFIG_USB_MON=y
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 #
@@ -1225,10 +1290,6 @@ CONFIG_USB_MON=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -1250,13 +1311,16 @@ CONFIG_USB_MON=y
 CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
+# CONFIG_INFINIBAND_IPATH is not set
 CONFIG_INFINIBAND_EHCA=m
-CONFIG_INFINIBAND_EHCA_SCALING=y
 # CONFIG_INFINIBAND_AMSO1100 is not set
+# CONFIG_MLX4_INFINIBAND is not set
 CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
 CONFIG_INFINIBAND_SRP=m
@@ -1285,8 +1349,9 @@ CONFIG_INFINIBAND_SRP=m
 #
 #
-# Virtualization
+# Auxiliary Display support
 #
+# CONFIG_KS0108 is not set
 #
 # File systems
@@ -1341,7 +1406,6 @@ CONFIG_FUSE_FS=m
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 CONFIG_UDF_NLS=y
@@ -1407,6 +1471,7 @@ CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 CONFIG_RPCSEC_GSS_SPKM3=m
 # CONFIG_SMB_FS is not set
@@ -1476,6 +1541,7 @@ CONFIG_NLS_ISO8859_1=y
 # Distributed Lock Manager
 #
 # CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
 #
 # Library routines
@@ -1483,12 +1549,19 @@ CONFIG_NLS_ISO8859_1=y
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 #
 # Instrumentation Support
@@ -1507,15 +1580,15 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=17
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -1526,8 +1599,10 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_LKDTM is not set
+# CONFIG_FAULT_INJECTION is not set
 CONFIG_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_HCALL_STATS=y
 CONFIG_DEBUGGER=y
 CONFIG_XMON=y
@@ -1564,8 +1639,11 @@ CONFIG_CRYPTO_TGR192=m
 # CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1580,6 +1658,7 @@ CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_CAMELLIA is not set
 CONFIG_CRYPTO_TEST=m
 #
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 3e779f07f2..42c42ecad0 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -12,7 +12,8 @@ endif
 obj-y                           := semaphore.o cputable.o ptrace.o syscalls.o \
                                   irq.o align.o signal_32.o pmc.o vdso.o \
-                                   init_task.o process.o systbl.o idle.o
+                                   init_task.o process.o systbl.o idle.o \
+                                   signal.o
 obj-y                           += vdso32/
 obj-$(CONFIG_PPC64)             += setup_64.o binfmt_elf32.o sys_ppc32.o \
                                   signal_64.o ptrace32.o \
@@ -65,9 +66,9 @@ obj-$(CONFIG_PPC_UDBG_16550)	+= legacy_serial.o udbg_16550.o
 module-$(CONFIG_PPC64)          += module_64.o
 obj-$(CONFIG_MODULES)           += $(module-y)
-pci64-$(CONFIG_PPC64)           += pci_64.o pci_dn.o
+pci64-$(CONFIG_PPC64)           += pci_64.o pci_dn.o isa-bridge.o
 pci32-$(CONFIG_PPC32)           := pci_32.o
-obj-$(CONFIG_PCI)               += $(pci64-y) $(pci32-y)
+obj-$(CONFIG_PCI)               += $(pci64-y) $(pci32-y) pci-common.o
 obj-$(CONFIG_PCI_MSI)           += msi.o
 kexec-$(CONFIG_PPC64)           := machine_kexec_64.o
 kexec-$(CONFIG_PPC32)           := machine_kexec_32.o
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index b2b5d664d3..b1f8000952 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -294,6 +294,21 @@ static struct cpu_spec cpu_specs[] = {
                .oprofile_mmcra_sipr    = MMCRA_SIPR,
                .platform               = "power5",
        },
+        {       /* Power5++ */
+                .pvr_mask               = 0xffffff00,
+                .pvr_value              = 0x003b0300,
+                .cpu_name               = "POWER5+ (gs)",
+                .cpu_features           = CPU_FTRS_POWER5,
+                .cpu_user_features      = COMMON_USER_POWER5_PLUS,
+                .icache_bsize           = 128,
+                .dcache_bsize           = 128,
+                .num_pmcs               = 6,
+                .oprofile_cpu_type      = "ppc64/power5++",
+                .oprofile_type          = PPC_OPROFILE_POWER4,
+                .oprofile_mmcra_sihv    = MMCRA_SIHV,
+                .oprofile_mmcra_sipr    = MMCRA_SIPR,
+                .platform               = "power5+",
+        },
        {       /* Power5 GS */
                .pvr_mask               = 0xffff0000,
                .pvr_value              = 0x003b0000,
@@ -1178,8 +1193,8 @@ static struct cpu_spec cpu_specs[] = {
                .platform               = "ppc440",
        },
        { /* 440SP Rev. A */
-                .pvr_mask               = 0xff000fff,
+                .pvr_mask               = 0xfff00fff,
-                .pvr_value              = 0x53000891,
+                .pvr_value              = 0x53200891,
                .cpu_name               = "440SP Rev. A",
                .cpu_features           = CPU_FTRS_44X,
                .cpu_user_features      = COMMON_USER_BOOKE,
@@ -1188,9 +1203,19 @@ static struct cpu_spec cpu_specs[] = {
                .platform               = "ppc440",
        },
        { /* 440SPe Rev. A */
-                .pvr_mask               = 0xff000fff,
+                .pvr_mask               = 0xfff00fff,
-                .pvr_value              = 0x53000890,
+                .pvr_value              = 0x53400890,
-                .cpu_name               = "440SPe Rev. A",
+                .cpu_name               = "440SPe Rev. A",
+                .cpu_features           = CPU_FTRS_44X,
+                .cpu_user_features      = COMMON_USER_BOOKE,
+                .icache_bsize           = 32,
+                .dcache_bsize           = 32,
+                .platform               = "ppc440",
+        },
+        { /* 440SPe Rev. B */
+                .pvr_mask               = 0xfff00fff,
+                .pvr_value              = 0x53400891,
+                .cpu_name               = "440SPe Rev. B",
                .cpu_features           = CPU_FTRS_44X,
                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index c897203198..7d73a13450 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -9,7 +9,6 @@
 *  rewritten by Paul Mackerras.
 *    Copyright (C) 1996 Paul Mackerras.
 *  MPC8xx modifications Copyright (C) 1997 Dan Malek (dmalek@jlc.net).
- *  Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
 *
 *  This file contains the low-level support and setup for the
 *  PowerPC platform, including trap and interrupt dispatch.
@@ -32,10 +31,6 @@
 #include <asm/ppc_asm.h>
 #include <asm/asm-offsets.h>
-#ifdef CONFIG_APUS
-#include <asm/amigappc.h>
-#endif
 /* 601 only have IBAT; cr0.eq is set on 601 when using this macro */
 #define LOAD_BAT(n, reg, RA, RB)        \
        /* see the comment for clear_bats() -- Cort */ \
@@ -92,11 +87,6 @@ _start:
 *  r4: virtual address of boot_infos_t
 *  r5: 0
 *
- * APUS
- *   r3: 'APUS'
- *   r4: physical address of memory base
- *   Linux/m68k style BootInfo structure at &_end.
- *
 * PREP
 * This is jumped to on prep systems right after the kernel is relocated
 * to its proper place in memory by the boot loader.  The expected layout
@@ -150,14 +140,6 @@ __start:
 */
        bl      early_init
-#ifdef CONFIG_APUS
-/* On APUS the __va/__pa constants need to be set to the correct
- * values before continuing.
- */
-        mr      r4,r30
-        bl      fix_mem_constants
-#endif /* CONFIG_APUS */
 /* Switch MMU off, clear BATs and flush TLB. At this point, r3 contains
 * the physical address we are running at, returned by early_init()
 */
@@ -167,7 +149,7 @@ __after_mmu_off:
        bl      flush_tlbs
        bl      initial_bats
-#if !defined(CONFIG_APUS) && defined(CONFIG_BOOTX_TEXT)
+#if defined(CONFIG_BOOTX_TEXT)
        bl      setup_disp_bat
 #endif
@@ -183,7 +165,6 @@ __after_mmu_off:
 #endif /* CONFIG_6xx */
-#ifndef CONFIG_APUS
 /*
 * We need to run with _start at physical address 0.
 * On CHRP, we are loaded at 0x10000 since OF on CHRP uses
@@ -196,7 +177,6 @@ __after_mmu_off:
        addis   r4,r3,KERNELBASE@h      /* current address of _start */
        cmpwi   0,r4,0                  /* are we already running at 0? */
        bne     relocate_kernel
-#endif /* CONFIG_APUS */
 /*
 * we now have the 1st 16M of ram mapped with the bats.
 * prep needs the mmu to be turned on here, but pmac already has it on.
@@ -881,85 +861,6 @@ _GLOBAL(copy_and_flush)
        addi    r6,r6,4
        blr
-#ifdef CONFIG_APUS
-/*
- * On APUS the physical base address of the kernel is not known at compile
- * time, which means the __pa/__va constants used are incorrect. In the
- * __init section is recorded the virtual addresses of instructions using
- * these constants, so all that has to be done is fix these before
- * continuing the kernel boot.
- *
- * r4 = The physical address of the kernel base.
- */
-fix_mem_constants:
-        mr      r10,r4
-        addis   r10,r10,-KERNELBASE@h    /* virt_to_phys constant */
-        neg     r11,r10                  /* phys_to_virt constant */
-        lis     r12,__vtop_table_begin@h
-        ori     r12,r12,__vtop_table_begin@l
-        add     r12,r12,r10              /* table begin phys address */
-        lis     r13,__vtop_table_end@h
-        ori     r13,r13,__vtop_table_end@l
-        add     r13,r13,r10              /* table end phys address */
-        subi    r12,r12,4
-        subi    r13,r13,4
-1:      lwzu    r14,4(r12)               /* virt address of instruction */
-        add     r14,r14,r10              /* phys address of instruction */
-        lwz     r15,0(r14)               /* instruction, now insert top */
-        rlwimi  r15,r10,16,16,31         /* half of vp const in low half */
-        stw     r15,0(r14)               /* of instruction and restore. */
-        dcbst   r0,r14                   /* write it to memory */
-        sync
-        icbi    r0,r14                   /* flush the icache line */
-        cmpw    r12,r13
-        bne     1b
-        sync                            /* additional sync needed on g4 */
-        isync
-/*
- * Map the memory where the exception handlers will
- * be copied to when hash constants have been patched.
- */
-#ifdef CONFIG_APUS_FAST_EXCEPT
-        lis     r8,0xfff0
-#else
-        lis     r8,0
-#endif
-        ori     r8,r8,0x2               /* 128KB, supervisor */
-        mtspr   SPRN_DBAT3U,r8
-        mtspr   SPRN_DBAT3L,r8
-        lis     r12,__ptov_table_begin@h
-        ori     r12,r12,__ptov_table_begin@l
-        add     r12,r12,r10              /* table begin phys address */
-        lis     r13,__ptov_table_end@h
-        ori     r13,r13,__ptov_table_end@l
-        add     r13,r13,r10              /* table end phys address */
-        subi    r12,r12,4
-        subi    r13,r13,4
-1:      lwzu    r14,4(r12)               /* virt address of instruction */
-        add     r14,r14,r10              /* phys address of instruction */
-        lwz     r15,0(r14)               /* instruction, now insert top */
-        rlwimi  r15,r11,16,16,31         /* half of pv const in low half*/
-        stw     r15,0(r14)               /* of instruction and restore. */
-        dcbst   r0,r14                   /* write it to memory */
-        sync
-        icbi    r0,r14                   /* flush the icache line */
-        cmpw    r12,r13
-        bne     1b
-        sync                            /* additional sync needed on g4 */
-        isync                           /* No speculative loading until now */
-        blr
-/***********************************************************************
- *  Please note that on APUS the exception handlers are located at the
- *  physical address 0xfff0000. For this reason, the exception handlers
- *  cannot use relative branches to access the code below.
- ***********************************************************************/
-#endif /* CONFIG_APUS */
 #ifdef CONFIG_SMP
 #ifdef CONFIG_GEMINI
        .globl  __secondary_start_gemini
@@ -1135,19 +1036,6 @@ start_here:
        bl      __save_cpu_setup
        bl      MMU_init
-#ifdef CONFIG_APUS
-        /* Copy exception code to exception vector base on APUS. */
-        lis     r4,KERNELBASE@h
-#ifdef CONFIG_APUS_FAST_EXCEPT
-        lis     r3,0xfff0               /* Copy to 0xfff00000 */
-#else
-        lis     r3,0                    /* Copy to 0x00000000 */
-#endif
-        li      r5,0x4000               /* # bytes of memory to copy */
-        li      r6,0
-        bl      copy_and_flush          /* copy the first 0x4000 bytes */
-#endif  /* CONFIG_APUS */
 /*
 * Go back to running unmapped so we can load up new values
 * for SDR1 (hash table pointer) and the segment registers
@@ -1324,11 +1212,7 @@ initial_bats:
 #else
        ori     r8,r8,2                 /* R/W access */
 #endif /* CONFIG_SMP */
-#ifdef CONFIG_APUS
-        ori     r11,r11,BL_8M<<2|0x2    /* set up 8MB BAT registers for 604 */
-#else
        ori     r11,r11,BL_256M<<2|0x2  /* set up BAT registers for 604 */
-#endif /* CONFIG_APUS */
        mtspr   SPRN_DBAT0L,r8          /* N.B. 6xx (not 601) have valid */
        mtspr   SPRN_DBAT0U,r11         /* bit in upper BAT register */
@@ -1338,7 +1222,7 @@ initial_bats:
        blr
-#if !defined(CONFIG_APUS) && defined(CONFIG_BOOTX_TEXT)
+#ifdef CONFIG_BOOTX_TEXT
 setup_disp_bat:
        /*
         * setup the display bat prepared for us in prom.c
@@ -1362,7 +1246,7 @@ setup_disp_bat:
 1:      mtspr   SPRN_IBAT3L,r8
        mtspr   SPRN_IBAT3U,r11
        blr
-#endif /* !defined(CONFIG_APUS) && defined(CONFIG_BOOTX_TEXT) */
+#endif /* CONFIG_BOOTX_TEXT */
 #ifdef CONFIG_8260
 /* Jump into the system reset for the rom.
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 1111fcec76..8cdd48ea43 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -103,8 +103,8 @@ __secondary_hold_acknowledge:
        . = 0x60
 /*
- * The following code is used on pSeries to hold secondary processors
+ * The following code is used to hold secondary processors
- * in a spin loop after they have been freed from OpenFirmware, but
+ * in a spin loop after they have entered the kernel, but
 * before the bulk of the kernel has been relocated.  This code
 * is relocated to physical address 0x60 before prom_init is run.
 * All of it must fit below the first exception vector at 0x100.
diff --git a/arch/powerpc/kernel/io.c b/arch/powerpc/kernel/io.c
index 34ae11494d..e31aca9208 100644
--- a/arch/powerpc/kernel/io.c
+++ b/arch/powerpc/kernel/io.c
@@ -35,7 +35,7 @@ void _insb(const volatile u8 __iomem *port, void *buf, long count)
        asm volatile("sync");
        do {
                tmp = *port;
-                asm volatile("eieio");
+                eieio();
                *tbuf++ = tmp;
        } while (--count != 0);
        asm volatile("twi 0,%0,0; isync" : : "r" (tmp));
@@ -66,7 +66,7 @@ void _insw_ns(const volatile u16 __iomem *port, void *buf, long count)
        asm volatile("sync");
        do {
                tmp = *port;
-                asm volatile("eieio");
+                eieio();
                *tbuf++ = tmp;
        } while (--count != 0);
        asm volatile("twi 0,%0,0; isync" : : "r" (tmp));
@@ -97,7 +97,7 @@ void _insl_ns(const volatile u32 __iomem *port, void *buf, long count)
        asm volatile("sync");
        do {
                tmp = *port;
-                asm volatile("eieio");
+                eieio();
                *tbuf++ = tmp;
        } while (--count != 0);
        asm volatile("twi 0,%0,0; isync" : : "r" (tmp));
@@ -155,21 +155,21 @@ void _memcpy_fromio(void *dest, const volatile void __iomem *src,
        __asm__ __volatile__ ("sync" : : : "memory");
        while(n && (!IO_CHECK_ALIGN(vsrc, 4) || !IO_CHECK_ALIGN(dest, 4))) {
                *((u8 *)dest) = *((volatile u8 *)vsrc);
-                __asm__ __volatile__ ("eieio" : : : "memory");
+                eieio();
                vsrc++;
                dest++;
                n--;
        }
        while(n > 4) {
                *((u32 *)dest) = *((volatile u32 *)vsrc);
-                __asm__ __volatile__ ("eieio" : : : "memory");
+                eieio();
                vsrc += 4;
                dest += 4;
                n -= 4;
        }
        while(n) {
                *((u8 *)dest) = *((volatile u8 *)vsrc);
-                __asm__ __volatile__ ("eieio" : : : "memory");
+                eieio();
                vsrc++;
                dest++;
                n--;
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 42c8ed6ed5..2fc8786214 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -7,7 +7,6 @@
 *    Copyright (C) 1996-2001 Cort Dougan
 *  Adapted for Power Macintosh by Paul Mackerras
 *    Copyright (C) 1996 Paul Mackerras (paulus@cs.anu.edu.au)
- *  Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -337,7 +336,8 @@ void do_IRQ(struct pt_regs *regs)
 void __init init_IRQ(void)
 {
-        ppc_md.init_IRQ();
+        if (ppc_md.init_IRQ)
+                ppc_md.init_IRQ();
 #ifdef CONFIG_PPC64
        irq_ctx_init();
 #endif
@@ -412,6 +412,12 @@ struct irq_map_entry irq_map[NR_IRQS];
 static unsigned int irq_virq_count = NR_IRQS;
 static struct irq_host *irq_default_host;
+irq_hw_number_t virq_to_hw(unsigned int virq)
+{
+        return irq_map[virq].hwirq;
+}
+EXPORT_SYMBOL_GPL(virq_to_hw);
 struct irq_host *irq_alloc_host(unsigned int revmap_type,
                                unsigned int revmap_arg,
                                struct irq_host_ops *ops,
@@ -591,6 +597,49 @@ static void irq_radix_rdunlock(unsigned long flags)
        local_irq_restore(flags);
 }
+static int irq_setup_virq(struct irq_host *host, unsigned int virq,
+                            irq_hw_number_t hwirq)
+{
+        /* Clear IRQ_NOREQUEST flag */
+        get_irq_desc(virq)->status &= ~IRQ_NOREQUEST;
+        /* map it */
+        smp_wmb();
+        irq_map[virq].hwirq = hwirq;
+        smp_mb();
+        if (host->ops->map(host, virq, hwirq)) {
+                pr_debug("irq: -> mapping failed, freeing\n");
+                irq_free_virt(virq, 1);
+                return -1;
+        }
+        return 0;
+}
+unsigned int irq_create_direct_mapping(struct irq_host *host)
+{
+        unsigned int virq;
+        if (host == NULL)
+                host = irq_default_host;
+        BUG_ON(host == NULL);
+        WARN_ON(host->revmap_type != IRQ_HOST_MAP_NOMAP);
+        virq = irq_alloc_virt(host, 1, 0);
+        if (virq == NO_IRQ) {
+                pr_debug("irq: create_direct virq allocation failed\n");
+                return NO_IRQ;
+        }
+        pr_debug("irq: create_direct obtained virq %d\n", virq);
+        if (irq_setup_virq(host, virq, virq))
+                return NO_IRQ;
+        return virq;
+}
 unsigned int irq_create_mapping(struct irq_host *host,
                                irq_hw_number_t hwirq)
@@ -639,18 +688,9 @@ unsigned int irq_create_mapping(struct irq_host *host,
        }
        pr_debug("irq: -> obtained virq %d\n", virq);
-        /* Clear IRQ_NOREQUEST flag */
+        if (irq_setup_virq(host, virq, hwirq))
-        get_irq_desc(virq)->status &= ~IRQ_NOREQUEST;
-        /* map it */
-        smp_wmb();
-        irq_map[virq].hwirq = hwirq;
-        smp_mb();
-        if (host->ops->map(host, virq, hwirq)) {
-                pr_debug("irq: -> mapping failed, freeing\n");
-                irq_free_virt(virq, 1);
                return NO_IRQ;
-        }
        return virq;
 }
 EXPORT_SYMBOL_GPL(irq_create_mapping);
diff --git a/arch/powerpc/kernel/isa-bridge.c b/arch/powerpc/kernel/isa-bridge.c
new file mode 100644
index 0000000000..f0f49d1be3
--- /dev/null
+++ b/arch/powerpc/kernel/isa-bridge.c
@@ -0,0 +1,271 @@
+/*
+ * Routines for tracking a legacy ISA bridge
+ *
+ * Copyrigh 2007 Benjamin Herrenschmidt <benh@kernel.crashing.org>, IBM Corp.
+ *
+ * Some bits and pieces moved over from pci_64.c
+ *
+ * Copyrigh 2003 Anton Blanchard <anton@au.ibm.com>, IBM Corp.
+ *
+ *      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.
+ */
+#define DEBUG
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/string.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/notifier.h>
+#include <asm/processor.h>
+#include <asm/io.h>
+#include <asm/prom.h>
+#include <asm/pci-bridge.h>
+#include <asm/machdep.h>
+#include <asm/ppc-pci.h>
+#include <asm/firmware.h>
+unsigned long isa_io_base;      /* NULL if no ISA bus */
+EXPORT_SYMBOL(isa_io_base);
+/* Cached ISA bridge dev. */
+static struct device_node *isa_bridge_devnode;
+struct pci_dev *isa_bridge_pcidev;
+EXPORT_SYMBOL_GPL(isa_bridge_pcidev);
+#define ISA_SPACE_MASK 0x1
+#define ISA_SPACE_IO 0x1
+static void __devinit pci_process_ISA_OF_ranges(struct device_node *isa_node,
+                                                unsigned long phb_io_base_phys)
+{
+        /* We should get some saner parsing here and remove these structs */
+        struct pci_address {
+                u32 a_hi;
+                u32 a_mid;
+                u32 a_lo;
+        };
+        struct isa_address {
+                u32 a_hi;
+                u32 a_lo;
+        };
+        struct isa_range {
+                struct isa_address isa_addr;
+                struct pci_address pci_addr;
+                unsigned int size;
+        };
+        const struct isa_range *range;
+        unsigned long pci_addr;
+        unsigned int isa_addr;
+        unsigned int size;
+        int rlen = 0;
+        range = of_get_property(isa_node, "ranges", &rlen);
+        if (range == NULL || (rlen < sizeof(struct isa_range)))
+                goto inval_range;
+        /* From "ISA Binding to 1275"
+         * The ranges property is laid out as an array of elements,
+         * each of which comprises:
+         *   cells 0 - 1:       an ISA address
+         *   cells 2 - 4:       a PCI address
+         *                      (size depending on dev->n_addr_cells)
+         *   cell 5:            the size of the range
+         */
+        if ((range->isa_addr.a_hi && ISA_SPACE_MASK) != ISA_SPACE_IO) {
+                range++;
+                rlen -= sizeof(struct isa_range);
+                if (rlen < sizeof(struct isa_range))
+                        goto inval_range;
+        }
+        if ((range->isa_addr.a_hi && ISA_SPACE_MASK) != ISA_SPACE_IO)
+                goto inval_range;
+        isa_addr = range->isa_addr.a_lo;
+        pci_addr = (unsigned long) range->pci_addr.a_mid << 32 |
+                range->pci_addr.a_lo;
+        /* Assume these are both zero. Note: We could fix that and
+         * do a proper parsing instead ... oh well, that will do for
+         * now as nobody uses fancy mappings for ISA bridges
+         */
+        if ((pci_addr != 0) || (isa_addr != 0)) {
+                printk(KERN_ERR "unexpected isa to pci mapping: %s\n",
+                       __FUNCTION__);
+                return;
+        }
+        /* Align size and make sure it's cropped to 64K */
+        size = PAGE_ALIGN(range->size);
+        if (size > 0x10000)
+                size = 0x10000;
+        printk(KERN_ERR "no ISA IO ranges or unexpected isa range,"
+               "mapping 64k\n");
+        __ioremap_at(phb_io_base_phys, (void *)ISA_IO_BASE,
+                     size, _PAGE_NO_CACHE|_PAGE_GUARDED);
+        return;
+inval_range:
+        printk(KERN_ERR "no ISA IO ranges or unexpected isa range,"
+               "mapping 64k\n");
+        __ioremap_at(phb_io_base_phys, (void *)ISA_IO_BASE,
+                     0x10000, _PAGE_NO_CACHE|_PAGE_GUARDED);
+}
+/**
+ * isa_bridge_find_early - Find and map the ISA IO space early before
+ *                         main PCI discovery. This is optionally called by
+ *                         the arch code when adding PCI PHBs to get early
+ *                         access to ISA IO ports
+ */
+void __init isa_bridge_find_early(struct pci_controller *hose)
+{
+        struct device_node *np, *parent = NULL, *tmp;
+        /* If we already have an ISA bridge, bail off */
+        if (isa_bridge_devnode != NULL)
+                return;
+        /* For each "isa" node in the system. Note : we do a search by
+         * type and not by name. It might be better to do by name but that's
+         * what the code used to do and I don't want to break too much at
+         * once. We can look into changing that separately
+         */
+        for_each_node_by_type(np, "isa") {
+                /* Look for our hose being a parent */
+                for (parent = of_get_parent(np); parent;) {
+                        if (parent == hose->arch_data) {
+                                of_node_put(parent);
+                                break;
+                        }
+                        tmp = parent;
+                        parent = of_get_parent(parent);
+                        of_node_put(tmp);
+                }
+                if (parent != NULL)
+                        break;
+        }
+        if (np == NULL)
+                return;
+        isa_bridge_devnode = np;
+        /* Now parse the "ranges" property and setup the ISA mapping */
+        pci_process_ISA_OF_ranges(np, hose->io_base_phys);
+        /* Set the global ISA io base to indicate we have an ISA bridge */
+        isa_io_base = ISA_IO_BASE;
+        pr_debug("ISA bridge (early) is %s\n", np->full_name);
+}
+/**
+ * isa_bridge_find_late - Find and map the ISA IO space upon discovery of
+ *                        a new ISA bridge
+ */
+static void __devinit isa_bridge_find_late(struct pci_dev *pdev,
+                                           struct device_node *devnode)
+{
+        struct pci_controller *hose = pci_bus_to_host(pdev->bus);
+        /* Store ISA device node and PCI device */
+        isa_bridge_devnode = of_node_get(devnode);
+        isa_bridge_pcidev = pdev;
+        /* Now parse the "ranges" property and setup the ISA mapping */
+        pci_process_ISA_OF_ranges(devnode, hose->io_base_phys);
+        /* Set the global ISA io base to indicate we have an ISA bridge */
+        isa_io_base = ISA_IO_BASE;
+        pr_debug("ISA bridge (late) is %s on %s\n",
+                 devnode->full_name, pci_name(pdev));
+}
+/**
+ * isa_bridge_remove - Remove/unmap an ISA bridge
+ */
+static void isa_bridge_remove(void)
+{
+        pr_debug("ISA bridge removed !\n");
+        /* Clear the global ISA io base to indicate that we have no more
+         * ISA bridge. Note that drivers don't quite handle that, though
+         * we should probably do something about it. But do we ever really
+         * have ISA bridges being removed on machines using legacy devices ?
+         */
+        isa_io_base = ISA_IO_BASE;
+        /* Clear references to the bridge */
+        of_node_put(isa_bridge_devnode);
+        isa_bridge_devnode = NULL;
+        isa_bridge_pcidev = NULL;
+        /* Unmap the ISA area */
+        __iounmap_at((void *)ISA_IO_BASE, 0x10000);
+}
+/**
+ * isa_bridge_notify - Get notified of PCI devices addition/removal
+ */
+static int __devinit isa_bridge_notify(struct notifier_block *nb,
+                                       unsigned long action, void *data)
+{
+        struct device *dev = data;
+        struct pci_dev *pdev = to_pci_dev(dev);
+        struct device_node *devnode = pci_device_to_OF_node(pdev);
+        switch(action) {
+        case BUS_NOTIFY_ADD_DEVICE:
+                /* Check if we have an early ISA device, without PCI dev */
+                if (isa_bridge_devnode && isa_bridge_devnode == devnode &&
+                    !isa_bridge_pcidev) {
+                        pr_debug("ISA bridge PCI attached: %s\n",
+                                 pci_name(pdev));
+                        isa_bridge_pcidev = pdev;
+                }
+                /* Check if we have no ISA device, and this happens to be one,
+                 * register it as such if it has an OF device
+                 */
+                if (!isa_bridge_devnode && devnode && devnode->type &&
+                    !strcmp(devnode->type, "isa"))
+                        isa_bridge_find_late(pdev, devnode);
+                return 0;
+        case BUS_NOTIFY_DEL_DEVICE:
+                /* Check if this our existing ISA device */
+                if (pdev == isa_bridge_pcidev ||
+                    (devnode && devnode == isa_bridge_devnode))
+                        isa_bridge_remove();
+                return 0;
+        }
+        return 0;
+}
+static struct notifier_block isa_bridge_notifier = {
+        .notifier_call = isa_bridge_notify
+};
+/**
+ * isa_bridge_init - register to be notified of ISA bridge addition/removal
+ *
+ */
+static int __init isa_bridge_init(void)
+{
+        if (firmware_has_feature(FW_FEATURE_ISERIES))
+                return 0;
+        bus_register_notifier(&pci_bus_type, &isa_bridge_notifier);
+        return 0;
+}
+arch_initcall(isa_bridge_init);
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index 98decf8ebf..e708ab7ca9 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -392,7 +392,7 @@ BEGIN_FTR_SECTION
        mtspr   SPRN_L1CSR0,r3
        isync
        blr
-END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
+END_FTR_SECTION_IFSET(CPU_FTR_UNIFIED_ID_CACHE)
        mfspr   r3,SPRN_L1CSR1
        ori     r3,r3,L1CSR1_ICFI|L1CSR1_ICLFR
        mtspr   SPRN_L1CSR1,r3
@@ -419,7 +419,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
 _GLOBAL(__flush_icache_range)
 BEGIN_FTR_SECTION
        blr                             /* for 601, do nothing */
-END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
+END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE)
        li      r5,L1_CACHE_BYTES-1
        andc    r3,r3,r5
        subf    r4,r3,r4
@@ -514,8 +514,8 @@ _GLOBAL(invalidate_dcache_range)
 */
 _GLOBAL(__flush_dcache_icache)
 BEGIN_FTR_SECTION
-        blr                                     /* for 601, do nothing */
+        blr
-END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
+END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE)
        rlwinm  r3,r3,0,0,19                    /* Get page base address */
        li      r4,4096/L1_CACHE_BYTES  /* Number of lines in a page */
        mtctr   r4
@@ -543,7 +543,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
 _GLOBAL(__flush_dcache_icache_phys)
 BEGIN_FTR_SECTION
        blr                                     /* for 601, do nothing */
-END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
+END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE)
        mfmsr   r10
        rlwinm  r0,r10,0,28,26                  /* clear DR */
        mtmsr   r0
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index 519861da04..bbb3ba54c5 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -646,6 +646,19 @@ _GLOBAL(kexec_sequence)
        /* turn off mmu */
        bl      real_mode
+        /* copy  0x100 bytes starting at start to 0 */
+        li      r3,0
+        mr      r4,r30          /* start, aka phys mem offset */
+        li      r5,0x100
+        li      r6,0
+        bl      .copy_and_flush /* (dest, src, copy limit, start offset) */
+1:      /* assume normal blr return */
+        /* release other cpus to the new kernel secondary start at 0x60 */
+        mflr    r5
+        li      r6,1
+        stw     r6,kexec_flag-1b(5)
        /* clear out hardware hash page table and tlb */
        ld      r5,0(r27)               /* deref function descriptor */
        mtctr   r5
@@ -676,19 +689,6 @@ _GLOBAL(kexec_sequence)
 *    are the boot cpu ?????
 *    other device tree differences (prop sizes, va vs pa, etc)...
 */
-        /* copy  0x100 bytes starting at start to 0 */
-        li      r3,0
-        mr      r4,r30
-        li      r5,0x100
-        li      r6,0
-        bl      .copy_and_flush /* (dest, src, copy limit, start offset) */
-1:      /* assume normal blr return */
-        /* release other cpus to the new kernel secondary start at 0x60 */
-        mflr    r5
-        li      r6,1
-        stw     r6,kexec_flag-1b(5)
        mr      r3,r25  # my phys cpu
        mr      r4,r30  # start, aka phys mem offset
        mtlr    4
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index d454f61c9c..9536ed7f24 100644
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -427,14 +427,6 @@ static int __devinit of_pci_phb_probe(struct of_device *dev,
        /* Process "ranges" property */
        pci_process_bridge_OF_ranges(phb, dev->node, 0);
-        /* Setup IO space. We use the non-dynamic version of that code here,
-         * which doesn't quite support unplugging. Next kernel release will
-         * have a better fix for this.
-         * Note also that we don't do ISA, this will also be fixed with a
-         * more massive rework.
-         */
-        pci_setup_phb_io(phb, pci_io_base == 0);
        /* Init pci_dn data structures */
        pci_devs_phb_init_dynamic(phb);
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
new file mode 100644
index 0000000000..94b4a02823
--- /dev/null
+++ b/arch/powerpc/kernel/pci-common.c
@@ -0,0 +1,457 @@
+/*
+ * Contains common pci routines for ALL ppc platform
+ * (based on pci_32.c and pci_64.c)
+ *
+ * Port for PPC64 David Engebretsen, IBM Corp.
+ * Contains common pci routines for ppc64 platform, pSeries and iSeries brands.
+ *
+ * Copyright (C) 2003 Anton Blanchard <anton@au.ibm.com>, IBM
+ *   Rework, based on alpha PCI code.
+ *
+ * Common pmac/prep/chrp pci routines. -- Cort
+ *
+ * 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.
+ */
+#undef DEBUG
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/string.h>
+#include <linux/init.h>
+#include <linux/bootmem.h>
+#include <linux/mm.h>
+#include <linux/list.h>
+#include <linux/syscalls.h>
+#include <linux/irq.h>
+#include <linux/vmalloc.h>
+#include <asm/processor.h>
+#include <asm/io.h>
+#include <asm/prom.h>
+#include <asm/pci-bridge.h>
+#include <asm/byteorder.h>
+#include <asm/machdep.h>
+#include <asm/ppc-pci.h>
+#include <asm/firmware.h>
+#ifdef DEBUG
+#include <asm/udbg.h>
+#define DBG(fmt...) printk(fmt)
+#else
+#define DBG(fmt...)
+#endif
+static DEFINE_SPINLOCK(hose_spinlock);
+/* XXX kill that some day ... */
+int global_phb_number;          /* Global phb counter */
+extern struct list_head hose_list;
+/*
+ * pci_controller(phb) initialized common variables.
+ */
+static void __devinit pci_setup_pci_controller(struct pci_controller *hose)
+{
+        memset(hose, 0, sizeof(struct pci_controller));
+        spin_lock(&hose_spinlock);
+        hose->global_number = global_phb_number++;
+        list_add_tail(&hose->list_node, &hose_list);
+        spin_unlock(&hose_spinlock);
+}
+struct pci_controller * pcibios_alloc_controller(struct device_node *dev)
+{
+        struct pci_controller *phb;
+        if (mem_init_done)
+                phb = kmalloc(sizeof(struct pci_controller), GFP_KERNEL);
+        else
+                phb = alloc_bootmem(sizeof (struct pci_controller));
+        if (phb == NULL)
+                return NULL;
+        pci_setup_pci_controller(phb);
+        phb->arch_data = dev;
+        phb->is_dynamic = mem_init_done;
+#ifdef CONFIG_PPC64
+        if (dev) {
+                int nid = of_node_to_nid(dev);
+                if (nid < 0 || !node_online(nid))
+                        nid = -1;
+                PHB_SET_NODE(phb, nid);
+        }
+#endif
+        return phb;
+}
+void pcibios_free_controller(struct pci_controller *phb)
+{
+        spin_lock(&hose_spinlock);
+        list_del(&phb->list_node);
+        spin_unlock(&hose_spinlock);
+        if (phb->is_dynamic)
+                kfree(phb);
+}
+/*
+ * Return the domain number for this bus.
+ */
+int pci_domain_nr(struct pci_bus *bus)
+{
+        if (firmware_has_feature(FW_FEATURE_ISERIES))
+                return 0;
+        else {
+                struct pci_controller *hose = pci_bus_to_host(bus);
+                return hose->global_number;
+        }
+}
+EXPORT_SYMBOL(pci_domain_nr);
+#ifdef CONFIG_PPC_OF
+/* This routine is meant to be used early during boot, when the
+ * PCI bus numbers have not yet been assigned, and you need to
+ * issue PCI config cycles to an OF device.
+ * It could also be used to "fix" RTAS config cycles if you want
+ * to set pci_assign_all_buses to 1 and still use RTAS for PCI
+ * config cycles.
+ */
+struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node)
+{
+        if (!have_of)
+                return NULL;
+        while(node) {
+                struct pci_controller *hose, *tmp;
+                list_for_each_entry_safe(hose, tmp, &hose_list, list_node)
+                        if (hose->arch_data == node)
+                                return hose;
+                node = node->parent;
+        }
+        return NULL;
+}
+static ssize_t pci_show_devspec(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct pci_dev *pdev;
+        struct device_node *np;
+        pdev = to_pci_dev (dev);
+        np = pci_device_to_OF_node(pdev);
+        if (np == NULL || np->full_name == NULL)
+                return 0;
+        return sprintf(buf, "%s", np->full_name);
+}
+static DEVICE_ATTR(devspec, S_IRUGO, pci_show_devspec, NULL);
+#endif /* CONFIG_PPC_OF */
+/* Add sysfs properties */
+int pcibios_add_platform_entries(struct pci_dev *pdev)
+{
+#ifdef CONFIG_PPC_OF
+        return device_create_file(&pdev->dev, &dev_attr_devspec);
+#else
+        return 0;
+#endif /* CONFIG_PPC_OF */
+}
+char __init *pcibios_setup(char *str)
+{
+        return str;
+}
+/*
+ * Reads the interrupt pin to determine if interrupt is use by card.
+ * If the interrupt is used, then gets the interrupt line from the
+ * openfirmware and sets it in the pci_dev and pci_config line.
+ */
+int pci_read_irq_line(struct pci_dev *pci_dev)
+{
+        struct of_irq oirq;
+        unsigned int virq;
+        DBG("Try to map irq for %s...\n", pci_name(pci_dev));
+#ifdef DEBUG
+        memset(&oirq, 0xff, sizeof(oirq));
+#endif
+        /* Try to get a mapping from the device-tree */
+        if (of_irq_map_pci(pci_dev, &oirq)) {
+                u8 line, pin;
+                /* If that fails, lets fallback to what is in the config
+                 * space and map that through the default controller. We
+                 * also set the type to level low since that's what PCI
+                 * interrupts are. If your platform does differently, then
+                 * either provide a proper interrupt tree or don't use this
+                 * function.
+                 */
+                if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_PIN, &pin))
+                        return -1;
+                if (pin == 0)
+                        return -1;
+                if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_LINE, &line) ||
+                    line == 0xff) {
+                        return -1;
+                }
+                DBG(" -> no map ! Using irq line %d from PCI config\n", line);
+                virq = irq_create_mapping(NULL, line);
+                if (virq != NO_IRQ)
+                        set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
+        } else {
+                DBG(" -> got one, spec %d cells (0x%08x 0x%08x...) on %s\n",
+                    oirq.size, oirq.specifier[0], oirq.specifier[1],
+                    oirq.controller->full_name);
+                virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
+                                             oirq.size);
+        }
+        if(virq == NO_IRQ) {
+                DBG(" -> failed to map !\n");
+                return -1;
+        }
+        DBG(" -> mapped to linux irq %d\n", virq);
+        pci_dev->irq = virq;
+        return 0;
+}
+EXPORT_SYMBOL(pci_read_irq_line);
+/*
+ * Platform support for /proc/bus/pci/X/Y mmap()s,
+ * modelled on the sparc64 implementation by Dave Miller.
+ *  -- paulus.
+ */
+/*
+ * Adjust vm_pgoff of VMA such that it is the physical page offset
+ * corresponding to the 32-bit pci bus offset for DEV requested by the user.
+ *
+ * Basically, the user finds the base address for his device which he wishes
+ * to mmap.  They read the 32-bit value from the config space base register,
+ * add whatever PAGE_SIZE multiple offset they wish, and feed this into the
+ * offset parameter of mmap on /proc/bus/pci/XXX for that device.
+ *
+ * Returns negative error code on failure, zero on success.
+ */
+static struct resource *__pci_mmap_make_offset(struct pci_dev *dev,
+                                               resource_size_t *offset,
+                                               enum pci_mmap_state mmap_state)
+{
+        struct pci_controller *hose = pci_bus_to_host(dev->bus);
+        unsigned long io_offset = 0;
+        int i, res_bit;
+        if (hose == 0)
+                return NULL;            /* should never happen */
+        /* If memory, add on the PCI bridge address offset */
+        if (mmap_state == pci_mmap_mem) {
+#if 0 /* See comment in pci_resource_to_user() for why this is disabled */
+                *offset += hose->pci_mem_offset;
+#endif
+                res_bit = IORESOURCE_MEM;
+        } else {
+                io_offset = (unsigned long)hose->io_base_virt - _IO_BASE;
+                *offset += io_offset;
+                res_bit = IORESOURCE_IO;
+        }
+        /*
+         * Check that the offset requested corresponds to one of the
+         * resources of the device.
+         */
+        for (i = 0; i <= PCI_ROM_RESOURCE; i++) {
+                struct resource *rp = &dev->resource[i];
+                int flags = rp->flags;
+                /* treat ROM as memory (should be already) */
+                if (i == PCI_ROM_RESOURCE)
+                        flags |= IORESOURCE_MEM;
+                /* Active and same type? */
+                if ((flags & res_bit) == 0)
+                        continue;
+                /* In the range of this resource? */
+                if (*offset < (rp->start & PAGE_MASK) || *offset > rp->end)
+                        continue;
+                /* found it! construct the final physical address */
+                if (mmap_state == pci_mmap_io)
+                        *offset += hose->io_base_phys - io_offset;
+                return rp;
+        }
+        return NULL;
+}
+/*
+ * Set vm_page_prot of VMA, as appropriate for this architecture, for a pci
+ * device mapping.
+ */
+static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,
+                                      pgprot_t protection,
+                                      enum pci_mmap_state mmap_state,
+                                      int write_combine)
+{
+        unsigned long prot = pgprot_val(protection);
+        /* Write combine is always 0 on non-memory space mappings. On
+         * memory space, if the user didn't pass 1, we check for a
+         * "prefetchable" resource. This is a bit hackish, but we use
+         * this to workaround the inability of /sysfs to provide a write
+         * combine bit
+         */
+        if (mmap_state != pci_mmap_mem)
+                write_combine = 0;
+        else if (write_combine == 0) {
+                if (rp->flags & IORESOURCE_PREFETCH)
+                        write_combine = 1;
+        }
+        /* XXX would be nice to have a way to ask for write-through */
+        prot |= _PAGE_NO_CACHE;
+        if (write_combine)
+                prot &= ~_PAGE_GUARDED;
+        else
+                prot |= _PAGE_GUARDED;
+        return __pgprot(prot);
+}
+/*
+ * This one is used by /dev/mem and fbdev who have no clue about the
+ * PCI device, it tries to find the PCI device first and calls the
+ * above routine
+ */
+pgprot_t pci_phys_mem_access_prot(struct file *file,
+                                  unsigned long pfn,
+                                  unsigned long size,
+                                  pgprot_t protection)
+{
+        struct pci_dev *pdev = NULL;
+        struct resource *found = NULL;
+        unsigned long prot = pgprot_val(protection);
+        unsigned long offset = pfn << PAGE_SHIFT;
+        int i;
+        if (page_is_ram(pfn))
+                return __pgprot(prot);
+        prot |= _PAGE_NO_CACHE | _PAGE_GUARDED;
+        for_each_pci_dev(pdev) {
+                for (i = 0; i <= PCI_ROM_RESOURCE; i++) {
+                        struct resource *rp = &pdev->resource[i];
+                        int flags = rp->flags;
+                        /* Active and same type? */
+                        if ((flags & IORESOURCE_MEM) == 0)
+                                continue;
+                        /* In the range of this resource? */
+                        if (offset < (rp->start & PAGE_MASK) ||
+                            offset > rp->end)
+                                continue;
+                        found = rp;
+                        break;
+                }
+                if (found)
+                        break;
+        }
+        if (found) {
+                if (found->flags & IORESOURCE_PREFETCH)
+                        prot &= ~_PAGE_GUARDED;
+                pci_dev_put(pdev);
+        }
+        DBG("non-PCI map for %lx, prot: %lx\n", offset, prot);
+        return __pgprot(prot);
+}
+/*
+ * Perform the actual remap of the pages for a PCI device mapping, as
+ * appropriate for this architecture.  The region in the process to map
+ * is described by vm_start and vm_end members of VMA, the base physical
+ * address is found in vm_pgoff.
+ * The pci device structure is provided so that architectures may make mapping
+ * decisions on a per-device or per-bus basis.
+ *
+ * Returns a negative error code on failure, zero on success.
+ */
+int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
+                        enum pci_mmap_state mmap_state, int write_combine)
+{
+        resource_size_t offset = vma->vm_pgoff << PAGE_SHIFT;
+        struct resource *rp;
+        int ret;
+        rp = __pci_mmap_make_offset(dev, &offset, mmap_state);
+        if (rp == NULL)
+                return -EINVAL;
+        vma->vm_pgoff = offset >> PAGE_SHIFT;
+        vma->vm_page_prot = __pci_mmap_set_pgprot(dev, rp,
+                                                  vma->vm_page_prot,
+                                                  mmap_state, write_combine);
+        ret = remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
+                               vma->vm_end - vma->vm_start, vma->vm_page_prot);
+        return ret;
+}
+void pci_resource_to_user(const struct pci_dev *dev, int bar,
+                          const struct resource *rsrc,
+                          resource_size_t *start, resource_size_t *end)
+{
+        struct pci_controller *hose = pci_bus_to_host(dev->bus);
+        resource_size_t offset = 0;
+        if (hose == NULL)
+                return;
+        if (rsrc->flags & IORESOURCE_IO)
+                offset = (unsigned long)hose->io_base_virt - _IO_BASE;
+        /* We pass a fully fixed up address to userland for MMIO instead of
+         * a BAR value because X is lame and expects to be able to use that
+         * to pass to /dev/mem !
+         *
+         * That means that we'll have potentially 64 bits values where some
+         * userland apps only expect 32 (like X itself since it thinks only
+         * Sparc has 64 bits MMIO) but if we don't do that, we break it on
+         * 32 bits CHRPs :-(
+         *
+         * Hopefully, the sysfs insterface is immune to that gunk. Once X
+         * has been fixed (and the fix spread enough), we can re-enable the
+         * 2 lines below and pass down a BAR value to userland. In that case
+         * we'll also have to re-enable the matching code in
+         * __pci_mmap_make_offset().
+         *
+         * BenH.
+         */
+#if 0
+        else if (rsrc->flags & IORESOURCE_MEM)
+                offset = hose->pci_mem_offset;
+#endif
+        *start = rsrc->start - offset;
+        *end = rsrc->end - offset;
+}
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index e66064b509..0adf077f3f 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -55,8 +55,7 @@ static u8* pci_to_OF_bus_map;
 */
 int pci_assign_all_buses;
-struct pci_controller* hose_head;
+LIST_HEAD(hose_list);
-struct pci_controller** hose_tail = &hose_head;
 static int pci_bus_count;
@@ -573,58 +572,6 @@ pcibios_assign_resources(void)
        }
 }
-int
-pcibios_enable_resources(struct pci_dev *dev, int mask)
-{
-        u16 cmd, old_cmd;
-        int idx;
-        struct resource *r;
-        pci_read_config_word(dev, PCI_COMMAND, &cmd);
-        old_cmd = cmd;
-        for (idx=0; idx<6; idx++) {
-                /* Only set up the requested stuff */
-                if (!(mask & (1<<idx)))
-                        continue;
-        
-                r = &dev->resource[idx];
-                if (r->flags & IORESOURCE_UNSET) {
-                        printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev));
-                        return -EINVAL;
-                }
-                if (r->flags & IORESOURCE_IO)
-                        cmd |= PCI_COMMAND_IO;
-                if (r->flags & IORESOURCE_MEM)
-                        cmd |= PCI_COMMAND_MEMORY;
-        }
-        if (dev->resource[PCI_ROM_RESOURCE].start)
-                cmd |= PCI_COMMAND_MEMORY;
-        if (cmd != old_cmd) {
-                printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd);
-                pci_write_config_word(dev, PCI_COMMAND, cmd);
-        }
-        return 0;
-}
-static int next_controller_index;
-struct pci_controller * __init
-pcibios_alloc_controller(void)
-{
-        struct pci_controller *hose;
-        hose = (struct pci_controller *)alloc_bootmem(sizeof(*hose));
-        memset(hose, 0, sizeof(struct pci_controller));
-        *hose_tail = hose;
-        hose_tail = &hose->next;
-        hose->index = next_controller_index++;
-        return hose;
-}
 #ifdef CONFIG_PPC_OF
 /*
 * Functions below are used on OpenFirmware machines.
@@ -670,7 +617,7 @@ void
 pcibios_make_OF_bus_map(void)
 {
        int i;
-        struct pci_controller* hose;
+        struct pci_controller *hose, *tmp;
        struct property *map_prop;
        struct device_node *dn;
@@ -687,7 +634,7 @@ pcibios_make_OF_bus_map(void)
                pci_to_OF_bus_map[i] = 0xff;
        /* For each hose, we begin searching bridges */
-        for(hose=hose_head; hose; hose=hose->next) {
+        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
                struct device_node* node;       
                node = (struct device_node *)hose->arch_data;
                if (!node)
@@ -765,7 +712,7 @@ static struct device_node *scan_OF_for_pci_bus(struct pci_bus *bus)
        /* Are we a root bus ? */
        if (bus->self == NULL || bus->parent == NULL) {
-                struct pci_controller *hose = pci_bus_to_hose(bus->number);
+                struct pci_controller *hose = pci_bus_to_host(bus);
                if (hose == NULL)
                        return NULL;
                return of_node_get(hose->arch_data);
@@ -818,27 +765,6 @@ pci_device_to_OF_node(struct pci_dev *dev)
 }
 EXPORT_SYMBOL(pci_device_to_OF_node);
-/* This routine is meant to be used early during boot, when the
- * PCI bus numbers have not yet been assigned, and you need to
- * issue PCI config cycles to an OF device.
- * It could also be used to "fix" RTAS config cycles if you want
- * to set pci_assign_all_buses to 1 and still use RTAS for PCI
- * config cycles.
- */
-struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node)
-{
-        if (!have_of)
-                return NULL;
-        while(node) {
-                struct pci_controller* hose;
-                for (hose=hose_head;hose;hose=hose->next)
-                        if (hose->arch_data == node)
-                                return hose;
-                node=node->parent;
-        }
-        return NULL;
-}
 static int
 find_OF_pci_device_filter(struct device_node* node, void* data)
 {
@@ -1027,34 +953,12 @@ pci_create_OF_bus_map(void)
        }
 }
-static ssize_t pci_show_devspec(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct pci_dev *pdev;
-        struct device_node *np;
-        pdev = to_pci_dev (dev);
-        np = pci_device_to_OF_node(pdev);
-        if (np == NULL || np->full_name == NULL)
-                return 0;
-        return sprintf(buf, "%s", np->full_name);
-}
-static DEVICE_ATTR(devspec, S_IRUGO, pci_show_devspec, NULL);
 #else /* CONFIG_PPC_OF */
 void pcibios_make_OF_bus_map(void)
 {
 }
 #endif /* CONFIG_PPC_OF */
-/* Add sysfs properties */
-void pcibios_add_platform_entries(struct pci_dev *pdev)
-{
-#ifdef CONFIG_PPC_OF
-        device_create_file(&pdev->dev, &dev_attr_devspec);
-#endif /* CONFIG_PPC_OF */
-}
 #ifdef CONFIG_PPC_PMAC
 /*
 * This set of routines checks for PCI<->PCI bridges that have closed
@@ -1269,14 +1173,14 @@ pcibios_fixup_p2p_bridges(void)
 static int __init
 pcibios_init(void)
 {
-        struct pci_controller *hose;
+        struct pci_controller *hose, *tmp;
        struct pci_bus *bus;
-        int next_busno;
+        int next_busno = 0;
        printk(KERN_INFO "PCI: Probing PCI hardware\n");
        /* Scan all of the recorded PCI controllers.  */
-        for (next_busno = 0, hose = hose_head; hose; hose = hose->next) {
+        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
                if (pci_assign_all_buses)
                        hose->first_busno = next_busno;
                hose->last_busno = 0xff;
@@ -1319,12 +1223,6 @@ pcibios_init(void)
 subsys_initcall(pcibios_init);
-unsigned long resource_fixup(struct pci_dev * dev, struct resource * res,
-                             unsigned long start, unsigned long size)
-{
-        return start;
-}
 void __init pcibios_fixup_bus(struct pci_bus *bus)
 {
        struct pci_controller *hose = (struct pci_controller *) bus->sysdata;
@@ -1342,7 +1240,7 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
                if (!res->flags) {
                        if (io_offset)
                                printk(KERN_ERR "I/O resource not set for host"
-                                       " bridge %d\n", hose->index);
+                                       " bridge %d\n", hose->global_number);
                        res->start = 0;
                        res->end = IO_SPACE_LIMIT;
                        res->flags = IORESOURCE_IO;
@@ -1356,7 +1254,7 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
                                if (i > 0)
                                        continue;
                                printk(KERN_ERR "Memory resource not set for "
-                                       "host bridge %d\n", hose->index);
+                                       "host bridge %d\n", hose->global_number);
                                res->start = hose->pci_mem_offset;
                                res->end = ~0U;
                                res->flags = IORESOURCE_MEM;
@@ -1370,7 +1268,7 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
                for (i = 0; i < 4; ++i) {
                        if ((res = bus->resource[i]) == NULL)
                                continue;
-                        if (!res->flags)
+                        if (!res->flags || bus->self->transparent)
                                continue;
                        if (io_offset && (res->flags & IORESOURCE_IO)) {
                                res->start += io_offset;
@@ -1395,11 +1293,6 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
        }
 }
-char __init *pcibios_setup(char *str)
-{
-        return str;
-}
 /* the next one is stolen from the alpha port... */
 void __init
 pcibios_update_irq(struct pci_dev *dev, int irq)
@@ -1408,64 +1301,6 @@ pcibios_update_irq(struct pci_dev *dev, int irq)
        /* XXX FIXME - update OF device tree node interrupt property */
 }
-#ifdef CONFIG_PPC_MERGE
-/* XXX This is a copy of the ppc64 version. This is temporary until we start
- * merging the 2 PCI layers
- */
-/*
- * Reads the interrupt pin to determine if interrupt is use by card.
- * If the interrupt is used, then gets the interrupt line from the
- * openfirmware and sets it in the pci_dev and pci_config line.
- */
-int pci_read_irq_line(struct pci_dev *pci_dev)
-{
-        struct of_irq oirq;
-        unsigned int virq;
-        DBG("Try to map irq for %s...\n", pci_name(pci_dev));
-        /* Try to get a mapping from the device-tree */
-        if (of_irq_map_pci(pci_dev, &oirq)) {
-                u8 line, pin;
-                /* If that fails, lets fallback to what is in the config
-                 * space and map that through the default controller. We
-                 * also set the type to level low since that's what PCI
-                 * interrupts are. If your platform does differently, then
-                 * either provide a proper interrupt tree or don't use this
-                 * function.
-                 */
-                if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_PIN, &pin))
-                        return -1;
-                if (pin == 0)
-                        return -1;
-                if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_LINE, &line) ||
-                    line == 0xff) {
-                        return -1;
-                }
-                DBG(" -> no map ! Using irq line %d from PCI config\n", line);
-                virq = irq_create_mapping(NULL, line);
-                if (virq != NO_IRQ)
-                        set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
-        } else {
-                DBG(" -> got one, spec %d cells (0x%08x...) on %s\n",
-                    oirq.size, oirq.specifier[0], oirq.controller->full_name);
-                virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
-                                             oirq.size);
-        }
-        if(virq == NO_IRQ) {
-                DBG(" -> failed to map !\n");
-                return -1;
-        }
-        pci_dev->irq = virq;
-        return 0;
-}
-EXPORT_SYMBOL(pci_read_irq_line);
-#endif /* CONFIG_PPC_MERGE */
 int pcibios_enable_device(struct pci_dev *dev, int mask)
 {
        u16 cmd, old_cmd;
@@ -1497,281 +1332,17 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
        return 0;
 }
-struct pci_controller*
+static struct pci_controller*
 pci_bus_to_hose(int bus)
 {
-        struct pci_controller* hose = hose_head;
+        struct pci_controller *hose, *tmp;
-        for (; hose; hose = hose->next)
+        list_for_each_entry_safe(hose, tmp, &hose_list, list_node)
                if (bus >= hose->first_busno && bus <= hose->last_busno)
                        return hose;
        return NULL;
 }
-void __iomem *
-pci_bus_io_base(unsigned int bus)
-{
-        struct pci_controller *hose;
-        hose = pci_bus_to_hose(bus);
-        if (!hose)
-                return NULL;
-        return hose->io_base_virt;
-}
-unsigned long
-pci_bus_io_base_phys(unsigned int bus)
-{
-        struct pci_controller *hose;
-        hose = pci_bus_to_hose(bus);
-        if (!hose)
-                return 0;
-        return hose->io_base_phys;
-}
-unsigned long
-pci_bus_mem_base_phys(unsigned int bus)
-{
-        struct pci_controller *hose;
-        hose = pci_bus_to_hose(bus);
-        if (!hose)
-                return 0;
-        return hose->pci_mem_offset;
-}
-unsigned long
-pci_resource_to_bus(struct pci_dev *pdev, struct resource *res)
-{
-        /* Hack alert again ! See comments in chrp_pci.c
-         */
-        struct pci_controller* hose =
-                (struct pci_controller *)pdev->sysdata;
-        if (hose && res->flags & IORESOURCE_MEM)
-                return res->start - hose->pci_mem_offset;
-        /* We may want to do something with IOs here... */
-        return res->start;
-}
-static struct resource *__pci_mmap_make_offset(struct pci_dev *dev,
-                                               resource_size_t *offset,
-                                               enum pci_mmap_state mmap_state)
-{
-        struct pci_controller *hose = pci_bus_to_hose(dev->bus->number);
-        unsigned long io_offset = 0;
-        int i, res_bit;
-        if (hose == 0)
-                return NULL;            /* should never happen */
-        /* If memory, add on the PCI bridge address offset */
-        if (mmap_state == pci_mmap_mem) {
-#if 0 /* See comment in pci_resource_to_user() for why this is disabled */
-                *offset += hose->pci_mem_offset;
-#endif
-                res_bit = IORESOURCE_MEM;
-        } else {
-                io_offset = hose->io_base_virt - (void __iomem *)_IO_BASE;
-                *offset += io_offset;
-                res_bit = IORESOURCE_IO;
-        }
-        /*
-         * Check that the offset requested corresponds to one of the
-         * resources of the device.
-         */
-        for (i = 0; i <= PCI_ROM_RESOURCE; i++) {
-                struct resource *rp = &dev->resource[i];
-                int flags = rp->flags;
-                /* treat ROM as memory (should be already) */
-                if (i == PCI_ROM_RESOURCE)
-                        flags |= IORESOURCE_MEM;
-                /* Active and same type? */
-                if ((flags & res_bit) == 0)
-                        continue;
-                /* In the range of this resource? */
-                if (*offset < (rp->start & PAGE_MASK) || *offset > rp->end)
-                        continue;
-                /* found it! construct the final physical address */
-                if (mmap_state == pci_mmap_io)
-                        *offset += hose->io_base_phys - io_offset;
-                return rp;
-        }
-        return NULL;
-}
-/*
- * Set vm_page_prot of VMA, as appropriate for this architecture, for a pci
- * device mapping.
- */
-static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,
-                                      pgprot_t protection,
-                                      enum pci_mmap_state mmap_state,
-                                      int write_combine)
-{
-        unsigned long prot = pgprot_val(protection);
-        /* Write combine is always 0 on non-memory space mappings. On
-         * memory space, if the user didn't pass 1, we check for a
-         * "prefetchable" resource. This is a bit hackish, but we use
-         * this to workaround the inability of /sysfs to provide a write
-         * combine bit
-         */
-        if (mmap_state != pci_mmap_mem)
-                write_combine = 0;
-        else if (write_combine == 0) {
-                if (rp->flags & IORESOURCE_PREFETCH)
-                        write_combine = 1;
-        }
-        /* XXX would be nice to have a way to ask for write-through */
-        prot |= _PAGE_NO_CACHE;
-        if (write_combine)
-                prot &= ~_PAGE_GUARDED;
-        else
-                prot |= _PAGE_GUARDED;
-        return __pgprot(prot);
-}
-/*
- * This one is used by /dev/mem and fbdev who have no clue about the
- * PCI device, it tries to find the PCI device first and calls the
- * above routine
- */
-pgprot_t pci_phys_mem_access_prot(struct file *file,
-                                  unsigned long pfn,
-                                  unsigned long size,
-                                  pgprot_t protection)
-{
-        struct pci_dev *pdev = NULL;
-        struct resource *found = NULL;
-        unsigned long prot = pgprot_val(protection);
-        unsigned long offset = pfn << PAGE_SHIFT;
-        int i;
-        if (page_is_ram(pfn))
-                return __pgprot(prot);
-        prot |= _PAGE_NO_CACHE | _PAGE_GUARDED;
-        for_each_pci_dev(pdev) {
-                for (i = 0; i <= PCI_ROM_RESOURCE; i++) {
-                        struct resource *rp = &pdev->resource[i];
-                        int flags = rp->flags;
-                        /* Active and same type? */
-                        if ((flags & IORESOURCE_MEM) == 0)
-                                continue;
-                        /* In the range of this resource? */
-                        if (offset < (rp->start & PAGE_MASK) ||
-                            offset > rp->end)
-                                continue;
-                        found = rp;
-                        break;
-                }
-                if (found)
-                        break;
-        }
-        if (found) {
-                if (found->flags & IORESOURCE_PREFETCH)
-                        prot &= ~_PAGE_GUARDED;
-                pci_dev_put(pdev);
-        }
-        DBG("non-PCI map for %lx, prot: %lx\n", offset, prot);
-        return __pgprot(prot);
-}
-/*
- * Perform the actual remap of the pages for a PCI device mapping, as
- * appropriate for this architecture.  The region in the process to map
- * is described by vm_start and vm_end members of VMA, the base physical
- * address is found in vm_pgoff.
- * The pci device structure is provided so that architectures may make mapping
- * decisions on a per-device or per-bus basis.
- *
- * Returns a negative error code on failure, zero on success.
- */
-int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
-                        enum pci_mmap_state mmap_state,
-                        int write_combine)
-{
-        resource_size_t offset = vma->vm_pgoff << PAGE_SHIFT;
-        struct resource *rp;
-        int ret;
-        rp = __pci_mmap_make_offset(dev, &offset, mmap_state);
-        if (rp == NULL)
-                return -EINVAL;
-        vma->vm_pgoff = offset >> PAGE_SHIFT;
-        vma->vm_page_prot = __pci_mmap_set_pgprot(dev, rp,
-                                                  vma->vm_page_prot,
-                                                  mmap_state, write_combine);
-        ret = remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
-                               vma->vm_end - vma->vm_start, vma->vm_page_prot);
-        return ret;
-}
-/* Obsolete functions. Should be removed once the symbios driver
- * is fixed
- */
-unsigned long
-phys_to_bus(unsigned long pa)
-{
-        struct pci_controller *hose;
-        int i;
-        for (hose = hose_head; hose; hose = hose->next) {
-                for (i = 0; i < 3; ++i) {
-                        if (pa >= hose->mem_resources[i].start
-                            && pa <= hose->mem_resources[i].end) {
-                                /*
-                                 * XXX the hose->pci_mem_offset really
-                                 * only applies to mem_resources[0].
-                                 * We need a way to store an offset for
-                                 * the others.  -- paulus
-                                 */
-                                if (i == 0)
-                                        pa -= hose->pci_mem_offset;
-                                return pa;
-                        }
-                }
-        }
-        /* hmmm, didn't find it */
-        return 0;
-}
-unsigned long
-pci_phys_to_bus(unsigned long pa, int busnr)
-{
-        struct pci_controller* hose = pci_bus_to_hose(busnr);
-        if (!hose)
-                return pa;
-        return pa - hose->pci_mem_offset;
-}
-unsigned long
-pci_bus_to_phys(unsigned int ba, int busnr)
-{
-        struct pci_controller* hose = pci_bus_to_hose(busnr);
-        if (!hose)
-                return ba;
-        return ba + hose->pci_mem_offset;
-}
 /* Provide information on locations of various I/O regions in physical
 * memory.  Do this on a per-card basis so that we choose the right
 * root bridge.
@@ -1814,62 +1385,11 @@ long sys_pciconfig_iobase(long which, unsigned long bus, unsigned long devfn)
        return result;
 }
-void pci_resource_to_user(const struct pci_dev *dev, int bar,
-                          const struct resource *rsrc,
-                          resource_size_t *start, resource_size_t *end)
-{
-        struct pci_controller *hose = pci_bus_to_hose(dev->bus->number);
-        resource_size_t offset = 0;
-        if (hose == NULL)
-                return;
-        if (rsrc->flags & IORESOURCE_IO)
-                offset = (unsigned long)hose->io_base_virt - _IO_BASE;
-        /* We pass a fully fixed up address to userland for MMIO instead of
-         * a BAR value because X is lame and expects to be able to use that
-         * to pass to /dev/mem !
-         *
-         * That means that we'll have potentially 64 bits values where some
-         * userland apps only expect 32 (like X itself since it thinks only
-         * Sparc has 64 bits MMIO) but if we don't do that, we break it on
-         * 32 bits CHRPs :-(
-         *
-         * Hopefully, the sysfs insterface is immune to that gunk. Once X
-         * has been fixed (and the fix spread enough), we can re-enable the
-         * 2 lines below and pass down a BAR value to userland. In that case
-         * we'll also have to re-enable the matching code in
-         * __pci_mmap_make_offset().
-         *
-         * BenH.
-         */
-#if 0
-        else if (rsrc->flags & IORESOURCE_MEM)
-                offset = hose->pci_mem_offset;
-#endif
-        *start = rsrc->start - offset;
-        *end = rsrc->end - offset;
-}
-void __init pci_init_resource(struct resource *res, resource_size_t start,
-                              resource_size_t end, int flags, char *name)
-{
-        res->start = start;
-        res->end = end;
-        res->flags = flags;
-        res->name = name;
-        res->parent = NULL;
-        res->sibling = NULL;
-        res->child = NULL;
-}
 unsigned long pci_address_to_pio(phys_addr_t address)
 {
-        struct pci_controller* hose = hose_head;
+        struct pci_controller *hose, *tmp;
-        for (; hose; hose = hose->next) {
+        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
                unsigned int size = hose->io_resource.end -
                        hose->io_resource.start + 1;
                if (address >= hose->io_base_phys &&
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 249cca27a9..a97e23ac19 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -22,6 +22,7 @@
 #include <linux/list.h>
 #include <linux/syscalls.h>
 #include <linux/irq.h>
+#include <linux/vmalloc.h>
 #include <asm/processor.h>
 #include <asm/io.h>
@@ -41,35 +42,23 @@
 unsigned long pci_probe_only = 1;
 int pci_assign_all_buses = 0;
-static int pci_initial_scan_done;
 static void fixup_resource(struct resource *res, struct pci_dev *dev);
 static void do_bus_setup(struct pci_bus *bus);
-static void phbs_remap_io(void);
 /* pci_io_base -- the base address from which io bars are offsets.
 * This is the lowest I/O base address (so bar values are always positive),
 * and it *must* be the start of ISA space if an ISA bus exists because
- * ISA drivers use hard coded offsets.  If no ISA bus exists a dummy
+ * ISA drivers use hard coded offsets.  If no ISA bus exists nothing
- * page is mapped and isa_io_limit prevents access to it.
+ * is mapped on the first 64K of IO space
 */
-unsigned long isa_io_base;      /* NULL if no ISA bus */
+unsigned long pci_io_base = ISA_IO_BASE;
-EXPORT_SYMBOL(isa_io_base);
-unsigned long pci_io_base;
 EXPORT_SYMBOL(pci_io_base);
-void iSeries_pcibios_init(void);
 LIST_HEAD(hose_list);
 static struct dma_mapping_ops *pci_dma_ops;
-int global_phb_number;          /* Global phb counter */
-/* Cached ISA bridge dev. */
-struct pci_dev *ppc64_isabridge_dev = NULL;
-EXPORT_SYMBOL_GPL(ppc64_isabridge_dev);
 void set_pci_dma_ops(struct dma_mapping_ops *dma_ops)
 {
        pci_dma_ops = dma_ops;
@@ -100,7 +89,7 @@ void  pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region
                return;
        if (res->flags & IORESOURCE_IO)
-                offset = (unsigned long)hose->io_base_virt - pci_io_base;
+                offset = (unsigned long)hose->io_base_virt - _IO_BASE;
        if (res->flags & IORESOURCE_MEM)
                offset = hose->pci_mem_offset;
@@ -119,7 +108,7 @@ void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
                return;
        if (res->flags & IORESOURCE_IO)
-                offset = (unsigned long)hose->io_base_virt - pci_io_base;
+                offset = (unsigned long)hose->io_base_virt - _IO_BASE;
        if (res->flags & IORESOURCE_MEM)
                offset = hose->pci_mem_offset;
@@ -156,7 +145,7 @@ void pcibios_align_resource(void *data, struct resource *res,
        if (res->flags & IORESOURCE_IO) {
                unsigned long offset = (unsigned long)hose->io_base_virt -
-                                        pci_io_base;
+                                        _IO_BASE;
                /* Make sure we start at our min on all hoses */
                if (start - offset < PCIBIOS_MIN_IO)
                        start = PCIBIOS_MIN_IO + offset;
@@ -180,55 +169,6 @@ void pcibios_align_resource(void *data, struct resource *res,
        res->start = start;
 }
-static DEFINE_SPINLOCK(hose_spinlock);
-/*
- * pci_controller(phb) initialized common variables.
- */
-static void __devinit pci_setup_pci_controller(struct pci_controller *hose)
-{
-        memset(hose, 0, sizeof(struct pci_controller));
-        spin_lock(&hose_spinlock);
-        hose->global_number = global_phb_number++;
-        list_add_tail(&hose->list_node, &hose_list);
-        spin_unlock(&hose_spinlock);
-}
-struct pci_controller * pcibios_alloc_controller(struct device_node *dev)
-{
-        struct pci_controller *phb;
-        if (mem_init_done)
-                phb = kmalloc(sizeof(struct pci_controller), GFP_KERNEL);
-        else
-                phb = alloc_bootmem(sizeof (struct pci_controller));
-        if (phb == NULL)
-                return NULL;
-        pci_setup_pci_controller(phb);
-        phb->arch_data = dev;
-        phb->is_dynamic = mem_init_done;
-        if (dev) {
-                int nid = of_node_to_nid(dev);
-                if (nid < 0 || !node_online(nid))
-                        nid = -1;
-                PHB_SET_NODE(phb, nid);
-        }
-        return phb;
-}
-void pcibios_free_controller(struct pci_controller *phb)
-{
-        spin_lock(&hose_spinlock);
-        list_del(&phb->list_node);
-        spin_unlock(&hose_spinlock);
-        if (phb->is_dynamic)
-                kfree(phb);
-}
 void __devinit pcibios_claim_one_bus(struct pci_bus *b)
 {
        struct pci_dev *dev;
@@ -291,7 +231,6 @@ static unsigned int pci_parse_of_flags(u32 addr0)
        return flags;
 }
-#define GET_64BIT(prop, i)      ((((u64) (prop)[(i)]) << 32) | (prop)[(i)+1])
 static void pci_parse_of_addrs(struct device_node *node, struct pci_dev *dev)
 {
@@ -310,8 +249,8 @@ static void pci_parse_of_addrs(struct device_node *node, struct pci_dev *dev)
                flags = pci_parse_of_flags(addrs[0]);
                if (!flags)
                        continue;
-                base = GET_64BIT(addrs, 1);
+                base = of_read_number(&addrs[1], 2);
-                size = GET_64BIT(addrs, 3);
+                size = of_read_number(&addrs[3], 2);
                if (!size)
                        continue;
                i = addrs[0] & 0xff;
@@ -367,8 +306,10 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
        sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),
                dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));
        dev->class = get_int_prop(node, "class-code", 0);
+        dev->revision = get_int_prop(node, "revision-id", 0);
        DBG("    class: 0x%x\n", dev->class);
+        DBG("    revision: 0x%x\n", dev->revision);
        dev->current_state = 4;         /* unknown power state */
        dev->error_state = pci_channel_io_normal;
@@ -477,7 +418,7 @@ void __devinit of_scan_pci_bridge(struct device_node *node,
        i = 1;
        for (; len >= 32; len -= 32, ranges += 8) {
                flags = pci_parse_of_flags(ranges[0]);
-                size = GET_64BIT(ranges, 6);
+                size = of_read_number(&ranges[6], 2);
                if (flags == 0 || size == 0)
                        continue;
                if (flags & IORESOURCE_IO) {
@@ -496,7 +437,7 @@ void __devinit of_scan_pci_bridge(struct device_node *node,
                        res = bus->resource[i];
                        ++i;
                }
-                res->start = GET_64BIT(ranges, 1);
+                res->start = of_read_number(&ranges[1], 2);
                res->end = res->start + size - 1;
                res->flags = flags;
                fixup_resource(res, dev);
@@ -535,10 +476,16 @@ void __devinit scan_phb(struct pci_controller *hose)
        bus->secondary = hose->first_busno;
        hose->bus = bus;
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                pcibios_map_io_space(bus);
        bus->resource[0] = res = &hose->io_resource;
-        if (res->flags && request_resource(&ioport_resource, res))
+        if (res->flags && request_resource(&ioport_resource, res)) {
                printk(KERN_ERR "Failed to request PCI IO region "
                       "on PCI domain %04x\n", hose->global_number);
+                DBG("res->start = 0x%016lx, res->end = 0x%016lx\n",
+                    res->start, res->end);
+        }
        for (i = 0; i < 3; ++i) {
                res = &hose->mem_resources[i];
@@ -596,17 +543,6 @@ static int __init pcibios_init(void)
        if (ppc_md.pcibios_fixup)
                ppc_md.pcibios_fixup();
-        /* Cache the location of the ISA bridge (if we have one) */
-        ppc64_isabridge_dev = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL);
-        if (ppc64_isabridge_dev != NULL)
-                printk(KERN_DEBUG "ISA bridge at %s\n", pci_name(ppc64_isabridge_dev));
-        if (!firmware_has_feature(FW_FEATURE_ISERIES))
-                /* map in PCI I/O space */
-                phbs_remap_io();
-        pci_initial_scan_done = 1;
        printk(KERN_DEBUG "PCI: Probing PCI hardware done\n");
        return 0;
@@ -614,11 +550,6 @@ static int __init pcibios_init(void)
 subsys_initcall(pcibios_init);
-char __init *pcibios_setup(char *str)
-{
-        return str;
-}
 int pcibios_enable_device(struct pci_dev *dev, int mask)
 {
        u16 cmd, oldcmd;
@@ -649,22 +580,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
        return 0;
 }
-/*
- * Return the domain number for this bus.
- */
-int pci_domain_nr(struct pci_bus *bus)
-{
-        if (firmware_has_feature(FW_FEATURE_ISERIES))
-                return 0;
-        else {
-                struct pci_controller *hose = pci_bus_to_host(bus);
-                return hose->global_number;
-        }
-}
-EXPORT_SYMBOL(pci_domain_nr);
 /* Decide whether to display the domain number in /proc */
 int pci_proc_domain(struct pci_bus *bus)
 {
@@ -676,281 +591,6 @@ int pci_proc_domain(struct pci_bus *bus)
        }
 }
-/*
- * Platform support for /proc/bus/pci/X/Y mmap()s,
- * modelled on the sparc64 implementation by Dave Miller.
- *  -- paulus.
- */
-/*
- * Adjust vm_pgoff of VMA such that it is the physical page offset
- * corresponding to the 32-bit pci bus offset for DEV requested by the user.
- *
- * Basically, the user finds the base address for his device which he wishes
- * to mmap.  They read the 32-bit value from the config space base register,
- * add whatever PAGE_SIZE multiple offset they wish, and feed this into the
- * offset parameter of mmap on /proc/bus/pci/XXX for that device.
- *
- * Returns negative error code on failure, zero on success.
- */
-static struct resource *__pci_mmap_make_offset(struct pci_dev *dev,
-                                               resource_size_t *offset,
-                                               enum pci_mmap_state mmap_state)
-{
-        struct pci_controller *hose = pci_bus_to_host(dev->bus);
-        unsigned long io_offset = 0;
-        int i, res_bit;
-        if (hose == 0)
-                return NULL;            /* should never happen */
-        /* If memory, add on the PCI bridge address offset */
-        if (mmap_state == pci_mmap_mem) {
-#if 0 /* See comment in pci_resource_to_user() for why this is disabled */
-                *offset += hose->pci_mem_offset;
-#endif
-                res_bit = IORESOURCE_MEM;
-        } else {
-                io_offset = (unsigned long)hose->io_base_virt - pci_io_base;
-                *offset += io_offset;
-                res_bit = IORESOURCE_IO;
-        }
-        /*
-         * Check that the offset requested corresponds to one of the
-         * resources of the device.
-         */
-        for (i = 0; i <= PCI_ROM_RESOURCE; i++) {
-                struct resource *rp = &dev->resource[i];
-                int flags = rp->flags;
-                /* treat ROM as memory (should be already) */
-                if (i == PCI_ROM_RESOURCE)
-                        flags |= IORESOURCE_MEM;
-                /* Active and same type? */
-                if ((flags & res_bit) == 0)
-                        continue;
-                /* In the range of this resource? */
-                if (*offset < (rp->start & PAGE_MASK) || *offset > rp->end)
-                        continue;
-                /* found it! construct the final physical address */
-                if (mmap_state == pci_mmap_io)
-                        *offset += hose->io_base_phys - io_offset;
-                return rp;
-        }
-        return NULL;
-}
-/*
- * Set vm_page_prot of VMA, as appropriate for this architecture, for a pci
- * device mapping.
- */
-static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,
-                                      pgprot_t protection,
-                                      enum pci_mmap_state mmap_state,
-                                      int write_combine)
-{
-        unsigned long prot = pgprot_val(protection);
-        /* Write combine is always 0 on non-memory space mappings. On
-         * memory space, if the user didn't pass 1, we check for a
-         * "prefetchable" resource. This is a bit hackish, but we use
-         * this to workaround the inability of /sysfs to provide a write
-         * combine bit
-         */
-        if (mmap_state != pci_mmap_mem)
-                write_combine = 0;
-        else if (write_combine == 0) {
-                if (rp->flags & IORESOURCE_PREFETCH)
-                        write_combine = 1;
-        }
-        /* XXX would be nice to have a way to ask for write-through */
-        prot |= _PAGE_NO_CACHE;
-        if (write_combine)
-                prot &= ~_PAGE_GUARDED;
-        else
-                prot |= _PAGE_GUARDED;
-        return __pgprot(prot);
-}
-/*
- * This one is used by /dev/mem and fbdev who have no clue about the
- * PCI device, it tries to find the PCI device first and calls the
- * above routine
- */
-pgprot_t pci_phys_mem_access_prot(struct file *file,
-                                  unsigned long pfn,
-                                  unsigned long size,
-                                  pgprot_t protection)
-{
-        struct pci_dev *pdev = NULL;
-        struct resource *found = NULL;
-        unsigned long prot = pgprot_val(protection);
-        unsigned long offset = pfn << PAGE_SHIFT;
-        int i;
-        if (page_is_ram(pfn))
-                return __pgprot(prot);
-        prot |= _PAGE_NO_CACHE | _PAGE_GUARDED;
-        for_each_pci_dev(pdev) {
-                for (i = 0; i <= PCI_ROM_RESOURCE; i++) {
-                        struct resource *rp = &pdev->resource[i];
-                        int flags = rp->flags;
-                        /* Active and same type? */
-                        if ((flags & IORESOURCE_MEM) == 0)
-                                continue;
-                        /* In the range of this resource? */
-                        if (offset < (rp->start & PAGE_MASK) ||
-                            offset > rp->end)
-                                continue;
-                        found = rp;
-                        break;
-                }
-                if (found)
-                        break;
-        }
-        if (found) {
-                if (found->flags & IORESOURCE_PREFETCH)
-                        prot &= ~_PAGE_GUARDED;
-                pci_dev_put(pdev);
-        }
-        DBG("non-PCI map for %lx, prot: %lx\n", offset, prot);
-        return __pgprot(prot);
-}
-/*
- * Perform the actual remap of the pages for a PCI device mapping, as
- * appropriate for this architecture.  The region in the process to map
- * is described by vm_start and vm_end members of VMA, the base physical
- * address is found in vm_pgoff.
- * The pci device structure is provided so that architectures may make mapping
- * decisions on a per-device or per-bus basis.
- *
- * Returns a negative error code on failure, zero on success.
- */
-int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
-                        enum pci_mmap_state mmap_state, int write_combine)
-{
-        resource_size_t offset = vma->vm_pgoff << PAGE_SHIFT;
-        struct resource *rp;
-        int ret;
-        rp = __pci_mmap_make_offset(dev, &offset, mmap_state);
-        if (rp == NULL)
-                return -EINVAL;
-        vma->vm_pgoff = offset >> PAGE_SHIFT;
-        vma->vm_page_prot = __pci_mmap_set_pgprot(dev, rp,
-                                                  vma->vm_page_prot,
-                                                  mmap_state, write_combine);
-        ret = remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
-                               vma->vm_end - vma->vm_start, vma->vm_page_prot);
-        return ret;
-}
-static ssize_t pci_show_devspec(struct device *dev,
-                struct device_attribute *attr, char *buf)
-{
-        struct pci_dev *pdev;
-        struct device_node *np;
-        pdev = to_pci_dev (dev);
-        np = pci_device_to_OF_node(pdev);
-        if (np == NULL || np->full_name == NULL)
-                return 0;
-        return sprintf(buf, "%s", np->full_name);
-}
-static DEVICE_ATTR(devspec, S_IRUGO, pci_show_devspec, NULL);
-void pcibios_add_platform_entries(struct pci_dev *pdev)
-{
-        device_create_file(&pdev->dev, &dev_attr_devspec);
-}
-#define ISA_SPACE_MASK 0x1
-#define ISA_SPACE_IO 0x1
-static void __devinit pci_process_ISA_OF_ranges(struct device_node *isa_node,
-                                      unsigned long phb_io_base_phys,
-                                      void __iomem * phb_io_base_virt)
-{
-        /* Remove these asap */
-        struct pci_address {
-                u32 a_hi;
-                u32 a_mid;
-                u32 a_lo;
-        };
-        struct isa_address {
-                u32 a_hi;
-                u32 a_lo;
-        };
-        struct isa_range {
-                struct isa_address isa_addr;
-                struct pci_address pci_addr;
-                unsigned int size;
-        };
-        const struct isa_range *range;
-        unsigned long pci_addr;
-        unsigned int isa_addr;
-        unsigned int size;
-        int rlen = 0;
-        range = of_get_property(isa_node, "ranges", &rlen);
-        if (range == NULL || (rlen < sizeof(struct isa_range))) {
-                printk(KERN_ERR "no ISA ranges or unexpected isa range size,"
-                       "mapping 64k\n");
-                __ioremap_explicit(phb_io_base_phys,
-                                   (unsigned long)phb_io_base_virt,
-                                   0x10000, _PAGE_NO_CACHE | _PAGE_GUARDED);
-                return; 
-        }
-        
-        /* From "ISA Binding to 1275"
-         * The ranges property is laid out as an array of elements,
-         * each of which comprises:
-         *   cells 0 - 1:       an ISA address
-         *   cells 2 - 4:       a PCI address 
-         *                      (size depending on dev->n_addr_cells)
-         *   cell 5:            the size of the range
-         */
-        if ((range->isa_addr.a_hi && ISA_SPACE_MASK) == ISA_SPACE_IO) {
-                isa_addr = range->isa_addr.a_lo;
-                pci_addr = (unsigned long) range->pci_addr.a_mid << 32 | 
-                        range->pci_addr.a_lo;
-                /* Assume these are both zero */
-                if ((pci_addr != 0) || (isa_addr != 0)) {
-                        printk(KERN_ERR "unexpected isa to pci mapping: %s\n",
-                                        __FUNCTION__);
-                        return;
-                }
-                
-                size = PAGE_ALIGN(range->size);
-                __ioremap_explicit(phb_io_base_phys, 
-                                   (unsigned long) phb_io_base_virt, 
-                                   size, _PAGE_NO_CACHE | _PAGE_GUARDED);
-        }
-}
 void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose,
                                            struct device_node *dev, int prim)
 {
@@ -1045,155 +685,122 @@ void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose,
        }
 }
-void __devinit pci_setup_phb_io(struct pci_controller *hose, int primary)
+#ifdef CONFIG_HOTPLUG
+int pcibios_unmap_io_space(struct pci_bus *bus)
 {
-        unsigned long size = hose->pci_io_size;
+        struct pci_controller *hose;
-        unsigned long io_virt_offset;
-        struct resource *res;
-        struct device_node *isa_dn;
-        if (size == 0)
+        WARN_ON(bus == NULL);
-                return;
-        hose->io_base_virt = reserve_phb_iospace(size);
+        /* If this is not a PHB, we only flush the hash table over
-        DBG("phb%d io_base_phys 0x%lx io_base_virt 0x%lx\n",
+         * the area mapped by this bridge. We don't play with the PTE
-                hose->global_number, hose->io_base_phys,
+         * mappings since we might have to deal with sub-page alignemnts
-                (unsigned long) hose->io_base_virt);
+         * so flushing the hash table is the only sane way to make sure
+         * that no hash entries are covering that removed bridge area
-        if (primary) {
+         * while still allowing other busses overlapping those pages
-                pci_io_base = (unsigned long)hose->io_base_virt;
+         */
-                isa_dn = of_find_node_by_type(NULL, "isa");
+        if (bus->self) {
-                if (isa_dn) {
+                struct resource *res = bus->resource[0];
-                        isa_io_base = pci_io_base;
-                        pci_process_ISA_OF_ranges(isa_dn, hose->io_base_phys,
-                                                hose->io_base_virt);
-                        of_node_put(isa_dn);
-                }
-        }
-        io_virt_offset = (unsigned long)hose->io_base_virt - pci_io_base;
+                DBG("IO unmapping for PCI-PCI bridge %s\n",
-        res = &hose->io_resource;
+                    pci_name(bus->self));
-        res->start += io_virt_offset;
-        res->end += io_virt_offset;
-        /* If this is called after the initial PCI scan, then we need to
+                __flush_hash_table_range(&init_mm, res->start + _IO_BASE,
-         * proceed to IO mappings now
+                                         res->end - res->start + 1);
-         */
+                return 0;
-        if (pci_initial_scan_done)
+        }
-                __ioremap_explicit(hose->io_base_phys,
-                                   (unsigned long)hose->io_base_virt,
-                                   hose->pci_io_size,
-                                   _PAGE_NO_CACHE | _PAGE_GUARDED);
-}
-void __devinit pci_setup_phb_io_dynamic(struct pci_controller *hose,
+        /* Get the host bridge */
-                                        int primary)
+        hose = pci_bus_to_host(bus);
-{
-        unsigned long size = hose->pci_io_size;
-        unsigned long io_virt_offset;
-        struct resource *res;
-        if (size == 0)
+        /* Check if we have IOs allocated */
-                return;
+        if (hose->io_base_alloc == 0)
+                return 0;
-        hose->io_base_virt = __ioremap(hose->io_base_phys, size,
+        DBG("IO unmapping for PHB %s\n",
-                                        _PAGE_NO_CACHE | _PAGE_GUARDED);
+            ((struct device_node *)hose->arch_data)->full_name);
-        DBG("phb%d io_base_phys 0x%lx io_base_virt 0x%lx\n",
+        DBG("  alloc=0x%p\n", hose->io_base_alloc);
-                hose->global_number, hose->io_base_phys,
-                (unsigned long) hose->io_base_virt);
-        if (primary)
+        /* This is a PHB, we fully unmap the IO area */
-                pci_io_base = (unsigned long)hose->io_base_virt;
+        vunmap(hose->io_base_alloc);
-        io_virt_offset = (unsigned long)hose->io_base_virt - pci_io_base;
+        return 0;
-        res = &hose->io_resource;
-        res->start += io_virt_offset;
-        res->end += io_virt_offset;
 }
+EXPORT_SYMBOL_GPL(pcibios_unmap_io_space);
+#endif /* CONFIG_HOTPLUG */
-static int get_bus_io_range(struct pci_bus *bus, unsigned long *start_phys,
+int __devinit pcibios_map_io_space(struct pci_bus *bus)
-                                unsigned long *start_virt, unsigned long *size)
 {
-        struct pci_controller *hose = pci_bus_to_host(bus);
+        struct vm_struct *area;
-        struct resource *res;
+        unsigned long phys_page;
+        unsigned long size_page;
-        if (bus->self)
+        unsigned long io_virt_offset;
-                res = bus->resource[0];
+        struct pci_controller *hose;
-        else
-                /* Root Bus */
-                res = &hose->io_resource;
-        if (res->end == 0 && res->start == 0)
-                return 1;
-        *start_virt = pci_io_base + res->start;
+        WARN_ON(bus == NULL);
-        *start_phys = *start_virt + hose->io_base_phys
-                - (unsigned long) hose->io_base_virt;
-        if (res->end > res->start)
+        /* If this not a PHB, nothing to do, page tables still exist and
-                *size = res->end - res->start + 1;
+         * thus HPTEs will be faulted in when needed
-        else {
+         */
-                printk("%s(): unexpected region 0x%lx->0x%lx\n",
+        if (bus->self) {
-                       __FUNCTION__, res->start, res->end);
+                DBG("IO mapping for PCI-PCI bridge %s\n",
-                return 1;
+                    pci_name(bus->self));
+                DBG("  virt=0x%016lx...0x%016lx\n",
+                    bus->resource[0]->start + _IO_BASE,
+                    bus->resource[0]->end + _IO_BASE);
+                return 0;
        }
-        return 0;
+        /* Get the host bridge */
-}
+        hose = pci_bus_to_host(bus);
+        phys_page = _ALIGN_DOWN(hose->io_base_phys, PAGE_SIZE);
-int unmap_bus_range(struct pci_bus *bus)
+        size_page = _ALIGN_UP(hose->pci_io_size, PAGE_SIZE);
-{
-        unsigned long start_phys;
-        unsigned long start_virt;
-        unsigned long size;
-        if (!bus) {
+        /* Make sure IO area address is clear */
-                printk(KERN_ERR "%s() expected bus\n", __FUNCTION__);
+        hose->io_base_alloc = NULL;
-                return 1;
-        }
-        
-        if (get_bus_io_range(bus, &start_phys, &start_virt, &size))
-                return 1;
-        if (__iounmap_explicit((void __iomem *) start_virt, size))
-                return 1;
-        return 0;
-}
-EXPORT_SYMBOL(unmap_bus_range);
-int remap_bus_range(struct pci_bus *bus)
+        /* If there's no IO to map on that bus, get away too */
-{
+        if (hose->pci_io_size == 0 || hose->io_base_phys == 0)
-        unsigned long start_phys;
+                return 0;
-        unsigned long start_virt;
-        unsigned long size;
-        if (!bus) {
+        /* Let's allocate some IO space for that guy. We don't pass
-                printk(KERN_ERR "%s() expected bus\n", __FUNCTION__);
+         * VM_IOREMAP because we don't care about alignment tricks that
-                return 1;
+         * the core does in that case. Maybe we should due to stupid card
-        }
+         * with incomplete address decoding but I'd rather not deal with
-        
+         * those outside of the reserved 64K legacy region.
-        
+         */
-        if (get_bus_io_range(bus, &start_phys, &start_virt, &size))
+        area = __get_vm_area(size_page, 0, PHB_IO_BASE, PHB_IO_END);
-                return 1;
+        if (area == NULL)
-        if (start_phys == 0)
+                return -ENOMEM;
-                return 1;
+        hose->io_base_alloc = area->addr;
-        printk(KERN_DEBUG "mapping IO %lx -> %lx, size: %lx\n", start_phys, start_virt, size);
+        hose->io_base_virt = (void __iomem *)(area->addr +
-        if (__ioremap_explicit(start_phys, start_virt, size,
+                                              hose->io_base_phys - phys_page);
-                               _PAGE_NO_CACHE | _PAGE_GUARDED))
-                return 1;
+        DBG("IO mapping for PHB %s\n",
+            ((struct device_node *)hose->arch_data)->full_name);
+        DBG("  phys=0x%016lx, virt=0x%p (alloc=0x%p)\n",
+            hose->io_base_phys, hose->io_base_virt, hose->io_base_alloc);
+        DBG("  size=0x%016lx (alloc=0x%016lx)\n",
+            hose->pci_io_size, size_page);
+        /* Establish the mapping */
+        if (__ioremap_at(phys_page, area->addr, size_page,
+                         _PAGE_NO_CACHE | _PAGE_GUARDED) == NULL)
+                return -ENOMEM;
+        /* Fixup hose IO resource */
+        io_virt_offset = (unsigned long)hose->io_base_virt - _IO_BASE;
+        hose->io_resource.start += io_virt_offset;
+        hose->io_resource.end += io_virt_offset;
+        DBG("  hose->io_resource=0x%016lx...0x%016lx\n",
+            hose->io_resource.start, hose->io_resource.end);
        return 0;
 }
-EXPORT_SYMBOL(remap_bus_range);
+EXPORT_SYMBOL_GPL(pcibios_map_io_space);
-static void phbs_remap_io(void)
-{
-        struct pci_controller *hose, *tmp;
-        list_for_each_entry_safe(hose, tmp, &hose_list, list_node)
-                remap_bus_range(hose->bus);
-}
 static void __devinit fixup_resource(struct resource *res, struct pci_dev *dev)
 {
@@ -1201,8 +808,7 @@ static void __devinit fixup_resource(struct resource *res, struct pci_dev *dev)
        unsigned long offset;
        if (res->flags & IORESOURCE_IO) {
-                offset = (unsigned long)hose->io_base_virt - pci_io_base;
+                offset = (unsigned long)hose->io_base_virt - _IO_BASE;
                res->start += offset;
                res->end += offset;
        } else if (res->flags & IORESOURCE_MEM) {
@@ -1217,9 +823,20 @@ void __devinit pcibios_fixup_device_resources(struct pci_dev *dev,
        /* Update device resources.  */
        int i;
-        for (i = 0; i < PCI_NUM_RESOURCES; i++)
+        DBG("%s: Fixup resources:\n", pci_name(dev));
-                if (dev->resource[i].flags)
+        for (i = 0; i < PCI_NUM_RESOURCES; i++) {
-                        fixup_resource(&dev->resource[i], dev);
+                struct resource *res = &dev->resource[i];
+                if (!res->flags)
+                        continue;
+                DBG("  0x%02x < %08lx:0x%016lx...0x%016lx\n",
+                    i, res->flags, res->start, res->end);
+                fixup_resource(res, dev);
+                DBG("       > %08lx:0x%016lx...0x%016lx\n",
+                    res->flags, res->start, res->end);
+        }
 }
 EXPORT_SYMBOL(pcibios_fixup_device_resources);
@@ -1289,119 +906,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
 }
 EXPORT_SYMBOL(pcibios_fixup_bus);
-/*
- * Reads the interrupt pin to determine if interrupt is use by card.
- * If the interrupt is used, then gets the interrupt line from the 
- * openfirmware and sets it in the pci_dev and pci_config line.
- */
-int pci_read_irq_line(struct pci_dev *pci_dev)
-{
-        struct of_irq oirq;
-        unsigned int virq;
-        DBG("Try to map irq for %s...\n", pci_name(pci_dev));
-#ifdef DEBUG
-        memset(&oirq, 0xff, sizeof(oirq));
-#endif
-        /* Try to get a mapping from the device-tree */
-        if (of_irq_map_pci(pci_dev, &oirq)) {
-                u8 line, pin;
-                /* If that fails, lets fallback to what is in the config
-                 * space and map that through the default controller. We
-                 * also set the type to level low since that's what PCI
-                 * interrupts are. If your platform does differently, then
-                 * either provide a proper interrupt tree or don't use this
-                 * function.
-                 */
-                if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_PIN, &pin))
-                        return -1;
-                if (pin == 0)
-                        return -1;
-                if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_LINE, &line) ||
-                    line == 0xff) {
-                        return -1;
-                }
-                DBG(" -> no map ! Using irq line %d from PCI config\n", line);
-                virq = irq_create_mapping(NULL, line);
-                if (virq != NO_IRQ)
-                        set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
-        } else {
-                DBG(" -> got one, spec %d cells (0x%08x 0x%08x...) on %s\n",
-                    oirq.size, oirq.specifier[0], oirq.specifier[1],
-                    oirq.controller->full_name);
-                virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
-                                             oirq.size);
-        }
-        if(virq == NO_IRQ) {
-                DBG(" -> failed to map !\n");
-                return -1;
-        }
-        DBG(" -> mapped to linux irq %d\n", virq);
-        pci_dev->irq = virq;
-        return 0;
-}
-EXPORT_SYMBOL(pci_read_irq_line);
-void pci_resource_to_user(const struct pci_dev *dev, int bar,
-                          const struct resource *rsrc,
-                          resource_size_t *start, resource_size_t *end)
-{
-        struct pci_controller *hose = pci_bus_to_host(dev->bus);
-        resource_size_t offset = 0;
-        if (hose == NULL)
-                return;
-        if (rsrc->flags & IORESOURCE_IO)
-                offset = (unsigned long)hose->io_base_virt - pci_io_base;
-        /* We pass a fully fixed up address to userland for MMIO instead of
-         * a BAR value because X is lame and expects to be able to use that
-         * to pass to /dev/mem !
-         *
-         * That means that we'll have potentially 64 bits values where some
-         * userland apps only expect 32 (like X itself since it thinks only
-         * Sparc has 64 bits MMIO) but if we don't do that, we break it on
-         * 32 bits CHRPs :-(
-         *
-         * Hopefully, the sysfs insterface is immune to that gunk. Once X
-         * has been fixed (and the fix spread enough), we can re-enable the
-         * 2 lines below and pass down a BAR value to userland. In that case
-         * we'll also have to re-enable the matching code in
-         * __pci_mmap_make_offset().
-         *
-         * BenH.
-         */
-#if 0
-        else if (rsrc->flags & IORESOURCE_MEM)
-                offset = hose->pci_mem_offset;
-#endif
-        *start = rsrc->start - offset;
-        *end = rsrc->end - offset;
-}
-struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node)
-{
-        if (!have_of)
-                return NULL;
-        while(node) {
-                struct pci_controller *hose, *tmp;
-                list_for_each_entry_safe(hose, tmp, &hose_list, list_node)
-                        if (hose->arch_data == node)
-                                return hose;
-                node = node->parent;
-        }
-        return NULL;
-}
 unsigned long pci_address_to_pio(phys_addr_t address)
 {
        struct pci_controller *hose, *tmp;
@@ -1410,7 +914,7 @@ unsigned long pci_address_to_pio(phys_addr_t address)
                if (address >= hose->io_base_phys &&
                    address < (hose->io_base_phys + hose->pci_io_size)) {
                        unsigned long base =
-                                (unsigned long)hose->io_base_virt - pci_io_base;
+                                (unsigned long)hose->io_base_virt - _IO_BASE;
                        return base + (address - hose->io_base_phys);
                }
        }
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index c96fa9bd35..a20f1951a5 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -67,7 +67,6 @@ EXPORT_SYMBOL(ISA_DMA_THRESHOLD);
 EXPORT_SYMBOL(DMA_MODE_READ);
 EXPORT_SYMBOL(DMA_MODE_WRITE);
-EXPORT_SYMBOL(do_signal);
 EXPORT_SYMBOL(transfer_to_handler);
 EXPORT_SYMBOL(do_IRQ);
 EXPORT_SYMBOL(machine_check_exception);
@@ -106,10 +105,6 @@ EXPORT_SYMBOL(isa_mem_base);
 EXPORT_SYMBOL(pci_dram_offset);
 EXPORT_SYMBOL(pci_alloc_consistent);
 EXPORT_SYMBOL(pci_free_consistent);
-EXPORT_SYMBOL(pci_bus_io_base);
-EXPORT_SYMBOL(pci_bus_io_base_phys);
-EXPORT_SYMBOL(pci_bus_mem_base_phys);
-EXPORT_SYMBOL(pci_bus_to_hose);
 #endif /* CONFIG_PCI */
 EXPORT_SYMBOL(start_thread);
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 6e2f03566b..84f000a45e 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -219,22 +219,26 @@ void discard_lazy_cpu_state(void)
 }
 #endif /* CONFIG_SMP */
-#ifdef CONFIG_PPC_MERGE         /* XXX for now */
 int set_dabr(unsigned long dabr)
 {
+#ifdef CONFIG_PPC_MERGE         /* XXX for now */
        if (ppc_md.set_dabr)
                return ppc_md.set_dabr(dabr);
+#endif
+        /* XXX should we have a CPU_FTR_HAS_DABR ? */
+#if defined(CONFIG_PPC64) || defined(CONFIG_6xx)
        mtspr(SPRN_DABR, dabr);
+#endif
        return 0;
 }
-#endif
 #ifdef CONFIG_PPC64
 DEFINE_PER_CPU(struct cpu_usage, cpu_usage_array);
-static DEFINE_PER_CPU(unsigned long, current_dabr);
 #endif
+static DEFINE_PER_CPU(unsigned long, current_dabr);
 struct task_struct *__switch_to(struct task_struct *prev,
        struct task_struct *new)
 {
@@ -299,12 +303,10 @@ struct task_struct *__switch_to(struct task_struct *prev,
 #endif /* CONFIG_SMP */
-#ifdef CONFIG_PPC64     /* for now */
        if (unlikely(__get_cpu_var(current_dabr) != new->thread.dabr)) {
                set_dabr(new->thread.dabr);
                __get_cpu_var(current_dabr) = new->thread.dabr;
        }
-#endif /* CONFIG_PPC64 */
        new_thread = &new->thread;
        old_thread = &current->thread;
@@ -473,12 +475,10 @@ void flush_thread(void)
        discard_lazy_cpu_state();
-#ifdef CONFIG_PPC64     /* for now */
        if (current->thread.dabr) {
                current->thread.dabr = 0;
                set_dabr(0);
        }
-#endif
 }
 void
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index af42ddab3a..37ff99bd98 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -52,6 +52,7 @@
 #include <asm/pSeries_reconfig.h>
 #include <asm/pci-bridge.h>
 #include <asm/kexec.h>
+#include <asm/system.h>
 #ifdef DEBUG
 #define DBG(fmt...) printk(KERN_ERR fmt)
@@ -1005,7 +1006,7 @@ static void __init early_reserve_mem(void)
 void __init early_init_devtree(void *params)
 {
-        DBG(" -> early_init_devtree()\n");
+        DBG(" -> early_init_devtree(%p)\n", params);
        /* Setup flat device-tree pointer */
        initial_boot_params = params;
@@ -1055,8 +1056,6 @@ void __init early_init_devtree(void *params)
        DBG(" <- early_init_devtree()\n");
 }
-#undef printk
 int of_n_addr_cells(struct device_node* np)
 {
        const int *ip;
@@ -1375,8 +1374,17 @@ static void of_node_release(struct kref *kref)
        struct device_node *node = kref_to_device_node(kref);
        struct property *prop = node->properties;
-        if (!OF_IS_DYNAMIC(node))
+        /* We should never be releasing nodes that haven't been detached. */
+        if (!of_node_check_flag(node, OF_DETACHED)) {
+                printk("WARNING: Bad of_node_put() on %s\n", node->full_name);
+                dump_stack();
+                kref_init(&node->kref);
+                return;
+        }
+        if (!of_node_check_flag(node, OF_DYNAMIC))
                return;
        while (prop) {
                struct property *next = prop->next;
                kfree(prop->name);
@@ -1432,6 +1440,8 @@ void of_detach_node(const struct device_node *np)
        write_lock(&devtree_lock);
        parent = np->parent;
+        if (!parent)
+                goto out_unlock;
        if (allnodes == np)
                allnodes = np->allnext;
@@ -1455,6 +1465,9 @@ void of_detach_node(const struct device_node *np)
                prevsib->sibling = np->sibling;
        }
+        of_node_set_flag(np, OF_DETACHED);
+out_unlock:
        write_unlock(&devtree_lock);
 }
@@ -1716,22 +1729,18 @@ struct device_node *of_get_cpu_node(int cpu, unsigned int *thread)
 }
 EXPORT_SYMBOL(of_get_cpu_node);
-#ifdef DEBUG
+#if defined(CONFIG_DEBUG_FS) && defined(DEBUG)
 static struct debugfs_blob_wrapper flat_dt_blob;
 static int __init export_flat_device_tree(void)
 {
        struct dentry *d;
-        d = debugfs_create_dir("powerpc", NULL);
-        if (!d)
-                return 1;
        flat_dt_blob.data = initial_boot_params;
        flat_dt_blob.size = initial_boot_params->totalsize;
        d = debugfs_create_blob("flat-device-tree", S_IFREG | S_IRUSR,
-                                d, &flat_dt_blob);
+                                powerpc_debugfs_root, &flat_dt_blob);
        if (!d)
                return 1;
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index d6047c4410..a1d582e386 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -635,6 +635,7 @@ static void __init early_cmdline_parse(void)
 /* ibm,dynamic-reconfiguration-memory property supported */
 #define OV5_DRCONF_MEMORY       0x20
 #define OV5_LARGE_PAGES         0x10    /* large pages supported */
+#define OV5_DONATE_DEDICATE_CPU 0x02    /* donate dedicated CPU support */
 /* PCIe/MSI support.  Without MSI full PCIe is not supported */
 #ifdef CONFIG_PCI_MSI
 #define OV5_MSI                 0x01    /* PCIe/MSI support */
@@ -685,7 +686,8 @@ static unsigned char ibm_architecture_vec[] = {
        /* option vector 5: PAPR/OF options */
        3 - 2,                          /* length */
        0,                              /* don't ignore, don't halt */
-        OV5_LPAR | OV5_SPLPAR | OV5_LARGE_PAGES | OV5_DRCONF_MEMORY | OV5_MSI,
+        OV5_LPAR | OV5_SPLPAR | OV5_LARGE_PAGES | OV5_DRCONF_MEMORY |
+        OV5_DONATE_DEDICATE_CPU | OV5_MSI,
 };
 /* Old method - ELF header with PT_NOTE sections */
diff --git a/arch/powerpc/kernel/ptrace-common.h b/arch/powerpc/kernel/ptrace-common.h
deleted file mode 100644
index 8797ae737a..0000000000
--- a/arch/powerpc/kernel/ptrace-common.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- *    Copyright (c) 2002 Stephen Rothwell, IBM Coproration
- *    Extracted from ptrace.c and ptrace32.c
- *
- * This file is subject to the terms and conditions of the GNU General
- * Public License.  See the file README.legal in the main directory of
- * this archive for more details.
- */
-#ifndef _PPC64_PTRACE_COMMON_H
-#define _PPC64_PTRACE_COMMON_H
-#include <asm/system.h>
-/*
- * Set of msr bits that gdb can change on behalf of a process.
- */
-#define MSR_DEBUGCHANGE (MSR_FE0 | MSR_SE | MSR_BE | MSR_FE1)
-/*
- * Get contents of register REGNO in task TASK.
- */
-static inline unsigned long get_reg(struct task_struct *task, int regno)
-{
-        unsigned long tmp = 0;
-        /*
-         * Put the correct FP bits in, they might be wrong as a result
-         * of our lazy FP restore.
-         */
-        if (regno == PT_MSR) {
-                tmp = ((unsigned long *)task->thread.regs)[PT_MSR];
-                tmp |= task->thread.fpexc_mode;
-        } else if (regno < (sizeof(struct pt_regs) / sizeof(unsigned long))) {
-                tmp = ((unsigned long *)task->thread.regs)[regno];
-        }
-        return tmp;
-}
-/*
- * Write contents of register REGNO in task TASK.
- */
-static inline int put_reg(struct task_struct *task, int regno,
-                          unsigned long data)
-{
-        if (regno < PT_SOFTE) {
-                if (regno == PT_MSR)
-                        data = (data & MSR_DEBUGCHANGE)
-                                | (task->thread.regs->msr & ~MSR_DEBUGCHANGE);
-                ((unsigned long *)task->thread.regs)[regno] = data;
-                return 0;
-        }
-        return -EIO;
-}
-static inline void set_single_step(struct task_struct *task)
-{
-        struct pt_regs *regs = task->thread.regs;
-        if (regs != NULL)
-                regs->msr |= MSR_SE;
-        set_tsk_thread_flag(task, TIF_SINGLESTEP);
-}
-static inline void clear_single_step(struct task_struct *task)
-{
-        struct pt_regs *regs = task->thread.regs;
-        if (regs != NULL)
-                regs->msr &= ~MSR_SE;
-        clear_tsk_thread_flag(task, TIF_SINGLESTEP);
-}
-#ifdef CONFIG_ALTIVEC
-/*
- * Get/set all the altivec registers vr0..vr31, vscr, vrsave, in one go.
- * The transfer totals 34 quadword.  Quadwords 0-31 contain the
- * corresponding vector registers.  Quadword 32 contains the vscr as the
- * last word (offset 12) within that quadword.  Quadword 33 contains the
- * vrsave as the first word (offset 0) within the quadword.
- *
- * This definition of the VMX state is compatible with the current PPC32
- * ptrace interface.  This allows signal handling and ptrace to use the
- * same structures.  This also simplifies the implementation of a bi-arch
- * (combined (32- and 64-bit) gdb.
- */
-/*
- * Get contents of AltiVec register state in task TASK
- */
-static inline int get_vrregs(unsigned long __user *data,
-                             struct task_struct *task)
-{
-        unsigned long regsize;
-        /* copy AltiVec registers VR[0] .. VR[31] */
-        regsize = 32 * sizeof(vector128);
-        if (copy_to_user(data, task->thread.vr, regsize))
-                return -EFAULT;
-        data += (regsize / sizeof(unsigned long));
-        /* copy VSCR */
-        regsize = 1 * sizeof(vector128);
-        if (copy_to_user(data, &task->thread.vscr, regsize))
-                return -EFAULT;
-        data += (regsize / sizeof(unsigned long));
-        /* copy VRSAVE */
-        if (put_user(task->thread.vrsave, (u32 __user *)data))
-                return -EFAULT;
-        return 0;
-}
-/*
- * Write contents of AltiVec register state into task TASK.
- */
-static inline int set_vrregs(struct task_struct *task,
-                             unsigned long __user *data)
-{
-        unsigned long regsize;
-        /* copy AltiVec registers VR[0] .. VR[31] */
-        regsize = 32 * sizeof(vector128);
-        if (copy_from_user(task->thread.vr, data, regsize))
-                return -EFAULT;
-        data += (regsize / sizeof(unsigned long));
-        /* copy VSCR */
-        regsize = 1 * sizeof(vector128);
-        if (copy_from_user(&task->thread.vscr, data, regsize))
-                return -EFAULT;
-        data += (regsize / sizeof(unsigned long));
-        /* copy VRSAVE */
-        if (get_user(task->thread.vrsave, (u32 __user *)data))
-                return -EFAULT;
-        return 0;
-}
-#endif
-static inline int ptrace_set_debugreg(struct task_struct *task,
-                                      unsigned long addr, unsigned long data)
-{
-        /* We only support one DABR and no IABRS at the moment */
-        if (addr > 0)
-                return -EINVAL;
-        /* The bottom 3 bits are flags */
-        if ((data & ~0x7UL) >= TASK_SIZE)
-                return -EIO;
-        /* Ensure translation is on */
-        if (data && !(data & DABR_TRANSLATION))
-                return -EIO;
-        task->thread.dabr = data;
-        return 0;
-}
-#endif /* _PPC64_PTRACE_COMMON_H */
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index bf76562167..8a177bd9ea 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -35,11 +35,11 @@
 #include <asm/pgtable.h>
 #include <asm/system.h>
-#ifdef CONFIG_PPC64
+/*
-#include "ptrace-common.h"
+ * does not yet catch signals sent when the child dies.
-#endif
+ * in exit.c or in signal.c.
+ */
-#ifdef CONFIG_PPC32
 /*
 * Set of msr bits that gdb can change on behalf of a process.
 */
@@ -48,65 +48,117 @@
 #else
 #define MSR_DEBUGCHANGE (MSR_SE | MSR_BE)
 #endif
-#endif /* CONFIG_PPC32 */
 /*
- * does not yet catch signals sent when the child dies.
+ * Max register writeable via put_reg
- * in exit.c or in signal.c.
 */
 #ifdef CONFIG_PPC32
+#define PT_MAX_PUT_REG  PT_MQ
+#else
+#define PT_MAX_PUT_REG  PT_CCR
+#endif
 /*
 * Get contents of register REGNO in task TASK.
 */
-static inline unsigned long get_reg(struct task_struct *task, int regno)
+unsigned long ptrace_get_reg(struct task_struct *task, int regno)
 {
-        if (regno < sizeof(struct pt_regs) / sizeof(unsigned long)
+        unsigned long tmp = 0;
-            && task->thread.regs != NULL)
+        if (task->thread.regs == NULL)
+                return -EIO;
+        if (regno == PT_MSR) {
+                tmp = ((unsigned long *)task->thread.regs)[PT_MSR];
+                return tmp | task->thread.fpexc_mode;
+        }
+        if (regno < (sizeof(struct pt_regs) / sizeof(unsigned long)))
                return ((unsigned long *)task->thread.regs)[regno];
-        return (0);
+        return -EIO;
 }
 /*
 * Write contents of register REGNO in task TASK.
 */
-static inline int put_reg(struct task_struct *task, int regno,
+int ptrace_put_reg(struct task_struct *task, int regno, unsigned long data)
-                          unsigned long data)
 {
-        if (regno <= PT_MQ && task->thread.regs != NULL) {
+        if (task->thread.regs == NULL)
+                return -EIO;
+        if (regno <= PT_MAX_PUT_REG || regno == PT_TRAP) {
                if (regno == PT_MSR)
                        data = (data & MSR_DEBUGCHANGE)
                                | (task->thread.regs->msr & ~MSR_DEBUGCHANGE);
+                /* We prevent mucking around with the reserved area of trap
+                 * which are used internally by the kernel
+                 */
+                if (regno == PT_TRAP)
+                        data &= 0xfff0;
                ((unsigned long *)task->thread.regs)[regno] = data;
                return 0;
        }
        return -EIO;
 }
+static int get_fpregs(void __user *data, struct task_struct *task,
+                      int has_fpscr)
+{
+        unsigned int count = has_fpscr ? 33 : 32;
+        if (copy_to_user(data, task->thread.fpr, count * sizeof(double)))
+                return -EFAULT;
+        return 0;
+}
+static int set_fpregs(void __user *data, struct task_struct *task,
+                      int has_fpscr)
+{
+        unsigned int count = has_fpscr ? 33 : 32;
+        if (copy_from_user(task->thread.fpr, data, count * sizeof(double)))
+                return -EFAULT;
+        return 0;
+}
 #ifdef CONFIG_ALTIVEC
 /*
+ * Get/set all the altivec registers vr0..vr31, vscr, vrsave, in one go.
+ * The transfer totals 34 quadword.  Quadwords 0-31 contain the
+ * corresponding vector registers.  Quadword 32 contains the vscr as the
+ * last word (offset 12) within that quadword.  Quadword 33 contains the
+ * vrsave as the first word (offset 0) within the quadword.
+ *
+ * This definition of the VMX state is compatible with the current PPC32
+ * ptrace interface.  This allows signal handling and ptrace to use the
+ * same structures.  This also simplifies the implementation of a bi-arch
+ * (combined (32- and 64-bit) gdb.
+ */
+/*
 * Get contents of AltiVec register state in task TASK
 */
-static inline int get_vrregs(unsigned long __user *data, struct task_struct *task)
+static int get_vrregs(unsigned long __user *data, struct task_struct *task)
 {
-        int i, j;
+        unsigned long regsize;
-        if (!access_ok(VERIFY_WRITE, data, 133 * sizeof(unsigned long)))
-                return -EFAULT;
        /* copy AltiVec registers VR[0] .. VR[31] */
-        for (i = 0; i < 32; i++)
+        regsize = 32 * sizeof(vector128);
-                for (j = 0; j < 4; j++, data++)
+        if (copy_to_user(data, task->thread.vr, regsize))
-                        if (__put_user(task->thread.vr[i].u[j], data))
+                return -EFAULT;
-                                return -EFAULT;
+        data += (regsize / sizeof(unsigned long));
        /* copy VSCR */
-        for (i = 0; i < 4; i++, data++)
+        regsize = 1 * sizeof(vector128);
-                if (__put_user(task->thread.vscr.u[i], data))
+        if (copy_to_user(data, &task->thread.vscr, regsize))
-                        return -EFAULT;
+                return -EFAULT;
+        data += (regsize / sizeof(unsigned long));
-        /* copy VRSAVE */
+        /* copy VRSAVE */
-        if (__put_user(task->thread.vrsave, data))
+        if (put_user(task->thread.vrsave, (u32 __user *)data))
                return -EFAULT;
        return 0;
@@ -115,31 +167,29 @@ static inline int get_vrregs(unsigned long __user *data, struct task_struct *tas
 /*
 * Write contents of AltiVec register state into task TASK.
 */
-static inline int set_vrregs(struct task_struct *task, unsigned long __user *data)
+static int set_vrregs(struct task_struct *task, unsigned long __user *data)
 {
-        int i, j;
+        unsigned long regsize;
-        if (!access_ok(VERIFY_READ, data, 133 * sizeof(unsigned long)))
-                return -EFAULT;
        /* copy AltiVec registers VR[0] .. VR[31] */
-        for (i = 0; i < 32; i++)
+        regsize = 32 * sizeof(vector128);
-                for (j = 0; j < 4; j++, data++)
+        if (copy_from_user(task->thread.vr, data, regsize))
-                        if (__get_user(task->thread.vr[i].u[j], data))
+                return -EFAULT;
-                                return -EFAULT;
+        data += (regsize / sizeof(unsigned long));
        /* copy VSCR */
-        for (i = 0; i < 4; i++, data++)
+        regsize = 1 * sizeof(vector128);
-                if (__get_user(task->thread.vscr.u[i], data))
+        if (copy_from_user(&task->thread.vscr, data, regsize))
-                        return -EFAULT;
+                return -EFAULT;
+        data += (regsize / sizeof(unsigned long));
        /* copy VRSAVE */
-        if (__get_user(task->thread.vrsave, data))
+        if (get_user(task->thread.vrsave, (u32 __user *)data))
                return -EFAULT;
        return 0;
 }
-#endif
+#endif /* CONFIG_ALTIVEC */
 #ifdef CONFIG_SPE
@@ -156,7 +206,7 @@ static inline int set_vrregs(struct task_struct *task, unsigned long __user *dat
 /*
 * Get contents of SPE register state in task TASK.
 */
-static inline int get_evrregs(unsigned long *data, struct task_struct *task)
+static int get_evrregs(unsigned long *data, struct task_struct *task)
 {
        int i;
@@ -182,7 +232,7 @@ static inline int get_evrregs(unsigned long *data, struct task_struct *task)
 /*
 * Write contents of SPE register state into task TASK.
 */
-static inline int set_evrregs(struct task_struct *task, unsigned long *data)
+static int set_evrregs(struct task_struct *task, unsigned long *data)
 {
        int i;
@@ -205,8 +255,8 @@ static inline int set_evrregs(struct task_struct *task, unsigned long *data)
 }
 #endif /* CONFIG_SPE */
-static inline void
-set_single_step(struct task_struct *task)
+static void set_single_step(struct task_struct *task)
 {
        struct pt_regs *regs = task->thread.regs;
@@ -221,8 +271,7 @@ set_single_step(struct task_struct *task)
        set_tsk_thread_flag(task, TIF_SINGLESTEP);
 }
-static inline void
+static void clear_single_step(struct task_struct *task)
-clear_single_step(struct task_struct *task)
 {
        struct pt_regs *regs = task->thread.regs;
@@ -236,7 +285,25 @@ clear_single_step(struct task_struct *task)
        }
        clear_tsk_thread_flag(task, TIF_SINGLESTEP);
 }
-#endif /* CONFIG_PPC32 */
+static int ptrace_set_debugreg(struct task_struct *task, unsigned long addr,
+                               unsigned long data)
+{
+        /* We only support one DABR and no IABRS at the moment */
+        if (addr > 0)
+                return -EINVAL;
+        /* The bottom 3 bits are flags */
+        if ((data & ~0x7UL) >= TASK_SIZE)
+                return -EIO;
+        /* Ensure translation is on */
+        if (data && !(data & DABR_TRANSLATION))
+                return -EIO;
+        task->thread.dabr = data;
+        return 0;
+}
 /*
 * Called by kernel/ptrace.c when detaching..
@@ -249,6 +316,62 @@ void ptrace_disable(struct task_struct *child)
        clear_single_step(child);
 }
+/*
+ * Here are the old "legacy" powerpc specific getregs/setregs ptrace calls,
+ * we mark them as obsolete now, they will be removed in a future version
+ */
+static long arch_ptrace_old(struct task_struct *child, long request, long addr,
+                            long data)
+{
+        int ret = -EPERM;
+        switch(request) {
+        case PPC_PTRACE_GETREGS: { /* Get GPRs 0 - 31. */
+                int i;
+                unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
+                unsigned long __user *tmp = (unsigned long __user *)addr;
+                for (i = 0; i < 32; i++) {
+                        ret = put_user(*reg, tmp);
+                        if (ret)
+                                break;
+                        reg++;
+                        tmp++;
+                }
+                break;
+        }
+        case PPC_PTRACE_SETREGS: { /* Set GPRs 0 - 31. */
+                int i;
+                unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
+                unsigned long __user *tmp = (unsigned long __user *)addr;
+                for (i = 0; i < 32; i++) {
+                        ret = get_user(*reg, tmp);
+                        if (ret)
+                                break;
+                        reg++;
+                        tmp++;
+                }
+                break;
+        }
+        case PPC_PTRACE_GETFPREGS: { /* Get FPRs 0 - 31. */
+                flush_fp_to_thread(child);
+                ret = get_fpregs((void __user *)addr, child, 0);
+                break;
+        }
+        case PPC_PTRACE_SETFPREGS: { /* Get FPRs 0 - 31. */
+                flush_fp_to_thread(child);
+                ret = set_fpregs((void __user *)addr, child, 0);
+                break;
+        }
+        }
+        return ret;
+}
 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 {
        int ret = -EPERM;
@@ -256,17 +379,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        switch (request) {
        /* when I and D space are separate, these will need to be fixed. */
        case PTRACE_PEEKTEXT: /* read word at location addr. */
-        case PTRACE_PEEKDATA: {
+        case PTRACE_PEEKDATA:
-                unsigned long tmp;
+                ret = generic_ptrace_peekdata(child, addr, data);
-                int copied;
-                copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
-                ret = -EIO;
-                if (copied != sizeof(tmp))
-                        break;
-                ret = put_user(tmp,(unsigned long __user *) data);
                break;
-        }
        /* read the word at location addr in the USER area. */
        case PTRACE_PEEKUSR: {
@@ -284,11 +399,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 #endif
                        break;
-#ifdef CONFIG_PPC32
                CHECK_FULL_REGS(child->thread.regs);
-#endif
                if (index < PT_FPR0) {
-                        tmp = get_reg(child, (int) index);
+                        tmp = ptrace_get_reg(child, (int) index);
                } else {
                        flush_fp_to_thread(child);
                        tmp = ((unsigned long *)child->thread.fpr)[index - PT_FPR0];
@@ -300,11 +413,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        /* If I and D space are separate, this will have to be fixed. */
        case PTRACE_POKETEXT: /* write the word at location addr. */
        case PTRACE_POKEDATA:
-                ret = 0;
+                ret = generic_ptrace_pokedata(child, addr, data);
-                if (access_process_vm(child, addr, &data, sizeof(data), 1)
-                                == sizeof(data))
-                        break;
-                ret = -EIO;
                break;
        /* write the word at location addr in the USER area */
@@ -323,13 +432,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 #endif
                        break;
-#ifdef CONFIG_PPC32
                CHECK_FULL_REGS(child->thread.regs);
-#endif
-                if (index == PT_ORIG_R3)
-                        break;
                if (index < PT_FPR0) {
-                        ret = put_reg(child, index, data);
+                        ret = ptrace_put_reg(child, index, data);
                } else {
                        flush_fp_to_thread(child);
                        ((unsigned long *)child->thread.fpr)[index - PT_FPR0] = data;
@@ -384,7 +489,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                break;
        }
-#ifdef CONFIG_PPC64
        case PTRACE_GET_DEBUGREG: {
                ret = -EINVAL;
                /* We only support one DABR and no IABRS at the moment */
@@ -398,73 +502,61 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        case PTRACE_SET_DEBUGREG:
                ret = ptrace_set_debugreg(child, addr, data);
                break;
-#endif
        case PTRACE_DETACH:
                ret = ptrace_detach(child, data);
                break;
-        case PPC_PTRACE_GETREGS: { /* Get GPRs 0 - 31. */
+#ifdef CONFIG_PPC64
-                int i;
+        case PTRACE_GETREGS64:
-                unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
+#endif
-                unsigned long __user *tmp = (unsigned long __user *)addr;
+        case PTRACE_GETREGS: { /* Get all pt_regs from the child. */
+                int ui;
-                for (i = 0; i < 32; i++) {
+                if (!access_ok(VERIFY_WRITE, (void __user *)data,
-                        ret = put_user(*reg, tmp);
+                               sizeof(struct pt_regs))) {
-                        if (ret)
+                        ret = -EIO;
-                                break;
+                        break;
-                        reg++;
+                }
-                        tmp++;
+                ret = 0;
+                for (ui = 0; ui < PT_REGS_COUNT; ui ++) {
+                        ret |= __put_user(ptrace_get_reg(child, ui),
+                                          (unsigned long __user *) data);
+                        data += sizeof(long);
                }
                break;
        }
-        case PPC_PTRACE_SETREGS: { /* Set GPRs 0 - 31. */
+#ifdef CONFIG_PPC64
-                int i;
+        case PTRACE_SETREGS64:
-                unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
+#endif
-                unsigned long __user *tmp = (unsigned long __user *)addr;
+        case PTRACE_SETREGS: { /* Set all gp regs in the child. */
+                unsigned long tmp;
-                for (i = 0; i < 32; i++) {
+                int ui;
-                        ret = get_user(*reg, tmp);
+                if (!access_ok(VERIFY_READ, (void __user *)data,
+                               sizeof(struct pt_regs))) {
+                        ret = -EIO;
+                        break;
+                }
+                ret = 0;
+                for (ui = 0; ui < PT_REGS_COUNT; ui ++) {
+                        ret = __get_user(tmp, (unsigned long __user *) data);
                        if (ret)
                                break;
-                        reg++;
+                        ptrace_put_reg(child, ui, tmp);
-                        tmp++;
+                        data += sizeof(long);
                }
                break;
        }
-        case PPC_PTRACE_GETFPREGS: { /* Get FPRs 0 - 31. */
+        case PTRACE_GETFPREGS: { /* Get the child FPU state (FPR0...31 + FPSCR) */
-                int i;
-                unsigned long *reg = &((unsigned long *)child->thread.fpr)[0];
-                unsigned long __user *tmp = (unsigned long __user *)addr;
                flush_fp_to_thread(child);
+                ret = get_fpregs((void __user *)data, child, 1);
-                for (i = 0; i < 32; i++) {
-                        ret = put_user(*reg, tmp);
-                        if (ret)
-                                break;
-                        reg++;
-                        tmp++;
-                }
                break;
        }
-        case PPC_PTRACE_SETFPREGS: { /* Get FPRs 0 - 31. */
+        case PTRACE_SETFPREGS: { /* Set the child FPU state (FPR0...31 + FPSCR) */
-                int i;
-                unsigned long *reg = &((unsigned long *)child->thread.fpr)[0];
-                unsigned long __user *tmp = (unsigned long __user *)addr;
                flush_fp_to_thread(child);
+                ret = set_fpregs((void __user *)data, child, 1);
-                for (i = 0; i < 32; i++) {
-                        ret = get_user(*reg, tmp);
-                        if (ret)
-                                break;
-                        reg++;
-                        tmp++;
-                }
                break;
        }
@@ -499,11 +591,18 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                break;
 #endif
+        /* Old reverse args ptrace callss */
+        case PPC_PTRACE_GETREGS: /* Get GPRs 0 - 31. */
+        case PPC_PTRACE_SETREGS: /* Set GPRs 0 - 31. */
+        case PPC_PTRACE_GETFPREGS: /* Get FPRs 0 - 31. */
+        case PPC_PTRACE_SETFPREGS: /* Get FPRs 0 - 31. */
+                ret = arch_ptrace_old(child, request, addr, data);
+                break;
        default:
                ret = ptrace_request(child, request, addr, data);
                break;
        }
        return ret;
 }
diff --git a/arch/powerpc/kernel/ptrace32.c b/arch/powerpc/kernel/ptrace32.c
index 9b9a230349..9e6baeac0f 100644
--- a/arch/powerpc/kernel/ptrace32.c
+++ b/arch/powerpc/kernel/ptrace32.c
@@ -33,13 +33,55 @@
 #include <asm/pgtable.h>
 #include <asm/system.h>
-#include "ptrace-common.h"
 /*
 * does not yet catch signals sent when the child dies.
 * in exit.c or in signal.c.
 */
+/*
+ * Here are the old "legacy" powerpc specific getregs/setregs ptrace calls,
+ * we mark them as obsolete now, they will be removed in a future version
+ */
+static long compat_ptrace_old(struct task_struct *child, long request,
+                              long addr, long data)
+{
+        int ret = -EPERM;
+        switch(request) {
+        case PPC_PTRACE_GETREGS: { /* Get GPRs 0 - 31. */
+                int i;
+                unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
+                unsigned int __user *tmp = (unsigned int __user *)addr;
+                for (i = 0; i < 32; i++) {
+                        ret = put_user(*reg, tmp);
+                        if (ret)
+                                break;
+                        reg++;
+                        tmp++;
+                }
+                break;
+        }
+        case PPC_PTRACE_SETREGS: { /* Set GPRs 0 - 31. */
+                int i;
+                unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
+                unsigned int __user *tmp = (unsigned int __user *)addr;
+                for (i = 0; i < 32; i++) {
+                        ret = get_user(*reg, tmp);
+                        if (ret)
+                                break;
+                        reg++;
+                        tmp++;
+                }
+                break;
+        }
+        }
+        return ret;
+}
 long compat_sys_ptrace(int request, int pid, unsigned long addr,
                       unsigned long data)
 {
@@ -123,7 +165,7 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
                        break;
                if (index < PT_FPR0) {
-                        tmp = get_reg(child, index);
+                        tmp = ptrace_get_reg(child, index);
                } else {
                        flush_fp_to_thread(child);
                        /*
@@ -162,7 +204,9 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
                else
                        part = 0;  /* want the 1st half of the register (left-most). */
-                /* Validate the input - check to see if address is on the wrong boundary or beyond the end of the user area */
+                /* Validate the input - check to see if address is on the wrong boundary
+                 * or beyond the end of the user area
+                 */
                if ((addr & 3) || numReg > PT_FPSCR)
                        break;
@@ -170,7 +214,7 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
                        flush_fp_to_thread(child);
                        tmp = ((unsigned long int *)child->thread.fpr)[numReg - PT_FPR0];
                } else { /* register within PT_REGS struct */
-                        tmp = get_reg(child, numReg);
+                        tmp = ptrace_get_reg(child, numReg);
                } 
                reg32bits = ((u32*)&tmp)[part];
                ret = put_user(reg32bits, (u32 __user *)data);
@@ -226,10 +270,8 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
                if ((addr & 3) || (index > PT_FPSCR32))
                        break;
-                if (index == PT_ORIG_R3)
-                        break;
                if (index < PT_FPR0) {
-                        ret = put_reg(child, index, data);
+                        ret = ptrace_put_reg(child, index, data);
                } else {
                        flush_fp_to_thread(child);
                        /*
@@ -258,70 +300,25 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
                /* Determine which register the user wants */
                index = (u64)addr >> 2;
                numReg = index / 2;
                /*
                 * Validate the input - check to see if address is on the
                 * wrong boundary or beyond the end of the user area
                 */
                if ((addr & 3) || (numReg > PT_FPSCR))
                        break;
-                /* Insure it is a register we let them change */
+                if (numReg < PT_FPR0) {
-                if ((numReg == PT_ORIG_R3)
+                        unsigned long freg = ptrace_get_reg(child, numReg);
-                                || ((numReg > PT_CCR) && (numReg < PT_FPR0)))
+                        if (index % 2)
-                        break;
+                                freg = (freg & ~0xfffffffful) | (data & 0xfffffffful);
-                if (numReg >= PT_FPR0) {
+                        else
+                                freg = (freg & 0xfffffffful) | (data << 32);
+                        ret = ptrace_put_reg(child, numReg, freg);
+                } else {
                        flush_fp_to_thread(child);
+                        ((unsigned int *)child->thread.regs)[index] = data;
+                        ret = 0;
                }
-                if (numReg == PT_MSR)
-                        data = (data & MSR_DEBUGCHANGE)
-                                | (child->thread.regs->msr & ~MSR_DEBUGCHANGE);
-                ((u32*)child->thread.regs)[index] = data;
-                ret = 0;
-                break;
-        }
-        case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
-        case PTRACE_CONT: { /* restart after signal. */
-                ret = -EIO;
-                if (!valid_signal(data))
-                        break;
-                if (request == PTRACE_SYSCALL)
-                        set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-                else
-                        clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-                child->exit_code = data;
-                /* make sure the single step bit is not set. */
-                clear_single_step(child);
-                wake_up_process(child);
-                ret = 0;
-                break;
-        }
-        /*
-         * make the child exit.  Best I can do is send it a sigkill.
-         * perhaps it should be put in the status that it wants to
-         * exit.
-         */
-        case PTRACE_KILL: {
-                ret = 0;
-                if (child->exit_state == EXIT_ZOMBIE)   /* already dead */
-                        break;
-                child->exit_code = SIGKILL;
-                /* make sure the single step bit is not set. */
-                clear_single_step(child);
-                wake_up_process(child);
-                break;
-        }
-        case PTRACE_SINGLESTEP: {  /* set the trap flag. */
-                ret = -EIO;
-                if (!valid_signal(data))
-                        break;
-                clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-                set_single_step(child);
-                child->exit_code = data;
-                /* give it a chance to run. */
-                wake_up_process(child);
-                ret = 0;
                break;
        }
@@ -334,95 +331,67 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
                break;
        }
-        case PTRACE_SET_DEBUGREG:
+        case PTRACE_GETEVENTMSG:
-                ret = ptrace_set_debugreg(child, addr, data);
+                ret = put_user(child->ptrace_message, (unsigned int __user *) data);
-                break;
-        case PTRACE_DETACH:
-                ret = ptrace_detach(child, data);
                break;
-        case PPC_PTRACE_GETREGS: { /* Get GPRs 0 - 31. */
+        case PTRACE_GETREGS: { /* Get all pt_regs from the child. */
-                int i;
+                int ui;
-                unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
+                if (!access_ok(VERIFY_WRITE, (void __user *)data,
-                unsigned int __user *tmp = (unsigned int __user *)addr;
+                               PT_REGS_COUNT * sizeof(int))) {
+                        ret = -EIO;
-                for (i = 0; i < 32; i++) {
+                        break;
-                        ret = put_user(*reg, tmp);
-                        if (ret)
-                                break;
-                        reg++;
-                        tmp++;
                }
-                break;
+                ret = 0;
-        }
+                for (ui = 0; ui < PT_REGS_COUNT; ui ++) {
+                        ret |= __put_user(ptrace_get_reg(child, ui),
-        case PPC_PTRACE_SETREGS: { /* Set GPRs 0 - 31. */
+                                          (unsigned int __user *) data);
-                int i;
+                        data += sizeof(int);
-                unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
-                unsigned int __user *tmp = (unsigned int __user *)addr;
-                for (i = 0; i < 32; i++) {
-                        ret = get_user(*reg, tmp);
-                        if (ret)
-                                break;
-                        reg++;
-                        tmp++;
                }
                break;
        }
-        case PPC_PTRACE_GETFPREGS: { /* Get FPRs 0 - 31. */
+        case PTRACE_SETREGS: { /* Set all gp regs in the child. */
-                int i;
+                unsigned long tmp;
-                unsigned long *reg = &((unsigned long *)child->thread.fpr)[0];
+                int ui;
-                unsigned int __user *tmp = (unsigned int __user *)addr;
+                if (!access_ok(VERIFY_READ, (void __user *)data,
+                               PT_REGS_COUNT * sizeof(int))) {
-                flush_fp_to_thread(child);
+                        ret = -EIO;
+                        break;
-                for (i = 0; i < 32; i++) {
-                        ret = put_user(*reg, tmp);
-                        if (ret)
-                                break;
-                        reg++;
-                        tmp++;
                }
-                break;
+                ret = 0;
-        }
+                for (ui = 0; ui < PT_REGS_COUNT; ui ++) {
+                        ret = __get_user(tmp, (unsigned int __user *) data);
-        case PPC_PTRACE_SETFPREGS: { /* Get FPRs 0 - 31. */
-                int i;
-                unsigned long *reg = &((unsigned long *)child->thread.fpr)[0];
-                unsigned int __user *tmp = (unsigned int __user *)addr;
-                flush_fp_to_thread(child);
-                for (i = 0; i < 32; i++) {
-                        ret = get_user(*reg, tmp);
                        if (ret)
                                break;
-                        reg++;
+                        ptrace_put_reg(child, ui, tmp);
-                        tmp++;
+                        data += sizeof(int);
                }
                break;
        }
-        case PTRACE_GETEVENTMSG:
+        case PTRACE_GETFPREGS:
-                ret = put_user(child->ptrace_message, (unsigned int __user *) data);
+        case PTRACE_SETFPREGS:
-                break;
-#ifdef CONFIG_ALTIVEC
        case PTRACE_GETVRREGS:
-                /* Get the child altivec register state. */
+        case PTRACE_SETVRREGS:
-                flush_altivec_to_thread(child);
+        case PTRACE_GETREGS64:
-                ret = get_vrregs((unsigned long __user *)data, child);
+        case PTRACE_SETREGS64:
+        case PPC_PTRACE_GETFPREGS:
+        case PPC_PTRACE_SETFPREGS:
+        case PTRACE_KILL:
+        case PTRACE_SINGLESTEP:
+        case PTRACE_DETACH:
+        case PTRACE_SET_DEBUGREG:
+        case PTRACE_SYSCALL:
+        case PTRACE_CONT:
+                ret = arch_ptrace(child, request, addr, data);
                break;
-        case PTRACE_SETVRREGS:
+        /* Old reverse args ptrace callss */
-                /* Set the child altivec register state. */
+        case PPC_PTRACE_GETREGS: /* Get GPRs 0 - 31. */
-                flush_altivec_to_thread(child);
+        case PPC_PTRACE_SETREGS: /* Set GPRs 0 - 31. */
-                ret = set_vrregs(child, (unsigned long __user *)data);
+                ret = compat_ptrace_old(child, request, addr, data);
                break;
-#endif
        default:
                ret = ptrace_request(child, request, addr, data);
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c
index f2286822be..a5de6211b9 100644
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c
@@ -278,10 +278,8 @@ void __init find_and_init_phbs(void)
 {
        struct device_node *node;
        struct pci_controller *phb;
-        unsigned int index;
        struct device_node *root = of_find_node_by_path("/");
-        index = 0;
        for (node = of_get_next_child(root, NULL);
             node != NULL;
             node = of_get_next_child(root, node)) {
@@ -295,8 +293,7 @@ void __init find_and_init_phbs(void)
                        continue;
                rtas_setup_phb(phb);
                pci_process_bridge_OF_ranges(phb, node, 0);
-                pci_setup_phb_io(phb, index == 0);
+                isa_bridge_find_early(phb);
-                index++;
        }
        of_node_put(root);
@@ -335,7 +332,7 @@ int pcibios_remove_root_bus(struct pci_controller *phb)
                return 1;
        }
-        rc = unmap_bus_range(b);
+        rc = pcibios_unmap_io_space(b);
        if (rc) {
                printk(KERN_ERR "%s: failed to unmap IO on bus %s\n",
                        __FUNCTION__, b->name);
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index ed07a198f8..4924c48cb1 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -32,6 +32,7 @@
 #include <linux/unistd.h>
 #include <linux/serial.h>
 #include <linux/serial_8250.h>
+#include <linux/debugfs.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/processor.h>
@@ -486,6 +487,14 @@ int check_legacy_ioport(unsigned long base_port)
        switch(base_port) {
        case I8042_DATA_REG:
+                if (!(np = of_find_compatible_node(NULL, NULL, "pnpPNP,303")))
+                        np = of_find_compatible_node(NULL, NULL, "pnpPNP,f03");
+                if (np) {
+                        parent = of_get_parent(np);
+                        of_node_put(np);
+                        np = parent;
+                        break;
+                }
                np = of_find_node_by_type(NULL, "8042");
                break;
        case FDC_BASE: /* FDC1 */
@@ -571,3 +580,15 @@ static int __init check_cache_coherency(void)
 late_initcall(check_cache_coherency);
 #endif /* CONFIG_CHECK_CACHE_COHERENCY */
+#ifdef CONFIG_DEBUG_FS
+struct dentry *powerpc_debugfs_root;
+static int powerpc_debugfs_init(void)
+{
+        powerpc_debugfs_root = debugfs_create_dir("powerpc", NULL);
+        return powerpc_debugfs_root == NULL;
+}
+arch_initcall(powerpc_debugfs_init);
+#endif
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 35f8f443c1..7ec6ba56d8 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -262,13 +262,11 @@ void __init setup_arch(char **cmdline_p)
         * Systems with OF can look in the properties on the cpu node(s)
         * for a possibly more accurate value.
         */
-        if (cpu_has_feature(CPU_FTR_SPLIT_ID_CACHE)) {
+        dcache_bsize = cur_cpu_spec->dcache_bsize;
-                dcache_bsize = cur_cpu_spec->dcache_bsize;
+        icache_bsize = cur_cpu_spec->icache_bsize;
-                icache_bsize = cur_cpu_spec->icache_bsize;
+        ucache_bsize = 0;
-                ucache_bsize = 0;
+        if (cpu_has_feature(CPU_FTR_UNIFIED_ID_CACHE))
-        } else
+                ucache_bsize = icache_bsize = dcache_bsize;
-                ucache_bsize = dcache_bsize = icache_bsize
-                        = cur_cpu_spec->dcache_bsize;
        /* reboot on panic */
        panic_timeout = 180;
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c
new file mode 100644
index 0000000000..c434d6c4e4
--- /dev/null
+++ b/arch/powerpc/kernel/signal.c
@@ -0,0 +1,180 @@
+/*
+ * Common signal handling code for both 32 and 64 bits
+ *
+ *    Copyright (c) 2007 Benjamin Herrenschmidt, IBM Coproration
+ *    Extracted from signal_32.c and signal_64.c
+ *
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License.  See the file README.legal in the main directory of
+ * this archive for more details.
+ */
+#include <linux/ptrace.h>
+#include <linux/signal.h>
+#include <asm/uaccess.h>
+#include <asm/unistd.h>
+#include "signal.h"
+/*
+ * Allocate space for the signal frame
+ */
+void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
+                           size_t frame_size)
+{
+        unsigned long oldsp, newsp;
+        /* Default to using normal stack */
+        oldsp = regs->gpr[1];
+        /* Check for alt stack */
+        if ((ka->sa.sa_flags & SA_ONSTACK) &&
+            current->sas_ss_size && !on_sig_stack(oldsp))
+                oldsp = (current->sas_ss_sp + current->sas_ss_size);
+        /* Get aligned frame */
+        newsp = (oldsp - frame_size) & ~0xFUL;
+        /* Check access */
+        if (!access_ok(VERIFY_WRITE, (void __user *)newsp, oldsp - newsp))
+                return NULL;
+        return (void __user *)newsp;
+}
+/*
+ * Restore the user process's signal mask
+ */
+void restore_sigmask(sigset_t *set)
+{
+        sigdelsetmask(set, ~_BLOCKABLE);
+        spin_lock_irq(&current->sighand->siglock);
+        current->blocked = *set;
+        recalc_sigpending();
+        spin_unlock_irq(&current->sighand->siglock);
+}
+static void check_syscall_restart(struct pt_regs *regs, struct k_sigaction *ka,
+                                  int has_handler)
+{
+        unsigned long ret = regs->gpr[3];
+        int restart = 1;
+        /* syscall ? */
+        if (TRAP(regs) != 0x0C00)
+                return;
+        /* error signalled ? */
+        if (!(regs->ccr & 0x10000000))
+                return;
+        switch (ret) {
+        case ERESTART_RESTARTBLOCK:
+        case ERESTARTNOHAND:
+                /* ERESTARTNOHAND means that the syscall should only be
+                 * restarted if there was no handler for the signal, and since
+                 * we only get here if there is a handler, we dont restart.
+                 */
+                restart = !has_handler;
+                break;
+        case ERESTARTSYS:
+                /* ERESTARTSYS means to restart the syscall if there is no
+                 * handler or the handler was registered with SA_RESTART
+                 */
+                restart = !has_handler || (ka->sa.sa_flags & SA_RESTART) != 0;
+                break;
+        case ERESTARTNOINTR:
+                /* ERESTARTNOINTR means that the syscall should be
+                 * called again after the signal handler returns.
+                 */
+                break;
+        default:
+                return;
+        }
+        if (restart) {
+                if (ret == ERESTART_RESTARTBLOCK)
+                        regs->gpr[0] = __NR_restart_syscall;
+                else
+                        regs->gpr[3] = regs->orig_gpr3;
+                regs->nip -= 4;
+                regs->result = 0;
+        } else {
+                regs->result = -EINTR;
+                regs->gpr[3] = EINTR;
+                regs->ccr |= 0x10000000;
+        }
+}
+int do_signal(sigset_t *oldset, struct pt_regs *regs)
+{
+        siginfo_t info;
+        int signr;
+        struct k_sigaction ka;
+        int ret;
+        int is32 = is_32bit_task();
+        if (test_thread_flag(TIF_RESTORE_SIGMASK))
+                oldset = &current->saved_sigmask;
+        else if (!oldset)
+                oldset = &current->blocked;
+        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
+        /* Is there any syscall restart business here ? */
+        check_syscall_restart(regs, &ka, signr > 0);
+        if (signr <= 0) {
+                /* No signal to deliver -- put the saved sigmask back */
+                if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
+                        clear_thread_flag(TIF_RESTORE_SIGMASK);
+                        sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
+                }
+                return 0;               /* no signals delivered */
+        }
+        /*
+         * Reenable the DABR before delivering the signal to
+         * user space. The DABR will have been cleared if it
+         * triggered inside the kernel.
+         */
+        if (current->thread.dabr)
+                set_dabr(current->thread.dabr);
+        if (is32) {
+                if (ka.sa.sa_flags & SA_SIGINFO)
+                        ret = handle_rt_signal32(signr, &ka, &info, oldset,
+                                        regs);
+                else
+                        ret = handle_signal32(signr, &ka, &info, oldset,
+                                        regs);
+        } else {
+                ret = handle_rt_signal64(signr, &ka, &info, oldset, regs);
+        }
+        if (ret) {
+                spin_lock_irq(&current->sighand->siglock);
+                sigorsets(&current->blocked, &current->blocked,
+                          &ka.sa.sa_mask);
+                if (!(ka.sa.sa_flags & SA_NODEFER))
+                        sigaddset(&current->blocked, signr);
+                recalc_sigpending();
+                spin_unlock_irq(&current->sighand->siglock);
+                /*
+                 * A signal was successfully delivered; the saved sigmask is in
+                 * its frame, and we can clear the TIF_RESTORE_SIGMASK flag.
+                 */
+                if (test_thread_flag(TIF_RESTORE_SIGMASK))
+                        clear_thread_flag(TIF_RESTORE_SIGMASK);
+        }
+        return ret;
+}
+long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,
+                unsigned long r5, unsigned long r6, unsigned long r7,
+                unsigned long r8, struct pt_regs *regs)
+{
+        return do_sigaltstack(uss, uoss, regs->gpr[1]);
+}
diff --git a/arch/powerpc/kernel/signal.h b/arch/powerpc/kernel/signal.h
new file mode 100644
index 0000000000..77efb3d546
--- /dev/null
+++ b/arch/powerpc/kernel/signal.h
@@ -0,0 +1,55 @@
+/*
+ *    Copyright (c) 2007 Benjamin Herrenschmidt, IBM Coproration
+ *    Extracted from signal_32.c and signal_64.c
+ *
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License.  See the file README.legal in the main directory of
+ * this archive for more details.
+ */
+#ifndef _POWERPC_ARCH_SIGNAL_H
+#define _POWERPC_ARCH_SIGNAL_H
+#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
+extern void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
+                                  size_t frame_size);
+extern void restore_sigmask(sigset_t *set);
+extern int handle_signal32(unsigned long sig, struct k_sigaction *ka,
+                           siginfo_t *info, sigset_t *oldset,
+                           struct pt_regs *regs);
+extern int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
+                              siginfo_t *info, sigset_t *oldset,
+                              struct pt_regs *regs);
+#ifdef CONFIG_PPC64
+static inline int is_32bit_task(void)
+{
+        return test_thread_flag(TIF_32BIT);
+}
+extern int handle_rt_signal64(int signr, struct k_sigaction *ka,
+                              siginfo_t *info, sigset_t *set,
+                              struct pt_regs *regs);
+#else /* CONFIG_PPC64 */
+static inline int is_32bit_task(void)
+{
+        return 1;
+}
+static inline int handle_rt_signal64(int signr, struct k_sigaction *ka,
+                                     siginfo_t *info, sigset_t *set,
+                                     struct pt_regs *regs)
+{
+        return -EFAULT;
+}
+#endif /* !defined(CONFIG_PPC64) */
+#endif  /* _POWERPC_ARCH_SIGNAL_H */
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index dd1dca5bfa..590057e9e9 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -51,12 +51,11 @@
 #include <asm/pgtable.h>
 #endif
-#undef DEBUG_SIG
+#include "signal.h"
-#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
+#undef DEBUG_SIG
 #ifdef CONFIG_PPC64
-#define do_signal       do_signal32
 #define sys_sigsuspend  compat_sys_sigsuspend
 #define sys_rt_sigsuspend       compat_sys_rt_sigsuspend
 #define sys_rt_sigreturn        compat_sys_rt_sigreturn
@@ -231,8 +230,6 @@ static inline int restore_general_regs(struct pt_regs *regs,
 #endif /* CONFIG_PPC64 */
-int do_signal(sigset_t *oldset, struct pt_regs *regs);
 /*
 * Atomically swap in the new signal mask, and wait for a signal.
 */
@@ -251,14 +248,6 @@ long sys_sigsuspend(old_sigset_t mask)
        return -ERESTARTNOHAND;
 }
-#ifdef CONFIG_PPC32
-long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, int r5,
-                int r6, int r7, int r8, struct pt_regs *regs)
-{
-        return do_sigaltstack(uss, uoss, regs->gpr[1]);
-}
-#endif
 long sys_sigaction(int sig, struct old_sigaction __user *act,
                struct old_sigaction __user *oact)
 {
@@ -293,14 +282,17 @@ long sys_sigaction(int sig, struct old_sigaction __user *act,
 /*
 * When we have signals to deliver, we set up on the
 * user stack, going down from the original stack pointer:
- *      a sigregs struct
+ *      an ABI gap of 56 words
+ *      an mcontext struct
 *      a sigcontext struct
 *      a gap of __SIGNAL_FRAMESIZE bytes
 *
- * Each of these things must be a multiple of 16 bytes in size.
+ * Each of these things must be a multiple of 16 bytes in size. The following
+ * structure represent all of this except the __SIGNAL_FRAMESIZE gap
 *
 */
-struct sigregs {
+struct sigframe {
+        struct sigcontext sctx;         /* the sigcontext */
        struct mcontext mctx;           /* all the register values */
        /*
         * Programs using the rs6000/xcoff abi can save up to 19 gp
@@ -703,44 +695,22 @@ int compat_sys_sigaltstack(u32 __new, u32 __old, int r5,
 }
 #endif /* CONFIG_PPC64 */
-/*
- * Restore the user process's signal mask
- */
-#ifdef CONFIG_PPC64
-extern void restore_sigmask(sigset_t *set);
-#else /* CONFIG_PPC64 */
-static void restore_sigmask(sigset_t *set)
-{
-        sigdelsetmask(set, ~_BLOCKABLE);
-        spin_lock_irq(&current->sighand->siglock);
-        current->blocked = *set;
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
-}
-#endif
 /*
 * Set up a signal frame for a "real-time" signal handler
 * (one which gets siginfo).
 */
-static int handle_rt_signal(unsigned long sig, struct k_sigaction *ka,
+int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
                siginfo_t *info, sigset_t *oldset,
-                struct pt_regs *regs, unsigned long newsp)
+                struct pt_regs *regs)
 {
        struct rt_sigframe __user *rt_sf;
        struct mcontext __user *frame;
-        unsigned long origsp = newsp;
+        unsigned long newsp = 0;
        /* Set up Signal Frame */
        /* Put a Real Time Context onto stack */
-        newsp -= sizeof(*rt_sf);
+        rt_sf = get_sigframe(ka, regs, sizeof(*rt_sf));
-        rt_sf = (struct rt_sigframe __user *)newsp;
+        if (unlikely(rt_sf == NULL))
-        /* create a stack frame for the caller of the handler */
-        newsp -= __SIGNAL_FRAMESIZE + 16;
-        if (!access_ok(VERIFY_WRITE, (void __user *)newsp, origsp - newsp))
                goto badframe;
        /* Put the siginfo & fill in most of the ucontext */
@@ -770,8 +740,12 @@ static int handle_rt_signal(unsigned long sig, struct k_sigaction *ka,
        current->thread.fpscr.val = 0;  /* turn off all fp exceptions */
+        /* create a stack frame for the caller of the handler */
+        newsp = ((unsigned long)rt_sf) - (__SIGNAL_FRAMESIZE + 16);
        if (put_user(regs->gpr[1], (u32 __user *)newsp))
                goto badframe;
+        /* Fill registers for signal handler */
        regs->gpr[1] = newsp;
        regs->gpr[3] = sig;
        regs->gpr[4] = (unsigned long) &rt_sf->info;
@@ -1015,27 +989,18 @@ int sys_debug_setcontext(struct ucontext __user *ctx,
 /*
 * OK, we're invoking a handler
 */
-static int handle_signal(unsigned long sig, struct k_sigaction *ka,
+int handle_signal32(unsigned long sig, struct k_sigaction *ka,
-                siginfo_t *info, sigset_t *oldset, struct pt_regs *regs,
+                    siginfo_t *info, sigset_t *oldset, struct pt_regs *regs)
-                unsigned long newsp)
 {
        struct sigcontext __user *sc;
-        struct sigregs __user *frame;
+        struct sigframe __user *frame;
-        unsigned long origsp = newsp;
+        unsigned long newsp = 0;
        /* Set up Signal Frame */
-        newsp -= sizeof(struct sigregs);
+        frame = get_sigframe(ka, regs, sizeof(*frame));
-        frame = (struct sigregs __user *) newsp;
+        if (unlikely(frame == NULL))
-        /* Put a sigcontext on the stack */
-        newsp -= sizeof(*sc);
-        sc = (struct sigcontext __user *) newsp;
-        /* create a stack frame for the caller of the handler */
-        newsp -= __SIGNAL_FRAMESIZE;
-        if (!access_ok(VERIFY_WRITE, (void __user *) newsp, origsp - newsp))
                goto badframe;
+        sc = (struct sigcontext __user *) &frame->sctx;
 #if _NSIG != 64
 #error "Please adjust handle_signal()"
@@ -1047,7 +1012,7 @@ static int handle_signal(unsigned long sig, struct k_sigaction *ka,
 #else
            || __put_user(oldset->sig[1], &sc->_unused[3])
 #endif
-            || __put_user(to_user_ptr(frame), &sc->regs)
+            || __put_user(to_user_ptr(&frame->mctx), &sc->regs)
            || __put_user(sig, &sc->signal))
                goto badframe;
@@ -1063,8 +1028,11 @@ static int handle_signal(unsigned long sig, struct k_sigaction *ka,
        current->thread.fpscr.val = 0;  /* turn off all fp exceptions */
+        /* create a stack frame for the caller of the handler */
+        newsp = ((unsigned long)frame) - __SIGNAL_FRAMESIZE;
        if (put_user(regs->gpr[1], (u32 __user *)newsp))
                goto badframe;
        regs->gpr[1] = newsp;
        regs->gpr[3] = sig;
        regs->gpr[4] = (unsigned long) sc;
@@ -1126,106 +1094,3 @@ badframe:
        force_sig(SIGSEGV, current);
        return 0;
 }
-/*
- * Note that 'init' is a special process: it doesn't get signals it doesn't
- * want to handle. Thus you cannot kill init even with a SIGKILL even by
- * mistake.
- */
-int do_signal(sigset_t *oldset, struct pt_regs *regs)
-{
-        siginfo_t info;
-        struct k_sigaction ka;
-        unsigned int newsp;
-        int signr, ret;
-#ifdef CONFIG_PPC32
-        if (try_to_freeze()) {
-                signr = 0;
-                if (!signal_pending(current))
-                        goto no_signal;
-        }
-#endif
-        if (test_thread_flag(TIF_RESTORE_SIGMASK))
-                oldset = &current->saved_sigmask;
-        else if (!oldset)
-                oldset = &current->blocked;
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-#ifdef CONFIG_PPC32
-no_signal:
-#endif
-        if (TRAP(regs) == 0x0C00                /* System Call! */
-            && regs->ccr & 0x10000000           /* error signalled */
-            && ((ret = regs->gpr[3]) == ERESTARTSYS
-                || ret == ERESTARTNOHAND || ret == ERESTARTNOINTR
-                || ret == ERESTART_RESTARTBLOCK)) {
-                if (signr > 0
-                    && (ret == ERESTARTNOHAND || ret == ERESTART_RESTARTBLOCK
-                        || (ret == ERESTARTSYS
-                            && !(ka.sa.sa_flags & SA_RESTART)))) {
-                        /* make the system call return an EINTR error */
-                        regs->result = -EINTR;
-                        regs->gpr[3] = EINTR;
-                        /* note that the cr0.SO bit is already set */
-                } else {
-                        regs->nip -= 4; /* Back up & retry system call */
-                        regs->result = 0;
-                        regs->trap = 0;
-                        if (ret == ERESTART_RESTARTBLOCK)
-                                regs->gpr[0] = __NR_restart_syscall;
-                        else
-                                regs->gpr[3] = regs->orig_gpr3;
-                }
-        }
-        if (signr == 0) {
-                /* No signal to deliver -- put the saved sigmask back */
-                if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
-                        clear_thread_flag(TIF_RESTORE_SIGMASK);
-                        sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
-                }
-                return 0;               /* no signals delivered */
-        }
-        if ((ka.sa.sa_flags & SA_ONSTACK) && current->sas_ss_size
-            && !on_sig_stack(regs->gpr[1]))
-                newsp = current->sas_ss_sp + current->sas_ss_size;
-        else
-                newsp = regs->gpr[1];
-        newsp &= ~0xfUL;
-#ifdef CONFIG_PPC64
-        /*
-         * Reenable the DABR before delivering the signal to
-         * user space. The DABR will have been cleared if it
-         * triggered inside the kernel.
-         */
-        if (current->thread.dabr)
-                set_dabr(current->thread.dabr);
-#endif
-        /* Whee!  Actually deliver the signal.  */
-        if (ka.sa.sa_flags & SA_SIGINFO)
-                ret = handle_rt_signal(signr, &ka, &info, oldset, regs, newsp);
-        else
-                ret = handle_signal(signr, &ka, &info, oldset, regs, newsp);
-        if (ret) {
-                spin_lock_irq(&current->sighand->siglock);
-                sigorsets(&current->blocked, &current->blocked,
-                          &ka.sa.sa_mask);
-                if (!(ka.sa.sa_flags & SA_NODEFER))
-                        sigaddset(&current->blocked, signr);
-                recalc_sigpending();
-                spin_unlock_irq(&current->sighand->siglock);
-                /* A signal was successfully delivered; the saved sigmask is in
-                   its frame, and we can clear the TIF_RESTORE_SIGMASK flag */
-                if (test_thread_flag(TIF_RESTORE_SIGMASK))
-                        clear_thread_flag(TIF_RESTORE_SIGMASK);
-        }
-        return ret;
-}
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index 1ce0ae3f6f..de895e6d8c 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -34,9 +34,9 @@
 #include <asm/syscalls.h>
 #include <asm/vdso.h>
-#define DEBUG_SIG 0
+#include "signal.h"
-#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
+#define DEBUG_SIG 0
 #define GP_REGS_SIZE    min(sizeof(elf_gregset_t), sizeof(struct pt_regs))
 #define FP_REGS_SIZE    sizeof(elf_fpregset_t)
@@ -64,14 +64,6 @@ struct rt_sigframe {
        char abigap[288];
 } __attribute__ ((aligned (16)));
-long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, unsigned long r5,
-                     unsigned long r6, unsigned long r7, unsigned long r8,
-                     struct pt_regs *regs)
-{
-        return do_sigaltstack(uss, uoss, regs->gpr[1]);
-}
 /*
 * Set up the sigcontext for the signal frame.
 */
@@ -176,6 +168,13 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
         */
        discard_lazy_cpu_state();
+        /*
+         * Force reload of FP/VEC.
+         * This has to be done before copying stuff into current->thread.fpr/vr
+         * for the reasons explained in the previous comment.
+         */
+        regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1 | MSR_VEC);
        err |= __copy_from_user(&current->thread.fpr, &sc->fp_regs, FP_REGS_SIZE);
 #ifdef CONFIG_ALTIVEC
@@ -197,32 +196,10 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
                current->thread.vrsave = 0;
 #endif /* CONFIG_ALTIVEC */
-        /* Force reload of FP/VEC */
-        regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1 | MSR_VEC);
        return err;
 }
 /*
- * Allocate space for the signal frame
- */
-static inline void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
-                                  size_t frame_size)
-{
-        unsigned long newsp;
-        /* Default to using normal stack */
-        newsp = regs->gpr[1];
-        if ((ka->sa.sa_flags & SA_ONSTACK) && current->sas_ss_size) {
-                if (! on_sig_stack(regs->gpr[1]))
-                        newsp = (current->sas_ss_sp + current->sas_ss_size);
-        }
-        return (void __user *)((newsp - frame_size) & -16ul);
-}
-/*
 * Setup the trampoline code on the stack
 */
 static long setup_trampoline(unsigned int syscall, unsigned int __user *tramp)
@@ -249,19 +226,6 @@ static long setup_trampoline(unsigned int syscall, unsigned int __user *tramp)
 }
 /*
- * Restore the user process's signal mask (also used by signal32.c)
- */
-void restore_sigmask(sigset_t *set)
-{
-        sigdelsetmask(set, ~_BLOCKABLE);
-        spin_lock_irq(&current->sighand->siglock);
-        current->blocked = *set;
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
-}
-/*
 * Handle {get,set,swap}_context operations
 */
 int sys_swapcontext(struct ucontext __user *old_ctx,
@@ -355,7 +319,7 @@ badframe:
        return 0;
 }
-static int setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,
+int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
                sigset_t *set, struct pt_regs *regs)
 {
        /* Handler is *really* a pointer to the function descriptor for
@@ -369,8 +333,7 @@ static int setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,
        long err = 0;
        frame = get_sigframe(ka, regs, sizeof(*frame));
+        if (unlikely(frame == NULL))
-        if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                goto badframe;
        err |= __put_user(&frame->info, &frame->pinfo);
@@ -407,7 +370,7 @@ static int setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,
        funct_desc_ptr = (func_descr_t __user *) ka->sa.sa_handler;
        /* Allocate a dummy caller frame for the signal handler. */
-        newsp = (unsigned long)frame - __SIGNAL_FRAMESIZE;
+        newsp = ((unsigned long)frame) - __SIGNAL_FRAMESIZE;
        err |= put_user(regs->gpr[1], (unsigned long __user *)newsp);
        /* Set up "regs" so we "return" to the signal handler. */
@@ -438,134 +401,3 @@ badframe:
        force_sigsegv(signr, current);
        return 0;
 }
-/*
- * OK, we're invoking a handler
- */
-static int handle_signal(unsigned long sig, struct k_sigaction *ka,
-                         siginfo_t *info, sigset_t *oldset, struct pt_regs *regs)
-{
-        int ret;
-        /* Set up Signal Frame */
-        ret = setup_rt_frame(sig, ka, info, oldset, regs);
-        if (ret) {
-                spin_lock_irq(&current->sighand->siglock);
-                sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);
-                if (!(ka->sa.sa_flags & SA_NODEFER))
-                        sigaddset(&current->blocked,sig);
-                recalc_sigpending();
-                spin_unlock_irq(&current->sighand->siglock);
-        }
-        return ret;
-}
-static inline void syscall_restart(struct pt_regs *regs, struct k_sigaction *ka)
-{
-        switch ((int)regs->result) {
-        case -ERESTART_RESTARTBLOCK:
-        case -ERESTARTNOHAND:
-                /* ERESTARTNOHAND means that the syscall should only be
-                 * restarted if there was no handler for the signal, and since
-                 * we only get here if there is a handler, we dont restart.
-                 */
-                regs->result = -EINTR;
-                regs->gpr[3] = EINTR;
-                regs->ccr |= 0x10000000;
-                break;
-        case -ERESTARTSYS:
-                /* ERESTARTSYS means to restart the syscall if there is no
-                 * handler or the handler was registered with SA_RESTART
-                 */
-                if (!(ka->sa.sa_flags & SA_RESTART)) {
-                        regs->result = -EINTR;
-                        regs->gpr[3] = EINTR;
-                        regs->ccr |= 0x10000000;
-                        break;
-                }
-                /* fallthrough */
-        case -ERESTARTNOINTR:
-                /* ERESTARTNOINTR means that the syscall should be
-                 * called again after the signal handler returns.
-                 */
-                regs->gpr[3] = regs->orig_gpr3;
-                regs->nip -= 4;
-                regs->result = 0;
-                break;
-        }
-}
-/*
- * Note that 'init' is a special process: it doesn't get signals it doesn't
- * want to handle. Thus you cannot kill init even with a SIGKILL even by
- * mistake.
- */
-int do_signal(sigset_t *oldset, struct pt_regs *regs)
-{
-        siginfo_t info;
-        int signr;
-        struct k_sigaction ka;
-        /*
-         * If the current thread is 32 bit - invoke the
-         * 32 bit signal handling code
-         */
-        if (test_thread_flag(TIF_32BIT))
-                return do_signal32(oldset, regs);
-        if (test_thread_flag(TIF_RESTORE_SIGMASK))
-                oldset = &current->saved_sigmask;
-        else if (!oldset)
-                oldset = &current->blocked;
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        if (signr > 0) {
-                int ret;
-                /* Whee!  Actually deliver the signal.  */
-                if (TRAP(regs) == 0x0C00)
-                        syscall_restart(regs, &ka);
-                /*
-                 * Reenable the DABR before delivering the signal to
-                 * user space. The DABR will have been cleared if it
-                 * triggered inside the kernel.
-                 */
-                if (current->thread.dabr)
-                        set_dabr(current->thread.dabr);
-                ret = handle_signal(signr, &ka, &info, oldset, regs);
-                /* If a signal was successfully delivered, the saved sigmask is in
-                   its frame, and we can clear the TIF_RESTORE_SIGMASK flag */
-                if (ret && test_thread_flag(TIF_RESTORE_SIGMASK))
-                        clear_thread_flag(TIF_RESTORE_SIGMASK);
-                return ret;
-        }
-        if (TRAP(regs) == 0x0C00) {     /* System Call! */
-                if ((int)regs->result == -ERESTARTNOHAND ||
-                    (int)regs->result == -ERESTARTSYS ||
-                    (int)regs->result == -ERESTARTNOINTR) {
-                        regs->gpr[3] = regs->orig_gpr3;
-                        regs->nip -= 4; /* Back up & retry system call */
-                        regs->result = 0;
-                } else if ((int)regs->result == -ERESTART_RESTARTBLOCK) {
-                        regs->gpr[0] = __NR_restart_syscall;
-                        regs->nip -= 4;
-                        regs->result = 0;
-                }
-        }
-        /* No signal to deliver -- put the saved sigmask back */
-        if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
-                clear_thread_flag(TIF_RESTORE_SIGMASK);
-                sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
-        }
-        return 0;
-}
-EXPORT_SYMBOL(do_signal);
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index 047246ad4f..bd85b5fd08 100644
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -773,6 +773,13 @@ asmlinkage int compat_sys_truncate64(const char __user * path, u32 reg4,
        return sys_truncate(path, (high << 32) | low);
 }
+asmlinkage long compat_sys_fallocate(int fd, int mode, u32 offhi, u32 offlo,
+                                     u32 lenhi, u32 lenlo)
+{
+        return sys_fallocate(fd, mode, ((loff_t)offhi << 32) | offlo,
+                             ((loff_t)lenhi << 32) | lenlo);
+}
 asmlinkage int compat_sys_ftruncate64(unsigned int fd, u32 reg4, unsigned long high,
                                 unsigned long low)
 {
@@ -810,3 +817,12 @@ asmlinkage long compat_sys_request_key(const char __user *_type,
        return sys_request_key(_type, _description, _callout_info, destringid);
 }
+asmlinkage long compat_sys_sync_file_range2(int fd, unsigned int flags,
+                                   unsigned offset_hi, unsigned offset_lo,
+                                   unsigned nbytes_hi, unsigned nbytes_lo)
+{
+        loff_t offset = ((loff_t)offset_hi << 32) | offset_lo;
+        loff_t nbytes = ((loff_t)nbytes_hi << 32) | nbytes_lo;
+        return sys_sync_file_range(fd, offset, nbytes, flags);
+}
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index 68991c2d4a..55d29ed4b7 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -442,12 +442,14 @@ int sysfs_add_device_to_node(struct sys_device *dev, int nid)
        return sysfs_create_link(&node->sysdev.kobj, &dev->kobj,
                        kobject_name(&dev->kobj));
 }
+EXPORT_SYMBOL_GPL(sysfs_add_device_to_node);
 void sysfs_remove_device_from_node(struct sys_device *dev, int nid)
 {
        struct node *node = &node_devices[nid];
        sysfs_remove_link(&node->sysdev.kobj, kobject_name(&dev->kobj));
 }
+EXPORT_SYMBOL_GPL(sysfs_remove_device_from_node);
 #else
 static void register_nodes(void)
@@ -457,9 +459,6 @@ static void register_nodes(void)
 #endif
-EXPORT_SYMBOL_GPL(sysfs_add_device_to_node);
-EXPORT_SYMBOL_GPL(sysfs_remove_device_from_node);
 /* Only valid if CPU is present. */
 static ssize_t show_physical_id(struct sys_device *dev, char *buf)
 {
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 2c8564d54e..e5df167f78 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -77,9 +77,8 @@
 /* keep track of when we need to update the rtc */
 time_t last_rtc_update;
 #ifdef CONFIG_PPC_ISERIES
-unsigned long iSeries_recal_titan = 0;
+static unsigned long __initdata iSeries_recal_titan;
-unsigned long iSeries_recal_tb = 0; 
+static signed long __initdata iSeries_recal_tb;
-static unsigned long first_settimeofday = 1;
 #endif
 /* The decrementer counts down by 128 every 128ns on a 601. */
@@ -113,8 +112,9 @@ u64 ticklen_to_xs;	/* 0.64 fraction */
 DEFINE_SPINLOCK(rtc_lock);
 EXPORT_SYMBOL_GPL(rtc_lock);
-u64 tb_to_ns_scale;
+static u64 tb_to_ns_scale __read_mostly;
-unsigned tb_to_ns_shift;
+static unsigned tb_to_ns_shift __read_mostly;
+static unsigned long boot_tb __read_mostly;
 struct gettimeofday_struct do_gtod;
@@ -214,7 +214,6 @@ static void account_process_time(struct pt_regs *regs)
        run_posix_cpu_timers(current);
 }
-#ifdef CONFIG_PPC_SPLPAR
 /*
 * Stuff for accounting stolen time.
 */
@@ -222,19 +221,28 @@ struct cpu_purr_data {
        int     initialized;                    /* thread is running */
        u64     tb;                     /* last TB value read */
        u64     purr;                   /* last PURR value read */
-        spinlock_t lock;
 };
+/*
+ * Each entry in the cpu_purr_data array is manipulated only by its
+ * "owner" cpu -- usually in the timer interrupt but also occasionally
+ * in process context for cpu online.  As long as cpus do not touch
+ * each others' cpu_purr_data, disabling local interrupts is
+ * sufficient to serialize accesses.
+ */
 static DEFINE_PER_CPU(struct cpu_purr_data, cpu_purr_data);
 static void snapshot_tb_and_purr(void *data)
 {
+        unsigned long flags;
        struct cpu_purr_data *p = &__get_cpu_var(cpu_purr_data);
+        local_irq_save(flags);
        p->tb = mftb();
        p->purr = mfspr(SPRN_PURR);
        wmb();
        p->initialized = 1;
+        local_irq_restore(flags);
 }
 /*
@@ -242,15 +250,14 @@ static void snapshot_tb_and_purr(void *data)
 */
 void snapshot_timebases(void)
 {
-        int cpu;
        if (!cpu_has_feature(CPU_FTR_PURR))
                return;
-        for_each_possible_cpu(cpu)
-                spin_lock_init(&per_cpu(cpu_purr_data, cpu).lock);
        on_each_cpu(snapshot_tb_and_purr, NULL, 0, 1);
 }
+/*
+ * Must be called with interrupts disabled.
+ */
 void calculate_steal_time(void)
 {
        u64 tb, purr;
@@ -262,7 +269,6 @@ void calculate_steal_time(void)
        pme = &per_cpu(cpu_purr_data, smp_processor_id());
        if (!pme->initialized)
                return;         /* this can happen in early boot */
-        spin_lock(&pme->lock);
        tb = mftb();
        purr = mfspr(SPRN_PURR);
        stolen = (tb - pme->tb) - (purr - pme->purr);
@@ -270,9 +276,9 @@ void calculate_steal_time(void)
                account_steal_time(current, stolen);
        pme->tb = tb;
        pme->purr = purr;
-        spin_unlock(&pme->lock);
 }
+#ifdef CONFIG_PPC_SPLPAR
 /*
 * Must be called before the cpu is added to the online map when
 * a cpu is being brought up at runtime.
@@ -284,12 +290,12 @@ static void snapshot_purr(void)
        if (!cpu_has_feature(CPU_FTR_PURR))
                return;
+        local_irq_save(flags);
        pme = &per_cpu(cpu_purr_data, smp_processor_id());
-        spin_lock_irqsave(&pme->lock, flags);
        pme->tb = mftb();
        pme->purr = mfspr(SPRN_PURR);
        pme->initialized = 1;
-        spin_unlock_irqrestore(&pme->lock, flags);
+        local_irq_restore(flags);
 }
 #endif /* CONFIG_PPC_SPLPAR */
@@ -550,10 +556,15 @@ EXPORT_SYMBOL(profile_pc);
 * returned by the service processor for the timebase frequency.  
 */
-static void iSeries_tb_recal(void)
+static int __init iSeries_tb_recal(void)
 {
        struct div_result divres;
        unsigned long titan, tb;
+        /* Make sure we only run on iSeries */
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                return -ENODEV;
        tb = get_tb();
        titan = HvCallXm_loadTod();
        if ( iSeries_recal_titan ) {
@@ -594,8 +605,18 @@ static void iSeries_tb_recal(void)
        }
        iSeries_recal_titan = titan;
        iSeries_recal_tb = tb;
+        return 0;
 }
-#endif
+late_initcall(iSeries_tb_recal);
+/* Called from platform early init */
+void __init iSeries_time_init_early(void)
+{
+        iSeries_recal_tb = get_tb();
+        iSeries_recal_titan = HvCallXm_loadTod();
+}
+#endif /* CONFIG_PPC_ISERIES */
 /*
 * For iSeries shared processors, we have to let the hypervisor
@@ -735,7 +756,7 @@ unsigned long long sched_clock(void)
 {
        if (__USE_RTC())
                return get_rtc();
-        return mulhdu(get_tb(), tb_to_ns_scale) << tb_to_ns_shift;
+        return mulhdu(get_tb() - boot_tb, tb_to_ns_scale) << tb_to_ns_shift;
 }
 int do_settimeofday(struct timespec *tv)
@@ -759,12 +780,6 @@ int do_settimeofday(struct timespec *tv)
         * to the RTC again, or write to the RTC but then they don't call
         * settimeofday to perform this operation.
         */
-#ifdef CONFIG_PPC_ISERIES
-        if (firmware_has_feature(FW_FEATURE_ISERIES) && first_settimeofday) {
-                iSeries_tb_recal();
-                first_settimeofday = 0;
-        }
-#endif
        /* Make userspace gettimeofday spin until we're done. */
        ++vdso_data->tb_update_count;
@@ -960,6 +975,8 @@ void __init time_init(void)
        }
        tb_to_ns_scale = scale;
        tb_to_ns_shift = shift;
+        /* Save the current timebase to pretty up CONFIG_PRINTK_TIME */
+        boot_tb = get_tb();
        tm = get_boot_time();
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index bf6445ac9f..2bb1cb9117 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -149,6 +149,7 @@ int die(const char *str, struct pt_regs *regs, long err)
        bust_spinlocks(0);
        die.lock_owner = -1;
+        add_taint(TAINT_DIE);
        spin_unlock_irqrestore(&die.lock, flags);
        if (kexec_should_crash(current) ||
@@ -777,7 +778,7 @@ void __kprobes program_check_exception(struct pt_regs *regs)
                        return;
                if (!(regs->msr & MSR_PR) &&  /* not user-mode */
-                    report_bug(regs->nip) == BUG_TRAP_TYPE_WARN) {
+                    report_bug(regs->nip, regs) == BUG_TRAP_TYPE_WARN) {
                        regs->nip += 4;
                        return;
                }
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index 4245579edb..cef01e4e89 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -670,7 +670,7 @@ static int __init vdso_init(void)
        /*
         * Fill up the "systemcfg" stuff for backward compatiblity
         */
-        strcpy(vdso_data->eye_catcher, "SYSTEMCFG:PPC64");
+        strcpy((char *)vdso_data->eye_catcher, "SYSTEMCFG:PPC64");
        vdso_data->version.major = SYSTEMCFG_MAJOR;
        vdso_data->version.minor = SYSTEMCFG_MINOR;
        vdso_data->processor = mfspr(SPRN_PVR);
diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S b/arch/powerpc/kernel/vdso32/gettimeofday.S
index 05909f7543..72ca26df45 100644
--- a/arch/powerpc/kernel/vdso32/gettimeofday.S
+++ b/arch/powerpc/kernel/vdso32/gettimeofday.S
@@ -32,6 +32,8 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday)
        mr      r11,r4                  /* r11 saves tz */
        bl      __get_datapage@local    /* get data page */
        mr      r9, r3                  /* datapage ptr in r9 */
+        cmplwi  r10,0                   /* check if tv is NULL */
+        beq     3f
        bl      __do_get_xsec@local     /* get xsec from tb & kernel */
        bne-    2f                      /* out of line -> do syscall */
@@ -50,7 +52,7 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday)
        mulhwu  r5,r5,r6
        stw     r5,TVAL32_TV_USEC(r10)
-        cmpli   cr0,r11,0               /* check if tz is NULL */
+3:      cmplwi  r11,0                   /* check if tz is NULL */
        beq     1f
        lwz     r4,CFG_TZ_MINUTEWEST(r9)/* fill tz */
        lwz     r5,CFG_TZ_DSTTIME(r9)
diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S
index 40ffd9b6ce..c6401f9e37 100644
--- a/arch/powerpc/kernel/vdso64/gettimeofday.S
+++ b/arch/powerpc/kernel/vdso64/gettimeofday.S
@@ -1,5 +1,4 @@
+/*
-        /*
 * Userland implementation of gettimeofday() for 64 bits processes in a
 * ppc64 kernel for use in the vDSO
 *
@@ -32,6 +31,8 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday)
        mr      r11,r3                  /* r11 holds tv */
        mr      r10,r4                  /* r10 holds tz */
        bl      V_LOCAL_FUNC(__get_datapage)    /* get data page */
+        cmpldi  r11,0                   /* check if tv is NULL */
+        beq     2f
        bl      V_LOCAL_FUNC(__do_get_xsec)     /* get xsec from tb & kernel */
        lis     r7,15                   /* r7 = 1000000 = USEC_PER_SEC */
        ori     r7,r7,16960
@@ -43,8 +44,8 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday)
                                         * XSEC_PER_SEC
                                         */
        rldicl  r0,r0,44,20
-        cmpldi  cr0,r10,0               /* check if tz is NULL */
        std     r0,TVAL64_TV_USEC(r11)  /* store usec in tv */
+2:      cmpldi  r10,0                   /* check if tz is NULL */
        beq     1f
        lwz     r4,CFG_TZ_MINUTEWEST(r3)/* fill tz */
        lwz     r5,CFG_TZ_DSTTIME(r3)
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 21c39ff2dc..ae4acd8414 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -7,6 +7,7 @@
 #define PROVIDE32(x)    PROVIDE(x)
 #endif
 #include <asm-generic/vmlinux.lds.h>
+#include <asm/cache.h>
 ENTRY(_stext)
@@ -211,6 +212,11 @@ SECTIONS
                *(.data.cacheline_aligned)
        }
+        . = ALIGN(L1_CACHE_BYTES);
+        .data.read_mostly : {
+                *(.data.read_mostly)
+        }
        . = ALIGN(PAGE_SIZE);
        __data_nosave : {
                __nosave_begin = .;
diff --git a/arch/powerpc/mm/44x_mmu.c b/arch/powerpc/mm/44x_mmu.c
index ca4dcb07a9..c3df504765 100644
--- a/arch/powerpc/mm/44x_mmu.c
+++ b/arch/powerpc/mm/44x_mmu.c
@@ -12,7 +12,6 @@
 *  Modifications by Paul Mackerras (PowerMac) (paulus@cs.anu.edu.au)
 *  and Cort Dougan (PReP) (cort@cs.nmt.edu)
 *    Copyright (C) 1996 Paul Mackerras
- *  Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
 *
 *  Derived from "arch/i386/mm/init.c"
 *    Copyright (C) 1991, 1992, 1993, 1994  Linus Torvalds
diff --git a/arch/powerpc/mm/4xx_mmu.c b/arch/powerpc/mm/4xx_mmu.c
index 838e09db71..7ff2609b64 100644
--- a/arch/powerpc/mm/4xx_mmu.c
+++ b/arch/powerpc/mm/4xx_mmu.c
@@ -9,7 +9,6 @@
 *  Modifications by Paul Mackerras (PowerMac) (paulus@cs.anu.edu.au)
 *  and Cort Dougan (PReP) (cort@cs.nmt.edu)
 *    Copyright (C) 1996 Paul Mackerras
- *  Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
 *
 *  Derived from "arch/i386/mm/init.c"
 *    Copyright (C) 1991, 1992, 1993, 1994  Linus Torvalds
diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile
index 4f839c6a97..7e4d27ad3d 100644
--- a/arch/powerpc/mm/Makefile
+++ b/arch/powerpc/mm/Makefile
@@ -11,8 +11,7 @@ obj-$(CONFIG_PPC32)		+= init_32.o pgtable_32.o mmu_context_32.o
 hash-$(CONFIG_PPC_NATIVE)       := hash_native_64.o
 obj-$(CONFIG_PPC64)             += init_64.o pgtable_64.o mmu_context_64.o \
                                   hash_utils_64.o hash_low_64.o tlb_64.o \
-                                   slb_low.o slb.o stab.o mmap.o imalloc.o \
+                                   slb_low.o slb.o stab.o mmap.o $(hash-y)
-                                   $(hash-y)
 obj-$(CONFIG_PPC_STD_MMU_32)    += ppc_mmu_32.o hash_low_32.o tlb_32.o
 obj-$(CONFIG_40x)               += 4xx_mmu.o
 obj-$(CONFIG_44x)               += 44x_mmu.o
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 115b25f50b..0ece51310b 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -380,7 +380,7 @@ out_of_memory:
        }
        printk("VM: killing process %s\n", current->comm);
        if (user_mode(regs))
-                do_exit(SIGKILL);
+                do_group_exit(SIGKILL);
        return SIGKILL;
 do_sigbus:
diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c
index 123da03ab1..afab247d47 100644
--- a/arch/powerpc/mm/fsl_booke_mmu.c
+++ b/arch/powerpc/mm/fsl_booke_mmu.c
@@ -14,7 +14,6 @@
 *  Modifications by Paul Mackerras (PowerMac) (paulus@cs.anu.edu.au)
 *  and Cort Dougan (PReP) (cort@cs.nmt.edu)
 *    Copyright (C) 1996 Paul Mackerras
- *  Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
 *
 *  Derived from "arch/i386/mm/init.c"
 *    Copyright (C) 1991, 1992, 1993, 1994  Linus Torvalds
diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c
index 4a20d890e2..6ba9b47e55 100644
--- a/arch/powerpc/mm/hash_native_64.c
+++ b/arch/powerpc/mm/hash_native_64.c
@@ -104,7 +104,7 @@ static inline void tlbie(unsigned long va, int psize, int local)
                spin_unlock(&native_tlbie_lock);
 }
-static inline void native_lock_hpte(hpte_t *hptep)
+static inline void native_lock_hpte(struct hash_pte *hptep)
 {
        unsigned long *word = &hptep->v;
@@ -116,7 +116,7 @@ static inline void native_lock_hpte(hpte_t *hptep)
        }
 }
-static inline void native_unlock_hpte(hpte_t *hptep)
+static inline void native_unlock_hpte(struct hash_pte *hptep)
 {
        unsigned long *word = &hptep->v;
@@ -128,7 +128,7 @@ static long native_hpte_insert(unsigned long hpte_group, unsigned long va,
                        unsigned long pa, unsigned long rflags,
                        unsigned long vflags, int psize)
 {
-        hpte_t *hptep = htab_address + hpte_group;
+        struct hash_pte *hptep = htab_address + hpte_group;
        unsigned long hpte_v, hpte_r;
        int i;
@@ -163,7 +163,7 @@ static long native_hpte_insert(unsigned long hpte_group, unsigned long va,
        hptep->r = hpte_r;
        /* Guarantee the second dword is visible before the valid bit */
-        __asm__ __volatile__ ("eieio" : : : "memory");
+        eieio();
        /*
         * Now set the first dword including the valid bit
         * NOTE: this also unlocks the hpte
@@ -177,7 +177,7 @@ static long native_hpte_insert(unsigned long hpte_group, unsigned long va,
 static long native_hpte_remove(unsigned long hpte_group)
 {
-        hpte_t *hptep;
+        struct hash_pte *hptep;
        int i;
        int slot_offset;
        unsigned long hpte_v;
@@ -217,7 +217,7 @@ static long native_hpte_remove(unsigned long hpte_group)
 static long native_hpte_updatepp(unsigned long slot, unsigned long newpp,
                                 unsigned long va, int psize, int local)
 {
-        hpte_t *hptep = htab_address + slot;
+        struct hash_pte *hptep = htab_address + slot;
        unsigned long hpte_v, want_v;
        int ret = 0;
@@ -233,15 +233,14 @@ static long native_hpte_updatepp(unsigned long slot, unsigned long newpp,
        /* Even if we miss, we need to invalidate the TLB */
        if (!HPTE_V_COMPARE(hpte_v, want_v) || !(hpte_v & HPTE_V_VALID)) {
                DBG_LOW(" -> miss\n");
-                native_unlock_hpte(hptep);
                ret = -1;
        } else {
                DBG_LOW(" -> hit\n");
                /* Update the HPTE */
                hptep->r = (hptep->r & ~(HPTE_R_PP | HPTE_R_N)) |
                        (newpp & (HPTE_R_PP | HPTE_R_N | HPTE_R_C));
-                native_unlock_hpte(hptep);
        }
+        native_unlock_hpte(hptep);
        /* Ensure it is out of the tlb too. */
        tlbie(va, psize, local);
@@ -251,7 +250,7 @@ static long native_hpte_updatepp(unsigned long slot, unsigned long newpp,
 static long native_hpte_find(unsigned long va, int psize)
 {
-        hpte_t *hptep;
+        struct hash_pte *hptep;
        unsigned long hash;
        unsigned long i, j;
        long slot;
@@ -294,7 +293,7 @@ static void native_hpte_updateboltedpp(unsigned long newpp, unsigned long ea,
 {
        unsigned long vsid, va;
        long slot;
-        hpte_t *hptep;
+        struct hash_pte *hptep;
        vsid = get_kernel_vsid(ea);
        va = (vsid << 28) | (ea & 0x0fffffff);
@@ -315,7 +314,7 @@ static void native_hpte_updateboltedpp(unsigned long newpp, unsigned long ea,
 static void native_hpte_invalidate(unsigned long slot, unsigned long va,
                                   int psize, int local)
 {
-        hpte_t *hptep = htab_address + slot;
+        struct hash_pte *hptep = htab_address + slot;
        unsigned long hpte_v;
        unsigned long want_v;
        unsigned long flags;
@@ -345,7 +344,7 @@ static void native_hpte_invalidate(unsigned long slot, unsigned long va,
 #define LP_BITS         8
 #define LP_MASK(i)      ((0xFF >> (i)) << LP_SHIFT)
-static void hpte_decode(hpte_t *hpte, unsigned long slot,
+static void hpte_decode(struct hash_pte *hpte, unsigned long slot,
                        int *psize, unsigned long *va)
 {
        unsigned long hpte_r = hpte->r;
@@ -415,7 +414,7 @@ static void hpte_decode(hpte_t *hpte, unsigned long slot,
 static void native_hpte_clear(void)
 {
        unsigned long slot, slots, flags;
-        hpte_t *hptep = htab_address;
+        struct hash_pte *hptep = htab_address;
        unsigned long hpte_v, va;
        unsigned long pteg_count;
        int psize;
@@ -462,7 +461,7 @@ static void native_hpte_clear(void)
 static void native_flush_hash_range(unsigned long number, int local)
 {
        unsigned long va, hash, index, hidx, shift, slot;
-        hpte_t *hptep;
+        struct hash_pte *hptep;
        unsigned long hpte_v;
        unsigned long want_v;
        unsigned long flags;
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 4f2f4534a9..2ce9491b48 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -87,7 +87,7 @@ extern unsigned long dart_tablebase;
 static unsigned long _SDR1;
 struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT];
-hpte_t *htab_address;
+struct hash_pte *htab_address;
 unsigned long htab_size_bytes;
 unsigned long htab_hash_mask;
 int mmu_linear_psize = MMU_PAGE_4K;
diff --git a/arch/powerpc/mm/imalloc.c b/arch/powerpc/mm/imalloc.c
deleted file mode 100644
index c831815c31..0000000000
--- a/arch/powerpc/mm/imalloc.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * c 2001 PPC 64 Team, IBM Corp
- * 
- *      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.
- */
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-#include <asm/uaccess.h>
-#include <asm/pgalloc.h>
-#include <asm/pgtable.h>
-#include <linux/mutex.h>
-#include <asm/cacheflush.h>
-#include "mmu_decl.h"
-static DEFINE_MUTEX(imlist_mutex);
-struct vm_struct * imlist = NULL;
-static int get_free_im_addr(unsigned long size, unsigned long *im_addr)
-{
-        unsigned long addr;
-        struct vm_struct **p, *tmp;
-        addr = ioremap_bot;
-        for (p = &imlist; (tmp = *p) ; p = &tmp->next) {
-                if (size + addr < (unsigned long) tmp->addr)
-                        break;
-                if ((unsigned long)tmp->addr >= ioremap_bot)
-                        addr = tmp->size + (unsigned long) tmp->addr;
-                if (addr >= IMALLOC_END-size)
-                        return 1;
-        }
-        *im_addr = addr;
-        return 0;
-}
-/* Return whether the region described by v_addr and size is a subset
- * of the region described by parent
- */
-static inline int im_region_is_subset(unsigned long v_addr, unsigned long size,
-                        struct vm_struct *parent)
-{
-        return (int) (v_addr >= (unsigned long) parent->addr &&
-                      v_addr < (unsigned long) parent->addr + parent->size &&
-                      size < parent->size);
-}
-/* Return whether the region described by v_addr and size is a superset
- * of the region described by child
- */
-static int im_region_is_superset(unsigned long v_addr, unsigned long size,
-                struct vm_struct *child)
-{
-        struct vm_struct parent;
-        parent.addr = (void *) v_addr;
-        parent.size = size;
-        return im_region_is_subset((unsigned long) child->addr, child->size,
-                        &parent);
-}
-/* Return whether the region described by v_addr and size overlaps
- * the region described by vm.  Overlapping regions meet the
- * following conditions:
- * 1) The regions share some part of the address space
- * 2) The regions aren't identical
- * 3) Neither region is a subset of the other
- */
-static int im_region_overlaps(unsigned long v_addr, unsigned long size,
-                     struct vm_struct *vm)
-{
-        if (im_region_is_superset(v_addr, size, vm))
-                return 0;
-        return (v_addr + size > (unsigned long) vm->addr + vm->size &&
-                v_addr < (unsigned long) vm->addr + vm->size) ||
-               (v_addr < (unsigned long) vm->addr &&
-                v_addr + size > (unsigned long) vm->addr);
-}
-/* Determine imalloc status of region described by v_addr and size.
- * Can return one of the following:
- * IM_REGION_UNUSED   -  Entire region is unallocated in imalloc space.
- * IM_REGION_SUBSET -    Region is a subset of a region that is already
- *                       allocated in imalloc space.
- *                       vm will be assigned to a ptr to the parent region.
- * IM_REGION_EXISTS -    Exact region already allocated in imalloc space.
- *                       vm will be assigned to a ptr to the existing imlist
- *                       member.
- * IM_REGION_OVERLAPS -  Region overlaps an allocated region in imalloc space.
- * IM_REGION_SUPERSET -  Region is a superset of a region that is already
- *                       allocated in imalloc space.
- */
-static int im_region_status(unsigned long v_addr, unsigned long size,
-                    struct vm_struct **vm)
-{
-        struct vm_struct *tmp;
-        for (tmp = imlist; tmp; tmp = tmp->next)
-                if (v_addr < (unsigned long) tmp->addr + tmp->size)
-                        break;
-        *vm = NULL;
-        if (tmp) {
-                if (im_region_overlaps(v_addr, size, tmp))
-                        return IM_REGION_OVERLAP;
-                *vm = tmp;
-                if (im_region_is_subset(v_addr, size, tmp)) {
-                        /* Return with tmp pointing to superset */
-                        return IM_REGION_SUBSET;
-                }
-                if (im_region_is_superset(v_addr, size, tmp)) {
-                        /* Return with tmp pointing to first subset */
-                        return IM_REGION_SUPERSET;
-                }
-                else if (v_addr == (unsigned long) tmp->addr &&
-                         size == tmp->size) {
-                        /* Return with tmp pointing to exact region */
-                        return IM_REGION_EXISTS;
-                }
-        }
-        return IM_REGION_UNUSED;
-}
-static struct vm_struct * split_im_region(unsigned long v_addr, 
-                unsigned long size, struct vm_struct *parent)
-{
-        struct vm_struct *vm1 = NULL;
-        struct vm_struct *vm2 = NULL;
-        struct vm_struct *new_vm = NULL;
-        
-        vm1 = kmalloc(sizeof(*vm1), GFP_KERNEL);
-        if (vm1 == NULL) {
-                printk(KERN_ERR "%s() out of memory\n", __FUNCTION__);
-                return NULL;
-        }
-        if (v_addr == (unsigned long) parent->addr) {
-                /* Use existing parent vm_struct to represent child, allocate
-                 * new one for the remainder of parent range
-                 */
-                vm1->size = parent->size - size;
-                vm1->addr = (void *) (v_addr + size);
-                vm1->next = parent->next;
-                parent->size = size;
-                parent->next = vm1;
-                new_vm = parent;
-        } else if (v_addr + size == (unsigned long) parent->addr + 
-                        parent->size) {
-                /* Allocate new vm_struct to represent child, use existing
-                 * parent one for remainder of parent range
-                 */
-                vm1->size = size;
-                vm1->addr = (void *) v_addr;
-                vm1->next = parent->next;
-                new_vm = vm1;
-                parent->size -= size;
-                parent->next = vm1;
-        } else {
-                /* Allocate two new vm_structs for the new child and 
-                 * uppermost remainder, and use existing parent one for the
-                 * lower remainder of parent range
-                 */
-                vm2 = kmalloc(sizeof(*vm2), GFP_KERNEL);
-                if (vm2 == NULL) {
-                        printk(KERN_ERR "%s() out of memory\n", __FUNCTION__);
-                        kfree(vm1);
-                        return NULL;
-                }
-                vm1->size = size;
-                vm1->addr = (void *) v_addr;
-                vm1->next = vm2;
-                new_vm = vm1;
-                vm2->size = ((unsigned long) parent->addr + parent->size) - 
-                                (v_addr + size);
-                vm2->addr = (void *) v_addr + size;
-                vm2->next = parent->next;
-                parent->size = v_addr - (unsigned long) parent->addr;
-                parent->next = vm1;
-        }
-        return new_vm;
-}
-static struct vm_struct * __add_new_im_area(unsigned long req_addr, 
-                                            unsigned long size)
-{
-        struct vm_struct **p, *tmp, *area;
-                
-        for (p = &imlist; (tmp = *p) ; p = &tmp->next) {
-                if (req_addr + size <= (unsigned long)tmp->addr)
-                        break;
-        }
-        
-        area = kmalloc(sizeof(*area), GFP_KERNEL);
-        if (!area)
-                return NULL;
-        area->flags = 0;
-        area->addr = (void *)req_addr;
-        area->size = size;
-        area->next = *p;
-        *p = area;
-        return area;
-}
-static struct vm_struct * __im_get_area(unsigned long req_addr, 
-                                        unsigned long size,
-                                        int criteria)
-{
-        struct vm_struct *tmp;
-        int status;
-        status = im_region_status(req_addr, size, &tmp);
-        if ((criteria & status) == 0) {
-                return NULL;
-        }
-        
-        switch (status) {
-        case IM_REGION_UNUSED:
-                tmp = __add_new_im_area(req_addr, size);
-                break;
-        case IM_REGION_SUBSET:
-                tmp = split_im_region(req_addr, size, tmp);
-                break;
-        case IM_REGION_EXISTS:
-                /* Return requested region */
-                break;
-        case IM_REGION_SUPERSET:
-                /* Return first existing subset of requested region */
-                break;
-        default:
-                printk(KERN_ERR "%s() unexpected imalloc region status\n",
-                                __FUNCTION__);
-                tmp = NULL;
-        }
-        return tmp;
-}
-struct vm_struct * im_get_free_area(unsigned long size)
-{
-        struct vm_struct *area;
-        unsigned long addr;
-        
-        mutex_lock(&imlist_mutex);
-        if (get_free_im_addr(size, &addr)) {
-                printk(KERN_ERR "%s() cannot obtain addr for size 0x%lx\n",
-                                __FUNCTION__, size);
-                area = NULL;
-                goto next_im_done;
-        }
-        area = __im_get_area(addr, size, IM_REGION_UNUSED);
-        if (area == NULL) {
-                printk(KERN_ERR 
-                       "%s() cannot obtain area for addr 0x%lx size 0x%lx\n",
-                        __FUNCTION__, addr, size);
-        }
-next_im_done:
-        mutex_unlock(&imlist_mutex);
-        return area;
-}
-struct vm_struct * im_get_area(unsigned long v_addr, unsigned long size,
-                int criteria)
-{
-        struct vm_struct *area;
-        mutex_lock(&imlist_mutex);
-        area = __im_get_area(v_addr, size, criteria);
-        mutex_unlock(&imlist_mutex);
-        return area;
-}
-void im_free(void * addr)
-{
-        struct vm_struct **p, *tmp;
-  
-        if (!addr)
-                return;
-        if ((unsigned long) addr & ~PAGE_MASK) {
-                printk(KERN_ERR "Trying to %s bad address (%p)\n", __FUNCTION__,                        addr);
-                return;
-        }
-        mutex_lock(&imlist_mutex);
-        for (p = &imlist ; (tmp = *p) ; p = &tmp->next) {
-                if (tmp->addr == addr) {
-                        *p = tmp->next;
-                        unmap_vm_area(tmp);
-                        kfree(tmp);
-                        mutex_unlock(&imlist_mutex);
-                        return;
-                }
-        }
-        mutex_unlock(&imlist_mutex);
-        printk(KERN_ERR "Trying to %s nonexistent area (%p)\n", __FUNCTION__,
-                        addr);
-}
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c
index 5fce6ccecb..e1f5ded851 100644
--- a/arch/powerpc/mm/init_32.c
+++ b/arch/powerpc/mm/init_32.c
@@ -5,7 +5,6 @@
 *  Modifications by Paul Mackerras (PowerMac) (paulus@cs.anu.edu.au)
 *  and Cort Dougan (PReP) (cort@cs.nmt.edu)
 *    Copyright (C) 1996 Paul Mackerras
- *  Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
 *  PPC44x/36-bit changes by Matt Porter (mporter@mvista.com)
 *
 *  Derived from "arch/i386/mm/init.c"
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 7312a26554..1d6edf724c 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -5,7 +5,6 @@
 *  Modifications by Paul Mackerras (PowerMac) (paulus@cs.anu.edu.au)
 *  and Cort Dougan (PReP) (cort@cs.nmt.edu)
 *    Copyright (C) 1996 Paul Mackerras
- *  Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
 *
 *  Derived from "arch/i386/mm/init.c"
 *    Copyright (C) 1991, 1992, 1993, 1994  Linus Torvalds
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 0266a94d83..f0e7eedb1b 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -5,7 +5,6 @@
 *  Modifications by Paul Mackerras (PowerMac) (paulus@cs.anu.edu.au)
 *  and Cort Dougan (PReP) (cort@cs.nmt.edu)
 *    Copyright (C) 1996 Paul Mackerras
- *  Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
 *  PPC44x/36-bit changes by Matt Porter (mporter@mvista.com)
 *
 *  Derived from "arch/i386/mm/init.c"
@@ -129,8 +128,6 @@ int __devinit arch_add_memory(int nid, u64 start, u64 size)
        zone = pgdata->node_zones;
        return __add_pages(zone, start_pfn, nr_pages);
-        return 0;
 }
 /*
diff --git a/arch/powerpc/mm/mmu_context_32.c b/arch/powerpc/mm/mmu_context_32.c
index 792086b010..cc32ba41d9 100644
--- a/arch/powerpc/mm/mmu_context_32.c
+++ b/arch/powerpc/mm/mmu_context_32.c
@@ -11,7 +11,6 @@
 *  Modifications by Paul Mackerras (PowerMac) (paulus@cs.anu.edu.au)
 *  and Cort Dougan (PReP) (cort@cs.nmt.edu)
 *    Copyright (C) 1996 Paul Mackerras
- *  Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
 *
 *  Derived from "arch/i386/mm/init.c"
 *    Copyright (C) 1991, 1992, 1993, 1994  Linus Torvalds
diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h
index 2558c34eed..c94a64fd3c 100644
--- a/arch/powerpc/mm/mmu_decl.h
+++ b/arch/powerpc/mm/mmu_decl.h
@@ -8,7 +8,6 @@
 *  Modifications by Paul Mackerras (PowerMac) (paulus@cs.anu.edu.au)
 *  and Cort Dougan (PReP) (cort@cs.nmt.edu)
 *    Copyright (C) 1996 Paul Mackerras
- *  Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
 *
 *  Derived from "arch/i386/mm/init.c"
 *    Copyright (C) 1991, 1992, 1993, 1994  Linus Torvalds
@@ -40,8 +39,8 @@ extern int __map_without_bats;
 extern unsigned long ioremap_base;
 extern unsigned int rtas_data, rtas_size;
-struct _PTE;
+struct hash_pte;
-extern struct _PTE *Hash, *Hash_end;
+extern struct hash_pte *Hash, *Hash_end;
 extern unsigned long Hash_size, Hash_mask;
 extern unsigned int num_tlbcam_entries;
@@ -90,16 +89,4 @@ static inline void flush_HPTE(unsigned context, unsigned long va,
        else
                _tlbie(va);
 }
-#else /* CONFIG_PPC64 */
-/* imalloc region types */
-#define IM_REGION_UNUSED        0x1
-#define IM_REGION_SUBSET        0x2
-#define IM_REGION_EXISTS        0x4
-#define IM_REGION_OVERLAP       0x8
-#define IM_REGION_SUPERSET      0x10
-extern struct vm_struct * im_get_free_area(unsigned long size);
-extern struct vm_struct * im_get_area(unsigned long v_addr, unsigned long size,
-                                      int region_type);
-extern void im_free(void *addr);
 #endif
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index f6ae1a57d6..6448872316 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -8,7 +8,6 @@
 *  Modifications by Paul Mackerras (PowerMac) (paulus@cs.anu.edu.au)
 *  and Cort Dougan (PReP) (cort@cs.nmt.edu)
 *    Copyright (C) 1996 Paul Mackerras
- *  Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
 *
 *  Derived from "arch/i386/mm/init.c"
 *    Copyright (C) 1991, 1992, 1993, 1994  Linus Torvalds
@@ -37,7 +36,6 @@
 unsigned long ioremap_base;
 unsigned long ioremap_bot;
 EXPORT_SYMBOL(ioremap_bot);     /* aka VMALLOC_END */
-int io_bat_index;
 #if defined(CONFIG_6xx) || defined(CONFIG_POWER3)
 #define HAVE_BATS       1
@@ -300,51 +298,6 @@ void __init mapin_ram(void)
        }
 }
-/* is x a power of 4? */
-#define is_power_of_4(x)        is_power_of_2(x) && (ffs(x) & 1)
-/*
- * Set up a mapping for a block of I/O.
- * virt, phys, size must all be page-aligned.
- * This should only be called before ioremap is called.
- */
-void __init io_block_mapping(unsigned long virt, phys_addr_t phys,
-                             unsigned int size, int flags)
-{
-        int i;
-        if (virt > KERNELBASE && virt < ioremap_bot)
-                ioremap_bot = ioremap_base = virt;
-#ifdef HAVE_BATS
-        /*
-         * Use a BAT for this if possible...
-         */
-        if (io_bat_index < 2 && is_power_of_2(size)
-            && (virt & (size - 1)) == 0 && (phys & (size - 1)) == 0) {
-                setbat(io_bat_index, virt, phys, size, flags);
-                ++io_bat_index;
-                return;
-        }
-#endif /* HAVE_BATS */
-#ifdef HAVE_TLBCAM
-        /*
-         * Use a CAM for this if possible...
-         */
-        if (tlbcam_index < num_tlbcam_entries && is_power_of_4(size)
-            && (virt & (size - 1)) == 0 && (phys & (size - 1)) == 0) {
-                settlbcam(tlbcam_index, virt, phys, size, flags, 0);
-                ++tlbcam_index;
-                return;
-        }
-#endif /* HAVE_TLBCAM */
-        /* No BATs available, put it in the page tables. */
-        for (i = 0; i < size; i += PAGE_SIZE)
-                map_page(virt + i, phys + i, flags);
-}
 /* Scan the real Linux page tables and return a PTE pointer for
 * a virtual address in a context.
 * Returns true (1) if PTE was found, zero otherwise.  The pointer to
@@ -379,82 +332,6 @@ get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep, pmd_t **pmdp)
        return(retval);
 }
-/* Find physical address for this virtual address.  Normally used by
- * I/O functions, but anyone can call it.
- */
-unsigned long iopa(unsigned long addr)
-{
-        unsigned long pa;
-        /* I don't know why this won't work on PMacs or CHRP.  It
-         * appears there is some bug, or there is some implicit
-         * mapping done not properly represented by BATs or in page
-         * tables.......I am actively working on resolving this, but
-         * can't hold up other stuff.  -- Dan
-         */
-        pte_t *pte;
-        struct mm_struct *mm;
-        /* Check the BATs */
-        pa = v_mapped_by_bats(addr);
-        if (pa)
-                return pa;
-        /* Allow mapping of user addresses (within the thread)
-         * for DMA if necessary.
-         */
-        if (addr < TASK_SIZE)
-                mm = current->mm;
-        else
-                mm = &init_mm;
-        pa = 0;
-        if (get_pteptr(mm, addr, &pte, NULL)) {
-                pa = (pte_val(*pte) & PAGE_MASK) | (addr & ~PAGE_MASK);
-                pte_unmap(pte);
-        }
-        return(pa);
-}
-/* This is will find the virtual address for a physical one....
- * Swiped from APUS, could be dangerous :-).
- * This is only a placeholder until I really find a way to make this
- * work.  -- Dan
- */
-unsigned long
-mm_ptov (unsigned long paddr)
-{
-        unsigned long ret;
-#if 0
-        if (paddr < 16*1024*1024)
-                ret = ZTWO_VADDR(paddr);
-        else {
-                int i;
-                for (i = 0; i < kmap_chunk_count;){
-                        unsigned long phys = kmap_chunks[i++];
-                        unsigned long size = kmap_chunks[i++];
-                        unsigned long virt = kmap_chunks[i++];
-                        if (paddr >= phys
-                            && paddr < (phys + size)){
-                                ret = virt + paddr - phys;
-                                goto exit;
-                        }
-                }
-        
-                ret = (unsigned long) __va(paddr);
-        }
-exit:
-#ifdef DEBUGPV
-        printk ("PTOV(%lx)=%lx\n", paddr, ret);
-#endif
-#else
-        ret = (unsigned long)paddr + KERNELBASE;
-#endif
-        return ret;
-}
 #ifdef CONFIG_DEBUG_PAGEALLOC
 static int __change_page_attr(struct page *page, pgprot_t prot)
diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index ad6e135bf2..3dfd10db93 100644
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -7,7 +7,6 @@
 *  Modifications by Paul Mackerras (PowerMac) (paulus@samba.org)
 *  and Cort Dougan (PReP) (cort@cs.nmt.edu)
 *    Copyright (C) 1996 Paul Mackerras
- *  Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
 *
 *  Derived from "arch/i386/mm/init.c"
 *    Copyright (C) 1991, 1992, 1993, 1994  Linus Torvalds
@@ -34,41 +33,27 @@
 #include <linux/stddef.h>
 #include <linux/vmalloc.h>
 #include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/bootmem.h>
-#include <linux/highmem.h>
-#include <linux/idr.h>
-#include <linux/nodemask.h>
-#include <linux/module.h>
 #include <asm/pgalloc.h>
 #include <asm/page.h>
 #include <asm/prom.h>
-#include <asm/lmb.h>
-#include <asm/rtas.h>
 #include <asm/io.h>
 #include <asm/mmu_context.h>
 #include <asm/pgtable.h>
 #include <asm/mmu.h>
-#include <asm/uaccess.h>
 #include <asm/smp.h>
 #include <asm/machdep.h>
 #include <asm/tlb.h>
-#include <asm/eeh.h>
 #include <asm/processor.h>
-#include <asm/mmzone.h>
 #include <asm/cputable.h>
 #include <asm/sections.h>
 #include <asm/system.h>
-#include <asm/iommu.h>
 #include <asm/abs_addr.h>
-#include <asm/vdso.h>
 #include <asm/firmware.h>
 #include "mmu_decl.h"
-unsigned long ioremap_bot = IMALLOC_BASE;
+unsigned long ioremap_bot = IOREMAP_BASE;
-static unsigned long phbs_io_bot = PHBS_IO_BASE;
 /*
 * map_io_page currently only called by __ioremap
@@ -102,8 +87,8 @@ static int map_io_page(unsigned long ea, unsigned long pa, int flags)
                 * entry in the hardware page table.
                 *
                 */
-                if (htab_bolt_mapping(ea, ea + PAGE_SIZE, pa, flags,
+                if (htab_bolt_mapping(ea, (unsigned long)ea + PAGE_SIZE,
-                                      mmu_io_psize)) {
+                                      pa, flags, mmu_io_psize)) {
                        printk(KERN_ERR "Failed to do bolted mapping IO "
                               "memory at %016lx !\n", pa);
                        return -ENOMEM;
@@ -113,8 +98,11 @@ static int map_io_page(unsigned long ea, unsigned long pa, int flags)
 }
-static void __iomem * __ioremap_com(phys_addr_t addr, unsigned long pa,
+/**
-                            unsigned long ea, unsigned long size,
+ * __ioremap_at - Low level function to establish the page tables
+ *                for an IO mapping
+ */
+void __iomem * __ioremap_at(phys_addr_t pa, void *ea, unsigned long size,
                            unsigned long flags)
 {
        unsigned long i;
@@ -122,17 +110,35 @@ static void __iomem * __ioremap_com(phys_addr_t addr, unsigned long pa,
        if ((flags & _PAGE_PRESENT) == 0)
                flags |= pgprot_val(PAGE_KERNEL);
+        WARN_ON(pa & ~PAGE_MASK);
+        WARN_ON(((unsigned long)ea) & ~PAGE_MASK);
+        WARN_ON(size & ~PAGE_MASK);
        for (i = 0; i < size; i += PAGE_SIZE)
-                if (map_io_page(ea+i, pa+i, flags))
+                if (map_io_page((unsigned long)ea+i, pa+i, flags))
                        return NULL;
-        return (void __iomem *) (ea + (addr & ~PAGE_MASK));
+        return (void __iomem *)ea;
+}
+/**
+ * __iounmap_from - Low level function to tear down the page tables
+ *                  for an IO mapping. This is used for mappings that
+ *                  are manipulated manually, like partial unmapping of
+ *                  PCI IOs or ISA space.
+ */
+void __iounmap_at(void *ea, unsigned long size)
+{
+        WARN_ON(((unsigned long)ea) & ~PAGE_MASK);
+        WARN_ON(size & ~PAGE_MASK);
+        unmap_kernel_range((unsigned long)ea, size);
 }
 void __iomem * __ioremap(phys_addr_t addr, unsigned long size,
                         unsigned long flags)
 {
-        unsigned long pa, ea;
+        phys_addr_t paligned;
        void __iomem *ret;
        /*
@@ -144,27 +150,30 @@ void __iomem * __ioremap(phys_addr_t addr, unsigned long size,
         * IMALLOC_END
         * 
         */
-        pa = addr & PAGE_MASK;
+        paligned = addr & PAGE_MASK;
-        size = PAGE_ALIGN(addr + size) - pa;
+        size = PAGE_ALIGN(addr + size) - paligned;
-        if ((size == 0) || (pa == 0))
+        if ((size == 0) || (paligned == 0))
                return NULL;
        if (mem_init_done) {
                struct vm_struct *area;
-                area = im_get_free_area(size);
+                area = __get_vm_area(size, VM_IOREMAP,
+                                     ioremap_bot, IOREMAP_END);
                if (area == NULL)
                        return NULL;
-                ea = (unsigned long)(area->addr);
+                ret = __ioremap_at(paligned, area->addr, size, flags);
-                ret = __ioremap_com(addr, pa, ea, size, flags);
                if (!ret)
-                        im_free(area->addr);
+                        vunmap(area->addr);
        } else {
-                ea = ioremap_bot;
+                ret = __ioremap_at(paligned, (void *)ioremap_bot, size, flags);
-                ret = __ioremap_com(addr, pa, ea, size, flags);
                if (ret)
                        ioremap_bot += size;
        }
+        if (ret)
+                ret += addr & ~PAGE_MASK;
        return ret;
 }
@@ -187,62 +196,9 @@ void __iomem * ioremap_flags(phys_addr_t addr, unsigned long size,
 }
-#define IS_PAGE_ALIGNED(_val) ((_val) == ((_val) & PAGE_MASK))
-int __ioremap_explicit(phys_addr_t pa, unsigned long ea,
-                       unsigned long size, unsigned long flags)
-{
-        struct vm_struct *area;
-        void __iomem *ret;
-        
-        /* For now, require page-aligned values for pa, ea, and size */
-        if (!IS_PAGE_ALIGNED(pa) || !IS_PAGE_ALIGNED(ea) ||
-            !IS_PAGE_ALIGNED(size)) {
-                printk(KERN_ERR "unaligned value in %s\n", __FUNCTION__);
-                return 1;
-        }
-        
-        if (!mem_init_done) {
-                /* Two things to consider in this case:
-                 * 1) No records will be kept (imalloc, etc) that the region
-                 *    has been remapped
-                 * 2) It won't be easy to iounmap() the region later (because
-                 *    of 1)
-                 */
-                ;
-        } else {
-                area = im_get_area(ea, size,
-                        IM_REGION_UNUSED|IM_REGION_SUBSET|IM_REGION_EXISTS);
-                if (area == NULL) {
-                        /* Expected when PHB-dlpar is in play */
-                        return 1;
-                }
-                if (ea != (unsigned long) area->addr) {
-                        printk(KERN_ERR "unexpected addr return from "
-                               "im_get_area\n");
-                        return 1;
-                }
-        }
-        
-        ret = __ioremap_com(pa, pa, ea, size, flags);
-        if (ret == NULL) {
-                printk(KERN_ERR "ioremap_explicit() allocation failure !\n");
-                return 1;
-        }
-        if (ret != (void *) ea) {
-                printk(KERN_ERR "__ioremap_com() returned unexpected addr\n");
-                return 1;
-        }
-        return 0;
-}
 /*  
 * Unmap an IO region and remove it from imalloc'd list.
 * Access to IO memory should be serialized by driver.
- * This code is modeled after vmalloc code - unmap_vm_area()
- *
- * XXX  what about calls before mem_init_done (ie python_countermeasures())
 */
 void __iounmap(volatile void __iomem *token)
 {
@@ -251,9 +207,14 @@ void __iounmap(volatile void __iomem *token)
        if (!mem_init_done)
                return;
        
-        addr = (void *) ((unsigned long __force) token & PAGE_MASK);
+        addr = (void *) ((unsigned long __force)
+                         PCI_FIX_ADDR(token) & PAGE_MASK);
-        im_free(addr);
+        if ((unsigned long)addr < ioremap_bot) {
+                printk(KERN_WARNING "Attempt to iounmap early bolted mapping"
+                       " at 0x%p\n", addr);
+                return;
+        }
+        vunmap(addr);
 }
 void iounmap(volatile void __iomem *token)
@@ -264,77 +225,8 @@ void iounmap(volatile void __iomem *token)
                __iounmap(token);
 }
-static int iounmap_subset_regions(unsigned long addr, unsigned long size)
-{
-        struct vm_struct *area;
-        /* Check whether subsets of this region exist */
-        area = im_get_area(addr, size, IM_REGION_SUPERSET);
-        if (area == NULL)
-                return 1;
-        while (area) {
-                iounmap((void __iomem *) area->addr);
-                area = im_get_area(addr, size,
-                                IM_REGION_SUPERSET);
-        }
-        return 0;
-}
-int __iounmap_explicit(volatile void __iomem *start, unsigned long size)
-{
-        struct vm_struct *area;
-        unsigned long addr;
-        int rc;
-        
-        addr = (unsigned long __force) start & PAGE_MASK;
-        /* Verify that the region either exists or is a subset of an existing
-         * region.  In the latter case, split the parent region to create 
-         * the exact region 
-         */
-        area = im_get_area(addr, size, 
-                            IM_REGION_EXISTS | IM_REGION_SUBSET);
-        if (area == NULL) {
-                /* Determine whether subset regions exist.  If so, unmap */
-                rc = iounmap_subset_regions(addr, size);
-                if (rc) {
-                        printk(KERN_ERR
-                               "%s() cannot unmap nonexistent range 0x%lx\n",
-                                __FUNCTION__, addr);
-                        return 1;
-                }
-        } else {
-                iounmap((void __iomem *) area->addr);
-        }
-        /*
-         * FIXME! This can't be right:
-        iounmap(area->addr);
-         * Maybe it should be "iounmap(area);"
-         */
-        return 0;
-}
 EXPORT_SYMBOL(ioremap);
 EXPORT_SYMBOL(ioremap_flags);
 EXPORT_SYMBOL(__ioremap);
 EXPORT_SYMBOL(iounmap);
 EXPORT_SYMBOL(__iounmap);
-static DEFINE_SPINLOCK(phb_io_lock);
-void __iomem * reserve_phb_iospace(unsigned long size)
-{
-        void __iomem *virt_addr;
-                
-        if (phbs_io_bot >= IMALLOC_BASE) 
-                panic("reserve_phb_iospace(): phb io space overflow\n");
-                        
-        spin_lock(&phb_io_lock);
-        virt_addr = (void __iomem *) phbs_io_bot;
-        phbs_io_bot += size;
-        spin_unlock(&phb_io_lock);
-        return virt_addr;
-}
diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c
index ec1421a20a..5c45d474cf 100644
--- a/arch/powerpc/mm/ppc_mmu_32.c
+++ b/arch/powerpc/mm/ppc_mmu_32.c
@@ -11,7 +11,6 @@
 *  Modifications by Paul Mackerras (PowerMac) (paulus@cs.anu.edu.au)
 *  and Cort Dougan (PReP) (cort@cs.nmt.edu)
 *    Copyright (C) 1996 Paul Mackerras
- *  Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
 *
 *  Derived from "arch/i386/mm/init.c"
 *    Copyright (C) 1991, 1992, 1993, 1994  Linus Torvalds
@@ -35,12 +34,12 @@
 #include "mmu_decl.h"
-PTE *Hash, *Hash_end;
+struct hash_pte *Hash, *Hash_end;
 unsigned long Hash_size, Hash_mask;
 unsigned long _SDR1;
 union ubat {                    /* BAT register values to be loaded */
-        BAT     bat;
+        struct ppc_bat bat;
        u32     word[2];
 } BATS[8][2];                   /* 8 pairs of IBAT, DBAT */
@@ -245,7 +244,7 @@ void __init MMU_init_hw(void)
        cacheable_memzero(Hash, Hash_size);
        _SDR1 = __pa(Hash) | SDR1_LOW_BITS;
-        Hash_end = (PTE *) ((unsigned long)Hash + Hash_size);
+        Hash_end = (struct hash_pte *) ((unsigned long)Hash + Hash_size);
        printk("Total memory = %ldMB; using %ldkB for hash table (at %p)\n",
               total_memory >> 20, Hash_size >> 10, Hash);
diff --git a/arch/powerpc/mm/stab.c b/arch/powerpc/mm/stab.c
index 132c6bc66c..28492bbdee 100644
--- a/arch/powerpc/mm/stab.c
+++ b/arch/powerpc/mm/stab.c
@@ -55,7 +55,7 @@ static int make_ste(unsigned long stab, unsigned long esid, unsigned long vsid)
                for (entry = 0; entry < 8; entry++, ste++) {
                        if (!(ste->esid_data & STE_ESID_V)) {
                                ste->vsid_data = vsid_data;
-                                asm volatile("eieio":::"memory");
+                                eieio();
                                ste->esid_data = esid_data;
                                return (global_entry | entry);
                        }
@@ -101,7 +101,7 @@ static int make_ste(unsigned long stab, unsigned long esid, unsigned long vsid)
        asm volatile("sync" : : : "memory");    /* Order update */
        castout_ste->vsid_data = vsid_data;
-        asm volatile("eieio" : : : "memory");   /* Order update */
+        eieio();                                /* Order update */
        castout_ste->esid_data = esid_data;
        asm volatile("slbie  %0" : : "r" (old_esid << SID_SHIFT));
diff --git a/arch/powerpc/mm/tlb_32.c b/arch/powerpc/mm/tlb_32.c
index 6a69417cbc..06c7e77e09 100644
--- a/arch/powerpc/mm/tlb_32.c
+++ b/arch/powerpc/mm/tlb_32.c
@@ -11,7 +11,6 @@
 *  Modifications by Paul Mackerras (PowerMac) (paulus@cs.anu.edu.au)
 *  and Cort Dougan (PReP) (cort@cs.nmt.edu)
 *    Copyright (C) 1996 Paul Mackerras
- *  Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
 *
 *  Derived from "arch/i386/mm/init.c"
 *    Copyright (C) 1991, 1992, 1993, 1994  Linus Torvalds
diff --git a/arch/powerpc/mm/tlb_64.c b/arch/powerpc/mm/tlb_64.c
index 2bfc4d7e1a..cbd34fc813 100644
--- a/arch/powerpc/mm/tlb_64.c
+++ b/arch/powerpc/mm/tlb_64.c
@@ -8,7 +8,6 @@
 *  Modifications by Paul Mackerras (PowerMac) (paulus@cs.anu.edu.au)
 *  and Cort Dougan (PReP) (cort@cs.nmt.edu)
 *    Copyright (C) 1996 Paul Mackerras
- *  Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
 *
 *  Derived from "arch/i386/mm/init.c"
 *    Copyright (C) 1991, 1992, 1993, 1994  Linus Torvalds
@@ -239,3 +238,59 @@ void pte_free_finish(void)
        pte_free_submit(*batchp);
        *batchp = NULL;
 }
+/**
+ * __flush_hash_table_range - Flush all HPTEs for a given address range
+ *                            from the hash table (and the TLB). But keeps
+ *                            the linux PTEs intact.
+ *
+ * @mm          : mm_struct of the target address space (generally init_mm)
+ * @start       : starting address
+ * @end         : ending address (not included in the flush)
+ *
+ * This function is mostly to be used by some IO hotplug code in order
+ * to remove all hash entries from a given address range used to map IO
+ * space on a removed PCI-PCI bidge without tearing down the full mapping
+ * since 64K pages may overlap with other bridges when using 64K pages
+ * with 4K HW pages on IO space.
+ *
+ * Because of that usage pattern, it's only available with CONFIG_HOTPLUG
+ * and is implemented for small size rather than speed.
+ */
+#ifdef CONFIG_HOTPLUG
+void __flush_hash_table_range(struct mm_struct *mm, unsigned long start,
+                              unsigned long end)
+{
+        unsigned long flags;
+        start = _ALIGN_DOWN(start, PAGE_SIZE);
+        end = _ALIGN_UP(end, PAGE_SIZE);
+        BUG_ON(!mm->pgd);
+        /* Note: Normally, we should only ever use a batch within a
+         * PTE locked section. This violates the rule, but will work
+         * since we don't actually modify the PTEs, we just flush the
+         * hash while leaving the PTEs intact (including their reference
+         * to being hashed). This is not the most performance oriented
+         * way to do things but is fine for our needs here.
+         */
+        local_irq_save(flags);
+        arch_enter_lazy_mmu_mode();
+        for (; start < end; start += PAGE_SIZE) {
+                pte_t *ptep = find_linux_pte(mm->pgd, start);
+                unsigned long pte;
+                if (ptep == NULL)
+                        continue;
+                pte = pte_val(*ptep);
+                if (!(pte & _PAGE_HASHPTE))
+                        continue;
+                hpte_need_flush(mm, start, ptep, pte, 0);
+        }
+        arch_leave_lazy_mmu_mode();
+        local_irq_restore(flags);
+}
+#endif /* CONFIG_HOTPLUG */
diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c
index fe597a154d..a7c206b665 100644
--- a/arch/powerpc/oprofile/op_model_power4.c
+++ b/arch/powerpc/oprofile/op_model_power4.c
@@ -1,5 +1,7 @@
 /*
 * Copyright (C) 2004 Anton Blanchard <anton@au.ibm.com>, IBM
+ * Added mmcra[slot] support:
+ * Copyright (C) 2006-2007 Will Schmidt <willschm@us.ibm.com>, IBM
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -181,11 +183,17 @@ static void __attribute_used__ kernel_unknown_bucket(void)
 * On GQ and newer the MMCRA stores the HV and PR bits at the time
 * the SIAR was sampled. We use that to work out if the SIAR was sampled in
 * the hypervisor, our exception vectors or RTAS.
+ * If the MMCRA_SAMPLE_ENABLE bit is set, we can use the MMCRA[slot] bits
+ * to more accurately identify the address of the sampled instruction. The
+ * mmcra[slot] bits represent the slot number of a sampled instruction
+ * within an instruction group.  The slot will contain a value between 1
+ * and 5 if MMCRA_SAMPLE_ENABLE is set, otherwise 0.
 */
 static unsigned long get_pc(struct pt_regs *regs)
 {
        unsigned long pc = mfspr(SPRN_SIAR);
        unsigned long mmcra;
+        unsigned long slot;
        /* Cant do much about it */
        if (!cur_cpu_spec->oprofile_mmcra_sihv)
@@ -193,6 +201,12 @@ static unsigned long get_pc(struct pt_regs *regs)
        mmcra = mfspr(SPRN_MMCRA);
+        if (mmcra & MMCRA_SAMPLE_ENABLE) {
+                slot = ((mmcra & MMCRA_SLOT) >> MMCRA_SLOT_SHIFT);
+                if (slot > 1)
+                        pc += 4 * (slot - 1);
+        }
        /* Were we in the hypervisor? */
        if (firmware_has_feature(FW_FEATURE_LPAR) &&
            (mmcra & cur_cpu_spec->oprofile_mmcra_sihv))
diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c
index f591a9fc19..4be6e7a17b 100644
--- a/arch/powerpc/platforms/52xx/efika.c
+++ b/arch/powerpc/platforms/52xx/efika.c
@@ -54,7 +54,7 @@ static int rtas_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
        struct pci_controller *hose = bus->sysdata;
        unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)
            | (((bus->number - hose->first_busno) & 0xff) << 16)
-            | (hose->index << 24);
+            | (hose->global_number << 24);
        int ret = -1;
        int rval;
@@ -69,7 +69,7 @@ static int rtas_write_config(struct pci_bus *bus, unsigned int devfn,
        struct pci_controller *hose = bus->sysdata;
        unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)
            | (((bus->number - hose->first_busno) & 0xff) << 16)
-            | (hose->index << 24);
+            | (hose->global_number << 24);
        int rval;
        rval = rtas_call(rtas_token("write-pci-config"), 3, 1, NULL,
@@ -83,7 +83,7 @@ static struct pci_ops rtas_pci_ops = {
 };
-void __init efika_pcisetup(void)
+static void __init efika_pcisetup(void)
 {
        const int *bus_range;
        int len;
@@ -128,7 +128,7 @@ void __init efika_pcisetup(void)
        printk(" controlled by %s\n", pcictrl->full_name);
        printk("\n");
-        hose = pcibios_alloc_controller();
+        hose = pcibios_alloc_controller(of_node_get(pcictrl));
        if (!hose) {
                printk(KERN_WARNING EFIKA_PLATFORM_NAME
                       ": Can't allocate PCI controller structure for %s\n",
@@ -136,7 +136,6 @@ void __init efika_pcisetup(void)
                return;
        }
-        hose->arch_data = of_node_get(pcictrl);
        hose->first_busno = bus_range[0];
        hose->last_busno = bus_range[1];
        hose->ops = &rtas_pci_ops;
@@ -145,7 +144,7 @@ void __init efika_pcisetup(void)
 }
 #else
-void __init efika_pcisetup(void)
+static void __init efika_pcisetup(void)
 {}
 #endif
@@ -252,6 +251,8 @@ define_machine(efika)
        .progress               = rtas_progress,
        .get_boot_time          = rtas_get_boot_time,
        .calibrate_decr         = generic_calibrate_decr,
+#ifdef CONFIG_PCI
        .phys_mem_access_prot   = pci_phys_mem_access_prot,
+#endif
 };
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
index 1cfc00dfb9..5c46e898fd 100644
--- a/arch/powerpc/platforms/52xx/lite5200.c
+++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -156,7 +156,7 @@ static void __init lite5200_setup_arch(void)
 }
-void lite5200_show_cpuinfo(struct seq_file *m)
+static void lite5200_show_cpuinfo(struct seq_file *m)
 {
        struct device_node* np = of_find_all_nodes(NULL);
        const char *model = NULL;
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
index 34d34a26d3..4c6c82a684 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
@@ -112,18 +112,18 @@ mpc52xx_pci_read_config(struct pci_bus *bus, unsigned int devfn,
        u32 value;
        if (ppc_md.pci_exclude_device)
-                if (ppc_md.pci_exclude_device(bus->number, devfn))
+                if (ppc_md.pci_exclude_device(hose, bus->number, devfn))
                        return PCIBIOS_DEVICE_NOT_FOUND;
        out_be32(hose->cfg_addr,
                (1 << 31) |
-                ((bus->number - hose->bus_offset) << 16) |
+                (bus->number << 16) |
                (devfn << 8) |
                (offset & 0xfc));
        mb();
 #if defined(CONFIG_PPC_MPC5200_BUGFIX)
-        if (bus->number != hose->bus_offset) {
+        if (bus->number) {
                /* workaround for the bug 435 of the MPC5200 (L25R);
                 * Don't do 32 bits config access during type-1 cycles */
                switch (len) {
@@ -169,18 +169,18 @@ mpc52xx_pci_write_config(struct pci_bus *bus, unsigned int devfn,
        u32 value, mask;
        if (ppc_md.pci_exclude_device)
-                if (ppc_md.pci_exclude_device(bus->number, devfn))
+                if (ppc_md.pci_exclude_device(hose, bus->number, devfn))
                        return PCIBIOS_DEVICE_NOT_FOUND;
        out_be32(hose->cfg_addr,
                (1 << 31) |
-                ((bus->number - hose->bus_offset) << 16) |
+                (bus->number << 16) |
                (devfn << 8) |
                (offset & 0xfc));
        mb();
 #if defined(CONFIG_PPC_MPC5200_BUGFIX)
-        if (bus->number != hose->bus_offset) {
+        if (bus->number) {
                /* workaround for the bug 435 of the MPC5200 (L25R);
                 * Don't do 32 bits config access during type-1 cycles */
                switch (len) {
@@ -385,17 +385,13 @@ mpc52xx_add_bridge(struct device_node *node)
         * tree are needed to configure the 52xx PCI controller.  Rather
         * than parse the tree here, let pci_process_bridge_OF_ranges()
         * do it for us and extract the values after the fact */
-        hose = pcibios_alloc_controller();
+        hose = pcibios_alloc_controller(node);
        if (!hose)
                return -ENOMEM;
-        hose->arch_data = node;
-        hose->set_cfg_type = 1;
        hose->first_busno = bus_range ? bus_range[0] : 0;
        hose->last_busno = bus_range ? bus_range[1] : 0xff;
-        hose->bus_offset = 0;
        hose->ops = &mpc52xx_pci_ops;
        pci_regs = ioremap(rsrc.start, rsrc.end - rsrc.start + 1);
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pm.c b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
index fd40044d16..ee2e7639c6 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
@@ -9,8 +9,8 @@
 /* these are defined in mpc52xx_sleep.S, and only used here */
-extern void mpc52xx_deep_sleep(void *sram, void *sdram_regs,
+extern void mpc52xx_deep_sleep(void __iomem *sram, void __iomem *sdram_regs,
-                struct mpc52xx_cdm *, struct mpc52xx_intr *);
+                struct mpc52xx_cdm __iomem *, struct mpc52xx_intr __iomem*);
 extern void mpc52xx_ds_sram(void);
 extern const long mpc52xx_ds_sram_size;
 extern void mpc52xx_ds_cached(void);
@@ -21,7 +21,7 @@ static void __iomem *sdram;
 static struct mpc52xx_cdm __iomem *cdm;
 static struct mpc52xx_intr __iomem *intr;
 static struct mpc52xx_gpio_wkup __iomem *gpiow;
-static void *sram;
+static void __iomem *sram;
 static int sram_size;
 struct mpc52xx_suspend mpc52xx_suspend;
@@ -100,7 +100,7 @@ int mpc52xx_pm_enter(suspend_state_t state)
        u32 clk_enables;
        u32 msr, hid0;
        u32 intr_main_mask;
-        void __iomem * irq_0x500 = (void *)CONFIG_KERNEL_START + 0x500;
+        void __iomem * irq_0x500 = (void __iomem *)CONFIG_KERNEL_START + 0x500;
        unsigned long irq_0x500_stop = (unsigned long)irq_0x500 + mpc52xx_ds_cached_size;
        char saved_0x500[mpc52xx_ds_cached_size];
diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index de7fce9cb6..89fde43895 100644
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -1,5 +1,5 @@
 choice
-        prompt "Machine Type"
+        prompt "82xx Board Type"
        depends on PPC_82xx
        default MPC82xx_ADS
diff --git a/arch/powerpc/platforms/82xx/mpc82xx_ads.c b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
index 47cb09f080..da20832b27 100644
--- a/arch/powerpc/platforms/82xx/mpc82xx_ads.c
+++ b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
@@ -49,7 +49,7 @@
 #include <linux/fs_enet_pd.h>
 #include <sysdev/fsl_soc.h>
-#include <../sysdev/cpm2_pic.h>
+#include <sysdev/cpm2_pic.h>
 #include "pq2ads.h"
@@ -507,7 +507,8 @@ void m82xx_pci_init_irq(void)
        return;
 }
-static int m82xx_pci_exclude_device(u_char bus, u_char devfn)
+static int m82xx_pci_exclude_device(struct pci_controller *hose,
+                                    u_char bus, u_char devfn)
 {
        if (bus == 0 && PCI_SLOT(devfn) == 0)
                return PCIBIOS_DEVICE_NOT_FOUND;
@@ -515,7 +516,7 @@ static int m82xx_pci_exclude_device(u_char bus, u_char devfn)
                return PCIBIOS_SUCCESSFUL;
 }
-void __init add_bridge(struct device_node *np)
+static void __init mpc82xx_add_bridge(struct device_node *np)
 {
        int len;
        struct pci_controller *hose;
@@ -542,19 +543,13 @@ void __init add_bridge(struct device_node *np)
        pci_assign_all_buses = 1;
-        hose = pcibios_alloc_controller();
+        hose = pcibios_alloc_controller(np);
        if (!hose)
                return;
-        hose->arch_data = np;
-        hose->set_cfg_type = 1;
        hose->first_busno = bus_range ? bus_range[0] : 0;
        hose->last_busno = bus_range ? bus_range[1] : 0xff;
-        hose->bus_offset = 0;
-        hose->set_cfg_type = 1;
        setup_indirect_pci(hose,
                           r.start + offsetof(pci_cpm2_t, pci_cfg_addr),
@@ -584,7 +579,7 @@ static void __init mpc82xx_ads_setup_arch(void)
 #ifdef CONFIG_PCI
        ppc_md.pci_exclude_device = m82xx_pci_exclude_device;
        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
-                add_bridge(np);
+                mpc82xx_add_bridge(np);
        of_node_put(np);
 #endif
diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index 19cafdf6df..ec305f18ab 100644
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -1,5 +1,5 @@
 choice
-        prompt "Machine Type"
+        prompt "83xx Board Type"
        depends on PPC_83xx
        default MPC834x_MDS
diff --git a/arch/powerpc/platforms/83xx/Makefile b/arch/powerpc/platforms/83xx/Makefile
index 31a91b53f5..5a98f88577 100644
--- a/arch/powerpc/platforms/83xx/Makefile
+++ b/arch/powerpc/platforms/83xx/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the PowerPC 83xx linux kernel.
 #
-obj-y                           := misc.o
+obj-y                           := misc.o usb.o
 obj-$(CONFIG_PCI)               += pci.o
 obj-$(CONFIG_MPC8313_RDB)       += mpc8313_rdb.o
 obj-$(CONFIG_MPC832x_RDB)       += mpc832x_rdb.o
diff --git a/arch/powerpc/platforms/83xx/mpc8313_rdb.c b/arch/powerpc/platforms/83xx/mpc8313_rdb.c
index 96970ac887..3edfe170a0 100644
--- a/arch/powerpc/platforms/83xx/mpc8313_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc8313_rdb.c
@@ -28,11 +28,6 @@
 #define DBG(fmt...)
 #endif
-#ifndef CONFIG_PCI
-unsigned long isa_io_base = 0;
-unsigned long isa_mem_base = 0;
-#endif
 /* ************************************************************************
 *
 * Setup the architecture
@@ -49,10 +44,11 @@ static void __init mpc8313_rdb_setup_arch(void)
 #ifdef CONFIG_PCI
        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
-                add_bridge(np);
+                mpc83xx_add_bridge(np);
        ppc_md.pci_exclude_device = mpc83xx_exclude_device;
 #endif
+        mpc831x_usb_cfg();
 }
 void __init mpc8313_rdb_init_IRQ(void)
diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c
index 94843ed52a..b39cb52c6f 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -49,11 +49,6 @@
 #define DBG(fmt...)
 #endif
-#ifndef CONFIG_PCI
-unsigned long isa_io_base = 0;
-unsigned long isa_mem_base = 0;
-#endif
 static u8 *bcsr_regs = NULL;
 /* ************************************************************************
@@ -80,7 +75,7 @@ static void __init mpc832x_sys_setup_arch(void)
 #ifdef CONFIG_PCI
        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
-                add_bridge(np);
+                mpc83xx_add_bridge(np);
        ppc_md.pci_exclude_device = mpc83xx_exclude_device;
 #endif
diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
index 3db68b73fc..b2b28a4473 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
@@ -32,11 +32,6 @@
 #define DBG(fmt...)
 #endif
-#ifndef CONFIG_PCI
-unsigned long isa_io_base = 0;
-unsigned long isa_mem_base = 0;
-#endif
 /* ************************************************************************
 *
 * Setup the architecture
@@ -53,7 +48,7 @@ static void __init mpc832x_rdb_setup_arch(void)
 #ifdef CONFIG_PCI
        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
-                add_bridge(np);
+                mpc83xx_add_bridge(np);
        ppc_md.pci_exclude_device = mpc83xx_exclude_device;
 #endif
diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c
index 40a01947d6..47ba5446f6 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c
@@ -38,11 +38,6 @@
 #include "mpc83xx.h"
-#ifndef CONFIG_PCI
-unsigned long isa_io_base = 0;
-unsigned long isa_mem_base = 0;
-#endif
 /* ************************************************************************
 *
 * Setup the architecture
@@ -59,10 +54,12 @@ static void __init mpc834x_itx_setup_arch(void)
 #ifdef CONFIG_PCI
        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
-                add_bridge(np);
+                mpc83xx_add_bridge(np);
        ppc_md.pci_exclude_device = mpc83xx_exclude_device;
 #endif
+        mpc834x_usb_cfg();
 }
 static void __init mpc834x_itx_init_IRQ(void)
diff --git a/arch/powerpc/platforms/83xx/mpc834x_mds.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c
index 10394b2d7e..4c9ff9cadf 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c
@@ -38,61 +38,17 @@
 #include "mpc83xx.h"
-#ifndef CONFIG_PCI
-unsigned long isa_io_base = 0;
-unsigned long isa_mem_base = 0;
-#endif
 #define BCSR5_INT_USB           0x02
-/* Note: This is only for PB, not for PB+PIB
+static int mpc834xemds_usb_cfg(void)
- * On PB only port0 is connected using ULPI */
-static int mpc834x_usb_cfg(void)
 {
-        unsigned long sccr, sicrl;
+        struct device_node *np;
-        void __iomem *immap;
        void __iomem *bcsr_regs = NULL;
        u8 bcsr5;
-        struct device_node *np = NULL;
-        int port0_is_dr = 0;
-        if ((np = of_find_compatible_node(NULL, "usb", "fsl-usb2-dr")) != NULL)
-                port0_is_dr = 1;
-        if ((np = of_find_compatible_node(NULL, "usb", "fsl-usb2-mph")) != NULL){
-                if (port0_is_dr) {
-                        printk(KERN_WARNING
-                                "There is only one USB port on PB board! \n");
-                        return -1;
-                } else if (!port0_is_dr)
-                        /* No usb port enabled */
-                        return -1;
-        }
-        immap = ioremap(get_immrbase(), 0x1000);
-        if (!immap)
-                return -1;
-        /* Configure clock */
-        sccr = in_be32(immap + MPC83XX_SCCR_OFFS);
-        if (port0_is_dr)
-                sccr |= MPC83XX_SCCR_USB_DRCM_11;  /* 1:3 */
-        else
-                sccr |= MPC83XX_SCCR_USB_MPHCM_11; /* 1:3 */
-        out_be32(immap + MPC83XX_SCCR_OFFS, sccr);
-        /* Configure Pin */
-        sicrl = in_be32(immap + MPC83XX_SICRL_OFFS);
-        /* set port0 only */
-        if (port0_is_dr)
-                sicrl |= MPC83XX_SICRL_USB0;
-        else
-                sicrl &= ~(MPC83XX_SICRL_USB0);
-        out_be32(immap + MPC83XX_SICRL_OFFS, sicrl);
-        iounmap(immap);
+        mpc834x_usb_cfg();
        /* Map BCSR area */
        np = of_find_node_by_name(NULL, "bcsr");
-        if (np != 0) {
+        if (np) {
                struct resource res;
                of_address_to_resource(np, 0, &res);
@@ -129,12 +85,12 @@ static void __init mpc834x_mds_setup_arch(void)
 #ifdef CONFIG_PCI
        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
-                add_bridge(np);
+                mpc83xx_add_bridge(np);
        ppc_md.pci_exclude_device = mpc83xx_exclude_device;
 #endif
-        mpc834x_usb_cfg();
+        mpc834xemds_usb_cfg();
 }
 static void __init mpc834x_mds_init_IRQ(void)
diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c
index bceeff8bbf..0e615fd65c 100644
--- a/arch/powerpc/platforms/83xx/mpc836x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c
@@ -55,11 +55,6 @@
 #define DBG(fmt...)
 #endif
-#ifndef CONFIG_PCI
-unsigned long isa_io_base = 0;
-unsigned long isa_mem_base = 0;
-#endif
 static u8 *bcsr_regs = NULL;
 /* ************************************************************************
@@ -86,7 +81,7 @@ static void __init mpc836x_mds_setup_arch(void)
 #ifdef CONFIG_PCI
        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
-                add_bridge(np);
+                mpc83xx_add_bridge(np);
        ppc_md.pci_exclude_device = mpc83xx_exclude_device;
 #endif
diff --git a/arch/powerpc/platforms/83xx/mpc83xx.h b/arch/powerpc/platforms/83xx/mpc83xx.h
index 9cd03b59c8..589ee55730 100644
--- a/arch/powerpc/platforms/83xx/mpc83xx.h
+++ b/arch/powerpc/platforms/83xx/mpc83xx.h
@@ -3,9 +3,11 @@
 #include <linux/init.h>
 #include <linux/device.h>
+#include <asm/pci-bridge.h>
 /* System Clock Control Register */
 #define MPC83XX_SCCR_OFFS          0xA08
+#define MPC83XX_SCCR_USB_MASK      0x00f00000
 #define MPC83XX_SCCR_USB_MPHCM_11  0x00c00000
 #define MPC83XX_SCCR_USB_MPHCM_01  0x00400000
 #define MPC83XX_SCCR_USB_MPHCM_10  0x00800000
@@ -15,21 +17,43 @@
 /* system i/o configuration register low */
 #define MPC83XX_SICRL_OFFS         0x114
-#define MPC83XX_SICRL_USB0         0x40000000
+#define MPC834X_SICRL_USB_MASK     0x60000000
-#define MPC83XX_SICRL_USB1         0x20000000
+#define MPC834X_SICRL_USB0         0x40000000
+#define MPC834X_SICRL_USB1         0x20000000
+#define MPC831X_SICRL_USB_MASK     0x00000c00
+#define MPC831X_SICRL_USB_ULPI     0x00000800
 /* system i/o configuration register high */
 #define MPC83XX_SICRH_OFFS         0x118
-#define MPC83XX_SICRH_USB_UTMI     0x00020000
+#define MPC834X_SICRH_USB_UTMI     0x00020000
+#define MPC831X_SICRH_USB_MASK     0x000000e0
+#define MPC831X_SICRH_USB_ULPI     0x000000a0
+/* USB Control Register */
+#define FSL_USB2_CONTROL_OFFS      0x500
+#define CONTROL_UTMI_PHY_EN        0x00000200
+#define CONTROL_REFSEL_48MHZ       0x00000080
+#define CONTROL_PHY_CLK_SEL_ULPI   0x00000400
+#define CONTROL_OTG_PORT           0x00000020
+/* USB PORTSC Registers */
+#define FSL_USB2_PORTSC1_OFFS      0x184
+#define FSL_USB2_PORTSC2_OFFS      0x188
+#define PORTSCX_PTW_16BIT          0x10000000
+#define PORTSCX_PTS_UTMI           0x00000000
+#define PORTSCX_PTS_ULPI           0x80000000
 /*
 * Declaration for the various functions exported by the
 * mpc83xx_* files. Mostly for use by mpc83xx_setup
 */
-extern int add_bridge(struct device_node *dev);
+extern int mpc83xx_add_bridge(struct device_node *dev);
-extern int mpc83xx_exclude_device(u_char bus, u_char devfn);
+extern int mpc83xx_exclude_device(struct pci_controller *hose,
+                                  u_char bus, u_char devfn);
 extern void mpc83xx_restart(char *cmd);
 extern long mpc83xx_time_init(void);
+extern int mpc834x_usb_cfg(void);
+extern int mpc831x_usb_cfg(void);
 #endif                          /* __MPC83XX_H__ */
diff --git a/arch/powerpc/platforms/83xx/pci.c b/arch/powerpc/platforms/83xx/pci.c
index 774457d09e..c0e2b89154 100644
--- a/arch/powerpc/platforms/83xx/pci.c
+++ b/arch/powerpc/platforms/83xx/pci.c
@@ -33,19 +33,14 @@
 #define DBG(x...)
 #endif
-int mpc83xx_pci2_busno;
+int mpc83xx_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn)
-int mpc83xx_exclude_device(u_char bus, u_char devfn)
 {
-        if (bus == 0 && PCI_SLOT(devfn) == 0)
+        if ((bus == hose->first_busno) && PCI_SLOT(devfn) == 0)
                return PCIBIOS_DEVICE_NOT_FOUND;
-        if (mpc83xx_pci2_busno)
-                if (bus == (mpc83xx_pci2_busno) && PCI_SLOT(devfn) == 0)
-                        return PCIBIOS_DEVICE_NOT_FOUND;
        return PCIBIOS_SUCCESSFUL;
 }
-int __init add_bridge(struct device_node *dev)
+int __init mpc83xx_add_bridge(struct device_node *dev)
 {
        int len;
        struct pci_controller *hose;
@@ -66,11 +61,10 @@ int __init add_bridge(struct device_node *dev)
                       " bus 0\n", dev->full_name);
        }
-        hose = pcibios_alloc_controller();
+        pci_assign_all_buses = 1;
+        hose = pcibios_alloc_controller(dev);
        if (!hose)
                return -ENOMEM;
-        hose->arch_data = dev;
-        hose->set_cfg_type = 1;
        hose->first_busno = bus_range ? bus_range[0] : 0;
        hose->last_busno = bus_range ? bus_range[1] : 0xff;
@@ -86,8 +80,6 @@ int __init add_bridge(struct device_node *dev)
        if ((rsrc.start & 0xfffff) == 0x8600) {
                setup_indirect_pci(hose, immr + 0x8380, immr + 0x8384);
                primary = 0;
-                hose->bus_offset = hose->first_busno;
-                mpc83xx_pci2_busno = hose->first_busno;
        }
        printk(KERN_INFO "Found MPC83xx PCI host bridge at 0x%016llx. "
diff --git a/arch/powerpc/platforms/83xx/usb.c b/arch/powerpc/platforms/83xx/usb.c
new file mode 100644
index 0000000000..e7fdf013cd
--- /dev/null
+++ b/arch/powerpc/platforms/83xx/usb.c
@@ -0,0 +1,181 @@
+/*
+ * Freescale 83xx USB SOC setup code
+ *
+ * Copyright (C) 2007 Freescale Semiconductor, Inc.
+ * Author: Li Yang
+ *
+ * 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.
+ */
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <asm/io.h>
+#include <asm/prom.h>
+#include <sysdev/fsl_soc.h>
+#include "mpc83xx.h"
+#ifdef CONFIG_MPC834x
+int mpc834x_usb_cfg(void)
+{
+        unsigned long sccr, sicrl, sicrh;
+        void __iomem *immap;
+        struct device_node *np = NULL;
+        int port0_is_dr = 0, port1_is_dr = 0;
+        const void *prop, *dr_mode;
+        immap = ioremap(get_immrbase(), 0x1000);
+        if (!immap)
+                return -ENOMEM;
+        /* Read registers */
+        /* Note: DR and MPH must use the same clock setting in SCCR */
+        sccr = in_be32(immap + MPC83XX_SCCR_OFFS) & ~MPC83XX_SCCR_USB_MASK;
+        sicrl = in_be32(immap + MPC83XX_SICRL_OFFS) & ~MPC834X_SICRL_USB_MASK;
+        sicrh = in_be32(immap + MPC83XX_SICRH_OFFS) & ~MPC834X_SICRH_USB_UTMI;
+        np = of_find_compatible_node(NULL, "usb", "fsl-usb2-dr");
+        if (np) {
+                sccr |= MPC83XX_SCCR_USB_DRCM_11;  /* 1:3 */
+                prop = of_get_property(np, "phy_type", NULL);
+                if (prop && (!strcmp(prop, "utmi") ||
+                                        !strcmp(prop, "utmi_wide"))) {
+                        sicrl |= MPC834X_SICRL_USB0 | MPC834X_SICRL_USB1;
+                        sicrh |= MPC834X_SICRH_USB_UTMI;
+                        port1_is_dr = 1;
+                } else if (prop && !strcmp(prop, "serial")) {
+                        dr_mode = of_get_property(np, "dr_mode", NULL);
+                        if (dr_mode && !strcmp(dr_mode, "otg")) {
+                                sicrl |= MPC834X_SICRL_USB0 | MPC834X_SICRL_USB1;
+                                port1_is_dr = 1;
+                        } else {
+                                sicrl |= MPC834X_SICRL_USB0;
+                        }
+                } else if (prop && !strcmp(prop, "ulpi")) {
+                        sicrl |= MPC834X_SICRL_USB0;
+                } else {
+                        printk(KERN_WARNING "834x USB PHY type not supported\n");
+                }
+                port0_is_dr = 1;
+                of_node_put(np);
+        }
+        np = of_find_compatible_node(NULL, "usb", "fsl-usb2-mph");
+        if (np) {
+                sccr |= MPC83XX_SCCR_USB_MPHCM_11; /* 1:3 */
+                prop = of_get_property(np, "port0", NULL);
+                if (prop) {
+                        if (port0_is_dr)
+                                printk(KERN_WARNING
+                                        "834x USB port0 can't be used by both DR and MPH!\n");
+                        sicrl |= MPC834X_SICRL_USB0;
+                }
+                prop = of_get_property(np, "port1", NULL);
+                if (prop) {
+                        if (port1_is_dr)
+                                printk(KERN_WARNING
+                                        "834x USB port1 can't be used by both DR and MPH!\n");
+                        sicrl |= MPC834X_SICRL_USB1;
+                }
+                of_node_put(np);
+        }
+        /* Write back */
+        out_be32(immap + MPC83XX_SCCR_OFFS, sccr);
+        out_be32(immap + MPC83XX_SICRL_OFFS, sicrl);
+        out_be32(immap + MPC83XX_SICRH_OFFS, sicrh);
+        iounmap(immap);
+        return 0;
+}
+#endif /* CONFIG_MPC834x */
+#ifdef CONFIG_PPC_MPC831x
+int mpc831x_usb_cfg(void)
+{
+        u32 temp;
+        void __iomem *immap, *usb_regs;
+        struct device_node *np = NULL;
+        const void *prop;
+        struct resource res;
+        int ret = 0;
+#ifdef CONFIG_USB_OTG
+        const void *dr_mode;
+#endif
+        np = of_find_compatible_node(NULL, "usb", "fsl-usb2-dr");
+        if (!np)
+                return -ENODEV;
+        prop = of_get_property(np, "phy_type", NULL);
+        /* Map IMMR space for pin and clock settings */
+        immap = ioremap(get_immrbase(), 0x1000);
+        if (!immap) {
+                of_node_put(np);
+                return -ENOMEM;
+        }
+        /* Configure clock */
+        temp = in_be32(immap + MPC83XX_SCCR_OFFS);
+        temp &= ~MPC83XX_SCCR_USB_MASK;
+        temp |= MPC83XX_SCCR_USB_DRCM_11;  /* 1:3 */
+        out_be32(immap + MPC83XX_SCCR_OFFS, temp);
+        /* Configure pin mux for ULPI.  There is no pin mux for UTMI */
+        if (!strcmp(prop, "ulpi")) {
+                temp = in_be32(immap + MPC83XX_SICRL_OFFS);
+                temp &= ~MPC831X_SICRL_USB_MASK;
+                temp |= MPC831X_SICRL_USB_ULPI;
+                out_be32(immap + MPC83XX_SICRL_OFFS, temp);
+                temp = in_be32(immap + MPC83XX_SICRH_OFFS);
+                temp &= ~MPC831X_SICRH_USB_MASK;
+                temp |= MPC831X_SICRH_USB_ULPI;
+                out_be32(immap + MPC83XX_SICRH_OFFS, temp);
+        }
+        iounmap(immap);
+        /* Map USB SOC space */
+        ret = of_address_to_resource(np, 0, &res);
+        if (ret) {
+                of_node_put(np);
+                return ret;
+        }
+        usb_regs = ioremap(res.start, res.end - res.start + 1);
+        /* Using on-chip PHY */
+        if (!strcmp(prop, "utmi_wide") ||
+                        !strcmp(prop, "utmi")) {
+                /* Set UTMI_PHY_EN, REFSEL to 48MHZ */
+                out_be32(usb_regs + FSL_USB2_CONTROL_OFFS,
+                                CONTROL_UTMI_PHY_EN | CONTROL_REFSEL_48MHZ);
+        /* Using external UPLI PHY */
+        } else if (!strcmp(prop, "ulpi")) {
+                /* Set PHY_CLK_SEL to ULPI */
+                temp = CONTROL_PHY_CLK_SEL_ULPI;
+#ifdef CONFIG_USB_OTG
+                /* Set OTG_PORT */
+                dr_mode = of_get_property(np, "dr_mode", NULL);
+                if (dr_mode && !strcmp(dr_mode, "otg"))
+                        temp |= CONTROL_OTG_PORT;
+#endif /* CONFIG_USB_OTG */
+                out_be32(usb_regs + FSL_USB2_CONTROL_OFFS, temp);
+        } else {
+                printk(KERN_WARNING "831x USB PHY type not supported\n");
+                ret = -EINVAL;
+        }
+        iounmap(usb_regs);
+        of_node_put(np);
+        return ret;
+}
+#endif /* CONFIG_PPC_MPC831x */
diff --git a/arch/powerpc/platforms/85xx/misc.c b/arch/powerpc/platforms/85xx/misc.c
index 3e62fcb04c..4fe376e9c3 100644
--- a/arch/powerpc/platforms/85xx/misc.c
+++ b/arch/powerpc/platforms/85xx/misc.c
@@ -13,11 +13,43 @@
 #include <linux/irq.h>
 #include <linux/module.h>
 #include <asm/irq.h>
+#include <asm/io.h>
+#include <asm/prom.h>
+#include <sysdev/fsl_soc.h>
+static __be32 __iomem *rstcr;
 extern void abort(void);
+static int __init mpc85xx_rstcr(void)
+{
+        struct device_node *np;
+        np = of_find_node_by_name(NULL, "global-utilities");
+        if ((np && of_get_property(np, "fsl,has-rstcr", NULL))) {
+                const u32 *prop = of_get_property(np, "reg", NULL);
+                if (prop) {
+                        /* map reset control register
+                         * 0xE00B0 is offset of reset control register
+                         */
+                        rstcr = ioremap(get_immrbase() + *prop + 0xB0, 0xff);
+                        if (!rstcr)
+                                printk (KERN_EMERG "Error: reset control "
+                                                "register not mapped!\n");
+                }
+        } else
+                printk (KERN_INFO "rstcr compatible register does not exist!\n");
+        if (np)
+                of_node_put(np);
+        return 0;
+}
+arch_initcall(mpc85xx_rstcr);
 void mpc85xx_restart(char *cmd)
 {
        local_irq_disable();
+        if (rstcr)
+                /* set reset control register */
+                out_be32(rstcr, 0x2);   /* HRESET_REQ */
        abort();
 }
diff --git a/arch/powerpc/platforms/85xx/mpc8544_ds.c b/arch/powerpc/platforms/85xx/mpc8544_ds.c
index bec84ffe70..6fb90aab87 100644
--- a/arch/powerpc/platforms/85xx/mpc8544_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc8544_ds.c
@@ -61,24 +61,11 @@ void __init mpc8544_ds_pic_init(void)
                return;
        }
-        /* Alloc mpic structure and per isu has 16 INT entries. */
        mpic = mpic_alloc(np, r.start,
                          MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
-                          16, 64, " OPENPIC     ");
+                        0, 256, " OpenPIC  ");
        BUG_ON(mpic == NULL);
-        /*
-         * 48 Internal Interrupts
-         */
-        mpic_assign_isu(mpic, 0, r.start + 0x10200);
-        mpic_assign_isu(mpic, 1, r.start + 0x10400);
-        mpic_assign_isu(mpic, 2, r.start + 0x10600);
-        /*
-         * 16 External interrupts
-         */
-        mpic_assign_isu(mpic, 3, r.start + 0x10000);
        mpic_init(mpic);
 #ifdef CONFIG_PPC_I8259
diff --git a/arch/powerpc/platforms/85xx/mpc85xx.h b/arch/powerpc/platforms/85xx/mpc85xx.h
index 83415db333..7286ffac2c 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx.h
+++ b/arch/powerpc/platforms/85xx/mpc85xx.h
@@ -15,4 +15,4 @@
 */
 extern void mpc85xx_restart(char *);
-extern int add_bridge(struct device_node *dev);
+extern int mpc85xx_add_bridge(struct device_node *dev);
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index 5d27621f09..7235f70239 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -38,13 +38,9 @@
 #include <asm/fs_pd.h>
 #endif
-#ifndef CONFIG_PCI
-unsigned long isa_io_base = 0;
-unsigned long isa_mem_base = 0;
-#endif
 #ifdef CONFIG_PCI
-static int mpc85xx_exclude_device(u_char bus, u_char devfn)
+static int mpc85xx_exclude_device(struct pci_controller *hose,
+                                   u_char bus, u_char devfn)
 {
        if (bus == 0 && PCI_SLOT(devfn) == 0)
                return PCIBIOS_DEVICE_NOT_FOUND;
@@ -91,30 +87,10 @@ static void __init mpc85xx_ads_pic_init(void)
        mpic = mpic_alloc(np, r.start,
                        MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
-                        4, 0, " OpenPIC  ");
+                        0, 256, " OpenPIC  ");
        BUG_ON(mpic == NULL);
        of_node_put(np);
-        mpic_assign_isu(mpic, 0, r.start + 0x10200);
-        mpic_assign_isu(mpic, 1, r.start + 0x10280);
-        mpic_assign_isu(mpic, 2, r.start + 0x10300);
-        mpic_assign_isu(mpic, 3, r.start + 0x10380);
-        mpic_assign_isu(mpic, 4, r.start + 0x10400);
-        mpic_assign_isu(mpic, 5, r.start + 0x10480);
-        mpic_assign_isu(mpic, 6, r.start + 0x10500);
-        mpic_assign_isu(mpic, 7, r.start + 0x10580);
-        /* Unused on this platform (leave room for 8548) */
-        mpic_assign_isu(mpic, 8, r.start + 0x10600);
-        mpic_assign_isu(mpic, 9, r.start + 0x10680);
-        mpic_assign_isu(mpic, 10, r.start + 0x10700);
-        mpic_assign_isu(mpic, 11, r.start + 0x10780);
-        /* External Interrupts */
-        mpic_assign_isu(mpic, 12, r.start + 0x10000);
-        mpic_assign_isu(mpic, 13, r.start + 0x10080);
-        mpic_assign_isu(mpic, 14, r.start + 0x10100);
        mpic_init(mpic);
 #ifdef CONFIG_CPM2
@@ -241,7 +217,7 @@ static void __init mpc85xx_ads_setup_arch(void)
 #ifdef CONFIG_PCI
        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
-                add_bridge(np);
+                mpc85xx_add_bridge(np);
        ppc_md.pci_exclude_device = mpc85xx_exclude_device;
 #endif
 }
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 1490eb3ce0..50c8d64583 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -47,11 +47,6 @@
 #include <sysdev/fsl_soc.h>
 #include "mpc85xx.h"
-#ifndef CONFIG_PCI
-unsigned long isa_io_base = 0;
-unsigned long isa_mem_base = 0;
-#endif
 static int cds_pci_slot = 2;
 static volatile u8 *cadmus;
@@ -60,15 +55,11 @@ static volatile u8 *cadmus;
 #define ARCADIA_HOST_BRIDGE_IDSEL       17
 #define ARCADIA_2ND_BRIDGE_IDSEL        3
-extern int mpc85xx_pci2_busno;
+static int mpc85xx_exclude_device(struct pci_controller *hose,
+                                  u_char bus, u_char devfn)
-static int mpc85xx_exclude_device(u_char bus, u_char devfn)
 {
-        if (bus == 0 && PCI_SLOT(devfn) == 0)
+        if ((bus == hose->first_busno) && PCI_SLOT(devfn) == 0)
                return PCIBIOS_DEVICE_NOT_FOUND;
-        if (mpc85xx_pci2_busno)
-                if (bus == (mpc85xx_pci2_busno) && PCI_SLOT(devfn) == 0)
-                        return PCIBIOS_DEVICE_NOT_FOUND;
        /* We explicitly do not go past the Tundra 320 Bridge */
        if ((bus == 1) && (PCI_SLOT(devfn) == ARCADIA_2ND_BRIDGE_IDSEL))
                return PCIBIOS_DEVICE_NOT_FOUND;
@@ -78,52 +69,44 @@ static int mpc85xx_exclude_device(u_char bus, u_char devfn)
                return PCIBIOS_SUCCESSFUL;
 }
-static void __init mpc85xx_cds_pcibios_fixup(void)
+static void __init mpc85xx_cds_pci_irq_fixup(struct pci_dev *dev)
 {
-        struct pci_dev *dev;
+        u_char c;
-        u_char          c;
+        if (dev->vendor == PCI_VENDOR_ID_VIA) {
+                switch (dev->device) {
-        if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,
+                case PCI_DEVICE_ID_VIA_82C586_1:
-                                        PCI_DEVICE_ID_VIA_82C586_1, NULL))) {
+                        /*
+                         * U-Boot does not set the enable bits
+                         * for the IDE device. Force them on here.
+                         */
+                        pci_read_config_byte(dev, 0x40, &c);
+                        c |= 0x03; /* IDE: Chip Enable Bits */
+                        pci_write_config_byte(dev, 0x40, c);
+                        /*
+                         * Since only primary interface works, force the
+                         * IDE function to standard primary IDE interrupt
+                         * w/ 8259 offset
+                         */
+                        dev->irq = 14;
+                        pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
+                        break;
                /*
-                 * U-Boot does not set the enable bits
+                 * Force legacy USB interrupt routing
-                 * for the IDE device. Force them on here.
                 */
-                pci_read_config_byte(dev, 0x40, &c);
+                case PCI_DEVICE_ID_VIA_82C586_2:
-                c |= 0x03; /* IDE: Chip Enable Bits */
+                /* There are two USB controllers.
-                pci_write_config_byte(dev, 0x40, c);
+                 * Identify them by functon number
-                /*
-                 * Since only primary interface works, force the
-                 * IDE function to standard primary IDE interrupt
-                 * w/ 8259 offset
                 */
-                dev->irq = 14;
+                        if (PCI_FUNC(dev->devfn))
-                pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
+                                dev->irq = 11;
-                pci_dev_put(dev);
+                        else
-        }
+                                dev->irq = 10;
+                        pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
-        /*
+                default:
-         * Force legacy USB interrupt routing
+                        break;
-         */
+                }
-        if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,
-                                        PCI_DEVICE_ID_VIA_82C586_2, NULL))) {
-                dev->irq = 10;
-                pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 10);
-                pci_dev_put(dev);
-        }
-        if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,
-                                        PCI_DEVICE_ID_VIA_82C586_2, dev))) {
-                dev->irq = 11;
-                pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 11);
-                pci_dev_put(dev);
        }
-        /* Now map all the PCI irqs */
-        dev = NULL;
-        for_each_pci_dev(dev)
-                pci_read_irq_line(dev);
 }
 #ifdef CONFIG_PPC_I8259
@@ -165,33 +148,12 @@ static void __init mpc85xx_cds_pic_init(void)
        mpic = mpic_alloc(np, r.start,
                        MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
-                        4, 0, " OpenPIC  ");
+                        0, 256, " OpenPIC  ");
        BUG_ON(mpic == NULL);
        /* Return the mpic node */
        of_node_put(np);
-        mpic_assign_isu(mpic, 0, r.start + 0x10200);
-        mpic_assign_isu(mpic, 1, r.start + 0x10280);
-        mpic_assign_isu(mpic, 2, r.start + 0x10300);
-        mpic_assign_isu(mpic, 3, r.start + 0x10380);
-        mpic_assign_isu(mpic, 4, r.start + 0x10400);
-        mpic_assign_isu(mpic, 5, r.start + 0x10480);
-        mpic_assign_isu(mpic, 6, r.start + 0x10500);
-        mpic_assign_isu(mpic, 7, r.start + 0x10580);
-        /* Used only for 8548 so far, but no harm in
-         * allocating them for everyone */
-        mpic_assign_isu(mpic, 8, r.start + 0x10600);
-        mpic_assign_isu(mpic, 9, r.start + 0x10680);
-        mpic_assign_isu(mpic, 10, r.start + 0x10700);
-        mpic_assign_isu(mpic, 11, r.start + 0x10780);
-        /* External Interrupts */
-        mpic_assign_isu(mpic, 12, r.start + 0x10000);
-        mpic_assign_isu(mpic, 13, r.start + 0x10080);
-        mpic_assign_isu(mpic, 14, r.start + 0x10100);
        mpic_init(mpic);
 #ifdef CONFIG_PPC_I8259
@@ -257,9 +219,9 @@ static void __init mpc85xx_cds_setup_arch(void)
 #ifdef CONFIG_PCI
        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
-                add_bridge(np);
+                mpc85xx_add_bridge(np);
-        ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup;
+        ppc_md.pci_irq_fixup = mpc85xx_cds_pci_irq_fixup;
        ppc_md.pci_exclude_device = mpc85xx_exclude_device;
 #endif
 }
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index e3dddbfe66..004b80bd0b 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -59,11 +59,6 @@
 #define DBG(fmt...)
 #endif
-#ifndef CONFIG_PCI
-unsigned long isa_io_base = 0;
-unsigned long isa_mem_base = 0;
-#endif
 /* ************************************************************************
 *
 * Setup the architecture
@@ -100,7 +95,7 @@ static void __init mpc85xx_mds_setup_arch(void)
 #ifdef CONFIG_PCI
        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) {
-                add_bridge(np);
+                mpc85xx_add_bridge(np);
        }
        of_node_put(np);
 #endif
@@ -181,29 +176,10 @@ static void __init mpc85xx_mds_pic_init(void)
        mpic = mpic_alloc(np, r.start,
                        MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
-                        4, 0, " OpenPIC  ");
+                        0, 256, " OpenPIC  ");
        BUG_ON(mpic == NULL);
        of_node_put(np);
-        /* Internal Interrupts */
-        mpic_assign_isu(mpic, 0, r.start + 0x10200);
-        mpic_assign_isu(mpic, 1, r.start + 0x10280);
-        mpic_assign_isu(mpic, 2, r.start + 0x10300);
-        mpic_assign_isu(mpic, 3, r.start + 0x10380);
-        mpic_assign_isu(mpic, 4, r.start + 0x10400);
-        mpic_assign_isu(mpic, 5, r.start + 0x10480);
-        mpic_assign_isu(mpic, 6, r.start + 0x10500);
-        mpic_assign_isu(mpic, 7, r.start + 0x10580);
-        mpic_assign_isu(mpic, 8, r.start + 0x10600);
-        mpic_assign_isu(mpic, 9, r.start + 0x10680);
-        mpic_assign_isu(mpic, 10, r.start + 0x10700);
-        mpic_assign_isu(mpic, 11, r.start + 0x10780);
-        /* External Interrupts */
-        mpic_assign_isu(mpic, 12, r.start + 0x10000);
-        mpic_assign_isu(mpic, 13, r.start + 0x10080);
-        mpic_assign_isu(mpic, 14, r.start + 0x10100);
        mpic_init(mpic);
 #ifdef CONFIG_QUICC_ENGINE
diff --git a/arch/powerpc/platforms/85xx/pci.c b/arch/powerpc/platforms/85xx/pci.c
index 48f17e23d7..8118417b73 100644
--- a/arch/powerpc/platforms/85xx/pci.c
+++ b/arch/powerpc/platforms/85xx/pci.c
@@ -33,10 +33,8 @@
 #define DBG(x...)
 #endif
-int mpc85xx_pci2_busno = 0;
 #ifdef CONFIG_PCI
-int __init add_bridge(struct device_node *dev)
+int __init mpc85xx_add_bridge(struct device_node *dev)
 {
        int len;
        struct pci_controller *hose;
@@ -57,11 +55,10 @@ int __init add_bridge(struct device_node *dev)
                       " bus 0\n", dev->full_name);
        }
-        hose = pcibios_alloc_controller();
+        pci_assign_all_buses = 1;
+        hose = pcibios_alloc_controller(dev);
        if (!hose)
                return -ENOMEM;
-        hose->arch_data = dev;
-        hose->set_cfg_type = 1;
        hose->first_busno = bus_range ? bus_range[0] : 0;
        hose->last_busno = bus_range ? bus_range[1] : 0xff;
@@ -74,8 +71,6 @@ int __init add_bridge(struct device_node *dev)
        if ((rsrc.start & 0xfffff) == 0x9000) {
                setup_indirect_pci(hose, immr + 0x9000, immr + 0x9004);
                primary = 0;
-                hose->bus_offset = hose->first_busno;
-                mpc85xx_pci2_busno = hose->first_busno;
        }
        printk(KERN_INFO "Found MPC85xx PCI host bridge at 0x%016llx. "
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index d1bcff5004..0faebfdc15 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -1,5 +1,5 @@
 choice
-        prompt "Machine Type"
+        prompt "86xx Board Type"
        depends on PPC_86xx
        default MPC8641_HPCN
diff --git a/arch/powerpc/platforms/86xx/mpc86xx.h b/arch/powerpc/platforms/86xx/mpc86xx.h
index 2834462590..23f7ed2a7f 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx.h
+++ b/arch/powerpc/platforms/86xx/mpc86xx.h
@@ -15,15 +15,10 @@
 * mpc86xx_* files. Mostly for use by mpc86xx_setup().
 */
-extern int add_bridge(struct device_node *dev);
+extern int mpc86xx_add_bridge(struct device_node *dev);
-extern int mpc86xx_exclude_device(u_char bus, u_char devfn);
+extern int mpc86xx_exclude_device(struct pci_controller *hose,
+                                  u_char bus, u_char devfn);
-extern void setup_indirect_pcie(struct pci_controller *hose,
-                                       u32 cfg_addr, u32 cfg_data);
-extern void setup_indirect_pcie_nomap(struct pci_controller *hose,
-                                             void __iomem *cfg_addr,
-                                             void __iomem *cfg_data);
 extern void __init mpc86xx_smp_init(void);
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 1051702c8d..5b01ec7c13 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -44,13 +44,6 @@
 #define DBG(fmt...) do { } while(0)
 #endif
-#ifndef CONFIG_PCI
-unsigned long isa_io_base = 0;
-unsigned long isa_mem_base = 0;
-unsigned long pci_dram_offset = 0;
-#endif
 #ifdef CONFIG_PCI
 static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
 {
@@ -81,22 +74,9 @@ mpc86xx_hpcn_init_irq(void)
        /* Alloc mpic structure and per isu has 16 INT entries. */
        mpic1 = mpic_alloc(np, res.start,
                        MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
-                        16, NR_IRQS - 4,
+                        0, 256, " MPIC     ");
-                        " MPIC     ");
        BUG_ON(mpic1 == NULL);
-        mpic_assign_isu(mpic1, 0, res.start + 0x10000);
-        /* 48 Internal Interrupts */
-        mpic_assign_isu(mpic1, 1, res.start + 0x10200);
-        mpic_assign_isu(mpic1, 2, res.start + 0x10400);
-        mpic_assign_isu(mpic1, 3, res.start + 0x10600);
-        /* 16 External interrupts
-         * Moving them from [0 - 15] to [64 - 79]
-         */
-        mpic_assign_isu(mpic1, 4, res.start + 0x10000);
        mpic_init(mpic1);
 #ifdef CONFIG_PCI
@@ -319,6 +299,7 @@ static void __devinit quirk_uli5229(struct pci_dev *dev)
 {
        unsigned short temp;
        pci_write_config_word(dev, 0x04, 0x0405);
+        dev->class &= ~0x5;
        pci_read_config_word(dev, 0x4a, &temp);
        temp |= 0x1000;
        pci_write_config_word(dev, 0x4a, temp);
@@ -364,9 +345,7 @@ mpc86xx_hpcn_setup_arch(void)
 #ifdef CONFIG_PCI
        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
-                add_bridge(np);
+                mpc86xx_add_bridge(np);
-        ppc_md.pci_exclude_device = mpc86xx_exclude_device;
 #endif
        printk("MPC86xx HPCN board from Freescale Semiconductor\n");
diff --git a/arch/powerpc/platforms/86xx/pci.c b/arch/powerpc/platforms/86xx/pci.c
index 8235c56266..73cd5b05a8 100644
--- a/arch/powerpc/platforms/86xx/pci.c
+++ b/arch/powerpc/platforms/86xx/pci.c
@@ -122,7 +122,6 @@ static void __init
 mpc86xx_setup_pcie(struct pci_controller *hose, u32 pcie_offset, u32 pcie_size)
 {
        u16 cmd;
-        unsigned int temps;
        DBG("PCIE host controller register offset 0x%08x, size 0x%08x.\n",
                        pcie_offset, pcie_size);
@@ -133,22 +132,49 @@ mpc86xx_setup_pcie(struct pci_controller *hose, u32 pcie_offset, u32 pcie_size)
        early_write_config_word(hose, 0, 0, PCI_COMMAND, cmd);
        early_write_config_byte(hose, 0, 0, PCI_LATENCY_TIMER, 0x80);
-        /* PCIE Bus, Fix the MPC8641D host bridge's location to bus 0xFF. */
-        early_read_config_dword(hose, 0, 0, PCI_PRIMARY_BUS, &temps);
-        temps = (temps & 0xff000000) | (0xff) | (0x0 << 8) | (0xfe << 16);
-        early_write_config_dword(hose, 0, 0, PCI_PRIMARY_BUS, temps);
 }
-int mpc86xx_exclude_device(u_char bus, u_char devfn)
+static void __devinit quirk_fsl_pcie_transparent(struct pci_dev *dev)
 {
-        if (bus == 0 && PCI_SLOT(devfn) == 0)
+        struct resource *res;
-                return PCIBIOS_DEVICE_NOT_FOUND;
+        int i, res_idx = PCI_BRIDGE_RESOURCES;
+        struct pci_controller *hose;
-        return PCIBIOS_SUCCESSFUL;
+        /*
+         * Make the bridge be transparent.
+         */
+        dev->transparent = 1;
+        hose = pci_bus_to_host(dev->bus);
+        if (!hose) {
+                printk(KERN_ERR "Can't find hose for bus %d\n",
+                       dev->bus->number);
+                return;
+        }
+        if (hose->io_resource.flags) {
+                res = &dev->resource[res_idx++];
+                res->start = hose->io_resource.start;
+                res->end = hose->io_resource.end;
+                res->flags = hose->io_resource.flags;
+        }
+        for (i = 0; i < 3; i++) {
+                res = &dev->resource[res_idx + i];
+                res->start = hose->mem_resources[i].start;
+                res->end = hose->mem_resources[i].end;
+                res->flags = hose->mem_resources[i].flags;
+        }
 }
-int __init add_bridge(struct device_node *dev)
+DECLARE_PCI_FIXUP_EARLY(0x1957, 0x7010, quirk_fsl_pcie_transparent);
+DECLARE_PCI_FIXUP_EARLY(0x1957, 0x7011, quirk_fsl_pcie_transparent);
+#define PCIE_LTSSM      0x404   /* PCIe Link Training and Status */
+#define PCIE_LTSSM_L0   0x16    /* L0 state */
+int __init mpc86xx_add_bridge(struct device_node *dev)
 {
        int len;
        struct pci_controller *hose;
@@ -156,6 +182,7 @@ int __init add_bridge(struct device_node *dev)
        const int *bus_range;
        int has_address = 0;
        int primary = 0;
+        u16 val;
        DBG("Adding PCIE host bridge %s\n", dev->full_name);
@@ -168,17 +195,23 @@ int __init add_bridge(struct device_node *dev)
                printk(KERN_WARNING "Can't get bus-range for %s, assume"
                       " bus 0\n", dev->full_name);
-        hose = pcibios_alloc_controller();
+        pci_assign_all_buses = 1;
+        hose = pcibios_alloc_controller(dev);
        if (!hose)
                return -ENOMEM;
-        hose->arch_data = dev;
-        hose->set_cfg_type = 1;
-        /* last_busno = 0xfe cause by MPC8641 PCIE bug */
+        hose->indirect_type = PPC_INDIRECT_TYPE_EXT_REG |
+                                PPC_INDIRECT_TYPE_SURPRESS_PRIMARY_BUS;
        hose->first_busno = bus_range ? bus_range[0] : 0x0;
-        hose->last_busno = bus_range ? bus_range[1] : 0xfe;
+        hose->last_busno = bus_range ? bus_range[1] : 0xff;
+        setup_indirect_pci(hose, rsrc.start, rsrc.start + 0x4);
-        setup_indirect_pcie(hose, rsrc.start, rsrc.start + 0x4);
+        /* Probe the hose link training status */
+        early_read_config_word(hose, 0, 0, PCIE_LTSSM, &val);
+        if (val < PCIE_LTSSM_L0)
+                return -ENXIO;
        /* Setup the PCIE host controller. */
        mpc86xx_setup_pcie(hose, rsrc.start, rsrc.end - rsrc.start + 1);
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c
index 0901dbada3..f1693550c7 100644
--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -32,6 +32,7 @@
 #include <linux/root_dev.h>
 #include <linux/time.h>
 #include <linux/rtc.h>
+#include <linux/fsl_devices.h>
 #include <asm/mmu.h>
 #include <asm/reg.h>
@@ -49,6 +50,10 @@
 #include "sysdev/mpc8xx_pic.h"
+#ifdef CONFIG_PCMCIA_M8XX
+struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;
+#endif
 void m8xx_calibrate_decr(void);
 extern void m8xx_wdt_handler_install(bd_t *bp);
 extern int cpm_pic_init(void);
diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
index c36e475d93..5a808d611a 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@ -22,6 +22,7 @@
 #include <linux/fs_enet_pd.h>
 #include <linux/fs_uart_pd.h>
+#include <linux/fsl_devices.h>
 #include <linux/mii.h>
 #include <asm/delay.h>
@@ -39,7 +40,7 @@
 #include <asm/prom.h>
 extern void cpm_reset(void);
-extern void mpc8xx_show_cpuinfo(struct seq_file*);
+extern void mpc8xx_show_cpuinfo(struct seq_file *);
 extern void mpc8xx_restart(char *cmd);
 extern void mpc8xx_calibrate_decr(void);
 extern int mpc8xx_set_rtc_time(struct rtc_time *tm);
@@ -47,9 +48,73 @@ extern void mpc8xx_get_rtc_time(struct rtc_time *tm);
 extern void m8xx_pic_init(void);
 extern unsigned int mpc8xx_get_irq(void);
-static void init_smc1_uart_ioports(struct fs_uart_platform_info* fpi);
+static void init_smc1_uart_ioports(struct fs_uart_platform_info *fpi);
-static void init_smc2_uart_ioports(struct fs_uart_platform_info* fpi);
+static void init_smc2_uart_ioports(struct fs_uart_platform_info *fpi);
-static void init_scc3_ioports(struct fs_platform_info* ptr);
+static void init_scc3_ioports(struct fs_platform_info *ptr);
+#ifdef CONFIG_PCMCIA_M8XX
+static void pcmcia_hw_setup(int slot, int enable)
+{
+        unsigned *bcsr_io;
+        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
+        if (enable)
+                clrbits32(bcsr_io, BCSR1_PCCEN);
+        else
+                setbits32(bcsr_io, BCSR1_PCCEN);
+        iounmap(bcsr_io);
+}
+static int pcmcia_set_voltage(int slot, int vcc, int vpp)
+{
+        u32 reg = 0;
+        unsigned *bcsr_io;
+        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
+        switch (vcc) {
+        case 0:
+                break;
+        case 33:
+                reg |= BCSR1_PCCVCC0;
+                break;
+        case 50:
+                reg |= BCSR1_PCCVCC1;
+                break;
+        default:
+                return 1;
+        }
+        switch (vpp) {
+        case 0:
+                break;
+        case 33:
+        case 50:
+                if (vcc == vpp)
+                        reg |= BCSR1_PCCVPP1;
+                else
+                        return 1;
+                break;
+        case 120:
+                if ((vcc == 33) || (vcc == 50))
+                        reg |= BCSR1_PCCVPP0;
+                else
+                        return 1;
+        default:
+                return 1;
+        }
+        /* first, turn off all power */
+        clrbits32(bcsr_io, 0x00610000);
+        /* enable new powersettings */
+        setbits32(bcsr_io, reg);
+        iounmap(bcsr_io);
+        return 0;
+}
+#endif
 void __init mpc885ads_board_setup(void)
 {
@@ -62,7 +127,7 @@ void __init mpc885ads_board_setup(void)
 #endif
        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
-        cp = (cpm8xx_t *)immr_map(im_cpm);
+        cp = (cpm8xx_t *) immr_map(im_cpm);
        if (bcsr_io == NULL) {
                printk(KERN_CRIT "Could not remap BCSR\n");
@@ -75,13 +140,13 @@ void __init mpc885ads_board_setup(void)
        out_8(&(cp->cp_smc[0].smc_smcm), tmpval8);
        clrbits16(&cp->cp_smc[0].smc_smcmr, SMCMR_REN | SMCMR_TEN);     /* brg1 */
 #else
-        setbits32(bcsr_io,BCSR1_RS232EN_1);
+        setbits32(bcsr_io, BCSR1_RS232EN_1);
        out_be16(&cp->cp_smc[0].smc_smcmr, 0);
        out_8(&cp->cp_smc[0].smc_smce, 0);
 #endif
 #ifdef CONFIG_SERIAL_CPM_SMC2
-        clrbits32(bcsr_io,BCSR1_RS232EN_2);
+        clrbits32(bcsr_io, BCSR1_RS232EN_2);
        clrbits32(&cp->cp_simode, 0xe0000000 >> 1);
        setbits32(&cp->cp_simode, 0x20000000 >> 1);     /* brg2 */
        tmpval8 = in_8(&(cp->cp_smc[1].smc_smcm)) | (SMCM_RX | SMCM_TX);
@@ -90,7 +155,7 @@ void __init mpc885ads_board_setup(void)
        init_smc2_uart_ioports(0);
 #else
-        setbits32(bcsr_io,BCSR1_RS232EN_2);
+        setbits32(bcsr_io, BCSR1_RS232EN_2);
        out_be16(&cp->cp_smc[1].smc_smcmr, 0);
        out_8(&cp->cp_smc[1].smc_smce, 0);
 #endif
@@ -99,29 +164,34 @@ void __init mpc885ads_board_setup(void)
 #ifdef CONFIG_FS_ENET
        /* use MDC for MII (common) */
-        io_port = (iop8xx_t*)immr_map(im_ioport);
+        io_port = (iop8xx_t *) immr_map(im_ioport);
        setbits16(&io_port->iop_pdpar, 0x0080);
        clrbits16(&io_port->iop_pddir, 0x0080);
        bcsr_io = ioremap(BCSR5, sizeof(unsigned long));
-        clrbits32(bcsr_io,BCSR5_MII1_EN);
+        clrbits32(bcsr_io, BCSR5_MII1_EN);
-        clrbits32(bcsr_io,BCSR5_MII1_RST);
+        clrbits32(bcsr_io, BCSR5_MII1_RST);
 #ifndef CONFIG_FC_ENET_HAS_SCC
-        clrbits32(bcsr_io,BCSR5_MII2_EN);
+        clrbits32(bcsr_io, BCSR5_MII2_EN);
-        clrbits32(bcsr_io,BCSR5_MII2_RST);
+        clrbits32(bcsr_io, BCSR5_MII2_RST);
 #endif
        iounmap(bcsr_io);
        immr_unmap(io_port);
 #endif
-}
+#ifdef CONFIG_PCMCIA_M8XX
+        /*Set up board specific hook-ups */
+        m8xx_pcmcia_ops.hw_ctrl = pcmcia_hw_setup;
+        m8xx_pcmcia_ops.voltage_set = pcmcia_set_voltage;
+#endif
+}
-static void init_fec1_ioports(struct fs_platform_info* ptr)
+static void init_fec1_ioports(struct fs_platform_info *ptr)
 {
-        cpm8xx_t *cp = (cpm8xx_t *)immr_map(im_cpm);
+        cpm8xx_t *cp = (cpm8xx_t *) immr_map(im_cpm);
-        iop8xx_t *io_port = (iop8xx_t *)immr_map(im_ioport);
+        iop8xx_t *io_port = (iop8xx_t *) immr_map(im_ioport);
        /* configure FEC1 pins  */
        setbits16(&io_port->iop_papar, 0xf830);
@@ -143,11 +213,10 @@ static void init_fec1_ioports(struct fs_platform_info* ptr)
        immr_unmap(cp);
 }
+static void init_fec2_ioports(struct fs_platform_info *ptr)
-static void init_fec2_ioports(struct fs_platform_info* ptr)
 {
-        cpm8xx_t *cp = (cpm8xx_t *)immr_map(im_cpm);
+        cpm8xx_t *cp = (cpm8xx_t *) immr_map(im_cpm);
-        iop8xx_t *io_port = (iop8xx_t *)immr_map(im_ioport);
+        iop8xx_t *io_port = (iop8xx_t *) immr_map(im_ioport);
        /* configure FEC2 pins */
        setbits32(&cp->cp_pepar, 0x0003fffc);
@@ -177,15 +246,15 @@ void init_fec_ioports(struct fs_platform_info *fpi)
        }
 }
-static void init_scc3_ioports(struct fs_platform_info* fpi)
+static void init_scc3_ioports(struct fs_platform_info *fpi)
 {
        unsigned *bcsr_io;
        iop8xx_t *io_port;
        cpm8xx_t *cp;
        bcsr_io = ioremap(BCSR_ADDR, BCSR_SIZE);
-        io_port = (iop8xx_t *)immr_map(im_ioport);
+        io_port = (iop8xx_t *) immr_map(im_ioport);
-        cp = (cpm8xx_t *)immr_map(im_cpm);
+        cp = (cpm8xx_t *) immr_map(im_cpm);
        if (bcsr_io == NULL) {
                printk(KERN_CRIT "Could not remap BCSR\n");
@@ -194,9 +263,9 @@ static void init_scc3_ioports(struct fs_platform_info* fpi)
        /* Enable the PHY.
         */
-        clrbits32(bcsr_io+4, BCSR4_ETH10_RST);
+        clrbits32(bcsr_io + 4, BCSR4_ETH10_RST);
        udelay(1000);
-        setbits32(bcsr_io+4, BCSR4_ETH10_RST);
+        setbits32(bcsr_io + 4, BCSR4_ETH10_RST);
        /* Configure port A pins for Txd and Rxd.
         */
        setbits16(&io_port->iop_papar, PA_ENET_RXD | PA_ENET_TXD);
@@ -212,8 +281,7 @@ static void init_scc3_ioports(struct fs_platform_info* fpi)
         */
        setbits32(&cp->cp_pepar, PE_ENET_TCLK | PE_ENET_RCLK);
        clrbits32(&cp->cp_pepar, PE_ENET_TENA);
-        clrbits32(&cp->cp_pedir,
+        clrbits32(&cp->cp_pedir, PE_ENET_TCLK | PE_ENET_RCLK | PE_ENET_TENA);
-                  PE_ENET_TCLK | PE_ENET_RCLK | PE_ENET_TENA);
        clrbits32(&cp->cp_peso, PE_ENET_TCLK | PE_ENET_RCLK);
        setbits32(&cp->cp_peso, PE_ENET_TENA);
@@ -237,7 +305,7 @@ static void init_scc3_ioports(struct fs_platform_info* fpi)
        clrbits32(&cp->cp_pedir, PE_ENET_TENA);
        setbits32(&cp->cp_peso, PE_ENET_TENA);
-        setbits32(bcsr_io+4, BCSR1_ETHEN);
+        setbits32(bcsr_io + 4, BCSR1_ETHEN);
        iounmap(bcsr_io);
        immr_unmap(io_port);
        immr_unmap(cp);
@@ -257,50 +325,48 @@ void init_scc_ioports(struct fs_platform_info *fpi)
        }
 }
+static void init_smc1_uart_ioports(struct fs_uart_platform_info *ptr)
-static void init_smc1_uart_ioports(struct fs_uart_platform_info* ptr)
 {
-        unsigned *bcsr_io;
+        unsigned *bcsr_io;
        cpm8xx_t *cp;
-        cp = (cpm8xx_t *)immr_map(im_cpm);
+        cp = (cpm8xx_t *) immr_map(im_cpm);
        setbits32(&cp->cp_pepar, 0x000000c0);
        clrbits32(&cp->cp_pedir, 0x000000c0);
        clrbits32(&cp->cp_peso, 0x00000040);
        setbits32(&cp->cp_peso, 0x00000080);
        immr_unmap(cp);
-        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
+        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
-        if (bcsr_io == NULL) {
+        if (bcsr_io == NULL) {
-                printk(KERN_CRIT "Could not remap BCSR1\n");
+                printk(KERN_CRIT "Could not remap BCSR1\n");
-                return;
+                return;
-        }
+        }
-        clrbits32(bcsr_io,BCSR1_RS232EN_1);
+        clrbits32(bcsr_io, BCSR1_RS232EN_1);
-        iounmap(bcsr_io);
+        iounmap(bcsr_io);
 }
-static void init_smc2_uart_ioports(struct fs_uart_platform_info* fpi)
+static void init_smc2_uart_ioports(struct fs_uart_platform_info *fpi)
 {
-        unsigned *bcsr_io;
+        unsigned *bcsr_io;
        cpm8xx_t *cp;
-        cp = (cpm8xx_t *)immr_map(im_cpm);
+        cp = (cpm8xx_t *) immr_map(im_cpm);
        setbits32(&cp->cp_pepar, 0x00000c00);
        clrbits32(&cp->cp_pedir, 0x00000c00);
        clrbits32(&cp->cp_peso, 0x00000400);
        setbits32(&cp->cp_peso, 0x00000800);
        immr_unmap(cp);
-        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
+        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
-        if (bcsr_io == NULL) {
+        if (bcsr_io == NULL) {
-                printk(KERN_CRIT "Could not remap BCSR1\n");
+                printk(KERN_CRIT "Could not remap BCSR1\n");
-                return;
+                return;
-        }
+        }
-        clrbits32(bcsr_io,BCSR1_RS232EN_2);
+        clrbits32(bcsr_io, BCSR1_RS232EN_2);
-        iounmap(bcsr_io);
+        iounmap(bcsr_io);
 }
 void init_smc_ioports(struct fs_uart_platform_info *data)
@@ -373,15 +439,11 @@ static int __init mpc885ads_probe(void)
        return 1;
 }
-define_machine(mpc885_ads) {
+define_machine(mpc885_ads)
-        .name                   = "MPC885 ADS",
+{
-        .probe                  = mpc885ads_probe,
+.name = "MPC885 ADS",.probe = mpc885ads_probe,.setup_arch =
-        .setup_arch             = mpc885ads_setup_arch,
+            mpc885ads_setup_arch,.init_IRQ =
-        .init_IRQ               = m8xx_pic_init,
+            m8xx_pic_init,.show_cpuinfo = mpc8xx_show_cpuinfo,.get_irq =
-        .show_cpuinfo           = mpc8xx_show_cpuinfo,
+            mpc8xx_get_irq,.restart = mpc8xx_restart,.calibrate_decr =
-        .get_irq                = mpc8xx_get_irq,
+            mpc8xx_calibrate_decr,.set_rtc_time =
-        .restart                = mpc8xx_restart,
+            mpc8xx_set_rtc_time,.get_rtc_time = mpc8xx_get_rtc_time,};
-        .calibrate_decr         = mpc8xx_calibrate_decr,
-        .set_rtc_time           = mpc8xx_set_rtc_time,
-        .get_rtc_time           = mpc8xx_get_rtc_time,
-};
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 361acfa289..33545d352e 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -2,7 +2,7 @@ menu "Platform support"
 choice
        prompt "Machine type"
-        depends on PPC64 || CLASSIC32
+        depends on PPC64 || 6xx
        default PPC_MULTIPLATFORM
 config PPC_MULTIPLATFORM
@@ -16,15 +16,30 @@ config EMBEDDED6xx
        bool "Embedded 6xx/7xx/7xxx-based board"
        depends on PPC32 && (BROKEN||BROKEN_ON_SMP)
-config APUS
+config PPC_82xx
-        bool "Amiga-APUS"
+        bool "Freescale 82xx"
-        depends on PPC32 && BROKEN
+        depends on 6xx
+config PPC_83xx
+        bool "Freescale 83xx"
+        depends on 6xx
+        select FSL_SOC
+        select 83xx
+        select WANT_DEVICE_TREE
+config PPC_86xx
+        bool "Freescale 86xx"
+        depends on 6xx
+        select FSL_SOC
+        select ALTIVEC
        help
-          Select APUS if configuring for a PowerUP Amiga.
+          The Freescale E600 SoCs have 74xx cores.
-          More information is available at:
-          <http://linux-apus.sourceforge.net/>.
 endchoice
+config CLASSIC32
+        def_bool y
+        depends on 6xx && PPC_MULTIPLATFORM
 source "arch/powerpc/platforms/pseries/Kconfig"
 source "arch/powerpc/platforms/iseries/Kconfig"
 source "arch/powerpc/platforms/chrp/Kconfig"
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
new file mode 100644
index 0000000000..b8b5fde946
--- /dev/null
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -0,0 +1,221 @@
+config PPC64
+        bool "64-bit kernel"
+        default n
+        help
+          This option selects whether a 32-bit or a 64-bit kernel
+          will be built.
+menu "Processor support"
+choice
+        prompt "Processor Type"
+        depends on PPC32
+        default 6xx
+        help
+          There are five families of 32 bit PowerPC chips supported.
+          The most common ones are the desktop and server CPUs (601, 603,
+          604, 740, 750, 74xx) CPUs from Freescale and IBM, with their
+          embedded 52xx/82xx/83xx/86xx counterparts.
+          The other embeeded parts, namely 4xx, 8xx, e200 (55xx) and e500
+          (85xx) each form a family of their own that is not compatible
+          with the others.
+          If unsure, select 52xx/6xx/7xx/74xx/82xx/83xx/86xx.
+config 6xx
+        bool "52xx/6xx/7xx/74xx/82xx/83xx/86xx"
+        select PPC_FPU
+config PPC_85xx
+        bool "Freescale 85xx"
+        select E500
+        select FSL_SOC
+        select 85xx
+        select WANT_DEVICE_TREE
+config PPC_8xx
+        bool "Freescale 8xx"
+        select FSL_SOC
+        select 8xx
+config 40x
+        bool "AMCC 40x"
+        select PPC_DCR_NATIVE
+config 44x
+        bool "AMCC 44x"
+        select PPC_DCR_NATIVE
+        select WANT_DEVICE_TREE
+config E200
+        bool "Freescale e200"
+endchoice
+config POWER4_ONLY
+        bool "Optimize for POWER4"
+        depends on PPC64
+        default n
+        ---help---
+          Cause the compiler to optimize for POWER4/POWER5/PPC970 processors.
+          The resulting binary will not work on POWER3 or RS64 processors
+          when compiled with binutils 2.15 or later.
+config POWER3
+        bool
+        depends on PPC64
+        default y if !POWER4_ONLY
+config POWER4
+        depends on PPC64
+        def_bool y
+config 6xx
+        bool
+# this is temp to handle compat with arch=ppc
+config 8xx
+        bool
+# this is temp to handle compat with arch=ppc
+config 83xx
+        bool
+# this is temp to handle compat with arch=ppc
+config 85xx
+        bool
+config E500
+        bool
+config PPC_FPU
+        bool
+        default y if PPC64
+config 4xx
+        bool
+        depends on 40x || 44x
+        default y
+config BOOKE
+        bool
+        depends on E200 || E500 || 44x
+        default y
+config FSL_BOOKE
+        bool
+        depends on E200 || E500
+        default y
+config PTE_64BIT
+        bool
+        depends on 44x || E500
+        default y if 44x
+        default y if E500 && PHYS_64BIT
+config PHYS_64BIT
+        bool 'Large physical address support' if E500
+        depends on 44x || E500
+        select RESOURCES_64BIT
+        default y if 44x
+        ---help---
+          This option enables kernel support for larger than 32-bit physical
+          addresses.  This features is not be available on all e500 cores.
+          If in doubt, say N here.
+config ALTIVEC
+        bool "AltiVec Support"
+        depends on CLASSIC32 || POWER4
+        ---help---
+          This option enables kernel support for the Altivec extensions to the
+          PowerPC processor. The kernel currently supports saving and restoring
+          altivec registers, and turning on the 'altivec enable' bit so user
+          processes can execute altivec instructions.
+          This option is only usefully if you have a processor that supports
+          altivec (G4, otherwise known as 74xx series), but does not have
+          any affect on a non-altivec cpu (it does, however add code to the
+          kernel).
+          If in doubt, say Y here.
+config SPE
+        bool "SPE Support"
+        depends on E200 || E500
+        default y
+        ---help---
+          This option enables kernel support for the Signal Processing
+          Extensions (SPE) to the PowerPC processor. The kernel currently
+          supports saving and restoring SPE registers, and turning on the
+          'spe enable' bit so user processes can execute SPE instructions.
+          This option is only useful if you have a processor that supports
+          SPE (e500, otherwise known as 85xx series), but does not have any
+          effect on a non-spe cpu (it does, however add code to the kernel).
+          If in doubt, say Y here.
+config PPC_STD_MMU
+        bool
+        depends on 6xx || POWER3 || POWER4 || PPC64
+        default y
+config PPC_STD_MMU_32
+        def_bool y
+        depends on PPC_STD_MMU && PPC32
+config PPC_MM_SLICES
+        bool
+        default y if HUGETLB_PAGE
+        default n
+config VIRT_CPU_ACCOUNTING
+        bool "Deterministic task and CPU time accounting"
+        depends on PPC64
+        default y
+        help
+          Select this option to enable more accurate task and CPU time
+          accounting.  This is done by reading a CPU counter on each
+          kernel entry and exit and on transitions within the kernel
+          between system, softirq and hardirq state, so there is a
+          small performance impact.  This also enables accounting of
+          stolen time on logically-partitioned systems running on
+          IBM POWER5-based machines.
+          If in doubt, say Y here.
+config SMP
+        depends on PPC_STD_MMU
+        bool "Symmetric multi-processing support"
+        ---help---
+          This enables support for systems with more than one CPU. If you have
+          a system with only one CPU, say N. If you have a system with more
+          than one CPU, say Y.  Note that the kernel does not currently
+          support SMP machines with 603/603e/603ev or PPC750 ("G3") processors
+          since they have inadequate hardware support for multiprocessor
+          operation.
+          If you say N here, the kernel will run on single and multiprocessor
+          machines, but will use only one CPU of a multiprocessor machine. If
+          you say Y here, the kernel will run on single-processor machines.
+          On a single-processor machine, the kernel will run faster if you say
+          N here.
+          If you don't know what to do here, say N.
+config NR_CPUS
+        int "Maximum number of CPUs (2-128)"
+        range 2 128
+        depends on SMP
+        default "32" if PPC64
+        default "4"
+config NOT_COHERENT_CACHE
+        bool
+        depends on 4xx || 8xx || E200
+        default y
+config CONFIG_CHECK_CACHE_COHERENCY
+        bool
+endmenu
diff --git a/arch/powerpc/platforms/apus/Kconfig b/arch/powerpc/platforms/apus/Kconfig
deleted file mode 100644
index 6bde3bffed..0000000000
--- a/arch/powerpc/platforms/apus/Kconfig
+++ /dev/null
@@ -1,130 +0,0 @@
-config AMIGA
-        bool
-        depends on APUS
-        default y
-        help
-          This option enables support for the Amiga series of computers.
-config ZORRO
-        bool
-        depends on APUS
-        default y
-        help
-          This enables support for the Zorro bus in the Amiga. If you have
-          expansion cards in your Amiga that conform to the Amiga
-          AutoConfig(tm) specification, say Y, otherwise N. Note that even
-          expansion cards that do not fit in the Zorro slots but fit in e.g.
-          the CPU slot may fall in this category, so you have to say Y to let
-          Linux use these.
-config ABSTRACT_CONSOLE
-        bool
-        depends on APUS
-        default y
-config APUS_FAST_EXCEPT
-        bool
-        depends on APUS
-        default y
-config AMIGA_PCMCIA
-        bool "Amiga 1200/600 PCMCIA support"
-        depends on APUS && EXPERIMENTAL
-        help
-          Include support in the kernel for pcmcia on Amiga 1200 and Amiga
-          600. If you intend to use pcmcia cards say Y; otherwise say N.
-config AMIGA_BUILTIN_SERIAL
-        tristate "Amiga builtin serial support"
-        depends on APUS
-        help
-          If you want to use your Amiga's built-in serial port in Linux,
-          answer Y.
-          To compile this driver as a module, choose M here.
-config GVPIOEXT
-        tristate "GVP IO-Extender support"
-        depends on APUS
-        help
-          If you want to use a GVP IO-Extender serial card in Linux, say Y.
-          Otherwise, say N.
-config GVPIOEXT_LP
-        tristate "GVP IO-Extender parallel printer support"
-        depends on GVPIOEXT
-        help
-          Say Y to enable driving a printer from the parallel port on your
-          GVP IO-Extender card, N otherwise.
-config GVPIOEXT_PLIP
-        tristate "GVP IO-Extender PLIP support"
-        depends on GVPIOEXT
-        help
-          Say Y to enable doing IP over the parallel port on your GVP
-          IO-Extender card, N otherwise.
-config MULTIFACE_III_TTY
-        tristate "Multiface Card III serial support"
-        depends on APUS
-        help
-          If you want to use a Multiface III card's serial port in Linux,
-          answer Y.
-          To compile this driver as a module, choose M here.
-config A2232
-        tristate "Commodore A2232 serial support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && APUS
-        ---help---
-          This option supports the 2232 7-port serial card shipped with the
-          Amiga 2000 and other Zorro-bus machines, dating from 1989.  At
-          a max of 19,200 bps, the ports are served by a 6551 ACIA UART chip
-          each, plus a 8520 CIA, and a master 6502 CPU and buffer as well. The
-          ports were connected with 8 pin DIN connectors on the card bracket,
-          for which 8 pin to DB25 adapters were supplied. The card also had
-          jumpers internally to toggle various pinning configurations.
-          This driver can be built as a module; but then "generic_serial"
-          will also be built as a module. This has to be loaded before
-          "ser_a2232". If you want to do this, answer M here.
-config WHIPPET_SERIAL
-        tristate "Hisoft Whippet PCMCIA serial support"
-        depends on AMIGA_PCMCIA
-        help
-          HiSoft has a web page at <http://www.hisoft.co.uk/>, but there
-          is no listing for the Whippet in their Amiga section.
-config APNE
-        tristate "PCMCIA NE2000 support"
-        depends on AMIGA_PCMCIA
-        help
-          If you have a PCMCIA NE2000 compatible adapter, say Y.  Otherwise,
-          say N.
-          To compile this driver as a module, choose M here: the
-          module will be called apne.
-config SERIAL_CONSOLE
-        bool "Support for serial port console"
-        depends on APUS && (AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y)
-config HEARTBEAT
-        bool "Use power LED as a heartbeat"
-        depends on APUS
-        help
-          Use the power-on LED on your machine as a load meter.  The exact
-          behavior is platform-dependent, but normally the flash frequency is
-          a hyperbolic function of the 5-minute load average.
-config PROC_HARDWARE
-        bool "/proc/hardware support"
-        depends on APUS
-source "drivers/zorro/Kconfig"
-config PCI_PERMEDIA
-        bool "PCI for Permedia2"
-        depends on !4xx && !8xx && APUS
diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq.c b/arch/powerpc/platforms/cell/cbe_cpufreq.c
index ac445998d8..ab511d5b65 100644
--- a/arch/powerpc/platforms/cell/cbe_cpufreq.c
+++ b/arch/powerpc/platforms/cell/cbe_cpufreq.c
@@ -74,6 +74,7 @@ static unsigned int pmi_frequency_limit = 0;
 static struct of_device *pmi_dev;
+#ifdef CONFIG_PPC_PMI
 static int set_pmode_pmi(int cpu, unsigned int pmode)
 {
        int ret;
@@ -102,7 +103,7 @@ static int set_pmode_pmi(int cpu, unsigned int pmode)
 #endif
        return ret;
 }
+#endif
 static int get_pmode(int cpu)
 {
@@ -157,9 +158,11 @@ static int set_pmode_reg(int cpu, unsigned int pmode)
 }
 static int set_pmode(int cpu, unsigned int slow_mode) {
+#ifdef CONFIG_PPC_PMI
        if (pmi_dev)
                return set_pmode_pmi(cpu, slow_mode);
        else
+#endif
                return set_pmode_reg(cpu, slow_mode);
 }
@@ -323,26 +326,28 @@ static struct cpufreq_driver cbe_cpufreq_driver = {
 static int __init cbe_cpufreq_init(void)
 {
+#ifdef CONFIG_PPC_PMI
        struct device_node *np;
+#endif
        if (!machine_is(cell))
                return -ENODEV;
+#ifdef CONFIG_PPC_PMI
        np = of_find_node_by_type(NULL, "ibm,pmi");
        pmi_dev = of_find_device_by_node(np);
        if (pmi_dev)
                pmi_register_handler(pmi_dev, &cbe_pmi_handler);
+#endif
        return cpufreq_register_driver(&cbe_cpufreq_driver);
 }
 static void __exit cbe_cpufreq_exit(void)
 {
+#ifdef CONFIG_PPC_PMI
        if (pmi_dev)
                pmi_unregister_handler(pmi_dev, &cbe_pmi_handler);
+#endif
        cpufreq_unregister_driver(&cbe_cpufreq_driver);
 }
diff --git a/arch/powerpc/platforms/cell/io-workarounds.c b/arch/powerpc/platforms/cell/io-workarounds.c
index 7fb92f23f3..9d7c2ef940 100644
--- a/arch/powerpc/platforms/cell/io-workarounds.c
+++ b/arch/powerpc/platforms/cell/io-workarounds.c
@@ -102,7 +102,7 @@ static void spider_io_flush(const volatile void __iomem *addr)
                vaddr = (unsigned long)PCI_FIX_ADDR(addr);
                /* Check if it's in allowed range for  PIO */
-                if (vaddr < PHBS_IO_BASE || vaddr >= IMALLOC_BASE)
+                if (vaddr < PHB_IO_BASE || vaddr > PHB_IO_END)
                        return;
                /* Try to find a PTE. If not, clear the paddr, we'll do
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index a7f5a7653c..96a8f60969 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -31,6 +31,7 @@
 #include <linux/mm.h>
 #include <linux/io.h>
 #include <linux/mutex.h>
+#include <linux/linux_logo.h>
 #include <asm/spu.h>
 #include <asm/spu_priv1.h>
 #include <asm/xmon.h>
@@ -183,7 +184,7 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea)
                spu->slb_replace = 0;
        spu_restart_dma(spu);
+        spu->stats.slb_flt++;
        return 0;
 }
@@ -332,6 +333,7 @@ spu_irq_class_2(int irq, void *data)
        if (stat & 0x10) /* SPU mailbox threshold */
                spu->wbox_callback(spu);
+        spu->stats.class2_intr++;
        return stat ? IRQ_HANDLED : IRQ_NONE;
 }
@@ -462,8 +464,18 @@ void spu_free(struct spu *spu)
 }
 EXPORT_SYMBOL_GPL(spu_free);
+static int spu_shutdown(struct sys_device *sysdev)
+{
+        struct spu *spu = container_of(sysdev, struct spu, sysdev);
+        spu_free_irqs(spu);
+        spu_destroy_spu(spu);
+        return 0;
+}
 struct sysdev_class spu_sysdev_class = {
-        set_kset_name("spu")
+        set_kset_name("spu"),
+        .shutdown = spu_shutdown,
 };
 int spu_add_sysdev_attr(struct sysdev_attribute *attr)
@@ -574,6 +586,9 @@ static int __init create_spu(void *data)
        spin_unlock_irqrestore(&spu_list_lock, flags);
        mutex_unlock(&spu_mutex);
+        spu->stats.utilization_state = SPU_UTIL_IDLE;
+        spu->stats.tstamp = jiffies;
        goto out;
 out_free_irqs:
@@ -586,6 +601,45 @@ out:
        return ret;
 }
+static const char *spu_state_names[] = {
+        "user", "system", "iowait", "idle"
+};
+static unsigned long long spu_acct_time(struct spu *spu,
+                enum spu_utilization_state state)
+{
+        unsigned long long time = spu->stats.times[state];
+        if (spu->stats.utilization_state == state)
+                time += jiffies - spu->stats.tstamp;
+        return jiffies_to_msecs(time);
+}
+static ssize_t spu_stat_show(struct sys_device *sysdev, char *buf)
+{
+        struct spu *spu = container_of(sysdev, struct spu, sysdev);
+        return sprintf(buf, "%s %llu %llu %llu %llu "
+                      "%llu %llu %llu %llu %llu %llu %llu %llu\n",
+                spu_state_names[spu->stats.utilization_state],
+                spu_acct_time(spu, SPU_UTIL_USER),
+                spu_acct_time(spu, SPU_UTIL_SYSTEM),
+                spu_acct_time(spu, SPU_UTIL_IOWAIT),
+                spu_acct_time(spu, SPU_UTIL_IDLE),
+                spu->stats.vol_ctx_switch,
+                spu->stats.invol_ctx_switch,
+                spu->stats.slb_flt,
+                spu->stats.hash_flt,
+                spu->stats.min_flt,
+                spu->stats.maj_flt,
+                spu->stats.class2_intr,
+                spu->stats.libassist);
+}
+static SYSDEV_ATTR(stat, 0644, spu_stat_show, NULL);
 static int __init init_spu_base(void)
 {
        int i, ret = 0;
@@ -603,14 +657,28 @@ static int __init init_spu_base(void)
        ret = spu_enumerate_spus(create_spu);
-        if (ret) {
+        if (ret < 0) {
                printk(KERN_WARNING "%s: Error initializing spus\n",
                        __FUNCTION__);
                goto out_unregister_sysdev_class;
        }
+        if (ret > 0) {
+                /*
+                 * We cannot put the forward declaration in
+                 * <linux/linux_logo.h> because of conflicting session type
+                 * conflicts for const and __initdata with different compiler
+                 * versions
+                 */
+                extern const struct linux_logo logo_spe_clut224;
+                fb_append_extra_logo(&logo_spe_clut224, ret);
+        }
        xmon_register_spus(&spu_full_list);
+        spu_add_sysdev_attr(&attr_stat);
        return 0;
 out_unregister_sysdev_class:
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
index 1d4562ae46..75ed50fcc3 100644
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -279,6 +279,7 @@ static int __init of_enumerate_spus(int (*fn)(void *data))
 {
        int ret;
        struct device_node *node;
+        unsigned int n = 0;
        ret = -ENODEV;
        for (node = of_find_node_by_type(NULL, "spe");
@@ -289,8 +290,9 @@ static int __init of_enumerate_spus(int (*fn)(void *data))
                                __FUNCTION__, node->name);
                        break;
                }
+                n++;
        }
-        return ret;
+        return ret ? ret : n;
 }
 static int __init of_create_spu(struct spu *spu, void *data)
diff --git a/arch/powerpc/platforms/cell/spufs/backing_ops.c b/arch/powerpc/platforms/cell/spufs/backing_ops.c
index d32db9ffc6..07a0e815ab 100644
--- a/arch/powerpc/platforms/cell/spufs/backing_ops.c
+++ b/arch/powerpc/platforms/cell/spufs/backing_ops.c
@@ -320,6 +320,12 @@ static int spu_backing_set_mfc_query(struct spu_context * ctx, u32 mask,
        /* FIXME: what are the side-effects of this? */
        prob->dma_querymask_RW = mask;
        prob->dma_querytype_RW = mode;
+        /* In the current implementation, the SPU context is always
+         * acquired in runnable state when new bits are added to the
+         * mask (tagwait), so it's sufficient just to mask
+         * dma_tagstatus_R with the 'mask' parameter here.
+         */
+        ctx->csa.prob.dma_tagstatus_R &= mask;
 out:
        spin_unlock(&ctx->csa.register_lock);
diff --git a/arch/powerpc/platforms/cell/spufs/context.c b/arch/powerpc/platforms/cell/spufs/context.c
index 7c51cb54bc..6d7bd60f53 100644
--- a/arch/powerpc/platforms/cell/spufs/context.c
+++ b/arch/powerpc/platforms/cell/spufs/context.c
@@ -23,10 +23,14 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
+#include <asm/atomic.h>
 #include <asm/spu.h>
 #include <asm/spu_csa.h>
 #include "spufs.h"
+atomic_t nr_spu_contexts = ATOMIC_INIT(0);
 struct spu_context *alloc_spu_context(struct spu_gang *gang)
 {
        struct spu_context *ctx;
@@ -53,10 +57,12 @@ struct spu_context *alloc_spu_context(struct spu_gang *gang)
        INIT_LIST_HEAD(&ctx->rq);
        if (gang)
                spu_gang_add_ctx(gang, ctx);
-        ctx->rt_priority = current->rt_priority;
+        ctx->cpus_allowed = current->cpus_allowed;
-        ctx->policy = current->policy;
+        spu_set_timeslice(ctx);
-        ctx->prio = current->prio;
+        ctx->stats.execution_state = SPUCTX_UTIL_USER;
-        INIT_DELAYED_WORK(&ctx->sched_work, spu_sched_tick);
+        ctx->stats.tstamp = jiffies;
+        atomic_inc(&nr_spu_contexts);
        goto out;
 out_free:
        kfree(ctx);
@@ -76,6 +82,7 @@ void destroy_spu_context(struct kref *kref)
        if (ctx->gang)
                spu_gang_remove_ctx(ctx->gang, ctx);
        BUG_ON(!list_empty(&ctx->rq));
+        atomic_dec(&nr_spu_contexts);
        kfree(ctx);
 }
diff --git a/arch/powerpc/platforms/cell/spufs/fault.c b/arch/powerpc/platforms/cell/spufs/fault.c
index 0f75c07e29..e064d0c0d8 100644
--- a/arch/powerpc/platforms/cell/spufs/fault.c
+++ b/arch/powerpc/platforms/cell/spufs/fault.c
@@ -33,7 +33,8 @@
 * function. Currently, there are a few corner cases that we haven't had
 * to handle fortunately.
 */
-static int spu_handle_mm_fault(struct mm_struct *mm, unsigned long ea, unsigned long dsisr)
+static int spu_handle_mm_fault(struct mm_struct *mm, unsigned long ea,
+                unsigned long dsisr, unsigned *flt)
 {
        struct vm_area_struct *vma;
        unsigned long is_write;
@@ -73,7 +74,8 @@ good_area:
                        goto bad_area;
        }
        ret = 0;
-        switch (handle_mm_fault(mm, vma, ea, is_write)) {
+        *flt = handle_mm_fault(mm, vma, ea, is_write);
+        switch (*flt) {
        case VM_FAULT_MINOR:
                current->min_flt++;
                break;
@@ -153,6 +155,7 @@ int spufs_handle_class1(struct spu_context *ctx)
 {
        u64 ea, dsisr, access;
        unsigned long flags;
+        unsigned flt = 0;
        int ret;
        /*
@@ -178,9 +181,17 @@ int spufs_handle_class1(struct spu_context *ctx)
        if (!(dsisr & (MFC_DSISR_PTE_NOT_FOUND | MFC_DSISR_ACCESS_DENIED)))
                return 0;
+        spuctx_switch_state(ctx, SPUCTX_UTIL_IOWAIT);
        pr_debug("ctx %p: ea %016lx, dsisr %016lx state %d\n", ctx, ea,
                dsisr, ctx->state);
+        ctx->stats.hash_flt++;
+        if (ctx->state == SPU_STATE_RUNNABLE) {
+                ctx->spu->stats.hash_flt++;
+                spu_switch_state(ctx->spu, SPU_UTIL_IOWAIT);
+        }
        /* we must not hold the lock when entering spu_handle_mm_fault */
        spu_release(ctx);
@@ -192,7 +203,7 @@ int spufs_handle_class1(struct spu_context *ctx)
        /* hashing failed, so try the actual fault handler */
        if (ret)
-                ret = spu_handle_mm_fault(current->mm, ea, dsisr);
+                ret = spu_handle_mm_fault(current->mm, ea, dsisr, &flt);
        spu_acquire(ctx);
        /*
@@ -201,11 +212,23 @@ int spufs_handle_class1(struct spu_context *ctx)
         * In case of unhandled error report the problem to user space.
         */
        if (!ret) {
+                if (flt == VM_FAULT_MINOR)
+                        ctx->stats.min_flt++;
+                else
+                        ctx->stats.maj_flt++;
+                if (ctx->state == SPU_STATE_RUNNABLE) {
+                        if (flt == VM_FAULT_MINOR)
+                                ctx->spu->stats.min_flt++;
+                        else
+                                ctx->spu->stats.maj_flt++;
+                }
                if (ctx->spu)
                        ctx->ops->restart_dma(ctx);
        } else
                spufs_handle_dma_error(ctx, ea, SPE_EVENT_SPE_DATA_STORAGE);
+        spuctx_switch_state(ctx, SPUCTX_UTIL_SYSTEM);
        return ret;
 }
 EXPORT_SYMBOL_GPL(spufs_handle_class1);
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index b1e7e2f8a2..c2814ea96a 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -28,6 +28,7 @@
 #include <linux/pagemap.h>
 #include <linux/poll.h>
 #include <linux/ptrace.h>
+#include <linux/seq_file.h>
 #include <asm/io.h>
 #include <asm/semaphore.h>
@@ -39,6 +40,7 @@
 #define SPUFS_MMAP_4K (PAGE_SIZE == 0x1000)
 static int
 spufs_mem_open(struct inode *inode, struct file *file)
 {
@@ -216,12 +218,12 @@ unsigned long spufs_get_unmapped_area(struct file *file, unsigned long addr,
 #endif /* CONFIG_SPU_FS_64K_LS */
 static const struct file_operations spufs_mem_fops = {
-        .open                   = spufs_mem_open,
+        .open                   = spufs_mem_open,
-        .release                = spufs_mem_release,
+        .release                = spufs_mem_release,
-        .read                   = spufs_mem_read,
+        .read                   = spufs_mem_read,
-        .write                  = spufs_mem_write,
+        .write                  = spufs_mem_write,
-        .llseek                 = generic_file_llseek,
+        .llseek                 = generic_file_llseek,
-        .mmap                   = spufs_mem_mmap,
+        .mmap                   = spufs_mem_mmap,
 #ifdef CONFIG_SPU_FS_64K_LS
        .get_unmapped_area      = spufs_get_unmapped_area,
 #endif
@@ -1497,14 +1499,15 @@ static ssize_t spufs_mfc_write(struct file *file, const char __user *buffer,
                if (status)
                        ret = status;
        }
-        spu_release(ctx);
        if (ret)
-                goto out;
+                goto out_unlock;
        ctx->tagwait |= 1 << cmd.tag;
        ret = size;
+out_unlock:
+        spu_release(ctx);
 out:
        return ret;
 }
@@ -1515,14 +1518,14 @@ static unsigned int spufs_mfc_poll(struct file *file,poll_table *wait)
        u32 free_elements, tagstatus;
        unsigned int mask;
+        poll_wait(file, &ctx->mfc_wq, wait);
        spu_acquire(ctx);
        ctx->ops->set_mfc_query(ctx, ctx->tagwait, 2);
        free_elements = ctx->ops->get_mfc_free_elements(ctx);
        tagstatus = ctx->ops->read_mfc_tagstatus(ctx);
        spu_release(ctx);
-        poll_wait(file, &ctx->mfc_wq, wait);
        mask = 0;
        if (free_elements & 0xffff)
                mask |= POLLOUT | POLLWRNORM;
@@ -1797,6 +1800,29 @@ static int spufs_info_open(struct inode *inode, struct file *file)
        return 0;
 }
+static int spufs_caps_show(struct seq_file *s, void *private)
+{
+        struct spu_context *ctx = s->private;
+        if (!(ctx->flags & SPU_CREATE_NOSCHED))
+                seq_puts(s, "sched\n");
+        if (!(ctx->flags & SPU_CREATE_ISOLATE))
+                seq_puts(s, "step\n");
+        return 0;
+}
+static int spufs_caps_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, spufs_caps_show, SPUFS_I(inode)->i_ctx);
+}
+static const struct file_operations spufs_caps_fops = {
+        .open           = spufs_caps_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
 static ssize_t __spufs_mbox_info_read(struct spu_context *ctx,
                        char __user *buf, size_t len, loff_t *pos)
 {
@@ -2014,7 +2040,105 @@ static const struct file_operations spufs_proxydma_info_fops = {
        .read = spufs_proxydma_info_read,
 };
+static int spufs_show_tid(struct seq_file *s, void *private)
+{
+        struct spu_context *ctx = s->private;
+        seq_printf(s, "%d\n", ctx->tid);
+        return 0;
+}
+static int spufs_tid_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, spufs_show_tid, SPUFS_I(inode)->i_ctx);
+}
+static const struct file_operations spufs_tid_fops = {
+        .open           = spufs_tid_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+static const char *ctx_state_names[] = {
+        "user", "system", "iowait", "loaded"
+};
+static unsigned long long spufs_acct_time(struct spu_context *ctx,
+                enum spuctx_execution_state state)
+{
+        unsigned long time = ctx->stats.times[state];
+        if (ctx->stats.execution_state == state)
+                time += jiffies - ctx->stats.tstamp;
+        return jiffies_to_msecs(time);
+}
+static unsigned long long spufs_slb_flts(struct spu_context *ctx)
+{
+        unsigned long long slb_flts = ctx->stats.slb_flt;
+        if (ctx->state == SPU_STATE_RUNNABLE) {
+                slb_flts += (ctx->spu->stats.slb_flt -
+                             ctx->stats.slb_flt_base);
+        }
+        return slb_flts;
+}
+static unsigned long long spufs_class2_intrs(struct spu_context *ctx)
+{
+        unsigned long long class2_intrs = ctx->stats.class2_intr;
+        if (ctx->state == SPU_STATE_RUNNABLE) {
+                class2_intrs += (ctx->spu->stats.class2_intr -
+                                 ctx->stats.class2_intr_base);
+        }
+        return class2_intrs;
+}
+static int spufs_show_stat(struct seq_file *s, void *private)
+{
+        struct spu_context *ctx = s->private;
+        spu_acquire(ctx);
+        seq_printf(s, "%s %llu %llu %llu %llu "
+                      "%llu %llu %llu %llu %llu %llu %llu %llu\n",
+                ctx_state_names[ctx->stats.execution_state],
+                spufs_acct_time(ctx, SPUCTX_UTIL_USER),
+                spufs_acct_time(ctx, SPUCTX_UTIL_SYSTEM),
+                spufs_acct_time(ctx, SPUCTX_UTIL_IOWAIT),
+                spufs_acct_time(ctx, SPUCTX_UTIL_LOADED),
+                ctx->stats.vol_ctx_switch,
+                ctx->stats.invol_ctx_switch,
+                spufs_slb_flts(ctx),
+                ctx->stats.hash_flt,
+                ctx->stats.min_flt,
+                ctx->stats.maj_flt,
+                spufs_class2_intrs(ctx),
+                ctx->stats.libassist);
+        spu_release(ctx);
+        return 0;
+}
+static int spufs_stat_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, spufs_show_stat, SPUFS_I(inode)->i_ctx);
+}
+static const struct file_operations spufs_stat_fops = {
+        .open           = spufs_stat_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
 struct tree_descr spufs_dir_contents[] = {
+        { "capabilities", &spufs_caps_fops, 0444, },
        { "mem",  &spufs_mem_fops,  0666, },
        { "regs", &spufs_regs_fops,  0666, },
        { "mbox", &spufs_mbox_fops, 0444, },
@@ -2046,10 +2170,13 @@ struct tree_descr spufs_dir_contents[] = {
        { "wbox_info", &spufs_wbox_info_fops, 0444, },
        { "dma_info", &spufs_dma_info_fops, 0444, },
        { "proxydma_info", &spufs_proxydma_info_fops, 0444, },
+        { "tid", &spufs_tid_fops, 0444, },
+        { "stat", &spufs_stat_fops, 0444, },
        {},
 };
 struct tree_descr spufs_dir_nosched_contents[] = {
+        { "capabilities", &spufs_caps_fops, 0444, },
        { "mem",  &spufs_mem_fops,  0666, },
        { "mbox", &spufs_mbox_fops, 0444, },
        { "ibox", &spufs_ibox_fops, 0444, },
@@ -2068,6 +2195,8 @@ struct tree_descr spufs_dir_nosched_contents[] = {
        { "psmap", &spufs_psmap_fops, 0666, },
        { "phys-id", &spufs_id_ops, 0666, },
        { "object-id", &spufs_object_id_ops, 0666, },
+        { "tid", &spufs_tid_fops, 0444, },
+        { "stat", &spufs_stat_fops, 0444, },
        {},
 };
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 9807206e02..f37460e5bf 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -232,10 +232,6 @@ static int spufs_dir_close(struct inode *inode, struct file *file)
        return dcache_dir_close(inode, file);
 }
-const struct inode_operations spufs_dir_inode_operations = {
-        .lookup = simple_lookup,
-};
 const struct file_operations spufs_context_fops = {
        .open           = dcache_dir_open,
        .release        = spufs_dir_close,
@@ -269,7 +265,7 @@ spufs_mkdir(struct inode *dir, struct dentry *dentry, unsigned int flags,
                goto out_iput;
        ctx->flags = flags;
-        inode->i_op = &spufs_dir_inode_operations;
+        inode->i_op = &simple_dir_inode_operations;
        inode->i_fop = &simple_dir_operations;
        if (flags & SPU_CREATE_NOSCHED)
                ret = spufs_fill_dir(dentry, spufs_dir_nosched_contents,
@@ -386,7 +382,7 @@ spufs_mkgang(struct inode *dir, struct dentry *dentry, int mode)
        if (!gang)
                goto out_iput;
-        inode->i_op = &spufs_dir_inode_operations;
+        inode->i_op = &simple_dir_inode_operations;
        inode->i_fop = &simple_dir_operations;
        d_instantiate(dentry, inode);
@@ -593,7 +589,7 @@ spufs_create_root(struct super_block *sb, void *data)
        if (!inode)
                goto out;
-        inode->i_op = &spufs_dir_inode_operations;
+        inode->i_op = &simple_dir_inode_operations;
        inode->i_fop = &simple_dir_operations;
        SPUFS_I(inode)->i_ctx = NULL;
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c
index 57626600b1..58ae13b7de 100644
--- a/arch/powerpc/platforms/cell/spufs/run.c
+++ b/arch/powerpc/platforms/cell/spufs/run.c
@@ -29,7 +29,8 @@ static inline int spu_stopped(struct spu_context *ctx, u32 * stat)
        spu = ctx->spu;
        pte_fault = spu->dsisr &
            (MFC_DSISR_PTE_NOT_FOUND | MFC_DSISR_ACCESS_DENIED);
-        return (!(*stat & 0x1) || pte_fault || spu->class_0_pending) ? 1 : 0;
+        return (!(*stat & SPU_STATUS_RUNNING) || pte_fault || spu->class_0_pending) ?
+                1 : 0;
 }
 static int spu_setup_isolated(struct spu_context *ctx)
@@ -142,8 +143,11 @@ static int spu_run_init(struct spu_context *ctx, u32 * npc)
                        runcntl = SPU_RUNCNTL_RUNNABLE;
                ctx->ops->runcntl_write(ctx, runcntl);
        } else {
-                spu_start_tick(ctx);
+                unsigned long mode = SPU_PRIVCNTL_MODE_NORMAL;
                ctx->ops->npc_write(ctx, *npc);
+                if (test_thread_flag(TIF_SINGLESTEP))
+                        mode = SPU_PRIVCNTL_MODE_SINGLE_STEP;
+                out_be64(&ctx->spu->priv2->spu_privcntl_RW, mode);
                ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_RUNNABLE);
        }
@@ -155,7 +159,6 @@ static int spu_run_fini(struct spu_context *ctx, u32 * npc,
 {
        int ret = 0;
-        spu_stop_tick(ctx);
        *status = ctx->ops->status_read(ctx);
        *npc = ctx->ops->npc_read(ctx);
        spu_release(ctx);
@@ -298,9 +301,22 @@ long spufs_run_spu(struct file *file, struct spu_context *ctx,
        ctx->ops->master_start(ctx);
        ctx->event_return = 0;
-        ret = spu_acquire_runnable(ctx, 0);
+        spu_acquire(ctx);
-        if (ret)
+        if (ctx->state == SPU_STATE_SAVED) {
-                return ret;
+                __spu_update_sched_info(ctx);
+                ret = spu_activate(ctx, 0);
+                if (ret) {
+                        spu_release(ctx);
+                        goto out;
+                }
+        } else {
+                /*
+                 * We have to update the scheduling priority under active_mutex
+                 * to protect against find_victim().
+                 */
+                spu_update_sched_info(ctx);
+        }
        ret = spu_run_init(ctx, npc);
        if (ret) {
@@ -325,16 +341,20 @@ long spufs_run_spu(struct file *file, struct spu_context *ctx,
                if (unlikely(ctx->state != SPU_STATE_RUNNABLE)) {
                        ret = spu_reacquire_runnable(ctx, npc, &status);
-                        if (ret) {
+                        if (ret)
-                                spu_stop_tick(ctx);
                                goto out2;
-                        }
                        continue;
                }
                ret = spu_process_events(ctx);
        } while (!ret && !(status & (SPU_STATUS_STOPPED_BY_STOP |
-                                      SPU_STATUS_STOPPED_BY_HALT)));
+                                      SPU_STATUS_STOPPED_BY_HALT |
+                                       SPU_STATUS_SINGLE_STEP)));
+        if ((status & SPU_STATUS_STOPPED_BY_STOP) &&
+            (((status >> SPU_STOP_STATUS_SHIFT) & 0x3f00) == 0x2100) &&
+            (ctx->state == SPU_STATE_RUNNABLE))
+                ctx->stats.libassist++;
        ctx->ops->master_stop(ctx);
        ret = spu_run_fini(ctx, npc, &status);
@@ -344,10 +364,15 @@ out2:
        if ((ret == 0) ||
            ((ret == -ERESTARTSYS) &&
             ((status & SPU_STATUS_STOPPED_BY_HALT) ||
+              (status & SPU_STATUS_SINGLE_STEP) ||
              ((status & SPU_STATUS_STOPPED_BY_STOP) &&
               (status >> SPU_STOP_STATUS_SHIFT != 0x2104)))))
                ret = status;
+        /* Note: we don't need to force_sig SIGTRAP on single-step
+         * since we have TIF_SINGLESTEP set, thus the kernel will do
+         * it upon return from the syscall anyawy
+         */
        if ((status & SPU_STATUS_STOPPED_BY_STOP)
            && (status >> SPU_STOP_STATUS_SHIFT) == 0x3fff) {
                force_sig(SIGTRAP, current);
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 3b831e07f1..e5b4dd1db2 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -35,6 +35,10 @@
 #include <linux/numa.h>
 #include <linux/mutex.h>
 #include <linux/notifier.h>
+#include <linux/kthread.h>
+#include <linux/pid_namespace.h>
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <asm/io.h>
 #include <asm/mmu_context.h>
@@ -43,54 +47,126 @@
 #include <asm/spu_priv1.h>
 #include "spufs.h"
-#define SPU_TIMESLICE   (HZ)
 struct spu_prio_array {
        DECLARE_BITMAP(bitmap, MAX_PRIO);
        struct list_head runq[MAX_PRIO];
        spinlock_t runq_lock;
        struct list_head active_list[MAX_NUMNODES];
        struct mutex active_mutex[MAX_NUMNODES];
+        int nr_active[MAX_NUMNODES];
+        int nr_waiting;
 };
+static unsigned long spu_avenrun[3];
 static struct spu_prio_array *spu_prio;
-static struct workqueue_struct *spu_sched_wq;
+static struct task_struct *spusched_task;
+static struct timer_list spusched_timer;
+/*
+ * Priority of a normal, non-rt, non-niced'd process (aka nice level 0).
+ */
+#define NORMAL_PRIO             120
+/*
+ * Frequency of the spu scheduler tick.  By default we do one SPU scheduler
+ * tick for every 10 CPU scheduler ticks.
+ */
+#define SPUSCHED_TICK           (10)
-static inline int node_allowed(int node)
+/*
+ * These are the 'tuning knobs' of the scheduler:
+ *
+ * Minimum timeslice is 5 msecs (or 1 spu scheduler tick, whichever is
+ * larger), default timeslice is 100 msecs, maximum timeslice is 800 msecs.
+ */
+#define MIN_SPU_TIMESLICE       max(5 * HZ / (1000 * SPUSCHED_TICK), 1)
+#define DEF_SPU_TIMESLICE       (100 * HZ / (1000 * SPUSCHED_TICK))
+#define MAX_USER_PRIO           (MAX_PRIO - MAX_RT_PRIO)
+#define SCALE_PRIO(x, prio) \
+        max(x * (MAX_PRIO - prio) / (MAX_USER_PRIO / 2), MIN_SPU_TIMESLICE)
+/*
+ * scale user-nice values [ -20 ... 0 ... 19 ] to time slice values:
+ * [800ms ... 100ms ... 5ms]
+ *
+ * The higher a thread's priority, the bigger timeslices
+ * it gets during one round of execution. But even the lowest
+ * priority thread gets MIN_TIMESLICE worth of execution time.
+ */
+void spu_set_timeslice(struct spu_context *ctx)
 {
-        cpumask_t mask;
+        if (ctx->prio < NORMAL_PRIO)
+                ctx->time_slice = SCALE_PRIO(DEF_SPU_TIMESLICE * 4, ctx->prio);
+        else
+                ctx->time_slice = SCALE_PRIO(DEF_SPU_TIMESLICE, ctx->prio);
+}
-        if (!nr_cpus_node(node))
+/*
-                return 0;
+ * Update scheduling information from the owning thread.
-        mask = node_to_cpumask(node);
+ */
-        if (!cpus_intersects(mask, current->cpus_allowed))
+void __spu_update_sched_info(struct spu_context *ctx)
-                return 0;
+{
-        return 1;
+        /*
+         * 32-Bit assignment are atomic on powerpc, and we don't care about
+         * memory ordering here because retriving the controlling thread is
+         * per defintion racy.
+         */
+        ctx->tid = current->pid;
+        /*
+         * We do our own priority calculations, so we normally want
+         * ->static_prio to start with. Unfortunately thies field
+         * contains junk for threads with a realtime scheduling
+         * policy so we have to look at ->prio in this case.
+         */
+        if (rt_prio(current->prio))
+                ctx->prio = current->prio;
+        else
+                ctx->prio = current->static_prio;
+        ctx->policy = current->policy;
+        /*
+         * A lot of places that don't hold active_mutex poke into
+         * cpus_allowed, including grab_runnable_context which
+         * already holds the runq_lock.  So abuse runq_lock
+         * to protect this field aswell.
+         */
+        spin_lock(&spu_prio->runq_lock);
+        ctx->cpus_allowed = current->cpus_allowed;
+        spin_unlock(&spu_prio->runq_lock);
 }
-void spu_start_tick(struct spu_context *ctx)
+void spu_update_sched_info(struct spu_context *ctx)
 {
-        if (ctx->policy == SCHED_RR) {
+        int node = ctx->spu->node;
-                /*
-                 * Make sure the exiting bit is cleared.
+        mutex_lock(&spu_prio->active_mutex[node]);
-                 */
+        __spu_update_sched_info(ctx);
-                clear_bit(SPU_SCHED_EXITING, &ctx->sched_flags);
+        mutex_unlock(&spu_prio->active_mutex[node]);
-                mb();
-                queue_delayed_work(spu_sched_wq, &ctx->sched_work, SPU_TIMESLICE);
-        }
 }
-void spu_stop_tick(struct spu_context *ctx)
+static int __node_allowed(struct spu_context *ctx, int node)
 {
-        if (ctx->policy == SCHED_RR) {
+        if (nr_cpus_node(node)) {
-                /*
+                cpumask_t mask = node_to_cpumask(node);
-                 * While the work can be rearming normally setting this flag
-                 * makes sure it does not rearm itself anymore.
+                if (cpus_intersects(mask, ctx->cpus_allowed))
-                 */
+                        return 1;
-                set_bit(SPU_SCHED_EXITING, &ctx->sched_flags);
-                mb();
-                cancel_delayed_work(&ctx->sched_work);
        }
+        return 0;
+}
+static int node_allowed(struct spu_context *ctx, int node)
+{
+        int rval;
+        spin_lock(&spu_prio->runq_lock);
+        rval = __node_allowed(ctx, node);
+        spin_unlock(&spu_prio->runq_lock);
+        return rval;
 }
 /**
@@ -99,9 +175,18 @@ void spu_stop_tick(struct spu_context *ctx)
 */
 static void spu_add_to_active_list(struct spu *spu)
 {
-        mutex_lock(&spu_prio->active_mutex[spu->node]);
+        int node = spu->node;
-        list_add_tail(&spu->list, &spu_prio->active_list[spu->node]);
-        mutex_unlock(&spu_prio->active_mutex[spu->node]);
+        mutex_lock(&spu_prio->active_mutex[node]);
+        spu_prio->nr_active[node]++;
+        list_add_tail(&spu->list, &spu_prio->active_list[node]);
+        mutex_unlock(&spu_prio->active_mutex[node]);
+}
+static void __spu_remove_from_active_list(struct spu *spu)
+{
+        list_del_init(&spu->list);
+        spu_prio->nr_active[spu->node]--;
 }
 /**
@@ -113,7 +198,7 @@ static void spu_remove_from_active_list(struct spu *spu)
        int node = spu->node;
        mutex_lock(&spu_prio->active_mutex[node]);
-        list_del_init(&spu->list);
+        __spu_remove_from_active_list(spu);
        mutex_unlock(&spu_prio->active_mutex[node]);
 }
@@ -144,6 +229,10 @@ static void spu_bind_context(struct spu *spu, struct spu_context *ctx)
 {
        pr_debug("%s: pid=%d SPU=%d NODE=%d\n", __FUNCTION__, current->pid,
                 spu->number, spu->node);
+        ctx->stats.slb_flt_base = spu->stats.slb_flt;
+        ctx->stats.class2_intr_base = spu->stats.class2_intr;
        spu->ctx = ctx;
        spu->flags = 0;
        ctx->spu = spu;
@@ -161,8 +250,8 @@ static void spu_bind_context(struct spu *spu, struct spu_context *ctx)
        spu->timestamp = jiffies;
        spu_cpu_affinity_set(spu, raw_smp_processor_id());
        spu_switch_notify(spu, ctx);
-        spu_add_to_active_list(spu);
        ctx->state = SPU_STATE_RUNNABLE;
+        spu_switch_state(spu, SPU_UTIL_SYSTEM);
 }
 /**
@@ -175,7 +264,8 @@ static void spu_unbind_context(struct spu *spu, struct spu_context *ctx)
        pr_debug("%s: unbind pid=%d SPU=%d NODE=%d\n", __FUNCTION__,
                 spu->pid, spu->number, spu->node);
-        spu_remove_from_active_list(spu);
+        spu_switch_state(spu, SPU_UTIL_IDLE);
        spu_switch_notify(spu, NULL);
        spu_unmap_mappings(ctx);
        spu_save(&ctx->csa, spu);
@@ -192,6 +282,11 @@ static void spu_unbind_context(struct spu *spu, struct spu_context *ctx)
        ctx->spu = NULL;
        spu->flags = 0;
        spu->ctx = NULL;
+        ctx->stats.slb_flt +=
+                (spu->stats.slb_flt - ctx->stats.slb_flt_base);
+        ctx->stats.class2_intr +=
+                (spu->stats.class2_intr - ctx->stats.class2_intr_base);
 }
 /**
@@ -200,20 +295,39 @@ static void spu_unbind_context(struct spu *spu, struct spu_context *ctx)
 */
 static void __spu_add_to_rq(struct spu_context *ctx)
 {
-        int prio = ctx->prio;
+        /*
+         * Unfortunately this code path can be called from multiple threads
-        list_add_tail(&ctx->rq, &spu_prio->runq[prio]);
+         * on behalf of a single context due to the way the problem state
-        set_bit(prio, spu_prio->bitmap);
+         * mmap support works.
+         *
+         * Fortunately we need to wake up all these threads at the same time
+         * and can simply skip the runqueue addition for every but the first
+         * thread getting into this codepath.
+         *
+         * It's still quite hacky, and long-term we should proxy all other
+         * threads through the owner thread so that spu_run is in control
+         * of all the scheduling activity for a given context.
+         */
+        if (list_empty(&ctx->rq)) {
+                list_add_tail(&ctx->rq, &spu_prio->runq[ctx->prio]);
+                set_bit(ctx->prio, spu_prio->bitmap);
+                if (!spu_prio->nr_waiting++)
+                        __mod_timer(&spusched_timer, jiffies + SPUSCHED_TICK);
+        }
 }
 static void __spu_del_from_rq(struct spu_context *ctx)
 {
        int prio = ctx->prio;
-        if (!list_empty(&ctx->rq))
+        if (!list_empty(&ctx->rq)) {
+                if (!--spu_prio->nr_waiting)
+                        del_timer(&spusched_timer);
                list_del_init(&ctx->rq);
-        if (list_empty(&spu_prio->runq[prio]))
-                clear_bit(prio, spu_prio->bitmap);
+                if (list_empty(&spu_prio->runq[prio]))
+                        clear_bit(prio, spu_prio->bitmap);
+        }
 }
 static void spu_prio_wait(struct spu_context *ctx)
@@ -244,7 +358,7 @@ static struct spu *spu_get_idle(struct spu_context *ctx)
        for (n = 0; n < MAX_NUMNODES; n++, node++) {
                node = (node < MAX_NUMNODES) ? node : 0;
-                if (!node_allowed(node))
+                if (!node_allowed(ctx, node))
                        continue;
                spu = spu_alloc_node(node);
                if (spu)
@@ -276,15 +390,15 @@ static struct spu *find_victim(struct spu_context *ctx)
        node = cpu_to_node(raw_smp_processor_id());
        for (n = 0; n < MAX_NUMNODES; n++, node++) {
                node = (node < MAX_NUMNODES) ? node : 0;
-                if (!node_allowed(node))
+                if (!node_allowed(ctx, node))
                        continue;
                mutex_lock(&spu_prio->active_mutex[node]);
                list_for_each_entry(spu, &spu_prio->active_list[node], list) {
                        struct spu_context *tmp = spu->ctx;
-                        if (tmp->rt_priority < ctx->rt_priority &&
+                        if (tmp->prio > ctx->prio &&
-                            (!victim || tmp->rt_priority < victim->rt_priority))
+                            (!victim || tmp->prio > victim->prio))
                                victim = spu->ctx;
                }
                mutex_unlock(&spu_prio->active_mutex[node]);
@@ -312,7 +426,10 @@ static struct spu *find_victim(struct spu_context *ctx)
                                victim = NULL;
                                goto restart;
                        }
+                        spu_remove_from_active_list(spu);
                        spu_unbind_context(spu, victim);
+                        victim->stats.invol_ctx_switch++;
+                        spu->stats.invol_ctx_switch++;
                        mutex_unlock(&victim->state_mutex);
                        /*
                         * We need to break out of the wait loop in spu_run
@@ -338,22 +455,30 @@ static struct spu *find_victim(struct spu_context *ctx)
 */
 int spu_activate(struct spu_context *ctx, unsigned long flags)
 {
+        spuctx_switch_state(ctx, SPUCTX_UTIL_SYSTEM);
-        if (ctx->spu)
-                return 0;
        do {
                struct spu *spu;
+                /*
+                 * If there are multiple threads waiting for a single context
+                 * only one actually binds the context while the others will
+                 * only be able to acquire the state_mutex once the context
+                 * already is in runnable state.
+                 */
+                if (ctx->spu)
+                        return 0;
                spu = spu_get_idle(ctx);
                /*
                 * If this is a realtime thread we try to get it running by
                 * preempting a lower priority thread.
                 */
-                if (!spu && ctx->rt_priority)
+                if (!spu && rt_prio(ctx->prio))
                        spu = find_victim(ctx);
                if (spu) {
                        spu_bind_context(spu, ctx);
+                        spu_add_to_active_list(spu);
                        return 0;
                }
@@ -369,23 +494,28 @@ int spu_activate(struct spu_context *ctx, unsigned long flags)
 * Remove the highest priority context on the runqueue and return it
 * to the caller.  Returns %NULL if no runnable context was found.
 */
-static struct spu_context *grab_runnable_context(int prio)
+static struct spu_context *grab_runnable_context(int prio, int node)
 {
-        struct spu_context *ctx = NULL;
+        struct spu_context *ctx;
        int best;
        spin_lock(&spu_prio->runq_lock);
        best = sched_find_first_bit(spu_prio->bitmap);
-        if (best < prio) {
+        while (best < prio) {
                struct list_head *rq = &spu_prio->runq[best];
-                BUG_ON(list_empty(rq));
+                list_for_each_entry(ctx, rq, rq) {
+                        /* XXX(hch): check for affinity here aswell */
-                ctx = list_entry(rq->next, struct spu_context, rq);
+                        if (__node_allowed(ctx, node)) {
-                __spu_del_from_rq(ctx);
+                                __spu_del_from_rq(ctx);
+                                goto found;
+                        }
+                }
+                best++;
        }
+        ctx = NULL;
+ found:
        spin_unlock(&spu_prio->runq_lock);
        return ctx;
 }
@@ -395,9 +525,12 @@ static int __spu_deactivate(struct spu_context *ctx, int force, int max_prio)
        struct spu_context *new = NULL;
        if (spu) {
-                new = grab_runnable_context(max_prio);
+                new = grab_runnable_context(max_prio, spu->node);
                if (new || force) {
+                        spu_remove_from_active_list(spu);
                        spu_unbind_context(spu, ctx);
+                        ctx->stats.vol_ctx_switch++;
+                        spu->stats.vol_ctx_switch++;
                        spu_free(spu);
                        if (new)
                                wake_up(&new->stop_wq);
@@ -417,7 +550,17 @@ static int __spu_deactivate(struct spu_context *ctx, int force, int max_prio)
 */
 void spu_deactivate(struct spu_context *ctx)
 {
+        /*
+         * We must never reach this for a nosched context,
+         * but handle the case gracefull instead of panicing.
+         */
+        if (ctx->flags & SPU_CREATE_NOSCHED) {
+                WARN_ON(1);
+                return;
+        }
        __spu_deactivate(ctx, 1, MAX_PRIO);
+        spuctx_switch_state(ctx, SPUCTX_UTIL_USER);
 }
 /**
@@ -432,56 +575,178 @@ void spu_yield(struct spu_context *ctx)
 {
        if (!(ctx->flags & SPU_CREATE_NOSCHED)) {
                mutex_lock(&ctx->state_mutex);
-                __spu_deactivate(ctx, 0, MAX_PRIO);
+                if (__spu_deactivate(ctx, 0, MAX_PRIO))
+                        spuctx_switch_state(ctx, SPUCTX_UTIL_USER);
+                else {
+                        spuctx_switch_state(ctx, SPUCTX_UTIL_LOADED);
+                        spu_switch_state(ctx->spu, SPU_UTIL_USER);
+                }
                mutex_unlock(&ctx->state_mutex);
        }
 }
-void spu_sched_tick(struct work_struct *work)
+static void spusched_tick(struct spu_context *ctx)
 {
-        struct spu_context *ctx =
+        if (ctx->flags & SPU_CREATE_NOSCHED)
-                container_of(work, struct spu_context, sched_work.work);
+                return;
-        int preempted;
+        if (ctx->policy == SCHED_FIFO)
+                return;
+        if (--ctx->time_slice)
+                return;
        /*
-         * If this context is being stopped avoid rescheduling from the
+         * Unfortunately active_mutex ranks outside of state_mutex, so
-         * scheduler tick because we would block on the state_mutex.
+         * we have to trylock here.  If we fail give the context another
-         * The caller will yield the spu later on anyway.
+         * tick and try again.
         */
-        if (test_bit(SPU_SCHED_EXITING, &ctx->sched_flags))
+        if (mutex_trylock(&ctx->state_mutex)) {
-                return;
+                struct spu *spu = ctx->spu;
+                struct spu_context *new;
-        mutex_lock(&ctx->state_mutex);
+                new = grab_runnable_context(ctx->prio + 1, spu->node);
-        preempted = __spu_deactivate(ctx, 0, ctx->prio + 1);
+                if (new) {
-        mutex_unlock(&ctx->state_mutex);
-        if (preempted) {
+                        __spu_remove_from_active_list(spu);
-                /*
+                        spu_unbind_context(spu, ctx);
-                 * We need to break out of the wait loop in spu_run manually
+                        ctx->stats.invol_ctx_switch++;
-                 * to ensure this context gets put on the runqueue again
+                        spu->stats.invol_ctx_switch++;
-                 * ASAP.
+                        spu_free(spu);
-                 */
+                        wake_up(&new->stop_wq);
-                wake_up(&ctx->stop_wq);
+                        /*
+                         * We need to break out of the wait loop in
+                         * spu_run manually to ensure this context
+                         * gets put on the runqueue again ASAP.
+                         */
+                        wake_up(&ctx->stop_wq);
+                }
+                spu_set_timeslice(ctx);
+                mutex_unlock(&ctx->state_mutex);
        } else {
-                spu_start_tick(ctx);
+                ctx->time_slice++;
        }
 }
-int __init spu_sched_init(void)
+/**
+ * count_active_contexts - count nr of active tasks
+ *
+ * Return the number of tasks currently running or waiting to run.
+ *
+ * Note that we don't take runq_lock / active_mutex here.  Reading
+ * a single 32bit value is atomic on powerpc, and we don't care
+ * about memory ordering issues here.
+ */
+static unsigned long count_active_contexts(void)
 {
-        int i;
+        int nr_active = 0, node;
-        spu_sched_wq = create_singlethread_workqueue("spusched");
+        for (node = 0; node < MAX_NUMNODES; node++)
-        if (!spu_sched_wq)
+                nr_active += spu_prio->nr_active[node];
-                return 1;
+        nr_active += spu_prio->nr_waiting;
-        spu_prio = kzalloc(sizeof(struct spu_prio_array), GFP_KERNEL);
+        return nr_active;
-        if (!spu_prio) {
+}
-                printk(KERN_WARNING "%s: Unable to allocate priority queue.\n",
-                       __FUNCTION__);
+/**
-                       destroy_workqueue(spu_sched_wq);
+ * spu_calc_load - given tick count, update the avenrun load estimates.
-                return 1;
+ * @tick:       tick count
+ *
+ * No locking against reading these values from userspace, as for
+ * the CPU loadavg code.
+ */
+static void spu_calc_load(unsigned long ticks)
+{
+        unsigned long active_tasks; /* fixed-point */
+        static int count = LOAD_FREQ;
+        count -= ticks;
+        if (unlikely(count < 0)) {
+                active_tasks = count_active_contexts() * FIXED_1;
+                do {
+                        CALC_LOAD(spu_avenrun[0], EXP_1, active_tasks);
+                        CALC_LOAD(spu_avenrun[1], EXP_5, active_tasks);
+                        CALC_LOAD(spu_avenrun[2], EXP_15, active_tasks);
+                        count += LOAD_FREQ;
+                } while (count < 0);
        }
+}
+static void spusched_wake(unsigned long data)
+{
+        mod_timer(&spusched_timer, jiffies + SPUSCHED_TICK);
+        wake_up_process(spusched_task);
+        spu_calc_load(SPUSCHED_TICK);
+}
+static int spusched_thread(void *unused)
+{
+        struct spu *spu, *next;
+        int node;
+        while (!kthread_should_stop()) {
+                set_current_state(TASK_INTERRUPTIBLE);
+                schedule();
+                for (node = 0; node < MAX_NUMNODES; node++) {
+                        mutex_lock(&spu_prio->active_mutex[node]);
+                        list_for_each_entry_safe(spu, next,
+                                                 &spu_prio->active_list[node],
+                                                 list)
+                                spusched_tick(spu->ctx);
+                        mutex_unlock(&spu_prio->active_mutex[node]);
+                }
+        }
+        return 0;
+}
+#define LOAD_INT(x) ((x) >> FSHIFT)
+#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
+static int show_spu_loadavg(struct seq_file *s, void *private)
+{
+        int a, b, c;
+        a = spu_avenrun[0] + (FIXED_1/200);
+        b = spu_avenrun[1] + (FIXED_1/200);
+        c = spu_avenrun[2] + (FIXED_1/200);
+        /*
+         * Note that last_pid doesn't really make much sense for the
+         * SPU loadavg (it even seems very odd on the CPU side..),
+         * but we include it here to have a 100% compatible interface.
+         */
+        seq_printf(s, "%d.%02d %d.%02d %d.%02d %ld/%d %d\n",
+                LOAD_INT(a), LOAD_FRAC(a),
+                LOAD_INT(b), LOAD_FRAC(b),
+                LOAD_INT(c), LOAD_FRAC(c),
+                count_active_contexts(),
+                atomic_read(&nr_spu_contexts),
+                current->nsproxy->pid_ns->last_pid);
+        return 0;
+}
+static int spu_loadavg_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, show_spu_loadavg, NULL);
+}
+static const struct file_operations spu_loadavg_fops = {
+        .open           = spu_loadavg_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+int __init spu_sched_init(void)
+{
+        struct proc_dir_entry *entry;
+        int err = -ENOMEM, i;
+        spu_prio = kzalloc(sizeof(struct spu_prio_array), GFP_KERNEL);
+        if (!spu_prio)
+                goto out;
        for (i = 0; i < MAX_PRIO; i++) {
                INIT_LIST_HEAD(&spu_prio->runq[i]);
                __clear_bit(i, spu_prio->bitmap);
@@ -492,7 +757,30 @@ int __init spu_sched_init(void)
                INIT_LIST_HEAD(&spu_prio->active_list[i]);
        }
        spin_lock_init(&spu_prio->runq_lock);
+        setup_timer(&spusched_timer, spusched_wake, 0);
+        spusched_task = kthread_run(spusched_thread, NULL, "spusched");
+        if (IS_ERR(spusched_task)) {
+                err = PTR_ERR(spusched_task);
+                goto out_free_spu_prio;
+        }
+        entry = create_proc_entry("spu_loadavg", 0, NULL);
+        if (!entry)
+                goto out_stop_kthread;
+        entry->proc_fops = &spu_loadavg_fops;
+        pr_debug("spusched: tick: %d, min ticks: %d, default ticks: %d\n",
+                        SPUSCHED_TICK, MIN_SPU_TIMESLICE, DEF_SPU_TIMESLICE);
        return 0;
+ out_stop_kthread:
+        kthread_stop(spusched_task);
+ out_free_spu_prio:
+        kfree(spu_prio);
+ out:
+        return err;
 }
 void __exit spu_sched_exit(void)
@@ -500,6 +788,11 @@ void __exit spu_sched_exit(void)
        struct spu *spu, *tmp;
        int node;
+        remove_proc_entry("spu_loadavg", NULL);
+        del_timer_sync(&spusched_timer);
+        kthread_stop(spusched_task);
        for (node = 0; node < MAX_NUMNODES; node++) {
                mutex_lock(&spu_prio->active_mutex[node]);
                list_for_each_entry_safe(spu, tmp, &spu_prio->active_list[node],
@@ -510,5 +803,4 @@ void __exit spu_sched_exit(void)
                mutex_unlock(&spu_prio->active_mutex[node]);
        }
        kfree(spu_prio);
-        destroy_workqueue(spu_sched_wq);
 }
diff --git a/arch/powerpc/platforms/cell/spufs/spu_restore.c b/arch/powerpc/platforms/cell/spufs/spu_restore.c
index 0bf723dcd6..4e19ed7a07 100644
--- a/arch/powerpc/platforms/cell/spufs/spu_restore.c
+++ b/arch/powerpc/platforms/cell/spufs/spu_restore.c
@@ -296,7 +296,7 @@ static inline void restore_complete(void)
 * This code deviates from the documented sequence in the
 * following aspects:
 *
- *      1. The EA for LSCSA is passed from PPE in the
+ *      1. The EA for LSCSA is passed from PPE in the
 *         signal notification channels.
 *      2. The register spill area is pulled by SPU
 *         into LS, rather than pushed by PPE.
diff --git a/arch/powerpc/platforms/cell/spufs/spu_save.c b/arch/powerpc/platforms/cell/spufs/spu_save.c
index 196033b8a5..ae95cc1701 100644
--- a/arch/powerpc/platforms/cell/spufs/spu_save.c
+++ b/arch/powerpc/platforms/cell/spufs/spu_save.c
@@ -44,7 +44,7 @@ static inline void save_event_mask(void)
         *    Read the SPU_RdEventMsk channel and save to the LSCSA.
         */
        offset = LSCSA_QW_OFFSET(event_mask);
-        regs_spill[offset].slot[0] = spu_readch(SPU_RdEventStatMask);
+        regs_spill[offset].slot[0] = spu_readch(SPU_RdEventMask);
 }
 static inline void save_tag_mask(void)
diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h
index 47617e8014..08b3530288 100644
--- a/arch/powerpc/platforms/cell/spufs/spufs.h
+++ b/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -26,6 +26,7 @@
 #include <linux/mutex.h>
 #include <linux/spinlock.h>
 #include <linux/fs.h>
+#include <linux/cpumask.h>
 #include <asm/spu.h>
 #include <asm/spu_csa.h>
@@ -39,9 +40,17 @@ enum {
 struct spu_context_ops;
 struct spu_gang;
-/* ctx->sched_flags */
+/*
-enum {
+ * This is the state for spu utilization reporting to userspace.
-        SPU_SCHED_EXITING = 0,
+ * Because this state is visible to userspace it must never change and needs
+ * to be kept strictly separate from any internal state kept by the kernel.
+ */
+enum spuctx_execution_state {
+        SPUCTX_UTIL_USER = 0,
+        SPUCTX_UTIL_SYSTEM,
+        SPUCTX_UTIL_IOWAIT,
+        SPUCTX_UTIL_LOADED,
+        SPUCTX_UTIL_MAX
 };
 struct spu_context {
@@ -81,13 +90,34 @@ struct spu_context {
        struct list_head gang_list;
        struct spu_gang *gang;
+        /* owner thread */
+        pid_t tid;
        /* scheduler fields */
-        struct list_head rq;
+        struct list_head rq;
-        struct delayed_work sched_work;
+        unsigned int time_slice;
        unsigned long sched_flags;
-        unsigned long rt_priority;
+        cpumask_t cpus_allowed;
        int policy;
        int prio;
+        /* statistics */
+        struct {
+                /* updates protected by ctx->state_mutex */
+                enum spuctx_execution_state execution_state;
+                unsigned long tstamp;           /* time of last ctx switch */
+                unsigned long times[SPUCTX_UTIL_MAX];
+                unsigned long long vol_ctx_switch;
+                unsigned long long invol_ctx_switch;
+                unsigned long long min_flt;
+                unsigned long long maj_flt;
+                unsigned long long hash_flt;
+                unsigned long long slb_flt;
+                unsigned long long slb_flt_base; /* # at last ctx switch */
+                unsigned long long class2_intr;
+                unsigned long long class2_intr_base; /* # at last ctx switch */
+                unsigned long long libassist;
+        } stats;
 };
 struct spu_gang {
@@ -177,6 +207,7 @@ void spu_gang_add_ctx(struct spu_gang *gang, struct spu_context *ctx);
 int spufs_handle_class1(struct spu_context *ctx);
 /* context management */
+extern atomic_t nr_spu_contexts;
 static inline void spu_acquire(struct spu_context *ctx)
 {
        mutex_lock(&ctx->state_mutex);
@@ -200,9 +231,9 @@ void spu_acquire_saved(struct spu_context *ctx);
 int spu_activate(struct spu_context *ctx, unsigned long flags);
 void spu_deactivate(struct spu_context *ctx);
 void spu_yield(struct spu_context *ctx);
-void spu_start_tick(struct spu_context *ctx);
+void spu_set_timeslice(struct spu_context *ctx);
-void spu_stop_tick(struct spu_context *ctx);
+void spu_update_sched_info(struct spu_context *ctx);
-void spu_sched_tick(struct work_struct *work);
+void __spu_update_sched_info(struct spu_context *ctx);
 int __init spu_sched_init(void);
 void __exit spu_sched_exit(void);
@@ -210,7 +241,7 @@ extern char *isolated_loader;
 /*
 * spufs_wait
- *      Same as wait_event_interruptible(), except that here
+ *      Same as wait_event_interruptible(), except that here
 *      we need to call spu_release(ctx) before sleeping, and
 *      then spu_acquire(ctx) when awoken.
 */
@@ -256,4 +287,37 @@ struct spufs_coredump_reader {
 extern struct spufs_coredump_reader spufs_coredump_read[];
 extern int spufs_coredump_num_notes;
+/*
+ * This function is a little bit too large for an inline, but
+ * as fault.c is built into the kernel we can't move it out of
+ * line.
+ */
+static inline void spuctx_switch_state(struct spu_context *ctx,
+                enum spuctx_execution_state new_state)
+{
+        WARN_ON(!mutex_is_locked(&ctx->state_mutex));
+        if (ctx->stats.execution_state != new_state) {
+                unsigned long curtime = jiffies;
+                ctx->stats.times[ctx->stats.execution_state] +=
+                                 curtime - ctx->stats.tstamp;
+                ctx->stats.tstamp = curtime;
+                ctx->stats.execution_state = new_state;
+        }
+}
+static inline void spu_switch_state(struct spu *spu,
+                enum spuctx_execution_state new_state)
+{
+        if (spu->stats.utilization_state != new_state) {
+                unsigned long curtime = jiffies;
+                spu->stats.times[spu->stats.utilization_state] +=
+                                 curtime - spu->stats.tstamp;
+                spu->stats.tstamp = curtime;
+                spu->stats.utilization_state = new_state;
+        }
+}
 #endif
diff --git a/arch/powerpc/platforms/cell/spufs/switch.c b/arch/powerpc/platforms/cell/spufs/switch.c
index 71a0b41adb..9c506ba08c 100644
--- a/arch/powerpc/platforms/cell/spufs/switch.c
+++ b/arch/powerpc/platforms/cell/spufs/switch.c
@@ -70,7 +70,7 @@
  }
 #endif                          /* debug */
-#define POLL_WHILE_FALSE(_c)    POLL_WHILE_TRUE(!(_c))
+#define POLL_WHILE_FALSE(_c)    POLL_WHILE_TRUE(!(_c))
 static inline void acquire_spu_lock(struct spu *spu)
 {
@@ -387,6 +387,19 @@ static inline void save_ppu_querytype(struct spu_state *csa, struct spu *spu)
        csa->prob.dma_querytype_RW = in_be32(&prob->dma_querytype_RW);
 }
+static inline void save_ppu_tagstatus(struct spu_state *csa, struct spu *spu)
+{
+        struct spu_problem __iomem *prob = spu->problem;
+        /* Save the Prxy_TagStatus register in the CSA.
+         *
+         * It is unnecessary to restore dma_tagstatus_R, however,
+         * dma_tagstatus_R in the CSA is accessed via backing_ops, so
+         * we must save it.
+         */
+        csa->prob.dma_tagstatus_R = in_be32(&prob->dma_tagstatus_R);
+}
 static inline void save_mfc_csr_tsq(struct spu_state *csa, struct spu *spu)
 {
        struct spu_priv2 __iomem *priv2 = spu->priv2;
@@ -1812,6 +1825,7 @@ static void save_csa(struct spu_state *prev, struct spu *spu)
        save_mfc_queues(prev, spu);     /* Step 19. */
        save_ppu_querymask(prev, spu);  /* Step 20. */
        save_ppu_querytype(prev, spu);  /* Step 21. */
+        save_ppu_tagstatus(prev, spu);  /* NEW.     */
        save_mfc_csr_tsq(prev, spu);    /* Step 22. */
        save_mfc_csr_cmd(prev, spu);    /* Step 23. */
        save_mfc_csr_ato(prev, spu);    /* Step 24. */
@@ -1930,7 +1944,7 @@ static void harvest(struct spu_state *prev, struct spu *spu)
        reset_spu_privcntl(prev, spu);          /* Step 16. */
        reset_spu_lslr(prev, spu);              /* Step 17. */
        setup_mfc_sr1(prev, spu);               /* Step 18. */
-        spu_invalidate_slbs(spu);               /* Step 19. */
+        spu_invalidate_slbs(spu);               /* Step 19. */
        reset_ch_part1(prev, spu);              /* Step 20. */
        reset_ch_part2(prev, spu);              /* Step 21. */
        enable_interrupts(prev, spu);           /* Step 22. */
diff --git a/arch/powerpc/platforms/chrp/Kconfig b/arch/powerpc/platforms/chrp/Kconfig
index d2c6905319..22b4b4e3b6 100644
--- a/arch/powerpc/platforms/chrp/Kconfig
+++ b/arch/powerpc/platforms/chrp/Kconfig
@@ -8,4 +8,5 @@ config PPC_CHRP
        select PPC_MPC106
        select PPC_UDBG_16550
        select PPC_NATIVE
+        select PCI
        default y
diff --git a/arch/powerpc/platforms/chrp/Makefile b/arch/powerpc/platforms/chrp/Makefile
index 902feb1ac4..4b3bfadc70 100644
--- a/arch/powerpc/platforms/chrp/Makefile
+++ b/arch/powerpc/platforms/chrp/Makefile
@@ -1,4 +1,3 @@
-obj-y                           += setup.o time.o pegasos_eth.o
+obj-y                           += setup.o time.o pegasos_eth.o pci.o
-obj-$(CONFIG_PCI)               += pci.o
 obj-$(CONFIG_SMP)               += smp.o
 obj-$(CONFIG_NVRAM)             += nvram.o
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index d32fedc991..3690624e49 100644
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -99,7 +99,7 @@ int rtas_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
        struct pci_controller *hose = bus->sysdata;
        unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)
                | (((bus->number - hose->first_busno) & 0xff) << 16)
-                | (hose->index << 24);
+                | (hose->global_number << 24);
        int ret = -1;
        int rval;
@@ -114,7 +114,7 @@ int rtas_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
        struct pci_controller *hose = bus->sysdata;
        unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)
                | (((bus->number - hose->first_busno) & 0xff) << 16)
-                | (hose->index << 24);
+                | (hose->global_number << 24);
        int rval;
        rval = rtas_call(rtas_token("write-pci-config"), 3, 1, NULL,
@@ -254,13 +254,12 @@ chrp_find_bridges(void)
                        printk(" at %llx", (unsigned long long)r.start);
                printk("\n");
-                hose = pcibios_alloc_controller();
+                hose = pcibios_alloc_controller(dev);
                if (!hose) {
                        printk("Can't allocate PCI controller structure for %s\n",
                                dev->full_name);
                        continue;
                }
-                hose->arch_data = dev;
                hose->first_busno = bus_range[0];
                hose->last_busno = bus_range[1];
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index f2d26268ca..bec772674e 100644
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -28,6 +28,7 @@ config PPC_HOLLY
        bool "PPC750GX/CL with TSI10x bridge (Hickory/Holly)"
        select TSI108_BRIDGE
        select PPC_UDBG_16550
+        select WANT_DEVICE_TREE
        help
          Select PPC_HOLLY if configuring for an IBM 750GX/CL Eval
          Board with TSI108/9 bridge (Hickory/Holly)
@@ -44,6 +45,7 @@ endchoice
 config TSI108_BRIDGE
        bool
        depends on MPC7448HPC2 || PPC_HOLLY
+        select PCI
        select MPIC
        select MPIC_WEIRD
        default y
diff --git a/arch/powerpc/platforms/embedded6xx/holly.c b/arch/powerpc/platforms/embedded6xx/holly.c
index 3a0b4a0140..6292e36dc5 100644
--- a/arch/powerpc/platforms/embedded6xx/holly.c
+++ b/arch/powerpc/platforms/embedded6xx/holly.c
@@ -45,7 +45,7 @@
 #define HOLLY_PCI_CFG_PHYS 0x7c000000
-int holly_exclude_device(u_char bus, u_char devfn)
+int holly_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn)
 {
        if (bus == 0 && PCI_SLOT(devfn) == 0)
                return PCIBIOS_DEVICE_NOT_FOUND;
diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c
index b412f006a9..f4d0a7a603 100644
--- a/arch/powerpc/platforms/embedded6xx/linkstation.c
+++ b/arch/powerpc/platforms/embedded6xx/linkstation.c
@@ -54,8 +54,9 @@ static struct mtd_partition linkstation_physmap_partitions[] = {
        },
 };
-static int __init add_bridge(struct device_node *dev)
+static int __init linkstation_add_bridge(struct device_node *dev)
 {
+#ifdef CONFIG_PCI
        int len;
        struct pci_controller *hose;
        const int *bus_range;
@@ -67,18 +68,17 @@ static int __init add_bridge(struct device_node *dev)
                printk(KERN_WARNING "Can't get bus-range for %s, assume"
                                " bus 0\n", dev->full_name);
-        hose = pcibios_alloc_controller();
+        hose = pcibios_alloc_controller(dev);
        if (hose == NULL)
                return -ENOMEM;
        hose->first_busno = bus_range ? bus_range[0] : 0;
        hose->last_busno = bus_range ? bus_range[1] : 0xff;
-        hose->arch_data = dev;
        setup_indirect_pci(hose, 0xfec00000, 0xfee00000);
        /* Interpret the "ranges" property */
        /* This also maps the I/O region and sets isa_io/mem_base */
        pci_process_bridge_OF_ranges(hose, dev, 1);
+#endif
        return 0;
 }
@@ -92,7 +92,7 @@ static void __init linkstation_setup_arch(void)
        /* Lookup PCI host bridges */
        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
-                add_bridge(np);
+                linkstation_add_bridge(np);
        printk(KERN_INFO "BUFFALO Network Attached Storage Series\n");
        printk(KERN_INFO "(C) 2002-2005 BUFFALO INC.\n");
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
index 4542e0c837..1e3cc69487 100644
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -54,15 +54,10 @@
 #define MPC7448HPC2_PCI_CFG_PHYS 0xfb000000
-#ifndef CONFIG_PCI
-isa_io_base = MPC7448_HPC2_ISA_IO_BASE;
-isa_mem_base = MPC7448_HPC2_ISA_MEM_BASE;
-pci_dram_offset = MPC7448_HPC2_PCI_MEM_OFFSET;
-#endif
 extern void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
-int mpc7448_hpc2_exclude_device(u_char bus, u_char devfn)
+int mpc7448_hpc2_exclude_device(struct pci_controller *hose,
+                                u_char bus, u_char devfn)
 {
        if (bus == 0 && PCI_SLOT(devfn) == 0)
                return PCIBIOS_DEVICE_NOT_FOUND;
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h
index a543a5242e..f7e0e0c7f8 100644
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h
+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h
@@ -18,9 +18,4 @@
 #include <asm/ppcboot.h>
-/* Base Addresses for the PCI bus
- */
-#define MPC7448_HPC2_PCI_MEM_OFFSET     (0x00000000)
-#define MPC7448_HPC2_ISA_IO_BASE        (0x00000000)
-#define MPC7448_HPC2_ISA_MEM_BASE       (0x00000000)
 #endif                          /* __PPC_PLATFORMS_MPC7448_HPC2_H */
diff --git a/arch/powerpc/platforms/iseries/call_hpt.h b/arch/powerpc/platforms/iseries/call_hpt.h
index a843b0f87b..8d95fe4b55 100644
--- a/arch/powerpc/platforms/iseries/call_hpt.h
+++ b/arch/powerpc/platforms/iseries/call_hpt.h
@@ -76,24 +76,25 @@ static inline u64 HvCallHpt_invalidateSetSwBitsGet(u32 hpteIndex, u8 bitson,
        return compressedStatus;
 }
-static inline u64 HvCallHpt_findValid(hpte_t *hpte, u64 vpn)
+static inline u64 HvCallHpt_findValid(struct hash_pte *hpte, u64 vpn)
 {
        return HvCall3Ret16(HvCallHptFindValid, hpte, vpn, 0, 0);
 }
-static inline u64 HvCallHpt_findNextValid(hpte_t *hpte, u32 hpteIndex,
+static inline u64 HvCallHpt_findNextValid(struct hash_pte *hpte, u32 hpteIndex,
                u8 bitson, u8 bitsoff)
 {
        return HvCall3Ret16(HvCallHptFindNextValid, hpte, hpteIndex,
                        bitson, bitsoff);
 }
-static inline void HvCallHpt_get(hpte_t *hpte, u32 hpteIndex)
+static inline void HvCallHpt_get(struct hash_pte *hpte, u32 hpteIndex)
 {
        HvCall2Ret16(HvCallHptGet, hpte, hpteIndex, 0);
 }
-static inline void HvCallHpt_addValidate(u32 hpteIndex, u32 hBit, hpte_t *hpte)
+static inline void HvCallHpt_addValidate(u32 hpteIndex, u32 hBit,
+                                         struct hash_pte *hpte)
 {
        HvCall4(HvCallHptAddValidate, hpteIndex, hBit, hpte->v, hpte->r);
 }
diff --git a/arch/powerpc/platforms/iseries/htab.c b/arch/powerpc/platforms/iseries/htab.c
index ed44dfceaa..b4e2c7a038 100644
--- a/arch/powerpc/platforms/iseries/htab.c
+++ b/arch/powerpc/platforms/iseries/htab.c
@@ -44,7 +44,7 @@ long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va,
                         unsigned long vflags, int psize)
 {
        long slot;
-        hpte_t lhpte;
+        struct hash_pte lhpte;
        int secondary = 0;
        BUG_ON(psize != MMU_PAGE_4K);
@@ -99,7 +99,7 @@ long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va,
 static unsigned long iSeries_hpte_getword0(unsigned long slot)
 {
-        hpte_t hpte;
+        struct hash_pte hpte;
        HvCallHpt_get(&hpte, slot);
        return hpte.v;
@@ -144,7 +144,7 @@ static long iSeries_hpte_remove(unsigned long hpte_group)
 static long iSeries_hpte_updatepp(unsigned long slot, unsigned long newpp,
                                  unsigned long va, int psize, int local)
 {
-        hpte_t hpte;
+        struct hash_pte hpte;
        unsigned long want_v;
        iSeries_hlock(slot);
@@ -176,7 +176,7 @@ static long iSeries_hpte_updatepp(unsigned long slot, unsigned long newpp,
 */
 static long iSeries_hpte_find(unsigned long vpn)
 {
-        hpte_t hpte;
+        struct hash_pte hpte;
        long slot;
        /*
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index 9c97422715..da87162000 100644
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -742,6 +742,11 @@ void __init iSeries_pcibios_init(void)
        /* Install IO hooks */
        ppc_pci_io = iseries_pci_io;
+        /* iSeries has no IO space in the common sense, it needs to set
+         * the IO base to 0
+         */
+        pci_io_base = 0;
        if (root == NULL) {
                printk(KERN_CRIT "iSeries_pcibios_init: can't find root "
                                "of device tree\n");
@@ -763,7 +768,7 @@ void __init iSeries_pcibios_init(void)
                if (phb == NULL)
                        continue;
-                phb->pci_mem_offset = phb->local_number = bus;
+                phb->pci_mem_offset = bus;
                phb->first_busno = bus;
                phb->last_busno = bus;
                phb->ops = &iSeries_pci_ops;
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 7f5dcee814..13a8b1908d 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -79,8 +79,6 @@ extern void iSeries_pci_final_fixup(void);
 static void iSeries_pci_final_fixup(void) { }
 #endif
-extern unsigned long iSeries_recal_tb;
-extern unsigned long iSeries_recal_titan;
 struct MemoryBlock {
        unsigned long absStart;
@@ -292,8 +290,8 @@ static void __init iSeries_init_early(void)
 {
        DBG(" -> iSeries_init_early()\n");
-        iSeries_recal_tb = get_tb();
+        /* Snapshot the timebase, for use in later recalibration */
-        iSeries_recal_titan = HvCallXm_loadTod();
+        iSeries_time_init_early();
        /*
         * Initialize the DMA/TCE management
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index 7aaa5bbc93..fceaae40fe 100644
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -444,7 +444,7 @@ static void __init setup_u3_ht(struct pci_controller* hose)
        u3_ht = hose;
 }
-static int __init add_bridge(struct device_node *dev)
+static int __init maple_add_bridge(struct device_node *dev)
 {
        int len;
        struct pci_controller *hose;
@@ -519,23 +519,6 @@ void __devinit maple_pci_irq_fixup(struct pci_dev *dev)
        DBG(" <- maple_pci_irq_fixup\n");
 }
-static void __init maple_fixup_phb_resources(void)
-{
-        struct pci_controller *hose, *tmp;
-        
-        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
-                unsigned long offset = (unsigned long)hose->io_base_virt - pci_io_base;
-                hose->io_resource.start += offset;
-                hose->io_resource.end += offset;
-                printk(KERN_INFO "PCI Host %d, io start: %llx; io end: %llx\n",
-                       hose->global_number,
-                       (unsigned long long)hose->io_resource.start,
-                       (unsigned long long)hose->io_resource.end);
-        }
-}
 void __init maple_pci_init(void)
 {
        struct device_node *np, *root;
@@ -558,7 +541,7 @@ void __init maple_pci_init(void)
                        continue;
                if ((of_device_is_compatible(np, "u4-pcie") ||
                     of_device_is_compatible(np, "u3-agp")) &&
-                    add_bridge(np) == 0)
+                    maple_add_bridge(np) == 0)
                        of_node_get(np);
                if (of_device_is_compatible(np, "u3-ht")) {
@@ -570,27 +553,9 @@ void __init maple_pci_init(void)
        /* Now setup the HyperTransport host if we found any
         */
-        if (ht && add_bridge(ht) != 0)
+        if (ht && maple_add_bridge(ht) != 0)
                of_node_put(ht);
-        /*
-         * We need to call pci_setup_phb_io for the HT bridge first
-         * so it gets the I/O port numbers starting at 0, and we
-         * need to call it for the AGP bridge after that so it gets
-         * small positive I/O port numbers.
-         */
-        if (u3_ht)
-                pci_setup_phb_io(u3_ht, 1);
-        if (u3_agp)
-                pci_setup_phb_io(u3_agp, 0);
-        if (u4_pcie)
-                pci_setup_phb_io(u4_pcie, 0);
-        /* Fixup the IO resources on our host bridges as the common code
-         * does it only for childs of the host bridges
-         */
-        maple_fixup_phb_resources();
        /* Setup the linkage between OF nodes and PHBs */ 
        pci_devs_phb_init();
diff --git a/arch/powerpc/platforms/pasemi/Kconfig b/arch/powerpc/platforms/pasemi/Kconfig
index 7c5076e38e..95cd90fd81 100644
--- a/arch/powerpc/platforms/pasemi/Kconfig
+++ b/arch/powerpc/platforms/pasemi/Kconfig
@@ -25,4 +25,13 @@ config PPC_PASEMI_MDIO
        help
          Driver for MDIO via GPIO on PWRficient platforms
+config ELECTRA_IDE
+      tristate "Electra IDE driver"
+      default y
+      depends on PPC_PASEMI && ATA
+      select PATA_PLATFORM
+      help
+        This includes driver support for the Electra on-board IDE
+        interface.
 endmenu
diff --git a/arch/powerpc/platforms/pasemi/Makefile b/arch/powerpc/platforms/pasemi/Makefile
index 2cd2a4f26a..f47fcac7e5 100644
--- a/arch/powerpc/platforms/pasemi/Makefile
+++ b/arch/powerpc/platforms/pasemi/Makefile
@@ -1,3 +1,4 @@
 obj-y   += setup.o pci.o time.o idle.o powersave.o iommu.o
 obj-$(CONFIG_PPC_PASEMI_MDIO)   += gpio_mdio.o
+obj-$(CONFIG_ELECTRA_IDE) += electra_ide.o
 obj-$(CONFIG_PPC_PASEMI_CPUFREQ) += cpufreq.o
diff --git a/arch/powerpc/platforms/pasemi/electra_ide.c b/arch/powerpc/platforms/pasemi/electra_ide.c
new file mode 100644
index 0000000000..12fb0c9492
--- /dev/null
+++ b/arch/powerpc/platforms/pasemi/electra_ide.c
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2007 PA Semi, Inc
+ *
+ * Maintained by: Olof Johansson <olof@lixom.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+#include <linux/platform_device.h>
+#include <asm/prom.h>
+#include <asm/system.h>
+/* The electra IDE interface is incredibly simple: Just a device on the localbus
+ * with interrupts hooked up to one of the GPIOs. The device tree contains the
+ * address window and interrupt mappings already, and the pata_platform driver handles
+ * the rest. We just need to hook the two up.
+ */
+#define MAX_IFS 4       /* really, we have only one */
+static struct platform_device *pdevs[MAX_IFS];
+static int __devinit electra_ide_init(void)
+{
+        struct device_node *np;
+        struct resource r[3];
+        int ret = 0;
+        int i;
+        np = of_find_compatible_node(NULL, "ide", "electra-ide");
+        i = 0;
+        while (np && i < MAX_IFS) {
+                memset(r, 0, sizeof(r));
+                /* pata_platform wants two address ranges: one for the base registers,
+                 * another for the control (altstatus). It's located at offset 0x3f6 in
+                 * the window, but the device tree only has one large register window
+                 * that covers both ranges. So we need to split it up by hand here:
+                 */
+                ret = of_address_to_resource(np, 0, &r[0]);
+                if (ret)
+                        goto out;
+                ret = of_address_to_resource(np, 0, &r[1]);
+                if (ret)
+                        goto out;
+                r[1].start += 0x3f6;
+                r[0].end = r[1].start-1;
+                r[2].start = irq_of_parse_and_map(np, 0);
+                r[2].end = irq_of_parse_and_map(np, 0);
+                r[2].flags = IORESOURCE_IRQ;
+                pr_debug("registering platform device at 0x%lx/0x%lx, irq is %ld\n",
+                         r[0].start, r[1].start, r[2].start);
+                pdevs[i] = platform_device_register_simple("pata_platform", i, r, 3);
+                if (IS_ERR(pdevs[i])) {
+                        ret = PTR_ERR(pdevs[i]);
+                        pdevs[i] = NULL;
+                        goto out;
+                }
+                np = of_find_compatible_node(np, "ide", "electra-ide");
+        }
+out:
+        return ret;
+}
+module_init(electra_ide_init);
+static void __devexit electra_ide_exit(void)
+{
+        int i;
+        for (i = 0; i < MAX_IFS; i++)
+                if (pdevs[i])
+                        platform_device_unregister(pdevs[i]);
+}
+module_exit(electra_ide_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>");
+MODULE_DESCRIPTION("PA Semi Electra IDE driver");
diff --git a/arch/powerpc/platforms/pasemi/pci.c b/arch/powerpc/platforms/pasemi/pci.c
index bbc6dfcfaa..ab1f5f62bc 100644
--- a/arch/powerpc/platforms/pasemi/pci.c
+++ b/arch/powerpc/platforms/pasemi/pci.c
@@ -132,7 +132,7 @@ static void __init setup_pa_pxp(struct pci_controller *hose)
        hose->cfg_data = ioremap(0xe0000000, 0x10000000);
 }
-static int __init add_bridge(struct device_node *dev)
+static int __init pas_add_bridge(struct device_node *dev)
 {
        struct pci_controller *hose;
@@ -150,29 +150,11 @@ static int __init add_bridge(struct device_node *dev)
        printk(KERN_INFO "Found PA-PXP PCI host bridge.\n");
        /* Interpret the "ranges" property */
-        /* This also maps the I/O region and sets isa_io/mem_base */
        pci_process_bridge_OF_ranges(hose, dev, 1);
-        pci_setup_phb_io(hose, 1);
        return 0;
 }
-static void __init pas_fixup_phb_resources(void)
-{
-        struct pci_controller *hose, *tmp;
-        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
-                unsigned long offset = (unsigned long)hose->io_base_virt - pci_io_base;
-                hose->io_resource.start += offset;
-                hose->io_resource.end += offset;
-                printk(KERN_INFO "PCI Host %d, io start: %lx; io end: %lx\n",
-                       hose->global_number,
-                       hose->io_resource.start, hose->io_resource.end);
-        }
-}
 void __init pas_pci_init(void)
 {
        struct device_node *np, *root;
@@ -185,13 +167,11 @@ void __init pas_pci_init(void)
        }
        for (np = NULL; (np = of_get_next_child(root, np)) != NULL;)
-                if (np->name && !strcmp(np->name, "pxp") && !add_bridge(np))
+                if (np->name && !strcmp(np->name, "pxp") && !pas_add_bridge(np))
                        of_node_get(np);
        of_node_put(root);
-        pas_fixup_phb_resources();
        /* Setup the linkage between OF nodes and PHBs */
        pci_devs_phb_init();
diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c
index c5a3f61f8d..ffe6528048 100644
--- a/arch/powerpc/platforms/pasemi/setup.c
+++ b/arch/powerpc/platforms/pasemi/setup.c
@@ -239,7 +239,7 @@ static int __init pas_probe(void)
        return 1;
 }
-define_machine(pas) {
+define_machine(pasemi) {
        .name                   = "PA Semi PA6T-1682M",
        .probe                  = pas_probe,
        .setup_arch             = pas_setup_arch,
diff --git a/arch/powerpc/platforms/powermac/Kconfig b/arch/powerpc/platforms/powermac/Kconfig
index 5b7afe5003..055990ca8c 100644
--- a/arch/powerpc/platforms/powermac/Kconfig
+++ b/arch/powerpc/platforms/powermac/Kconfig
@@ -2,6 +2,7 @@ config PPC_PMAC
        bool "Apple PowerMac based machines"
        depends on PPC_MULTIPLATFORM
        select MPIC
+        select PCI
        select PPC_INDIRECT_PCI if PPC32
        select PPC_MPC106 if PPC32
        select PPC_NATIVE
diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c
index 3f507ab9c5..efdf5eb81e 100644
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
@@ -42,6 +42,7 @@
 #include <linux/interrupt.h>
 #include <linux/completion.h>
 #include <linux/timer.h>
+#include <linux/mutex.h>
 #include <asm/keylargo.h>
 #include <asm/uninorth.h>
 #include <asm/io.h>
@@ -84,7 +85,7 @@ struct pmac_i2c_bus
        void                    *hostdata;
        int                     channel;        /* some hosts have multiple */
        int                     mode;           /* current mode */
-        struct semaphore        sem;
+        struct mutex            mutex;
        int                     opened;
        int                     polled;         /* open mode */
        struct platform_device  *platform_dev;
@@ -104,7 +105,7 @@ static LIST_HEAD(pmac_i2c_busses);
 struct pmac_i2c_host_kw
 {
-        struct semaphore        mutex;          /* Access mutex for use by
+        struct mutex            mutex;          /* Access mutex for use by
                                                 * i2c-keywest */
        void __iomem            *base;          /* register base address */
        int                     bsteps;         /* register stepping */
@@ -375,14 +376,14 @@ static void kw_i2c_timeout(unsigned long data)
 static int kw_i2c_open(struct pmac_i2c_bus *bus)
 {
        struct pmac_i2c_host_kw *host = bus->hostdata;
-        down(&host->mutex);
+        mutex_lock(&host->mutex);
        return 0;
 }
 static void kw_i2c_close(struct pmac_i2c_bus *bus)
 {
        struct pmac_i2c_host_kw *host = bus->hostdata;
-        up(&host->mutex);
+        mutex_unlock(&host->mutex);
 }
 static int kw_i2c_xfer(struct pmac_i2c_bus *bus, u8 addrdir, int subsize,
@@ -498,7 +499,7 @@ static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np)
                kfree(host);
                return NULL;
        }
-        init_MUTEX(&host->mutex);
+        mutex_init(&host->mutex);
        init_completion(&host->complete);
        spin_lock_init(&host->lock);
        init_timer(&host->timeout_timer);
@@ -571,7 +572,7 @@ static void __init kw_i2c_add(struct pmac_i2c_host_kw *host,
        bus->open = kw_i2c_open;
        bus->close = kw_i2c_close;
        bus->xfer = kw_i2c_xfer;
-        init_MUTEX(&bus->sem);
+        mutex_init(&bus->mutex);
        if (controller == busnode)
                bus->flags = pmac_i2c_multibus;
        list_add(&bus->link, &pmac_i2c_busses);
@@ -798,7 +799,7 @@ static void __init pmu_i2c_probe(void)
                bus->mode = pmac_i2c_mode_std;
                bus->hostdata = bus + 1;
                bus->xfer = pmu_i2c_xfer;
-                init_MUTEX(&bus->sem);
+                mutex_init(&bus->mutex);
                bus->flags = pmac_i2c_multibus;
                list_add(&bus->link, &pmac_i2c_busses);
@@ -921,7 +922,7 @@ static void __init smu_i2c_probe(void)
                bus->mode = pmac_i2c_mode_std;
                bus->hostdata = bus + 1;
                bus->xfer = smu_i2c_xfer;
-                init_MUTEX(&bus->sem);
+                mutex_init(&bus->mutex);
                bus->flags = 0;
                list_add(&bus->link, &pmac_i2c_busses);
@@ -1093,13 +1094,13 @@ int pmac_i2c_open(struct pmac_i2c_bus *bus, int polled)
 {
        int rc;
-        down(&bus->sem);
+        mutex_lock(&bus->mutex);
        bus->polled = polled || pmac_i2c_force_poll;
        bus->opened = 1;
        bus->mode = pmac_i2c_mode_std;
        if (bus->open && (rc = bus->open(bus)) != 0) {
                bus->opened = 0;
-                up(&bus->sem);
+                mutex_unlock(&bus->mutex);
                return rc;
        }
        return 0;
@@ -1112,7 +1113,7 @@ void pmac_i2c_close(struct pmac_i2c_bus *bus)
        if (bus->close)
                bus->close(bus);
        bus->opened = 0;
-        up(&bus->sem);
+        mutex_unlock(&bus->mutex);
 }
 EXPORT_SYMBOL_GPL(pmac_i2c_close);
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index c4af9e21ac..92586db197 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -35,8 +35,6 @@
 #define DBG(x...)
 #endif
-static int add_bridge(struct device_node *dev);
 /* XXX Could be per-controller, but I don't think we risk anything by
 * assuming we won't have both UniNorth and Bandit */
 static int has_uninorth;
@@ -897,7 +895,7 @@ static void __init setup_u3_ht(struct pci_controller* hose)
 * "pci" (a MPC106) and no bandit or chaos bridges, and contrariwise,
 * if we have one or more bandit or chaos bridges, we don't have a MPC106.
 */
-static int __init add_bridge(struct device_node *dev)
+static int __init pmac_add_bridge(struct device_node *dev)
 {
        int len;
        struct pci_controller *hose;
@@ -918,15 +916,9 @@ static int __init add_bridge(struct device_node *dev)
                       " bus 0\n", dev->full_name);
        }
-        /* XXX Different prototypes, to be merged */
-#ifdef CONFIG_PPC64
        hose = pcibios_alloc_controller(dev);
-#else
-        hose = pcibios_alloc_controller();
-#endif
        if (!hose)
                return -ENOMEM;
-        hose->arch_data = dev;
        hose->first_busno = bus_range ? bus_range[0] : 0;
        hose->last_busno = bus_range ? bus_range[1] : 0xff;
@@ -1006,19 +998,6 @@ void __devinit pmac_pci_irq_fixup(struct pci_dev *dev)
 #endif /* CONFIG_PPC32 */
 }
-#ifdef CONFIG_PPC64
-static void __init pmac_fixup_phb_resources(void)
-{
-        struct pci_controller *hose, *tmp;
-        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
-                printk(KERN_INFO "PCI Host %d, io start: %lx; io end: %lx\n",
-                       hose->global_number,
-                       hose->io_resource.start, hose->io_resource.end);
-        }
-}
-#endif
 void __init pmac_pci_init(void)
 {
        struct device_node *np, *root;
@@ -1036,7 +1015,7 @@ void __init pmac_pci_init(void)
                if (strcmp(np->name, "bandit") == 0
                    || strcmp(np->name, "chaos") == 0
                    || strcmp(np->name, "pci") == 0) {
-                        if (add_bridge(np) == 0)
+                        if (pmac_add_bridge(np) == 0)
                                of_node_get(np);
                }
                if (strcmp(np->name, "ht") == 0) {
@@ -1050,28 +1029,9 @@ void __init pmac_pci_init(void)
        /* Probe HT last as it relies on the agp resources to be already
         * setup
         */
-        if (ht && add_bridge(ht) != 0)
+        if (ht && pmac_add_bridge(ht) != 0)
                of_node_put(ht);
-        /*
-         * We need to call pci_setup_phb_io for the HT bridge first
-         * so it gets the I/O port numbers starting at 0, and we
-         * need to call it for the AGP bridge after that so it gets
-         * small positive I/O port numbers.
-         */
-        if (u3_ht)
-                pci_setup_phb_io(u3_ht, 1);
-        if (u3_agp)
-                pci_setup_phb_io(u3_agp, 0);
-        if (u4_pcie)
-                pci_setup_phb_io(u4_pcie, 0);
-        /*
-         * On ppc64, fixup the IO resources on our host bridges as
-         * the common code does it only for children of the host bridges
-         */
-        pmac_fixup_phb_resources();
        /* Setup the linkage between OF nodes and PHBs */
        pci_devs_phb_init();
diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig
index 40f0008af4..a05079b076 100644
--- a/arch/powerpc/platforms/ps3/Kconfig
+++ b/arch/powerpc/platforms/ps3/Kconfig
@@ -7,6 +7,7 @@ config PPC_PS3
        select USB_OHCI_BIG_ENDIAN_MMIO
        select USB_ARCH_HAS_EHCI
        select USB_EHCI_BIG_ENDIAN_MMIO
+        select MEMORY_HOTPLUG
        help
          This option enables support for the Sony PS3 game console
          and other platforms using the PS3 hypervisor.
@@ -73,18 +74,12 @@ config PS3_USE_LPAR_ADDR
 config PS3_VUART
        depends on PPC_PS3
-        bool "PS3 Virtual UART support" if PS3_ADVANCED
+        tristate
-        default y
-        help
-          Include support for the PS3 Virtual UART.
-          This support is required for several system services
-          including the System Manager and AV Settings.  In
-          general, all users will say Y.
 config PS3_PS3AV
+        depends on PPC_PS3
        tristate "PS3 AV settings driver" if PS3_ADVANCED
-        depends on PS3_VUART
+        select PS3_VUART
        default y
        help
          Include support for the PS3 AV Settings driver.
@@ -93,13 +88,18 @@ config PS3_PS3AV
          general, all users will say Y or M.
 config PS3_SYS_MANAGER
-        bool "PS3 System Manager driver" if PS3_ADVANCED
+        depends on PPC_PS3
-        depends on PS3_VUART
+        tristate "PS3 System Manager driver" if PS3_ADVANCED
-        default y
+        select PS3_VUART
+        default m
        help
          Include support for the PS3 System Manager.
          This support is required for system control.  In
-          general, all users will say Y.
+          general, all users will say Y or M.
+config PS3_STORAGE
+        depends on PPC_PS3
+        tristate
 endmenu
diff --git a/arch/powerpc/platforms/ps3/Makefile b/arch/powerpc/platforms/ps3/Makefile
index a0048fcf08..ac1bdf844e 100644
--- a/arch/powerpc/platforms/ps3/Makefile
+++ b/arch/powerpc/platforms/ps3/Makefile
@@ -4,3 +4,4 @@ obj-y += system-bus.o
 obj-$(CONFIG_SMP) += smp.o
 obj-$(CONFIG_SPU_BASE) += spu.o
+obj-y += device-init.o
diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c
new file mode 100644
index 0000000000..825ebb2cbc
--- /dev/null
+++ b/arch/powerpc/platforms/ps3/device-init.c
@@ -0,0 +1,785 @@
+/*
+ *  PS3 device registration routines.
+ *
+ *  Copyright (C) 2007 Sony Computer Entertainment Inc.
+ *  Copyright 2007 Sony Corp.
+ *
+ *  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; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <linux/delay.h>
+#include <linux/freezer.h>
+#include <linux/kernel.h>
+#include <linux/kthread.h>
+#include <linux/init.h>
+#include <asm/firmware.h>
+#include <asm/lv1call.h>
+#include <asm/ps3stor.h>
+#include "platform.h"
+/**
+ * ps3_setup_gelic_device - Setup and register a gelic device instance.
+ *
+ * Allocates memory for a struct ps3_system_bus_device instance, initialises the
+ * structure members, and registers the device instance with the system bus.
+ */
+static int __init ps3_setup_gelic_device(
+        const struct ps3_repository_device *repo)
+{
+        int result;
+        struct layout {
+                struct ps3_system_bus_device dev;
+                struct ps3_dma_region d_region;
+        } *p;
+        pr_debug(" -> %s:%d\n", __func__, __LINE__);
+        BUG_ON(repo->bus_type != PS3_BUS_TYPE_SB);
+        BUG_ON(repo->dev_type != PS3_DEV_TYPE_SB_GELIC);
+        p = kzalloc(sizeof(struct layout), GFP_KERNEL);
+        if (!p) {
+                result = -ENOMEM;
+                goto fail_malloc;
+        }
+        p->dev.match_id = PS3_MATCH_ID_GELIC;
+        p->dev.dev_type = PS3_DEVICE_TYPE_SB;
+        p->dev.bus_id = repo->bus_id;
+        p->dev.dev_id = repo->dev_id;
+        p->dev.d_region = &p->d_region;
+        result = ps3_repository_find_interrupt(repo,
+                PS3_INTERRUPT_TYPE_EVENT_PORT, &p->dev.interrupt_id);
+        if (result) {
+                pr_debug("%s:%d ps3_repository_find_interrupt failed\n",
+                        __func__, __LINE__);
+                goto fail_find_interrupt;
+        }
+        BUG_ON(p->dev.interrupt_id != 0);
+        result = ps3_dma_region_init(&p->dev, p->dev.d_region, PS3_DMA_64K,
+                PS3_DMA_OTHER, NULL, 0);
+        if (result) {
+                pr_debug("%s:%d ps3_dma_region_init failed\n",
+                        __func__, __LINE__);
+                goto fail_dma_init;
+        }
+        result = ps3_system_bus_device_register(&p->dev);
+        if (result) {
+                pr_debug("%s:%d ps3_system_bus_device_register failed\n",
+                        __func__, __LINE__);
+                goto fail_device_register;
+        }
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return result;
+fail_device_register:
+fail_dma_init:
+fail_find_interrupt:
+        kfree(p);
+fail_malloc:
+        pr_debug(" <- %s:%d: fail.\n", __func__, __LINE__);
+        return result;
+}
+static int __init_refok ps3_setup_uhc_device(
+        const struct ps3_repository_device *repo, enum ps3_match_id match_id,
+        enum ps3_interrupt_type interrupt_type, enum ps3_reg_type reg_type)
+{
+        int result;
+        struct layout {
+                struct ps3_system_bus_device dev;
+                struct ps3_dma_region d_region;
+                struct ps3_mmio_region m_region;
+        } *p;
+        u64 bus_addr;
+        u64 len;
+        pr_debug(" -> %s:%d\n", __func__, __LINE__);
+        BUG_ON(repo->bus_type != PS3_BUS_TYPE_SB);
+        BUG_ON(repo->dev_type != PS3_DEV_TYPE_SB_USB);
+        p = kzalloc(sizeof(struct layout), GFP_KERNEL);
+        if (!p) {
+                result = -ENOMEM;
+                goto fail_malloc;
+        }
+        p->dev.match_id = match_id;
+        p->dev.dev_type = PS3_DEVICE_TYPE_SB;
+        p->dev.bus_id = repo->bus_id;
+        p->dev.dev_id = repo->dev_id;
+        p->dev.d_region = &p->d_region;
+        p->dev.m_region = &p->m_region;
+        result = ps3_repository_find_interrupt(repo,
+                interrupt_type, &p->dev.interrupt_id);
+        if (result) {
+                pr_debug("%s:%d ps3_repository_find_interrupt failed\n",
+                        __func__, __LINE__);
+                goto fail_find_interrupt;
+        }
+        result = ps3_repository_find_reg(repo, reg_type,
+                &bus_addr, &len);
+        if (result) {
+                pr_debug("%s:%d ps3_repository_find_reg failed\n",
+                        __func__, __LINE__);
+                goto fail_find_reg;
+        }
+        result = ps3_dma_region_init(&p->dev, p->dev.d_region, PS3_DMA_64K,
+                PS3_DMA_INTERNAL, NULL, 0);
+        if (result) {
+                pr_debug("%s:%d ps3_dma_region_init failed\n",
+                        __func__, __LINE__);
+                goto fail_dma_init;
+        }
+        result = ps3_mmio_region_init(&p->dev, p->dev.m_region, bus_addr, len,
+                PS3_MMIO_4K);
+        if (result) {
+                pr_debug("%s:%d ps3_mmio_region_init failed\n",
+                        __func__, __LINE__);
+                goto fail_mmio_init;
+        }
+        result = ps3_system_bus_device_register(&p->dev);
+        if (result) {
+                pr_debug("%s:%d ps3_system_bus_device_register failed\n",
+                        __func__, __LINE__);
+                goto fail_device_register;
+        }
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return result;
+fail_device_register:
+fail_mmio_init:
+fail_dma_init:
+fail_find_reg:
+fail_find_interrupt:
+        kfree(p);
+fail_malloc:
+        pr_debug(" <- %s:%d: fail.\n", __func__, __LINE__);
+        return result;
+}
+static int __init ps3_setup_ehci_device(
+        const struct ps3_repository_device *repo)
+{
+        return ps3_setup_uhc_device(repo, PS3_MATCH_ID_EHCI,
+                PS3_INTERRUPT_TYPE_SB_EHCI, PS3_REG_TYPE_SB_EHCI);
+}
+static int __init ps3_setup_ohci_device(
+        const struct ps3_repository_device *repo)
+{
+        return ps3_setup_uhc_device(repo, PS3_MATCH_ID_OHCI,
+                PS3_INTERRUPT_TYPE_SB_OHCI, PS3_REG_TYPE_SB_OHCI);
+}
+static int __init ps3_setup_vuart_device(enum ps3_match_id match_id,
+        unsigned int port_number)
+{
+        int result;
+        struct layout {
+                struct ps3_system_bus_device dev;
+        } *p;
+        pr_debug(" -> %s:%d: match_id %u, port %u\n", __func__, __LINE__,
+                match_id, port_number);
+        p = kzalloc(sizeof(struct layout), GFP_KERNEL);
+        if (!p)
+                return -ENOMEM;
+        p->dev.match_id = match_id;
+        p->dev.dev_type = PS3_DEVICE_TYPE_VUART;
+        p->dev.port_number = port_number;
+        result = ps3_system_bus_device_register(&p->dev);
+        if (result)
+                pr_debug("%s:%d ps3_system_bus_device_register failed\n",
+                        __func__, __LINE__);
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return result;
+}
+static int ps3stor_wait_for_completion(u64 dev_id, u64 tag,
+                                       unsigned int timeout)
+{
+        int result = -1;
+        unsigned int retries = 0;
+        u64 status;
+        for (retries = 0; retries < timeout; retries++) {
+                result = lv1_storage_check_async_status(dev_id, tag, &status);
+                if (!result)
+                        break;
+                msleep(1);
+        }
+        if (result)
+                pr_debug("%s:%u: check_async_status: %s, status %lx\n",
+                         __func__, __LINE__, ps3_result(result), status);
+        return result;
+}
+/**
+ * ps3_storage_wait_for_device - Wait for a storage device to become ready.
+ * @repo: The repository device to wait for.
+ *
+ * Uses the hypervisor's storage device notification mechanism to wait until
+ * a storage device is ready.  The device notification mechanism uses a
+ * psuedo device (id = -1) to asynchronously notify the guest when storage
+ * devices become ready.  The notification device has a block size of 512
+ * bytes.
+ */
+static int ps3_storage_wait_for_device(const struct ps3_repository_device *repo)
+{
+        int result;
+        const u64 notification_dev_id = (u64)-1LL;
+        const unsigned int timeout = HZ;
+        u64 lpar;
+        u64 tag;
+        struct {
+                u64 operation_code;     /* must be zero */
+                u64 event_mask;         /* 1 = device ready */
+        } *notify_cmd;
+        struct {
+                u64 event_type;         /* notify_device_ready */
+                u64 bus_id;
+                u64 dev_id;
+                u64 dev_type;
+                u64 dev_port;
+        } *notify_event;
+        enum {
+                notify_device_ready = 1
+        };
+        pr_debug(" -> %s:%u: bus_id %u, dev_id %u, dev_type %u\n", __func__,
+                 __LINE__, repo->bus_id, repo->dev_id, repo->dev_type);
+        notify_cmd = kzalloc(512, GFP_KERNEL);
+        notify_event = (void *)notify_cmd;
+        if (!notify_cmd)
+                return -ENOMEM;
+        lpar = ps3_mm_phys_to_lpar(__pa(notify_cmd));
+        result = lv1_open_device(repo->bus_id, notification_dev_id, 0);
+        if (result) {
+                printk(KERN_ERR "%s:%u: lv1_open_device %s\n", __func__,
+                       __LINE__, ps3_result(result));
+                result = -ENODEV;
+                goto fail_free;
+        }
+        /* Setup and write the request for device notification. */
+        notify_cmd->operation_code = 0; /* must be zero */
+        notify_cmd->event_mask = 0x01;  /* device ready */
+        result = lv1_storage_write(notification_dev_id, 0, 0, 1, 0, lpar,
+                                   &tag);
+        if (result) {
+                printk(KERN_ERR "%s:%u: write failed %s\n", __func__, __LINE__,
+                       ps3_result(result));
+                result = -ENODEV;
+                goto fail_close;
+        }
+        /* Wait for the write completion */
+        result = ps3stor_wait_for_completion(notification_dev_id, tag,
+                                             timeout);
+        if (result) {
+                printk(KERN_ERR "%s:%u: write not completed %s\n", __func__,
+                       __LINE__, ps3_result(result));
+                result = -ENODEV;
+                goto fail_close;
+        }
+        /* Loop here processing the requested notification events. */
+        result = -ENODEV;
+        while (1) {
+                memset(notify_event, 0, sizeof(*notify_event));
+                result = lv1_storage_read(notification_dev_id, 0, 0, 1, 0,
+                                          lpar, &tag);
+                if (result) {
+                        printk(KERN_ERR "%s:%u: write failed %s\n", __func__,
+                               __LINE__, ps3_result(result));
+                        break;
+                }
+                result = ps3stor_wait_for_completion(notification_dev_id, tag,
+                                                     timeout);
+                if (result) {
+                        printk(KERN_ERR "%s:%u: read not completed %s\n",
+                               __func__, __LINE__, ps3_result(result));
+                        break;
+                }
+                if (notify_event->event_type != notify_device_ready ||
+                    notify_event->bus_id != repo->bus_id) {
+                        pr_debug("%s:%u: bad notify_event: event %lu, "
+                                 "dev_id %lu, dev_type %lu\n",
+                                 __func__, __LINE__, notify_event->event_type,
+                                 notify_event->dev_id, notify_event->dev_type);
+                        break;
+                }
+                if (notify_event->dev_id == repo->dev_id &&
+                    notify_event->dev_type == repo->dev_type) {
+                        pr_debug("%s:%u: device ready: dev_id %u\n", __func__,
+                                 __LINE__, repo->dev_id);
+                        result = 0;
+                        break;
+                }
+                if (notify_event->dev_id == repo->dev_id &&
+                    notify_event->dev_type == PS3_DEV_TYPE_NOACCESS) {
+                        pr_debug("%s:%u: no access: dev_id %u\n", __func__,
+                                 __LINE__, repo->dev_id);
+                        break;
+                }
+        }
+fail_close:
+        lv1_close_device(repo->bus_id, notification_dev_id);
+fail_free:
+        kfree(notify_cmd);
+        pr_debug(" <- %s:%u\n", __func__, __LINE__);
+        return result;
+}
+static int ps3_setup_storage_dev(const struct ps3_repository_device *repo,
+                                 enum ps3_match_id match_id)
+{
+        int result;
+        struct ps3_storage_device *p;
+        u64 port, blk_size, num_blocks;
+        unsigned int num_regions, i;
+        pr_debug(" -> %s:%u: match_id %u\n", __func__, __LINE__, match_id);
+        result = ps3_repository_read_stor_dev_info(repo->bus_index,
+                                                   repo->dev_index, &port,
+                                                   &blk_size, &num_blocks,
+                                                   &num_regions);
+        if (result) {
+                printk(KERN_ERR "%s:%u: _read_stor_dev_info failed %d\n",
+                       __func__, __LINE__, result);
+                return -ENODEV;
+        }
+        pr_debug("%s:%u: index %u:%u: port %lu blk_size %lu num_blocks %lu "
+                 "num_regions %u\n", __func__, __LINE__, repo->bus_index,
+                 repo->dev_index, port, blk_size, num_blocks, num_regions);
+        p = kzalloc(sizeof(struct ps3_storage_device) +
+                    num_regions * sizeof(struct ps3_storage_region),
+                    GFP_KERNEL);
+        if (!p) {
+                result = -ENOMEM;
+                goto fail_malloc;
+        }
+        p->sbd.match_id = match_id;
+        p->sbd.dev_type = PS3_DEVICE_TYPE_SB;
+        p->sbd.bus_id = repo->bus_id;
+        p->sbd.dev_id = repo->dev_id;
+        p->sbd.d_region = &p->dma_region;
+        p->blk_size = blk_size;
+        p->num_regions = num_regions;
+        result = ps3_repository_find_interrupt(repo,
+                                               PS3_INTERRUPT_TYPE_EVENT_PORT,
+                                               &p->sbd.interrupt_id);
+        if (result) {
+                printk(KERN_ERR "%s:%u: find_interrupt failed %d\n", __func__,
+                       __LINE__, result);
+                result = -ENODEV;
+                goto fail_find_interrupt;
+        }
+        /* FIXME: Arrange to only do this on a 'cold' boot */
+        result = ps3_storage_wait_for_device(repo);
+        if (result) {
+                printk(KERN_ERR "%s:%u: storage_notification failed %d\n",
+                       __func__, __LINE__, result);
+                result = -ENODEV;
+                goto fail_probe_notification;
+        }
+        for (i = 0; i < num_regions; i++) {
+                unsigned int id;
+                u64 start, size;
+                result = ps3_repository_read_stor_dev_region(repo->bus_index,
+                                                             repo->dev_index,
+                                                             i, &id, &start,
+                                                             &size);
+                if (result) {
+                        printk(KERN_ERR
+                               "%s:%u: read_stor_dev_region failed %d\n",
+                               __func__, __LINE__, result);
+                        result = -ENODEV;
+                        goto fail_read_region;
+                }
+                pr_debug("%s:%u: region %u: id %u start %lu size %lu\n",
+                         __func__, __LINE__, i, id, start, size);
+                p->regions[i].id = id;
+                p->regions[i].start = start;
+                p->regions[i].size = size;
+        }
+        result = ps3_system_bus_device_register(&p->sbd);
+        if (result) {
+                pr_debug("%s:%u ps3_system_bus_device_register failed\n",
+                         __func__, __LINE__);
+                goto fail_device_register;
+        }
+        pr_debug(" <- %s:%u\n", __func__, __LINE__);
+        return 0;
+fail_device_register:
+fail_read_region:
+fail_probe_notification:
+fail_find_interrupt:
+        kfree(p);
+fail_malloc:
+        pr_debug(" <- %s:%u: fail.\n", __func__, __LINE__);
+        return result;
+}
+static int __init ps3_register_vuart_devices(void)
+{
+        int result;
+        unsigned int port_number;
+        pr_debug(" -> %s:%d\n", __func__, __LINE__);
+        result = ps3_repository_read_vuart_av_port(&port_number);
+        if (result)
+                port_number = 0; /* av default */
+        result = ps3_setup_vuart_device(PS3_MATCH_ID_AV_SETTINGS, port_number);
+        WARN_ON(result);
+        result = ps3_repository_read_vuart_sysmgr_port(&port_number);
+        if (result)
+                port_number = 2; /* sysmgr default */
+        result = ps3_setup_vuart_device(PS3_MATCH_ID_SYSTEM_MANAGER,
+                port_number);
+        WARN_ON(result);
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return result;
+}
+static int __init ps3_register_sound_devices(void)
+{
+        int result;
+        struct layout {
+                struct ps3_system_bus_device dev;
+                struct ps3_dma_region d_region;
+                struct ps3_mmio_region m_region;
+        } *p;
+        pr_debug(" -> %s:%d\n", __func__, __LINE__);
+        p = kzalloc(sizeof(*p), GFP_KERNEL);
+        if (!p)
+                return -ENOMEM;
+        p->dev.match_id = PS3_MATCH_ID_SOUND;
+        p->dev.dev_type = PS3_DEVICE_TYPE_IOC0;
+        p->dev.d_region = &p->d_region;
+        p->dev.m_region = &p->m_region;
+        result = ps3_system_bus_device_register(&p->dev);
+        if (result)
+                pr_debug("%s:%d ps3_system_bus_device_register failed\n",
+                        __func__, __LINE__);
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return result;
+}
+static int __init ps3_register_graphics_devices(void)
+{
+        int result;
+        struct layout {
+                struct ps3_system_bus_device dev;
+        } *p;
+        pr_debug(" -> %s:%d\n", __func__, __LINE__);
+        p = kzalloc(sizeof(struct layout), GFP_KERNEL);
+        if (!p)
+                return -ENOMEM;
+        p->dev.match_id = PS3_MATCH_ID_GRAPHICS;
+        p->dev.dev_type = PS3_DEVICE_TYPE_IOC0;
+        result = ps3_system_bus_device_register(&p->dev);
+        if (result)
+                pr_debug("%s:%d ps3_system_bus_device_register failed\n",
+                        __func__, __LINE__);
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return result;
+}
+/**
+ * ps3_register_repository_device - Register a device from the repositiory info.
+ *
+ */
+static int ps3_register_repository_device(
+        const struct ps3_repository_device *repo)
+{
+        int result;
+        switch (repo->dev_type) {
+        case PS3_DEV_TYPE_SB_GELIC:
+                result = ps3_setup_gelic_device(repo);
+                if (result) {
+                        pr_debug("%s:%d ps3_setup_gelic_device failed\n",
+                                __func__, __LINE__);
+                }
+                break;
+        case PS3_DEV_TYPE_SB_USB:
+                /* Each USB device has both an EHCI and an OHCI HC */
+                result = ps3_setup_ehci_device(repo);
+                if (result) {
+                        pr_debug("%s:%d ps3_setup_ehci_device failed\n",
+                                __func__, __LINE__);
+                }
+                result = ps3_setup_ohci_device(repo);
+                if (result) {
+                        pr_debug("%s:%d ps3_setup_ohci_device failed\n",
+                                __func__, __LINE__);
+                }
+                break;
+        case PS3_DEV_TYPE_STOR_DISK:
+                result = ps3_setup_storage_dev(repo, PS3_MATCH_ID_STOR_DISK);
+                /* Some devices are not accessable from the Other OS lpar. */
+                if (result == -ENODEV) {
+                        result = 0;
+                        pr_debug("%s:%u: not accessable\n", __func__,
+                                 __LINE__);
+                }
+                if (result)
+                        pr_debug("%s:%u ps3_setup_storage_dev failed\n",
+                                 __func__, __LINE__);
+                break;
+        case PS3_DEV_TYPE_STOR_ROM:
+                result = ps3_setup_storage_dev(repo, PS3_MATCH_ID_STOR_ROM);
+                if (result)
+                        pr_debug("%s:%u ps3_setup_storage_dev failed\n",
+                                 __func__, __LINE__);
+                break;
+        case PS3_DEV_TYPE_STOR_FLASH:
+                result = ps3_setup_storage_dev(repo, PS3_MATCH_ID_STOR_FLASH);
+                if (result)
+                        pr_debug("%s:%u ps3_setup_storage_dev failed\n",
+                                 __func__, __LINE__);
+                break;
+        default:
+                result = 0;
+                pr_debug("%s:%u: unsupported dev_type %u\n", __func__, __LINE__,
+                        repo->dev_type);
+        }
+        return result;
+}
+/**
+ * ps3_probe_thread - Background repository probing at system startup.
+ *
+ * This implementation only supports background probing on a single bus.
+ */
+static int ps3_probe_thread(void *data)
+{
+        struct ps3_repository_device *repo = data;
+        int result;
+        unsigned int ms = 250;
+        pr_debug(" -> %s:%u: kthread started\n", __func__, __LINE__);
+        do {
+                try_to_freeze();
+                pr_debug("%s:%u: probing...\n", __func__, __LINE__);
+                do {
+                        result = ps3_repository_find_device(repo);
+                        if (result == -ENODEV)
+                                pr_debug("%s:%u: nothing new\n", __func__,
+                                        __LINE__);
+                        else if (result)
+                                pr_debug("%s:%u: find device error.\n",
+                                        __func__, __LINE__);
+                        else {
+                                pr_debug("%s:%u: found device\n", __func__,
+                                        __LINE__);
+                                ps3_register_repository_device(repo);
+                                ps3_repository_bump_device(repo);
+                                ms = 250;
+                        }
+                } while (!result);
+                pr_debug("%s:%u: ms %u\n", __func__, __LINE__, ms);
+                if ( ms > 60000)
+                        break;
+                msleep_interruptible(ms);
+                /* An exponential backoff. */
+                ms <<= 1;
+        } while (!kthread_should_stop());
+        pr_debug(" <- %s:%u: kthread finished\n", __func__, __LINE__);
+        return 0;
+}
+/**
+ * ps3_start_probe_thread - Starts the background probe thread.
+ *
+ */
+static int __init ps3_start_probe_thread(enum ps3_bus_type bus_type)
+{
+        int result;
+        struct task_struct *task;
+        static struct ps3_repository_device repo; /* must be static */
+        pr_debug(" -> %s:%d\n", __func__, __LINE__);
+        memset(&repo, 0, sizeof(repo));
+        repo.bus_type = bus_type;
+        result = ps3_repository_find_bus(repo.bus_type, 0, &repo.bus_index);
+        if (result) {
+                printk(KERN_ERR "%s: Cannot find bus (%d)\n", __func__, result);
+                return -ENODEV;
+        }
+        result = ps3_repository_read_bus_id(repo.bus_index, &repo.bus_id);
+        if (result) {
+                printk(KERN_ERR "%s: read_bus_id failed %d\n", __func__,
+                        result);
+                return -ENODEV;
+        }
+        task = kthread_run(ps3_probe_thread, &repo, "ps3-probe-%u", bus_type);
+        if (IS_ERR(task)) {
+                result = PTR_ERR(task);
+                printk(KERN_ERR "%s: kthread_run failed %d\n", __func__,
+                       result);
+                return result;
+        }
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return 0;
+}
+/**
+ * ps3_register_devices - Probe the system and register devices found.
+ *
+ * A device_initcall() routine.
+ */
+static int __init ps3_register_devices(void)
+{
+        int result;
+        if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
+                return -ENODEV;
+        pr_debug(" -> %s:%d\n", __func__, __LINE__);
+        /* ps3_repository_dump_bus_info(); */
+        result = ps3_start_probe_thread(PS3_BUS_TYPE_STORAGE);
+        ps3_register_vuart_devices();
+        ps3_register_graphics_devices();
+        ps3_repository_find_devices(PS3_BUS_TYPE_SB,
+                ps3_register_repository_device);
+        ps3_register_sound_devices();
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return 0;
+}
+device_initcall(ps3_register_devices);
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c
index a1409e450c..5d2e176a1b 100644
--- a/arch/powerpc/platforms/ps3/htab.c
+++ b/arch/powerpc/platforms/ps3/htab.c
@@ -29,12 +29,12 @@
 #include "platform.h"
 #if defined(DEBUG)
-#define DBG(fmt...) udbg_printf(fmt)
+#define DBG udbg_printf
 #else
-#define DBG(fmt...) do{if(0)printk(fmt);}while(0)
+#define DBG pr_debug
 #endif
-static hpte_t *htab;
+static struct hash_pte *htab;
 static unsigned long htab_addr;
 static unsigned char *bolttab;
 static unsigned char *inusetab;
@@ -44,8 +44,8 @@ static DEFINE_SPINLOCK(ps3_bolttab_lock);
 #define debug_dump_hpte(_a, _b, _c, _d, _e, _f, _g) \
        _debug_dump_hpte(_a, _b, _c, _d, _e, _f, _g, __func__, __LINE__)
 static void _debug_dump_hpte(unsigned long pa, unsigned long va,
-        unsigned long group, unsigned long bitmap, hpte_t lhpte, int psize,
+        unsigned long group, unsigned long bitmap, struct hash_pte lhpte,
-        unsigned long slot, const char* func, int line)
+        int psize, unsigned long slot, const char* func, int line)
 {
        DBG("%s:%d: pa     = %lxh\n", func, line, pa);
        DBG("%s:%d: lpar   = %lxh\n", func, line,
@@ -63,7 +63,7 @@ static long ps3_hpte_insert(unsigned long hpte_group, unsigned long va,
        unsigned long pa, unsigned long rflags, unsigned long vflags, int psize)
 {
        unsigned long slot;
-        hpte_t lhpte;
+        struct hash_pte lhpte;
        int secondary = 0;
        unsigned long result;
        unsigned long bitmap;
@@ -234,10 +234,17 @@ static void ps3_hpte_invalidate(unsigned long slot, unsigned long va,
 static void ps3_hpte_clear(void)
 {
-        /* Make sure to clean up the frame buffer device first */
+        int result;
-        ps3fb_cleanup();
-        lv1_unmap_htab(htab_addr);
+        DBG(" -> %s:%d\n", __func__, __LINE__);
+        result = lv1_unmap_htab(htab_addr);
+        BUG_ON(result);
+        ps3_mm_shutdown();
+        ps3_mm_vas_destroy();
+        DBG(" <- %s:%d\n", __func__, __LINE__);
 }
 void __init ps3_hpte_init(unsigned long htab_size)
@@ -255,7 +262,7 @@ void __init ps3_hpte_init(unsigned long htab_size)
        ppc64_pft_size = __ilog2(htab_size);
-        bitmap_size = htab_size / sizeof(hpte_t) / 8;
+        bitmap_size = htab_size / sizeof(struct hash_pte) / 8;
        bolttab = __va(lmb_alloc(bitmap_size, 1));
        inusetab = __va(lmb_alloc(bitmap_size, 1));
@@ -273,8 +280,8 @@ void __init ps3_map_htab(void)
        result = lv1_map_htab(0, &htab_addr);
-        htab = (hpte_t *)__ioremap(htab_addr, htab_size,
+        htab = (__force struct hash_pte *)ioremap_flags(htab_addr, htab_size,
-                                   pgprot_val(PAGE_READONLY_X));
+                                            pgprot_val(PAGE_READONLY_X));
        DBG("%s:%d: lpar %016lxh, virt %016lxh\n", __func__, __LINE__,
                htab_addr, (unsigned long)htab);
diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c
index ec9030dbb5..67e32ec9b3 100644
--- a/arch/powerpc/platforms/ps3/interrupt.c
+++ b/arch/powerpc/platforms/ps3/interrupt.c
@@ -30,9 +30,9 @@
 #include "platform.h"
 #if defined(DEBUG)
-#define DBG(fmt...) udbg_printf(fmt)
+#define DBG udbg_printf
 #else
-#define DBG(fmt...) do{if(0)printk(fmt);}while(0)
+#define DBG pr_debug
 #endif
 /**
@@ -78,19 +78,85 @@ struct ps3_bmp {
 /**
 * struct ps3_private - a per cpu data structure
 * @bmp: ps3_bmp structure
- * @node: HV logical_ppe_id
+ * @ppe_id: HV logical_ppe_id
- * @cpu: HV thread_id
+ * @thread_id: HV thread_id
 */
 struct ps3_private {
        struct ps3_bmp bmp __attribute__ ((aligned (PS3_BMP_MINALIGN)));
-        u64 node;
+        u64 ppe_id;
-        unsigned int cpu;
+        u64 thread_id;
 };
 static DEFINE_PER_CPU(struct ps3_private, ps3_private);
 /**
+ * ps3_chip_mask - Set an interrupt mask bit in ps3_bmp.
+ * @virq: The assigned Linux virq.
+ *
+ * Sets ps3_bmp.mask and calls lv1_did_update_interrupt_mask().
+ */
+static void ps3_chip_mask(unsigned int virq)
+{
+        struct ps3_private *pd = get_irq_chip_data(virq);
+        unsigned long flags;
+        pr_debug("%s:%d: thread_id %lu, virq %d\n", __func__, __LINE__,
+                pd->thread_id, virq);
+        local_irq_save(flags);
+        clear_bit(63 - virq, &pd->bmp.mask);
+        lv1_did_update_interrupt_mask(pd->ppe_id, pd->thread_id);
+        local_irq_restore(flags);
+}
+/**
+ * ps3_chip_unmask - Clear an interrupt mask bit in ps3_bmp.
+ * @virq: The assigned Linux virq.
+ *
+ * Clears ps3_bmp.mask and calls lv1_did_update_interrupt_mask().
+ */
+static void ps3_chip_unmask(unsigned int virq)
+{
+        struct ps3_private *pd = get_irq_chip_data(virq);
+        unsigned long flags;
+        pr_debug("%s:%d: thread_id %lu, virq %d\n", __func__, __LINE__,
+                pd->thread_id, virq);
+        local_irq_save(flags);
+        set_bit(63 - virq, &pd->bmp.mask);
+        lv1_did_update_interrupt_mask(pd->ppe_id, pd->thread_id);
+        local_irq_restore(flags);
+}
+/**
+ * ps3_chip_eoi - HV end-of-interrupt.
+ * @virq: The assigned Linux virq.
+ *
+ * Calls lv1_end_of_interrupt_ext().
+ */
+static void ps3_chip_eoi(unsigned int virq)
+{
+        const struct ps3_private *pd = get_irq_chip_data(virq);
+        lv1_end_of_interrupt_ext(pd->ppe_id, pd->thread_id, virq);
+}
+/**
+ * ps3_irq_chip - Represents the ps3_bmp as a Linux struct irq_chip.
+ */
+static struct irq_chip ps3_irq_chip = {
+        .typename = "ps3",
+        .mask = ps3_chip_mask,
+        .unmask = ps3_chip_unmask,
+        .eoi = ps3_chip_eoi,
+};
+/**
 * ps3_virq_setup - virq related setup.
 * @cpu: enum ps3_cpu_binding indicating the cpu the interrupt should be
 * serviced on.
@@ -134,6 +200,8 @@ int ps3_virq_setup(enum ps3_cpu_binding cpu, unsigned long outlet,
                goto fail_set;
        }
+        ps3_chip_mask(*virq);
        return result;
 fail_set:
@@ -153,8 +221,8 @@ int ps3_virq_destroy(unsigned int virq)
 {
        const struct ps3_private *pd = get_irq_chip_data(virq);
-        pr_debug("%s:%d: node %lu, cpu %d, virq %u\n", __func__, __LINE__,
+        pr_debug("%s:%d: ppe_id %lu, thread_id %lu, virq %u\n", __func__,
-                pd->node, pd->cpu, virq);
+                __LINE__, pd->ppe_id, pd->thread_id, virq);
        set_irq_chip_data(virq, NULL);
        irq_dispose_mapping(virq);
@@ -190,7 +258,8 @@ int ps3_irq_plug_setup(enum ps3_cpu_binding cpu, unsigned long outlet,
        /* Binds outlet to cpu + virq. */
-        result = lv1_connect_irq_plug_ext(pd->node, pd->cpu, *virq, outlet, 0);
+        result = lv1_connect_irq_plug_ext(pd->ppe_id, pd->thread_id, *virq,
+                outlet, 0);
        if (result) {
                pr_info("%s:%d: lv1_connect_irq_plug_ext failed: %s\n",
@@ -222,10 +291,12 @@ int ps3_irq_plug_destroy(unsigned int virq)
        int result;
        const struct ps3_private *pd = get_irq_chip_data(virq);
-        pr_debug("%s:%d: node %lu, cpu %d, virq %u\n", __func__, __LINE__,
+        pr_debug("%s:%d: ppe_id %lu, thread_id %lu, virq %u\n", __func__,
-                pd->node, pd->cpu, virq);
+                __LINE__, pd->ppe_id, pd->thread_id, virq);
+        ps3_chip_mask(virq);
-        result = lv1_disconnect_irq_plug_ext(pd->node, pd->cpu, virq);
+        result = lv1_disconnect_irq_plug_ext(pd->ppe_id, pd->thread_id, virq);
        if (result)
                pr_info("%s:%d: lv1_disconnect_irq_plug_ext failed: %s\n",
@@ -282,7 +353,9 @@ int ps3_event_receive_port_destroy(unsigned int virq)
 {
        int result;
-        pr_debug(" -> %s:%d virq: %u\n", __func__, __LINE__, virq);
+        pr_debug(" -> %s:%d virq %u\n", __func__, __LINE__, virq);
+        ps3_chip_mask(virq);
        result = lv1_destruct_event_receive_port(virq_to_hw(virq));
@@ -290,17 +363,14 @@ int ps3_event_receive_port_destroy(unsigned int virq)
                pr_debug("%s:%d: lv1_destruct_event_receive_port failed: %s\n",
                        __func__, __LINE__, ps3_result(result));
-        /* lv1_destruct_event_receive_port() destroys the IRQ plug,
+        /*
-         * so don't call ps3_irq_plug_destroy() here.
+         * Don't call ps3_virq_destroy() here since ps3_smp_cleanup_cpu()
+         * calls from interrupt context (smp_call_function) when kexecing.
         */
-        result = ps3_virq_destroy(virq);
-        BUG_ON(result);
        pr_debug(" <- %s:%d\n", __func__, __LINE__);
        return result;
 }
-EXPORT_SYMBOL_GPL(ps3_event_receive_port_destroy);
 int ps3_send_event_locally(unsigned int virq)
 {
@@ -311,17 +381,15 @@ int ps3_send_event_locally(unsigned int virq)
 * ps3_sb_event_receive_port_setup - Setup a system bus event receive port.
 * @cpu: enum ps3_cpu_binding indicating the cpu the interrupt should be
 * serviced on.
- * @did: The HV device identifier read from the system repository.
+ * @dev: The system bus device instance.
- * @interrupt_id: The device interrupt id read from the system repository.
 * @virq: The assigned Linux virq.
 *
 * An event irq represents a virtual device interrupt.  The interrupt_id
 * coresponds to the software interrupt number.
 */
-int ps3_sb_event_receive_port_setup(enum ps3_cpu_binding cpu,
+int ps3_sb_event_receive_port_setup(struct ps3_system_bus_device *dev,
-        const struct ps3_device_id *did, unsigned int interrupt_id,
+        enum ps3_cpu_binding cpu, unsigned int *virq)
-        unsigned int *virq)
 {
        /* this should go in system-bus.c */
@@ -332,8 +400,8 @@ int ps3_sb_event_receive_port_setup(enum ps3_cpu_binding cpu,
        if (result)
                return result;
-        result = lv1_connect_interrupt_event_receive_port(did->bus_id,
+        result = lv1_connect_interrupt_event_receive_port(dev->bus_id,
-                did->dev_id, virq_to_hw(*virq), interrupt_id);
+                dev->dev_id, virq_to_hw(*virq), dev->interrupt_id);
        if (result) {
                pr_debug("%s:%d: lv1_connect_interrupt_event_receive_port"
@@ -345,24 +413,24 @@ int ps3_sb_event_receive_port_setup(enum ps3_cpu_binding cpu,
        }
        pr_debug("%s:%d: interrupt_id %u, virq %u\n", __func__, __LINE__,
-                interrupt_id, *virq);
+                dev->interrupt_id, *virq);
        return 0;
 }
 EXPORT_SYMBOL(ps3_sb_event_receive_port_setup);
-int ps3_sb_event_receive_port_destroy(const struct ps3_device_id *did,
+int ps3_sb_event_receive_port_destroy(struct ps3_system_bus_device *dev,
-        unsigned int interrupt_id, unsigned int virq)
+        unsigned int virq)
 {
        /* this should go in system-bus.c */
        int result;
        pr_debug(" -> %s:%d: interrupt_id %u, virq %u\n", __func__, __LINE__,
-                interrupt_id, virq);
+                dev->interrupt_id, virq);
-        result = lv1_disconnect_interrupt_event_receive_port(did->bus_id,
+        result = lv1_disconnect_interrupt_event_receive_port(dev->bus_id,
-                did->dev_id, virq_to_hw(virq), interrupt_id);
+                dev->dev_id, virq_to_hw(virq), dev->interrupt_id);
        if (result)
                pr_debug("%s:%d: lv1_disconnect_interrupt_event_receive_port"
@@ -372,6 +440,14 @@ int ps3_sb_event_receive_port_destroy(const struct ps3_device_id *did,
        result = ps3_event_receive_port_destroy(virq);
        BUG_ON(result);
+        /*
+         * ps3_event_receive_port_destroy() destroys the IRQ plug,
+         * so don't call ps3_irq_plug_destroy() here.
+         */
+        result = ps3_virq_destroy(virq);
+        BUG_ON(result);
        pr_debug(" <- %s:%d\n", __func__, __LINE__);
        return result;
 }
@@ -412,16 +488,24 @@ EXPORT_SYMBOL_GPL(ps3_io_irq_setup);
 int ps3_io_irq_destroy(unsigned int virq)
 {
        int result;
+        unsigned long outlet = virq_to_hw(virq);
-        result = lv1_destruct_io_irq_outlet(virq_to_hw(virq));
+        ps3_chip_mask(virq);
-        if (result)
+        /*
-                pr_debug("%s:%d: lv1_destruct_io_irq_outlet failed: %s\n",
+         * lv1_destruct_io_irq_outlet() will destroy the IRQ plug,
-                        __func__, __LINE__, ps3_result(result));
+         * so call ps3_irq_plug_destroy() first.
+         */
        result = ps3_irq_plug_destroy(virq);
        BUG_ON(result);
+        result = lv1_destruct_io_irq_outlet(outlet);
+        if (result)
+                pr_debug("%s:%d: lv1_destruct_io_irq_outlet failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
        return result;
 }
 EXPORT_SYMBOL_GPL(ps3_io_irq_destroy);
@@ -461,11 +545,13 @@ int ps3_vuart_irq_setup(enum ps3_cpu_binding cpu, void* virt_addr_bmp,
        return result;
 }
+EXPORT_SYMBOL_GPL(ps3_vuart_irq_setup);
 int ps3_vuart_irq_destroy(unsigned int virq)
 {
        int result;
+        ps3_chip_mask(virq);
        result = lv1_deconfigure_virtual_uart_irq();
        if (result) {
@@ -479,6 +565,7 @@ int ps3_vuart_irq_destroy(unsigned int virq)
        return result;
 }
+EXPORT_SYMBOL_GPL(ps3_vuart_irq_destroy);
 /**
 * ps3_spe_irq_setup - Setup an spe virq.
@@ -514,9 +601,14 @@ int ps3_spe_irq_setup(enum ps3_cpu_binding cpu, unsigned long spe_id,
 int ps3_spe_irq_destroy(unsigned int virq)
 {
-        int result = ps3_irq_plug_destroy(virq);
+        int result;
+        ps3_chip_mask(virq);
+        result = ps3_irq_plug_destroy(virq);
        BUG_ON(result);
-        return 0;
+        return result;
 }
@@ -533,7 +625,7 @@ static void _dump_64_bmp(const char *header, const u64 *p, unsigned cpu,
                *p & 0xffff);
 }
-static void __attribute__ ((unused)) _dump_256_bmp(const char *header,
+static void __maybe_unused _dump_256_bmp(const char *header,
        const u64 *p, unsigned cpu, const char* func, int line)
 {
        pr_debug("%s:%d: %s %u {%016lx:%016lx:%016lx:%016lx}\n",
@@ -546,86 +638,25 @@ static void _dump_bmp(struct ps3_private* pd, const char* func, int line)
        unsigned long flags;
        spin_lock_irqsave(&pd->bmp.lock, flags);
-        _dump_64_bmp("stat", &pd->bmp.status, pd->cpu, func, line);
+        _dump_64_bmp("stat", &pd->bmp.status, pd->thread_id, func, line);
-        _dump_64_bmp("mask", &pd->bmp.mask, pd->cpu, func, line);
+        _dump_64_bmp("mask", &pd->bmp.mask, pd->thread_id, func, line);
        spin_unlock_irqrestore(&pd->bmp.lock, flags);
 }
 #define dump_mask(_x) _dump_mask(_x, __func__, __LINE__)
-static void __attribute__ ((unused)) _dump_mask(struct ps3_private* pd,
+static void __maybe_unused _dump_mask(struct ps3_private *pd,
        const char* func, int line)
 {
        unsigned long flags;
        spin_lock_irqsave(&pd->bmp.lock, flags);
-        _dump_64_bmp("mask", &pd->bmp.mask, pd->cpu, func, line);
+        _dump_64_bmp("mask", &pd->bmp.mask, pd->thread_id, func, line);
        spin_unlock_irqrestore(&pd->bmp.lock, flags);
 }
 #else
 static void dump_bmp(struct ps3_private* pd) {};
 #endif /* defined(DEBUG) */
-static void ps3_chip_mask(unsigned int virq)
-{
-        struct ps3_private *pd = get_irq_chip_data(virq);
-        u64 bit = 0x8000000000000000UL >> virq;
-        u64 *p = &pd->bmp.mask;
-        u64 old;
-        unsigned long flags;
-        pr_debug("%s:%d: cpu %u, virq %d\n", __func__, __LINE__, pd->cpu, virq);
-        local_irq_save(flags);
-        asm volatile(
-                     "1:        ldarx %0,0,%3\n"
-                     "andc      %0,%0,%2\n"
-                     "stdcx.    %0,0,%3\n"
-                     "bne-      1b"
-                     : "=&r" (old), "+m" (*p)
-                     : "r" (bit), "r" (p)
-                     : "cc" );
-        lv1_did_update_interrupt_mask(pd->node, pd->cpu);
-        local_irq_restore(flags);
-}
-static void ps3_chip_unmask(unsigned int virq)
-{
-        struct ps3_private *pd = get_irq_chip_data(virq);
-        u64 bit = 0x8000000000000000UL >> virq;
-        u64 *p = &pd->bmp.mask;
-        u64 old;
-        unsigned long flags;
-        pr_debug("%s:%d: cpu %u, virq %d\n", __func__, __LINE__, pd->cpu, virq);
-        local_irq_save(flags);
-        asm volatile(
-                     "1:        ldarx %0,0,%3\n"
-                     "or        %0,%0,%2\n"
-                     "stdcx.    %0,0,%3\n"
-                     "bne-      1b"
-                     : "=&r" (old), "+m" (*p)
-                     : "r" (bit), "r" (p)
-                     : "cc" );
-        lv1_did_update_interrupt_mask(pd->node, pd->cpu);
-        local_irq_restore(flags);
-}
-static void ps3_chip_eoi(unsigned int virq)
-{
-        const struct ps3_private *pd = get_irq_chip_data(virq);
-        lv1_end_of_interrupt_ext(pd->node, pd->cpu, virq);
-}
-static struct irq_chip irq_chip = {
-        .typename = "ps3",
-        .mask = ps3_chip_mask,
-        .unmask = ps3_chip_unmask,
-        .eoi = ps3_chip_eoi,
-};
 static void ps3_host_unmap(struct irq_host *h, unsigned int virq)
 {
        set_irq_chip_data(virq, NULL);
@@ -637,7 +668,7 @@ static int ps3_host_map(struct irq_host *h, unsigned int virq,
        pr_debug("%s:%d: hwirq %lu, virq %u\n", __func__, __LINE__, hwirq,
                virq);
-        set_irq_chip_and_handler(virq, &irq_chip, handle_fasteoi_irq);
+        set_irq_chip_and_handler(virq, &ps3_irq_chip, handle_fasteoi_irq);
        return 0;
 }
@@ -657,7 +688,7 @@ void __init ps3_register_ipi_debug_brk(unsigned int cpu, unsigned int virq)
                cpu, virq, pd->bmp.ipi_debug_brk_mask);
 }
-unsigned int ps3_get_irq(void)
+static unsigned int ps3_get_irq(void)
 {
        struct ps3_private *pd = &__get_cpu_var(ps3_private);
        u64 x = (pd->bmp.status & pd->bmp.mask);
@@ -672,8 +703,8 @@ unsigned int ps3_get_irq(void)
        plug &= 0x3f;
        if (unlikely(plug) == NO_IRQ) {
-                pr_debug("%s:%d: no plug found: cpu %u\n", __func__, __LINE__,
+                pr_debug("%s:%d: no plug found: thread_id %lu\n", __func__,
-                        pd->cpu);
+                        __LINE__, pd->thread_id);
                dump_bmp(&per_cpu(ps3_private, 0));
                dump_bmp(&per_cpu(ps3_private, 1));
                return NO_IRQ;
@@ -703,16 +734,16 @@ void __init ps3_init_IRQ(void)
        for_each_possible_cpu(cpu) {
                struct ps3_private *pd = &per_cpu(ps3_private, cpu);
-                lv1_get_logical_ppe_id(&pd->node);
+                lv1_get_logical_ppe_id(&pd->ppe_id);
-                pd->cpu = get_hard_smp_processor_id(cpu);
+                pd->thread_id = get_hard_smp_processor_id(cpu);
                spin_lock_init(&pd->bmp.lock);
-                pr_debug("%s:%d: node %lu, cpu %d, bmp %lxh\n", __func__,
+                pr_debug("%s:%d: ppe_id %lu, thread_id %lu, bmp %lxh\n",
-                        __LINE__, pd->node, pd->cpu,
+                        __func__, __LINE__, pd->ppe_id, pd->thread_id,
                        ps3_mm_phys_to_lpar(__pa(&pd->bmp)));
-                result = lv1_configure_irq_state_bitmap(pd->node, pd->cpu,
+                result = lv1_configure_irq_state_bitmap(pd->ppe_id,
-                        ps3_mm_phys_to_lpar(__pa(&pd->bmp)));
+                        pd->thread_id, ps3_mm_phys_to_lpar(__pa(&pd->bmp)));
                if (result)
                        pr_debug("%s:%d: lv1_configure_irq_state_bitmap failed:"
@@ -722,3 +753,16 @@ void __init ps3_init_IRQ(void)
        ppc_md.get_irq = ps3_get_irq;
 }
+void ps3_shutdown_IRQ(int cpu)
+{
+        int result;
+        u64 ppe_id;
+        u64 thread_id = get_hard_smp_processor_id(cpu);
+        lv1_get_logical_ppe_id(&ppe_id);
+        result = lv1_configure_irq_state_bitmap(ppe_id, thread_id, 0);
+        DBG("%s:%d: lv1_configure_irq_state_bitmap (%lu:%lu/%d) %s\n", __func__,
+                __LINE__, ppe_id, thread_id, cpu, ps3_result(result));
+}
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
index f8a3e206c5..7bb3e16209 100644
--- a/arch/powerpc/platforms/ps3/mm.c
+++ b/arch/powerpc/platforms/ps3/mm.c
@@ -30,9 +30,9 @@
 #include "platform.h"
 #if defined(DEBUG)
-#define DBG(fmt...) udbg_printf(fmt)
+#define DBG udbg_printf
 #else
-#define DBG(fmt...) do{if(0)printk(fmt);}while(0)
+#define DBG pr_debug
 #endif
 enum {
@@ -115,7 +115,8 @@ struct map {
 };
 #define debug_dump_map(x) _debug_dump_map(x, __func__, __LINE__)
-static void _debug_dump_map(const struct map* m, const char* func, int line)
+static void __maybe_unused _debug_dump_map(const struct map *m,
+        const char *func, int line)
 {
        DBG("%s:%d: map.total     = %lxh\n", func, line, m->total);
        DBG("%s:%d: map.rm.size   = %lxh\n", func, line, m->rm.size);
@@ -212,9 +213,15 @@ fail:
 void ps3_mm_vas_destroy(void)
 {
+        int result;
+        DBG("%s:%d: map.vas_id    = %lu\n", __func__, __LINE__, map.vas_id);
        if (map.vas_id) {
-                lv1_select_virtual_address_space(0);
+                result = lv1_select_virtual_address_space(0);
-                lv1_destruct_virtual_address_space(map.vas_id);
+                BUG_ON(result);
+                result = lv1_destruct_virtual_address_space(map.vas_id);
+                BUG_ON(result);
                map.vas_id = 0;
        }
 }
@@ -232,7 +239,7 @@ void ps3_mm_vas_destroy(void)
 * @size is rounded down to a multiple of the vas large page size.
 */
-int ps3_mm_region_create(struct mem_region *r, unsigned long size)
+static int ps3_mm_region_create(struct mem_region *r, unsigned long size)
 {
        int result;
        unsigned long muid;
@@ -273,10 +280,14 @@ zero_region:
 * @r: pointer to struct mem_region
 */
-void ps3_mm_region_destroy(struct mem_region *r)
+static void ps3_mm_region_destroy(struct mem_region *r)
 {
+        int result;
+        DBG("%s:%d: r->base = %lxh\n", __func__, __LINE__, r->base);
        if (r->base) {
-                lv1_release_memory(r->base);
+                result = lv1_release_memory(r->base);
+                BUG_ON(result);
                r->size = r->base = r->offset = 0;
                map.total = map.rm.size;
        }
@@ -329,31 +340,34 @@ core_initcall(ps3_mm_add_memory);
 /*============================================================================*/
 /**
- * dma_lpar_to_bus - Translate an lpar address to ioc mapped bus address.
+ * dma_sb_lpar_to_bus - Translate an lpar address to ioc mapped bus address.
 * @r: pointer to dma region structure
 * @lpar_addr: HV lpar address
 */
-static unsigned long dma_lpar_to_bus(struct ps3_dma_region *r,
+static unsigned long dma_sb_lpar_to_bus(struct ps3_dma_region *r,
        unsigned long lpar_addr)
 {
-        BUG_ON(lpar_addr >= map.r1.base + map.r1.size);
+        if (lpar_addr >= map.rm.size)
-        return r->bus_addr + (lpar_addr <= map.rm.size ? lpar_addr
+                lpar_addr -= map.r1.offset;
-                : lpar_addr - map.r1.offset);
+        BUG_ON(lpar_addr < r->offset);
+        BUG_ON(lpar_addr >= r->offset + r->len);
+        return r->bus_addr + lpar_addr - r->offset;
 }
 #define dma_dump_region(_a) _dma_dump_region(_a, __func__, __LINE__)
-static void _dma_dump_region(const struct ps3_dma_region *r, const char* func,
+static void  __maybe_unused _dma_dump_region(const struct ps3_dma_region *r,
-        int line)
+        const char *func, int line)
 {
-        DBG("%s:%d: dev        %u:%u\n", func, line, r->did.bus_id,
+        DBG("%s:%d: dev        %u:%u\n", func, line, r->dev->bus_id,
-                r->did.dev_id);
+                r->dev->dev_id);
        DBG("%s:%d: page_size  %u\n", func, line, r->page_size);
        DBG("%s:%d: bus_addr   %lxh\n", func, line, r->bus_addr);
        DBG("%s:%d: len        %lxh\n", func, line, r->len);
+        DBG("%s:%d: offset     %lxh\n", func, line, r->offset);
 }
-/**
+  /**
 * dma_chunk - A chunk of dma pages mapped by the io controller.
 * @region - The dma region that owns this chunk.
 * @lpar_addr: Starting lpar address of the area to map.
@@ -381,10 +395,11 @@ static void _dma_dump_chunk (const struct dma_chunk* c, const char* func,
        int line)
 {
        DBG("%s:%d: r.dev        %u:%u\n", func, line,
-                c->region->did.bus_id, c->region->did.dev_id);
+                c->region->dev->bus_id, c->region->dev->dev_id);
        DBG("%s:%d: r.bus_addr   %lxh\n", func, line, c->region->bus_addr);
        DBG("%s:%d: r.page_size  %u\n", func, line, c->region->page_size);
        DBG("%s:%d: r.len        %lxh\n", func, line, c->region->len);
+        DBG("%s:%d: r.offset     %lxh\n", func, line, c->region->offset);
        DBG("%s:%d: c.lpar_addr  %lxh\n", func, line, c->lpar_addr);
        DBG("%s:%d: c.bus_addr   %lxh\n", func, line, c->bus_addr);
        DBG("%s:%d: c.len        %lxh\n", func, line, c->len);
@@ -395,39 +410,68 @@ static struct dma_chunk * dma_find_chunk(struct ps3_dma_region *r,
 {
        struct dma_chunk *c;
        unsigned long aligned_bus = _ALIGN_DOWN(bus_addr, 1 << r->page_size);
-        unsigned long aligned_len = _ALIGN_UP(len, 1 << r->page_size);
+        unsigned long aligned_len = _ALIGN_UP(len+bus_addr-aligned_bus,
+                                              1 << r->page_size);
        list_for_each_entry(c, &r->chunk_list.head, link) {
                /* intersection */
-                if (aligned_bus >= c->bus_addr
+                if (aligned_bus >= c->bus_addr &&
-                        && aligned_bus < c->bus_addr + c->len
+                    aligned_bus + aligned_len <= c->bus_addr + c->len)
-                        && aligned_bus + aligned_len <= c->bus_addr + c->len) {
                        return c;
-                }
                /* below */
-                if (aligned_bus + aligned_len <= c->bus_addr) {
+                if (aligned_bus + aligned_len <= c->bus_addr)
                        continue;
-                }
                /* above */
-                if (aligned_bus >= c->bus_addr + c->len) {
+                if (aligned_bus >= c->bus_addr + c->len)
                        continue;
-                }
                /* we don't handle the multi-chunk case for now */
                dma_dump_chunk(c);
                BUG();
        }
        return NULL;
 }
-static int dma_free_chunk(struct dma_chunk *c)
+static struct dma_chunk *dma_find_chunk_lpar(struct ps3_dma_region *r,
+        unsigned long lpar_addr, unsigned long len)
+{
+        struct dma_chunk *c;
+        unsigned long aligned_lpar = _ALIGN_DOWN(lpar_addr, 1 << r->page_size);
+        unsigned long aligned_len = _ALIGN_UP(len + lpar_addr - aligned_lpar,
+                                              1 << r->page_size);
+        list_for_each_entry(c, &r->chunk_list.head, link) {
+                /* intersection */
+                if (c->lpar_addr <= aligned_lpar &&
+                    aligned_lpar < c->lpar_addr + c->len) {
+                        if (aligned_lpar + aligned_len <= c->lpar_addr + c->len)
+                                return c;
+                        else {
+                                dma_dump_chunk(c);
+                                BUG();
+                        }
+                }
+                /* below */
+                if (aligned_lpar + aligned_len <= c->lpar_addr) {
+                        continue;
+                }
+                /* above */
+                if (c->lpar_addr + c->len <= aligned_lpar) {
+                        continue;
+                }
+        }
+        return NULL;
+}
+static int dma_sb_free_chunk(struct dma_chunk *c)
 {
        int result = 0;
        if (c->bus_addr) {
-                result = lv1_unmap_device_dma_region(c->region->did.bus_id,
+                result = lv1_unmap_device_dma_region(c->region->dev->bus_id,
-                        c->region->did.dev_id, c->bus_addr, c->len);
+                        c->region->dev->dev_id, c->bus_addr, c->len);
                BUG_ON(result);
        }
@@ -435,8 +479,39 @@ static int dma_free_chunk(struct dma_chunk *c)
        return result;
 }
+static int dma_ioc0_free_chunk(struct dma_chunk *c)
+{
+        int result = 0;
+        int iopage;
+        unsigned long offset;
+        struct ps3_dma_region *r = c->region;
+        DBG("%s:start\n", __func__);
+        for (iopage = 0; iopage < (c->len >> r->page_size); iopage++) {
+                offset = (1 << r->page_size) * iopage;
+                /* put INVALID entry */
+                result = lv1_put_iopte(0,
+                                       c->bus_addr + offset,
+                                       c->lpar_addr + offset,
+                                       r->ioid,
+                                       0);
+                DBG("%s: bus=%#lx, lpar=%#lx, ioid=%d\n", __func__,
+                    c->bus_addr + offset,
+                    c->lpar_addr + offset,
+                    r->ioid);
+                if (result) {
+                        DBG("%s:%d: lv1_put_iopte failed: %s\n", __func__,
+                            __LINE__, ps3_result(result));
+                }
+        }
+        kfree(c);
+        DBG("%s:end\n", __func__);
+        return result;
+}
 /**
- * dma_map_pages - Maps dma pages into the io controller bus address space.
+ * dma_sb_map_pages - Maps dma pages into the io controller bus address space.
 * @r: Pointer to a struct ps3_dma_region.
 * @phys_addr: Starting physical address of the area to map.
 * @len: Length in bytes of the area to map.
@@ -446,8 +521,8 @@ static int dma_free_chunk(struct dma_chunk *c)
 * make the HV call to add the pages into the io controller address space.
 */
-static int dma_map_pages(struct ps3_dma_region *r, unsigned long phys_addr,
+static int dma_sb_map_pages(struct ps3_dma_region *r, unsigned long phys_addr,
-        unsigned long len, struct dma_chunk **c_out)
+            unsigned long len, struct dma_chunk **c_out, u64 iopte_flag)
 {
        int result;
        struct dma_chunk *c;
@@ -461,13 +536,13 @@ static int dma_map_pages(struct ps3_dma_region *r, unsigned long phys_addr,
        c->region = r;
        c->lpar_addr = ps3_mm_phys_to_lpar(phys_addr);
-        c->bus_addr = dma_lpar_to_bus(r, c->lpar_addr);
+        c->bus_addr = dma_sb_lpar_to_bus(r, c->lpar_addr);
        c->len = len;
-        result = lv1_map_device_dma_region(c->region->did.bus_id,
+        BUG_ON(iopte_flag != 0xf800000000000000UL);
-                c->region->did.dev_id, c->lpar_addr, c->bus_addr, c->len,
+        result = lv1_map_device_dma_region(c->region->dev->bus_id,
-                0xf800000000000000UL);
+                                           c->region->dev->dev_id, c->lpar_addr,
+                                           c->bus_addr, c->len, iopte_flag);
        if (result) {
                DBG("%s:%d: lv1_map_device_dma_region failed: %s\n",
                        __func__, __LINE__, ps3_result(result));
@@ -487,26 +562,120 @@ fail_alloc:
        return result;
 }
+static int dma_ioc0_map_pages(struct ps3_dma_region *r, unsigned long phys_addr,
+                              unsigned long len, struct dma_chunk **c_out,
+                              u64 iopte_flag)
+{
+        int result;
+        struct dma_chunk *c, *last;
+        int iopage, pages;
+        unsigned long offset;
+        DBG(KERN_ERR "%s: phy=%#lx, lpar%#lx, len=%#lx\n", __func__,
+            phys_addr, ps3_mm_phys_to_lpar(phys_addr), len);
+        c = kzalloc(sizeof(struct dma_chunk), GFP_ATOMIC);
+        if (!c) {
+                result = -ENOMEM;
+                goto fail_alloc;
+        }
+        c->region = r;
+        c->len = len;
+        c->lpar_addr = ps3_mm_phys_to_lpar(phys_addr);
+        /* allocate IO address */
+        if (list_empty(&r->chunk_list.head)) {
+                /* first one */
+                c->bus_addr = r->bus_addr;
+        } else {
+                /* derive from last bus addr*/
+                last  = list_entry(r->chunk_list.head.next,
+                                   struct dma_chunk, link);
+                c->bus_addr = last->bus_addr + last->len;
+                DBG("%s: last bus=%#lx, len=%#lx\n", __func__,
+                    last->bus_addr, last->len);
+        }
+        /* FIXME: check whether length exceeds region size */
+        /* build ioptes for the area */
+        pages = len >> r->page_size;
+        DBG("%s: pgsize=%#x len=%#lx pages=%#x iopteflag=%#lx\n", __func__,
+            r->page_size, r->len, pages, iopte_flag);
+        for (iopage = 0; iopage < pages; iopage++) {
+                offset = (1 << r->page_size) * iopage;
+                result = lv1_put_iopte(0,
+                                       c->bus_addr + offset,
+                                       c->lpar_addr + offset,
+                                       r->ioid,
+                                       iopte_flag);
+                if (result) {
+                        printk(KERN_WARNING "%s:%d: lv1_map_device_dma_region "
+                                "failed: %s\n", __func__, __LINE__,
+                                ps3_result(result));
+                        goto fail_map;
+                }
+                DBG("%s: pg=%d bus=%#lx, lpar=%#lx, ioid=%#x\n", __func__,
+                    iopage, c->bus_addr + offset, c->lpar_addr + offset,
+                    r->ioid);
+        }
+        /* be sure that last allocated one is inserted at head */
+        list_add(&c->link, &r->chunk_list.head);
+        *c_out = c;
+        DBG("%s: end\n", __func__);
+        return 0;
+fail_map:
+        for (iopage--; 0 <= iopage; iopage--) {
+                lv1_put_iopte(0,
+                              c->bus_addr + offset,
+                              c->lpar_addr + offset,
+                              r->ioid,
+                              0);
+        }
+        kfree(c);
+fail_alloc:
+        *c_out = NULL;
+        return result;
+}
 /**
- * dma_region_create - Create a device dma region.
+ * dma_sb_region_create - Create a device dma region.
 * @r: Pointer to a struct ps3_dma_region.
 *
 * This is the lowest level dma region create routine, and is the one that
 * will make the HV call to create the region.
 */
-static int dma_region_create(struct ps3_dma_region* r)
+static int dma_sb_region_create(struct ps3_dma_region *r)
 {
        int result;
-        r->len = _ALIGN_UP(map.total, 1 << r->page_size);
+        pr_info(" -> %s:%d:\n", __func__, __LINE__);
+        BUG_ON(!r);
+        if (!r->dev->bus_id) {
+                pr_info("%s:%d: %u:%u no dma\n", __func__, __LINE__,
+                        r->dev->bus_id, r->dev->dev_id);
+                return 0;
+        }
+        DBG("%s:%u: len = 0x%lx, page_size = %u, offset = 0x%lx\n", __func__,
+            __LINE__, r->len, r->page_size, r->offset);
+        BUG_ON(!r->len);
+        BUG_ON(!r->page_size);
+        BUG_ON(!r->region_ops);
        INIT_LIST_HEAD(&r->chunk_list.head);
        spin_lock_init(&r->chunk_list.lock);
-        result = lv1_allocate_device_dma_region(r->did.bus_id, r->did.dev_id,
+        result = lv1_allocate_device_dma_region(r->dev->bus_id, r->dev->dev_id,
-                r->len, r->page_size, r->region_type, &r->bus_addr);
+                roundup_pow_of_two(r->len), r->page_size, r->region_type,
+                &r->bus_addr);
-        dma_dump_region(r);
        if (result) {
                DBG("%s:%d: lv1_allocate_device_dma_region failed: %s\n",
@@ -517,6 +686,27 @@ static int dma_region_create(struct ps3_dma_region* r)
        return result;
 }
+static int dma_ioc0_region_create(struct ps3_dma_region *r)
+{
+        int result;
+        INIT_LIST_HEAD(&r->chunk_list.head);
+        spin_lock_init(&r->chunk_list.lock);
+        result = lv1_allocate_io_segment(0,
+                                         r->len,
+                                         r->page_size,
+                                         &r->bus_addr);
+        if (result) {
+                DBG("%s:%d: lv1_allocate_io_segment failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+                r->len = r->bus_addr = 0;
+        }
+        DBG("%s: len=%#lx, pg=%d, bus=%#lx\n", __func__,
+            r->len, r->page_size, r->bus_addr);
+        return result;
+}
 /**
 * dma_region_free - Free a device dma region.
 * @r: Pointer to a struct ps3_dma_region.
@@ -525,31 +715,62 @@ static int dma_region_create(struct ps3_dma_region* r)
 * will make the HV call to free the region.
 */
-static int dma_region_free(struct ps3_dma_region* r)
+static int dma_sb_region_free(struct ps3_dma_region *r)
 {
        int result;
        struct dma_chunk *c;
        struct dma_chunk *tmp;
+        BUG_ON(!r);
+        if (!r->dev->bus_id) {
+                pr_info("%s:%d: %u:%u no dma\n", __func__, __LINE__,
+                        r->dev->bus_id, r->dev->dev_id);
+                return 0;
+        }
        list_for_each_entry_safe(c, tmp, &r->chunk_list.head, link) {
                list_del(&c->link);
-                dma_free_chunk(c);
+                dma_sb_free_chunk(c);
        }
-        result = lv1_free_device_dma_region(r->did.bus_id, r->did.dev_id,
+        result = lv1_free_device_dma_region(r->dev->bus_id, r->dev->dev_id,
                r->bus_addr);
        if (result)
                DBG("%s:%d: lv1_free_device_dma_region failed: %s\n",
                        __func__, __LINE__, ps3_result(result));
-        r->len = r->bus_addr = 0;
+        r->bus_addr = 0;
+        return result;
+}
+static int dma_ioc0_region_free(struct ps3_dma_region *r)
+{
+        int result;
+        struct dma_chunk *c, *n;
+        DBG("%s: start\n", __func__);
+        list_for_each_entry_safe(c, n, &r->chunk_list.head, link) {
+                list_del(&c->link);
+                dma_ioc0_free_chunk(c);
+        }
+        result = lv1_release_io_segment(0, r->bus_addr);
+        if (result)
+                DBG("%s:%d: lv1_free_device_dma_region failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+        r->bus_addr = 0;
+        DBG("%s: end\n", __func__);
        return result;
 }
 /**
- * dma_map_area - Map an area of memory into a device dma region.
+ * dma_sb_map_area - Map an area of memory into a device dma region.
 * @r: Pointer to a struct ps3_dma_region.
 * @virt_addr: Starting virtual address of the area to map.
 * @len: Length in bytes of the area to map.
@@ -559,16 +780,19 @@ static int dma_region_free(struct ps3_dma_region* r)
 * This is the common dma mapping routine.
 */
-static int dma_map_area(struct ps3_dma_region *r, unsigned long virt_addr,
+static int dma_sb_map_area(struct ps3_dma_region *r, unsigned long virt_addr,
-        unsigned long len, unsigned long *bus_addr)
+           unsigned long len, unsigned long *bus_addr,
+           u64 iopte_flag)
 {
        int result;
        unsigned long flags;
        struct dma_chunk *c;
        unsigned long phys_addr = is_kernel_addr(virt_addr) ? __pa(virt_addr)
                : virt_addr;
+        unsigned long aligned_phys = _ALIGN_DOWN(phys_addr, 1 << r->page_size);
-        *bus_addr = dma_lpar_to_bus(r, ps3_mm_phys_to_lpar(phys_addr));
+        unsigned long aligned_len = _ALIGN_UP(len + phys_addr - aligned_phys,
+                                              1 << r->page_size);
+        *bus_addr = dma_sb_lpar_to_bus(r, ps3_mm_phys_to_lpar(phys_addr));
        if (!USE_DYNAMIC_DMA) {
                unsigned long lpar_addr = ps3_mm_phys_to_lpar(phys_addr);
@@ -588,17 +812,18 @@ static int dma_map_area(struct ps3_dma_region *r, unsigned long virt_addr,
        c = dma_find_chunk(r, *bus_addr, len);
        if (c) {
+                DBG("%s:%d: reusing mapped chunk", __func__, __LINE__);
+                dma_dump_chunk(c);
                c->usage_count++;
                spin_unlock_irqrestore(&r->chunk_list.lock, flags);
                return 0;
        }
-        result = dma_map_pages(r, _ALIGN_DOWN(phys_addr, 1 << r->page_size),
+        result = dma_sb_map_pages(r, aligned_phys, aligned_len, &c, iopte_flag);
-                _ALIGN_UP(len, 1 << r->page_size), &c);
        if (result) {
                *bus_addr = 0;
-                DBG("%s:%d: dma_map_pages failed (%d)\n",
+                DBG("%s:%d: dma_sb_map_pages failed (%d)\n",
                        __func__, __LINE__, result);
                spin_unlock_irqrestore(&r->chunk_list.lock, flags);
                return result;
@@ -610,8 +835,57 @@ static int dma_map_area(struct ps3_dma_region *r, unsigned long virt_addr,
        return result;
 }
+static int dma_ioc0_map_area(struct ps3_dma_region *r, unsigned long virt_addr,
+             unsigned long len, unsigned long *bus_addr,
+             u64 iopte_flag)
+{
+        int result;
+        unsigned long flags;
+        struct dma_chunk *c;
+        unsigned long phys_addr = is_kernel_addr(virt_addr) ? __pa(virt_addr)
+                : virt_addr;
+        unsigned long aligned_phys = _ALIGN_DOWN(phys_addr, 1 << r->page_size);
+        unsigned long aligned_len = _ALIGN_UP(len + phys_addr - aligned_phys,
+                                              1 << r->page_size);
+        DBG(KERN_ERR "%s: vaddr=%#lx, len=%#lx\n", __func__,
+            virt_addr, len);
+        DBG(KERN_ERR "%s: ph=%#lx a_ph=%#lx a_l=%#lx\n", __func__,
+            phys_addr, aligned_phys, aligned_len);
+        spin_lock_irqsave(&r->chunk_list.lock, flags);
+        c = dma_find_chunk_lpar(r, ps3_mm_phys_to_lpar(phys_addr), len);
+        if (c) {
+                /* FIXME */
+                BUG();
+                *bus_addr = c->bus_addr + phys_addr - aligned_phys;
+                c->usage_count++;
+                spin_unlock_irqrestore(&r->chunk_list.lock, flags);
+                return 0;
+        }
+        result = dma_ioc0_map_pages(r, aligned_phys, aligned_len, &c,
+                                    iopte_flag);
+        if (result) {
+                *bus_addr = 0;
+                DBG("%s:%d: dma_ioc0_map_pages failed (%d)\n",
+                        __func__, __LINE__, result);
+                spin_unlock_irqrestore(&r->chunk_list.lock, flags);
+                return result;
+        }
+        *bus_addr = c->bus_addr + phys_addr - aligned_phys;
+        DBG("%s: va=%#lx pa=%#lx a_pa=%#lx bus=%#lx\n", __func__,
+            virt_addr, phys_addr, aligned_phys, *bus_addr);
+        c->usage_count = 1;
+        spin_unlock_irqrestore(&r->chunk_list.lock, flags);
+        return result;
+}
 /**
- * dma_unmap_area - Unmap an area of memory from a device dma region.
+ * dma_sb_unmap_area - Unmap an area of memory from a device dma region.
 * @r: Pointer to a struct ps3_dma_region.
 * @bus_addr: The starting ioc bus address of the area to unmap.
 * @len: Length in bytes of the area to unmap.
@@ -619,7 +893,7 @@ static int dma_map_area(struct ps3_dma_region *r, unsigned long virt_addr,
 * This is the common dma unmap routine.
 */
-int dma_unmap_area(struct ps3_dma_region *r, unsigned long bus_addr,
+static int dma_sb_unmap_area(struct ps3_dma_region *r, unsigned long bus_addr,
        unsigned long len)
 {
        unsigned long flags;
@@ -631,7 +905,8 @@ int dma_unmap_area(struct ps3_dma_region *r, unsigned long bus_addr,
        if (!c) {
                unsigned long aligned_bus = _ALIGN_DOWN(bus_addr,
                        1 << r->page_size);
-                unsigned long aligned_len = _ALIGN_UP(len, 1 << r->page_size);
+                unsigned long aligned_len = _ALIGN_UP(len + bus_addr
+                        - aligned_bus, 1 << r->page_size);
                DBG("%s:%d: not found: bus_addr %lxh\n",
                        __func__, __LINE__, bus_addr);
                DBG("%s:%d: not found: len %lxh\n",
@@ -647,94 +922,166 @@ int dma_unmap_area(struct ps3_dma_region *r, unsigned long bus_addr,
        if (!c->usage_count) {
                list_del(&c->link);
-                dma_free_chunk(c);
+                dma_sb_free_chunk(c);
        }
        spin_unlock_irqrestore(&r->chunk_list.lock, flags);
        return 0;
 }
+static int dma_ioc0_unmap_area(struct ps3_dma_region *r,
+                        unsigned long bus_addr, unsigned long len)
+{
+        unsigned long flags;
+        struct dma_chunk *c;
+        DBG("%s: start a=%#lx l=%#lx\n", __func__, bus_addr, len);
+        spin_lock_irqsave(&r->chunk_list.lock, flags);
+        c = dma_find_chunk(r, bus_addr, len);
+        if (!c) {
+                unsigned long aligned_bus = _ALIGN_DOWN(bus_addr,
+                                                        1 << r->page_size);
+                unsigned long aligned_len = _ALIGN_UP(len + bus_addr
+                                                      - aligned_bus,
+                                                      1 << r->page_size);
+                DBG("%s:%d: not found: bus_addr %lxh\n",
+                    __func__, __LINE__, bus_addr);
+                DBG("%s:%d: not found: len %lxh\n",
+                    __func__, __LINE__, len);
+                DBG("%s:%d: not found: aligned_bus %lxh\n",
+                    __func__, __LINE__, aligned_bus);
+                DBG("%s:%d: not found: aligned_len %lxh\n",
+                    __func__, __LINE__, aligned_len);
+                BUG();
+        }
+        c->usage_count--;
+        if (!c->usage_count) {
+                list_del(&c->link);
+                dma_ioc0_free_chunk(c);
+        }
+        spin_unlock_irqrestore(&r->chunk_list.lock, flags);
+        DBG("%s: end\n", __func__);
+        return 0;
+}
 /**
- * dma_region_create_linear - Setup a linear dma maping for a device.
+ * dma_sb_region_create_linear - Setup a linear dma mapping for a device.
 * @r: Pointer to a struct ps3_dma_region.
 *
 * This routine creates an HV dma region for the device and maps all available
 * ram into the io controller bus address space.
 */
-static int dma_region_create_linear(struct ps3_dma_region *r)
+static int dma_sb_region_create_linear(struct ps3_dma_region *r)
 {
        int result;
-        unsigned long tmp;
+        unsigned long virt_addr, len, tmp;
-        /* force 16M dma pages for linear mapping */
+        if (r->len > 16*1024*1024) {    /* FIXME: need proper fix */
+                /* force 16M dma pages for linear mapping */
-        if (r->page_size != PS3_DMA_16M) {
+                if (r->page_size != PS3_DMA_16M) {
-                pr_info("%s:%d: forcing 16M pages for linear map\n",
+                        pr_info("%s:%d: forcing 16M pages for linear map\n",
-                        __func__, __LINE__);
+                                __func__, __LINE__);
-                r->page_size = PS3_DMA_16M;
+                        r->page_size = PS3_DMA_16M;
+                        r->len = _ALIGN_UP(r->len, 1 << r->page_size);
+                }
        }
-        result = dma_region_create(r);
+        result = dma_sb_region_create(r);
        BUG_ON(result);
-        result = dma_map_area(r, map.rm.base, map.rm.size, &tmp);
+        if (r->offset < map.rm.size) {
-        BUG_ON(result);
+                /* Map (part of) 1st RAM chunk */
+                virt_addr = map.rm.base + r->offset;
-        if (USE_LPAR_ADDR)
+                len = map.rm.size - r->offset;
-                result = dma_map_area(r, map.r1.base, map.r1.size,
+                if (len > r->len)
-                        &tmp);
+                        len = r->len;
-        else
+                result = dma_sb_map_area(r, virt_addr, len, &tmp,
-                result = dma_map_area(r, map.rm.size, map.r1.size,
+                        IOPTE_PP_W | IOPTE_PP_R | IOPTE_SO_RW | IOPTE_M);
-                        &tmp);
+                BUG_ON(result);
+        }
-        BUG_ON(result);
+        if (r->offset + r->len > map.rm.size) {
+                /* Map (part of) 2nd RAM chunk */
+                virt_addr = USE_LPAR_ADDR ? map.r1.base : map.rm.size;
+                len = r->len;
+                if (r->offset >= map.rm.size)
+                        virt_addr += r->offset - map.rm.size;
+                else
+                        len -= map.rm.size - r->offset;
+                result = dma_sb_map_area(r, virt_addr, len, &tmp,
+                        IOPTE_PP_W | IOPTE_PP_R | IOPTE_SO_RW | IOPTE_M);
+                BUG_ON(result);
+        }
        return result;
 }
 /**
- * dma_region_free_linear - Free a linear dma mapping for a device.
+ * dma_sb_region_free_linear - Free a linear dma mapping for a device.
 * @r: Pointer to a struct ps3_dma_region.
 *
 * This routine will unmap all mapped areas and free the HV dma region.
 */
-static int dma_region_free_linear(struct ps3_dma_region *r)
+static int dma_sb_region_free_linear(struct ps3_dma_region *r)
 {
        int result;
+        unsigned long bus_addr, len, lpar_addr;
+        if (r->offset < map.rm.size) {
+                /* Unmap (part of) 1st RAM chunk */
+                lpar_addr = map.rm.base + r->offset;
+                len = map.rm.size - r->offset;
+                if (len > r->len)
+                        len = r->len;
+                bus_addr = dma_sb_lpar_to_bus(r, lpar_addr);
+                result = dma_sb_unmap_area(r, bus_addr, len);
+                BUG_ON(result);
+        }
-        result = dma_unmap_area(r, dma_lpar_to_bus(r, 0), map.rm.size);
+        if (r->offset + r->len > map.rm.size) {
-        BUG_ON(result);
+                /* Unmap (part of) 2nd RAM chunk */
+                lpar_addr = map.r1.base;
-        result = dma_unmap_area(r, dma_lpar_to_bus(r, map.r1.base),
+                len = r->len;
-                map.r1.size);
+                if (r->offset >= map.rm.size)
-        BUG_ON(result);
+                        lpar_addr += r->offset - map.rm.size;
+                else
+                        len -= map.rm.size - r->offset;
+                bus_addr = dma_sb_lpar_to_bus(r, lpar_addr);
+                result = dma_sb_unmap_area(r, bus_addr, len);
+                BUG_ON(result);
+        }
-        result = dma_region_free(r);
+        result = dma_sb_region_free(r);
        BUG_ON(result);
        return result;
 }
 /**
- * dma_map_area_linear - Map an area of memory into a device dma region.
+ * dma_sb_map_area_linear - Map an area of memory into a device dma region.
 * @r: Pointer to a struct ps3_dma_region.
 * @virt_addr: Starting virtual address of the area to map.
 * @len: Length in bytes of the area to map.
 * @bus_addr: A pointer to return the starting ioc bus address of the area to
 * map.
 *
- * This routine just returns the coresponding bus address.  Actual mapping
+ * This routine just returns the corresponding bus address.  Actual mapping
 * occurs in dma_region_create_linear().
 */
-static int dma_map_area_linear(struct ps3_dma_region *r,
+static int dma_sb_map_area_linear(struct ps3_dma_region *r,
-        unsigned long virt_addr, unsigned long len, unsigned long *bus_addr)
+        unsigned long virt_addr, unsigned long len, unsigned long *bus_addr,
+        u64 iopte_flag)
 {
        unsigned long phys_addr = is_kernel_addr(virt_addr) ? __pa(virt_addr)
                : virt_addr;
-        *bus_addr = dma_lpar_to_bus(r, ps3_mm_phys_to_lpar(phys_addr));
+        *bus_addr = dma_sb_lpar_to_bus(r, ps3_mm_phys_to_lpar(phys_addr));
        return 0;
 }
@@ -744,42 +1091,98 @@ static int dma_map_area_linear(struct ps3_dma_region *r,
 * @bus_addr: The starting ioc bus address of the area to unmap.
 * @len: Length in bytes of the area to unmap.
 *
- * This routine does nothing.  Unmapping occurs in dma_region_free_linear().
+ * This routine does nothing.  Unmapping occurs in dma_sb_region_free_linear().
 */
-static int dma_unmap_area_linear(struct ps3_dma_region *r,
+static int dma_sb_unmap_area_linear(struct ps3_dma_region *r,
        unsigned long bus_addr, unsigned long len)
 {
        return 0;
+};
+static const struct ps3_dma_region_ops ps3_dma_sb_region_ops =  {
+        .create = dma_sb_region_create,
+        .free = dma_sb_region_free,
+        .map = dma_sb_map_area,
+        .unmap = dma_sb_unmap_area
+};
+static const struct ps3_dma_region_ops ps3_dma_sb_region_linear_ops = {
+        .create = dma_sb_region_create_linear,
+        .free = dma_sb_region_free_linear,
+        .map = dma_sb_map_area_linear,
+        .unmap = dma_sb_unmap_area_linear
+};
+static const struct ps3_dma_region_ops ps3_dma_ioc0_region_ops = {
+        .create = dma_ioc0_region_create,
+        .free = dma_ioc0_region_free,
+        .map = dma_ioc0_map_area,
+        .unmap = dma_ioc0_unmap_area
+};
+int ps3_dma_region_init(struct ps3_system_bus_device *dev,
+        struct ps3_dma_region *r, enum ps3_dma_page_size page_size,
+        enum ps3_dma_region_type region_type, void *addr, unsigned long len)
+{
+        unsigned long lpar_addr;
+        lpar_addr = addr ? ps3_mm_phys_to_lpar(__pa(addr)) : 0;
+        r->dev = dev;
+        r->page_size = page_size;
+        r->region_type = region_type;
+        r->offset = lpar_addr;
+        if (r->offset >= map.rm.size)
+                r->offset -= map.r1.offset;
+        r->len = len ? len : _ALIGN_UP(map.total, 1 << r->page_size);
+        switch (dev->dev_type) {
+        case PS3_DEVICE_TYPE_SB:
+                r->region_ops =  (USE_DYNAMIC_DMA)
+                        ? &ps3_dma_sb_region_ops
+                        : &ps3_dma_sb_region_linear_ops;
+                break;
+        case PS3_DEVICE_TYPE_IOC0:
+                r->region_ops = &ps3_dma_ioc0_region_ops;
+                break;
+        default:
+                BUG();
+                return -EINVAL;
+        }
+        return 0;
 }
+EXPORT_SYMBOL(ps3_dma_region_init);
 int ps3_dma_region_create(struct ps3_dma_region *r)
 {
-        return (USE_DYNAMIC_DMA)
+        BUG_ON(!r);
-                ? dma_region_create(r)
+        BUG_ON(!r->region_ops);
-                : dma_region_create_linear(r);
+        BUG_ON(!r->region_ops->create);
+        return r->region_ops->create(r);
 }
+EXPORT_SYMBOL(ps3_dma_region_create);
 int ps3_dma_region_free(struct ps3_dma_region *r)
 {
-        return (USE_DYNAMIC_DMA)
+        BUG_ON(!r);
-                ? dma_region_free(r)
+        BUG_ON(!r->region_ops);
-                : dma_region_free_linear(r);
+        BUG_ON(!r->region_ops->free);
+        return r->region_ops->free(r);
 }
+EXPORT_SYMBOL(ps3_dma_region_free);
 int ps3_dma_map(struct ps3_dma_region *r, unsigned long virt_addr,
-        unsigned long len, unsigned long *bus_addr)
+        unsigned long len, unsigned long *bus_addr,
+        u64 iopte_flag)
 {
-        return (USE_DYNAMIC_DMA)
+        return r->region_ops->map(r, virt_addr, len, bus_addr, iopte_flag);
-                ? dma_map_area(r, virt_addr, len, bus_addr)
-                : dma_map_area_linear(r, virt_addr, len, bus_addr);
 }
 int ps3_dma_unmap(struct ps3_dma_region *r, unsigned long bus_addr,
        unsigned long len)
 {
-        return (USE_DYNAMIC_DMA) ? dma_unmap_area(r, bus_addr, len)
+        return r->region_ops->unmap(r, bus_addr, len);
-                : dma_unmap_area_linear(r, bus_addr, len);
 }
 /*============================================================================*/
@@ -810,12 +1213,13 @@ void __init ps3_mm_init(void)
        BUG_ON(map.rm.base);
        BUG_ON(!map.rm.size);
-        lmb_add(map.rm.base, map.rm.size);
-        lmb_analyze();
        /* arrange to do this in ps3_mm_add_memory */
        ps3_mm_region_create(&map.r1, map.total - map.rm.size);
+        /* correct map.total for the real total amount of memory we use */
+        map.total = map.rm.size + map.r1.size;
        DBG(" <- %s:%d\n", __func__, __LINE__);
 }
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
index 5c3da08bc0..b70e474014 100644
--- a/arch/powerpc/platforms/ps3/os-area.c
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -133,7 +133,7 @@ struct saved_params {
 } static saved_params;
 #define dump_header(_a) _dump_header(_a, __func__, __LINE__)
-static void _dump_header(const struct os_area_header __iomem *h, const char* func,
+static void _dump_header(const struct os_area_header *h, const char *func,
        int line)
 {
        pr_debug("%s:%d: h.magic_num:         '%s'\n", func, line,
@@ -151,7 +151,7 @@ static void _dump_header(const struct os_area_header __iomem *h, const char* fun
 }
 #define dump_params(_a) _dump_params(_a, __func__, __LINE__)
-static void _dump_params(const struct os_area_params __iomem *p, const char* func,
+static void _dump_params(const struct os_area_params *p, const char *func,
        int line)
 {
        pr_debug("%s:%d: p.boot_flag:       %u\n", func, line, p->boot_flag);
diff --git a/arch/powerpc/platforms/ps3/platform.h b/arch/powerpc/platforms/ps3/platform.h
index ca04f03305..87d52060fe 100644
--- a/arch/powerpc/platforms/ps3/platform.h
+++ b/arch/powerpc/platforms/ps3/platform.h
@@ -41,6 +41,7 @@ void ps3_mm_shutdown(void);
 /* irq */
 void ps3_init_IRQ(void);
+void ps3_shutdown_IRQ(int cpu);
 void __init ps3_register_ipi_debug_brk(unsigned int cpu, unsigned int virq);
 /* smp */
@@ -82,6 +83,7 @@ enum ps3_dev_type {
        PS3_DEV_TYPE_STOR_ROM = TYPE_ROM,       /* 5 */
        PS3_DEV_TYPE_SB_GPIO = 6,
        PS3_DEV_TYPE_STOR_FLASH = TYPE_RBC,     /* 14 */
+        PS3_DEV_TYPE_NOACCESS = 255,
 };
 int ps3_repository_read_bus_str(unsigned int bus_index, const char *bus_str,
@@ -129,24 +131,28 @@ int ps3_repository_read_dev_reg(unsigned int bus_index,
 /* repository bus enumerators */
 struct ps3_repository_device {
+        enum ps3_bus_type bus_type;
        unsigned int bus_index;
+        unsigned int bus_id;
+        enum ps3_dev_type dev_type;
        unsigned int dev_index;
-        struct ps3_device_id did;
+        unsigned int dev_id;
 };
-int ps3_repository_find_device(enum ps3_bus_type bus_type,
+static inline struct ps3_repository_device *ps3_repository_bump_device(
-        enum ps3_dev_type dev_type,
+        struct ps3_repository_device *repo)
-        const struct ps3_repository_device *start_dev,
-        struct ps3_repository_device *dev);
-static inline int ps3_repository_find_first_device(
-        enum ps3_bus_type bus_type, enum ps3_dev_type dev_type,
-        struct ps3_repository_device *dev)
 {
-        return ps3_repository_find_device(bus_type, dev_type, NULL, dev);
+        repo->dev_index++;
+        return repo;
 }
-int ps3_repository_find_interrupt(const struct ps3_repository_device *dev,
+int ps3_repository_find_device(struct ps3_repository_device *repo);
+int ps3_repository_find_devices(enum ps3_bus_type bus_type,
+        int (*callback)(const struct ps3_repository_device *repo));
+int ps3_repository_find_bus(enum ps3_bus_type bus_type, unsigned int from,
+        unsigned int *bus_index);
+int ps3_repository_find_interrupt(const struct ps3_repository_device *repo,
        enum ps3_interrupt_type intr_type, unsigned int *interrupt_id);
-int ps3_repository_find_reg(const struct ps3_repository_device *dev,
+int ps3_repository_find_reg(const struct ps3_repository_device *repo,
        enum ps3_reg_type reg_type, u64 *bus_addr, u64 *len);
 /* repository block device info */
@@ -216,4 +222,19 @@ int ps3_repository_read_num_spu_resource_id(unsigned int *num_resource_id);
 int ps3_repository_read_spu_resource_id(unsigned int res_index,
        enum ps3_spu_resource_type* resource_type, unsigned int *resource_id);
+/* repository vuart info */
+int ps3_repository_read_vuart_av_port(unsigned int *port);
+int ps3_repository_read_vuart_sysmgr_port(unsigned int *port);
+/* Page table entries */
+#define IOPTE_PP_W              0x8000000000000000ul /* protection: write */
+#define IOPTE_PP_R              0x4000000000000000ul /* protection: read */
+#define IOPTE_M                 0x2000000000000000ul /* coherency required */
+#define IOPTE_SO_R              0x1000000000000000ul /* ordering: writes */
+#define IOPTE_SO_RW             0x1800000000000000ul /* ordering: r & w */
+#define IOPTE_RPN_Mask          0x07fffffffffff000ul /* RPN */
+#define IOPTE_H                 0x0000000000000800ul /* cache hint */
+#define IOPTE_IOID_Mask         0x00000000000007fful /* ioid */
 #endif
diff --git a/arch/powerpc/platforms/ps3/repository.c b/arch/powerpc/platforms/ps3/repository.c
index ae586a0e5d..8cc37cfea0 100644
--- a/arch/powerpc/platforms/ps3/repository.c
+++ b/arch/powerpc/platforms/ps3/repository.c
@@ -138,7 +138,7 @@ static int read_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,
                pr_debug("%s:%d: lv1_get_repository_node_value failed: %s\n",
                        __func__, __LINE__, ps3_result(result));
                dump_node_name(lpar_id, n1, n2, n3, n4);
-                return result;
+                return -ENOENT;
        }
        dump_node(lpar_id, n1, n2, n3, n4, v1, v2);
@@ -155,7 +155,7 @@ static int read_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,
                pr_debug("%s:%d: warning: discarding non-zero v2: %016lx\n",
                        __func__, __LINE__, v2);
-        return result;
+        return 0;
 }
 int ps3_repository_read_bus_str(unsigned int bus_index, const char *bus_str,
@@ -314,324 +314,140 @@ int ps3_repository_read_dev_reg(unsigned int bus_index,
                reg_index, bus_addr, len);
 }
-#if defined(DEBUG)
-int ps3_repository_dump_resource_info(unsigned int bus_index,
-        unsigned int dev_index)
-{
-        int result = 0;
-        unsigned int res_index;
-        pr_debug(" -> %s:%d: (%u:%u)\n", __func__, __LINE__,
-                bus_index, dev_index);
-        for (res_index = 0; res_index < 10; res_index++) {
+int ps3_repository_find_device(struct ps3_repository_device *repo)
-                enum ps3_interrupt_type intr_type;
+{
-                unsigned int interrupt_id;
+        int result;
+        struct ps3_repository_device tmp = *repo;
+        unsigned int num_dev;
-                result = ps3_repository_read_dev_intr(bus_index, dev_index,
+        BUG_ON(repo->bus_index > 10);
-                        res_index, &intr_type, &interrupt_id);
+        BUG_ON(repo->dev_index > 10);
-                if (result) {
+        result = ps3_repository_read_bus_num_dev(tmp.bus_index, &num_dev);
-                        if (result !=  LV1_NO_ENTRY)
-                                pr_debug("%s:%d ps3_repository_read_dev_intr"
-                                        " (%u:%u) failed\n", __func__, __LINE__,
-                                        bus_index, dev_index);
-                        break;
-                }
-                pr_debug("%s:%d (%u:%u) intr_type %u, interrupt_id %u\n",
+        if (result) {
-                        __func__, __LINE__, bus_index, dev_index, intr_type,
+                pr_debug("%s:%d read_bus_num_dev failed\n", __func__, __LINE__);
-                        interrupt_id);
+                return result;
        }
-        for (res_index = 0; res_index < 10; res_index++) {
+        pr_debug("%s:%d: bus_type %u, bus_index %u, bus_id %u, num_dev %u\n",
-                enum ps3_reg_type reg_type;
+                __func__, __LINE__, tmp.bus_type, tmp.bus_index, tmp.bus_id,
-                u64 bus_addr;
+                num_dev);
-                u64 len;
-                result = ps3_repository_read_dev_reg(bus_index, dev_index,
-                        res_index, &reg_type, &bus_addr, &len);
-                if (result) {
+        if (tmp.dev_index >= num_dev) {
-                        if (result !=  LV1_NO_ENTRY)
+                pr_debug("%s:%d: no device found\n", __func__, __LINE__);
-                                pr_debug("%s:%d ps3_repository_read_dev_reg"
+                return -ENODEV;
-                                        " (%u:%u) failed\n", __func__, __LINE__,
-                                        bus_index, dev_index);
-                        break;
-                }
-                pr_debug("%s:%d (%u:%u) reg_type %u, bus_addr %lxh, len %lxh\n",
-                        __func__, __LINE__, bus_index, dev_index, reg_type,
-                        bus_addr, len);
        }
-        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        result = ps3_repository_read_dev_type(tmp.bus_index, tmp.dev_index,
-        return result;
+                &tmp.dev_type);
-}
-static int dump_stor_dev_info(unsigned int bus_index, unsigned int dev_index)
-{
-        int result = 0;
-        unsigned int num_regions, region_index;
-        u64 port, blk_size, num_blocks;
-        pr_debug(" -> %s:%d: (%u:%u)\n", __func__, __LINE__,
-                bus_index, dev_index);
-        result = ps3_repository_read_stor_dev_info(bus_index, dev_index, &port,
-                &blk_size, &num_blocks, &num_regions);
        if (result) {
-                pr_debug("%s:%d ps3_repository_read_stor_dev_info"
+                pr_debug("%s:%d read_dev_type failed\n", __func__, __LINE__);
-                        " (%u:%u) failed\n", __func__, __LINE__,
+                return result;
-                        bus_index, dev_index);
-                goto out;
        }
-        pr_debug("%s:%d  (%u:%u): port %lu, blk_size %lu, num_blocks "
+        result = ps3_repository_read_dev_id(tmp.bus_index, tmp.dev_index,
-                 "%lu, num_regions %u\n",
+                &tmp.dev_id);
-                 __func__, __LINE__, bus_index, dev_index, port,
-                 blk_size, num_blocks, num_regions);
-        for (region_index = 0; region_index < num_regions; region_index++) {
-                unsigned int region_id;
-                u64 region_start, region_size;
-                result = ps3_repository_read_stor_dev_region(bus_index,
-                        dev_index, region_index, &region_id, &region_start,
-                        &region_size);
-                if (result) {
-                         pr_debug("%s:%d ps3_repository_read_stor_dev_region"
-                                  " (%u:%u) failed\n", __func__, __LINE__,
-                                  bus_index, dev_index);
-                        break;
-                }
-                pr_debug("%s:%d (%u:%u) region_id %u, start %lxh, size %lxh\n",
+        if (result) {
-                         __func__, __LINE__, bus_index, dev_index, region_id,
+                pr_debug("%s:%d ps3_repository_read_dev_id failed\n", __func__,
-                         region_start, region_size);
+                __LINE__);
+                return result;
        }
-out:
+        pr_debug("%s:%d: found: dev_type %u, dev_index %u, dev_id %u\n",
-        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+                __func__, __LINE__, tmp.dev_type, tmp.dev_index, tmp.dev_id);
-        return result;
-}
-static int dump_device_info(unsigned int bus_index, enum ps3_bus_type bus_type,
-                            unsigned int num_dev)
-{
-        int result = 0;
-        unsigned int dev_index;
-        pr_debug(" -> %s:%d: bus_%u\n", __func__, __LINE__, bus_index);
-        for (dev_index = 0; dev_index < num_dev; dev_index++) {
-                enum ps3_dev_type dev_type;
-                unsigned int dev_id;
-                result = ps3_repository_read_dev_type(bus_index, dev_index,
-                        &dev_type);
-                if (result) {
-                        pr_debug("%s:%d ps3_repository_read_dev_type"
-                                " (%u:%u) failed\n", __func__, __LINE__,
-                                bus_index, dev_index);
-                        break;
-                }
-                result = ps3_repository_read_dev_id(bus_index, dev_index,
-                        &dev_id);
-                if (result) {
-                        pr_debug("%s:%d ps3_repository_read_dev_id"
-                                " (%u:%u) failed\n", __func__, __LINE__,
-                                bus_index, dev_index);
-                        continue;
-                }
-                pr_debug("%s:%d  (%u:%u): dev_type %u, dev_id %u\n", __func__,
+        *repo = tmp;
-                        __LINE__, bus_index, dev_index, dev_type, dev_id);
+        return 0;
-                ps3_repository_dump_resource_info(bus_index, dev_index);
-                if (bus_type == PS3_BUS_TYPE_STORAGE)
-                        dump_stor_dev_info(bus_index, dev_index);
-        }
-        pr_debug(" <- %s:%d\n", __func__, __LINE__);
-        return result;
 }
-int ps3_repository_dump_bus_info(void)
+int __devinit ps3_repository_find_devices(enum ps3_bus_type bus_type,
+        int (*callback)(const struct ps3_repository_device *repo))
 {
        int result = 0;
-        unsigned int bus_index;
+        struct ps3_repository_device repo;
-        pr_debug(" -> %s:%d\n", __func__, __LINE__);
+        pr_debug(" -> %s:%d: find bus_type %u\n", __func__, __LINE__, bus_type);
-        for (bus_index = 0; bus_index < 10; bus_index++) {
+        for (repo.bus_index = 0; repo.bus_index < 10; repo.bus_index++) {
-                enum ps3_bus_type bus_type;
-                unsigned int bus_id;
-                unsigned int num_dev;
-                result = ps3_repository_read_bus_type(bus_index, &bus_type);
+                result = ps3_repository_read_bus_type(repo.bus_index,
+                        &repo.bus_type);
                if (result) {
                        pr_debug("%s:%d read_bus_type(%u) failed\n",
-                                __func__, __LINE__, bus_index);
+                                __func__, __LINE__, repo.bus_index);
                        break;
                }
-                result = ps3_repository_read_bus_id(bus_index, &bus_id);
+                if (repo.bus_type != bus_type) {
+                        pr_debug("%s:%d: skip, bus_type %u\n", __func__,
-                if (result) {
+                                __LINE__, repo.bus_type);
-                        pr_debug("%s:%d read_bus_id(%u) failed\n",
-                                __func__, __LINE__, bus_index);
                        continue;
                }
-                if (bus_index != bus_id)
+                result = ps3_repository_read_bus_id(repo.bus_index,
-                        pr_debug("%s:%d bus_index != bus_id\n",
+                        &repo.bus_id);
-                                __func__, __LINE__);
-                result = ps3_repository_read_bus_num_dev(bus_index, &num_dev);
                if (result) {
-                        pr_debug("%s:%d read_bus_num_dev(%u) failed\n",
+                        pr_debug("%s:%d read_bus_id(%u) failed\n",
-                                __func__, __LINE__, bus_index);
+                                __func__, __LINE__, repo.bus_index);
                        continue;
                }
-                pr_debug("%s:%d bus_%u: bus_type %u, bus_id %u, num_dev %u\n",
+                for (repo.dev_index = 0; ; repo.dev_index++) {
-                        __func__, __LINE__, bus_index, bus_type, bus_id,
+                        result = ps3_repository_find_device(&repo);
-                        num_dev);
-                dump_device_info(bus_index, bus_type, num_dev);
+                        if (result == -ENODEV) {
-        }
+                                result = 0;
+                                break;
+                        } else if (result)
+                                break;
-        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+                        result = callback(&repo);
-        return result;
-}
-#endif /* defined(DEBUG) */
-static int find_device(unsigned int bus_index, unsigned int num_dev,
-        unsigned int start_dev_index, enum ps3_dev_type dev_type,
-        struct ps3_repository_device *dev)
-{
-        int result = 0;
-        unsigned int dev_index;
-        pr_debug("%s:%d: find dev_type %u\n", __func__, __LINE__, dev_type);
+                        if (result) {
+                                pr_debug("%s:%d: abort at callback\n", __func__,
-        dev->dev_index = UINT_MAX;
+                                        __LINE__);
+                                break;
-        for (dev_index = start_dev_index; dev_index < num_dev; dev_index++) {
+                        }
-                enum ps3_dev_type x;
-                result = ps3_repository_read_dev_type(bus_index, dev_index,
-                        &x);
-                if (result) {
-                        pr_debug("%s:%d read_dev_type failed\n",
-                                __func__, __LINE__);
-                        return result;
                }
+                break;
-                if (x == dev_type)
-                        break;
-        }
-        if (dev_index == num_dev)
-                return -1;
-        pr_debug("%s:%d: found dev_type %u at dev_index %u\n",
-                __func__, __LINE__, dev_type, dev_index);
-        result = ps3_repository_read_dev_id(bus_index, dev_index,
-                &dev->did.dev_id);
-        if (result) {
-                pr_debug("%s:%d read_dev_id failed\n",
-                        __func__, __LINE__);
-                return result;
        }
-        dev->dev_index = dev_index;
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
-        pr_debug("%s:%d found: dev_id %u\n", __func__, __LINE__,
-                dev->did.dev_id);
        return result;
 }
-int ps3_repository_find_device (enum ps3_bus_type bus_type,
+int ps3_repository_find_bus(enum ps3_bus_type bus_type, unsigned int from,
-        enum ps3_dev_type dev_type,
+        unsigned int *bus_index)
-        const struct ps3_repository_device *start_dev,
-        struct ps3_repository_device *dev)
 {
-        int result = 0;
+        unsigned int i;
-        unsigned int bus_index;
+        enum ps3_bus_type type;
-        unsigned int num_dev;
+        int error;
-        pr_debug("%s:%d: find bus_type %u, dev_type %u\n", __func__, __LINE__,
-                bus_type, dev_type);
-        BUG_ON(start_dev && start_dev->bus_index > 10);
-        for (bus_index = start_dev ? start_dev->bus_index : 0; bus_index < 10;
-                bus_index++) {
-                enum ps3_bus_type x;
-                result = ps3_repository_read_bus_type(bus_index, &x);
-                if (result) {
+        for (i = from; i < 10; i++) {
+                error = ps3_repository_read_bus_type(i, &type);
+                if (error) {
                        pr_debug("%s:%d read_bus_type failed\n",
                                __func__, __LINE__);
-                        dev->bus_index = UINT_MAX;
+                        *bus_index = UINT_MAX;
-                        return result;
+                        return error;
+                }
+                if (type == bus_type) {
+                        *bus_index = i;
+                        return 0;
                }
-                if (x == bus_type)
-                        break;
-        }
-        if (bus_index >= 10)
-                return -ENODEV;
-        pr_debug("%s:%d: found bus_type %u at bus_index %u\n",
-                __func__, __LINE__, bus_type, bus_index);
-        result = ps3_repository_read_bus_num_dev(bus_index, &num_dev);
-        if (result) {
-                pr_debug("%s:%d read_bus_num_dev failed\n",
-                        __func__, __LINE__);
-                return result;
-        }
-        result = find_device(bus_index, num_dev, start_dev
-                ? start_dev->dev_index + 1 : 0, dev_type, dev);
-        if (result) {
-                pr_debug("%s:%d get_did failed\n", __func__, __LINE__);
-                return result;
-        }
-        result = ps3_repository_read_bus_id(bus_index, &dev->did.bus_id);
-        if (result) {
-                pr_debug("%s:%d read_bus_id failed\n",
-                        __func__, __LINE__);
-                return result;
        }
+        *bus_index = UINT_MAX;
-        dev->bus_index = bus_index;
+        return -ENODEV;
-        pr_debug("%s:%d found: bus_id %u, dev_id %u\n",
-                __func__, __LINE__, dev->did.bus_id, dev->did.dev_id);
-        return result;
 }
-int ps3_repository_find_interrupt(const struct ps3_repository_device *dev,
+int ps3_repository_find_interrupt(const struct ps3_repository_device *repo,
        enum ps3_interrupt_type intr_type, unsigned int *interrupt_id)
 {
        int result = 0;
@@ -645,8 +461,8 @@ int ps3_repository_find_interrupt(const struct ps3_repository_device *dev,
                enum ps3_interrupt_type t;
                unsigned int id;
-                result = ps3_repository_read_dev_intr(dev->bus_index,
+                result = ps3_repository_read_dev_intr(repo->bus_index,
-                        dev->dev_index, res_index, &t, &id);
+                        repo->dev_index, res_index, &t, &id);
                if (result) {
                        pr_debug("%s:%d read_dev_intr failed\n",
@@ -669,7 +485,7 @@ int ps3_repository_find_interrupt(const struct ps3_repository_device *dev,
        return result;
 }
-int ps3_repository_find_reg(const struct ps3_repository_device *dev,
+int ps3_repository_find_reg(const struct ps3_repository_device *repo,
        enum ps3_reg_type reg_type, u64 *bus_addr, u64 *len)
 {
        int result = 0;
@@ -684,8 +500,8 @@ int ps3_repository_find_reg(const struct ps3_repository_device *dev,
                u64 a;
                u64 l;
-                result = ps3_repository_read_dev_reg(dev->bus_index,
+                result = ps3_repository_read_dev_reg(repo->bus_index,
-                        dev->dev_index, res_index, &t, &a, &l);
+                        repo->dev_index, res_index, &t, &a, &l);
                if (result) {
                        pr_debug("%s:%d read_dev_reg failed\n",
@@ -965,6 +781,36 @@ int ps3_repository_read_boot_dat_size(unsigned int *size)
        return result;
 }
+int ps3_repository_read_vuart_av_port(unsigned int *port)
+{
+        int result;
+        u64 v1;
+        result = read_node(PS3_LPAR_ID_CURRENT,
+                make_first_field("bi", 0),
+                make_field("vir_uart", 0),
+                make_field("port", 0),
+                make_field("avset", 0),
+                &v1, 0);
+        *port = v1;
+        return result;
+}
+int ps3_repository_read_vuart_sysmgr_port(unsigned int *port)
+{
+        int result;
+        u64 v1;
+        result = read_node(PS3_LPAR_ID_CURRENT,
+                make_first_field("bi", 0),
+                make_field("vir_uart", 0),
+                make_field("port", 0),
+                make_field("sysmgr", 0),
+                &v1, 0);
+        *port = v1;
+        return result;
+}
 /**
  * ps3_repository_read_boot_dat_info - Get address and size of cell_ext_os_area.
  * address: lpar address of cell_ext_os_area
@@ -1026,3 +872,205 @@ int ps3_repository_read_be_tb_freq(unsigned int be_index, u64 *tb_freq)
        return result ? result
                : ps3_repository_read_tb_freq(node_id, tb_freq);
 }
+#if defined(DEBUG)
+int ps3_repository_dump_resource_info(const struct ps3_repository_device *repo)
+{
+        int result = 0;
+        unsigned int res_index;
+        pr_debug(" -> %s:%d: (%u:%u)\n", __func__, __LINE__,
+                repo->bus_index, repo->dev_index);
+        for (res_index = 0; res_index < 10; res_index++) {
+                enum ps3_interrupt_type intr_type;
+                unsigned int interrupt_id;
+                result = ps3_repository_read_dev_intr(repo->bus_index,
+                        repo->dev_index, res_index, &intr_type, &interrupt_id);
+                if (result) {
+                        if (result !=  LV1_NO_ENTRY)
+                                pr_debug("%s:%d ps3_repository_read_dev_intr"
+                                        " (%u:%u) failed\n", __func__, __LINE__,
+                                        repo->bus_index, repo->dev_index);
+                        break;
+                }
+                pr_debug("%s:%d (%u:%u) intr_type %u, interrupt_id %u\n",
+                        __func__, __LINE__, repo->bus_index, repo->dev_index,
+                        intr_type, interrupt_id);
+        }
+        for (res_index = 0; res_index < 10; res_index++) {
+                enum ps3_reg_type reg_type;
+                u64 bus_addr;
+                u64 len;
+                result = ps3_repository_read_dev_reg(repo->bus_index,
+                        repo->dev_index, res_index, &reg_type, &bus_addr, &len);
+                if (result) {
+                        if (result !=  LV1_NO_ENTRY)
+                                pr_debug("%s:%d ps3_repository_read_dev_reg"
+                                        " (%u:%u) failed\n", __func__, __LINE__,
+                                        repo->bus_index, repo->dev_index);
+                        break;
+                }
+                pr_debug("%s:%d (%u:%u) reg_type %u, bus_addr %lxh, len %lxh\n",
+                        __func__, __LINE__, repo->bus_index, repo->dev_index,
+                        reg_type, bus_addr, len);
+        }
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return result;
+}
+static int dump_stor_dev_info(struct ps3_repository_device *repo)
+{
+        int result = 0;
+        unsigned int num_regions, region_index;
+        u64 port, blk_size, num_blocks;
+        pr_debug(" -> %s:%d: (%u:%u)\n", __func__, __LINE__,
+                repo->bus_index, repo->dev_index);
+        result = ps3_repository_read_stor_dev_info(repo->bus_index,
+                repo->dev_index, &port, &blk_size, &num_blocks, &num_regions);
+        if (result) {
+                pr_debug("%s:%d ps3_repository_read_stor_dev_info"
+                        " (%u:%u) failed\n", __func__, __LINE__,
+                        repo->bus_index, repo->dev_index);
+                goto out;
+        }
+        pr_debug("%s:%d  (%u:%u): port %lu, blk_size %lu, num_blocks "
+                 "%lu, num_regions %u\n",
+                 __func__, __LINE__, repo->bus_index, repo->dev_index, port,
+                 blk_size, num_blocks, num_regions);
+        for (region_index = 0; region_index < num_regions; region_index++) {
+                unsigned int region_id;
+                u64 region_start, region_size;
+                result = ps3_repository_read_stor_dev_region(repo->bus_index,
+                        repo->dev_index, region_index, &region_id,
+                        &region_start, &region_size);
+                if (result) {
+                         pr_debug("%s:%d ps3_repository_read_stor_dev_region"
+                                  " (%u:%u) failed\n", __func__, __LINE__,
+                                  repo->bus_index, repo->dev_index);
+                        break;
+                }
+                pr_debug("%s:%d (%u:%u) region_id %u, start %lxh, size %lxh\n",
+                        __func__, __LINE__, repo->bus_index, repo->dev_index,
+                        region_id, region_start, region_size);
+        }
+out:
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return result;
+}
+static int dump_device_info(struct ps3_repository_device *repo,
+        unsigned int num_dev)
+{
+        int result = 0;
+        pr_debug(" -> %s:%d: bus_%u\n", __func__, __LINE__, repo->bus_index);
+        for (repo->dev_index = 0; repo->dev_index < num_dev;
+                repo->dev_index++) {
+                result = ps3_repository_read_dev_type(repo->bus_index,
+                        repo->dev_index, &repo->dev_type);
+                if (result) {
+                        pr_debug("%s:%d ps3_repository_read_dev_type"
+                                " (%u:%u) failed\n", __func__, __LINE__,
+                                repo->bus_index, repo->dev_index);
+                        break;
+                }
+                result = ps3_repository_read_dev_id(repo->bus_index,
+                        repo->dev_index, &repo->dev_id);
+                if (result) {
+                        pr_debug("%s:%d ps3_repository_read_dev_id"
+                                " (%u:%u) failed\n", __func__, __LINE__,
+                                repo->bus_index, repo->dev_index);
+                        continue;
+                }
+                pr_debug("%s:%d  (%u:%u): dev_type %u, dev_id %u\n", __func__,
+                        __LINE__, repo->bus_index, repo->dev_index,
+                        repo->dev_type, repo->dev_id);
+                ps3_repository_dump_resource_info(repo);
+                if (repo->bus_type == PS3_BUS_TYPE_STORAGE)
+                        dump_stor_dev_info(repo);
+        }
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return result;
+}
+int ps3_repository_dump_bus_info(void)
+{
+        int result = 0;
+        struct ps3_repository_device repo;
+        pr_debug(" -> %s:%d\n", __func__, __LINE__);
+        memset(&repo, 0, sizeof(repo));
+        for (repo.bus_index = 0; repo.bus_index < 10; repo.bus_index++) {
+                unsigned int num_dev;
+                result = ps3_repository_read_bus_type(repo.bus_index,
+                        &repo.bus_type);
+                if (result) {
+                        pr_debug("%s:%d read_bus_type(%u) failed\n",
+                                __func__, __LINE__, repo.bus_index);
+                        break;
+                }
+                result = ps3_repository_read_bus_id(repo.bus_index,
+                        &repo.bus_id);
+                if (result) {
+                        pr_debug("%s:%d read_bus_id(%u) failed\n",
+                                __func__, __LINE__, repo.bus_index);
+                        continue;
+                }
+                if (repo.bus_index != repo.bus_id)
+                        pr_debug("%s:%d bus_index != bus_id\n",
+                                __func__, __LINE__);
+                result = ps3_repository_read_bus_num_dev(repo.bus_index,
+                        &num_dev);
+                if (result) {
+                        pr_debug("%s:%d read_bus_num_dev(%u) failed\n",
+                                __func__, __LINE__, repo.bus_index);
+                        continue;
+                }
+                pr_debug("%s:%d bus_%u: bus_type %u, bus_id %u, num_dev %u\n",
+                        __func__, __LINE__, repo.bus_index, repo.bus_type,
+                        repo.bus_id, num_dev);
+                dump_device_info(&repo, num_dev);
+        }
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return result;
+}
+#endif /* defined(DEBUG) */
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index 9353967666..aa05288de6 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -37,27 +37,35 @@
 #include "platform.h"
 #if defined(DEBUG)
-#define DBG(fmt...) udbg_printf(fmt)
+#define DBG udbg_printf
 #else
-#define DBG(fmt...) do{if(0)printk(fmt);}while(0)
+#define DBG pr_debug
 #endif
 #if !defined(CONFIG_SMP)
 static void smp_send_stop(void) {}
 #endif
-int ps3_get_firmware_version(union ps3_firmware_version *v)
+static union ps3_firmware_version ps3_firmware_version;
+void ps3_get_firmware_version(union ps3_firmware_version *v)
 {
-        int result = lv1_get_version_info(&v->raw);
+        *v = ps3_firmware_version;
+}
+EXPORT_SYMBOL_GPL(ps3_get_firmware_version);
-        if (result) {
+int ps3_compare_firmware_version(u16 major, u16 minor, u16 rev)
-                v->raw = 0;
+{
-                return -1;
+        union ps3_firmware_version x;
-        }
+        x.pad = 0;
+        x.major = major;
+        x.minor = minor;
+        x.rev = rev;
-        return result;
+        return (ps3_firmware_version.raw - x.raw);
 }
-EXPORT_SYMBOL_GPL(ps3_get_firmware_version);
+EXPORT_SYMBOL_GPL(ps3_compare_firmware_version);
 static void ps3_power_save(void)
 {
@@ -99,7 +107,8 @@ static void ps3_panic(char *str)
        while(1);
 }
-#ifdef CONFIG_FB_PS3
+#if defined(CONFIG_FB_PS3) || defined(CONFIG_FB_PS3_MODULE) || \
+    defined(CONFIG_PS3_FLASH) || defined(CONFIG_PS3_FLASH_MODULE)
 static void prealloc(struct ps3_prealloc *p)
 {
        if (!p->size)
@@ -115,12 +124,15 @@ static void prealloc(struct ps3_prealloc *p)
        printk(KERN_INFO "%s: %lu bytes at %p\n", p->name, p->size,
               p->address);
 }
+#endif
+#if defined(CONFIG_FB_PS3) || defined(CONFIG_FB_PS3_MODULE)
 struct ps3_prealloc ps3fb_videomemory = {
-    .name = "ps3fb videomemory",
+        .name = "ps3fb videomemory",
-    .size = CONFIG_FB_PS3_DEFAULT_SIZE_M*1024*1024,
+        .size = CONFIG_FB_PS3_DEFAULT_SIZE_M*1024*1024,
-    .align = 1024*1024                  /* the GPU requires 1 MiB alignment */
+        .align = 1024*1024              /* the GPU requires 1 MiB alignment */
 };
+EXPORT_SYMBOL_GPL(ps3fb_videomemory);
 #define prealloc_ps3fb_videomemory()    prealloc(&ps3fb_videomemory)
 static int __init early_parse_ps3fb(char *p)
@@ -137,6 +149,30 @@ early_param("ps3fb", early_parse_ps3fb);
 #define prealloc_ps3fb_videomemory()    do { } while (0)
 #endif
+#if defined(CONFIG_PS3_FLASH) || defined(CONFIG_PS3_FLASH_MODULE)
+struct ps3_prealloc ps3flash_bounce_buffer = {
+        .name = "ps3flash bounce buffer",
+        .size = 256*1024,
+        .align = 256*1024
+};
+EXPORT_SYMBOL_GPL(ps3flash_bounce_buffer);
+#define prealloc_ps3flash_bounce_buffer()       prealloc(&ps3flash_bounce_buffer)
+static int __init early_parse_ps3flash(char *p)
+{
+        if (!p)
+                return 1;
+        if (!strcmp(p, "off"))
+                ps3flash_bounce_buffer.size = 0;
+        return 0;
+}
+early_param("ps3flash", early_parse_ps3flash);
+#else
+#define prealloc_ps3flash_bounce_buffer()       do { } while (0)
+#endif
 static int ps3_set_dabr(u64 dabr)
 {
        enum {DABR_USER = 1, DABR_KERNEL = 2,};
@@ -146,13 +182,13 @@ static int ps3_set_dabr(u64 dabr)
 static void __init ps3_setup_arch(void)
 {
-        union ps3_firmware_version v;
        DBG(" -> %s:%d\n", __func__, __LINE__);
-        ps3_get_firmware_version(&v);
+        lv1_get_version_info(&ps3_firmware_version.raw);
-        printk(KERN_INFO "PS3 firmware version %u.%u.%u\n", v.major, v.minor,
+        printk(KERN_INFO "PS3 firmware version %u.%u.%u\n",
-                v.rev);
+               ps3_firmware_version.major, ps3_firmware_version.minor,
+               ps3_firmware_version.rev);
        ps3_spu_set_platform();
        ps3_map_htab();
@@ -166,6 +202,8 @@ static void __init ps3_setup_arch(void)
 #endif
        prealloc_ps3fb_videomemory();
+        prealloc_ps3flash_bounce_buffer();
        ppc_md.power_save = ps3_power_save;
        DBG(" <- %s:%d\n", __func__, __LINE__);
@@ -184,7 +222,7 @@ static int __init ps3_probe(void)
        DBG(" -> %s:%d\n", __func__, __LINE__);
        dt_root = of_get_flat_dt_root();
-        if (!of_flat_dt_is_compatible(dt_root, "PS3"))
+        if (!of_flat_dt_is_compatible(dt_root, "sony,ps3"))
                return 0;
        powerpc_firmware_features |= FW_FEATURE_PS3_POSSIBLE;
@@ -201,31 +239,12 @@ static int __init ps3_probe(void)
 #if defined(CONFIG_KEXEC)
 static void ps3_kexec_cpu_down(int crash_shutdown, int secondary)
 {
-        DBG(" -> %s:%d\n", __func__, __LINE__);
+        int cpu = smp_processor_id();
-        if (secondary) {
-                int cpu;
-                for_each_online_cpu(cpu)
-                        if (cpu)
-                                ps3_smp_cleanup_cpu(cpu);
-        } else
-                ps3_smp_cleanup_cpu(0);
-        DBG(" <- %s:%d\n", __func__, __LINE__);
-}
-static void ps3_machine_kexec(struct kimage *image)
-{
-        unsigned long ppe_id;
-        DBG(" -> %s:%d\n", __func__, __LINE__);
-        lv1_get_logical_ppe_id(&ppe_id);
+        DBG(" -> %s:%d: (%d)\n", __func__, __LINE__, cpu);
-        lv1_configure_irq_state_bitmap(ppe_id, 0, 0);
-        ps3_mm_shutdown();
-        ps3_mm_vas_destroy();
-        default_machine_kexec(image);
+        ps3_smp_cleanup_cpu(cpu);
+        ps3_shutdown_IRQ(cpu);
        DBG(" <- %s:%d\n", __func__, __LINE__);
 }
@@ -247,7 +266,7 @@ define_machine(ps3) {
        .power_off                      = ps3_power_off,
 #if defined(CONFIG_KEXEC)
        .kexec_cpu_down                 = ps3_kexec_cpu_down,
-        .machine_kexec                  = ps3_machine_kexec,
+        .machine_kexec                  = default_machine_kexec,
        .machine_kexec_prepare          = default_machine_kexec_prepare,
        .machine_crash_shutdown         = default_machine_crash_shutdown,
 #endif
diff --git a/arch/powerpc/platforms/ps3/smp.c b/arch/powerpc/platforms/ps3/smp.c
index 53416ec519..f0b12f2123 100644
--- a/arch/powerpc/platforms/ps3/smp.c
+++ b/arch/powerpc/platforms/ps3/smp.c
@@ -27,9 +27,9 @@
 #include "platform.h"
 #if defined(DEBUG)
-#define DBG(fmt...) udbg_printf(fmt)
+#define DBG udbg_printf
 #else
-#define DBG(fmt...) do{if(0)printk(fmt);}while(0)
+#define DBG pr_debug
 #endif
 static irqreturn_t ipi_function_handler(int irq, void *msg)
@@ -39,11 +39,11 @@ static irqreturn_t ipi_function_handler(int irq, void *msg)
 }
 /**
-  * virqs - a per cpu array of virqs for ipi use
+  * ps3_ipi_virqs - a per cpu array of virqs for ipi use
  */
 #define MSG_COUNT 4
-static DEFINE_PER_CPU(unsigned int, virqs[MSG_COUNT]);
+static DEFINE_PER_CPU(unsigned int, ps3_ipi_virqs[MSG_COUNT]);
 static const char *names[MSG_COUNT] = {
        "ipi call",
@@ -62,7 +62,7 @@ static void do_message_pass(int target, int msg)
                return;
        }
-        virq = per_cpu(virqs, target)[msg];
+        virq = per_cpu(ps3_ipi_virqs, target)[msg];
        result = ps3_send_event_locally(virq);
        if (result)
@@ -94,13 +94,13 @@ static int ps3_smp_probe(void)
 static void __init ps3_smp_setup_cpu(int cpu)
 {
        int result;
-        unsigned int *virqs = per_cpu(virqs, cpu);
+        unsigned int *virqs = per_cpu(ps3_ipi_virqs, cpu);
        int i;
        DBG(" -> %s:%d: (%d)\n", __func__, __LINE__, cpu);
        /*
-         * Check assumptions on virqs[] indexing. If this
+         * Check assumptions on ps3_ipi_virqs[] indexing. If this
         * check fails, then a different mapping of PPC_MSG_
         * to index needs to be setup.
         */
@@ -132,13 +132,13 @@ static void __init ps3_smp_setup_cpu(int cpu)
 void ps3_smp_cleanup_cpu(int cpu)
 {
-        unsigned int *virqs = per_cpu(virqs, cpu);
+        unsigned int *virqs = per_cpu(ps3_ipi_virqs, cpu);
        int i;
        DBG(" -> %s:%d: (%d)\n", __func__, __LINE__, cpu);
        for (i = 0; i < MSG_COUNT; i++) {
-                free_irq(virqs[i], (void*)(long)i);
+                /* Can't call free_irq from interrupt context. */
                ps3_event_receive_port_destroy(virqs[i]);
                virqs[i] = NO_IRQ;
        }
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c
index 651437cb2c..502d80ed98 100644
--- a/arch/powerpc/platforms/ps3/spu.c
+++ b/arch/powerpc/platforms/ps3/spu.c
@@ -182,15 +182,18 @@ static int __init setup_areas(struct spu *spu)
 {
        struct table {char* name; unsigned long addr; unsigned long size;};
-        spu_pdata(spu)->shadow = __ioremap(
+        spu_pdata(spu)->shadow = ioremap_flags(spu_pdata(spu)->shadow_addr,
-                spu_pdata(spu)->shadow_addr, sizeof(struct spe_shadow),
+                                               sizeof(struct spe_shadow),
-                pgprot_val(PAGE_READONLY) | _PAGE_NO_CACHE | _PAGE_GUARDED);
+                                               pgprot_val(PAGE_READONLY) |
+                                               _PAGE_NO_CACHE);
        if (!spu_pdata(spu)->shadow) {
                pr_debug("%s:%d: ioremap shadow failed\n", __func__, __LINE__);
                goto fail_ioremap;
        }
-        spu->local_store = ioremap(spu->local_store_phys, LS_SIZE);
+        spu->local_store = (__force void *)ioremap_flags(spu->local_store_phys,
+                LS_SIZE, _PAGE_NO_CACHE);
        if (!spu->local_store) {
                pr_debug("%s:%d: ioremap local_store failed\n",
                        __func__, __LINE__);
@@ -199,6 +202,7 @@ static int __init setup_areas(struct spu *spu)
        spu->problem = ioremap(spu->problem_phys,
                sizeof(struct spu_problem));
        if (!spu->problem) {
                pr_debug("%s:%d: ioremap problem failed\n", __func__, __LINE__);
                goto fail_ioremap;
@@ -206,6 +210,7 @@ static int __init setup_areas(struct spu *spu)
        spu->priv2 = ioremap(spu_pdata(spu)->priv2_addr,
                sizeof(struct spu_priv2));
        if (!spu->priv2) {
                pr_debug("%s:%d: ioremap priv2 failed\n", __func__, __LINE__);
                goto fail_ioremap;
@@ -400,11 +405,13 @@ static int __init ps3_enumerate_spus(int (*fn)(void *data))
                }
        }
-        if (result)
+        if (result) {
                printk(KERN_WARNING "%s:%d: Error initializing spus\n",
                        __func__, __LINE__);
+                return result;
+        }
-        return result;
+        return num_resource_id;
 }
 const struct spu_management_ops spu_management_ps3_ops = {
diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c
index 6bda51027c..4bb634a17e 100644
--- a/arch/powerpc/platforms/ps3/system-bus.c
+++ b/arch/powerpc/platforms/ps3/system-bus.c
@@ -30,22 +30,228 @@
 #include "platform.h"
+static struct device ps3_system_bus = {
+        .bus_id = "ps3_system",
+};
+/* FIXME: need device usage counters! */
+struct {
+        struct mutex mutex;
+        int sb_11; /* usb 0 */
+        int sb_12; /* usb 0 */
+        int gpu;
+} static usage_hack;
+static int ps3_is_device(struct ps3_system_bus_device *dev,
+                         unsigned int bus_id, unsigned int dev_id)
+{
+        return dev->bus_id == bus_id && dev->dev_id == dev_id;
+}
+static int ps3_open_hv_device_sb(struct ps3_system_bus_device *dev)
+{
+        int result;
+        BUG_ON(!dev->bus_id);
+        mutex_lock(&usage_hack.mutex);
+        if (ps3_is_device(dev, 1, 1)) {
+                usage_hack.sb_11++;
+                if (usage_hack.sb_11 > 1) {
+                        result = 0;
+                        goto done;
+                }
+        }
+        if (ps3_is_device(dev, 1, 2)) {
+                usage_hack.sb_12++;
+                if (usage_hack.sb_12 > 1) {
+                        result = 0;
+                        goto done;
+                }
+        }
+        result = lv1_open_device(dev->bus_id, dev->dev_id, 0);
+        if (result) {
+                pr_debug("%s:%d: lv1_open_device failed: %s\n", __func__,
+                        __LINE__, ps3_result(result));
+                        result = -EPERM;
+        }
+done:
+        mutex_unlock(&usage_hack.mutex);
+        return result;
+}
+static int ps3_close_hv_device_sb(struct ps3_system_bus_device *dev)
+{
+        int result;
+        BUG_ON(!dev->bus_id);
+        mutex_lock(&usage_hack.mutex);
+        if (ps3_is_device(dev, 1, 1)) {
+                usage_hack.sb_11--;
+                if (usage_hack.sb_11) {
+                        result = 0;
+                        goto done;
+                }
+        }
+        if (ps3_is_device(dev, 1, 2)) {
+                usage_hack.sb_12--;
+                if (usage_hack.sb_12) {
+                        result = 0;
+                        goto done;
+                }
+        }
+        result = lv1_close_device(dev->bus_id, dev->dev_id);
+        BUG_ON(result);
+done:
+        mutex_unlock(&usage_hack.mutex);
+        return result;
+}
+static int ps3_open_hv_device_gpu(struct ps3_system_bus_device *dev)
+{
+        int result;
+        mutex_lock(&usage_hack.mutex);
+        usage_hack.gpu++;
+        if (usage_hack.gpu > 1) {
+                result = 0;
+                goto done;
+        }
+        result = lv1_gpu_open(0);
+        if (result) {
+                pr_debug("%s:%d: lv1_gpu_open failed: %s\n", __func__,
+                        __LINE__, ps3_result(result));
+                        result = -EPERM;
+        }
+done:
+        mutex_unlock(&usage_hack.mutex);
+        return result;
+}
+static int ps3_close_hv_device_gpu(struct ps3_system_bus_device *dev)
+{
+        int result;
+        mutex_lock(&usage_hack.mutex);
+        usage_hack.gpu--;
+        if (usage_hack.gpu) {
+                result = 0;
+                goto done;
+        }
+        result = lv1_gpu_close();
+        BUG_ON(result);
+done:
+        mutex_unlock(&usage_hack.mutex);
+        return result;
+}
+int ps3_open_hv_device(struct ps3_system_bus_device *dev)
+{
+        BUG_ON(!dev);
+        pr_debug("%s:%d: match_id: %u\n", __func__, __LINE__, dev->match_id);
+        switch (dev->match_id) {
+        case PS3_MATCH_ID_EHCI:
+        case PS3_MATCH_ID_OHCI:
+        case PS3_MATCH_ID_GELIC:
+        case PS3_MATCH_ID_STOR_DISK:
+        case PS3_MATCH_ID_STOR_ROM:
+        case PS3_MATCH_ID_STOR_FLASH:
+                return ps3_open_hv_device_sb(dev);
+        case PS3_MATCH_ID_SOUND:
+        case PS3_MATCH_ID_GRAPHICS:
+                return ps3_open_hv_device_gpu(dev);
+        case PS3_MATCH_ID_AV_SETTINGS:
+        case PS3_MATCH_ID_SYSTEM_MANAGER:
+                pr_debug("%s:%d: unsupported match_id: %u\n", __func__,
+                        __LINE__, dev->match_id);
+                pr_debug("%s:%d: bus_id: %u\n", __func__,
+                        __LINE__, dev->bus_id);
+                BUG();
+                return -EINVAL;
+        default:
+                break;
+        }
+        pr_debug("%s:%d: unknown match_id: %u\n", __func__, __LINE__,
+                dev->match_id);
+        BUG();
+        return -ENODEV;
+}
+EXPORT_SYMBOL_GPL(ps3_open_hv_device);
+int ps3_close_hv_device(struct ps3_system_bus_device *dev)
+{
+        BUG_ON(!dev);
+        pr_debug("%s:%d: match_id: %u\n", __func__, __LINE__, dev->match_id);
+        switch (dev->match_id) {
+        case PS3_MATCH_ID_EHCI:
+        case PS3_MATCH_ID_OHCI:
+        case PS3_MATCH_ID_GELIC:
+        case PS3_MATCH_ID_STOR_DISK:
+        case PS3_MATCH_ID_STOR_ROM:
+        case PS3_MATCH_ID_STOR_FLASH:
+                return ps3_close_hv_device_sb(dev);
+        case PS3_MATCH_ID_SOUND:
+        case PS3_MATCH_ID_GRAPHICS:
+                return ps3_close_hv_device_gpu(dev);
+        case PS3_MATCH_ID_AV_SETTINGS:
+        case PS3_MATCH_ID_SYSTEM_MANAGER:
+                pr_debug("%s:%d: unsupported match_id: %u\n", __func__,
+                        __LINE__, dev->match_id);
+                pr_debug("%s:%d: bus_id: %u\n", __func__,
+                        __LINE__, dev->bus_id);
+                BUG();
+                return -EINVAL;
+        default:
+                break;
+        }
+        pr_debug("%s:%d: unknown match_id: %u\n", __func__, __LINE__,
+                dev->match_id);
+        BUG();
+        return -ENODEV;
+}
+EXPORT_SYMBOL_GPL(ps3_close_hv_device);
 #define dump_mmio_region(_a) _dump_mmio_region(_a, __func__, __LINE__)
 static void _dump_mmio_region(const struct ps3_mmio_region* r,
        const char* func, int line)
 {
-        pr_debug("%s:%d: dev       %u:%u\n", func, line, r->did.bus_id,
+        pr_debug("%s:%d: dev       %u:%u\n", func, line, r->dev->bus_id,
-                r->did.dev_id);
+                r->dev->dev_id);
        pr_debug("%s:%d: bus_addr  %lxh\n", func, line, r->bus_addr);
        pr_debug("%s:%d: len       %lxh\n", func, line, r->len);
        pr_debug("%s:%d: lpar_addr %lxh\n", func, line, r->lpar_addr);
 }
-int ps3_mmio_region_create(struct ps3_mmio_region *r)
+static int ps3_sb_mmio_region_create(struct ps3_mmio_region *r)
 {
        int result;
-        result = lv1_map_device_mmio_region(r->did.bus_id, r->did.dev_id,
+        result = lv1_map_device_mmio_region(r->dev->bus_id, r->dev->dev_id,
                r->bus_addr, r->len, r->page_size, &r->lpar_addr);
        if (result) {
@@ -57,13 +263,26 @@ int ps3_mmio_region_create(struct ps3_mmio_region *r)
        dump_mmio_region(r);
        return result;
 }
+static int ps3_ioc0_mmio_region_create(struct ps3_mmio_region *r)
+{
+        /* device specific; do nothing currently */
+        return 0;
+}
+int ps3_mmio_region_create(struct ps3_mmio_region *r)
+{
+        return r->mmio_ops->create(r);
+}
 EXPORT_SYMBOL_GPL(ps3_mmio_region_create);
-int ps3_free_mmio_region(struct ps3_mmio_region *r)
+static int ps3_sb_free_mmio_region(struct ps3_mmio_region *r)
 {
        int result;
-        result = lv1_unmap_device_mmio_region(r->did.bus_id, r->did.dev_id,
+        dump_mmio_region(r);
+;
+        result = lv1_unmap_device_mmio_region(r->dev->bus_id, r->dev->dev_id,
                r->lpar_addr);
        if (result)
@@ -73,14 +292,60 @@ int ps3_free_mmio_region(struct ps3_mmio_region *r)
        r->lpar_addr = 0;
        return result;
 }
+static int ps3_ioc0_free_mmio_region(struct ps3_mmio_region *r)
+{
+        /* device specific; do nothing currently */
+        return 0;
+}
+int ps3_free_mmio_region(struct ps3_mmio_region *r)
+{
+        return r->mmio_ops->free(r);
+}
 EXPORT_SYMBOL_GPL(ps3_free_mmio_region);
+static const struct ps3_mmio_region_ops ps3_mmio_sb_region_ops = {
+        .create = ps3_sb_mmio_region_create,
+        .free = ps3_sb_free_mmio_region
+};
+static const struct ps3_mmio_region_ops ps3_mmio_ioc0_region_ops = {
+        .create = ps3_ioc0_mmio_region_create,
+        .free = ps3_ioc0_free_mmio_region
+};
+int ps3_mmio_region_init(struct ps3_system_bus_device *dev,
+        struct ps3_mmio_region *r, unsigned long bus_addr, unsigned long len,
+        enum ps3_mmio_page_size page_size)
+{
+        r->dev = dev;
+        r->bus_addr = bus_addr;
+        r->len = len;
+        r->page_size = page_size;
+        switch (dev->dev_type) {
+        case PS3_DEVICE_TYPE_SB:
+                r->mmio_ops = &ps3_mmio_sb_region_ops;
+                break;
+        case PS3_DEVICE_TYPE_IOC0:
+                r->mmio_ops = &ps3_mmio_ioc0_region_ops;
+                break;
+        default:
+                BUG();
+                return -EINVAL;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(ps3_mmio_region_init);
 static int ps3_system_bus_match(struct device *_dev,
        struct device_driver *_drv)
 {
        int result;
-        struct ps3_system_bus_driver *drv = to_ps3_system_bus_driver(_drv);
+        struct ps3_system_bus_driver *drv = ps3_drv_to_system_bus_drv(_drv);
-        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+        struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
        result = dev->match_id == drv->match_id;
@@ -92,32 +357,14 @@ static int ps3_system_bus_match(struct device *_dev,
 static int ps3_system_bus_probe(struct device *_dev)
 {
-        int result;
+        int result = 0;
-        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+        struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
-        struct ps3_system_bus_driver *drv =
+        struct ps3_system_bus_driver *drv;
-                to_ps3_system_bus_driver(_dev->driver);
-        result = lv1_open_device(dev->did.bus_id, dev->did.dev_id, 0);
-        if (result) {
-                pr_debug("%s:%d: lv1_open_device failed (%d)\n",
-                        __func__, __LINE__, result);
-                result = -EACCES;
-                goto clean_none;
-        }
-        if (dev->d_region->did.bus_id) {
-                result = ps3_dma_region_create(dev->d_region);
-                if (result) {
+        BUG_ON(!dev);
-                        pr_debug("%s:%d: ps3_dma_region_create failed (%d)\n",
+        pr_info(" -> %s:%d: %s\n", __func__, __LINE__, _dev->bus_id);
-                                __func__, __LINE__, result);
-                        BUG_ON("check region type");
-                        result = -EINVAL;
-                        goto clean_device;
-                }
-        }
+        drv = ps3_system_bus_dev_to_system_bus_drv(dev);
        BUG_ON(!drv);
        if (drv->probe)
@@ -126,56 +373,127 @@ static int ps3_system_bus_probe(struct device *_dev)
                pr_info("%s:%d: %s no probe method\n", __func__, __LINE__,
                        dev->core.bus_id);
-        if (result) {
+        pr_info(" <- %s:%d: %s\n", __func__, __LINE__, dev->core.bus_id);
-                pr_debug("%s:%d: drv->probe failed\n", __func__, __LINE__);
-                goto clean_dma;
-        }
-        return result;
-clean_dma:
-        ps3_dma_region_free(dev->d_region);
-clean_device:
-        lv1_close_device(dev->did.bus_id, dev->did.dev_id);
-clean_none:
        return result;
 }
 static int ps3_system_bus_remove(struct device *_dev)
 {
-        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+        int result = 0;
-        struct ps3_system_bus_driver *drv =
+        struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
-                to_ps3_system_bus_driver(_dev->driver);
+        struct ps3_system_bus_driver *drv;
+        BUG_ON(!dev);
+        pr_info(" -> %s:%d: %s\n", __func__, __LINE__, _dev->bus_id);
+        drv = ps3_system_bus_dev_to_system_bus_drv(dev);
+        BUG_ON(!drv);
        if (drv->remove)
-                drv->remove(dev);
+                result = drv->remove(dev);
        else
-                pr_info("%s:%d: %s no remove method\n", __func__, __LINE__,
+                dev_dbg(&dev->core, "%s:%d %s: no remove method\n",
-                        dev->core.bus_id);
+                        __func__, __LINE__, drv->core.name);
+        pr_info(" <- %s:%d: %s\n", __func__, __LINE__, dev->core.bus_id);
+        return result;
+}
+static void ps3_system_bus_shutdown(struct device *_dev)
+{
+        struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
+        struct ps3_system_bus_driver *drv;
+        BUG_ON(!dev);
+        dev_dbg(&dev->core, " -> %s:%d: match_id %d\n", __func__, __LINE__,
+                dev->match_id);
+        if (!dev->core.driver) {
+                dev_dbg(&dev->core, "%s:%d: no driver bound\n", __func__,
+                        __LINE__);
+                return;
+        }
+        drv = ps3_system_bus_dev_to_system_bus_drv(dev);
+        BUG_ON(!drv);
+        dev_dbg(&dev->core, "%s:%d: %s -> %s\n", __func__, __LINE__,
+                dev->core.bus_id, drv->core.name);
+        if (drv->shutdown)
+                drv->shutdown(dev);
+        else if (drv->remove) {
+                dev_dbg(&dev->core, "%s:%d %s: no shutdown, calling remove\n",
+                        __func__, __LINE__, drv->core.name);
+                drv->remove(dev);
+        } else {
+                dev_dbg(&dev->core, "%s:%d %s: no shutdown method\n",
+                        __func__, __LINE__, drv->core.name);
+                BUG();
+        }
+        dev_dbg(&dev->core, " <- %s:%d\n", __func__, __LINE__);
+}
+static int ps3_system_bus_uevent(struct device *_dev, char **envp,
+                                 int num_envp, char *buffer, int buffer_size)
+{
+        struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
+        int i = 0, length = 0;
-        ps3_dma_region_free(dev->d_region);
+        if (add_uevent_var(envp, num_envp, &i, buffer, buffer_size,
-        ps3_free_mmio_region(dev->m_region);
+                           &length, "MODALIAS=ps3:%d",
-        lv1_close_device(dev->did.bus_id, dev->did.dev_id);
+                           dev->match_id))
+                return -ENOMEM;
+        envp[i] = NULL;
        return 0;
 }
+static ssize_t modalias_show(struct device *_dev, struct device_attribute *a,
+        char *buf)
+{
+        struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
+        int len = snprintf(buf, PAGE_SIZE, "ps3:%d\n", dev->match_id);
+        return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
+}
+static struct device_attribute ps3_system_bus_dev_attrs[] = {
+        __ATTR_RO(modalias),
+        __ATTR_NULL,
+};
 struct bus_type ps3_system_bus_type = {
        .name = "ps3_system_bus",
        .match = ps3_system_bus_match,
+        .uevent = ps3_system_bus_uevent,
        .probe = ps3_system_bus_probe,
        .remove = ps3_system_bus_remove,
+        .shutdown = ps3_system_bus_shutdown,
+        .dev_attrs = ps3_system_bus_dev_attrs,
 };
-int __init ps3_system_bus_init(void)
+static int __init ps3_system_bus_init(void)
 {
        int result;
        if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
                return -ENODEV;
+        pr_debug(" -> %s:%d\n", __func__, __LINE__);
+        mutex_init(&usage_hack.mutex);
+        result = device_register(&ps3_system_bus);
+        BUG_ON(result);
        result = bus_register(&ps3_system_bus_type);
        BUG_ON(result);
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
        return result;
 }
@@ -185,16 +503,13 @@ core_initcall(ps3_system_bus_init);
 * Returns the virtual address of the buffer and sets dma_handle
 * to the dma address (mapping) of the first page.
 */
 static void * ps3_alloc_coherent(struct device *_dev, size_t size,
-        dma_addr_t *dma_handle, gfp_t flag)
+                                      dma_addr_t *dma_handle, gfp_t flag)
 {
        int result;
-        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+        struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
        unsigned long virt_addr;
-        BUG_ON(!dev->d_region->bus_addr);
        flag &= ~(__GFP_DMA | __GFP_HIGHMEM);
        flag |= __GFP_ZERO;
@@ -205,7 +520,8 @@ static void * ps3_alloc_coherent(struct device *_dev, size_t size,
                goto clean_none;
        }
-        result = ps3_dma_map(dev->d_region, virt_addr, size, dma_handle);
+        result = ps3_dma_map(dev->d_region, virt_addr, size, dma_handle,
+                             IOPTE_PP_W | IOPTE_PP_R | IOPTE_SO_RW | IOPTE_M);
        if (result) {
                pr_debug("%s:%d: ps3_dma_map failed (%d)\n",
@@ -226,7 +542,7 @@ clean_none:
 static void ps3_free_coherent(struct device *_dev, size_t size, void *vaddr,
        dma_addr_t dma_handle)
 {
-        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+        struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
        ps3_dma_unmap(dev->d_region, dma_handle, size);
        free_pages((unsigned long)vaddr, get_order(size));
@@ -239,15 +555,16 @@ static void ps3_free_coherent(struct device *_dev, size_t size, void *vaddr,
 * byte within the page as vaddr.
 */
-static dma_addr_t ps3_map_single(struct device *_dev, void *ptr, size_t size,
+static dma_addr_t ps3_sb_map_single(struct device *_dev, void *ptr, size_t size,
        enum dma_data_direction direction)
 {
-        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+        struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
        int result;
        unsigned long bus_addr;
        result = ps3_dma_map(dev->d_region, (unsigned long)ptr, size,
-                &bus_addr);
+                             &bus_addr,
+                             IOPTE_PP_R | IOPTE_PP_W | IOPTE_SO_RW | IOPTE_M);
        if (result) {
                pr_debug("%s:%d: ps3_dma_map failed (%d)\n",
@@ -257,10 +574,44 @@ static dma_addr_t ps3_map_single(struct device *_dev, void *ptr, size_t size,
        return bus_addr;
 }
+static dma_addr_t ps3_ioc0_map_single(struct device *_dev, void *ptr,
+                                      size_t size,
+                                      enum dma_data_direction direction)
+{
+        struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
+        int result;
+        unsigned long bus_addr;
+        u64 iopte_flag;
+        iopte_flag = IOPTE_M;
+        switch (direction) {
+        case DMA_BIDIRECTIONAL:
+                iopte_flag |= IOPTE_PP_R | IOPTE_PP_W | IOPTE_SO_RW;
+                break;
+        case DMA_TO_DEVICE:
+                iopte_flag |= IOPTE_PP_R | IOPTE_SO_R;
+                break;
+        case DMA_FROM_DEVICE:
+                iopte_flag |= IOPTE_PP_W | IOPTE_SO_RW;
+                break;
+        default:
+                /* not happned */
+                BUG();
+        };
+        result = ps3_dma_map(dev->d_region, (unsigned long)ptr, size,
+                             &bus_addr, iopte_flag);
+        if (result) {
+                pr_debug("%s:%d: ps3_dma_map failed (%d)\n",
+                        __func__, __LINE__, result);
+        }
+        return bus_addr;
+}
 static void ps3_unmap_single(struct device *_dev, dma_addr_t dma_addr,
        size_t size, enum dma_data_direction direction)
 {
-        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+        struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
        int result;
        result = ps3_dma_unmap(dev->d_region, dma_addr, size);
@@ -271,20 +622,20 @@ static void ps3_unmap_single(struct device *_dev, dma_addr_t dma_addr,
        }
 }
-static int ps3_map_sg(struct device *_dev, struct scatterlist *sg, int nents,
+static int ps3_sb_map_sg(struct device *_dev, struct scatterlist *sg, int nents,
        enum dma_data_direction direction)
 {
 #if defined(CONFIG_PS3_DYNAMIC_DMA)
        BUG_ON("do");
        return -EPERM;
 #else
-        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+        struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
        int i;
        for (i = 0; i < nents; i++, sg++) {
                int result = ps3_dma_map(dev->d_region,
                        page_to_phys(sg->page) + sg->offset, sg->length,
-                        &sg->dma_address);
+                                         &sg->dma_address, 0);
                if (result) {
                        pr_debug("%s:%d: ps3_dma_map failed (%d)\n",
@@ -299,7 +650,15 @@ static int ps3_map_sg(struct device *_dev, struct scatterlist *sg, int nents,
 #endif
 }
-static void ps3_unmap_sg(struct device *_dev, struct scatterlist *sg,
+static int ps3_ioc0_map_sg(struct device *_dev, struct scatterlist *sg,
+                           int nents,
+                           enum dma_data_direction direction)
+{
+        BUG();
+        return 0;
+}
+static void ps3_sb_unmap_sg(struct device *_dev, struct scatterlist *sg,
        int nents, enum dma_data_direction direction)
 {
 #if defined(CONFIG_PS3_DYNAMIC_DMA)
@@ -307,18 +666,34 @@ static void ps3_unmap_sg(struct device *_dev, struct scatterlist *sg,
 #endif
 }
+static void ps3_ioc0_unmap_sg(struct device *_dev, struct scatterlist *sg,
+                            int nents, enum dma_data_direction direction)
+{
+        BUG();
+}
 static int ps3_dma_supported(struct device *_dev, u64 mask)
 {
        return mask >= DMA_32BIT_MASK;
 }
-static struct dma_mapping_ops ps3_dma_ops = {
+static struct dma_mapping_ops ps3_sb_dma_ops = {
        .alloc_coherent = ps3_alloc_coherent,
        .free_coherent = ps3_free_coherent,
-        .map_single = ps3_map_single,
+        .map_single = ps3_sb_map_single,
        .unmap_single = ps3_unmap_single,
-        .map_sg = ps3_map_sg,
+        .map_sg = ps3_sb_map_sg,
-        .unmap_sg = ps3_unmap_sg,
+        .unmap_sg = ps3_sb_unmap_sg,
+        .dma_supported = ps3_dma_supported
+};
+static struct dma_mapping_ops ps3_ioc0_dma_ops = {
+        .alloc_coherent = ps3_alloc_coherent,
+        .free_coherent = ps3_free_coherent,
+        .map_single = ps3_ioc0_map_single,
+        .unmap_single = ps3_unmap_single,
+        .map_sg = ps3_ioc0_map_sg,
+        .unmap_sg = ps3_ioc0_unmap_sg,
        .dma_supported = ps3_dma_supported
 };
@@ -328,7 +703,7 @@ static struct dma_mapping_ops ps3_dma_ops = {
 static void ps3_system_bus_release_device(struct device *_dev)
 {
-        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+        struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
        kfree(dev);
 }
@@ -343,19 +718,38 @@ static void ps3_system_bus_release_device(struct device *_dev)
 int ps3_system_bus_device_register(struct ps3_system_bus_device *dev)
 {
        int result;
-        static unsigned int dev_count = 1;
+        static unsigned int dev_ioc0_count;
+        static unsigned int dev_sb_count;
+        static unsigned int dev_vuart_count;
-        dev->core.parent = NULL;
+        if (!dev->core.parent)
+                dev->core.parent = &ps3_system_bus;
        dev->core.bus = &ps3_system_bus_type;
        dev->core.release = ps3_system_bus_release_device;
+        switch (dev->dev_type) {
+        case PS3_DEVICE_TYPE_IOC0:
+                dev->core.archdata.dma_ops = &ps3_ioc0_dma_ops;
+                snprintf(dev->core.bus_id, sizeof(dev->core.bus_id),
+                        "ioc0_%02x", ++dev_ioc0_count);
+                break;
+        case PS3_DEVICE_TYPE_SB:
+                dev->core.archdata.dma_ops = &ps3_sb_dma_ops;
+                snprintf(dev->core.bus_id, sizeof(dev->core.bus_id),
+                        "sb_%02x", ++dev_sb_count);
+                break;
+        case PS3_DEVICE_TYPE_VUART:
+                snprintf(dev->core.bus_id, sizeof(dev->core.bus_id),
+                        "vuart_%02x", ++dev_vuart_count);
+                break;
+        default:
+                BUG();
+        };
        dev->core.archdata.of_node = NULL;
-        dev->core.archdata.dma_ops = &ps3_dma_ops;
        dev->core.archdata.numa_node = 0;
-        snprintf(dev->core.bus_id, sizeof(dev->core.bus_id), "sb_%02x",
-                dev_count++);
        pr_debug("%s:%d add %s\n", __func__, __LINE__, dev->core.bus_id);
        result = device_register(&dev->core);
@@ -368,9 +762,15 @@ int ps3_system_bus_driver_register(struct ps3_system_bus_driver *drv)
 {
        int result;
+        pr_debug(" -> %s:%d: %s\n", __func__, __LINE__, drv->core.name);
+        if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
+                return -ENODEV;
        drv->core.bus = &ps3_system_bus_type;
        result = driver_register(&drv->core);
+        pr_debug(" <- %s:%d: %s\n", __func__, __LINE__, drv->core.name);
        return result;
 }
@@ -378,7 +778,9 @@ EXPORT_SYMBOL_GPL(ps3_system_bus_driver_register);
 void ps3_system_bus_driver_unregister(struct ps3_system_bus_driver *drv)
 {
+        pr_debug(" -> %s:%d: %s\n", __func__, __LINE__, drv->core.name);
        driver_unregister(&drv->core);
+        pr_debug(" <- %s:%d: %s\n", __func__, __LINE__, drv->core.name);
 }
 EXPORT_SYMBOL_GPL(ps3_system_bus_driver_unregister);
diff --git a/arch/powerpc/platforms/ps3/time.c b/arch/powerpc/platforms/ps3/time.c
index 1bae8b19b3..802a9ccacb 100644
--- a/arch/powerpc/platforms/ps3/time.c
+++ b/arch/powerpc/platforms/ps3/time.c
@@ -39,7 +39,7 @@ static void _dump_tm(const struct rtc_time *tm, const char* func, int line)
 }
 #define dump_time(_a) _dump_time(_a, __func__, __LINE__)
-static void __attribute__ ((unused)) _dump_time(int time, const char* func,
+static void __maybe_unused _dump_time(int time, const char *func,
        int line)
 {
        struct rtc_time tm;
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index ae1fc92dc1..992ba6753c 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -8,7 +8,7 @@ obj-y			:= lpar.o hvCall.o nvram.o reconfig.o \
 obj-$(CONFIG_SMP)       += smp.o
 obj-$(CONFIG_XICS)      += xics.o
 obj-$(CONFIG_SCANLOG)   += scanlog.o
-obj-$(CONFIG_EEH)       += eeh.o eeh_cache.o eeh_driver.o eeh_event.o
+obj-$(CONFIG_EEH)       += eeh.o eeh_cache.o eeh_driver.o eeh_event.o eeh_sysfs.o
 obj-$(CONFIG_KEXEC)     += kexec.o
 obj-$(CONFIG_PCI)       += pci.o pci_dlpar.o
 obj-$(CONFIG_PCI_MSI)   += msi.o
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 5f3e6d8659..b877039501 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -1,6 +1,8 @@
 /*
 * eeh.c
- * Copyright (C) 2001 Dave Engebretsen & Todd Inglett IBM Corporation
+ * Copyright IBM Corporation 2001, 2005, 2006
+ * Copyright Dave Engebretsen & Todd Inglett 2001
+ * Copyright Linas Vepstas 2005, 2006
 *
 * 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
@@ -15,6 +17,8 @@
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ * Please address comments and feedback to Linas Vepstas <linas@austin.ibm.com>
 */
 #include <linux/delay.h>
@@ -117,7 +121,6 @@ static unsigned long no_cfg_addr;
 static unsigned long ignored_check;
 static unsigned long total_mmio_ffs;
 static unsigned long false_positives;
-static unsigned long ignored_failures;
 static unsigned long slot_resets;
 #define IS_BRIDGE(class_code) (((class_code)<<16) == PCI_BASE_CLASS_BRIDGE)
@@ -505,6 +508,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
                printk(KERN_WARNING "EEH: read_slot_reset_state() failed; rc=%d dn=%s\n",
                       ret, dn->full_name);
                false_positives++;
+                pdn->eeh_false_positives ++;
                rc = 0;
                goto dn_unlock;
        }
@@ -513,6 +517,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
         * they are empty when they don't have children. */
        if ((rets[0] == 5) && (dn->child == NULL)) {
                false_positives++;
+                pdn->eeh_false_positives ++;
                rc = 0;
                goto dn_unlock;
        }
@@ -522,6 +527,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
                printk(KERN_WARNING "EEH: event on unsupported device, rc=%d dn=%s\n",
                       ret, dn->full_name);
                false_positives++;
+                pdn->eeh_false_positives ++;
                rc = 0;
                goto dn_unlock;
        }
@@ -529,6 +535,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
        /* If not the kind of error we know about, punt. */
        if (rets[0] != 1 && rets[0] != 2 && rets[0] != 4 && rets[0] != 5) {
                false_positives++;
+                pdn->eeh_false_positives ++;
                rc = 0;
                goto dn_unlock;
        }
@@ -921,6 +928,7 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
        pdn->eeh_mode = 0;
        pdn->eeh_check_count = 0;
        pdn->eeh_freeze_count = 0;
+        pdn->eeh_false_positives = 0;
        if (status && strcmp(status, "ok") != 0)
                return NULL;    /* ignore devices with bad status */
@@ -1139,7 +1147,8 @@ static void eeh_add_device_late(struct pci_dev *dev)
        pdn = PCI_DN(dn);
        pdn->pcidev = dev;
-        pci_addr_cache_insert_device (dev);
+        pci_addr_cache_insert_device(dev);
+        eeh_sysfs_add_device(dev);
 }
 void eeh_add_device_tree_late(struct pci_bus *bus)
@@ -1178,6 +1187,7 @@ static void eeh_remove_device(struct pci_dev *dev)
        printk(KERN_DEBUG "EEH: remove device %s\n", pci_name(dev));
 #endif
        pci_addr_cache_remove_device(dev);
+        eeh_sysfs_remove_device(dev);
        dn = pci_device_to_OF_node(dev);
        if (PCI_DN(dn)->pcidev) {
@@ -1214,11 +1224,10 @@ static int proc_eeh_show(struct seq_file *m, void *v)
                                "check not wanted=%ld\n"
                                "eeh_total_mmio_ffs=%ld\n"
                                "eeh_false_positives=%ld\n"
-                                "eeh_ignored_failures=%ld\n"
                                "eeh_slot_resets=%ld\n",
                                no_device, no_dn, no_cfg_addr, 
                                ignored_check, total_mmio_ffs, 
-                                false_positives, ignored_failures, 
+                                false_positives,
                                slot_resets);
        }
diff --git a/arch/powerpc/platforms/pseries/eeh_cache.c b/arch/powerpc/platforms/pseries/eeh_cache.c
index f2bae04424..e49c815eae 100644
--- a/arch/powerpc/platforms/pseries/eeh_cache.c
+++ b/arch/powerpc/platforms/pseries/eeh_cache.c
@@ -2,7 +2,8 @@
 * eeh_cache.c
 * PCI address cache; allows the lookup of PCI devices based on I/O address
 *
- * Copyright (C) 2004 Linas Vepstas <linas@austin.ibm.com> IBM Corporation
+ * Copyright IBM Corporation 2004
+ * Copyright Linas Vepstas <linas@austin.ibm.com> 2004
 *
 * 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
@@ -295,6 +296,8 @@ void __init pci_addr_cache_build(void)
                        continue;
                pci_dev_get (dev);  /* matching put is in eeh_remove_device() */
                PCI_DN(dn)->pcidev = dev;
+                eeh_sysfs_add_device(dev);
        }
 #ifdef DEBUG
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index 161a5844ab..15e015ef68 100644
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -1,6 +1,7 @@
 /*
 * PCI Error Recovery Driver for RPA-compliant PPC64 platform.
- * Copyright (C) 2004, 2005 Linas Vepstas <linas@linas.org>
+ * Copyright IBM Corp. 2004 2005
+ * Copyright Linas Vepstas <linas@linas.org> 2004, 2005
 *
 * All rights reserved.
 *
@@ -19,8 +20,7 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *
- * Send feedback to <linas@us.ibm.com>
+ * Send comments and feedback to Linas Vepstas <linas@austin.ibm.com>
- *
 */
 #include <linux/delay.h>
 #include <linux/interrupt.h>
diff --git a/arch/powerpc/platforms/pseries/eeh_sysfs.c b/arch/powerpc/platforms/pseries/eeh_sysfs.c
new file mode 100644
index 0000000000..15e13b5689
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/eeh_sysfs.c
@@ -0,0 +1,87 @@
+/*
+ * Sysfs entries for PCI Error Recovery for PAPR-compliant platform.
+ * Copyright IBM Corporation 2007
+ * Copyright Linas Vepstas <linas@austin.ibm.com> 2007
+ *
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
+ * NON INFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Send comments and feedback to Linas Vepstas <linas@austin.ibm.com>
+ */
+#include <linux/pci.h>
+#include <asm/ppc-pci.h>
+#include <asm/pci-bridge.h>
+#include <linux/kobject.h>
+/**
+ * EEH_SHOW_ATTR -- create sysfs entry for eeh statistic
+ * @_name: name of file in sysfs directory
+ * @_memb: name of member in struct pci_dn to access
+ * @_format: printf format for display
+ *
+ * All of the attributes look very similar, so just
+ * auto-gen a cut-n-paste routine to display them.
+ */
+#define EEH_SHOW_ATTR(_name,_memb,_format)               \
+static ssize_t eeh_show_##_name(struct device *dev,      \
+                struct device_attribute *attr, char *buf)          \
+{                                                        \
+        struct pci_dev *pdev = to_pci_dev(dev);               \
+        struct device_node *dn = pci_device_to_OF_node(pdev); \
+        struct pci_dn *pdn;                                   \
+                                                              \
+        if (!dn || PCI_DN(dn) == NULL)                        \
+                return 0;                                          \
+                                                              \
+        pdn = PCI_DN(dn);                                     \
+        return sprintf(buf, _format "\n", pdn->_memb);        \
+}                                                        \
+static DEVICE_ATTR(_name, S_IRUGO, eeh_show_##_name, NULL);
+EEH_SHOW_ATTR(eeh_mode, eeh_mode, "0x%x");
+EEH_SHOW_ATTR(eeh_config_addr, eeh_config_addr, "0x%x");
+EEH_SHOW_ATTR(eeh_pe_config_addr, eeh_pe_config_addr, "0x%x");
+EEH_SHOW_ATTR(eeh_check_count, eeh_check_count, "%d");
+EEH_SHOW_ATTR(eeh_freeze_count, eeh_freeze_count, "%d");
+EEH_SHOW_ATTR(eeh_false_positives, eeh_false_positives, "%d");
+void eeh_sysfs_add_device(struct pci_dev *pdev)
+{
+        int rc=0;
+        rc += device_create_file(&pdev->dev, &dev_attr_eeh_mode);
+        rc += device_create_file(&pdev->dev, &dev_attr_eeh_config_addr);
+        rc += device_create_file(&pdev->dev, &dev_attr_eeh_pe_config_addr);
+        rc += device_create_file(&pdev->dev, &dev_attr_eeh_check_count);
+        rc += device_create_file(&pdev->dev, &dev_attr_eeh_false_positives);
+        rc += device_create_file(&pdev->dev, &dev_attr_eeh_freeze_count);
+        if (rc)
+                printk(KERN_WARNING "EEH: Unable to create sysfs entries\n");
+}
+void eeh_sysfs_remove_device(struct pci_dev *pdev)
+{
+        device_remove_file(&pdev->dev, &dev_attr_eeh_mode);
+        device_remove_file(&pdev->dev, &dev_attr_eeh_config_addr);
+        device_remove_file(&pdev->dev, &dev_attr_eeh_pe_config_addr);
+        device_remove_file(&pdev->dev, &dev_attr_eeh_check_count);
+        device_remove_file(&pdev->dev, &dev_attr_eeh_false_positives);
+        device_remove_file(&pdev->dev, &dev_attr_eeh_freeze_count);
+}
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 362dfbc260..8cc6eeeaae 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -373,12 +373,23 @@ static void pSeries_lpar_hptab_clear(void)
 {
        unsigned long size_bytes = 1UL << ppc64_pft_size;
        unsigned long hpte_count = size_bytes >> 4;
-        unsigned long dummy1, dummy2;
+        unsigned long dummy1, dummy2, dword0;
+        long lpar_rc;
        int i;
        /* TODO: Use bulk call */
-        for (i = 0; i < hpte_count; i++)
+        for (i = 0; i < hpte_count; i++) {
-                plpar_pte_remove_raw(0, i, 0, &dummy1, &dummy2);
+                /* dont remove HPTEs with VRMA mappings */
+                lpar_rc = plpar_pte_remove_raw(H_ANDCOND, i, HPTE_V_1TB_SEG,
+                                                &dummy1, &dummy2);
+                if (lpar_rc == H_NOT_FOUND) {
+                        lpar_rc = plpar_pte_read_raw(0, i, &dword0, &dummy1);
+                        if (!lpar_rc && ((dword0 & HPTE_V_VRMA_MASK)
+                                != HPTE_V_VRMA_MASK))
+                                /* Can be hpte for 1TB Seg. So remove it */
+                                plpar_pte_remove_raw(0, i, 0, &dummy1, &dummy2);
+                }
+        }
 }
 /*
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c
index ffaf6c5c51..47f0e0857f 100644
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -110,8 +110,6 @@ pcibios_fixup_new_pci_devices(struct pci_bus *bus, int fix_bus)
                        }
                }
        }
-        eeh_add_device_tree_late(bus);
 }
 EXPORT_SYMBOL_GPL(pcibios_fixup_new_pci_devices);
@@ -139,6 +137,8 @@ pcibios_pci_config_bridge(struct pci_dev *dev)
        /* Make the discovered devices available */
        pci_bus_add_devices(child_bus);
+        eeh_add_device_tree_late(child_bus);
        return 0;
 }
@@ -171,6 +171,7 @@ pcibios_add_pci_devices(struct pci_bus * bus)
                if (!list_empty(&bus->devices)) {
                        pcibios_fixup_new_pci_devices(bus, 0);
                        pci_bus_add_devices(bus);
+                        eeh_add_device_tree_late(bus);
                }
        } else if (mode == PCI_PROBE_NORMAL) {
                /* use legacy probe */
@@ -179,6 +180,7 @@ pcibios_add_pci_devices(struct pci_bus * bus)
                if (num) {
                        pcibios_fixup_new_pci_devices(bus, 1);
                        pci_bus_add_devices(bus);
+                        eeh_add_device_tree_late(bus);
                }
                list_for_each_entry(dev, &bus->devices, bus_list)
@@ -200,8 +202,6 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
        rtas_setup_phb(phb);
        pci_process_bridge_OF_ranges(phb, dn, 0);
-        pci_setup_phb_io_dynamic(phb, primary);
        pci_devs_phb_init_dynamic(phb);
        if (dn->child)
@@ -210,6 +210,7 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
        scan_phb(phb);
        pcibios_fixup_new_pci_devices(phb->bus, 0);
        pci_bus_add_devices(phb->bus);
+        eeh_add_device_tree_late(phb->bus);
        return phb;
 }
diff --git a/arch/powerpc/platforms/pseries/plpar_wrappers.h b/arch/powerpc/platforms/pseries/plpar_wrappers.h
index 2e4d10c9ee..d003c80fa3 100644
--- a/arch/powerpc/platforms/pseries/plpar_wrappers.h
+++ b/arch/powerpc/platforms/pseries/plpar_wrappers.h
@@ -108,6 +108,21 @@ static inline long plpar_pte_read(unsigned long flags, unsigned long ptex,
        return rc;
 }
+/* plpar_pte_read_raw can be called in real mode. It calls plpar_hcall_raw */
+static inline long plpar_pte_read_raw(unsigned long flags, unsigned long ptex,
+                unsigned long *old_pteh_ret, unsigned long *old_ptel_ret)
+{
+        long rc;
+        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
+        rc = plpar_hcall_raw(H_READ, retbuf, flags, ptex);
+        *old_pteh_ret = retbuf[0];
+        *old_ptel_ret = retbuf[1];
+        return rc;
+}
 static inline long plpar_pte_protect(unsigned long flags, unsigned long ptex,
                unsigned long avpn)
 {
diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h
index 2729d559fd..61e19f78b9 100644
--- a/arch/powerpc/platforms/pseries/pseries.h
+++ b/arch/powerpc/platforms/pseries/pseries.h
@@ -33,6 +33,8 @@ static inline void setup_kexec_cpu_down_xics(void) { }
 static inline void setup_kexec_cpu_down_mpic(void) { }
 #endif
+extern void pSeries_final_fixup(void);
 /* Poweron flag used for enabling auto ups restart */
 extern unsigned long rtas_poweron_auto;
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index 5aa97aff33..c02f8742c5 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -123,7 +123,7 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist
        strcpy(np->full_name, path);
        np->properties = proplist;
-        OF_MARK_DYNAMIC(np);
+        of_node_set_flag(np, OF_DYNAMIC);
        kref_init(&np->kref);
        np->parent = derive_parent(path);
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 470db6efae..59e69f085c 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -176,7 +176,7 @@ static void __init pseries_mpic_init_IRQ(void)
                return;
        cascade_irq = irq_of_parse_and_map(cascade, 0);
-        if (cascade == NO_IRQ) {
+        if (cascade_irq == NO_IRQ) {
                printk(KERN_ERR "mpic: failed to map cascade interrupt");
                return;
        }
@@ -399,6 +399,7 @@ static void pseries_dedicated_idle_sleep(void)
         * a good time to find other work to dispatch.
         */
        get_lppaca()->idle = 1;
+        get_lppaca()->donate_dedicated_cpu = 1;
        /*
         * We come in with interrupts disabled, and need_resched()
@@ -431,6 +432,7 @@ static void pseries_dedicated_idle_sleep(void)
 out:
        HMT_medium();
+        get_lppaca()->donate_dedicated_cpu = 0;
        get_lppaca()->idle = 0;
 }
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index f1df942072..5bd90a7eb7 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -156,9 +156,9 @@ static inline void lpar_qirr_info(int n_cpu , u8 value)
 #ifdef CONFIG_SMP
-static int get_irq_server(unsigned int virq)
+static int get_irq_server(unsigned int virq, unsigned int strict_check)
 {
-        unsigned int server;
+        int server;
        /* For the moment only implement delivery to all cpus or one cpu */
        cpumask_t cpumask = irq_desc[virq].affinity;
        cpumask_t tmp = CPU_MASK_NONE;
@@ -166,22 +166,25 @@ static int get_irq_server(unsigned int virq)
        if (!distribute_irqs)
                return default_server;
-        if (cpus_equal(cpumask, CPU_MASK_ALL)) {
+        if (!cpus_equal(cpumask, CPU_MASK_ALL)) {
-                server = default_distrib_server;
-        } else {
                cpus_and(tmp, cpu_online_map, cpumask);
-                if (cpus_empty(tmp))
+                server = first_cpu(tmp);
-                        server = default_distrib_server;
-                else
+                if (server < NR_CPUS)
-                        server = get_hard_smp_processor_id(first_cpu(tmp));
+                        return get_hard_smp_processor_id(server);
+                if (strict_check)
+                        return -1;
        }
-        return server;
+        if (cpus_equal(cpu_online_map, cpu_present_map))
+                return default_distrib_server;
+        return default_server;
 }
 #else
-static int get_irq_server(unsigned int virq)
+static int get_irq_server(unsigned int virq, unsigned int strict_check)
 {
        return default_server;
 }
@@ -192,7 +195,7 @@ static void xics_unmask_irq(unsigned int virq)
 {
        unsigned int irq;
        int call_status;
-        unsigned int server;
+        int server;
        pr_debug("xics: unmask virq %d\n", virq);
@@ -201,7 +204,7 @@ static void xics_unmask_irq(unsigned int virq)
        if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS)
                return;
-        server = get_irq_server(virq);
+        server = get_irq_server(virq, 0);
        call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server,
                                DEFAULT_PRIORITY);
@@ -398,8 +401,7 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)
        unsigned int irq;
        int status;
        int xics_status[2];
-        unsigned long newmask;
+        int irq_server;
-        cpumask_t tmp = CPU_MASK_NONE;
        irq = (unsigned int)irq_map[virq].hwirq;
        if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS)
@@ -413,18 +415,21 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)
                return;
        }
-        /* For the moment only implement delivery to all cpus or one cpu */
+        /*
-        if (cpus_equal(cpumask, CPU_MASK_ALL)) {
+         * For the moment only implement delivery to all cpus or one cpu.
-                newmask = default_distrib_server;
+         * Get current irq_server for the given irq
-        } else {
+         */
-                cpus_and(tmp, cpu_online_map, cpumask);
+        irq_server = get_irq_server(irq, 1);
-                if (cpus_empty(tmp))
+        if (irq_server == -1) {
-                        return;
+                char cpulist[128];
-                newmask = get_hard_smp_processor_id(first_cpu(tmp));
+                cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);
+                printk(KERN_WARNING "xics_set_affinity: No online cpus in "
+                                "the mask %s for irq %d\n", cpulist, virq);
+                return;
        }
        status = rtas_call(ibm_set_xive, 3, 1, NULL,
-                                irq, newmask, xics_status[1]);
+                                irq, irq_server, xics_status[1]);
        if (status) {
                printk(KERN_ERR "xics_set_affinity: irq=%u ibm,set-xive "
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index c3ce0bd12c..f65078c3d3 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -5,7 +5,6 @@ endif
 mpic-msi-obj-$(CONFIG_PCI_MSI)  += mpic_msi.o mpic_u3msi.o
 obj-$(CONFIG_MPIC)              += mpic.o $(mpic-msi-obj-y)
-obj-$(CONFIG_PPC_INDIRECT_PCI)  += indirect_pci.o
 obj-$(CONFIG_PPC_MPC106)        += grackle.o
 obj-$(CONFIG_PPC_DCR)           += dcr.o
 obj-$(CONFIG_PPC_DCR_NATIVE)    += dcr-low.o
@@ -13,16 +12,19 @@ obj-$(CONFIG_PPC_PMI)		+= pmi.o
 obj-$(CONFIG_U3_DART)           += dart_iommu.o
 obj-$(CONFIG_MMIO_NVRAM)        += mmio_nvram.o
 obj-$(CONFIG_FSL_SOC)           += fsl_soc.o
-obj-$(CONFIG_FSL_PCIE)          += fsl_pcie.o
 obj-$(CONFIG_TSI108_BRIDGE)     += tsi108_pci.o tsi108_dev.o
 obj-$(CONFIG_QUICC_ENGINE)      += qe_lib/
 mv64x60-$(CONFIG_PCI)           += mv64x60_pci.o
 obj-$(CONFIG_MV64X60)           += $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o
+obj-$(CONFIG_RTC_DRV_CMOS)      += rtc_cmos_setup.o
 # contains only the suspend handler for time
+ifeq ($(CONFIG_RTC_CLASS),)
 obj-$(CONFIG_PM)                += timer.o
+endif
 ifeq ($(CONFIG_PPC_MERGE),y)
+obj-$(CONFIG_PPC_INDIRECT_PCI)  += indirect_pci.o
 obj-$(CONFIG_PPC_I8259)         += i8259.o
 obj-$(CONFIG_PPC_83xx)          += ipic.o
 obj-$(CONFIG_4xx)               += uic.o
diff --git a/arch/powerpc/sysdev/fsl_pcie.c b/arch/powerpc/sysdev/fsl_pcie.c
deleted file mode 100644
index 041c07e8b6..0000000000
--- a/arch/powerpc/sysdev/fsl_pcie.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Support for indirect PCI bridges.
- *
- * Copyright (C) 1998 Gabriel Paubert.
- *
- * 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.
- *
- * "Temporary" MPC8548 Errata file -
- * The standard indirect_pci code should work with future silicon versions.
- */
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/string.h>
-#include <linux/init.h>
-#include <linux/bootmem.h>
-#include <asm/io.h>
-#include <asm/prom.h>
-#include <asm/pci-bridge.h>
-#include <asm/machdep.h>
-#define PCI_CFG_OUT out_be32
-/* ERRATA PCI-Ex 14 PCIE Controller timeout */
-#define PCIE_FIX                out_be32(hose->cfg_addr+0x4, 0x0400ffff)
-static int
-indirect_read_config_pcie(struct pci_bus *bus, unsigned int devfn, int offset,
-                     int len, u32 *val)
-{
-        struct pci_controller *hose = bus->sysdata;
-        volatile void __iomem *cfg_data;
-        u32 temp;
-        if (ppc_md.pci_exclude_device)
-                if (ppc_md.pci_exclude_device(bus->number, devfn))
-                        return PCIBIOS_DEVICE_NOT_FOUND;
-        /* Possible artifact of CDCpp50937 needs further investigation */
-        if (devfn != 0x0 && bus->number == 0xff)
-                return PCIBIOS_DEVICE_NOT_FOUND;
-        PCIE_FIX;
-        if (bus->number == 0xff) {
-                PCI_CFG_OUT(hose->cfg_addr,
-                            (0x80000000 | ((offset & 0xf00) << 16) |
-                             ((bus->number - hose->bus_offset) << 16)
-                             | (devfn << 8) | ((offset & 0xfc) )));
-        } else {
-                PCI_CFG_OUT(hose->cfg_addr,
-                            (0x80000001 | ((offset & 0xf00) << 16) |
-                             ((bus->number - hose->bus_offset) << 16)
-                             | (devfn << 8) | ((offset & 0xfc) )));
-        }
-        /*
-         * Note: the caller has already checked that offset is
-         * suitably aligned and that len is 1, 2 or 4.
-         */
-        /* ERRATA PCI-Ex 12 - Configuration Address/Data Alignment */
-        cfg_data = hose->cfg_data;
-        PCIE_FIX;
-        temp = in_le32(cfg_data);
-        switch (len) {
-        case 1:
-                *val = (temp >> (((offset & 3))*8)) & 0xff;
-                break;
-        case 2:
-                *val = (temp >> (((offset & 3))*8)) & 0xffff;
-                break;
-        default:
-                *val = temp;
-                break;
-        }
-        return PCIBIOS_SUCCESSFUL;
-}
-static int
-indirect_write_config_pcie(struct pci_bus *bus, unsigned int devfn, int offset,
-                      int len, u32 val)
-{
-        struct pci_controller *hose = bus->sysdata;
-        volatile void __iomem *cfg_data;
-        u32 temp;
-        if (ppc_md.pci_exclude_device)
-                if (ppc_md.pci_exclude_device(bus->number, devfn))
-                        return PCIBIOS_DEVICE_NOT_FOUND;
-        /* Possible artifact of CDCpp50937 needs further investigation */
-        if (devfn != 0x0 && bus->number == 0xff)
-                return PCIBIOS_DEVICE_NOT_FOUND;
-        PCIE_FIX;
-        if (bus->number == 0xff) {
-                PCI_CFG_OUT(hose->cfg_addr,
-                            (0x80000000 | ((offset & 0xf00) << 16) |
-                             ((bus->number - hose->bus_offset) << 16)
-                             | (devfn << 8) | ((offset & 0xfc) )));
-        } else {
-                PCI_CFG_OUT(hose->cfg_addr,
-                            (0x80000001 | ((offset & 0xf00) << 16) |
-                             ((bus->number - hose->bus_offset) << 16)
-                             | (devfn << 8) | ((offset & 0xfc) )));
-        }
-        /*
-         * Note: the caller has already checked that offset is
-         * suitably aligned and that len is 1, 2 or 4.
-         */
-        /* ERRATA PCI-Ex 12 - Configuration Address/Data Alignment */
-        cfg_data = hose->cfg_data;
-        switch (len) {
-        case 1:
-                PCIE_FIX;
-                temp = in_le32(cfg_data);
-                temp = (temp & ~(0xff << ((offset & 3) * 8))) |
-                        (val << ((offset & 3) * 8));
-                PCIE_FIX;
-                out_le32(cfg_data, temp);
-                break;
-        case 2:
-                PCIE_FIX;
-                temp = in_le32(cfg_data);
-                temp = (temp & ~(0xffff << ((offset & 3) * 8)));
-                temp |= (val << ((offset & 3) * 8)) ;
-                PCIE_FIX;
-                out_le32(cfg_data, temp);
-                break;
-        default:
-                PCIE_FIX;
-                out_le32(cfg_data, val);
-                break;
-        }
-        PCIE_FIX;
-        return PCIBIOS_SUCCESSFUL;
-}
-static struct pci_ops indirect_pcie_ops = {
-        indirect_read_config_pcie,
-        indirect_write_config_pcie
-};
-void __init
-setup_indirect_pcie_nomap(struct pci_controller* hose, void __iomem * cfg_addr,
-        void __iomem * cfg_data)
-{
-        hose->cfg_addr = cfg_addr;
-        hose->cfg_data = cfg_data;
-        hose->ops = &indirect_pcie_ops;
-}
-void __init
-setup_indirect_pcie(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data)
-{
-        unsigned long base = cfg_addr & PAGE_MASK;
-        void __iomem *mbase, *addr, *data;
-        mbase = ioremap(base, PAGE_SIZE);
-        addr = mbase + (cfg_addr & ~PAGE_MASK);
-        if ((cfg_data & PAGE_MASK) != base)
-                mbase = ioremap(cfg_data & PAGE_MASK, PAGE_SIZE);
-        data = mbase + (cfg_data & ~PAGE_MASK);
-        setup_indirect_pcie_nomap(hose, addr, data);
-}
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index cad1757243..c0ddc80d81 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -1028,6 +1028,19 @@ err:
 arch_initcall(fs_enet_of_init);
+static int __init fsl_pcmcia_of_init(void)
+{
+        struct device_node *np = NULL;
+        /*
+         * Register all the devices which type is "pcmcia"
+         */
+        while ((np = of_find_compatible_node(np,
+                        "pcmcia", "fsl,pq-pcmcia")) != NULL)
+                            of_platform_device_create(np, "m8xx-pcmcia", NULL);
+        return 0;
+}
+arch_initcall(fsl_pcmcia_of_init);
 static const char *smc_regs = "regs";
 static const char *smc_pram = "pram";
diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c
index e714884697..c7e6e859b3 100644
--- a/arch/powerpc/sysdev/indirect_pci.c
+++ b/arch/powerpc/sysdev/indirect_pci.c
@@ -33,18 +33,27 @@ indirect_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
        struct pci_controller *hose = bus->sysdata;
        volatile void __iomem *cfg_data;
        u8 cfg_type = 0;
+        u32 bus_no, reg;
        if (ppc_md.pci_exclude_device)
-                if (ppc_md.pci_exclude_device(bus->number, devfn))
+                if (ppc_md.pci_exclude_device(hose, bus->number, devfn))
                        return PCIBIOS_DEVICE_NOT_FOUND;
        
-        if (hose->set_cfg_type)
+        if (hose->indirect_type & PPC_INDIRECT_TYPE_SET_CFG_TYPE)
                if (bus->number != hose->first_busno)
                        cfg_type = 1;
-        PCI_CFG_OUT(hose->cfg_addr,                                      
+        bus_no = (bus->number == hose->first_busno) ?
-                 (0x80000000 | ((bus->number - hose->bus_offset) << 16)
+                        hose->self_busno : bus->number;
-                  | (devfn << 8) | ((offset & 0xfc) | cfg_type)));
+        if (hose->indirect_type & PPC_INDIRECT_TYPE_EXT_REG)
+                reg = ((offset & 0xf00) << 16) | (offset & 0xfc);
+        else
+                reg = offset & 0xfc;
+        PCI_CFG_OUT(hose->cfg_addr,
+                 (0x80000000 | (bus_no << 16)
+                  | (devfn << 8) | reg | cfg_type));
        /*
         * Note: the caller has already checked that offset is
@@ -72,18 +81,33 @@ indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
        struct pci_controller *hose = bus->sysdata;
        volatile void __iomem *cfg_data;
        u8 cfg_type = 0;
+        u32 bus_no, reg;
        if (ppc_md.pci_exclude_device)
-                if (ppc_md.pci_exclude_device(bus->number, devfn))
+                if (ppc_md.pci_exclude_device(hose, bus->number, devfn))
                        return PCIBIOS_DEVICE_NOT_FOUND;
-        if (hose->set_cfg_type)
+        if (hose->indirect_type & PPC_INDIRECT_TYPE_SET_CFG_TYPE)
                if (bus->number != hose->first_busno)
                        cfg_type = 1;
-        PCI_CFG_OUT(hose->cfg_addr,                                      
+        bus_no = (bus->number == hose->first_busno) ?
-                 (0x80000000 | ((bus->number - hose->bus_offset) << 16)
+                        hose->self_busno : bus->number;
-                  | (devfn << 8) | ((offset & 0xfc) | cfg_type)));
+        if (hose->indirect_type & PPC_INDIRECT_TYPE_EXT_REG)
+                reg = ((offset & 0xf00) << 16) | (offset & 0xfc);
+        else
+                reg = offset & 0xfc;
+        PCI_CFG_OUT(hose->cfg_addr,
+                 (0x80000000 | (bus_no << 16)
+                  | (devfn << 8) | reg | cfg_type));
+        /* surpress setting of PCI_PRIMARY_BUS */
+        if (hose->indirect_type & PPC_INDIRECT_TYPE_SURPRESS_PRIMARY_BUS)
+                if ((offset == PCI_PRIMARY_BUS) &&
+                        (bus->number == hose->first_busno))
+                val &= 0xffffff00;
        /*
         * Note: the caller has already checked that offset is
diff --git a/arch/powerpc/sysdev/mpc8xx_pic.h b/arch/powerpc/sysdev/mpc8xx_pic.h
index afa2ee6717..9fe00eebdc 100644
--- a/arch/powerpc/sysdev/mpc8xx_pic.h
+++ b/arch/powerpc/sysdev/mpc8xx_pic.h
@@ -4,9 +4,16 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
-extern struct hw_interrupt_type mpc8xx_pic;
 int mpc8xx_pic_init(void);
 unsigned int mpc8xx_get_irq(void);
+/*
+ * Some internal interrupt registers use an 8-bit mask for the interrupt
+ * level instead of a number.
+ */
+static inline uint mk_int_int_mask(uint mask)
+{
+        return (1 << (7 - (mask/2)));
+}
 #endif /* _PPC_KERNEL_PPC8xx_H */
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c
index 4b0a9c88ee..b618fa60ae 100644
--- a/arch/powerpc/sysdev/mv64x60_dev.c
+++ b/arch/powerpc/sysdev/mv64x60_dev.c
@@ -12,6 +12,7 @@
 #include <linux/stddef.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/console.h>
 #include <linux/mv643xx.h>
 #include <linux/platform_device.h>
@@ -420,3 +421,30 @@ error:
        return err;
 }
 arch_initcall(mv64x60_device_setup);
+static int __init mv64x60_add_mpsc_console(void)
+{
+        struct device_node *np = NULL;
+        const char *prop;
+        prop = of_get_property(of_chosen, "linux,stdout-path", NULL);
+        if (prop == NULL)
+                goto not_mpsc;
+        np = of_find_node_by_path(prop);
+        if (!np)
+                goto not_mpsc;
+        if (!of_device_is_compatible(np, "marvell,mpsc"))
+                goto not_mpsc;
+        prop = of_get_property(np, "block-index", NULL);
+        if (!prop)
+                goto not_mpsc;
+        add_preferred_console("ttyMM", *(int *)prop, NULL);
+not_mpsc:
+        return 0;
+}
+console_initcall(mv64x60_add_mpsc_console);
diff --git a/arch/powerpc/sysdev/mv64x60_pci.c b/arch/powerpc/sysdev/mv64x60_pci.c
index b5aef4cbc8..45db86c236 100644
--- a/arch/powerpc/sysdev/mv64x60_pci.c
+++ b/arch/powerpc/sysdev/mv64x60_pci.c
@@ -137,18 +137,15 @@ static int __init mv64x60_add_bridge(struct device_node *dev)
                printk(KERN_WARNING "Can't get bus-range for %s, assume"
                       " bus 0\n", dev->full_name);
-        hose = pcibios_alloc_controller();
+        hose = pcibios_alloc_controller(dev);
        if (!hose)
                return -ENOMEM;
-        hose->arch_data = dev;
-        hose->set_cfg_type = 1;
        hose->first_busno = bus_range ? bus_range[0] : 0;
        hose->last_busno = bus_range ? bus_range[1] : 0xff;
        setup_indirect_pci(hose, rsrc.start, rsrc.start + 4);
-        hose->bus_offset = hose->first_busno;
+        hose->self_busno = hose->first_busno;
        printk(KERN_INFO "Found MV64x60 PCI host bridge at 0x%016llx. "
               "Firmware bus number: %d->%d\n",
diff --git a/arch/powerpc/sysdev/qe_lib/ucc.c b/arch/powerpc/sysdev/qe_lib/ucc.c
index ac12a44d51..f970e5415a 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/stddef.h>
+#include <linux/module.h>
 #include <asm/irq.h>
 #include <asm/io.h>
@@ -40,6 +41,7 @@ int ucc_set_qe_mux_mii_mng(int ucc_num)
        return 0;
 }
+EXPORT_SYMBOL(ucc_set_qe_mux_mii_mng);
 int ucc_set_type(int ucc_num, struct ucc_common *regs,
                 enum ucc_speed_type speed)
diff --git a/arch/powerpc/sysdev/qe_lib/ucc_fast.c b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
index 9143236853..3df202e8d3 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc_fast.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
@@ -19,6 +19,7 @@
 #include <linux/stddef.h>
 #include <linux/interrupt.h>
 #include <linux/err.h>
+#include <linux/module.h>
 #include <asm/io.h>
 #include <asm/immap_qe.h>
@@ -70,6 +71,7 @@ void ucc_fast_dump_regs(struct ucc_fast_private * uccf)
        printk(KERN_INFO "guemr : addr - 0x%08x, val - 0x%02x",
                  (u32) & uccf->uf_regs->guemr, uccf->uf_regs->guemr);
 }
+EXPORT_SYMBOL(ucc_fast_dump_regs);
 u32 ucc_fast_get_qe_cr_subblock(int uccf_num)
 {
@@ -85,11 +87,13 @@ u32 ucc_fast_get_qe_cr_subblock(int uccf_num)
        default: return QE_CR_SUBBLOCK_INVALID;
        }
 }
+EXPORT_SYMBOL(ucc_fast_get_qe_cr_subblock);
 void ucc_fast_transmit_on_demand(struct ucc_fast_private * uccf)
 {
        out_be16(&uccf->uf_regs->utodr, UCC_FAST_TOD);
 }
+EXPORT_SYMBOL(ucc_fast_transmit_on_demand);
 void ucc_fast_enable(struct ucc_fast_private * uccf, enum comm_dir mode)
 {
@@ -110,6 +114,7 @@ void ucc_fast_enable(struct ucc_fast_private * uccf, enum comm_dir mode)
        }
        out_be32(&uf_regs->gumr, gumr);
 }
+EXPORT_SYMBOL(ucc_fast_enable);
 void ucc_fast_disable(struct ucc_fast_private * uccf, enum comm_dir mode)
 {
@@ -130,6 +135,7 @@ void ucc_fast_disable(struct ucc_fast_private * uccf, enum comm_dir mode)
        }
        out_be32(&uf_regs->gumr, gumr);
 }
+EXPORT_SYMBOL(ucc_fast_disable);
 int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** uccf_ret)
 {
@@ -341,6 +347,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
        *uccf_ret = uccf;
        return 0;
 }
+EXPORT_SYMBOL(ucc_fast_init);
 void ucc_fast_free(struct ucc_fast_private * uccf)
 {
@@ -355,3 +362,4 @@ void ucc_fast_free(struct ucc_fast_private * uccf)
        kfree(uccf);
 }
+EXPORT_SYMBOL(ucc_fast_free);
diff --git a/arch/powerpc/sysdev/rtc_cmos_setup.c b/arch/powerpc/sysdev/rtc_cmos_setup.c
new file mode 100644
index 0000000000..e276048b8c
--- /dev/null
+++ b/arch/powerpc/sysdev/rtc_cmos_setup.c
@@ -0,0 +1,49 @@
+/*
+ * Setup code for PC-style Real-Time Clock.
+ *
+ * Author: Wade Farnsworth <wfarnsworth@mvista.com>
+ *
+ * 2007 (c) MontaVista Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+#include <linux/platform_device.h>
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/mc146818rtc.h>
+#include <asm/prom.h>
+static int  __init add_rtc(void)
+{
+        struct device_node *np;
+        struct platform_device *pd;
+        struct resource res;
+        int ret;
+        np = of_find_compatible_node(NULL, NULL, "pnpPNP,b00");
+        if (!np)
+                return -ENODEV;
+        ret = of_address_to_resource(np, 0, &res);
+        of_node_put(np);
+        if (ret)
+                return ret;
+        /*
+         * RTC_PORT(x) is hardcoded in asm/mc146818rtc.h.  Verify that the
+         * address provided by the device node matches.
+         */
+        if (res.start != RTC_PORT(0))
+                return -EINVAL;
+        pd = platform_device_register_simple("rtc_cmos", -1,
+                                             &res, 1);
+        if (IS_ERR(pd))
+                return PTR_ERR(pd);
+        return 0;
+}
+fs_initcall(add_rtc);
diff --git a/arch/powerpc/sysdev/timer.c b/arch/powerpc/sysdev/timer.c
index 4a01748b42..e81e7ec2e7 100644
--- a/arch/powerpc/sysdev/timer.c
+++ b/arch/powerpc/sysdev/timer.c
@@ -24,7 +24,12 @@ static int timer_resume(struct sys_device *dev)
        /* get current RTC time and convert to seconds */
        get_rtc_time(&cur_rtc_tm);
-        rtc_tm_to_time(&cur_rtc_tm, &cur_rtc_time);
+        cur_rtc_time = mktime(cur_rtc_tm.tm_year + 1900,
+                              cur_rtc_tm.tm_mon + 1,
+                              cur_rtc_tm.tm_mday,
+                              cur_rtc_tm.tm_hour,
+                              cur_rtc_tm.tm_min,
+                              cur_rtc_tm.tm_sec);
        diff = cur_rtc_time - suspend_rtc_time;
@@ -44,7 +49,12 @@ static int timer_suspend(struct sys_device *dev, pm_message_t state)
        WARN_ON(!ppc_md.get_rtc_time);
        get_rtc_time(&suspend_rtc_tm);
-        rtc_tm_to_time(&suspend_rtc_tm, &suspend_rtc_time);
+        suspend_rtc_time = mktime(suspend_rtc_tm.tm_year + 1900,
+                                  suspend_rtc_tm.tm_mon + 1,
+                                  suspend_rtc_tm.tm_mday,
+                                  suspend_rtc_tm.tm_hour,
+                                  suspend_rtc_tm.tm_min,
+                                  suspend_rtc_tm.tm_sec);
        return 0;
 }
diff --git a/arch/powerpc/sysdev/tsi108_dev.c b/arch/powerpc/sysdev/tsi108_dev.c
index 7d3b09b7d5..a113d800cb 100644
--- a/arch/powerpc/sysdev/tsi108_dev.c
+++ b/arch/powerpc/sysdev/tsi108_dev.c
@@ -72,12 +72,11 @@ static int __init tsi108_eth_of_init(void)
        int ret;
        for (np = NULL, i = 0;
-             (np = of_find_compatible_node(np, "network", "tsi-ethernet")) != NULL;
+             (np = of_find_compatible_node(np, "network", "tsi108-ethernet")) != NULL;
             i++) {
                struct resource r[2];
-                struct device_node *phy;
+                struct device_node *phy, *mdio;
                hw_info tsi_eth_data;
-                const unsigned int *id;
                const unsigned int *phy_id;
                const void *mac_addr;
                const phandle *ph;
@@ -111,6 +110,13 @@ static int __init tsi108_eth_of_init(void)
                if (mac_addr)
                        memcpy(tsi_eth_data.mac_addr, mac_addr, 6);
+                ph = of_get_property(np, "mdio-handle", NULL);
+                mdio = of_find_node_by_phandle(*ph);
+                ret = of_address_to_resource(mdio, 0, &res);
+                of_node_put(mdio);
+                if (ret)
+                        goto unreg;
                ph = of_get_property(np, "phy-handle", NULL);
                phy = of_find_node_by_phandle(*ph);
@@ -119,20 +125,25 @@ static int __init tsi108_eth_of_init(void)
                        goto unreg;
                }
-                id = of_get_property(phy, "reg", NULL);
+                phy_id = of_get_property(phy, "reg", NULL);
-                phy_id = of_get_property(phy, "phy-id", NULL);
-                ret = of_address_to_resource(phy, 0, &res);
-                if (ret) {
-                        of_node_put(phy);
-                        goto unreg;
-                }
                tsi_eth_data.regs = r[0].start;
                tsi_eth_data.phyregs = res.start;
                tsi_eth_data.phy = *phy_id;
                tsi_eth_data.irq_num = irq_of_parse_and_map(np, 0);
-                if (of_device_is_compatible(phy, "bcm54xx"))
+                /* Some boards with the TSI108 bridge (e.g. Holly)
+                 * have a miswiring of the ethernet PHYs which
+                 * requires a workaround.  The special
+                 * "txc-rxc-delay-disable" property enables this
+                 * workaround.  FIXME: Need to port the tsi108_eth
+                 * driver itself to phylib and use a non-misleading
+                 * name for the workaround flag - it's not actually to
+                 * do with the model of PHY in use */
+                if (of_get_property(phy, "txc-rxc-delay-disable", NULL))
                        tsi_eth_data.phy_type = TSI108_PHY_BCM54XX;
                of_node_put(phy);
                ret =
                    platform_device_add_data(tsi_eth_dev, &tsi_eth_data,
                                             sizeof(hw_info));
diff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_pci.c
index 2153163fa5..90db8a720f 100644
--- a/arch/powerpc/sysdev/tsi108_pci.c
+++ b/arch/powerpc/sysdev/tsi108_pci.c
@@ -64,9 +64,10 @@ tsi108_direct_write_config(struct pci_bus *bus, unsigned int devfunc,
                           int offset, int len, u32 val)
 {
        volatile unsigned char *cfg_addr;
+        struct pci_controller *hose = bus->sysdata;
        if (ppc_md.pci_exclude_device)
-                if (ppc_md.pci_exclude_device(bus->number, devfunc))
+                if (ppc_md.pci_exclude_device(hose, bus->number, devfunc))
                        return PCIBIOS_DEVICE_NOT_FOUND;
        cfg_addr = (unsigned char *)(tsi_mk_config_addr(bus->number,
@@ -149,10 +150,11 @@ tsi108_direct_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
                          int len, u32 * val)
 {
        volatile unsigned char *cfg_addr;
+        struct pci_controller *hose = bus->sysdata;
        u32 temp;
        if (ppc_md.pci_exclude_device)
-                if (ppc_md.pci_exclude_device(bus->number, devfn))
+                if (ppc_md.pci_exclude_device(hose, bus->number, devfn))
                        return PCIBIOS_DEVICE_NOT_FOUND;
        cfg_addr = (unsigned char *)(tsi_mk_config_addr(bus->number,
@@ -219,14 +221,12 @@ int __init tsi108_setup_pci(struct device_node *dev, u32 cfg_phys, int primary)
                       " bus 0\n", dev->full_name);
        }
-        hose = pcibios_alloc_controller();
+        hose = pcibios_alloc_controller(dev);
        if (!hose) {
                printk("PCI Host bridge init failed\n");
                return -ENOMEM;
        }
-        hose->arch_data = dev;
-        hose->set_cfg_type = 1;
        hose->first_busno = bus_range ? bus_range[0] : 0;
        hose->last_busno = bus_range ? bus_range[1] : 0xff;
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 28fdf4f50c..669e6566ad 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -2634,7 +2634,7 @@ static int __init setup_xmon_sysrq(void)
 __initcall(setup_xmon_sysrq);
 #endif /* CONFIG_MAGIC_SYSRQ */
-int __initdata xmon_early, xmon_off;
+static int __initdata xmon_early, xmon_off;
 static int __init early_parse_xmon(char *p)
 {
diff --git a/arch/ppc/8260_io/enet.c b/arch/ppc/8260_io/enet.c
index 4c0a7d732f..615b6583d9 100644
--- a/arch/ppc/8260_io/enet.c
+++ b/arch/ppc/8260_io/enet.c
@@ -477,9 +477,9 @@ for (;;) {
                }
                else {
                        skb_put(skb,pkt_len-4); /* Make room */
-                        eth_copy_and_sum(skb,
+                        skb_copy_to_linear_data(skb,
                                (unsigned char *)__va(bdp->cbd_bufaddr),
-                                pkt_len-4, 0);
+                                pkt_len-4);
                        skb->protocol=eth_type_trans(skb,dev);
                        netif_rx(skb);
                }
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c
index cab395da25..6f3ed6a72e 100644
--- a/arch/ppc/8260_io/fcc_enet.c
+++ b/arch/ppc/8260_io/fcc_enet.c
@@ -734,9 +734,9 @@ for (;;) {
                }
                else {
                        skb_put(skb,pkt_len);   /* Make room */
-                        eth_copy_and_sum(skb,
+                        skb_copy_to_linear_data(skb,
                                (unsigned char *)__va(bdp->cbd_bufaddr),
-                                pkt_len, 0);
+                                pkt_len);
                        skb->protocol=eth_type_trans(skb,dev);
                        netif_rx(skb);
                }
diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c
index e58288e143..703d47eee4 100644
--- a/arch/ppc/8xx_io/enet.c
+++ b/arch/ppc/8xx_io/enet.c
@@ -506,9 +506,9 @@ for (;;) {
                }
                else {
                        skb_put(skb,pkt_len-4); /* Make room */
-                        eth_copy_and_sum(skb,
+                        skb_copy_to_linear_data(skb,
                                cep->rx_vaddr[bdp - cep->rx_bd_base],
-                                pkt_len-4, 0);
+                                pkt_len-4);
                        skb->protocol=eth_type_trans(skb,dev);
                        netif_rx(skb);
                }
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c
index d38335d2d7..0288279be9 100644
--- a/arch/ppc/8xx_io/fec.c
+++ b/arch/ppc/8xx_io/fec.c
@@ -725,7 +725,7 @@ while (!(bdp->cbd_sc & BD_ENET_RX_EMPTY)) {
                fep->stats.rx_dropped++;
        } else {
                skb_put(skb,pkt_len-4); /* Make room */
-                eth_copy_and_sum(skb, data, pkt_len-4, 0);
+                skb_copy_to_linear_data(skb, data, pkt_len-4);
                skb->protocol=eth_type_trans(skb,dev);
                netif_rx(skb);
        }
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index ccce2a4a15..6bdeeb70b1 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -1237,8 +1237,10 @@ config PCI
          infrastructure code to support PCI bus devices.
 config PCI_DOMAINS
-        bool
+        def_bool PCI
-        default PCI
+config PCI_SYSCALL
+        def_bool PCI
 config MPC83xx_PCI2
        bool "Support for 2nd PCI host controller"
diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S
index d319f9ba23..0da5536865 100644
--- a/arch/ppc/kernel/misc.S
+++ b/arch/ppc/kernel/misc.S
@@ -328,7 +328,7 @@ BEGIN_FTR_SECTION
        mtspr   SPRN_L1CSR0,r3
        isync
        blr
-END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
+END_FTR_SECTION_IFSET(CPU_FTR_UNIFIED_ID_CACHE)
        mfspr   r3,SPRN_L1CSR1
        ori     r3,r3,L1CSR1_ICFI|L1CSR1_ICLFR
        mtspr   SPRN_L1CSR1,r3
@@ -355,7 +355,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
 _GLOBAL(__flush_icache_range)
 BEGIN_FTR_SECTION
        blr                             /* for 601, do nothing */
-END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
+END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE)
        li      r5,L1_CACHE_BYTES-1
        andc    r3,r3,r5
        subf    r4,r3,r4
@@ -472,7 +472,7 @@ _GLOBAL(flush_dcache_all)
 _GLOBAL(__flush_dcache_icache)
 BEGIN_FTR_SECTION
        blr                                     /* for 601, do nothing */
-END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
+END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE)
        rlwinm  r3,r3,0,0,19                    /* Get page base address */
        li      r4,4096/L1_CACHE_BYTES  /* Number of lines in a page */
        mtctr   r4
@@ -500,7 +500,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
 _GLOBAL(__flush_dcache_icache_phys)
 BEGIN_FTR_SECTION
        blr                                     /* for 601, do nothing */
-END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
+END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE)
        mfmsr   r10
        rlwinm  r0,r10,0,28,26                  /* clear DR */
        mtmsr   r0
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index 5e723c4c25..c2ec13bea0 100644
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
@@ -633,12 +633,6 @@ void pcibios_make_OF_bus_map(void)
 {
 }
-/* Add sysfs properties */
-void pcibios_add_platform_entries(struct pci_dev *pdev)
-{
-}
 static int __init
 pcibios_init(void)
 {
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
index a4165209ac..63f0a98713 100644
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
@@ -64,7 +64,6 @@ extern unsigned long mm_ptov (unsigned long paddr);
 EXPORT_SYMBOL(clear_pages);
 EXPORT_SYMBOL(clear_user_page);
-EXPORT_SYMBOL(do_signal);
 EXPORT_SYMBOL(transfer_to_handler);
 EXPORT_SYMBOL(do_IRQ);
 EXPORT_SYMBOL(machine_check_exception);
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index c79704f540..967c1ef59a 100644
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -526,7 +526,7 @@ void __init setup_arch(char **cmdline_p)
         * Systems with OF can look in the properties on the cpu node(s)
         * for a possibly more accurate value.
         */
-        if (cpu_has_feature(CPU_FTR_SPLIT_ID_CACHE)) {
+        if (! cpu_has_feature(CPU_FTR_UNIFIED_ID_CACHE)) {
                dcache_bsize = cur_cpu_spec->dcache_bsize;
                icache_bsize = cur_cpu_spec->icache_bsize;
                ucache_bsize = 0;
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c
index aea100be52..3f3b292eb7 100644
--- a/arch/ppc/kernel/traps.c
+++ b/arch/ppc/kernel/traps.c
@@ -92,6 +92,7 @@ int die(const char * str, struct pt_regs * fp, long err)
        if (nl)
                printk("\n");
        show_regs(fp);
+        add_taint(TAINT_DIE);
        spin_unlock_irq(&die_lock);
        /* do_exit() should take care of panic'ing from an interrupt
         * context so we don't handle it here
@@ -619,7 +620,7 @@ void program_check_exception(struct pt_regs *regs)
                        return;
                if (!(regs->msr & MSR_PR) &&  /* not user-mode */
-                    report_bug(regs->nip) == BUG_TRAP_TYPE_WARN) {
+                    report_bug(regs->nip, regs) == BUG_TRAP_TYPE_WARN) {
                        regs->nip += 4;
                        return;
                }
diff --git a/arch/ppc/mm/tlb.c b/arch/ppc/mm/tlb.c
index fa29740a28..4ff260bc9d 100644
--- a/arch/ppc/mm/tlb.c
+++ b/arch/ppc/mm/tlb.c
@@ -27,6 +27,7 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/highmem.h>
+#include <linux/pagemap.h>
 #include <asm/tlbflush.h>
 #include <asm/tlb.h>
diff --git a/arch/ppc/platforms/4xx/bamboo.c b/arch/ppc/platforms/4xx/bamboo.c
index 349660b84a..017623c9bc 100644
--- a/arch/ppc/platforms/4xx/bamboo.c
+++ b/arch/ppc/platforms/4xx/bamboo.c
@@ -29,6 +29,7 @@
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <linux/ethtool.h>
 #include <asm/system.h>
diff --git a/arch/ppc/platforms/4xx/bubinga.c b/arch/ppc/platforms/4xx/bubinga.c
index 1a7f075b75..cd696be55a 100644
--- a/arch/ppc/platforms/4xx/bubinga.c
+++ b/arch/ppc/platforms/4xx/bubinga.c
@@ -21,6 +21,7 @@
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <asm/system.h>
 #include <asm/pci-bridge.h>
diff --git a/arch/ppc/platforms/4xx/cpci405.c b/arch/ppc/platforms/4xx/cpci405.c
index 8474b05b79..2e7e25dd84 100644
--- a/arch/ppc/platforms/4xx/cpci405.c
+++ b/arch/ppc/platforms/4xx/cpci405.c
@@ -23,6 +23,7 @@
 #include <asm/todc.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <asm/ocp.h>
 #include <asm/ibm_ocp_pci.h>
 #include <platforms/4xx/ibm405gp.h>
diff --git a/arch/ppc/platforms/4xx/ebony.c b/arch/ppc/platforms/4xx/ebony.c
index f0f9cc8480..05d7184d7e 100644
--- a/arch/ppc/platforms/4xx/ebony.c
+++ b/arch/ppc/platforms/4xx/ebony.c
@@ -32,6 +32,7 @@
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
diff --git a/arch/ppc/platforms/4xx/luan.c b/arch/ppc/platforms/4xx/luan.c
index 61706ef371..4b169610f1 100644
--- a/arch/ppc/platforms/4xx/luan.c
+++ b/arch/ppc/platforms/4xx/luan.c
@@ -30,6 +30,7 @@
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
diff --git a/arch/ppc/platforms/4xx/ocotea.c b/arch/ppc/platforms/4xx/ocotea.c
index 5e994e146b..fd0f971881 100644
--- a/arch/ppc/platforms/4xx/ocotea.c
+++ b/arch/ppc/platforms/4xx/ocotea.c
@@ -30,6 +30,7 @@
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
diff --git a/arch/ppc/platforms/4xx/taishan.c b/arch/ppc/platforms/4xx/taishan.c
index 5d9af8ddb1..888c492b4a 100644
--- a/arch/ppc/platforms/4xx/taishan.c
+++ b/arch/ppc/platforms/4xx/taishan.c
@@ -30,6 +30,7 @@
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand.h>
diff --git a/arch/ppc/platforms/4xx/yucca.c b/arch/ppc/platforms/4xx/yucca.c
index 346787df0d..a83b0baea0 100644
--- a/arch/ppc/platforms/4xx/yucca.c
+++ b/arch/ppc/platforms/4xx/yucca.c
@@ -31,6 +31,7 @@
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
diff --git a/arch/ppc/platforms/85xx/sbc8560.c b/arch/ppc/platforms/85xx/sbc8560.c
index 1d10ab98f6..3d7addbdec 100644
--- a/arch/ppc/platforms/85xx/sbc8560.c
+++ b/arch/ppc/platforms/85xx/sbc8560.c
@@ -26,6 +26,7 @@
 #include <linux/serial.h>
 #include <linux/tty.h>  /* for linux/serial_core.h */
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <linux/initrd.h>
 #include <linux/module.h>
 #include <linux/fsl_devices.h>
diff --git a/arch/ppc/platforms/chestnut.c b/arch/ppc/platforms/chestnut.c
index a764ae71cb..248684f50d 100644
--- a/arch/ppc/platforms/chestnut.c
+++ b/arch/ppc/platforms/chestnut.c
@@ -25,6 +25,7 @@
 #include <linux/ide.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <linux/mtd/physmap.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
diff --git a/arch/ppc/platforms/ev64260.c b/arch/ppc/platforms/ev64260.c
index 4957a7bcde..976270d537 100644
--- a/arch/ppc/platforms/ev64260.c
+++ b/arch/ppc/platforms/ev64260.c
@@ -35,6 +35,7 @@
 #include <linux/serial.h>
 #include <linux/tty.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #else
 #include <linux/mv643xx.h>
 #endif
diff --git a/arch/ppc/platforms/prep_setup.c b/arch/ppc/platforms/prep_setup.c
index 6f21110a97..3c56654bfc 100644
--- a/arch/ppc/platforms/prep_setup.c
+++ b/arch/ppc/platforms/prep_setup.c
@@ -69,9 +69,6 @@
 TODC_ALLOC();
-unsigned char ucBoardRev;
-unsigned char ucBoardRevMaj, ucBoardRevMin;
 extern unsigned char prep_nvram_read_val(int addr);
 extern void prep_nvram_write_val(int addr,
                                 unsigned char val);
diff --git a/arch/ppc/platforms/radstone_ppc7d.c b/arch/ppc/platforms/radstone_ppc7d.c
index b55860734a..44d4398a36 100644
--- a/arch/ppc/platforms/radstone_ppc7d.c
+++ b/arch/ppc/platforms/radstone_ppc7d.c
@@ -35,6 +35,7 @@
 #include <linux/serial.h>
 #include <linux/tty.h>          /* for linux/serial_core.h */
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <linux/mv643xx.h>
 #include <linux/netdevice.h>
 #include <linux/platform_device.h>
diff --git a/arch/ppc/platforms/spruce.c b/arch/ppc/platforms/spruce.c
index 3c78427848..f4de50ba29 100644
--- a/arch/ppc/platforms/spruce.c
+++ b/arch/ppc/platforms/spruce.c
@@ -27,6 +27,7 @@
 #include <linux/serial.h>
 #include <linux/tty.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile
index 95694159b2..543795be58 100644
--- a/arch/ppc/syslib/Makefile
+++ b/arch/ppc/syslib/Makefile
@@ -7,6 +7,7 @@ CFLAGS_btext.o          += -fPIC
 wdt-mpc8xx-$(CONFIG_8xx_WDT)    += m8xx_wdt.o
+obj-$(CONFIG_PPC_INDIRECT_PCI)  += indirect_pci.o
 obj-$(CONFIG_PPCBUG_NVRAM)      += prep_nvram.o
 obj-$(CONFIG_PPC_OCP)           += ocp.o
 obj-$(CONFIG_IBM_OCP)           += ibm_ocp.o
diff --git a/arch/ppc/syslib/indirect_pci.c b/arch/ppc/syslib/indirect_pci.c
new file mode 100644
index 0000000000..83b323a7d0
--- /dev/null
+++ b/arch/ppc/syslib/indirect_pci.c
@@ -0,0 +1,134 @@
+/*
+ * Support for indirect PCI bridges.
+ *
+ * Copyright (C) 1998 Gabriel Paubert.
+ *
+ * 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.
+ */
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/init.h>
+#include <asm/io.h>
+#include <asm/prom.h>
+#include <asm/pci-bridge.h>
+#include <asm/machdep.h>
+#ifdef CONFIG_PPC_INDIRECT_PCI_BE
+#define PCI_CFG_OUT out_be32
+#else
+#define PCI_CFG_OUT out_le32
+#endif
+static int
+indirect_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
+                     int len, u32 *val)
+{
+        struct pci_controller *hose = bus->sysdata;
+        volatile void __iomem *cfg_data;
+        u8 cfg_type = 0;
+        if (ppc_md.pci_exclude_device)
+                if (ppc_md.pci_exclude_device(bus->number, devfn))
+                        return PCIBIOS_DEVICE_NOT_FOUND;
+        if (hose->set_cfg_type)
+                if (bus->number != hose->first_busno)
+                        cfg_type = 1;
+        PCI_CFG_OUT(hose->cfg_addr,
+                 (0x80000000 | ((bus->number - hose->bus_offset) << 16)
+                  | (devfn << 8) | ((offset & 0xfc) | cfg_type)));
+        /*
+         * Note: the caller has already checked that offset is
+         * suitably aligned and that len is 1, 2 or 4.
+         */
+        cfg_data = hose->cfg_data + (offset & 3);
+        switch (len) {
+        case 1:
+                *val = in_8(cfg_data);
+                break;
+        case 2:
+                *val = in_le16(cfg_data);
+                break;
+        default:
+                *val = in_le32(cfg_data);
+                break;
+        }
+        return PCIBIOS_SUCCESSFUL;
+}
+static int
+indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
+                      int len, u32 val)
+{
+        struct pci_controller *hose = bus->sysdata;
+        volatile void __iomem *cfg_data;
+        u8 cfg_type = 0;
+        if (ppc_md.pci_exclude_device)
+                if (ppc_md.pci_exclude_device(bus->number, devfn))
+                        return PCIBIOS_DEVICE_NOT_FOUND;
+        if (hose->set_cfg_type)
+                if (bus->number != hose->first_busno)
+                        cfg_type = 1;
+        PCI_CFG_OUT(hose->cfg_addr,
+                 (0x80000000 | ((bus->number - hose->bus_offset) << 16)
+                  | (devfn << 8) | ((offset & 0xfc) | cfg_type)));
+        /*
+         * Note: the caller has already checked that offset is
+         * suitably aligned and that len is 1, 2 or 4.
+         */
+        cfg_data = hose->cfg_data + (offset & 3);
+        switch (len) {
+        case 1:
+                out_8(cfg_data, val);
+                break;
+        case 2:
+                out_le16(cfg_data, val);
+                break;
+        default:
+                out_le32(cfg_data, val);
+                break;
+        }
+        return PCIBIOS_SUCCESSFUL;
+}
+static struct pci_ops indirect_pci_ops =
+{
+        indirect_read_config,
+        indirect_write_config
+};
+void __init
+setup_indirect_pci_nomap(struct pci_controller* hose, void __iomem * cfg_addr,
+        void __iomem * cfg_data)
+{
+        hose->cfg_addr = cfg_addr;
+        hose->cfg_data = cfg_data;
+        hose->ops = &indirect_pci_ops;
+}
+void __init
+setup_indirect_pci(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data)
+{
+        unsigned long base = cfg_addr & PAGE_MASK;
+        void __iomem *mbase, *addr, *data;
+        mbase = ioremap(base, PAGE_SIZE);
+        addr = mbase + (cfg_addr & ~PAGE_MASK);
+        if ((cfg_data & PAGE_MASK) != base)
+                mbase = ioremap(cfg_data & PAGE_MASK, PAGE_SIZE);
+        data = mbase + (cfg_data & ~PAGE_MASK);
+        setup_indirect_pci_nomap(hose, addr, data);
+}
diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c
index 8485a68cd4..032f4b7f42 100644
--- a/arch/ppc/syslib/mv64x60.c
+++ b/arch/ppc/syslib/mv64x60.c
@@ -2415,7 +2415,6 @@ static struct bin_attribute mv64xxx_hs_reg_attr = { /* Hotswap register */
        .attr = {
                .name = "hs_reg",
                .mode = S_IRUGO | S_IWUSR,
-                .owner = THIS_MODULE,
        },
        .size  = VAL_LEN_MAX,
        .read  = mv64xxx_hs_reg_read,
diff --git a/arch/ppc/syslib/virtex_devices.c b/arch/ppc/syslib/virtex_devices.c
index 16546788e2..ace4ec08de 100644
--- a/arch/ppc/syslib/virtex_devices.c
+++ b/arch/ppc/syslib/virtex_devices.c
@@ -71,6 +71,21 @@
        }, \
 }
+/*
+ * ML300/ML403 Video Device: shortcut macro for single instance
+ */
+#define XPAR_TFT(num) { \
+        .name = "xilinxfb", \
+        .id = num, \
+        .num_resources = 1, \
+        .resource = (struct resource[]) { \
+                { \
+                        .start = XPAR_TFT_##num##_BASEADDR, \
+                        .end = XPAR_TFT_##num##_BASEADDR+7, \
+                        .flags = IORESOURCE_IO, \
+                }, \
+        }, \
+}
 /* UART 8250 driver platform data table */
 struct plat_serial8250_port virtex_serial_platform_data[] = {
@@ -146,20 +161,17 @@ struct platform_device virtex_platform_devices[] = {
        XPAR_SYSACE(1),
 #endif
-        /* ML300/403 reference design framebuffer */
 #if defined(XPAR_TFT_0_BASEADDR)
-        {
+        XPAR_TFT(0),
-                .name           = "xilinxfb",
+#endif
-                .id             = 0,
+#if defined(XPAR_TFT_1_BASEADDR)
-                .num_resources  = 1,
+        XPAR_TFT(1),
-                .resource = (struct resource[]) {
+#endif
-                        {
+#if defined(XPAR_TFT_2_BASEADDR)
-                                .start  = XPAR_TFT_0_BASEADDR,
+        XPAR_TFT(2),
-                                .end    = XPAR_TFT_0_BASEADDR+7,
+#endif
-                                .flags  = IORESOURCE_IO,
+#if defined(XPAR_TFT_3_BASEADDR)
-                        },
+        XPAR_TFT(3),
-                },
-        },
 #endif
 };
diff --git a/arch/ppc/syslib/virtex_devices.h b/arch/ppc/syslib/virtex_devices.h
index 3d4be1412f..9f38d92ae5 100644
--- a/arch/ppc/syslib/virtex_devices.h
+++ b/arch/ppc/syslib/virtex_devices.h
@@ -31,4 +31,11 @@ void __init virtex_early_serial_map(void);
 */
 int virtex_device_fixup(struct platform_device *dev);
+/* SPI Controller IP */
+struct xspi_platform_data {
+        s16 bus_num;
+        u16 num_chipselect;
+        u32 speed_hz;
+};
 #endif  /* __ASM_VIRTEX_DEVICES_H__ */
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 68441e0e74..143ed8e154 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -19,7 +19,7 @@ CFLAGS		+= -m31
 AFLAGS          += -m31
 UTS_MACHINE     := s390
 STACK_SIZE      := 8192
-CHECKFLAGS      += -D__s390__
+CHECKFLAGS      += -D__s390__ -msize-long
 else
 LDFLAGS         := -m elf64_s390
 MODFLAGS        += -fpic -D__PIC__
diff --git a/arch/s390/crypto/crypt_s390.h b/arch/s390/crypto/crypt_s390.h
index 2775d26183..95f5160df2 100644
--- a/arch/s390/crypto/crypt_s390.h
+++ b/arch/s390/crypto/crypt_s390.h
@@ -24,7 +24,7 @@
 #define CRYPT_S390_PRIORITY 300
 #define CRYPT_S390_COMPOSITE_PRIORITY 400
-/* s930 cryptographic operations */
+/* s390 cryptographic operations */
 enum crypt_s390_operations {
        CRYPT_S390_KM   = 0x0100,
        CRYPT_S390_KMC  = 0x0200,
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index 485b60c198..2aae23dba4 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21
+# Linux kernel version: 2.6.22
-# Thu May 10 15:18:19 2007
+# Tue Jul 17 12:50:23 2007
 #
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
@@ -32,12 +32,11 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 CONFIG_AUDIT=y
 # CONFIG_AUDITSYSCALL is not set
 CONFIG_IKCONFIG=y
@@ -61,20 +60,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -82,12 +80,9 @@ CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
+CONFIG_BLK_DEV_BSG=y
 #
 # IO Schedulers
@@ -151,6 +146,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_VIRT_TO_BUS=y
 CONFIG_HOLES_IN_ZONE=y
 #
@@ -248,25 +244,13 @@ CONFIG_IPV6_SIT=y
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -293,6 +277,7 @@ CONFIG_NET_SCH_CBQ=m
 # CONFIG_NET_SCH_HTB is not set
 # CONFIG_NET_SCH_HFSC is not set
 CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RR=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TEQL=m
@@ -317,10 +302,14 @@ CONFIG_CLS_U32_MARK=y
 CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 # CONFIG_NET_EMATCH is not set
-# CONFIG_NET_CLS_ACT is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+# CONFIG_NET_ACT_GACT is not set
+# CONFIG_NET_ACT_MIRRED is not set
+# CONFIG_NET_ACT_PEDIT is not set
+# CONFIG_NET_ACT_SIMP is not set
 CONFIG_NET_CLS_POLICE=y
 # CONFIG_NET_CLS_IND is not set
-CONFIG_NET_ESTIMATOR=y
 #
 # Network testing
@@ -329,6 +318,7 @@ CONFIG_NET_ESTIMATOR=y
 # CONFIG_NET_TCPPROBE is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 # CONFIG_PCMCIA is not set
 CONFIG_CCW=y
@@ -345,15 +335,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 CONFIG_SYS_HYPERVISOR=y
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
+CONFIG_BLK_DEV=y
-#
-# Block devices
-#
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -376,17 +359,15 @@ CONFIG_DASD_ECKD=y
 CONFIG_DASD_FBA=y
 CONFIG_DASD_DIAG=y
 CONFIG_DASD_EER=y
+CONFIG_MISC_DEVICES=y
-#
+# CONFIG_EEPROM_93CX6 is not set
-# Misc devices
-#
-# CONFIG_BLINK is not set
 #
 # SCSI device support
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_TGT is not set
 CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
@@ -447,40 +428,21 @@ CONFIG_DM_MIRROR=y
 CONFIG_DM_ZERO=y
 CONFIG_DM_MULTIPATH=y
 # CONFIG_DM_MULTIPATH_EMC is not set
+# CONFIG_DM_MULTIPATH_RDAC is not set
 # CONFIG_DM_DELAY is not set
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_IFB is not set
 CONFIG_DUMMY=m
 CONFIG_BONDING=m
+# CONFIG_MACVLAN is not set
 CONFIG_EQUALIZER=m
 CONFIG_TUN=m
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 # CONFIG_MII is not set
+CONFIG_NETDEV_1000=y
-#
+CONFIG_NETDEV_10000=y
-# Ethernet (1000 Mbit)
-#
-#
-# Ethernet (10000 Mbit)
-#
-CONFIG_MLX4_DEBUG=y
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 #
@@ -511,10 +473,6 @@ CONFIG_CCWGROUP=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=m
 # CONFIG_R3964 is not set
@@ -554,6 +512,8 @@ CONFIG_S390_TAPE_34XX=m
 # CONFIG_VMCP is not set
 # CONFIG_MONREADER is not set
 CONFIG_MONWRITER=m
+CONFIG_S390_VMUR=m
+# CONFIG_POWER_SUPPLY is not set
 #
 # File systems
@@ -655,7 +615,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 #
 # Partition Types
@@ -712,6 +671,7 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 CONFIG_HEADERS_CHECK=y
 CONFIG_DEBUG_KERNEL=y
+# CONFIG_SCHED_DEBUG is not set
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -740,10 +700,6 @@ CONFIG_FORCED_INLINING=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -782,10 +738,7 @@ CONFIG_CRYPTO_FCRYPT=m
 # CONFIG_CRYPTO_CRC32C is not set
 CONFIG_CRYPTO_CAMELLIA=m
 # CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_HW=y
-#
-# Hardware crypto devices
-#
 # CONFIG_CRYPTO_SHA1_S390 is not set
 # CONFIG_CRYPTO_SHA256_S390 is not set
 # CONFIG_CRYPTO_DES_S390 is not set
@@ -800,6 +753,7 @@ CONFIG_ZCRYPT=m
 CONFIG_BITREVERSE=m
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=m
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c
index a057ebf108..d3057318f2 100644
--- a/arch/s390/kernel/dis.c
+++ b/arch/s390/kernel/dis.c
@@ -240,8 +240,8 @@ static const unsigned char formats[][7] = {
        [INSTR_RXY_FRRD]  = { 0xff, F_8,D20_20,X_12,B_16,0,0 },/* e.g. ley   */
        [INSTR_RX_FRRD]   = { 0xff, F_8,D_20,X_12,B_16,0,0 },  /* e.g. ae    */
        [INSTR_RX_RRRD]   = { 0xff, R_8,D_20,X_12,B_16,0,0 },  /* e.g. l     */
-        [INSTR_RX_URRD]   = { 0x00, U4_8,D_20,X_12,B_16,0,0 }, /* e.g. bc    */
+        [INSTR_RX_URRD]   = { 0xff, U4_8,D_20,X_12,B_16,0,0 }, /* e.g. bc    */
-        [INSTR_SI_URD]    = { 0x00, D_20,B_16,U8_8,0,0,0 },    /* e.g. cli   */
+        [INSTR_SI_URD]    = { 0xff, D_20,B_16,U8_8,0,0,0 },    /* e.g. cli   */
        [INSTR_SIY_URD]   = { 0xff, D20_20,B_16,U8_8,0,0,0 },  /* e.g. tmy   */
        [INSTR_SSE_RDRD]  = { 0xff, D_20,B_16,D_36,B_32,0,0 }, /* e.g. mvsdk */
        [INSTR_SS_L0RDRD] = { 0xff, D_20,L8_8,B_16,D_36,B_32,0 },
@@ -1190,7 +1190,8 @@ static int print_insn(char *buffer, unsigned char *code, unsigned long addr)
                        else if (operand->flags & OPERAND_CR)
                                ptr += sprintf(ptr, "%%c%i", value);
                        else if (operand->flags & OPERAND_PCREL)
-                                ptr += sprintf(ptr, "%lx", value + addr);
+                                ptr += sprintf(ptr, "%lx", (signed int) value
+                                                                      + addr);
                        else if (operand->flags & OPERAND_SIGNED)
                                ptr += sprintf(ptr, "%i", value);
                        else
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index 50538e5456..e6289ee74e 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -171,37 +171,6 @@ static inline int memory_fast_detect(void)
 }
 #endif
-#define ADDR2G  (1UL << 31)
-static noinline __init unsigned long sclp_memory_detect(void)
-{
-        struct sclp_readinfo_sccb *sccb;
-        unsigned long long memsize;
-        sccb = &s390_readinfo_sccb;
-        if (sccb->header.response_code != 0x10)
-                return 0;
-        if (sccb->rnsize)
-                memsize = sccb->rnsize << 20;
-        else
-                memsize = sccb->rnsize2 << 20;
-        if (sccb->rnmax)
-                memsize *= sccb->rnmax;
-        else
-                memsize *= sccb->rnmax2;
-#ifndef CONFIG_64BIT
-        /*
-         * Can't deal with more than 2G in 31 bit addressing mode, so
-         * limit the value in order to avoid strange side effects.
-         */
-        if (memsize > ADDR2G)
-                memsize = ADDR2G;
-#endif
-        return (unsigned long) memsize;
-}
 static inline __init unsigned long __tprot(unsigned long addr)
 {
        int cc = -1;
@@ -218,6 +187,7 @@ static inline __init unsigned long __tprot(unsigned long addr)
 /* Checking memory in 128KB increments. */
 #define CHUNK_INCR      (1UL << 17)
+#define ADDR2G          (1UL << 31)
 static noinline __init void find_memory_chunks(unsigned long memsize)
 {
@@ -293,7 +263,7 @@ static noinline __init void setup_lowcore_early(void)
 */
 void __init startup_init(void)
 {
-        unsigned long memsize;
+        unsigned long long memsize;
        ipl_save_parameters();
        clear_bss_section();
@@ -305,8 +275,17 @@ void __init startup_init(void)
        sort_main_extable();
        setup_lowcore_early();
        sclp_readinfo_early();
+        sclp_facilities_detect();
        memsize = sclp_memory_detect();
+#ifndef CONFIG_64BIT
+        /*
+         * Can't deal with more than 2G in 31 bit addressing mode, so
+         * limit the value in order to avoid strange side effects.
+         */
+        if (memsize > ADDR2G)
+                memsize = ADDR2G;
+#endif
        if (memory_fast_detect() < 0)
-                find_memory_chunks(memsize);
+                find_memory_chunks((unsigned long) memsize);
        lockdep_on();
 }
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index 6234c6978a..bc7ff3658c 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -107,6 +107,11 @@ STACK_SIZE  = 1 << STACK_SHIFT
        l       %r13,__LC_SVC_NEW_PSW+4 # load &system_call to %r13
        .endm
+        .macro  SAVE_ALL_SVC psworg,savearea
+        la      %r12,\psworg
+        l       %r15,__LC_KERNEL_STACK  # problem state -> load ksp
+        .endm
        .macro  SAVE_ALL_SYNC psworg,savearea
        la      %r12,\psworg
        tm      \psworg+1,0x01          # test problem state bit
@@ -218,7 +223,7 @@ system_call:
        STORE_TIMER __LC_SYNC_ENTER_TIMER
 sysc_saveall:
        SAVE_ALL_BASE __LC_SAVE_AREA
-        SAVE_ALL_SYNC __LC_SVC_OLD_PSW,__LC_SAVE_AREA
+        SAVE_ALL_SVC __LC_SVC_OLD_PSW,__LC_SAVE_AREA
        CREATE_STACK_FRAME __LC_SVC_OLD_PSW,__LC_SAVE_AREA
        lh      %r7,0x8a          # get svc number from lowcore
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 685f11faa4..2a7b130441 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -99,6 +99,11 @@ _TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NEED_RESCHED | \
        larl    %r13,system_call
        .endm
+        .macro  SAVE_ALL_SVC psworg,savearea
+        la      %r12,\psworg
+        lg      %r15,__LC_KERNEL_STACK  # problem state -> load ksp
+        .endm
        .macro  SAVE_ALL_SYNC psworg,savearea
        la      %r12,\psworg
        tm      \psworg+1,0x01          # test problem state bit
@@ -207,7 +212,7 @@ system_call:
        STORE_TIMER __LC_SYNC_ENTER_TIMER
 sysc_saveall:
        SAVE_ALL_BASE __LC_SAVE_AREA
-        SAVE_ALL_SYNC __LC_SVC_OLD_PSW,__LC_SAVE_AREA
+        SAVE_ALL_SVC __LC_SVC_OLD_PSW,__LC_SAVE_AREA
        CREATE_STACK_FRAME __LC_SVC_OLD_PSW,__LC_SAVE_AREA
        llgh    %r7,__LC_SVC_INT_CODE   # get svc number from lowcore
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 367caf92ea..8b8f136d9c 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -25,10 +25,6 @@
 #define IPL_PARM_BLOCK_VERSION 0
-#define SCCB_VALID (s390_readinfo_sccb.header.response_code == 0x10)
-#define SCCB_LOADPARM (&s390_readinfo_sccb.loadparm)
-#define SCCB_FLAG (s390_readinfo_sccb.flags)
 #define IPL_UNKNOWN_STR         "unknown"
 #define IPL_CCW_STR             "ccw"
 #define IPL_FCP_STR             "fcp"
@@ -146,6 +142,8 @@ static struct ipl_parameter_block *dump_block_ccw;
 static enum shutdown_action on_panic_action = SHUTDOWN_STOP;
+static struct sclp_ipl_info sclp_ipl_info;
 int diag308(unsigned long subcode, void *addr)
 {
        register unsigned long _addr asm("0") = (unsigned long) addr;
@@ -297,8 +295,8 @@ static ssize_t sys_ipl_device_show(struct kset *kset, char *page)
 static struct subsys_attribute sys_ipl_device_attr =
        __ATTR(device, S_IRUGO, sys_ipl_device_show, NULL);
-static ssize_t ipl_parameter_read(struct kobject *kobj, char *buf, loff_t off,
+static ssize_t ipl_parameter_read(struct kobject *kobj, struct bin_attribute *attr,
-                                  size_t count)
+                                  char *buf, loff_t off, size_t count)
 {
        unsigned int size = IPL_PARMBLOCK_SIZE;
@@ -314,14 +312,13 @@ static struct bin_attribute ipl_parameter_attr = {
        .attr = {
                .name = "binary_parameter",
                .mode = S_IRUGO,
-                .owner = THIS_MODULE,
        },
        .size = PAGE_SIZE,
        .read = &ipl_parameter_read,
 };
-static ssize_t ipl_scp_data_read(struct kobject *kobj, char *buf, loff_t off,
+static ssize_t ipl_scp_data_read(struct kobject *kobj, struct bin_attribute *attr,
-        size_t count)
+                                 char *buf, loff_t off, size_t count)
 {
        unsigned int size = IPL_PARMBLOCK_START->ipl_info.fcp.scp_data_len;
        void *scp_data = &IPL_PARMBLOCK_START->ipl_info.fcp.scp_data;
@@ -338,10 +335,9 @@ static struct bin_attribute ipl_scp_data_attr = {
        .attr = {
                .name = "scp_data",
                .mode = S_IRUGO,
-                .owner = THIS_MODULE,
        },
        .size = PAGE_SIZE,
-        .read = &ipl_scp_data_read,
+        .read = ipl_scp_data_read,
 };
 /* FCP ipl device attributes */
@@ -375,9 +371,9 @@ static ssize_t ipl_ccw_loadparm_show(struct kset *kset, char *page)
 {
        char loadparm[LOADPARM_LEN + 1] = {};
-        if (!SCCB_VALID)
+        if (!sclp_ipl_info.is_valid)
                return sprintf(page, "#unknown#\n");
-        memcpy(loadparm, SCCB_LOADPARM, LOADPARM_LEN);
+        memcpy(loadparm, &sclp_ipl_info.loadparm, LOADPARM_LEN);
        EBCASC(loadparm, LOADPARM_LEN);
        strstrip(loadparm);
        return sprintf(page, "%s\n", loadparm);
@@ -910,9 +906,9 @@ static int __init reipl_ccw_init(void)
        reipl_block_ccw->hdr.blk0_len = IPL_PARM_BLK0_CCW_LEN;
        reipl_block_ccw->hdr.pbt = DIAG308_IPL_TYPE_CCW;
        /* check if read scp info worked and set loadparm */
-        if (SCCB_VALID)
+        if (sclp_ipl_info.is_valid)
                memcpy(reipl_block_ccw->ipl_info.ccw.load_param,
-                       SCCB_LOADPARM, LOADPARM_LEN);
+                       &sclp_ipl_info.loadparm, LOADPARM_LEN);
        else
                /* read scp info failed: set empty loadparm (EBCDIC blanks) */
                memset(reipl_block_ccw->ipl_info.ccw.load_param, 0x40,
@@ -1007,7 +1003,7 @@ static int __init dump_fcp_init(void)
 {
        int rc;
-        if(!(SCCB_FLAG & 0x2) || !SCCB_VALID)
+        if (!sclp_ipl_info.has_dump)
                return 0; /* LDIPL DUMP is not installed */
        if (!diag308_set_works)
                return 0;
@@ -1088,6 +1084,7 @@ static int __init s390_ipl_init(void)
 {
        int rc;
+        sclp_get_ipl_info(&sclp_ipl_info);
        reipl_probe();
        rc = ipl_init();
        if (rc)
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index eb43c3b312..441975b796 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -93,8 +93,8 @@ void do_monitor_call(struct pt_regs *regs, long interruption_code)
        /* disable monitor call class 0 */
        __ctl_clear_bit(8, 15);
-        atomic_notifier_call_chain(&idle_chain, CPU_NOT_IDLE,
+        atomic_notifier_call_chain(&idle_chain, S390_CPU_NOT_IDLE,
-                            (void *)(long) smp_processor_id());
+                                   (void *)(long) smp_processor_id());
 }
 extern void s390_handle_mcck(void);
@@ -115,7 +115,7 @@ static void default_idle(void)
        }
        rc = atomic_notifier_call_chain(&idle_chain,
-                        CPU_IDLE, (void *)(long) cpu);
+                                        S390_CPU_IDLE, (void *)(long) cpu);
        if (rc != NOTIFY_OK && rc != NOTIFY_DONE)
                BUG();
        if (rc != NOTIFY_OK) {
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 2a8f0872ea..f4503ca276 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -294,7 +294,6 @@ poke_user(struct task_struct *child, addr_t addr, addr_t data)
 static int
 do_ptrace_normal(struct task_struct *child, long request, long addr, long data)
 {
-        unsigned long tmp;
        ptrace_area parea; 
        int copied, ret;
@@ -304,10 +303,7 @@ do_ptrace_normal(struct task_struct *child, long request, long addr, long data)
                /* Remove high order bit from address (only for 31 bit). */
                addr &= PSW_ADDR_INSN;
                /* read word at location addr. */
-                copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
+                return generic_ptrace_peekdata(child, addr, data);
-                if (copied != sizeof(tmp))
-                        return -EIO;
-                return put_user(tmp, (unsigned long __force __user *) data);
        case PTRACE_PEEKUSR:
                /* read the word at location addr in the USER area. */
@@ -318,10 +314,7 @@ do_ptrace_normal(struct task_struct *child, long request, long addr, long data)
                /* Remove high order bit from address (only for 31 bit). */
                addr &= PSW_ADDR_INSN;
                /* write the word at location addr. */
-                copied = access_process_vm(child, addr, &data, sizeof(data),1);
+                return generic_ptrace_pokedata(child, addr, data);
-                if (copied != sizeof(data))
-                        return -EIO;
-                return 0;
        case PTRACE_POKEUSR:
                /* write the word at location addr in the USER area */
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 8ff2feaf9b..182c085ae4 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -410,58 +410,40 @@ EXPORT_SYMBOL(smp_ctl_clear_bit);
 unsigned int zfcpdump_prefix_array[NR_CPUS + 1] \
        __attribute__((__section__(".data")));
-static void __init smp_get_save_areas(void)
+static void __init smp_get_save_area(unsigned int cpu, unsigned int phy_cpu)
 {
-        unsigned int cpu, cpu_num, rc;
-        __u16 boot_cpu_addr;
        if (ipl_info.type != IPL_TYPE_FCP_DUMP)
                return;
-        boot_cpu_addr = S390_lowcore.cpu_data.cpu_addr;
+        if (cpu >= NR_CPUS) {
-        cpu_num = 1;
+                printk(KERN_WARNING "Registers for cpu %i not saved since dump "
-        for (cpu = 0; cpu <= 65535; cpu++) {
+                       "kernel was compiled with NR_CPUS=%i\n", cpu, NR_CPUS);
-                if ((u16) cpu == boot_cpu_addr)
+                return;
-                        continue;
-                __cpu_logical_map[1] = (__u16) cpu;
-                if (signal_processor(1, sigp_sense) == sigp_not_operational)
-                        continue;
-                if (cpu_num >= NR_CPUS) {
-                        printk("WARNING: Registers for cpu %i are not "
-                               "saved, since dump kernel was compiled with"
-                               "NR_CPUS=%i!\n", cpu_num, NR_CPUS);
-                        continue;
-                }
-                zfcpdump_save_areas[cpu_num] =
-                        alloc_bootmem(sizeof(union save_area));
-                while (1) {
-                        rc = signal_processor(1, sigp_stop_and_store_status);
-                        if (rc != sigp_busy)
-                                break;
-                        cpu_relax();
-                }
-                memcpy(zfcpdump_save_areas[cpu_num],
-                       (void *)(unsigned long) store_prefix() +
-                       SAVE_AREA_BASE, SAVE_AREA_SIZE);
-#ifdef __s390x__
-                /* copy original prefix register */
-                zfcpdump_save_areas[cpu_num]->s390x.pref_reg =
-                        zfcpdump_prefix_array[cpu_num];
-#endif
-                cpu_num++;
        }
+        zfcpdump_save_areas[cpu] = alloc_bootmem(sizeof(union save_area));
+        __cpu_logical_map[1] = (__u16) phy_cpu;
+        while (signal_processor(1, sigp_stop_and_store_status) == sigp_busy)
+                cpu_relax();
+        memcpy(zfcpdump_save_areas[cpu],
+               (void *)(unsigned long) store_prefix() + SAVE_AREA_BASE,
+               SAVE_AREA_SIZE);
+#ifdef CONFIG_64BIT
+        /* copy original prefix register */
+        zfcpdump_save_areas[cpu]->s390x.pref_reg = zfcpdump_prefix_array[cpu];
+#endif
 }
 union save_area *zfcpdump_save_areas[NR_CPUS + 1];
 EXPORT_SYMBOL_GPL(zfcpdump_save_areas);
 #else
-#define smp_get_save_areas() do { } while (0)
-#endif
+static inline void smp_get_save_area(unsigned int cpu, unsigned int phy_cpu) { }
+#endif /* CONFIG_ZFCPDUMP || CONFIG_ZFCPDUMP_MODULE */
 /*
 * Lets check how many CPUs we have.
 */
 static unsigned int __init smp_count_cpus(void)
 {
        unsigned int cpu, num_cpus;
@@ -470,7 +452,6 @@ static unsigned int __init smp_count_cpus(void)
        /*
         * cpu 0 is the boot cpu. See smp_prepare_boot_cpu.
         */
        boot_cpu_addr = S390_lowcore.cpu_data.cpu_addr;
        current_thread_info()->cpu = 0;
        num_cpus = 1;
@@ -480,12 +461,11 @@ static unsigned int __init smp_count_cpus(void)
                __cpu_logical_map[1] = (__u16) cpu;
                if (signal_processor(1, sigp_sense) == sigp_not_operational)
                        continue;
+                smp_get_save_area(num_cpus, cpu);
                num_cpus++;
        }
        printk("Detected %d CPU's\n", (int) num_cpus);
        printk("Boot cpu address %2X\n", boot_cpu_addr);
        return num_cpus;
 }
@@ -606,7 +586,6 @@ void __init smp_setup_cpu_possible_map(void)
 {
        unsigned int phy_cpus, pos_cpus, cpu;
-        smp_get_save_areas();
        phy_cpus = smp_count_cpus();
        pos_cpus = min(phy_cpus + additional_cpus, (unsigned int) NR_CPUS);
diff --git a/arch/s390/kernel/stacktrace.c b/arch/s390/kernel/stacktrace.c
index 515ff9011d..da69247299 100644
--- a/arch/s390/kernel/stacktrace.c
+++ b/arch/s390/kernel/stacktrace.c
@@ -12,7 +12,6 @@
 #include <linux/kallsyms.h>
 static unsigned long save_context_stack(struct stack_trace *trace,
-                                        unsigned int *skip,
                                        unsigned long sp,
                                        unsigned long low,
                                        unsigned long high)
@@ -28,10 +27,10 @@ static unsigned long save_context_stack(struct stack_trace *trace,
                sf = (struct stack_frame *)sp;
                while(1) {
                        addr = sf->gprs[8] & PSW_ADDR_INSN;
-                        if (!(*skip))
+                        if (!trace->skip)
                                trace->entries[trace->nr_entries++] = addr;
                        else
-                                (*skip)--;
+                                trace->skip--;
                        if (trace->nr_entries >= trace->max_entries)
                                return sp;
                        low = sp;
@@ -48,10 +47,10 @@ static unsigned long save_context_stack(struct stack_trace *trace,
                        return sp;
                regs = (struct pt_regs *)sp;
                addr = regs->psw.addr & PSW_ADDR_INSN;
-                if (!(*skip))
+                if (!trace->skip)
                        trace->entries[trace->nr_entries++] = addr;
                else
-                        (*skip)--;
+                        trace->skip--;
                if (trace->nr_entries >= trace->max_entries)
                        return sp;
                low = sp;
@@ -65,20 +64,17 @@ void save_stack_trace(struct stack_trace *trace)
        unsigned long orig_sp, new_sp;
        orig_sp = sp & PSW_ADDR_INSN;
+        new_sp = save_context_stack(trace, orig_sp,
-        new_sp = save_context_stack(trace, &trace->skip, orig_sp,
+                                    S390_lowcore.panic_stack - PAGE_SIZE,
-                                S390_lowcore.panic_stack - PAGE_SIZE,
+                                    S390_lowcore.panic_stack);
-                                S390_lowcore.panic_stack);
        if (new_sp != orig_sp)
                return;
-        new_sp = save_context_stack(trace, &trace->skip, new_sp,
+        new_sp = save_context_stack(trace, new_sp,
-                                S390_lowcore.async_stack - ASYNC_SIZE,
+                                    S390_lowcore.async_stack - ASYNC_SIZE,
-                                S390_lowcore.async_stack);
+                                    S390_lowcore.async_stack);
        if (new_sp != orig_sp)
                return;
+        save_context_stack(trace, new_sp,
-        save_context_stack(trace, &trace->skip, new_sp,
                           S390_lowcore.thread_info,
                           S390_lowcore.thread_info + THREAD_SIZE);
-        return;
 }
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 9c2872a7cc..48dae49bc1 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -226,10 +226,10 @@ static int nohz_idle_notify(struct notifier_block *self,
                            unsigned long action, void *hcpu)
 {
        switch (action) {
-        case CPU_IDLE:
+        case S390_CPU_IDLE:
                stop_hz_timer();
                break;
-        case CPU_NOT_IDLE:
+        case S390_CPU_NOT_IDLE:
                start_hz_timer();
                break;
        }
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index ee9186f8fb..8ec9def83c 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -262,6 +262,7 @@ void die(const char * str, struct pt_regs * regs, long err)
        print_modules();
        show_regs(regs);
        bust_spinlocks(0);
+        add_taint(TAINT_DIE);
        spin_unlock_irq(&die_lock);
        if (in_interrupt())
                panic("Fatal exception in interrupt");
@@ -319,7 +320,7 @@ static void __kprobes inline do_trap(long interruption_code, int signr,
                else {
                        enum bug_trap_type btt;
-                        btt = report_bug(regs->psw.addr & PSW_ADDR_INSN);
+                        btt = report_bug(regs->psw.addr & PSW_ADDR_INSN, regs);
                        if (btt == BUG_TRAP_TYPE_WARN)
                                return;
                        die(str, regs, interruption_code);
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 1e1a6ee2ca..b6ed143e85 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -545,10 +545,10 @@ static int vtimer_idle_notify(struct notifier_block *self,
                              unsigned long action, void *hcpu)
 {
        switch (action) {
-        case CPU_IDLE:
+        case S390_CPU_IDLE:
                stop_cpu_timer();
                break;
-        case CPU_NOT_IDLE:
+        case S390_CPU_NOT_IDLE:
                start_cpu_timer();
                break;
        }
diff --git a/arch/s390/lib/Makefile b/arch/s390/lib/Makefile
index 59aea65ce9..52084436ab 100644
--- a/arch/s390/lib/Makefile
+++ b/arch/s390/lib/Makefile
@@ -4,7 +4,7 @@
 EXTRA_AFLAGS := -traditional
-lib-y += delay.o string.o uaccess_std.o uaccess_pt.o qrnnd.o
+lib-y += delay.o string.o uaccess_std.o uaccess_pt.o
-obj-$(CONFIG_32BIT) += div64.o
+obj-$(CONFIG_32BIT) += div64.o qrnnd.o
 lib-$(CONFIG_64BIT) += uaccess_mvcos.o
 lib-$(CONFIG_SMP) += spinlock.o
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 038179ecf6..d8ed6676ae 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -55,8 +55,21 @@ config GENERIC_TIME
 config GENERIC_CLOCKEVENTS
        def_bool n
+config SYS_SUPPORTS_PM
+        bool
 config SYS_SUPPORTS_APM_EMULATION
        bool
+        select SYS_SUPPORTS_PM
+config SYS_SUPPORTS_SMP
+        bool
+config SYS_SUPPORTS_NUMA
+        bool
+config SYS_SUPPORTS_PCI
+        bool
 config ARCH_MAY_HAVE_PC_FDC
        bool
@@ -81,24 +94,146 @@ source "init/Kconfig"
 menu "System type"
-config SOLUTION_ENGINE
+source "arch/sh/mm/Kconfig"
-        bool
+menu "Processor features"
 choice
-        prompt "SuperH system type"
+        prompt "Endianess selection" 
-        default SH_UNKNOWN
+        default CPU_LITTLE_ENDIAN
+        help
+          Some SuperH machines can be configured for either little or big
+          endian byte order. These modes require different kernels.
+config CPU_LITTLE_ENDIAN
+        bool "Little Endian"
+config CPU_BIG_ENDIAN
+        bool "Big Endian"
+endchoice
+config SH_FPU
+        bool "FPU support"
+        depends on CPU_SH4
+        default y
+        help
+          Selecting this option will enable support for SH processors that
+          have FPU units (ie, SH77xx).
+          This option must be set in order to enable the FPU.
+config SH_FPU_EMU
+        bool "FPU emulation support"
+        depends on !SH_FPU && EXPERIMENTAL
+        default n
+        help
+          Selecting this option will enable support for software FPU emulation.
+          Most SH-3 users will want to say Y here, whereas most SH-4 users will
+          want to say N.
+config SH_DSP
+        bool "DSP support"
+        default y if SH4AL_DSP || !CPU_SH4
+        default n
+        help
+          Selecting this option will enable support for SH processors that
+          have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP).
+          This option must be set in order to enable the DSP.
+config SH_ADC
+        bool "ADC support"
+        depends on CPU_SH3
+        default y
+        help
+          Selecting this option will allow the Linux kernel to use SH3 on-chip
+          ADC module.
+          If unsure, say N.
+config SH_STORE_QUEUES
+        bool "Support for Store Queues"
+        depends on CPU_SH4
+        help
+          Selecting this option will enable an in-kernel API for manipulating
+          the store queues integrated in the SH-4 processors.
+config SPECULATIVE_EXECUTION
+        bool "Speculative subroutine return"
+        depends on CPU_SUBTYPE_SH7780 && EXPERIMENTAL
+        help
+          This enables support for a speculative instruction fetch for
+          subroutine return. There are various pitfalls associated with
+          this, as outlined in the SH7780 hardware manual.
+          If unsure, say N.
+config CPU_HAS_INTEVT
+        bool
+config CPU_HAS_PINT_IRQ
+        bool
+config CPU_HAS_MASKREG_IRQ
+        bool
+config CPU_HAS_INTC2_IRQ
+        bool
+config CPU_HAS_IPR_IRQ
+        bool
+config CPU_HAS_SR_RB
+        bool "CPU has SR.RB"
+        depends on CPU_SH3 || CPU_SH4
+        default y
+        help
+          This will enable the use of SR.RB register bank usage. Processors
+          that are lacking this bit must have another method in place for
+          accomplishing what is taken care of by the banked registers.
+          See <file:Documentation/sh/register-banks.txt> for further
+          information on SR.RB and register banking in the kernel in general.
+config CPU_HAS_PTEA
+        bool
+endmenu
+menu "Board support"
+config SOLUTION_ENGINE
+        bool
 config SH_SOLUTION_ENGINE
        bool "SolutionEngine"
        select SOLUTION_ENGINE
+        depends on CPU_SUBTYPE_SH7709 || CPU_SUBTYPE_SH7750
        help
          Select SolutionEngine if configuring for a Hitachi SH7709
          or SH7750 evaluation board.
+config SH_7206_SOLUTION_ENGINE
+        bool "SolutionEngine7206"
+        select SOLUTION_ENGINE
+        depends on CPU_SUBTYPE_SH7206
+        help
+          Select 7206 SolutionEngine if configuring for a Hitachi SH7206
+          evaluation board.
+config SH_7619_SOLUTION_ENGINE
+        bool "SolutionEngine7619"
+        select SOLUTION_ENGINE
+        depends on CPU_SUBTYPE_SH7619
+        help
+          Select 7619 SolutionEngine if configuring for a Hitachi SH7619
+          evaluation board.
+        
 config SH_7722_SOLUTION_ENGINE
        bool "SolutionEngine7722"
        select SOLUTION_ENGINE
-        select CPU_SUBTYPE_SH7722
+        depends on CPU_SUBTYPE_SH7722
        help
          Select 7722 SolutionEngine if configuring for a Hitachi SH772
          evaluation board.
@@ -106,7 +241,7 @@ config SH_7722_SOLUTION_ENGINE
 config SH_7751_SOLUTION_ENGINE
        bool "SolutionEngine7751"
        select SOLUTION_ENGINE
-        select CPU_SUBTYPE_SH7751
+        depends on CPU_SUBTYPE_SH7751
        help
          Select 7751 SolutionEngine if configuring for a Hitachi SH7751
          evaluation board.
@@ -114,7 +249,8 @@ config SH_7751_SOLUTION_ENGINE
 config SH_7780_SOLUTION_ENGINE
        bool "SolutionEngine7780"
        select SOLUTION_ENGINE
-        select CPU_SUBTYPE_SH7780
+        select SYS_SUPPORTS_PCI
+        depends on CPU_SUBTYPE_SH7780
        help
          Select 7780 SolutionEngine if configuring for a Renesas SH7780
          evaluation board.
@@ -122,7 +258,7 @@ config SH_7780_SOLUTION_ENGINE
 config SH_7300_SOLUTION_ENGINE
        bool "SolutionEngine7300"
        select SOLUTION_ENGINE
-        select CPU_SUBTYPE_SH7300
+        depends on CPU_SUBTYPE_SH7300
        help
          Select 7300 SolutionEngine if configuring for a Hitachi
          SH7300(SH-Mobile V) evaluation board.
@@ -130,22 +266,22 @@ config SH_7300_SOLUTION_ENGINE
 config SH_7343_SOLUTION_ENGINE
        bool "SolutionEngine7343"
        select SOLUTION_ENGINE
-        select CPU_SUBTYPE_SH7343
+        depends on CPU_SUBTYPE_SH7343
        help
          Select 7343 SolutionEngine if configuring for a Hitachi
          SH7343 (SH-Mobile 3AS) evaluation board.
 config SH_73180_SOLUTION_ENGINE
-       bool "SolutionEngine73180"
+        bool "SolutionEngine73180"
        select SOLUTION_ENGINE
-        select CPU_SUBTYPE_SH73180
+        depends on CPU_SUBTYPE_SH73180
        help
          Select 73180 SolutionEngine if configuring for a Hitachi
          SH73180(SH-Mobile 3) evaluation board.
 config SH_7751_SYSTEMH
        bool "SystemH7751R"
-        select CPU_SUBTYPE_SH7751R
+        depends on CPU_SUBTYPE_SH7751R
        help
          Select SystemH if you are configuring for a Renesas SystemH
          7751R evaluation board.
@@ -153,20 +289,17 @@ config SH_7751_SYSTEMH
 config SH_HP6XX
        bool "HP6XX"
        select SYS_SUPPORTS_APM_EMULATION
+        select HD6446X_SERIES
+        depends on CPU_SUBTYPE_SH7709
        help
          Select HP6XX if configuring for a HP jornada HP6xx.
          More information (hardware only) at
          <http://www.hp.com/jornada/>.
-config SH_SATURN
-        bool "Saturn"
-        select CPU_SUBTYPE_SH7604
-        help
-          Select Saturn if configuring for a SEGA Saturn.
 config SH_DREAMCAST
        bool "Dreamcast"
-        select CPU_SUBTYPE_SH7091
+        select SYS_SUPPORTS_PCI
+        depends on CPU_SUBTYPE_SH7091
        help
          Select Dreamcast if configuring for a SEGA Dreamcast.
          More information at
@@ -175,6 +308,7 @@ config SH_DREAMCAST
 config SH_MPC1211
        bool "Interface MPC1211"
+        depends on CPU_SUBTYPE_SH7751 && BROKEN
        help
          CTP/PCI-SH02 is a CPU module computer that is produced
          by Interface Corporation.
@@ -182,6 +316,8 @@ config SH_MPC1211
 config SH_SH03
        bool "Interface CTP/PCI-SH03"
+        depends on CPU_SUBTYPE_SH7751 && BROKEN
+        select SYS_SUPPORTS_PCI
        help
          CTP/PCI-SH03 is a CPU module computer that is produced
          by Interface Corporation.
@@ -189,7 +325,8 @@ config SH_SH03
 config SH_SECUREEDGE5410
        bool "SecureEdge5410"
-        select CPU_SUBTYPE_SH7751R
+        depends on CPU_SUBTYPE_SH7751R
+        select SYS_SUPPORTS_PCI
        help
          Select SecureEdge5410 if configuring for a SnapGear SH board.
          This includes both the OEM SecureEdge products as well as the
@@ -197,246 +334,76 @@ config SH_SECUREEDGE5410
 config SH_HS7751RVOIP
        bool "HS7751RVOIP"
-        select CPU_SUBTYPE_SH7751R
+        depends on CPU_SUBTYPE_SH7751R
        help
          Select HS7751RVOIP if configuring for a Renesas Technology
          Sales VoIP board.
 config SH_7710VOIPGW
        bool "SH7710-VOIP-GW"
-        select CPU_SUBTYPE_SH7710
+        depends on CPU_SUBTYPE_SH7710
        help
          Select this option to build a kernel for the SH7710 based
          VOIP GW.
 config SH_RTS7751R2D
        bool "RTS7751R2D"
-        select CPU_SUBTYPE_SH7751R
+        depends on CPU_SUBTYPE_SH7751R
+        select SYS_SUPPORTS_PCI
        help
          Select RTS7751R2D if configuring for a Renesas Technology
          Sales SH-Graphics board.
 config SH_HIGHLANDER
        bool "Highlander"
+        depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785
+        select SYS_SUPPORTS_PCI
 config SH_EDOSK7705
        bool "EDOSK7705"
-        select CPU_SUBTYPE_SH7705
+        depends on CPU_SUBTYPE_SH7705
 config SH_SH4202_MICRODEV
        bool "SH4-202 MicroDev"
-        select CPU_SUBTYPE_SH4_202
+        depends on CPU_SUBTYPE_SH4_202
        help
          Select SH4-202 MicroDev if configuring for a SuperH MicroDev board
          with an SH4-202 CPU.
 config SH_LANDISK
        bool "LANDISK"
-        select CPU_SUBTYPE_SH7751R
+        depends on CPU_SUBTYPE_SH7751R
+        select SYS_SUPPORTS_PCI
        help
          I-O DATA DEVICE, INC. "LANDISK Series" support.
 config SH_TITAN
        bool "TITAN"
-        select CPU_SUBTYPE_SH7751R
+        depends on CPU_SUBTYPE_SH7751R
+        select SYS_SUPPORTS_PCI
        help
          Select Titan if you are configuring for a Nimble Microsystems
          NetEngine NP51R.
 config SH_SHMIN
        bool "SHMIN"
-        select CPU_SUBTYPE_SH7706
+        depends on CPU_SUBTYPE_SH7706
        help
          Select SHMIN if configuring for the SHMIN board.
-config SH_7206_SOLUTION_ENGINE
-        bool "SolutionEngine7206"
-        select CPU_SUBTYPE_SH7206
-        help
-          Select 7206 SolutionEngine if configuring for a Hitachi SH7206
-          evaluation board.
-config SH_7619_SOLUTION_ENGINE
-        bool "SolutionEngine7619"
-        select CPU_SUBTYPE_SH7619
-        help
-          Select 7619 SolutionEngine if configuring for a Hitachi SH7619
-          evaluation board.
-        
 config SH_LBOX_RE2
        bool "L-BOX RE2"
-        select CPU_SUBTYPE_SH7751R
+        depends on CPU_SUBTYPE_SH7751R
+        select SYS_SUPPORTS_PCI
        help
          Select L-BOX RE2 if configuring for the NTT COMWARE L-BOX RE2.
-config SH_UNKNOWN
+endmenu
-        bool "BareCPU"
-        help
-          "Bare CPU" aka "unknown" means an SH-based system which is not one
-          of the specific ones mentioned above, which means you need to enter
-          all sorts of stuff like CONFIG_MEMORY_START because the config
-          system doesn't already know what it is.  You get a machine vector
-          without any platform-specific code in it, so things like the RTC may
-          not work.
-          This option is for the early stages of porting to a new machine.
-endchoice
 source "arch/sh/boards/renesas/hs7751rvoip/Kconfig"
 source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
 source "arch/sh/boards/renesas/r7780rp/Kconfig"
-source "arch/sh/mm/Kconfig"
-config CF_ENABLER
-        bool "Compact Flash Enabler support"
-        depends on SH_SOLUTION_ENGINE || SH_UNKNOWN || SH_SH03
-        ---help---
-          Compact Flash is a small, removable mass storage device introduced
-          in 1994 originally as a PCMCIA device.  If you say `Y' here, you
-          compile in support for Compact Flash devices directly connected to
-          a SuperH processor.  A Compact Flash FAQ is available at
-          <http://www.compactflash.org/faqs/faq.htm>.
-          If your board has "Directly Connected" CompactFlash at area 5 or 6,
-          you may want to enable this option.  Then, you can use CF as
-          primary IDE drive (only tested for SanDisk).
-          If in doubt, select 'N'.
-choice
-        prompt "Compact Flash Connection Area"
-        depends on CF_ENABLER
-        default CF_AREA6
-config CF_AREA5
-        bool "Area5"
-        help
-          If your board has "Directly Connected" CompactFlash, You should
-          select the area where your CF is connected to.
-          - "Area5" if CompactFlash is connected to Area 5 (0x14000000)
-          - "Area6" if it is connected to Area 6 (0x18000000)
-          "Area6" will work for most boards.
-config CF_AREA6
-        bool "Area6"
-endchoice
-config CF_BASE_ADDR
-        hex
-        depends on CF_ENABLER
-        default "0xb8000000" if CF_AREA6
-        default "0xb4000000" if CF_AREA5
-menu "Processor features"
-choice
-        prompt "Endianess selection" 
-        default CPU_LITTLE_ENDIAN
-        help
-          Some SuperH machines can be configured for either little or big
-          endian byte order. These modes require different kernels.
-config CPU_LITTLE_ENDIAN
-        bool "Little Endian"
-config CPU_BIG_ENDIAN
-        bool "Big Endian"
-endchoice
-config SH_FPU
-        bool "FPU support"
-        depends on !CPU_SH3
-        default y
-        help
-          Selecting this option will enable support for SH processors that
-          have FPU units (ie, SH77xx).
-          This option must be set in order to enable the FPU.
-config SH_FPU_EMU
-        bool "FPU emulation support"
-        depends on !SH_FPU && EXPERIMENTAL
-        default n
-        help
-          Selecting this option will enable support for software FPU emulation.
-          Most SH-3 users will want to say Y here, whereas most SH-4 users will
-          want to say N.
-config SH_DSP
-        bool "DSP support"
-        default y if SH4AL_DSP || !CPU_SH4
-        default n
-        help
-          Selecting this option will enable support for SH processors that
-          have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP).
-          This option must be set in order to enable the DSP.
-config SH_ADC
-        bool "ADC support"
-        depends on CPU_SH3
-        default y
-        help
-          Selecting this option will allow the Linux kernel to use SH3 on-chip
-          ADC module.
-          If unsure, say N.
-config SH_STORE_QUEUES
-        bool "Support for Store Queues"
-        depends on CPU_SH4
-        help
-          Selecting this option will enable an in-kernel API for manipulating
-          the store queues integrated in the SH-4 processors.
-config SPECULATIVE_EXECUTION
-        bool "Speculative subroutine return"
-        depends on CPU_SUBTYPE_SH7780 && EXPERIMENTAL
-        help
-          This enables support for a speculative instruction fetch for
-          subroutine return. There are various pitfalls associated with
-          this, as outlined in the SH7780 hardware manual.
-          If unsure, say N.
-config CPU_HAS_INTEVT
-        bool
-config CPU_HAS_PINT_IRQ
-        bool
-config CPU_HAS_MASKREG_IRQ
-        bool
-config CPU_HAS_INTC2_IRQ
-        bool
-config CPU_HAS_IPR_IRQ
-        bool
-config CPU_HAS_SR_RB
-        bool "CPU has SR.RB"
-        depends on CPU_SH3 || CPU_SH4
-        default y
-        help
-          This will enable the use of SR.RB register bank usage. Processors
-          that are lacking this bit must have another method in place for
-          accomplishing what is taken care of by the banked registers.
-          See <file:Documentation/sh/register-banks.txt> for further
-          information on SR.RB and register banking in the kernel in general.
-config CPU_HAS_PTEA
-        bool
-endmenu
 menu "Timer and clock configuration"
 config SH_TMU
@@ -473,13 +440,13 @@ config SH_PCLK_FREQ
        int "Peripheral clock frequency (in Hz)"
        default "27000000" if CPU_SUBTYPE_SH73180 || CPU_SUBTYPE_SH7343
        default "31250000" if CPU_SUBTYPE_SH7619
+        default "32000000" if CPU_SUBTYPE_SH7722
        default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || \
                              CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7705 || \
                              CPU_SUBTYPE_SH7206
-        default "50000000" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7780 || \
+        default "60000000" if CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7751R
-                              CPU_SUBTYPE_SH7785
-        default "60000000" if CPU_SUBTYPE_SH7751
        default "66000000" if CPU_SUBTYPE_SH4_202
+        default "50000000"
        help
          This option is used to specify the peripheral clock frequency.
          This is necessary for determining the reference clock value on
@@ -487,8 +454,10 @@ config SH_PCLK_FREQ
 config SH_CLK_MD
        int "CPU Mode Pin Setting"
-        default 0
        depends on CPU_SUBTYPE_SH7619 || CPU_SUBTYPE_SH7206
+        default 6 if CPU_SUBTYPE_SH7206
+        default 5 if CPU_SUBTYPE_SH7619
+        default 0
        help
          MD2 - MD0 pin setting.
@@ -560,6 +529,7 @@ config CRASH_DUMP
 config SMP
        bool "Symmetric multi-processing support"
+        depends on SYS_SUPPORTS_SMP
        ---help---
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If
@@ -584,6 +554,7 @@ config NR_CPUS
        int "Maximum number of CPUs (2-32)"
        range 2 32
        depends on SMP
+        default "4" if CPU_SHX3
        default "2"
        help
          This allows you to specify the maximum number of CPUs which this
@@ -623,6 +594,7 @@ config BOOT_LINK_OFFSET
 config UBC_WAKEUP
        bool "Wakeup UBC on startup"
+        depends on CPU_SH4
        help
          Selecting this option will wakeup the User Break Controller (UBC) on
          startup. Although the UBC is left in an awake state when the processor
@@ -651,8 +623,8 @@ menu "Bus options"
 # we're not using PCMCIA, so we make it dependent on
 # PCMCIA outright. -- PFM.
 config ISA
-        bool
+        def_bool y
-        default y if PCMCIA
+        depends on PCMCIA && HD6446X_SERIES
        help
          Find out whether you have ISA slots on your motherboard.  ISA is the
          name of a bus system, i.e. the way the CPU talks to the other stuff
@@ -690,6 +662,49 @@ config SUPERHYWAY
        tristate "SuperHyway Bus support"
        depends on CPU_SUBTYPE_SH4_202
+config CF_ENABLER
+        bool "Compact Flash Enabler support"
+        depends on SOLUTION_ENGINE || SH_SH03
+        ---help---
+          Compact Flash is a small, removable mass storage device introduced
+          in 1994 originally as a PCMCIA device.  If you say `Y' here, you
+          compile in support for Compact Flash devices directly connected to
+          a SuperH processor.  A Compact Flash FAQ is available at
+          <http://www.compactflash.org/faqs/faq.htm>.
+          If your board has "Directly Connected" CompactFlash at area 5 or 6,
+          you may want to enable this option.  Then, you can use CF as
+          primary IDE drive (only tested for SanDisk).
+          If in doubt, select 'N'.
+choice
+        prompt "Compact Flash Connection Area"
+        depends on CF_ENABLER
+        default CF_AREA6
+config CF_AREA5
+        bool "Area5"
+        help
+          If your board has "Directly Connected" CompactFlash, You should
+          select the area where your CF is connected to.
+          - "Area5" if CompactFlash is connected to Area 5 (0x14000000)
+          - "Area6" if it is connected to Area 6 (0x18000000)
+          "Area6" will work for most boards.
+config CF_AREA6
+        bool "Area6"
+endchoice
+config CF_BASE_ADDR
+        hex
+        depends on CF_ENABLER
+        default "0xb8000000" if CF_AREA6
+        default "0xb4000000" if CF_AREA5
 source "arch/sh/drivers/pci/Kconfig"
 source "drivers/pci/Kconfig"
@@ -707,7 +722,7 @@ source "fs/Kconfig.binfmt"
 endmenu
 menu "Power management options (EXPERIMENTAL)"
-depends on EXPERIMENTAL
+depends on EXPERIMENTAL && SYS_SUPPORTS_PM
 source kernel/power/Kconfig
diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index b56307294b..52f6a99c8e 100644
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -52,6 +52,10 @@ config EARLY_PRINTK
          select both the EARLY_SCIF_CONSOLE and SH_STANDARD_BIOS, using
          the kernel command line option to toggle back and forth.
+config DEBUG_BOOTMEM
+        depends on DEBUG_KERNEL
+        bool "Debug BOOTMEM initialization"
 config DEBUG_STACKOVERFLOW
        bool "Check for stack overflows"
        depends on DEBUG_KERNEL
@@ -82,6 +86,7 @@ config SH_KGDB
        bool "Include KGDB kernel debugger"
        select FRAME_POINTER
        select DEBUG_INFO
+        depends on CPU_SH3 || CPU_SH4
        help
          Include in-kernel hooks for kgdb, the Linux kernel source level
          debugger.  See <http://kgdb.sourceforge.net/> for more information.
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 883b03b040..77fecc62a0 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -34,20 +34,20 @@ isa-y			:= $(isa-y)-nofpu
 endif
 endif
-cflags-$(CONFIG_CPU_SH2)                := -m2
+cflags-$(CONFIG_CPU_SH2)                := $(call cc-option,-m2,)
-cflags-$(CONFIG_CPU_SH2A)               := -m2a $(call cc-option,-m2a-nofpu,)
+cflags-$(CONFIG_CPU_SH2A)               += $(call cc-option,-m2a,) \
-cflags-$(CONFIG_CPU_SH3)                := -m3
+                                           $(call cc-option,-m2a-nofpu,)
-cflags-$(CONFIG_CPU_SH4)                := -m4 \
+cflags-$(CONFIG_CPU_SH3)                := $(call cc-option,-m3,)
+cflags-$(CONFIG_CPU_SH4)                := $(call cc-option,-m4,) \
        $(call cc-option,-mno-implicit-fp,-m4-nofpu)
-cflags-$(CONFIG_CPU_SH4A)               := $(call cc-option,-m4a,) $(call cc-option,-m4a-nofpu,)
+cflags-$(CONFIG_CPU_SH4A)               += $(call cc-option,-m4a,) \
+                                           $(call cc-option,-m4a-nofpu,)
 cflags-$(CONFIG_CPU_BIG_ENDIAN)         += -mb
 cflags-$(CONFIG_CPU_LITTLE_ENDIAN)      += -ml
 cflags-y        += $(call as-option,-Wa$(comma)-isa=$(isa-y),) -ffreestanding
-cflags-$(CONFIG_SH_DSP)                 += -Wa,-dsp
 cflags-$(CONFIG_MORE_COMPILE_OPTIONS)   += \
        $(shell echo $(CONFIG_COMPILE_OPTIONS) | sed -e 's/"//g')
@@ -87,39 +87,37 @@ core-y				+= arch/sh/kernel/ arch/sh/mm/
 core-$(CONFIG_SH_FPU_EMU)       += arch/sh/math-emu/
 # Boards
-machdir-$(CONFIG_SH_SOLUTION_ENGINE)            := se/770x
+machdir-$(CONFIG_SH_SOLUTION_ENGINE)            += se/770x
-machdir-$(CONFIG_SH_7722_SOLUTION_ENGINE)       := se/7722
+machdir-$(CONFIG_SH_7722_SOLUTION_ENGINE)       += se/7722
-machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE)       := se/7751
+machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE)       += se/7751
-machdir-$(CONFIG_SH_7780_SOLUTION_ENGINE)       := se/7780
+machdir-$(CONFIG_SH_7780_SOLUTION_ENGINE)       += se/7780
-machdir-$(CONFIG_SH_7300_SOLUTION_ENGINE)       := se/7300
+machdir-$(CONFIG_SH_7300_SOLUTION_ENGINE)       += se/7300
-machdir-$(CONFIG_SH_7343_SOLUTION_ENGINE)       := se/7343
+machdir-$(CONFIG_SH_7343_SOLUTION_ENGINE)       += se/7343
-machdir-$(CONFIG_SH_73180_SOLUTION_ENGINE)      := se/73180
+machdir-$(CONFIG_SH_73180_SOLUTION_ENGINE)      += se/73180
-machdir-$(CONFIG_SH_HP6XX)                      := hp6xx
+machdir-$(CONFIG_SH_HP6XX)                      += hp6xx
-machdir-$(CONFIG_SH_SATURN)                     := saturn
+machdir-$(CONFIG_SH_DREAMCAST)                  += dreamcast
-machdir-$(CONFIG_SH_DREAMCAST)                  := dreamcast
+machdir-$(CONFIG_SH_MPC1211)                    += mpc1211
-machdir-$(CONFIG_SH_MPC1211)                    := mpc1211
+machdir-$(CONFIG_SH_SH03)                       += sh03
-machdir-$(CONFIG_SH_SH03)                       := sh03
+machdir-$(CONFIG_SH_SECUREEDGE5410)             += snapgear
-machdir-$(CONFIG_SH_SECUREEDGE5410)             := snapgear
+machdir-$(CONFIG_SH_HS7751RVOIP)                += renesas/hs7751rvoip
-machdir-$(CONFIG_SH_HS7751RVOIP)                := renesas/hs7751rvoip
+machdir-$(CONFIG_SH_RTS7751R2D)                 += renesas/rts7751r2d
-machdir-$(CONFIG_SH_RTS7751R2D)                 := renesas/rts7751r2d
+machdir-$(CONFIG_SH_7751_SYSTEMH)               += renesas/systemh
-machdir-$(CONFIG_SH_7751_SYSTEMH)               := renesas/systemh
+machdir-$(CONFIG_SH_EDOSK7705)                  += renesas/edosk7705
-machdir-$(CONFIG_SH_EDOSK7705)                  := renesas/edosk7705
+machdir-$(CONFIG_SH_HIGHLANDER)                 += renesas/r7780rp
-machdir-$(CONFIG_SH_HIGHLANDER)                 := renesas/r7780rp
+machdir-$(CONFIG_SH_7710VOIPGW)                 += renesas/sh7710voipgw
-machdir-$(CONFIG_SH_7710VOIPGW)                 := renesas/sh7710voipgw
+machdir-$(CONFIG_SH_SH4202_MICRODEV)            += superh/microdev
-machdir-$(CONFIG_SH_SH4202_MICRODEV)            := superh/microdev
+machdir-$(CONFIG_SH_LANDISK)                    += landisk
-machdir-$(CONFIG_SH_LANDISK)                    := landisk
+machdir-$(CONFIG_SH_TITAN)                      += titan
-machdir-$(CONFIG_SH_TITAN)                      := titan
+machdir-$(CONFIG_SH_SHMIN)                      += shmin
-machdir-$(CONFIG_SH_SHMIN)                      := shmin
+machdir-$(CONFIG_SH_7206_SOLUTION_ENGINE)       += se/7206
-machdir-$(CONFIG_SH_7206_SOLUTION_ENGINE)       := se/7206
+machdir-$(CONFIG_SH_7619_SOLUTION_ENGINE)       += se/7619
-machdir-$(CONFIG_SH_7619_SOLUTION_ENGINE)       := se/7619
+machdir-$(CONFIG_SH_LBOX_RE2)                   += lboxre2
-machdir-$(CONFIG_SH_LBOX_RE2)                   := lboxre2
-machdir-$(CONFIG_SH_UNKNOWN)                    := unknown
+incdir-y        := $(notdir $(machdir-y))
-incdir-y                        := $(notdir $(machdir-y))
-incdir-$(CONFIG_SH_HP6XX)                       := hp6xx
 ifneq ($(machdir-y),)
-core-y                          += arch/sh/boards/$(machdir-y)/
+core-y  += $(addprefix arch/sh/boards/, \
+             $(filter-out ., $(patsubst %,%/,$(machdir-y))))
 endif
 # Companion chips
@@ -157,19 +155,31 @@ include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) \
 #       Most boards have their own mach directories.  For the ones that
 #       don't, just reference the parent directory so the semantics are
 #       kept roughly the same.
+#
+#       When multiple boards are compiled in at the same time, preference
+#       for the mach link is given to whichever has a directory for its
+#       headers. However, this is only a workaround until platforms that
+#       can live in the same kernel image back away from relying on the
+#       mach link.
 include/asm-sh/.mach: $(wildcard include/config/sh/*.h) \
                      include/config/auto.conf FORCE
-        @echo -n '  SYMLINK include/asm-sh/mach -> '
        $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi
-        $(Q)if [ -d $(incdir-prefix)$(incdir-y) ]; then \
+        $(Q)rm -f include/asm-sh/mach
-                echo -e 'include/asm-sh/$(incdir-y)'; \
+        $(Q)for i in $(incdir-y); do \
-                ln -fsn $(incdir-prefix)$(incdir-y) \
+        if [ -d $(incdir-prefix)$$i ]; then \
+                echo -n '  SYMLINK include/asm-sh/mach -> '; \
+                echo -e "include/asm-sh/$$i"; \
+                ln -fsn $(incdir-prefix)$$i \
                        include/asm-sh/mach; \
        else \
-                echo -e 'include/asm-sh'; \
+                if [ ! -d include/asm-sh/mach ]; then \
-                ln -fsn $(incdir-prefix) include/asm-sh/mach; \
+                        echo -n '  SYMLINK include/asm-sh/mach -> '; \
-        fi
+                        echo -e 'include/asm-sh'; \
+                        ln -fsn $(incdir-prefix) include/asm-sh/mach; \
+                fi; \
+        fi; \
+        done
        @touch $@
 archprepare: include/asm-sh/.cpu include/asm-sh/.mach maketools
@@ -188,7 +198,9 @@ compressed: zImage
 archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
-CLEAN_FILES += include/asm-sh/machtypes.h
+CLEAN_FILES += include/asm-sh/machtypes.h \
+               include/asm-sh/cpu include/asm-sh/.cpu \
+               include/asm-sh/mach include/asm-sh/.mach
 define archhelp
        @echo '* zImage                    - Compressed kernel image'
diff --git a/arch/sh/boards/dreamcast/setup.c b/arch/sh/boards/dreamcast/setup.c
index f13017eeeb..8799df6e86 100644
--- a/arch/sh/boards/dreamcast/setup.c
+++ b/arch/sh/boards/dreamcast/setup.c
@@ -60,7 +60,7 @@ static void __init dreamcast_setup(char **cmdline_p)
 #endif
 }
-struct sh_machine_vector mv_dreamcast __initmv = {
+static struct sh_machine_vector mv_dreamcast __initmv = {
        .mv_name                = "Sega Dreamcast",
        .mv_setup               = dreamcast_setup,
        .mv_irq_demux           = systemasic_irq_demux,
@@ -70,4 +70,3 @@ struct sh_machine_vector mv_dreamcast __initmv = {
        .mv_consistent_free     = dreamcast_consistent_free,
 #endif
 };
-ALIAS_MV(dreamcast)
diff --git a/arch/sh/boards/hp6xx/mach.c b/arch/sh/boards/hp6xx/mach.c
deleted file mode 100644
index 08dbba910f..0000000000
--- a/arch/sh/boards/hp6xx/mach.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * linux/arch/sh/boards/hp6xx/mach.c
- *
- * Copyright (C) 2000 Stuart Menefy (stuart.menefy@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Machine vector for the HP680
- */
-#include <asm/machvec.h>
-#include <asm/hd64461.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-struct sh_machine_vector mv_hp6xx __initmv = {
-        .mv_nr_irqs = HD64461_IRQBASE + HD64461_IRQ_NUM,
-        .mv_inb = hd64461_inb,
-        .mv_inw = hd64461_inw,
-        .mv_inl = hd64461_inl,
-        .mv_outb = hd64461_outb,
-        .mv_outw = hd64461_outw,
-        .mv_outl = hd64461_outl,
-        .mv_inb_p = hd64461_inb_p,
-        .mv_inw_p = hd64461_inw,
-        .mv_inl_p = hd64461_inl,
-        .mv_outb_p = hd64461_outb_p,
-        .mv_outw_p = hd64461_outw,
-        .mv_outl_p = hd64461_outl,
-        .mv_insb = hd64461_insb,
-        .mv_insw = hd64461_insw,
-        .mv_insl = hd64461_insl,
-        .mv_outsb = hd64461_outsb,
-        .mv_outsw = hd64461_outsw,
-        .mv_outsl = hd64461_outsl,
-        .mv_readw = hd64461_readw,
-        .mv_writew = hd64461_writew,
-        .mv_irq_demux = hd64461_irq_demux,
-};
-ALIAS_MV(hp6xx)
diff --git a/arch/sh/boards/hp6xx/setup.c b/arch/sh/boards/hp6xx/setup.c
index 6aeee85c97..7ae708930b 100644
--- a/arch/sh/boards/hp6xx/setup.c
+++ b/arch/sh/boards/hp6xx/setup.c
@@ -98,10 +98,9 @@ static void __init hp6xx_setup(char **cmdline_p)
 }
 device_initcall(hp6xx_devices_setup);
-struct sh_machine_vector mv_hp6xx __initmv = {
+static struct sh_machine_vector mv_hp6xx __initmv = {
        .mv_name = "hp6xx",
        .mv_setup = hp6xx_setup,
        .mv_nr_irqs = HD64461_IRQBASE + HD64461_IRQ_NUM,
        .mv_irq_demux = hd64461_irq_demux,
 };
-ALIAS_MV(hp6xx)
diff --git a/arch/sh/boards/landisk/setup.c b/arch/sh/boards/landisk/setup.c
index f953c74277..eda71763ec 100644
--- a/arch/sh/boards/landisk/setup.c
+++ b/arch/sh/boards/landisk/setup.c
@@ -97,10 +97,9 @@ static void __init landisk_setup(char **cmdline_p)
 /*
 * The Machine Vector
 */
-struct sh_machine_vector mv_landisk __initmv = {
+static struct sh_machine_vector mv_landisk __initmv = {
        .mv_name = "LANDISK",
        .mv_nr_irqs = 72,
        .mv_setup = landisk_setup,
        .mv_init_irq = init_landisk_IRQ,
 };
-ALIAS_MV(landisk)
diff --git a/arch/sh/boards/lboxre2/setup.c b/arch/sh/boards/lboxre2/setup.c
index 4e20f7c63b..9c830fdc41 100644
--- a/arch/sh/boards/lboxre2/setup.c
+++ b/arch/sh/boards/lboxre2/setup.c
@@ -77,9 +77,8 @@ device_initcall(lboxre2_devices_setup);
 /*
 * The Machine Vector
 */
-struct sh_machine_vector mv_lboxre2 __initmv = {
+static struct sh_machine_vector mv_lboxre2 __initmv = {
        .mv_name                = "L-BOX RE2",
        .mv_nr_irqs             = 72,
        .mv_init_irq            = init_lboxre2_IRQ,
 };
-ALIAS_MV(lboxre2)
diff --git a/arch/sh/boards/mpc1211/setup.c b/arch/sh/boards/mpc1211/setup.c
index 1a0604b23c..8ce03e00b0 100644
--- a/arch/sh/boards/mpc1211/setup.c
+++ b/arch/sh/boards/mpc1211/setup.c
@@ -338,11 +338,10 @@ static void __init mpc1211_setup(char **cmdline_p)
 /*
 * The Machine Vector
 */
-struct sh_machine_vector mv_mpc1211 __initmv = {
+static struct sh_machine_vector mv_mpc1211 __initmv = {
        .mv_name                = "Interface MPC-1211(CTP/PCI/MPC-SH02)",
        .mv_setup               = mpc1211_setup,
        .mv_nr_irqs             = 48,
        .mv_irq_demux           = mpc1211_irq_demux,
        .mv_init_irq            = init_mpc1211_IRQ,
 };
-ALIAS_MV(mpc1211)
diff --git a/arch/sh/boards/renesas/edosk7705/setup.c b/arch/sh/boards/renesas/edosk7705/setup.c
index ec5be01077..f076c45308 100644
--- a/arch/sh/boards/renesas/edosk7705/setup.c
+++ b/arch/sh/boards/renesas/edosk7705/setup.c
@@ -21,7 +21,7 @@ static void __init sh_edosk7705_init_irq(void)
 /*
 * The Machine Vector
 */
-struct sh_machine_vector mv_edosk7705 __initmv = {
+static struct sh_machine_vector mv_edosk7705 __initmv = {
        .mv_name                = "EDOSK7705",
        .mv_nr_irqs             = 80,
@@ -41,4 +41,3 @@ struct sh_machine_vector mv_edosk7705 __initmv = {
        .mv_isa_port2addr       = sh_edosk7705_isa_port2addr,
        .mv_init_irq            = sh_edosk7705_init_irq,
 };
-ALIAS_MV(edosk7705)
diff --git a/arch/sh/boards/renesas/hs7751rvoip/setup.c b/arch/sh/boards/renesas/hs7751rvoip/setup.c
index f7d0e304d8..fa5fa39202 100644
--- a/arch/sh/boards/renesas/hs7751rvoip/setup.c
+++ b/arch/sh/boards/renesas/hs7751rvoip/setup.c
@@ -89,7 +89,7 @@ static void __init hs7751rvoip_setup(char **cmdline_p)
        printk(KERN_INFO "Renesas Technology Sales HS7751RVoIP-2 support.\n");
 }
-struct sh_machine_vector mv_hs7751rvoip __initmv = {
+static struct sh_machine_vector mv_hs7751rvoip __initmv = {
        .mv_name                = "HS7751RVoIP",
        .mv_setup               = hs7751rvoip_setup,
        .mv_nr_irqs             = 72,
@@ -118,4 +118,3 @@ struct sh_machine_vector mv_hs7751rvoip __initmv = {
        .mv_init_irq            = hs7751rvoip_init_irq,
        .mv_ioport_map          = hs7751rvoip_ioport_map,
 };
-ALIAS_MV(hs7751rvoip)
diff --git a/arch/sh/boards/renesas/r7780rp/Kconfig b/arch/sh/boards/renesas/r7780rp/Kconfig
index 9fb11641fe..fc8f28e04b 100644
--- a/arch/sh/boards/renesas/r7780rp/Kconfig
+++ b/arch/sh/boards/renesas/r7780rp/Kconfig
@@ -6,18 +6,18 @@ choice
 config SH_R7780RP
        bool "R7780RP-1 board support"
-        select CPU_SUBTYPE_SH7780
+        depends on CPU_SUBTYPE_SH7780
 config SH_R7780MP
        bool "R7780MP board support"
-        select CPU_SUBTYPE_SH7780
+        depends on CPU_SUBTYPE_SH7780
        help
          Selecting this option will enable support for the mass-production
          version of the R7780RP. If in doubt, say Y.
 config SH_R7785RP
        bool "R7785RP board support"
-        select CPU_SUBTYPE_SH7785
+        depends on CPU_SUBTYPE_SH7785
 endchoice
diff --git a/arch/sh/boards/renesas/r7780rp/setup.c b/arch/sh/boards/renesas/r7780rp/setup.c
index 0727ef92f2..5afb864a1e 100644
--- a/arch/sh/boards/renesas/r7780rp/setup.c
+++ b/arch/sh/boards/renesas/r7780rp/setup.c
@@ -166,10 +166,9 @@ static void __init highlander_setup(char **cmdline_p)
 /*
 * The Machine Vector
 */
-struct sh_machine_vector mv_highlander __initmv = {
+static struct sh_machine_vector mv_highlander __initmv = {
        .mv_name                = "Highlander",
        .mv_nr_irqs             = 109,
        .mv_setup               = highlander_setup,
        .mv_init_irq            = highlander_init_irq,
 };
-ALIAS_MV(highlander)
diff --git a/arch/sh/boards/renesas/rts7751r2d/setup.c b/arch/sh/boards/renesas/rts7751r2d/setup.c
index 593f26a85e..656fda30ef 100644
--- a/arch/sh/boards/renesas/rts7751r2d/setup.c
+++ b/arch/sh/boards/renesas/rts7751r2d/setup.c
@@ -176,7 +176,7 @@ static void __init rts7751r2d_setup(char **cmdline_p)
 /*
 * The Machine Vector
 */
-struct sh_machine_vector mv_rts7751r2d __initmv = {
+static struct sh_machine_vector mv_rts7751r2d __initmv = {
        .mv_name                = "RTS7751R2D",
        .mv_setup               = rts7751r2d_setup,
        .mv_nr_irqs             = 72,
@@ -189,4 +189,3 @@ struct sh_machine_vector mv_rts7751r2d __initmv = {
        .mv_consistent_free     = voyagergx_consistent_free,
 #endif
 };
-ALIAS_MV(rts7751r2d)
diff --git a/arch/sh/boards/renesas/sh7710voipgw/setup.c b/arch/sh/boards/renesas/sh7710voipgw/setup.c
index 180810b121..2dce8bd97f 100644
--- a/arch/sh/boards/renesas/sh7710voipgw/setup.c
+++ b/arch/sh/boards/renesas/sh7710voipgw/setup.c
@@ -88,9 +88,8 @@ static void __init sh7710voipgw_init_irq(void)
 /*
 * The Machine Vector
 */
-struct sh_machine_vector mv_sh7710voipgw __initmv = {
+static struct sh_machine_vector mv_sh7710voipgw __initmv = {
        .mv_name                = "SH7710 VoIP Gateway",
        .mv_nr_irqs             = 104,
        .mv_init_irq            = sh7710voipgw_init_irq,
 };
-ALIAS_MV(sh7710voipgw)
diff --git a/arch/sh/boards/renesas/systemh/setup.c b/arch/sh/boards/renesas/systemh/setup.c
index 936117659b..ee78af8427 100644
--- a/arch/sh/boards/renesas/systemh/setup.c
+++ b/arch/sh/boards/renesas/systemh/setup.c
@@ -28,7 +28,7 @@ static void __init sh7751systemh_init_irq(void)
        make_systemh_irq(0xb);  /* Ethernet interrupt */
 }
-struct sh_machine_vector mv_7751systemh __initmv = {
+static struct sh_machine_vector mv_7751systemh __initmv = {
        .mv_name                = "7751 SystemH",
        .mv_nr_irqs             = 72,
@@ -55,4 +55,3 @@ struct sh_machine_vector mv_7751systemh __initmv = {
        .mv_init_irq            = sh7751systemh_init_irq,
 };
-ALIAS_MV(7751systemh)
diff --git a/arch/sh/boards/saturn/Makefile b/arch/sh/boards/saturn/Makefile
deleted file mode 100644
index 75a3042e25..0000000000
--- a/arch/sh/boards/saturn/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for the Sega Saturn specific parts of the kernel
-#
-obj-y    := setup.o io.o irq.o
-obj-$(CONFIG_SMP) += smp.o
diff --git a/arch/sh/boards/saturn/io.c b/arch/sh/boards/saturn/io.c
deleted file mode 100644
index c6e4f7f2e6..0000000000
--- a/arch/sh/boards/saturn/io.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * arch/sh/boards/saturn/io.c
- *
- * I/O routines for the Sega Saturn.
- *
- * Copyright (C) 2002 Paul Mundt
- *
- * Released under the terms of the GNU GPL v2.0.
- */
-#include <asm/saturn/io.h>
-#include <asm/machvec.h>
-unsigned long saturn_isa_port2addr(unsigned long offset)
-{
-        return offset;
-}
-void *saturn_ioremap(unsigned long offset, unsigned long size)
-{
-        return (void *)offset;
-}
-void saturn_iounmap(void *addr)
-{
-}
diff --git a/arch/sh/boards/saturn/irq.c b/arch/sh/boards/saturn/irq.c
deleted file mode 100644
index 15d1d3f0f7..0000000000
--- a/arch/sh/boards/saturn/irq.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * arch/sh/boards/saturn/irq.c
- *
- * Copyright (C) 2002 Paul Mundt
- *
- * Released under the terms of the GNU GPL v2.0.
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <asm/irq.h>
-#include <asm/io.h>
-/*
- * Interrupts map out as follows:
- *
- *  Vector      Name            Mask
- *
- *      64      VBLANKIN        0x0001
- *      65      VBLANKOUT       0x0002
- *      66      HBLANKIN        0x0004
- *      67      TIMER0          0x0008
- *      68      TIMER1          0x0010
- *      69      DSPEND          0x0020
- *      70      SOUNDREQUEST    0x0040
- *      71      SYSTEMMANAGER   0x0080
- *      72      PAD             0x0100
- *      73      LEVEL2DMAEND    0x0200
- *      74      LEVEL1DMAEND    0x0400
- *      75      LEVEL0DMAEND    0x0800
- *      76      DMAILLEGAL      0x1000
- *      77      SRITEDRAWEND    0x2000
- *      78      ABUS            0x8000
- *
- */
-#define SATURN_IRQ_MIN          64      /* VBLANKIN */
-#define SATURN_IRQ_MAX          78      /* ABUS */
-#define SATURN_IRQ_MASK         0xbfff
-static inline u32 saturn_irq_mask(unsigned int irq_nr)
-{
-        u32 mask;
-        mask = (1 << (irq_nr - SATURN_IRQ_MIN));
-        mask <<= (irq_nr == SATURN_IRQ_MAX);
-        mask &= SATURN_IRQ_MASK;
-        return mask;
-}
-static inline void mask_saturn_irq(unsigned int irq_nr)
-{
-        u32 mask;
-        mask = ctrl_inl(SATURN_IMR);
-        mask |= saturn_irq_mask(irq_nr);
-        ctrl_outl(mask, SATURN_IMR);
-}
-static inline void unmask_saturn_irq(unsigned int irq_nr)
-{
-        u32 mask;
-        mask = ctrl_inl(SATURN_IMR);
-        mask &= ~saturn_irq_mask(irq_nr);
-        ctrl_outl(mask, SATURN_IMR);
-}
-static void disable_saturn_irq(unsigned int irq_nr)
-{
-        mask_saturn_irq(irq_nr);
-}
-static void enable_saturn_irq(unsigned int irq_nr)
-{
-        unmask_saturn_irq(irq_nr);
-}
-static void mask_and_ack_saturn_irq(unsigned int irq_nr)
-{
-        mask_saturn_irq(irq_nr);
-}
-static void end_saturn_irq(unsigned int irq_nr)
-{
-        if (!(irq_desc[irq_nr].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
-                unmask_saturn_irq(irq_nr);
-}
-static unsigned int startup_saturn_irq(unsigned int irq_nr)
-{
-        unmask_saturn_irq(irq_nr);
-        return 0;
-}
-static void shutdown_saturn_irq(unsigned int irq_nr)
-{
-        mask_saturn_irq(irq_nr);
-}
-static struct hw_interrupt_type saturn_int = {
-        .typename       = "Saturn",
-        .enable         = enable_saturn_irq,
-        .disable        = disable_saturn_irq,
-        .ack            = mask_and_ack_saturn_irq,
-        .end            = end_saturn_irq,
-        .startup        = startup_saturn_irq,
-        .shutdown       = shutdown_saturn_irq,
-};
-int saturn_irq_demux(int irq_nr)
-{
-        /* FIXME */
-        return irq_nr;
-}
diff --git a/arch/sh/boards/saturn/setup.c b/arch/sh/boards/saturn/setup.c
deleted file mode 100644
index a3a37c9aad..0000000000
--- a/arch/sh/boards/saturn/setup.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* 
- * arch/sh/boards/saturn/setup.c
- *
- * Hardware support for the Sega Saturn.
- *
- * Copyright (c) 2002 Paul Mundt
- *
- * Released under the terms of the GNU GPL v2.0.
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <asm/io.h>
-#include <asm/machvec.h>
-#include <asm/mach/io.h>
-extern int saturn_irq_demux(int irq_nr);
-/*
- * The Machine Vector
- */
-struct sh_machine_vector mv_saturn __initmv = {
-        .mv_name                = "Sega Saturn",
-        .mv_nr_irqs             = 80,   /* Fix this later */
-        .mv_isa_port2addr       = saturn_isa_port2addr,
-        .mv_irq_demux           = saturn_irq_demux,
-        .mv_ioremap             = saturn_ioremap,
-        .mv_iounmap             = saturn_iounmap,
-};
-ALIAS_MV(saturn)
diff --git a/arch/sh/boards/saturn/smp.c b/arch/sh/boards/saturn/smp.c
deleted file mode 100644
index 76460918c9..0000000000
--- a/arch/sh/boards/saturn/smp.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* 
- * arch/sh/boards/saturn/smp.c
- *
- * SMP support for the Sega Saturn.
- *
- * Copyright (c) 2002 Paul Mundt
- *
- * Released under the terms of the GNU GPL v2.0.
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/smp.h>
-#include <asm/saturn/smpc.h>
-extern void start_secondary(void);
-void __smp_send_ipi(unsigned int cpu, unsigned int action)
-{
-        /* Nothing here yet .. */
-}
-unsigned int __smp_probe_cpus(void)
-{
-        /*
-         * This is just a straightforward master/slave configuration,
-         * and probing isn't really supported..
-         */
-        return 2;
-}
-/*
- * We're only allowed to do byte-access to SMPC registers. In
- * addition to which, we treat them as write-only, since
- * reading from them will return undefined data.
- */
-static inline void smpc_slave_stop(unsigned int cpu)
-{
-        smpc_barrier();
-        ctrl_outb(1, SMPC_STATUS);
-        ctrl_outb(SMPC_CMD_SSHOFF, SMPC_COMMAND);
-        smpc_barrier();
-}
-static inline void smpc_slave_start(unsigned int cpu)
-{
-        ctrl_outb(1, SMPC_STATUS);
-        ctrl_outb(SMPC_CMD_SSHON, SMPC_COMMAND);
-        smpc_barrier();
-}
-void __smp_slave_init(unsigned int cpu)
-{
-        register unsigned long vbr;
-        void **entry;
-        __asm__ __volatile__ ("stc vbr, %0\n\t" : "=r" (vbr));
-        entry = (void **)(vbr + 0x310 + 0x94);
-        smpc_slave_stop(cpu);
-        *(void **)entry = (void *)start_secondary;
-        smpc_slave_start(cpu);
-}
diff --git a/arch/sh/boards/se/7206/setup.c b/arch/sh/boards/se/7206/setup.c
index ca714879f5..a074b62505 100644
--- a/arch/sh/boards/se/7206/setup.c
+++ b/arch/sh/boards/se/7206/setup.c
@@ -70,7 +70,7 @@ __initcall(se7206_devices_setup);
 * The Machine Vector
 */
-struct sh_machine_vector mv_se __initmv = {
+static struct sh_machine_vector mv_se __initmv = {
        .mv_name                = "SolutionEngine",
        .mv_nr_irqs             = 256,
        .mv_inb                 = se7206_inb,
@@ -96,4 +96,3 @@ struct sh_machine_vector mv_se __initmv = {
        .mv_init_irq            = init_se7206_IRQ,
 };
-ALIAS_MV(se)
diff --git a/arch/sh/boards/se/7300/setup.c b/arch/sh/boards/se/7300/setup.c
index f1960956ba..eb469f5b6e 100644
--- a/arch/sh/boards/se/7300/setup.c
+++ b/arch/sh/boards/se/7300/setup.c
@@ -46,7 +46,7 @@ __initcall(se7300_devices_setup);
 /*
 * The Machine Vector
 */
-struct sh_machine_vector mv_7300se __initmv = {
+static struct sh_machine_vector mv_7300se __initmv = {
        .mv_name = "SolutionEngine 7300",
        .mv_nr_irqs = 109,
        .mv_inb = sh7300se_inb,
@@ -72,4 +72,3 @@ struct sh_machine_vector mv_7300se __initmv = {
        .mv_init_irq = init_7300se_IRQ,
 };
-ALIAS_MV(7300se)
diff --git a/arch/sh/boards/se/73180/setup.c b/arch/sh/boards/se/73180/setup.c
index e143017c89..1deee85566 100644
--- a/arch/sh/boards/se/73180/setup.c
+++ b/arch/sh/boards/se/73180/setup.c
@@ -46,7 +46,7 @@ __initcall(se73180_devices_setup);
 /*
 * The Machine Vector
 */
-struct sh_machine_vector mv_73180se __initmv = {
+static struct sh_machine_vector mv_73180se __initmv = {
        .mv_name = "SolutionEngine 73180",
        .mv_nr_irqs = 108,
        .mv_inb = sh73180se_inb,
@@ -73,4 +73,3 @@ struct sh_machine_vector mv_73180se __initmv = {
        .mv_init_irq = init_73180se_IRQ,
        .mv_irq_demux = shmse_irq_demux,
 };
-ALIAS_MV(73180se)
diff --git a/arch/sh/boards/se/7343/setup.c b/arch/sh/boards/se/7343/setup.c
index 3fdb16f2ce..8fec155e2f 100644
--- a/arch/sh/boards/se/7343/setup.c
+++ b/arch/sh/boards/se/7343/setup.c
@@ -64,7 +64,7 @@ static void __init sh7343se_setup(char **cmdline_p)
 /*
 * The Machine Vector
 */
-struct sh_machine_vector mv_7343se __initmv = {
+static struct sh_machine_vector mv_7343se __initmv = {
        .mv_name = "SolutionEngine 7343",
        .mv_setup = sh7343se_setup,
        .mv_nr_irqs = 108,
@@ -92,4 +92,3 @@ struct sh_machine_vector mv_7343se __initmv = {
        .mv_init_irq = init_7343se_IRQ,
        .mv_irq_demux = shmse_irq_demux,
 };
-ALIAS_MV(7343se)
diff --git a/arch/sh/boards/se/7619/setup.c b/arch/sh/boards/se/7619/setup.c
index 52d2c4d5d2..1d0ef7faa1 100644
--- a/arch/sh/boards/se/7619/setup.c
+++ b/arch/sh/boards/se/7619/setup.c
@@ -15,8 +15,7 @@
 * The Machine Vector
 */
-struct sh_machine_vector mv_se __initmv = {
+static struct sh_machine_vector mv_se __initmv = {
        .mv_name                = "SolutionEngine",
        .mv_nr_irqs             = 108,
 };
-ALIAS_MV(se)
diff --git a/arch/sh/boards/se/770x/irq.c b/arch/sh/boards/se/770x/irq.c
index c8eccff77a..cdb0807928 100644
--- a/arch/sh/boards/se/770x/irq.c
+++ b/arch/sh/boards/se/770x/irq.c
@@ -15,46 +15,7 @@
 #include <asm/io.h>
 #include <asm/se.h>
-/* 
+static struct ipr_data ipr_irq_table[] = {
- * If the problem of make_ipr_irq is solved, 
- * this code will become unnecessary. :-) 
- */
-static void se770x_disable_ipr_irq(unsigned int irq)
-{
-        struct ipr_data *p = get_irq_chip_data(irq);
-        ctrl_outw(ctrl_inw(p->addr) & (0xffff ^ (0xf << p->shift)), p->addr);
-}
-static void se770x_enable_ipr_irq(unsigned int irq)
-{
-        struct ipr_data *p = get_irq_chip_data(irq);
-        ctrl_outw(ctrl_inw(p->addr) | (p->priority << p->shift), p->addr);
-}
-static struct irq_chip se770x_irq_chip = {
-        .name           = "MS770xSE-FPGA",
-        .mask           = se770x_disable_ipr_irq,
-        .unmask         = se770x_enable_ipr_irq,
-        .mask_ack       = se770x_disable_ipr_irq,
-};
-void make_se770x_irq(struct ipr_data *table, unsigned int nr_irqs)
-{
-        int i;
-        for (i = 0; i < nr_irqs; i++) {
-                unsigned int irq = table[i].irq;
-                disable_irq_nosync(irq);
-                set_irq_chip_and_handler_name(irq, &se770x_irq_chip,
-                        handle_level_irq, "level");
-                set_irq_chip_data(irq, &table[i]);
-                se770x_enable_ipr_irq(irq);
-        }
-}
-static struct ipr_data se770x_ipr_map[] = {
        /*
        * Super I/O (Just mimic PC):
        *  1: keyboard
@@ -68,46 +29,67 @@ static struct ipr_data se770x_ipr_map[] = {
        */
 #if defined(CONFIG_CPU_SUBTYPE_SH7705)
        /* This is default value */
-        { 13, 0, 8,  0x0f-13 ,BCR_ILCRA},
+        { 13, 0, 8,  0x0f-13, },
-        { 5 , 0, 4,  0x0f- 5 ,BCR_ILCRA},
+        { 5 , 0, 4,  0x0f- 5, },
-        { 10, 0, 0,  0x0f-10, BCR_ILCRB},
+        { 10, 1, 0,  0x0f-10, },
-        { 7 , 0, 4,  0x0f- 7, BCR_ILCRC},
+        { 7 , 2, 4,  0x0f- 7, },
-        { 3 , 0, 0,  0x0f- 3, BCR_ILCRC},
+        { 3 , 2, 0,  0x0f- 3, },
-        { 1 , 0, 12, 0x0f- 1, BCR_ILCRD},
+        { 1 , 3, 12, 0x0f- 1, },
-        { 12, 0, 4,  0x0f-12, BCR_ILCRD}, /* LAN */
+        { 12, 3, 4,  0x0f-12, }, /* LAN */
-        { 2 , 0, 8,  0x0f- 2, BCR_ILCRE}, /* PCIRQ2 */
+        { 2 , 4, 8,  0x0f- 2, }, /* PCIRQ2 */
-        { 6 , 0, 4,  0x0f- 6, BCR_ILCRE}, /* PCIRQ1 */
+        { 6 , 4, 4,  0x0f- 6, }, /* PCIRQ1 */
-        { 14, 0, 0,  0x0f-14, BCR_ILCRE}, /* PCIRQ0 */
+        { 14, 4, 0,  0x0f-14, }, /* PCIRQ0 */
-        { 0 , 0, 12, 0x0f   , BCR_ILCRF}, 
+        { 0 , 5, 12, 0x0f   , }, 
-        { 4 , 0, 4,  0x0f- 4, BCR_ILCRF},
+        { 4 , 5, 4,  0x0f- 4, },
-        { 8 , 0, 12, 0x0f- 8, BCR_ILCRG},
+        { 8 , 6, 12, 0x0f- 8, },
-        { 9 , 0, 8,  0x0f- 9, BCR_ILCRG},
+        { 9 , 6, 8,  0x0f- 9, },
-        { 11, 0, 4,  0x0f-11, BCR_ILCRG},
+        { 11, 6, 4,  0x0f-11, },
 #else
-        { 14, 0,  8, 0x0f-14 ,BCR_ILCRA},
+        { 14, 0,  8, 0x0f-14, },
-        { 12, 0,  4, 0x0f-12 ,BCR_ILCRA},
+        { 12, 0,  4, 0x0f-12, },
-        {  8, 0,  4, 0x0f- 8 ,BCR_ILCRB},
+        {  8, 1,  4, 0x0f- 8, },
-        {  6, 0, 12, 0x0f- 6 ,BCR_ILCRC},
+        {  6, 2, 12, 0x0f- 6, },
-        {  5, 0,  8, 0x0f- 5 ,BCR_ILCRC},
+        {  5, 2,  8, 0x0f- 5, },
-        {  4, 0,  4, 0x0f- 4 ,BCR_ILCRC},
+        {  4, 2,  4, 0x0f- 4, },
-        {  3, 0,  0, 0x0f- 3 ,BCR_ILCRC},
+        {  3, 2,  0, 0x0f- 3, },
-        {  1, 0, 12, 0x0f- 1 ,BCR_ILCRD},
+        {  1, 3, 12, 0x0f- 1, },
 #if defined(CONFIG_STNIC)
        /* ST NIC */
-        { 10, 0,  4, 0x0f-10 ,BCR_ILCRD},       /* LAN */
+        { 10, 3,  4, 0x0f-10, },        /* LAN */
 #endif
        /* MRSHPC IRQs setting */
-        {  0, 0, 12, 0x0f- 0 ,BCR_ILCRE},       /* PCIRQ3 */
+        {  0, 4, 12, 0x0f- 0, },        /* PCIRQ3 */
-        { 11, 0,  8, 0x0f-11 ,BCR_ILCRE},       /* PCIRQ2 */
+        { 11, 4,  8, 0x0f-11, },        /* PCIRQ2 */
-        {  9, 0,  4, 0x0f- 9 ,BCR_ILCRE},       /* PCIRQ1 */
+        {  9, 4,  4, 0x0f- 9, },        /* PCIRQ1 */
-        {  7, 0,  0, 0x0f- 7 ,BCR_ILCRE},       /* PCIRQ0 */
+        {  7, 4,  0, 0x0f- 7, },        /* PCIRQ0 */
        /* #2, #13 are allocated for SLOT IRQ #1 and #2 (for now) */
        /* NOTE: #2 and #13 are not used on PC */
-        { 13, 0,  4, 0x0f-13 ,BCR_ILCRG},       /* SLOTIRQ2 */
+        { 13, 6,  4, 0x0f-13, },        /* SLOTIRQ2 */
-        {  2, 0,  0, 0x0f- 2 ,BCR_ILCRG},       /* SLOTIRQ1 */
+        {  2, 6,  0, 0x0f- 2, },        /* SLOTIRQ1 */
 #endif
 };
+static unsigned long ipr_offsets[] = {
+        BCR_ILCRA,
+        BCR_ILCRB,
+        BCR_ILCRC,
+        BCR_ILCRD,
+        BCR_ILCRE,
+        BCR_ILCRF,
+        BCR_ILCRG,
+};
+static struct ipr_desc ipr_irq_desc = {
+        .ipr_offsets    = ipr_offsets,
+        .nr_offsets     = ARRAY_SIZE(ipr_offsets),
+        .ipr_data       = ipr_irq_table,
+        .nr_irqs        = ARRAY_SIZE(ipr_irq_table),
+        .chip = {
+                .name   = "IPR-se770x",
+        },
+};
 /*
 * Initialize IRQ setting
 */
@@ -122,5 +104,5 @@ void __init init_se_IRQ(void)
        ctrl_outw(0, BCR_ILCRF);
        ctrl_outw(0, BCR_ILCRG);
-        make_se770x_irq(se770x_ipr_map, ARRAY_SIZE(se770x_ipr_map));
+        register_ipr_controller(&ipr_irq_desc);
 }
diff --git a/arch/sh/boards/se/770x/setup.c b/arch/sh/boards/se/770x/setup.c
index 17a2631de3..2962da148f 100644
--- a/arch/sh/boards/se/770x/setup.c
+++ b/arch/sh/boards/se/770x/setup.c
@@ -122,7 +122,7 @@ device_initcall(se_devices_setup);
 /*
 * The Machine Vector
 */
-struct sh_machine_vector mv_se __initmv = {
+static struct sh_machine_vector mv_se __initmv = {
        .mv_name                = "SolutionEngine",
        .mv_setup               = smsc_setup,
 #if defined(CONFIG_CPU_SH4)
@@ -160,4 +160,3 @@ struct sh_machine_vector mv_se __initmv = {
        .mv_init_irq            = init_se_IRQ,
 };
-ALIAS_MV(se)
diff --git a/arch/sh/boards/se/7722/irq.c b/arch/sh/boards/se/7722/irq.c
index 099e5deb77..26cff0efda 100644
--- a/arch/sh/boards/se/7722/irq.c
+++ b/arch/sh/boards/se/7722/irq.c
@@ -19,15 +19,24 @@
 #define INTC_INTMSK0             0xFFD00044
 #define INTC_INTMSKCLR0          0xFFD00064
+struct se7722_data {
+        unsigned char irq;
+        unsigned char ipr_idx;
+        unsigned char shift;
+        unsigned short priority;
+        unsigned long addr;
+};
 static void disable_se7722_irq(unsigned int irq)
 {
-        struct ipr_data *p = get_irq_chip_data(irq);
+        struct se7722_data *p = get_irq_chip_data(irq);
        ctrl_outw( ctrl_inw( p->addr ) | p->priority , p->addr );
 }
 static void enable_se7722_irq(unsigned int irq)
 {
-        struct ipr_data *p = get_irq_chip_data(irq);
+        struct se7722_data *p = get_irq_chip_data(irq);
        ctrl_outw( ctrl_inw( p->addr ) & ~p->priority , p->addr );
 }
@@ -38,7 +47,7 @@ static struct irq_chip se7722_irq_chip __read_mostly = {
        .mask_ack       = disable_se7722_irq,
 };
-static struct ipr_data ipr_irq_table[] = {
+static struct se7722_data ipr_irq_table[] = {
        /* irq        ,idx,sft, priority     , addr   */
        { MRSHPC_IRQ0 , 0 , 0 , MRSHPC_BIT0 , IRQ01_MASK } ,
        { MRSHPC_IRQ1 , 0 , 0 , MRSHPC_BIT1 , IRQ01_MASK } ,
diff --git a/arch/sh/boards/se/7722/setup.c b/arch/sh/boards/se/7722/setup.c
index 636ca6c987..6cca6cbc80 100644
--- a/arch/sh/boards/se/7722/setup.c
+++ b/arch/sh/boards/se/7722/setup.c
@@ -137,7 +137,7 @@ static void __init se7722_setup(char **cmdline_p)
 /*
 * The Machine Vector
 */
-struct sh_machine_vector mv_se7722 __initmv = {
+static struct sh_machine_vector mv_se7722 __initmv = {
        .mv_name                = "Solution Engine 7722" ,
        .mv_setup               = se7722_setup ,
        .mv_nr_irqs             = 109 ,
@@ -145,4 +145,3 @@ struct sh_machine_vector mv_se7722 __initmv = {
        .mv_irq_demux           = se7722_irq_demux,
 };
-ALIAS_MV(se7722)
diff --git a/arch/sh/boards/se/7751/irq.c b/arch/sh/boards/se/7751/irq.c
index e4c63a4829..c3d12590e5 100644
--- a/arch/sh/boards/se/7751/irq.c
+++ b/arch/sh/boards/se/7751/irq.c
@@ -14,44 +14,31 @@
 #include <asm/irq.h>
 #include <asm/se7751.h>
-static struct ipr_data se7751_ipr_map[] = {
+static struct ipr_data ipr_irq_table[] = {
-  /* Leave old Solution Engine code in for reference. */
+        { 13, 3, 3, 2 },
-#if defined(CONFIG_SH_SOLUTION_ENGINE)
+        /* Add additional entries here as drivers are added and tested. */
-        /*
+};
-         * Super I/O (Just mimic PC):
-         *  1: keyboard
-         *  3: serial 0
-         *  4: serial 1
-         *  5: printer
-         *  6: floppy
-         *  8: rtc
-         * 12: mouse
-         * 14: ide0
-         */
-        { 14, BCR_ILCRA, 2, 0x0f-14 },
-        { 12, BCR_ILCRA, 1, 0x0f-12 },
-        {  8, BCR_ILCRB, 1, 0x0f- 8 },
-        {  6, BCR_ILCRC, 3, 0x0f- 6 },
-        {  5, BCR_ILCRC, 2, 0x0f- 5 },
-        {  4, BCR_ILCRC, 1, 0x0f- 4 },
-        {  3, BCR_ILCRC, 0, 0x0f- 3 },
-        {  1, BCR_ILCRD, 3, 0x0f- 1 },
-        { 10, BCR_ILCRD, 1, 0x0f-10 }, /* LAN */
+static unsigned long ipr_offsets[] = {
+        BCR_ILCRA,
+        BCR_ILCRB,
+        BCR_ILCRC,
+        BCR_ILCRD,
+        BCR_ILCRE,
+        BCR_ILCRF,
+        BCR_ILCRG,
+};
-        {  0, BCR_ILCRE, 3, 0x0f- 0 }, /* PCIRQ3 */
+static struct ipr_desc ipr_irq_desc = {
-        { 11, BCR_ILCRE, 2, 0x0f-11 }, /* PCIRQ2 */
+        .ipr_offsets    = ipr_offsets,
-        {  9, BCR_ILCRE, 1, 0x0f- 9 }, /* PCIRQ1 */
+        .nr_offsets     = ARRAY_SIZE(ipr_offsets),
-        {  7, BCR_ILCRE, 0, 0x0f- 7 }, /* PCIRQ0 */
-        /* #2, #13 are allocated for SLOT IRQ #1 and #2 (for now) */
+        .ipr_data       = ipr_irq_table,
-        /* NOTE: #2 and #13 are not used on PC */
+        .nr_irqs        = ARRAY_SIZE(ipr_irq_table),
-        { 13, BCR_ILCRG, 1, 0x0f-13 }, /* SLOTIRQ2 */
-        {  2, BCR_ILCRG, 0, 0x0f- 2 }, /* SLOTIRQ1 */
+        .chip = {
-#elif defined(CONFIG_SH_7751_SOLUTION_ENGINE)
+                .name   = "IPR-se7751",
-        { 13, BCR_ILCRD, 3, 2 },
+        },
-        /* Add additional entries here as drivers are added and tested. */
-#endif
 };
 /*
@@ -59,5 +46,5 @@ static struct ipr_data se7751_ipr_map[] = {
 */
 void __init init_7751se_IRQ(void)
 {
-        make_ipr_irq(se7751_ipr_map, ARRAY_SIZE(se7751_ipr_map));
+        register_ipr_controller(&ipr_irq_desc);
 }
diff --git a/arch/sh/boards/se/7751/setup.c b/arch/sh/boards/se/7751/setup.c
index 52c7bfa57c..7873d07e40 100644
--- a/arch/sh/boards/se/7751/setup.c
+++ b/arch/sh/boards/se/7751/setup.c
@@ -48,7 +48,7 @@ __initcall(se7751_devices_setup);
 /*
 * The Machine Vector
 */
-struct sh_machine_vector mv_7751se __initmv = {
+static struct sh_machine_vector mv_7751se __initmv = {
        .mv_name                = "7751 SolutionEngine",
        .mv_nr_irqs             = 72,
@@ -71,4 +71,3 @@ struct sh_machine_vector mv_7751se __initmv = {
        .mv_init_irq            = init_7751se_IRQ,
 };
-ALIAS_MV(7751se)
diff --git a/arch/sh/boards/se/7780/irq.c b/arch/sh/boards/se/7780/irq.c
index 3d0625c2d0..8749147460 100644
--- a/arch/sh/boards/se/7780/irq.c
+++ b/arch/sh/boards/se/7780/irq.c
@@ -16,28 +16,6 @@
 #include <asm/io.h>
 #include <asm/se7780.h>
-#define INTC_INTMSK0             0xFFD00044
-#define INTC_INTMSKCLR0          0xFFD00064
-static void disable_se7780_irq(unsigned int irq)
-{
-        struct intc2_data *p = get_irq_chip_data(irq);
-        ctrl_outl(1 << p->msk_shift, INTC_INTMSK0 + p->msk_offset);
-}
-static void enable_se7780_irq(unsigned int irq)
-{
-        struct intc2_data *p = get_irq_chip_data(irq);
-        ctrl_outl(1 << p->msk_shift, INTC_INTMSKCLR0 + p->msk_offset);
-}
-static struct irq_chip se7780_irq_chip __read_mostly = {
-        .name           = "SE7780",
-        .mask           = disable_se7780_irq,
-        .unmask         = enable_se7780_irq,
-        .mask_ack       = disable_se7780_irq,
-};
 static struct intc2_data intc2_irq_table[] = {
        { 2,  0, 31, 0, 31, 3 }, /* daughter board EXTINT1 */
        { 4,  0, 30, 0, 30, 3 }, /* daughter board EXTINT2 */
@@ -51,13 +29,24 @@ static struct intc2_data intc2_irq_table[] = {
        { 0 , 0, 24, 0, 24, 3 }, /* SM501 */
 };
+static struct intc2_desc intc2_irq_desc __read_mostly = {
+        .prio_base      = 0, /* N/A */
+        .msk_base       = 0xffd00044,
+        .mskclr_base    = 0xffd00064,
+        .intc2_data     = intc2_irq_table,
+        .nr_irqs        = ARRAY_SIZE(intc2_irq_table),
+        .chip = {
+                .name   = "INTC2-se7780",
+        },
+};
 /*
 * Initialize IRQ setting
 */
 void __init init_se7780_IRQ(void)
 {
-        int i ;
        /* enable all interrupt at FPGA */
        ctrl_outw(0, FPGA_INTMSK1);
        /* mask SM501 interrupt */
@@ -79,11 +68,5 @@ void __init init_se7780_IRQ(void)
        /* FPGA + 0x0A */
        ctrl_outw((IRQPIN_PCCPW << IRQPOS_PCCPW), FPGA_INTSEL3);
-        for (i = 0; i < ARRAY_SIZE(intc2_irq_table); i++) {
+        register_intc2_controller(&intc2_irq_desc);
-                disable_irq_nosync(intc2_irq_table[i].irq);
-                set_irq_chip_and_handler_name( intc2_irq_table[i].irq, &se7780_irq_chip,
-                        handle_level_irq, "level");
-                set_irq_chip_data( intc2_irq_table[i].irq, &intc2_irq_table[i] );
-                disable_se7780_irq(intc2_irq_table[i].irq);
-        }
 }
diff --git a/arch/sh/boards/se/7780/setup.c b/arch/sh/boards/se/7780/setup.c
index df7d08a24c..723f2fd4d5 100644
--- a/arch/sh/boards/se/7780/setup.c
+++ b/arch/sh/boards/se/7780/setup.c
@@ -113,10 +113,9 @@ static void __init se7780_setup(char **cmdline_p)
 /*
 * The Machine Vector
 */
-struct sh_machine_vector mv_se7780 __initmv = {
+static struct sh_machine_vector mv_se7780 __initmv = {
        .mv_name                = "Solution Engine 7780" ,
        .mv_setup               = se7780_setup ,
        .mv_nr_irqs             = 111 ,
        .mv_init_irq            = init_se7780_IRQ,
 };
-ALIAS_MV(se7780)
diff --git a/arch/sh/boards/sh03/setup.c b/arch/sh/boards/sh03/setup.c
index c069c444b4..9c031a8c0a 100644
--- a/arch/sh/boards/sh03/setup.c
+++ b/arch/sh/boards/sh03/setup.c
@@ -15,17 +15,33 @@
 #include <asm/sh03/sh03.h>
 #include <asm/addrspace.h>
-static struct ipr_data sh03_ipr_map[] = {
+static struct ipr_data ipr_irq_table[] = {
-        { IRL0_IRQ, IRL0_IPR_ADDR, IRL0_IPR_POS, IRL0_PRIORITY },
+        { IRL0_IRQ, 0, IRL0_IPR_POS, IRL0_PRIORITY },
-        { IRL1_IRQ, IRL1_IPR_ADDR, IRL1_IPR_POS, IRL1_PRIORITY },
+        { IRL1_IRQ, 0, IRL1_IPR_POS, IRL1_PRIORITY },
-        { IRL2_IRQ, IRL2_IPR_ADDR, IRL2_IPR_POS, IRL2_PRIORITY },
+        { IRL2_IRQ, 0, IRL2_IPR_POS, IRL2_PRIORITY },
-        { IRL3_IRQ, IRL3_IPR_ADDR, IRL3_IPR_POS, IRL3_PRIORITY },
+        { IRL3_IRQ, 0, IRL3_IPR_POS, IRL3_PRIORITY },
+};
+static unsigned long ipr_offsets[] = {
+        INTC_IPRD,
+};
+static struct ipr_desc ipr_irq_desc = {
+        .ipr_offsets    = ipr_offsets,
+        .nr_offsets     = ARRAY_SIZE(ipr_offsets),
+        .ipr_data       = ipr_irq_table,
+        .nr_irqs        = ARRAY_SIZE(ipr_irq_table),
+        .chip = {
+                .name   = "IPR-sh03",
+        },
 };
 static void __init init_sh03_IRQ(void)
 {
        ctrl_outw(ctrl_inw(INTC_ICR) | INTC_ICR_IRLM, INTC_ICR);
-        make_ipr_irq(sh03_ipr_map, ARRAY_SIZE(sh03_ipr_map));
+        register_ipr_controller(&ipr_irq_desc);
 }
 extern void *cf_io_base;
@@ -74,11 +90,10 @@ static int __init sh03_devices_setup(void)
 }
 __initcall(sh03_devices_setup);
-struct sh_machine_vector mv_sh03 __initmv = {
+static struct sh_machine_vector mv_sh03 __initmv = {
        .mv_name                = "Interface (CTP/PCI-SH03)",
        .mv_setup               = sh03_setup,
        .mv_nr_irqs             = 48,
        .mv_ioport_map          = sh03_ioport_map,
        .mv_init_irq            = init_sh03_IRQ,
 };
-ALIAS_MV(sh03)
diff --git a/arch/sh/boards/shmin/setup.c b/arch/sh/boards/shmin/setup.c
index 4a9df4a6b0..dfd124509f 100644
--- a/arch/sh/boards/shmin/setup.c
+++ b/arch/sh/boards/shmin/setup.c
@@ -6,28 +6,44 @@
 * SHMIN Support.
 */
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <asm/machvec.h>
 #include <asm/shmin.h>
 #include <asm/clock.h>
-#include <asm/irq.h>
 #include <asm/io.h>
 #define PFC_PHCR        0xa400010eUL
 #define INTC_ICR1       0xa4000010UL
 #define INTC_IPRC       0xa4000016UL
-static struct ipr_data shmin_ipr_map[] = {
+static struct ipr_data ipr_irq_table[] = {
-        { .irq=32, .addr=INTC_IPRC, .shift= 0, .priority=0 },
+        { 32, 0, 0, 0 },
-        { .irq=33, .addr=INTC_IPRC, .shift= 4, .priority=0 },
+        { 33, 0, 4, 0 },
-        { .irq=34, .addr=INTC_IPRC, .shift= 8, .priority=8 },
+        { 34, 0, 8, 8 },
-        { .irq=35, .addr=INTC_IPRC, .shift=12, .priority=0 },
+        { 35, 0, 12, 0 },
+};
+static unsigned long ipr_offsets[] = {
+        INTC_IPRC,
+};
+static struct ipr_desc ipr_irq_desc = {
+        .ipr_offsets    = ipr_offsets,
+        .nr_offsets     = ARRAY_SIZE(ipr_offsets),
+        .ipr_data       = ipr_irq_table,
+        .nr_irqs        = ARRAY_SIZE(ipr_irq_table),
+        .chip = {
+                .name   = "IPR-shmin",
+        },
 };
 static void __init init_shmin_irq(void)
 {
        ctrl_outw(0x2a00, PFC_PHCR);    // IRQ0-3=IRQ
        ctrl_outw(0x0aaa, INTC_ICR1);   // IRQ0-3=IRQ-mode,Low-active.
-        make_ipr_irq(shmin_ipr_map, ARRAY_SIZE(shmin_ipr_map));
+        register_ipr_controller(&ipr_irq_desc);
 }
 static void __iomem *shmin_ioport_map(unsigned long port, unsigned int size)
@@ -43,9 +59,8 @@ static void __iomem *shmin_ioport_map(unsigned long port, unsigned int size)
 }
-struct sh_machine_vector mv_shmin __initmv = {
+static struct sh_machine_vector mv_shmin __initmv = {
        .mv_name        = "SHMIN",
        .mv_init_irq    = init_shmin_irq,
        .mv_ioport_map  = shmin_ioport_map,
 };
-ALIAS_MV(shmin)
diff --git a/arch/sh/boards/snapgear/setup.c b/arch/sh/boards/snapgear/setup.c
index 650fb36459..84271d85a8 100644
--- a/arch/sh/boards/snapgear/setup.c
+++ b/arch/sh/boards/snapgear/setup.c
@@ -68,11 +68,27 @@ module_init(eraseconfig_init);
 * IRL3 = crypto
 */
-static struct ipr_data snapgear_ipr_map[] = {
+static struct ipr_data ipr_irq_table[] = {
-        make_ipr_irq(IRL0_IRQ, IRL0_IPR_ADDR, IRL0_IPR_POS, IRL0_PRIORITY);
+        { IRL0_IRQ, 0, IRL0_IPR_POS, IRL0_PRIORITY },
-        make_ipr_irq(IRL1_IRQ, IRL1_IPR_ADDR, IRL1_IPR_POS, IRL1_PRIORITY);
+        { IRL1_IRQ, 0, IRL1_IPR_POS, IRL1_PRIORITY },
-        make_ipr_irq(IRL2_IRQ, IRL2_IPR_ADDR, IRL2_IPR_POS, IRL2_PRIORITY);
+        { IRL2_IRQ, 0, IRL2_IPR_POS, IRL2_PRIORITY },
-        make_ipr_irq(IRL3_IRQ, IRL3_IPR_ADDR, IRL3_IPR_POS, IRL3_PRIORITY);
+        { IRL3_IRQ, 0, IRL3_IPR_POS, IRL3_PRIORITY },
+};
+static unsigned long ipr_offsets[] = {
+        INTC_IPRD,
+};
+static struct ipr_desc ipr_irq_desc = {
+        .ipr_offsets    = ipr_offsets,
+        .nr_offsets     = ARRAY_SIZE(ipr_offsets),
+        .ipr_data       = ipr_irq_table,
+        .nr_irqs        = ARRAY_SIZE(ipr_irq_table),
+        .chip = {
+                .name   = "IPR-snapgear",
+        },
 };
 static void __init init_snapgear_IRQ(void)
@@ -82,7 +98,7 @@ static void __init init_snapgear_IRQ(void)
        printk("Setup SnapGear IRQ/IPR ...\n");
-        make_ipr_irq(snapgear_ipr_map, ARRAY_SIZE(snapgear_ipr_map));
+        register_ipr_controller(&ipr_irq_desc);
 }
 /*
@@ -96,7 +112,7 @@ static void __init snapgear_setup(char **cmdline_p)
 /*
 * The Machine Vector
 */
-struct sh_machine_vector mv_snapgear __initmv = {
+static struct sh_machine_vector mv_snapgear __initmv = {
        .mv_name                = "SnapGear SecureEdge5410",
        .mv_setup               = snapgear_setup,
        .mv_nr_irqs             = 72,
@@ -117,4 +133,3 @@ struct sh_machine_vector mv_snapgear __initmv = {
        .mv_init_irq            = init_snapgear_IRQ,
 };
-ALIAS_MV(snapgear)
diff --git a/arch/sh/boards/superh/microdev/setup.c b/arch/sh/boards/superh/microdev/setup.c
index 6396cea1c8..fc8cd06d66 100644
--- a/arch/sh/boards/superh/microdev/setup.c
+++ b/arch/sh/boards/superh/microdev/setup.c
@@ -371,7 +371,7 @@ static void __init microdev_setup(char **cmdline_p)
 /*
 * The Machine Vector
 */
-struct sh_machine_vector mv_sh4202_microdev __initmv = {
+static struct sh_machine_vector mv_sh4202_microdev __initmv = {
        .mv_name                = "SH4-202 MicroDev",
        .mv_setup               = microdev_setup,
        .mv_nr_irqs             = 72,           /* QQQ need to check this - use the MACRO */
@@ -403,4 +403,3 @@ struct sh_machine_vector mv_sh4202_microdev __initmv = {
        .mv_heartbeat           = microdev_heartbeat,
 #endif
 };
-ALIAS_MV(sh4202_microdev)
diff --git a/arch/sh/boards/titan/setup.c b/arch/sh/boards/titan/setup.c
index 6bcd939bfa..606d25a4b8 100644
--- a/arch/sh/boards/titan/setup.c
+++ b/arch/sh/boards/titan/setup.c
@@ -12,7 +12,7 @@
 #include <asm/titan.h>
 #include <asm/io.h>
-static struct ipr_data titan_ipr_map[] = {
+static struct ipr_data ipr_irq_table[] = {
        /* IRQ, IPR idx, shift, prio */
        { TITAN_IRQ_WAN,   3, 12, 8 },  /* eth0 (WAN) */
        { TITAN_IRQ_LAN,   3,  8, 8 },  /* eth1 (LAN) */
@@ -20,15 +20,33 @@ static struct ipr_data titan_ipr_map[] = {
        { TITAN_IRQ_USB,   3,  0, 8 },  /* mPCI B (bottom), USB */
 };
+static unsigned long ipr_offsets[] = { /* stolen from setup-sh7750.c */
+        0xffd00004UL,   /* 0: IPRA */
+        0xffd00008UL,   /* 1: IPRB */
+        0xffd0000cUL,   /* 2: IPRC */
+        0xffd00010UL,   /* 3: IPRD */
+};
+static struct ipr_desc ipr_irq_desc = {
+        .ipr_offsets    = ipr_offsets,
+        .nr_offsets     = ARRAY_SIZE(ipr_offsets),
+        .ipr_data       = ipr_irq_table,
+        .nr_irqs        = ARRAY_SIZE(ipr_irq_table),
+        .chip = {
+                .name   = "IPR-titan",
+        },
+};
 static void __init init_titan_irq(void)
 {
        /* enable individual interrupt mode for externals */
        ipr_irq_enable_irlm();
        /* register ipr irqs */
-        make_ipr_irq(titan_ipr_map, ARRAY_SIZE(titan_ipr_map));
+        register_ipr_controller(&ipr_irq_desc);
 }
-struct sh_machine_vector mv_titan __initmv = {
+static struct sh_machine_vector mv_titan __initmv = {
        .mv_name =      "Titan",
        .mv_inb =       titan_inb,
@@ -52,4 +70,3 @@ struct sh_machine_vector mv_titan __initmv = {
        .mv_init_irq =  init_titan_irq,
 };
-ALIAS_MV(titan)
diff --git a/arch/sh/boards/unknown/Makefile b/arch/sh/boards/unknown/Makefile
deleted file mode 100644
index 7d18f408b0..0000000000
--- a/arch/sh/boards/unknown/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Makefile for unknown SH boards 
-#
-obj-y    := setup.o
diff --git a/arch/sh/boards/unknown/setup.c b/arch/sh/boards/unknown/setup.c
deleted file mode 100644
index bee4612de5..0000000000
--- a/arch/sh/boards/unknown/setup.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * linux/arch/sh/boards/unknown/setup.c
- *
- * Copyright (C) 2002 Paul Mundt
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Setup code for an unknown machine (internal peripherals only)
- *
- * This is the simplest of all boards, and serves only as a quick and dirty
- * method to start debugging a new board during bring-up until proper board
- * setup code is written.
- */
-#include <linux/init.h>
-#include <asm/machvec.h>
-struct sh_machine_vector mv_unknown __initmv = {
-        .mv_name                = "Unknown",
-};
-ALIAS_MV(unknown)
diff --git a/arch/sh/cchips/Kconfig b/arch/sh/cchips/Kconfig
index 0582ca8346..2e516e9a6e 100644
--- a/arch/sh/cchips/Kconfig
+++ b/arch/sh/cchips/Kconfig
@@ -13,10 +13,8 @@ config VOYAGERGX
          are additional GPIO bits that can be used to interface to
          external as well.
-# A board must have defined HD6446X_SERIES in order to see these
 config HD6446X_SERIES
-        bool "HD6446x support"
+        bool
-        default n
 choice
        prompt "HD6446x options"
@@ -25,7 +23,6 @@ choice
 config HD64461
        bool "Hitachi HD64461 companion chip support"
-        depends on CPU_SUBTYPE_SH7709
        ---help---
          The Hitachi HD64461 provides an interface for
          the SH7709 CPU, supporting a LCD controller,
@@ -40,7 +37,6 @@ config HD64461
 config HD64465
        bool "Hitachi HD64465 companion chip support"
-        depends on CPU_SUBTYPE_SH7750
        ---help---
          The Hitachi HD64465 provides an interface for
          the SH7750 CPU, supporting a LCD controller,
diff --git a/arch/sh/configs/dreamcast_defconfig b/arch/sh/configs/dreamcast_defconfig
index 8b6b5a779d..3fdd270eec 100644
--- a/arch/sh/configs/dreamcast_defconfig
+++ b/arch/sh/configs/dreamcast_defconfig
@@ -1,15 +1,23 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18
+# Linux kernel version: 2.6.22-rc4
-# Tue Oct  3 10:51:55 2006
+# Sat Jul  7 03:47:45 2007
 #
 CONFIG_SUPERH=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_SYS_SUPPORTS_PCI=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 #
@@ -28,6 +36,7 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
@@ -35,8 +44,10 @@ CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -50,14 +61,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -93,44 +109,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # System type
 #
-# CONFIG_SH_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SOLUTION_ENGINE is not set
-# CONFIG_SH_7300_SOLUTION_ENGINE is not set
-# CONFIG_SH_7343_SOLUTION_ENGINE is not set
-# CONFIG_SH_73180_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SYSTEMH is not set
-# CONFIG_SH_HP6XX is not set
-# CONFIG_SH_EC3104 is not set
-# CONFIG_SH_SATURN is not set
-CONFIG_SH_DREAMCAST=y
-# CONFIG_SH_BIGSUR is not set
-# CONFIG_SH_MPC1211 is not set
-# CONFIG_SH_SH03 is not set
-# CONFIG_SH_SECUREEDGE5410 is not set
-# CONFIG_SH_HS7751RVOIP is not set
-# CONFIG_SH_7710VOIPGW is not set
-# CONFIG_SH_RTS7751R2D is not set
-# CONFIG_SH_R7780RP is not set
-# CONFIG_SH_EDOSK7705 is not set
-# CONFIG_SH_SH4202_MICRODEV is not set
-# CONFIG_SH_LANDISK is not set
-# CONFIG_SH_TITAN is not set
-# CONFIG_SH_SHMIN is not set
-# CONFIG_SH_UNKNOWN is not set
-#
-# Processor selection
-#
 CONFIG_CPU_SH4=y
+# CONFIG_CPU_SUBTYPE_SH7619 is not set
-#
+# CONFIG_CPU_SUBTYPE_SH7206 is not set
-# SH-2 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7604 is not set
-#
-# SH-3 Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH7300 is not set
 # CONFIG_CPU_SUBTYPE_SH7705 is not set
 # CONFIG_CPU_SUBTYPE_SH7706 is not set
@@ -138,79 +119,93 @@ CONFIG_CPU_SH4=y
 # CONFIG_CPU_SUBTYPE_SH7708 is not set
 # CONFIG_CPU_SUBTYPE_SH7709 is not set
 # CONFIG_CPU_SUBTYPE_SH7710 is not set
+# CONFIG_CPU_SUBTYPE_SH7712 is not set
-#
+# CONFIG_CPU_SUBTYPE_SH7750 is not set
-# SH-4 Processor Support
-#
-CONFIG_CPU_SUBTYPE_SH7750=y
 CONFIG_CPU_SUBTYPE_SH7091=y
-CONFIG_CPU_SUBTYPE_SH7750R=y
+# CONFIG_CPU_SUBTYPE_SH7750R is not set
 # CONFIG_CPU_SUBTYPE_SH7750S is not set
 # CONFIG_CPU_SUBTYPE_SH7751 is not set
 # CONFIG_CPU_SUBTYPE_SH7751R is not set
 # CONFIG_CPU_SUBTYPE_SH7760 is not set
 # CONFIG_CPU_SUBTYPE_SH4_202 is not set
-#
-# ST40 Processor Support
-#
 # CONFIG_CPU_SUBTYPE_ST40STB1 is not set
 # CONFIG_CPU_SUBTYPE_ST40GX1 is not set
-#
-# SH-4A Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH7770 is not set
 # CONFIG_CPU_SUBTYPE_SH7780 is not set
+# CONFIG_CPU_SUBTYPE_SH7785 is not set
-#
+# CONFIG_CPU_SUBTYPE_SHX3 is not set
-# SH4AL-DSP Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH73180 is not set
 # CONFIG_CPU_SUBTYPE_SH7343 is not set
+# CONFIG_CPU_SUBTYPE_SH7722 is not set
 #
 # Memory management options
 #
+CONFIG_QUICKLIST=y
 CONFIG_MMU=y
 CONFIG_PAGE_OFFSET=0x80000000
 CONFIG_MEMORY_START=0x0c000000
 CONFIG_MEMORY_SIZE=0x01000000
 CONFIG_VSYSCALL=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_MAX_ACTIVE_REGIONS=1
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
 CONFIG_HUGETLB_PAGE_SIZE_64K=y
+# CONFIG_HUGETLB_PAGE_SIZE_256K is not set
 # CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
+# CONFIG_HUGETLB_PAGE_SIZE_4MB is not set
+# CONFIG_HUGETLB_PAGE_SIZE_64MB is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPARSEMEM_STATIC=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
 #
 # Cache configuration
 #
 # CONFIG_SH_DIRECT_MAPPED is not set
 # CONFIG_SH_WRITETHROUGH is not set
-# CONFIG_SH_OCRAM is not set
 #
 # Processor features
 #
 CONFIG_CPU_LITTLE_ENDIAN=y
+# CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_SH_FPU=y
 # CONFIG_SH_DSP is not set
 CONFIG_SH_STORE_QUEUES=y
 CONFIG_CPU_HAS_INTEVT=y
+CONFIG_CPU_HAS_IPR_IRQ=y
 CONFIG_CPU_HAS_SR_RB=y
+CONFIG_CPU_HAS_PTEA=y
 #
-# Timer support
+# Board support
+#
+CONFIG_SH_DREAMCAST=y
+#
+# Timer and clock configuration
 #
 CONFIG_SH_TMU=y
+CONFIG_SH_TIMER_IRQ=16
 CONFIG_SH_PCLK_FREQ=49876504
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
 #
 # CPU Frequency scaling
@@ -232,6 +227,7 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
 #
 # DMA support
 #
+CONFIG_SH_DMA_API=y
 CONFIG_SH_DMA=y
 CONFIG_NR_ONCHIP_DMA_CHANNELS=4
 CONFIG_NR_DMA_CHANNELS_BOOL=y
@@ -240,17 +236,23 @@ CONFIG_NR_DMA_CHANNELS=9
 #
 # Companion Chips
 #
-# CONFIG_HD6446X_SERIES is not set
+#
+# Additional SuperH Device Drivers
+#
+# CONFIG_HEARTBEAT is not set
+# CONFIG_PUSH_SWITCH is not set
 #
 # Kernel features
 #
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
 # CONFIG_KEXEC is not set
-# CONFIG_SMP is not set
+# CONFIG_CRASH_DUMP is not set
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
@@ -269,33 +271,23 @@ CONFIG_CMDLINE="console=ttySC1,115200 panic=3"
 # Bus options
 #
 CONFIG_PCI=y
-# CONFIG_SH_PCIDMA_NONCOHERENT is not set
+CONFIG_SH_PCIDMA_NONCOHERENT=y
 CONFIG_PCI_AUTO=y
-# CONFIG_PCI_MULTITHREAD_PROBE is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_FLAT is not set
 # CONFIG_BINFMT_MISC is not set
 #
-# Power management options (EXPERIMENTAL)
-#
-# CONFIG_PM is not set
-#
 # Networking
 #
 CONFIG_NET=y
@@ -303,13 +295,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -327,30 +319,20 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_TUNNEL is not set
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -376,7 +358,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -394,10 +385,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -408,6 +395,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -421,13 +409,16 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
-# ATA/ATAPI/MFM/RLL support
+# Misc devices
 #
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
 # CONFIG_IDE is not set
 #
@@ -436,10 +427,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -455,6 +442,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
@@ -470,15 +458,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 #
@@ -521,47 +501,16 @@ CONFIG_8139TOO=y
 # CONFIG_SUNDANCE is not set
 # CONFIG_TLAN is not set
 # CONFIG_VIA_RHINE is not set
+# CONFIG_SC92031 is not set
-#
+# CONFIG_NETDEV_1000 is not set
-# Ethernet (1000 Mbit)
+# CONFIG_NETDEV_10000 is not set
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-# CONFIG_QLA3XXX is not set
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_MYRI10GE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -604,17 +553,19 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_ATKBD is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_PS2 is not set
 # CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -660,10 +611,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -680,14 +627,8 @@ CONFIG_SH_WDT=y
 # CONFIG_PCIPCWATCHDOG is not set
 # CONFIG_WDTPCI is not set
 CONFIG_HW_RANDOM=y
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
@@ -695,11 +636,7 @@ CONFIG_HW_RANDOM=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -711,44 +648,51 @@ CONFIG_HW_RANDOM=y
 #
 # Dallas's 1-wire bus
 #
+# CONFIG_W1 is not set
+# CONFIG_HWMON is not set
 #
-# Hardware Monitoring support
+# Multifunction device drivers
-#
-CONFIG_HWMON=y
-# CONFIG_HWMON_VID is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
-#
-# Misc devices
 #
+# CONFIG_MFD_SM501 is not set
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
+#
+# Frame buffer hardware drivers
+#
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_CYBER2000 is not set
@@ -763,13 +707,17 @@ CONFIG_FB_PVR2=y
 # CONFIG_FB_RADEON is not set
 # CONFIG_FB_ATY128 is not set
 # CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
 # CONFIG_FB_SAVAGE is not set
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
 # CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
 # CONFIG_FB_VIRTUAL is not set
 #
@@ -789,10 +737,6 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
@@ -800,7 +744,6 @@ CONFIG_LOGO=y
 # CONFIG_LOGO_SUPERH_MONO is not set
 # CONFIG_LOGO_SUPERH_VGA16 is not set
 CONFIG_LOGO_SUPERH_CLUT224=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
 # Sound
@@ -808,6 +751,12 @@ CONFIG_LOGO_SUPERH_CLUT224=y
 # CONFIG_SOUND is not set
 #
+# HID Devices
+#
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -823,10 +772,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -874,10 +819,12 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -957,6 +904,11 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_NLS is not set
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+#
 # Profiling support
 #
 CONFIG_PROFILING=y
@@ -965,17 +917,18 @@ CONFIG_PROFILING=y
 #
 # Kernel hacking
 #
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_SH_STANDARD_BIOS is not set
 # CONFIG_EARLY_SCIF_CONSOLE is not set
-# CONFIG_KGDB is not set
+# CONFIG_SH_KGDB is not set
 #
 # Security options
@@ -991,8 +944,13 @@ CONFIG_LOG_BUF_SHIFT=14
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/sh/configs/r7780mp_defconfig b/arch/sh/configs/r7780mp_defconfig
new file mode 100644
index 0000000000..17f7402b31
--- /dev/null
+++ b/arch/sh/configs/r7780mp_defconfig
@@ -0,0 +1,1223 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.22-rc4
+# Mon Jun 11 10:24:57 2007
+#
+CONFIG_SUPERH=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+# CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
+# CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+#
+# System type
+#
+CONFIG_CPU_SH4=y
+CONFIG_CPU_SH4A=y
+# CONFIG_CPU_SUBTYPE_SH7619 is not set
+# CONFIG_CPU_SUBTYPE_SH7206 is not set
+# CONFIG_CPU_SUBTYPE_SH7300 is not set
+# CONFIG_CPU_SUBTYPE_SH7705 is not set
+# CONFIG_CPU_SUBTYPE_SH7706 is not set
+# CONFIG_CPU_SUBTYPE_SH7707 is not set
+# CONFIG_CPU_SUBTYPE_SH7708 is not set
+# CONFIG_CPU_SUBTYPE_SH7709 is not set
+# CONFIG_CPU_SUBTYPE_SH7710 is not set
+# CONFIG_CPU_SUBTYPE_SH7712 is not set
+# CONFIG_CPU_SUBTYPE_SH7750 is not set
+# CONFIG_CPU_SUBTYPE_SH7091 is not set
+# CONFIG_CPU_SUBTYPE_SH7750R is not set
+# CONFIG_CPU_SUBTYPE_SH7750S is not set
+# CONFIG_CPU_SUBTYPE_SH7751 is not set
+# CONFIG_CPU_SUBTYPE_SH7751R is not set
+# CONFIG_CPU_SUBTYPE_SH7760 is not set
+# CONFIG_CPU_SUBTYPE_SH4_202 is not set
+# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
+# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
+# CONFIG_CPU_SUBTYPE_SH7770 is not set
+CONFIG_CPU_SUBTYPE_SH7780=y
+# CONFIG_CPU_SUBTYPE_SH7785 is not set
+# CONFIG_CPU_SUBTYPE_SH73180 is not set
+# CONFIG_CPU_SUBTYPE_SH7343 is not set
+# CONFIG_CPU_SUBTYPE_SH7722 is not set
+#
+# Memory management options
+#
+CONFIG_QUICKLIST=y
+CONFIG_MMU=y
+CONFIG_PAGE_OFFSET=0x80000000
+CONFIG_MEMORY_START=0x08000000
+CONFIG_MEMORY_SIZE=0x08000000
+# CONFIG_32BIT is not set
+CONFIG_VSYSCALL=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_MAX_ACTIVE_REGIONS=1
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
+CONFIG_HUGETLB_PAGE_SIZE_64K=y
+# CONFIG_HUGETLB_PAGE_SIZE_256K is not set
+# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
+# CONFIG_HUGETLB_PAGE_SIZE_4MB is not set
+# CONFIG_HUGETLB_PAGE_SIZE_64MB is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
+#
+# Cache configuration
+#
+# CONFIG_SH_DIRECT_MAPPED is not set
+# CONFIG_SH_WRITETHROUGH is not set
+# CONFIG_SH_OCRAM is not set
+#
+# Processor features
+#
+CONFIG_CPU_LITTLE_ENDIAN=y
+# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_SH_FPU=y
+# CONFIG_SH_DSP is not set
+CONFIG_SH_STORE_QUEUES=y
+CONFIG_SPECULATIVE_EXECUTION=y
+CONFIG_CPU_HAS_INTEVT=y
+CONFIG_CPU_HAS_INTC2_IRQ=y
+CONFIG_CPU_HAS_SR_RB=y
+#
+# Board support
+#
+# CONFIG_SH_7780_SOLUTION_ENGINE is not set
+CONFIG_SH_HIGHLANDER=y
+# CONFIG_SH_R7780RP is not set
+CONFIG_SH_R7780MP=y
+# CONFIG_SH_R7785RP is not set
+#
+# Timer and clock configuration
+#
+CONFIG_SH_TMU=y
+CONFIG_SH_TIMER_IRQ=28
+CONFIG_SH_PCLK_FREQ=32000000
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+#
+# DMA support
+#
+# CONFIG_SH_DMA is not set
+#
+# Companion Chips
+#
+# CONFIG_HD6446X_SERIES is not set
+#
+# Additional SuperH Device Drivers
+#
+# CONFIG_HEARTBEAT is not set
+CONFIG_PUSH_SWITCH=y
+#
+# Kernel features
+#
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_KEXEC=y
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_SMP is not set
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_BKL=y
+#
+# Boot options
+#
+CONFIG_ZERO_PAGE_OFFSET=0x00001000
+CONFIG_BOOT_LINK_OFFSET=0x00800000
+# CONFIG_UBC_WAKEUP is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
+#
+# Bus options
+#
+CONFIG_PCI=y
+CONFIG_SH_PCIDMA_NONCOHERENT=y
+CONFIG_PCI_AUTO=y
+CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCI_DEBUG is not set
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+#
+# Power management options (EXPERIMENTAL)
+#
+# CONFIG_PM is not set
+#
+# Networking
+#
+CONFIG_NET=y
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_MULTIPLE_TABLES is not set
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=m
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+#
+# Device Drivers
+#
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+# CONFIG_MTD is not set
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+#
+# Plug and Play support
+#
+# CONFIG_PNPACPI is not set
+#
+# Block devices
+#
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+#
+# Misc devices
+#
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
+# CONFIG_IDE is not set
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+CONFIG_CHR_DEV_SG=m
+# CONFIG_CHR_DEV_SCH is not set
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+#
+# SCSI low-level drivers
+#
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+CONFIG_SATA_SIL=y
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+CONFIG_PATA_PLATFORM=y
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_ARCNET is not set
+# CONFIG_PHYLIB is not set
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_STNIC is not set
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_SMC91X is not set
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=m
+# CONFIG_PCNET32_NAPI is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+# CONFIG_VIA_RHINE_NAPI is not set
+# CONFIG_SC92031 is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+CONFIG_E1000=m
+# CONFIG_E1000_NAPI is not set
+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+CONFIG_R8169=y
+# CONFIG_R8169_NAPI is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_TR is not set
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+# CONFIG_SERIO_I8042 is not set
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_NR_UARTS=2
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+# CONFIG_I2C is not set
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
+#
+# Graphics support
+#
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_FB is not set
+#
+# Sound
+#
+CONFIG_SOUND=m
+#
+# Advanced Linux Sound Architecture
+#
+# CONFIG_SND is not set
+#
+# Open Sound System
+#
+CONFIG_SOUND_PRIME=m
+# CONFIG_OSS_OBSOLETE is not set
+# CONFIG_SOUND_TRIDENT is not set
+# CONFIG_SOUND_MSNDCLAS is not set
+# CONFIG_SOUND_MSNDPIN is not set
+#
+# HID Devices
+#
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+# CONFIG_USB is not set
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+#
+# LED drivers
+#
+#
+# LED Triggers
+#
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+#
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+#
+#
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+#
+# I2C RTC drivers
+#
+#
+# SPI RTC drivers
+#
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_SH=y
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+#
+# DMA Clients
+#
+#
+# DMA Devices
+#
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_MINIX_FS=y
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+CONFIG_FUSE_FS=m
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=y
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_RAMFS=y
+CONFIG_CONFIGFS_FS=m
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_TCP=y
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
+CONFIG_RPCSEC_GSS_KRB5=y
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+CONFIG_NLS_CODEPAGE_932=y
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+#
+# Profiling support
+#
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=m
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_FRAME_POINTER is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_SH_STANDARD_BIOS=y
+# CONFIG_EARLY_SCIF_CONSOLE is not set
+CONFIG_EARLY_PRINTK=y
+# CONFIG_DEBUG_BOOTMEM is not set
+CONFIG_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_4KSTACKS is not set
+# CONFIG_SH_KGDB is not set
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_TEST is not set
+#
+# Hardware crypto devices
+#
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/sh/configs/r7785rp_defconfig b/arch/sh/configs/r7785rp_defconfig
index 0f5ec649da..5c29338532 100644
--- a/arch/sh/configs/r7785rp_defconfig
+++ b/arch/sh/configs/r7785rp_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc3
+# Linux kernel version: 2.6.22-rc4
-# Mon Mar 12 14:26:33 2007
+# Thu Jul 12 12:33:15 2007
 #
 CONFIG_SUPERH=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -11,7 +11,9 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-# CONFIG_GENERIC_TIME is not set
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_SYS_SUPPORTS_PCI=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -43,6 +45,7 @@ CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 # CONFIG_BLK_DEV_INITRD is not set
@@ -60,13 +63,18 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 # CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -102,55 +110,11 @@ CONFIG_DEFAULT_IOSCHED="noop"
 #
 # System type
 #
-# CONFIG_SH_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SOLUTION_ENGINE is not set
-# CONFIG_SH_7300_SOLUTION_ENGINE is not set
-# CONFIG_SH_7343_SOLUTION_ENGINE is not set
-# CONFIG_SH_73180_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SYSTEMH is not set
-# CONFIG_SH_HP6XX is not set
-# CONFIG_SH_SATURN is not set
-# CONFIG_SH_DREAMCAST is not set
-# CONFIG_SH_MPC1211 is not set
-# CONFIG_SH_SH03 is not set
-# CONFIG_SH_SECUREEDGE5410 is not set
-# CONFIG_SH_HS7751RVOIP is not set
-# CONFIG_SH_7710VOIPGW is not set
-# CONFIG_SH_RTS7751R2D is not set
-CONFIG_SH_HIGHLANDER=y
-# CONFIG_SH_EDOSK7705 is not set
-# CONFIG_SH_SH4202_MICRODEV is not set
-# CONFIG_SH_LANDISK is not set
-# CONFIG_SH_TITAN is not set
-# CONFIG_SH_SHMIN is not set
-# CONFIG_SH_7206_SOLUTION_ENGINE is not set
-# CONFIG_SH_7619_SOLUTION_ENGINE is not set
-# CONFIG_SH_UNKNOWN is not set
-# CONFIG_SH_R7780RP is not set
-# CONFIG_SH_R7780MP is not set
-CONFIG_SH_R7785RP=y
-#
-# Processor selection
-#
 CONFIG_CPU_SH4=y
 CONFIG_CPU_SH4A=y
 CONFIG_CPU_SHX2=y
-#
-# SH-2 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7604 is not set
 # CONFIG_CPU_SUBTYPE_SH7619 is not set
-#
-# SH-2A Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH7206 is not set
-#
-# SH-3 Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH7300 is not set
 # CONFIG_CPU_SUBTYPE_SH7705 is not set
 # CONFIG_CPU_SUBTYPE_SH7706 is not set
@@ -158,10 +122,7 @@ CONFIG_CPU_SHX2=y
 # CONFIG_CPU_SUBTYPE_SH7708 is not set
 # CONFIG_CPU_SUBTYPE_SH7709 is not set
 # CONFIG_CPU_SUBTYPE_SH7710 is not set
+# CONFIG_CPU_SUBTYPE_SH7712 is not set
-#
-# SH-4 Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH7750 is not set
 # CONFIG_CPU_SUBTYPE_SH7091 is not set
 # CONFIG_CPU_SUBTYPE_SH7750R is not set
@@ -170,23 +131,12 @@ CONFIG_CPU_SHX2=y
 # CONFIG_CPU_SUBTYPE_SH7751R is not set
 # CONFIG_CPU_SUBTYPE_SH7760 is not set
 # CONFIG_CPU_SUBTYPE_SH4_202 is not set
-#
-# ST40 Processor Support
-#
 # CONFIG_CPU_SUBTYPE_ST40STB1 is not set
 # CONFIG_CPU_SUBTYPE_ST40GX1 is not set
-#
-# SH-4A Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH7770 is not set
 # CONFIG_CPU_SUBTYPE_SH7780 is not set
 CONFIG_CPU_SUBTYPE_SH7785=y
+# CONFIG_CPU_SUBTYPE_SHX3 is not set
-#
-# SH4AL-DSP Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH73180 is not set
 # CONFIG_CPU_SUBTYPE_SH7343 is not set
 # CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -194,6 +144,7 @@ CONFIG_CPU_SUBTYPE_SH7785=y
 #
 # Memory management options
 #
+CONFIG_QUICKLIST=y
 CONFIG_MMU=y
 CONFIG_PAGE_OFFSET=0x80000000
 CONFIG_MEMORY_START=0x08000000
@@ -201,6 +152,12 @@ CONFIG_MEMORY_SIZE=0x08000000
 CONFIG_32BIT=y
 # CONFIG_X2TLB is not set
 CONFIG_VSYSCALL=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_MAX_ACTIVE_REGIONS=1
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PAGE_SIZE_64KB is not set
@@ -215,17 +172,17 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPARSEMEM_STATIC=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
 #
 # Cache configuration
 #
 # CONFIG_SH_DIRECT_MAPPED is not set
 # CONFIG_SH_WRITETHROUGH is not set
-# CONFIG_SH_OCRAM is not set
 #
 # Processor features
@@ -241,12 +198,22 @@ CONFIG_CPU_HAS_SR_RB=y
 CONFIG_CPU_HAS_PTEA=y
 #
+# Board support
+#
+CONFIG_SH_HIGHLANDER=y
+# CONFIG_SH_R7780RP is not set
+# CONFIG_SH_R7780MP is not set
+CONFIG_SH_R7785RP=y
+#
 # Timer and clock configuration
 #
 CONFIG_SH_TMU=y
 CONFIG_SH_TIMER_IRQ=28
-CONFIG_NO_IDLE_HZ=y
 CONFIG_SH_PCLK_FREQ=50000000
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
 #
 # CPU Frequency scaling
@@ -261,7 +228,6 @@ CONFIG_SH_PCLK_FREQ=50000000
 #
 # Companion Chips
 #
-# CONFIG_HD6446X_SERIES is not set
 #
 # Additional SuperH Device Drivers
@@ -278,7 +244,7 @@ CONFIG_HZ_250=y
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
 CONFIG_KEXEC=y
-# CONFIG_SMP is not set
+# CONFIG_CRASH_DUMP is not set
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
@@ -300,31 +266,22 @@ CONFIG_PCI=y
 CONFIG_SH_PCIDMA_NONCOHERENT=y
 CONFIG_PCI_AUTO=y
 CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 #
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_FLAT is not set
 # CONFIG_BINFMT_MISC is not set
 #
-# Power management options (EXPERIMENTAL)
-#
-# CONFIG_PM is not set
-#
 # Networking
 #
 CONFIG_NET=y
@@ -332,7 +289,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -377,20 +333,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 CONFIG_BRIDGE=m
@@ -417,8 +361,16 @@ CONFIG_LLC=m
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
-# CONFIG_IEEE80211 is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
 CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -438,10 +390,6 @@ CONFIG_FW_LOADER=m
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -475,12 +423,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -509,6 +455,7 @@ CONFIG_CHR_DEV_SG=m
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -554,10 +501,6 @@ CONFIG_CHR_DEV_SG=m
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_SATA_AHCI is not set
@@ -580,6 +523,7 @@ CONFIG_SATA_SIL=y
 # CONFIG_PATA_AMD is not set
 # CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CS5520 is not set
 # CONFIG_PATA_CS5530 is not set
@@ -629,6 +573,7 @@ CONFIG_PATA_PLATFORM=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 #
@@ -644,15 +589,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 #
@@ -673,10 +610,7 @@ CONFIG_MII=y
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
+CONFIG_NETDEV_1000=y
-#
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -689,55 +623,26 @@ CONFIG_R8169=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
-#
-# Ethernet (10000 Mbit)
-#
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
-#
-CONFIG_NET_RADIO=y
-# CONFIG_NET_WIRELESS_RTNETLINK is not set
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-# CONFIG_IPW2100 is not set
-# CONFIG_IPW2200 is not set
-# CONFIG_HERMES is not set
-# CONFIG_ATMEL is not set
-#
-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
-#
-# CONFIG_PRISM54 is not set
-# CONFIG_HOSTAP is not set
-CONFIG_NET_WIRELESS=y
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -789,6 +694,7 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -831,14 +737,8 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_DRM is not set
@@ -848,10 +748,7 @@ CONFIG_HW_RANDOM=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -864,16 +761,15 @@ CONFIG_HW_RANDOM=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 #
@@ -885,22 +781,30 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_CFB_FILLRECT is not set
 # CONFIG_FB_CFB_COPYAREA is not set
 # CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@@ -908,7 +812,7 @@ CONFIG_FB=y
 # CONFIG_FB_TILEBLITTING is not set
 #
-# Frambuffer hardware drivers
+# Frame buffer hardware drivers
 #
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
@@ -930,12 +834,11 @@ CONFIG_FB=y
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
 # CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
 # CONFIG_FB_VIRTUAL is not set
-#
-# Logo configuration
-#
 # CONFIG_LOGO is not set
 #
@@ -952,13 +855,10 @@ CONFIG_SOUND=m
 # Open Sound System
 #
 CONFIG_SOUND_PRIME=m
-# CONFIG_OBSOLETE_OSS is not set
+# CONFIG_OSS_OBSOLETE is not set
-# CONFIG_SOUND_BT878 is not set
-# CONFIG_SOUND_ICH is not set
 # CONFIG_SOUND_TRIDENT is not set
 # CONFIG_SOUND_MSNDCLAS is not set
 # CONFIG_SOUND_MSNDPIN is not set
-# CONFIG_SOUND_VIA82CXXX is not set
 #
 # HID Devices
@@ -982,10 +882,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -1026,18 +922,30 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+#
+# I2C RTC drivers
+#
 #
-# RTC drivers
+# SPI RTC drivers
+#
+#
+# Platform RTC drivers
 #
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
-CONFIG_RTC_DRV_SH=y
-# CONFIG_RTC_DRV_TEST is not set
 # CONFIG_RTC_DRV_V3020 is not set
 #
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_SH=y
+#
 # DMA Engine support
 #
 # CONFIG_DMA_ENGINE is not set
@@ -1051,14 +959,6 @@ CONFIG_RTC_DRV_SH=y
 #
 #
-# Auxiliary Display support
-#
-#
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1157,6 +1057,7 @@ CONFIG_EXPORTFS=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1239,7 +1140,6 @@ CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DETECT_SOFTLOCKUP is not set
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
@@ -1266,6 +1166,7 @@ CONFIG_FORCED_INLINING=y
 CONFIG_SH_STANDARD_BIOS=y
 # CONFIG_EARLY_SCIF_CONSOLE is not set
 CONFIG_EARLY_PRINTK=y
+# CONFIG_DEBUG_BOOTMEM is not set
 CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_DEBUG_STACK_USAGE=y
 # CONFIG_4KSTACKS is not set
@@ -1300,6 +1201,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
@@ -1328,7 +1230,9 @@ CONFIG_CRYPTO_DES=y
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig
index 87ab9080fd..f2f2a3c9c3 100644
--- a/arch/sh/configs/se7206_defconfig
+++ b/arch/sh/configs/se7206_defconfig
@@ -1,18 +1,22 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19
+# Linux kernel version: 2.6.22-rc4
-# Wed Dec  6 14:40:15 2006
+# Fri Jun 15 19:37:46 2007
 #
 CONFIG_SUPERH=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 # CONFIG_GENERIC_TIME is not set
+# CONFIG_GENERIC_CLOCKEVENTS is not set
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 #
@@ -34,8 +38,10 @@ CONFIG_LOCALVERSION=""
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -48,12 +54,17 @@ CONFIG_BUG=y
 # CONFIG_ELF_CORE is not set
 # CONFIG_BASE_FULL is not set
 # CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
-CONFIG_SLAB=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 # CONFIG_VM_EVENT_COUNTERS is not set
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_TINY_SHMEM=y
 CONFIG_BASE_SMALL=1
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -83,53 +94,10 @@ CONFIG_DEFAULT_IOSCHED="noop"
 #
 # System type
 #
-# CONFIG_SH_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SOLUTION_ENGINE is not set
-# CONFIG_SH_7300_SOLUTION_ENGINE is not set
-# CONFIG_SH_7343_SOLUTION_ENGINE is not set
-# CONFIG_SH_73180_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SYSTEMH is not set
-# CONFIG_SH_HP6XX is not set
-# CONFIG_SH_EC3104 is not set
-# CONFIG_SH_SATURN is not set
-# CONFIG_SH_DREAMCAST is not set
-# CONFIG_SH_BIGSUR is not set
-# CONFIG_SH_MPC1211 is not set
-# CONFIG_SH_SH03 is not set
-# CONFIG_SH_SECUREEDGE5410 is not set
-# CONFIG_SH_HS7751RVOIP is not set
-# CONFIG_SH_7710VOIPGW is not set
-# CONFIG_SH_RTS7751R2D is not set
-# CONFIG_SH_R7780RP is not set
-# CONFIG_SH_EDOSK7705 is not set
-# CONFIG_SH_SH4202_MICRODEV is not set
-# CONFIG_SH_LANDISK is not set
-# CONFIG_SH_TITAN is not set
-# CONFIG_SH_SHMIN is not set
-CONFIG_SH_7206_SOLUTION_ENGINE=y
-# CONFIG_SH_7619_SOLUTION_ENGINE is not set
-# CONFIG_SH_UNKNOWN is not set
-#
-# Processor selection
-#
 CONFIG_CPU_SH2=y
 CONFIG_CPU_SH2A=y
-#
-# SH-2 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7604 is not set
 # CONFIG_CPU_SUBTYPE_SH7619 is not set
-#
-# SH-2A Processor Support
-#
 CONFIG_CPU_SUBTYPE_SH7206=y
-#
-# SH-3 Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH7300 is not set
 # CONFIG_CPU_SUBTYPE_SH7705 is not set
 # CONFIG_CPU_SUBTYPE_SH7706 is not set
@@ -137,10 +105,7 @@ CONFIG_CPU_SUBTYPE_SH7206=y
 # CONFIG_CPU_SUBTYPE_SH7708 is not set
 # CONFIG_CPU_SUBTYPE_SH7709 is not set
 # CONFIG_CPU_SUBTYPE_SH7710 is not set
+# CONFIG_CPU_SUBTYPE_SH7712 is not set
-#
-# SH-4 Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH7750 is not set
 # CONFIG_CPU_SUBTYPE_SH7091 is not set
 # CONFIG_CPU_SUBTYPE_SH7750R is not set
@@ -149,32 +114,28 @@ CONFIG_CPU_SUBTYPE_SH7206=y
 # CONFIG_CPU_SUBTYPE_SH7751R is not set
 # CONFIG_CPU_SUBTYPE_SH7760 is not set
 # CONFIG_CPU_SUBTYPE_SH4_202 is not set
-#
-# ST40 Processor Support
-#
 # CONFIG_CPU_SUBTYPE_ST40STB1 is not set
 # CONFIG_CPU_SUBTYPE_ST40GX1 is not set
-#
-# SH-4A Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH7770 is not set
 # CONFIG_CPU_SUBTYPE_SH7780 is not set
 # CONFIG_CPU_SUBTYPE_SH7785 is not set
-#
-# SH4AL-DSP Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH73180 is not set
 # CONFIG_CPU_SUBTYPE_SH7343 is not set
+# CONFIG_CPU_SUBTYPE_SH7722 is not set
 #
 # Memory management options
 #
+CONFIG_QUICKLIST=y
 CONFIG_PAGE_OFFSET=0x00000000
 CONFIG_MEMORY_START=0x0c000000
 CONFIG_MEMORY_SIZE=0x04000000
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_MAX_ACTIVE_REGIONS=1
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PAGE_SIZE_64KB is not set
@@ -184,35 +145,42 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPARSEMEM_STATIC=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
 #
 # Cache configuration
 #
 # CONFIG_SH_DIRECT_MAPPED is not set
 # CONFIG_SH_WRITETHROUGH is not set
-# CONFIG_SH_OCRAM is not set
 #
 # Processor features
 #
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_SH_FPU is not set
 # CONFIG_SH_FPU_EMU is not set
 # CONFIG_SH_DSP is not set
+CONFIG_CPU_HAS_IPR_IRQ=y
+#
+# Board support
+#
+CONFIG_SOLUTION_ENGINE=y
+CONFIG_SH_7206_SOLUTION_ENGINE=y
 #
-# Timer support
+# Timer and clock configuration
 #
 CONFIG_SH_CMT=y
 # CONFIG_SH_MTU2 is not set
 CONFIG_SH_TIMER_IRQ=140
-# CONFIG_NO_IDLE_HZ is not set
 CONFIG_SH_PCLK_FREQ=33333333
 CONFIG_SH_CLK_MD=6
+# CONFIG_TICK_ONESHOT is not set
 #
 # CPU Frequency scaling
@@ -227,11 +195,11 @@ CONFIG_SH_CLK_MD=6
 #
 # Companion Chips
 #
-# CONFIG_HD6446X_SERIES is not set
 #
 # Additional SuperH Device Drivers
 #
+# CONFIG_HEARTBEAT is not set
 # CONFIG_PUSH_SWITCH is not set
 #
@@ -239,10 +207,11 @@ CONFIG_SH_CLK_MD=6
 #
 CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=100
 # CONFIG_KEXEC is not set
-# CONFIG_SMP is not set
+# CONFIG_CRASH_DUMP is not set
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
@@ -252,23 +221,18 @@ CONFIG_PREEMPT_NONE=y
 #
 CONFIG_ZERO_PAGE_OFFSET=0x00001000
 CONFIG_BOOT_LINK_OFFSET=0x00800000
-# CONFIG_UBC_WAKEUP is not set
 # CONFIG_CMDLINE_BOOL is not set
 #
 # Bus options
 #
-# CONFIG_PCI is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 #
-# PCI Hotplug Support
-#
-#
 # Executable file formats
 #
 CONFIG_BINFMT_FLAT=y
@@ -277,11 +241,6 @@ CONFIG_BINFMT_ZFLAT=y
 # CONFIG_BINFMT_MISC is not set
 #
-# Power management options (EXPERIMENTAL)
-#
-# CONFIG_PM is not set
-#
 # Networking
 #
 CONFIG_NET=y
@@ -289,7 +248,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 # CONFIG_PACKET is not set
 # CONFIG_UNIX is not set
 # CONFIG_NET_KEY is not set
@@ -314,25 +272,14 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -358,7 +305,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -375,10 +331,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_CONCAT=y
@@ -393,6 +345,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # User Modules And Translation Layers
 #
 CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
@@ -424,7 +377,6 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 #
 # Mapping drivers for chip access
@@ -452,16 +404,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=4
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
 #
-# OneNAND Flash Device Drivers
+# UBI - Unsorted block images
 #
-# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_UBI is not set
 #
 # Parallel port support
@@ -471,6 +420,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=4
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -479,18 +429,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=4
 # CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 #
 # Misc devices
 #
-# CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -499,10 +444,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=4
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -511,19 +452,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=4
 # CONFIG_MD is not set
 #
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-#
-# IEEE 1394 (FireWire) support
-#
-#
-# I2O device support
-#
-#
 # Network device support
 #
 CONFIG_NETDEVICES=y
@@ -531,10 +459,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 #
@@ -544,27 +468,14 @@ CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_STNIC is not set
 CONFIG_SMC91X=y
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 #
-# Ethernet (1000 Mbit)
+# Wireless LAN
-#
-#
-# Ethernet (10000 Mbit)
-#
-#
-# Token Ring devices
-#
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -604,6 +515,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -639,29 +551,15 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_RAW_DRIVER is not set
 #
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -674,27 +572,30 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
+# CONFIG_HWMON is not set
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
+# CONFIG_MFD_SM501 is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 #
@@ -703,6 +604,12 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SOUND is not set
 #
+# HID Devices
+#
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+#
 # USB support
 #
 # CONFIG_USB_ARCH_HAS_HCD is not set
@@ -717,10 +624,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -802,7 +705,6 @@ CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
 # CONFIG_SYSFS is not set
 # CONFIG_TMPFS is not set
-# CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
@@ -816,7 +718,6 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
 # CONFIG_JFFS2_FS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
@@ -849,6 +750,11 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_NLS is not set
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+#
 # Profiling support
 #
 # CONFIG_PROFILING is not set
@@ -861,14 +767,11 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_UNWIND_INFO is not set
-# CONFIG_HEADERS_CHECK is not set
 # CONFIG_SH_STANDARD_BIOS is not set
 # CONFIG_EARLY_SCIF_CONSOLE is not set
-# CONFIG_KGDB is not set
 #
 # Security options
@@ -883,8 +786,13 @@ CONFIG_LOG_BUF_SHIFT=14
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/sh/configs/se7619_defconfig b/arch/sh/configs/se7619_defconfig
index 20ac7f4c53..3a3c3c1f50 100644
--- a/arch/sh/configs/se7619_defconfig
+++ b/arch/sh/configs/se7619_defconfig
@@ -1,18 +1,22 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19
+# Linux kernel version: 2.6.22-rc4
-# Wed Dec  6 16:35:36 2006
+# Fri Jun 15 19:43:06 2007
 #
 CONFIG_SUPERH=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 # CONFIG_GENERIC_TIME is not set
+# CONFIG_GENERIC_CLOCKEVENTS is not set
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 #
@@ -31,8 +35,10 @@ CONFIG_LOCALVERSION=""
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -45,12 +51,17 @@ CONFIG_BUG=y
 # CONFIG_ELF_CORE is not set
 # CONFIG_BASE_FULL is not set
 # CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
-CONFIG_SLAB=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 # CONFIG_VM_EVENT_COUNTERS is not set
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_TINY_SHMEM=y
 CONFIG_BASE_SMALL=1
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -80,52 +91,9 @@ CONFIG_DEFAULT_IOSCHED="noop"
 #
 # System type
 #
-# CONFIG_SH_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SOLUTION_ENGINE is not set
-# CONFIG_SH_7300_SOLUTION_ENGINE is not set
-# CONFIG_SH_7343_SOLUTION_ENGINE is not set
-# CONFIG_SH_73180_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SYSTEMH is not set
-# CONFIG_SH_HP6XX is not set
-# CONFIG_SH_EC3104 is not set
-# CONFIG_SH_SATURN is not set
-# CONFIG_SH_DREAMCAST is not set
-# CONFIG_SH_BIGSUR is not set
-# CONFIG_SH_MPC1211 is not set
-# CONFIG_SH_SH03 is not set
-# CONFIG_SH_SECUREEDGE5410 is not set
-# CONFIG_SH_HS7751RVOIP is not set
-# CONFIG_SH_7710VOIPGW is not set
-# CONFIG_SH_RTS7751R2D is not set
-# CONFIG_SH_R7780RP is not set
-# CONFIG_SH_EDOSK7705 is not set
-# CONFIG_SH_SH4202_MICRODEV is not set
-# CONFIG_SH_LANDISK is not set
-# CONFIG_SH_TITAN is not set
-# CONFIG_SH_SHMIN is not set
-# CONFIG_SH_7206_SOLUTION_ENGINE is not set
-CONFIG_SH_7619_SOLUTION_ENGINE=y
-# CONFIG_SH_UNKNOWN is not set
-#
-# Processor selection
-#
 CONFIG_CPU_SH2=y
-#
-# SH-2 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7604 is not set
 CONFIG_CPU_SUBTYPE_SH7619=y
-#
-# SH-2A Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH7206 is not set
-#
-# SH-3 Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH7300 is not set
 # CONFIG_CPU_SUBTYPE_SH7705 is not set
 # CONFIG_CPU_SUBTYPE_SH7706 is not set
@@ -133,10 +101,7 @@ CONFIG_CPU_SUBTYPE_SH7619=y
 # CONFIG_CPU_SUBTYPE_SH7708 is not set
 # CONFIG_CPU_SUBTYPE_SH7709 is not set
 # CONFIG_CPU_SUBTYPE_SH7710 is not set
+# CONFIG_CPU_SUBTYPE_SH7712 is not set
-#
-# SH-4 Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH7750 is not set
 # CONFIG_CPU_SUBTYPE_SH7091 is not set
 # CONFIG_CPU_SUBTYPE_SH7750R is not set
@@ -145,32 +110,28 @@ CONFIG_CPU_SUBTYPE_SH7619=y
 # CONFIG_CPU_SUBTYPE_SH7751R is not set
 # CONFIG_CPU_SUBTYPE_SH7760 is not set
 # CONFIG_CPU_SUBTYPE_SH4_202 is not set
-#
-# ST40 Processor Support
-#
 # CONFIG_CPU_SUBTYPE_ST40STB1 is not set
 # CONFIG_CPU_SUBTYPE_ST40GX1 is not set
-#
-# SH-4A Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH7770 is not set
 # CONFIG_CPU_SUBTYPE_SH7780 is not set
 # CONFIG_CPU_SUBTYPE_SH7785 is not set
-#
-# SH4AL-DSP Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH73180 is not set
 # CONFIG_CPU_SUBTYPE_SH7343 is not set
+# CONFIG_CPU_SUBTYPE_SH7722 is not set
 #
 # Memory management options
 #
+CONFIG_QUICKLIST=y
 CONFIG_PAGE_OFFSET=0x00000000
 CONFIG_MEMORY_START=0x0c000000
 CONFIG_MEMORY_SIZE=0x04000000
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_MAX_ACTIVE_REGIONS=1
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PAGE_SIZE_64KB is not set
@@ -180,34 +141,41 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPARSEMEM_STATIC=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
 #
 # Cache configuration
 #
 # CONFIG_SH_DIRECT_MAPPED is not set
 CONFIG_SH_WRITETHROUGH=y
-# CONFIG_SH_OCRAM is not set
 #
 # Processor features
 #
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_SH_FPU is not set
 # CONFIG_SH_FPU_EMU is not set
 # CONFIG_SH_DSP is not set
+CONFIG_CPU_HAS_IPR_IRQ=y
+#
+# Board support
+#
+CONFIG_SOLUTION_ENGINE=y
+CONFIG_SH_7619_SOLUTION_ENGINE=y
 #
-# Timer support
+# Timer and clock configuration
 #
 CONFIG_SH_CMT=y
 CONFIG_SH_TIMER_IRQ=86
-# CONFIG_NO_IDLE_HZ is not set
 CONFIG_SH_PCLK_FREQ=31250000
 CONFIG_SH_CLK_MD=5
+# CONFIG_TICK_ONESHOT is not set
 #
 # CPU Frequency scaling
@@ -222,11 +190,11 @@ CONFIG_SH_CLK_MD=5
 #
 # Companion Chips
 #
-# CONFIG_HD6446X_SERIES is not set
 #
 # Additional SuperH Device Drivers
 #
+# CONFIG_HEARTBEAT is not set
 # CONFIG_PUSH_SWITCH is not set
 #
@@ -234,10 +202,11 @@ CONFIG_SH_CLK_MD=5
 #
 CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=100
 # CONFIG_KEXEC is not set
-# CONFIG_SMP is not set
+# CONFIG_CRASH_DUMP is not set
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
@@ -247,23 +216,18 @@ CONFIG_PREEMPT_NONE=y
 #
 CONFIG_ZERO_PAGE_OFFSET=0x00001000
 CONFIG_BOOT_LINK_OFFSET=0x00800000
-# CONFIG_UBC_WAKEUP is not set
 # CONFIG_CMDLINE_BOOL is not set
 #
 # Bus options
 #
-# CONFIG_PCI is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 #
-# PCI Hotplug Support
-#
-#
 # Executable file formats
 #
 CONFIG_BINFMT_FLAT=y
@@ -272,11 +236,6 @@ CONFIG_BINFMT_ZFLAT=y
 # CONFIG_BINFMT_MISC is not set
 #
-# Power management options (EXPERIMENTAL)
-#
-# CONFIG_PM is not set
-#
 # Networking
 #
 # CONFIG_NET is not set
@@ -295,10 +254,6 @@ CONFIG_BINFMT_ZFLAT=y
 #
 # Connector - unified userspace <-> kernelspace linker
 #
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_CONCAT=y
@@ -313,6 +268,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # User Modules And Translation Layers
 #
 CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
@@ -344,7 +300,6 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 #
 # Mapping drivers for chip access
@@ -372,16 +327,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
 #
-# OneNAND Flash Device Drivers
+# UBI - Unsorted block images
 #
-# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_UBI is not set
 #
 # Parallel port support
@@ -391,6 +343,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 #
 # Block devices
@@ -398,17 +351,12 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 #
 # Misc devices
 #
-# CONFIG_TIFM_CORE is not set
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -417,10 +365,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 #
@@ -429,19 +373,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # CONFIG_MD is not set
 #
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-#
-# IEEE 1394 (FireWire) support
-#
-#
-# I2O device support
-#
-#
 # ISDN subsystem
 #
@@ -471,6 +402,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -506,29 +438,15 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_RAW_DRIVER is not set
 #
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -541,26 +459,29 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
+# CONFIG_HWMON is not set
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
+# CONFIG_MFD_SM501 is not set
-# CONFIG_HWMON_VID is not set
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+CONFIG_DAB=y
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 #
@@ -569,6 +490,12 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SOUND is not set
 #
+# HID Devices
+#
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+#
 # USB support
 #
 # CONFIG_USB_ARCH_HAS_HCD is not set
@@ -583,10 +510,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -668,7 +591,6 @@ CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
 # CONFIG_SYSFS is not set
 # CONFIG_TMPFS is not set
-# CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
@@ -682,7 +604,6 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
 # CONFIG_JFFS2_FS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
@@ -715,14 +636,11 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_UNWIND_INFO is not set
-# CONFIG_HEADERS_CHECK is not set
 # CONFIG_SH_STANDARD_BIOS is not set
 # CONFIG_EARLY_SCIF_CONSOLE is not set
-# CONFIG_KGDB is not set
 #
 # Security options
@@ -737,8 +655,13 @@ CONFIG_LOG_BUF_SHIFT=14
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/sh/configs/se7722_defconfig b/arch/sh/configs/se7722_defconfig
index ca4c663dfa..764b813c40 100644
--- a/arch/sh/configs/se7722_defconfig
+++ b/arch/sh/configs/se7722_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc7
+# Linux kernel version: 2.6.22-rc4
-# Fri Apr 27 16:30:30 2007
+# Wed Jun 20 18:08:04 2007
 #
 CONFIG_SUPERH=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -11,7 +11,9 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-# CONFIG_GENERIC_TIME is not set
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_SYS_SUPPORTS_NUMA=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -43,6 +45,7 @@ CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -60,14 +63,20 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 #
 # Loadable module support
@@ -103,57 +112,12 @@ CONFIG_DEFAULT_IOSCHED="noop"
 #
 # System type
 #
-CONFIG_SOLUTION_ENGINE=y
-# CONFIG_SH_SOLUTION_ENGINE is not set
-CONFIG_SH_7722_SOLUTION_ENGINE=y
-# CONFIG_SH_7751_SOLUTION_ENGINE is not set
-# CONFIG_SH_7780_SOLUTION_ENGINE is not set
-# CONFIG_SH_7300_SOLUTION_ENGINE is not set
-# CONFIG_SH_7343_SOLUTION_ENGINE is not set
-# CONFIG_SH_73180_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SYSTEMH is not set
-# CONFIG_SH_HP6XX is not set
-# CONFIG_SH_SATURN is not set
-# CONFIG_SH_DREAMCAST is not set
-# CONFIG_SH_MPC1211 is not set
-# CONFIG_SH_SH03 is not set
-# CONFIG_SH_SECUREEDGE5410 is not set
-# CONFIG_SH_HS7751RVOIP is not set
-# CONFIG_SH_7710VOIPGW is not set
-# CONFIG_SH_RTS7751R2D is not set
-# CONFIG_SH_HIGHLANDER is not set
-# CONFIG_SH_EDOSK7705 is not set
-# CONFIG_SH_SH4202_MICRODEV is not set
-# CONFIG_SH_LANDISK is not set
-# CONFIG_SH_TITAN is not set
-# CONFIG_SH_SHMIN is not set
-# CONFIG_SH_7206_SOLUTION_ENGINE is not set
-# CONFIG_SH_7619_SOLUTION_ENGINE is not set
-# CONFIG_SH_LBOX_RE2 is not set
-# CONFIG_SH_UNKNOWN is not set
-#
-# Processor selection
-#
 CONFIG_CPU_SH4=y
 CONFIG_CPU_SH4A=y
 CONFIG_CPU_SH4AL_DSP=y
 CONFIG_CPU_SHX2=y
-#
-# SH-2 Processor Support
-#
-# CONFIG_CPU_SUBTYPE_SH7604 is not set
 # CONFIG_CPU_SUBTYPE_SH7619 is not set
-#
-# SH-2A Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH7206 is not set
-#
-# SH-3 Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH7300 is not set
 # CONFIG_CPU_SUBTYPE_SH7705 is not set
 # CONFIG_CPU_SUBTYPE_SH7706 is not set
@@ -162,10 +126,6 @@ CONFIG_CPU_SHX2=y
 # CONFIG_CPU_SUBTYPE_SH7709 is not set
 # CONFIG_CPU_SUBTYPE_SH7710 is not set
 # CONFIG_CPU_SUBTYPE_SH7712 is not set
-#
-# SH-4 Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH7750 is not set
 # CONFIG_CPU_SUBTYPE_SH7091 is not set
 # CONFIG_CPU_SUBTYPE_SH7750R is not set
@@ -174,23 +134,11 @@ CONFIG_CPU_SHX2=y
 # CONFIG_CPU_SUBTYPE_SH7751R is not set
 # CONFIG_CPU_SUBTYPE_SH7760 is not set
 # CONFIG_CPU_SUBTYPE_SH4_202 is not set
-#
-# ST40 Processor Support
-#
 # CONFIG_CPU_SUBTYPE_ST40STB1 is not set
 # CONFIG_CPU_SUBTYPE_ST40GX1 is not set
-#
-# SH-4A Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH7770 is not set
 # CONFIG_CPU_SUBTYPE_SH7780 is not set
 # CONFIG_CPU_SUBTYPE_SH7785 is not set
-#
-# SH4AL-DSP Processor Support
-#
 # CONFIG_CPU_SUBTYPE_SH73180 is not set
 # CONFIG_CPU_SUBTYPE_SH7343 is not set
 CONFIG_CPU_SUBTYPE_SH7722=y
@@ -198,15 +146,21 @@ CONFIG_CPU_SUBTYPE_SH7722=y
 #
 # Memory management options
 #
+CONFIG_QUICKLIST=y
 CONFIG_MMU=y
 CONFIG_PAGE_OFFSET=0x80000000
 CONFIG_MEMORY_START=0x0c000000
 CONFIG_MEMORY_SIZE=0x04000000
-# CONFIG_32BIT is not set
 # CONFIG_X2TLB is not set
 CONFIG_VSYSCALL=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_NUMA=y
+CONFIG_NODES_SHIFT=1
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_MAX_ACTIVE_REGIONS=2
 CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PAGE_SIZE_64KB is not set
@@ -216,26 +170,25 @@ CONFIG_HUGETLB_PAGE_SIZE_64K=y
 # CONFIG_HUGETLB_PAGE_SIZE_4MB is not set
 # CONFIG_HUGETLB_PAGE_SIZE_64MB is not set
 CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
+# CONFIG_FLATMEM_MANUAL is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_FLATMEM=y
+CONFIG_SPARSEMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_NEED_MULTIPLE_NODES=y
-# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_STATIC=y
+# CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MIGRATION=y
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
 #
 # Cache configuration
 #
 # CONFIG_SH_DIRECT_MAPPED is not set
 # CONFIG_SH_WRITETHROUGH is not set
-# CONFIG_SH_OCRAM is not set
-CONFIG_CF_ENABLER=y
-# CONFIG_CF_AREA5 is not set
-CONFIG_CF_AREA6=y
-CONFIG_CF_BASE_ADDR=0xb8000000
 #
 # Processor features
@@ -252,12 +205,20 @@ CONFIG_CPU_HAS_SR_RB=y
 CONFIG_CPU_HAS_PTEA=y
 #
+# Board support
+#
+CONFIG_SOLUTION_ENGINE=y
+CONFIG_SH_7722_SOLUTION_ENGINE=y
+#
 # Timer and clock configuration
 #
 CONFIG_SH_TMU=y
 CONFIG_SH_TIMER_IRQ=16
-CONFIG_NO_IDLE_HZ=y
 CONFIG_SH_PCLK_FREQ=33333333
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 #
 # CPU Frequency scaling
@@ -272,7 +233,6 @@ CONFIG_SH_PCLK_FREQ=33333333
 #
 # Companion Chips
 #
-# CONFIG_HD6446X_SERIES is not set
 #
 # Additional SuperH Device Drivers
@@ -290,7 +250,6 @@ CONFIG_HZ_250=y
 CONFIG_HZ=250
 CONFIG_KEXEC=y
 # CONFIG_CRASH_DUMP is not set
-# CONFIG_SMP is not set
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
@@ -307,7 +266,11 @@ CONFIG_BOOT_LINK_OFFSET=0x00800000
 #
 # Bus options
 #
-# CONFIG_PCI is not set
+CONFIG_CF_ENABLER=y
+# CONFIG_CF_AREA5 is not set
+CONFIG_CF_AREA6=y
+CONFIG_CF_BASE_ADDR=0xb8000000
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -315,22 +278,12 @@ CONFIG_BOOT_LINK_OFFSET=0x00800000
 # CONFIG_PCCARD is not set
 #
-# PCI Hotplug Support
-#
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_FLAT is not set
 # CONFIG_BINFMT_MISC is not set
 #
-# Power management options (EXPERIMENTAL)
-#
-# CONFIG_PM is not set
-#
 # Networking
 #
 CONFIG_NET=y
@@ -338,7 +291,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
@@ -375,20 +327,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -414,7 +354,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 #
 # Device Drivers
@@ -432,10 +381,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 #
@@ -464,10 +409,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # Misc devices
 #
+# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 #
@@ -496,6 +438,7 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
@@ -511,10 +454,6 @@ CONFIG_BLK_DEV_SD=y
 #
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_DEBUG is not set
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_PATA_PLATFORM=y
@@ -525,19 +464,6 @@ CONFIG_PATA_PLATFORM=y
 # CONFIG_MD is not set
 #
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-#
-# IEEE 1394 (FireWire) support
-#
-#
-# I2O device support
-#
-#
 # Network device support
 #
 CONFIG_NETDEVICES=y
@@ -545,10 +471,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 #
@@ -558,27 +480,14 @@ CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_STNIC is not set
 CONFIG_SMC91X=y
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 #
-# Ethernet (1000 Mbit)
+# Wireless LAN
-#
-#
-# Ethernet (10000 Mbit)
-#
-#
-# Token Ring devices
-#
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-#
-# Wan interfaces
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -627,6 +536,7 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -667,14 +577,8 @@ CONFIG_LEGACY_PTY_COUNT=256
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
@@ -682,10 +586,6 @@ CONFIG_HW_RANDOM=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 #
@@ -698,16 +598,15 @@ CONFIG_HW_RANDOM=y
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 #
@@ -719,16 +618,19 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 #
@@ -757,10 +659,6 @@ CONFIG_HID=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 #
@@ -800,18 +698,30 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
 #
-# RTC drivers
+# I2C RTC drivers
+#
+#
+# SPI RTC drivers
+#
+#
+# Platform RTC drivers
 #
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
-CONFIG_RTC_DRV_SH=y
-# CONFIG_RTC_DRV_TEST is not set
 # CONFIG_RTC_DRV_V3020 is not set
 #
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_SH=y
+#
 # DMA Engine support
 #
 # CONFIG_DMA_ENGINE is not set
@@ -825,14 +735,6 @@ CONFIG_RTC_DRV_SH=y
 #
 #
-# Auxiliary Display support
-#
-#
-# Virtualization
-#
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -937,23 +839,24 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Profiling support
 #
-# CONFIG_PROFILING is not set
+CONFIG_PROFILING=y
+# CONFIG_OPROFILE is not set
 #
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK_TIME=y
 # CONFIG_ENABLE_MUST_CHECK is not set
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_SH_STANDARD_BIOS is not set
+CONFIG_SH_STANDARD_BIOS=y
 # CONFIG_EARLY_SCIF_CONSOLE is not set
+# CONFIG_EARLY_PRINTK is not set
 # CONFIG_SH_KGDB is not set
 #
@@ -973,8 +876,10 @@ CONFIG_LOG_BUF_SHIFT=14
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/sh/configs/shx3_defconfig b/arch/sh/configs/shx3_defconfig
new file mode 100644
index 0000000000..219bad558b
--- /dev/null
+++ b/arch/sh/configs/shx3_defconfig
@@ -0,0 +1,756 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.22-rc4
+# Wed Jun 20 14:09:27 2007
+#
+CONFIG_SUPERH=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_UTS_NS is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+#
+# System type
+#
+CONFIG_CPU_SH4=y
+CONFIG_CPU_SH4A=y
+CONFIG_CPU_SHX3=y
+# CONFIG_CPU_SUBTYPE_SH7619 is not set
+# CONFIG_CPU_SUBTYPE_SH7206 is not set
+# CONFIG_CPU_SUBTYPE_SH7300 is not set
+# CONFIG_CPU_SUBTYPE_SH7705 is not set
+# CONFIG_CPU_SUBTYPE_SH7706 is not set
+# CONFIG_CPU_SUBTYPE_SH7707 is not set
+# CONFIG_CPU_SUBTYPE_SH7708 is not set
+# CONFIG_CPU_SUBTYPE_SH7709 is not set
+# CONFIG_CPU_SUBTYPE_SH7710 is not set
+# CONFIG_CPU_SUBTYPE_SH7712 is not set
+# CONFIG_CPU_SUBTYPE_SH7750 is not set
+# CONFIG_CPU_SUBTYPE_SH7091 is not set
+# CONFIG_CPU_SUBTYPE_SH7750R is not set
+# CONFIG_CPU_SUBTYPE_SH7750S is not set
+# CONFIG_CPU_SUBTYPE_SH7751 is not set
+# CONFIG_CPU_SUBTYPE_SH7751R is not set
+# CONFIG_CPU_SUBTYPE_SH7760 is not set
+# CONFIG_CPU_SUBTYPE_SH4_202 is not set
+# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
+# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
+# CONFIG_CPU_SUBTYPE_SH7770 is not set
+# CONFIG_CPU_SUBTYPE_SH7780 is not set
+# CONFIG_CPU_SUBTYPE_SH7785 is not set
+CONFIG_CPU_SUBTYPE_SHX3=y
+# CONFIG_CPU_SUBTYPE_SH73180 is not set
+# CONFIG_CPU_SUBTYPE_SH7343 is not set
+# CONFIG_CPU_SUBTYPE_SH7722 is not set
+#
+# Memory management options
+#
+CONFIG_QUICKLIST=y
+CONFIG_MMU=y
+CONFIG_PAGE_OFFSET=0x80000000
+CONFIG_MEMORY_START=0x0c000000
+CONFIG_MEMORY_SIZE=0x04000000
+CONFIG_VSYSCALL=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_MAX_ACTIVE_REGIONS=1
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
+CONFIG_HUGETLB_PAGE_SIZE_64K=y
+# CONFIG_HUGETLB_PAGE_SIZE_256K is not set
+# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
+# CONFIG_HUGETLB_PAGE_SIZE_4MB is not set
+# CONFIG_HUGETLB_PAGE_SIZE_64MB is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
+#
+# Cache configuration
+#
+# CONFIG_SH_DIRECT_MAPPED is not set
+# CONFIG_SH_WRITETHROUGH is not set
+#
+# Processor features
+#
+CONFIG_CPU_LITTLE_ENDIAN=y
+# CONFIG_CPU_BIG_ENDIAN is not set
+# CONFIG_SH_FPU is not set
+# CONFIG_SH_FPU_EMU is not set
+CONFIG_SH_DSP=y
+CONFIG_SH_STORE_QUEUES=y
+CONFIG_CPU_HAS_INTEVT=y
+CONFIG_CPU_HAS_INTC2_IRQ=y
+CONFIG_CPU_HAS_SR_RB=y
+#
+# Board support
+#
+#
+# Timer and clock configuration
+#
+CONFIG_SH_TMU=y
+CONFIG_SH_TIMER_IRQ=16
+CONFIG_SH_PCLK_FREQ=50000000
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+#
+# DMA support
+#
+# CONFIG_SH_DMA is not set
+#
+# Companion Chips
+#
+#
+# Additional SuperH Device Drivers
+#
+CONFIG_HEARTBEAT=y
+# CONFIG_PUSH_SWITCH is not set
+#
+# Kernel features
+#
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_KEXEC=y
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_BKL=y
+#
+# Boot options
+#
+CONFIG_ZERO_PAGE_OFFSET=0x00001000
+CONFIG_BOOT_LINK_OFFSET=0x00800000
+# CONFIG_UBC_WAKEUP is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttySC0,115200 ip=192.168.1.2:::255.255.255.0 root=/dev/nfs nfsroot=192.168.1.1:/exports/devel/rfs/mobiler noaliencache earlyprintk=bios ignore_loglevel"
+#
+# Bus options
+#
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+#
+# Networking
+#
+# CONFIG_NET is not set
+#
+# Device Drivers
+#
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_MTD is not set
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+#
+# Plug and Play support
+#
+# CONFIG_PNPACPI is not set
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_CDROM_PKTCDVD is not set
+#
+# Misc devices
+#
+# CONFIG_BLINK is not set
+# CONFIG_IDE is not set
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+#
+# SCSI low-level drivers
+#
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_PATA_PLATFORM=y
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+#
+# ISDN subsystem
+#
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+# CONFIG_SERIO_I8042 is not set
+# CONFIG_SERIO_SERPORT is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_NR_UARTS=2
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+# CONFIG_I2C is not set
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+# CONFIG_HWMON is not set
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DAB is not set
+#
+# Graphics support
+#
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_FB is not set
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+#
+# HID Devices
+#
+# CONFIG_HID is not set
+#
+# USB support
+#
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+#
+# LED drivers
+#
+#
+# LED Triggers
+#
+#
+# InfiniBand support
+#
+#
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+#
+#
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+#
+# I2C RTC drivers
+#
+#
+# SPI RTC drivers
+#
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_SH=y
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+#
+# DMA Clients
+#
+#
+# DMA Devices
+#
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+#
+# Profiling support
+#
+CONFIG_PROFILING=y
+# CONFIG_OPROFILE is not set
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+CONFIG_DEBUG_SLAB=y
+CONFIG_DEBUG_SLAB_LEAK=y
+CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_DEBUG_MUTEXES=y
+CONFIG_DEBUG_LOCK_ALLOC=y
+# CONFIG_PROVE_LOCKING is not set
+CONFIG_LOCKDEP=y
+CONFIG_DEBUG_LOCKDEP=y
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_VM=y
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FRAME_POINTER=y
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_SH_STANDARD_BIOS=y
+# CONFIG_EARLY_SCIF_CONSOLE is not set
+CONFIG_EARLY_PRINTK=y
+# CONFIG_DEBUG_BOOTMEM is not set
+CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_DEBUG_STACK_USAGE=y
+# CONFIG_4KSTACKS is not set
+# CONFIG_SH_KGDB is not set
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig
index 99935f9daf..333898077c 100644
--- a/arch/sh/drivers/dma/Kconfig
+++ b/arch/sh/drivers/dma/Kconfig
@@ -36,23 +36,6 @@ config NR_DMA_CHANNELS
          support. Setting this to a higher value allows for cascading DMACs
          with additional channels.
-config DMA_PAGE_OPS
-        bool "Use DMAC for page copy/clear"
-        depends on SH_DMA && BROKEN
-        help
-          Selecting this option will use a dual-address mode configured channel
-          in the SH DMAC for copy_page()/clear_page(). Primarily a performance
-          hack.
-config DMA_PAGE_OPS_CHANNEL
-        depends on DMA_PAGE_OPS
-        int "DMA channel for sh memory-manager page copy/clear"
-        default "3"
-        help
-          This allows the specification of the dual address dma channel,
-          in case channel 3 is unavailable. On the SH4, channels 1,2, and 3
-          are dual-address capable.
 config SH_DMABRG
        bool "SH7760 DMABRG support"
        depends on CPU_SUBTYPE_SH7760
diff --git a/arch/sh/drivers/pci/Kconfig b/arch/sh/drivers/pci/Kconfig
index 6d1cbbe674..fbc6f2c864 100644
--- a/arch/sh/drivers/pci/Kconfig
+++ b/arch/sh/drivers/pci/Kconfig
@@ -1,5 +1,6 @@
 config PCI
        bool "PCI support"
+        depends on SYS_SUPPORTS_PCI
        help
          Find out whether you have a PCI motherboard. PCI is the name of a
          bus system, i.e. the way the CPU talks to the other stuff inside
diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile
index 9104b62576..1f141a8ba1 100644
--- a/arch/sh/kernel/Makefile
+++ b/arch/sh/kernel/Makefile
@@ -4,10 +4,9 @@
 extra-y := head.o init_task.o vmlinux.lds
-obj-y   := process.o signal.o traps.o irq.o \
+obj-y   := debugtraps.o io.o io_generic.o irq.o machvec.o process.o ptrace.o \
-        ptrace.o setup.o time.o sys_sh.o semaphore.o \
+           semaphore.o setup.o signal.o sys_sh.o syscalls.o \
-        io.o io_generic.o sh_ksyms.o syscalls.o \
+           time.o topology.o traps.o
-        debugtraps.o
 obj-y                           += cpu/ timers/
 obj-$(CONFIG_VSYSCALL)          += vsyscall/
@@ -17,7 +16,7 @@ obj-$(CONFIG_CF_ENABLER)	+= cf-enabler.o
 obj-$(CONFIG_SH_STANDARD_BIOS)  += sh_bios.o
 obj-$(CONFIG_SH_KGDB)           += kgdb_stub.o kgdb_jmp.o
 obj-$(CONFIG_SH_CPU_FREQ)       += cpufreq.o
-obj-$(CONFIG_MODULES)           += module.o
+obj-$(CONFIG_MODULES)           += sh_ksyms.o module.o
 obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
 obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o
 obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
diff --git a/arch/sh/kernel/cf-enabler.c b/arch/sh/kernel/cf-enabler.c
index ebc73b8509..1c3b99642e 100644
--- a/arch/sh/kernel/cf-enabler.c
+++ b/arch/sh/kernel/cf-enabler.c
@@ -75,11 +75,7 @@ static int __init cf_init_default(void)
 #if defined(CONFIG_CPU_SH4)
        allocate_cf_area();
 #endif
-#if defined(CONFIG_SH_UNKNOWN)
-        /* This should be done in each board's init_xxx_irq. */
-        make_imask_irq(14);
-        disable_irq(14);
-#endif
        return 0;
 }
diff --git a/arch/sh/kernel/cpu/init.c b/arch/sh/kernel/cpu/init.c
index 6451ad6301..9172e97dc2 100644
--- a/arch/sh/kernel/cpu/init.c
+++ b/arch/sh/kernel/cpu/init.c
@@ -21,8 +21,7 @@
 #include <asm/cacheflush.h>
 #include <asm/cache.h>
 #include <asm/io.h>
+#include <asm/ubc.h>
-extern void detect_cpu_and_cache_system(void);
 /*
 * Generic wrapper for command line arguments to disable on-chip
@@ -152,15 +151,6 @@ static void __init cache_init(void)
        flags |= CCR_CACHE_CB;
 #endif
-#ifdef CONFIG_SH_OCRAM
-        /* Turn on OCRAM -- halve the OC */
-        flags |= CCR_CACHE_ORA;
-        current_cpu_data.dcache.sets >>= 1;
-        current_cpu_data.dcache.way_size = current_cpu_data.dcache.sets *
-                                    current_cpu_data.dcache.linesz;
-#endif
        ctrl_outl(flags, CCR);
        back_to_P1();
 }
@@ -269,7 +259,6 @@ asmlinkage void __init sh_cpu_init(void)
        }
 #endif
-#ifdef CONFIG_UBC_WAKEUP
        /*
         * Some brain-damaged loaders decided it would be a good idea to put
         * the UBC to sleep. This causes some issues when it comes to things
@@ -277,7 +266,5 @@ asmlinkage void __init sh_cpu_init(void)
         * we wake it up and hope that all is well.
         */
        ubc_wakeup();
-#endif
        speculative_execution_init();
 }
diff --git a/arch/sh/kernel/cpu/irq/intc2.c b/arch/sh/kernel/cpu/irq/intc2.c
index d8e22f4ff0..cc5221390e 100644
--- a/arch/sh/kernel/cpu/irq/intc2.c
+++ b/arch/sh/kernel/cpu/irq/intc2.c
@@ -13,36 +13,31 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <asm/smp.h>
-#if defined(CONFIG_CPU_SUBTYPE_SH7760)
+static inline struct intc2_desc *get_intc2_desc(unsigned int irq)
-#define INTC2_BASE      0xfe080000
+{
-#define INTC2_INTMSK    (INTC2_BASE + 0x40)
+        struct irq_chip *chip = get_irq_chip(irq);
-#define INTC2_INTMSKCLR (INTC2_BASE + 0x60)
+        return (void *)((char *)chip - offsetof(struct intc2_desc, chip));
-#elif defined(CONFIG_CPU_SUBTYPE_SH7780) || \
+}
-      defined(CONFIG_CPU_SUBTYPE_SH7785)
-#define INTC2_BASE      0xffd40000
-#define INTC2_INTMSK    (INTC2_BASE + 0x38)
-#define INTC2_INTMSKCLR (INTC2_BASE + 0x3c)
-#endif
 static void disable_intc2_irq(unsigned int irq)
 {
        struct intc2_data *p = get_irq_chip_data(irq);
-        ctrl_outl(1 << p->msk_shift, INTC2_INTMSK + p->msk_offset);
+        struct intc2_desc *d = get_intc2_desc(irq);
+        ctrl_outl(1 << p->msk_shift, d->msk_base + p->msk_offset +
+                                     (hard_smp_processor_id() * 4));
 }
 static void enable_intc2_irq(unsigned int irq)
 {
        struct intc2_data *p = get_irq_chip_data(irq);
-        ctrl_outl(1 << p->msk_shift, INTC2_INTMSKCLR + p->msk_offset);
+        struct intc2_desc *d = get_intc2_desc(irq);
-}
-static struct irq_chip intc2_irq_chip = {
+        ctrl_outl(1 << p->msk_shift, d->mskclr_base + p->msk_offset +
-        .name           = "INTC2",
+                                     (hard_smp_processor_id() * 4));
-        .mask           = disable_intc2_irq,
+}
-        .unmask         = enable_intc2_irq,
-        .mask_ack       = disable_intc2_irq,
-};
 /*
 * Setup an INTC2 style interrupt.
@@ -56,30 +51,36 @@ static struct irq_chip intc2_irq_chip = {
 *
 * in the intc2_data table.
 */
-void make_intc2_irq(struct intc2_data *table, unsigned int nr_irqs)
+void register_intc2_controller(struct intc2_desc *desc)
 {
        int i;
-        for (i = 0; i < nr_irqs; i++) {
+        desc->chip.mask = disable_intc2_irq;
+        desc->chip.unmask = enable_intc2_irq;
+        desc->chip.mask_ack = disable_intc2_irq;
+        for (i = 0; i < desc->nr_irqs; i++) {
                unsigned long ipr, flags;
-                struct intc2_data *p = table + i;
+                struct intc2_data *p = desc->intc2_data + i;
                disable_irq_nosync(p->irq);
-                /* Set the priority level */
+                if (desc->prio_base) {
-                local_irq_save(flags);
+                        /* Set the priority level */
+                        local_irq_save(flags);
-                ipr = ctrl_inl(INTC2_BASE + p->ipr_offset);
+                        ipr = ctrl_inl(desc->prio_base + p->ipr_offset);
-                ipr &= ~(0xf << p->ipr_shift);
+                        ipr &= ~(0xf << p->ipr_shift);
-                ipr |= p->priority << p->ipr_shift;
+                        ipr |= p->priority << p->ipr_shift;
-                ctrl_outl(ipr, INTC2_BASE + p->ipr_offset);
+                        ctrl_outl(ipr, desc->prio_base + p->ipr_offset);
-                local_irq_restore(flags);
+                        local_irq_restore(flags);
+                }
-                set_irq_chip_and_handler_name(p->irq, &intc2_irq_chip,
+                set_irq_chip_and_handler_name(p->irq, &desc->chip,
                                              handle_level_irq, "level");
                set_irq_chip_data(p->irq, p);
-                enable_intc2_irq(p->irq);
+                disable_intc2_irq(p->irq);
        }
 }
diff --git a/arch/sh/kernel/cpu/irq/ipr.c b/arch/sh/kernel/cpu/irq/ipr.c
index 210280b6fd..98e84f40c7 100644
--- a/arch/sh/kernel/cpu/irq/ipr.c
+++ b/arch/sh/kernel/cpu/irq/ipr.c
@@ -22,58 +22,57 @@
 #include <linux/io.h>
 #include <linux/interrupt.h>
+static inline struct ipr_desc *get_ipr_desc(unsigned int irq)
+{
+        struct irq_chip *chip = get_irq_chip(irq);
+        return (void *)((char *)chip - offsetof(struct ipr_desc, chip));
+}
 static void disable_ipr_irq(unsigned int irq)
 {
        struct ipr_data *p = get_irq_chip_data(irq);
+        unsigned long addr = get_ipr_desc(irq)->ipr_offsets[p->ipr_idx];
        /* Set the priority in IPR to 0 */
-        ctrl_outw(ctrl_inw(p->addr) & (0xffff ^ (0xf << p->shift)), p->addr);
+        ctrl_outw(ctrl_inw(addr) & (0xffff ^ (0xf << p->shift)), addr);
 }
 static void enable_ipr_irq(unsigned int irq)
 {
        struct ipr_data *p = get_irq_chip_data(irq);
+        unsigned long addr = get_ipr_desc(irq)->ipr_offsets[p->ipr_idx];
        /* Set priority in IPR back to original value */
-        ctrl_outw(ctrl_inw(p->addr) | (p->priority << p->shift), p->addr);
+        ctrl_outw(ctrl_inw(addr) | (p->priority << p->shift), addr);
 }
-static struct irq_chip ipr_irq_chip = {
+/*
-        .name           = "IPR",
+ * The shift value is now the number of bits to shift, not the number of
-        .mask           = disable_ipr_irq,
+ * bits/4. This is to make it easier to read the value directly from the
-        .unmask         = enable_ipr_irq,
+ * datasheets. The IPR address is calculated using the ipr_offset table.
-        .mask_ack       = disable_ipr_irq,
+ */
-};
-unsigned int map_ipridx_to_addr(int idx) __attribute__ ((weak));
-unsigned int map_ipridx_to_addr(int idx)
-{
-        return 0;
-}
-void make_ipr_irq(struct ipr_data *table, unsigned int nr_irqs)
+void register_ipr_controller(struct ipr_desc *desc)
 {
        int i;
-        for (i = 0; i < nr_irqs; i++) {
+        desc->chip.mask = disable_ipr_irq;
-                unsigned int irq = table[i].irq;
+        desc->chip.unmask = enable_ipr_irq;
+        desc->chip.mask_ack = disable_ipr_irq;
-                if (!irq)
+        for (i = 0; i < desc->nr_irqs; i++) {
-                        irq = table[i].irq = i;
+                struct ipr_data *p = desc->ipr_data + i;
-                /* could the IPR index be mapped, if not we ignore this */
+                BUG_ON(p->ipr_idx >= desc->nr_offsets);
-                if (!table[i].addr) {
+                BUG_ON(!desc->ipr_offsets[p->ipr_idx]);
-                        table[i].addr = map_ipridx_to_addr(table[i].ipr_idx);
-                        if (!table[i].addr)
-                                continue;
-                }
-                disable_irq_nosync(irq);
+                disable_irq_nosync(p->irq);
-                set_irq_chip_and_handler_name(irq, &ipr_irq_chip,
+                set_irq_chip_and_handler_name(p->irq, &desc->chip,
                                      handle_level_irq, "level");
-                set_irq_chip_data(irq, &table[i]);
+                set_irq_chip_data(p->irq, p);
-                enable_ipr_irq(irq);
+                disable_ipr_irq(p->irq);
        }
 }
-EXPORT_SYMBOL(make_ipr_irq);
+EXPORT_SYMBOL(register_ipr_controller);
 #if !defined(CONFIG_CPU_HAS_PINT_IRQ)
 int ipr_irq_demux(int irq)
diff --git a/arch/sh/kernel/cpu/sh2/entry.S b/arch/sh/kernel/cpu/sh2/entry.S
index c16dc8fec4..ee8f1fe84b 100644
--- a/arch/sh/kernel/cpu/sh2/entry.S
+++ b/arch/sh/kernel/cpu/sh2/entry.S
@@ -311,6 +311,7 @@ restore_all:
        rte
         nop
+        .align 2
 #ifdef CONFIG_TRACE_IRQFLAGS
 1:     .long   trace_hardirqs_off
 #endif
diff --git a/arch/sh/kernel/cpu/sh2/probe.c b/arch/sh/kernel/cpu/sh2/probe.c
index 108e81b682..abbf17427e 100644
--- a/arch/sh/kernel/cpu/sh2/probe.c
+++ b/arch/sh/kernel/cpu/sh2/probe.c
@@ -9,23 +9,14 @@
 * License.  See the file "COPYING" in the main directory of this archive
 * for more details.
 */
 #include <linux/init.h>
+#include <linux/smp.h>
 #include <asm/processor.h>
 #include <asm/cache.h>
 int __init detect_cpu_and_cache_system(void)
 {
-#if defined(CONFIG_CPU_SUBTYPE_SH7604)
+#if defined(CONFIG_CPU_SUBTYPE_SH7619)
-        current_cpu_data.type                   = CPU_SH7604;
-        current_cpu_data.dcache.ways            = 4;
-        current_cpu_data.dcache.way_incr        = (1<<10);
-        current_cpu_data.dcache.sets            = 64;
-        current_cpu_data.dcache.entry_shift     = 4;
-        current_cpu_data.dcache.linesz          = L1_CACHE_BYTES;
-        current_cpu_data.dcache.flags           = 0;
-#elif defined(CONFIG_CPU_SUBTYPE_SH7619)
        current_cpu_data.type                   = CPU_SH7619;
        current_cpu_data.dcache.ways            = 4;
        current_cpu_data.dcache.way_incr        = (1<<12);
diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
index f83ff8a68f..1a107fe22d 100644
--- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c
+++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
@@ -52,7 +52,7 @@ static int __init sh7619_devices_setup(void)
 }
 __initcall(sh7619_devices_setup);
-static struct ipr_data sh7619_ipr_map[] = {
+static struct ipr_data ipr_irq_table[] = {
        { 86, 0,  4, 2 },       /* CMI0 */
        { 88, 1, 12, 3 },       /* SCIF0_ERI */
        { 89, 1, 12, 3 },       /* SCIF0_RXI */
@@ -68,7 +68,7 @@ static struct ipr_data sh7619_ipr_map[] = {
        { 99, 1,  4, 3 },       /* SCIF2_TXI */
 };
-static unsigned int ipr_offsets[] = {
+static unsigned long ipr_offsets[] = {
        0xf8080000,     /* IPRC */
        0xf8080002,     /* IPRD */
        0xf8080004,     /* IPRE */
@@ -76,15 +76,19 @@ static unsigned int ipr_offsets[] = {
        0xf8080008,     /* IPRG */
 };
-/* given the IPR index return the address of the IPR register */
+static struct ipr_desc ipr_irq_desc = {
-unsigned int map_ipridx_to_addr(int idx)
+        .ipr_offsets    = ipr_offsets,
-{
+        .nr_offsets     = ARRAY_SIZE(ipr_offsets),
-        if (unlikely(idx >= ARRAY_SIZE(ipr_offsets)))
-                return 0;
+        .ipr_data       = ipr_irq_table,
-        return ipr_offsets[idx];
+        .nr_irqs        = ARRAY_SIZE(ipr_irq_table),
-}
+        .chip = {
+                .name   = "IPR-sh7619",
+        },
+};
 void __init init_IRQ_ipr(void)
 {
-        make_ipr_irq(sh7619_ipr_map, ARRAY_SIZE(sh7619_ipr_map));
+        register_ipr_controller(&ipr_irq_desc);
 }
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
index 4ed9110632..b6e3a6351f 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
@@ -57,7 +57,7 @@ static int __init sh7206_devices_setup(void)
 }
 __initcall(sh7206_devices_setup);
-static struct ipr_data sh7206_ipr_map[] = {
+static struct ipr_data ipr_irq_table[] = {
        { 140,  7, 12, 2 },     /* CMI0 */
        { 164,  8,  4, 2 },     /* MTU2_TGI1A */
        { 240, 13, 12, 3 },     /* SCIF0_BRI */
@@ -78,7 +78,7 @@ static struct ipr_data sh7206_ipr_map[] = {
        { 255, 13,  0, 3 },     /* SCIF3_TXI */
 };
-static unsigned int ipr_offsets[] = {
+static unsigned long ipr_offsets[] = {
        0xfffe0818,     /* IPR01 */
        0xfffe081a,     /* IPR02 */
        0,              /* unused */
@@ -95,15 +95,19 @@ static unsigned int ipr_offsets[] = {
        0xfffe0c10,     /* IPR14 */
 };
-/* given the IPR index return the address of the IPR register */
+static struct ipr_desc ipr_irq_desc = {
-unsigned int map_ipridx_to_addr(int idx)
+        .ipr_offsets    = ipr_offsets,
-{
+        .nr_offsets     = ARRAY_SIZE(ipr_offsets),
-        if (unlikely(idx >= ARRAY_SIZE(ipr_offsets)))
-                return 0;
+        .ipr_data       = ipr_irq_table,
-        return ipr_offsets[idx];
+        .nr_irqs        = ARRAY_SIZE(ipr_irq_table),
-}
+        .chip = {
+                .name   = "IPR-sh7206",
+        },
+};
 void __init init_IRQ_ipr(void)
 {
-        make_ipr_irq(sh7206_ipr_map, ARRAY_SIZE(sh7206_ipr_map));
+        register_ipr_controller(&ipr_irq_desc);
 }
diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S
index b0b59d4a33..d8e122971c 100644
--- a/arch/sh/kernel/cpu/sh3/entry.S
+++ b/arch/sh/kernel/cpu/sh3/entry.S
@@ -340,8 +340,27 @@ ENTRY(vbr_base)
 general_exception:
        mov.l   1f, k2
        mov.l   2f, k3
+#ifdef CONFIG_CPU_SUBTYPE_SHX3
+        mov.l   @k2, k2
+        ! Is EXPEVT larger than 0x800?
+        mov     #0x8, k0
+        shll8   k0
+        cmp/hs  k0, k2
+        bf      0f
+        ! then add 0x580 (k2 is 0xd80 or 0xda0)
+        mov     #0x58, k0
+        shll2   k0
+        shll2   k0
+        add     k0, k2
+0:
+        bra     handle_exception
+         nop
+#else
        bra     handle_exception
         mov.l  @k2, k2
+#endif
        .align  2
 1:      .long   EXPEVT
 2:      .long   ret_from_exception
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7705.c b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
index 1983fb7ad6..a55b8ce2c5 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7705.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
@@ -48,7 +48,7 @@ static int __init sh7705_devices_setup(void)
 }
 __initcall(sh7705_devices_setup);
-static struct ipr_data sh7705_ipr_map[] = {
+static struct ipr_data ipr_irq_table[] = {
        /* IRQ, IPR-idx, shift, priority */
        { 16, 0, 12, 2 }, /* TMU0 TUNI*/
        { 17, 0,  8, 2 }, /* TMU1 TUNI */
@@ -70,25 +70,29 @@ static struct ipr_data sh7705_ipr_map[] = {
 };
 static unsigned long ipr_offsets[] = {
-        0xFFFFFEE2      /* 0: IPRA */
+        0xFFFFFEE2,     /* 0: IPRA */
-,       0xFFFFFEE4      /* 1: IPRB */
+        0xFFFFFEE4,     /* 1: IPRB */
-,       0xA4000016      /* 2: IPRC */
+        0xA4000016,     /* 2: IPRC */
-,       0xA4000018      /* 3: IPRD */
+        0xA4000018,     /* 3: IPRD */
-,       0xA400001A      /* 4: IPRE */
+        0xA400001A,     /* 4: IPRE */
-,       0xA4080000      /* 5: IPRF */
+        0xA4080000,     /* 5: IPRF */
-,       0xA4080002      /* 6: IPRG */
+        0xA4080002,     /* 6: IPRG */
-,       0xA4080004      /* 7: IPRH */
+        0xA4080004,     /* 7: IPRH */
 };
-/* given the IPR index return the address of the IPR register */
+static struct ipr_desc ipr_irq_desc = {
-unsigned int map_ipridx_to_addr(int idx)
+        .ipr_offsets    = ipr_offsets,
-{
+        .nr_offsets     = ARRAY_SIZE(ipr_offsets),
-        if (idx >= ARRAY_SIZE(ipr_offsets))
-                return 0;
+        .ipr_data       = ipr_irq_table,
-        return ipr_offsets[idx];
+        .nr_irqs        = ARRAY_SIZE(ipr_irq_table),
-}
+        .chip = {
+                .name   = "IPR-sh7705",
+        },
+};
-void __init init_IRQ_ipr()
+void __init init_IRQ_ipr(void)
 {
-        make_ipr_irq(sh7705_ipr_map, ARRAY_SIZE(sh7705_ipr_map));
+        register_ipr_controller(&ipr_irq_desc);
 }
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7709.c b/arch/sh/kernel/cpu/sh3/setup-sh7709.c
index c7d7c35fc8..d79ec0c052 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7709.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7709.c
@@ -12,6 +12,26 @@
 #include <linux/serial.h>
 #include <asm/sci.h>
+static struct resource rtc_resources[] = {
+        [0] =   {
+                .start  = 0xfffffec0,
+                .end    = 0xfffffec0 + 0x1e,
+                .flags  = IORESOURCE_IO,
+        },
+        [1] =   {
+                .start  = 20,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] =   {
+                .start  = 21,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [3] =   {
+                .start  = 22,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
 static struct plat_sci_port sci_platform_data[] = {
        {
                .mapbase        = 0xfffffe80,
@@ -41,8 +61,16 @@ static struct platform_device sci_device = {
        },
 };
+static struct platform_device rtc_device = {
+        .name           = "sh-rtc",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(rtc_resources),
+        .resource       = rtc_resources,
+};
 static struct platform_device *sh7709_devices[] __initdata = {
        &sci_device,
+        &rtc_device,
 };
 static int __init sh7709_devices_setup(void)
@@ -52,32 +80,66 @@ static int __init sh7709_devices_setup(void)
 }
 __initcall(sh7709_devices_setup);
-#define IPRx(A,N)       .addr=A, .shift=N
+static struct ipr_data ipr_irq_table[] = {
-#define IPRA(N) IPRx(0xfffffee2UL,N)
+        { 16, 0, 12, 2 }, /* TMU TUNI0 */
-#define IPRB(N) IPRx(0xfffffee4UL,N)
+        { 17, 0, 8,  4 }, /* TMU TUNI1 */
-#define IPRC(N) IPRx(0xa4000016UL,N)
+        { 18, 0, 4,  1 }, /* TMU TUNI1 */
-#define IPRD(N) IPRx(0xa4000018UL,N)
+        { 19, 0, 4,  1 }, /* TMU TUNI1 */
-#define IPRE(N) IPRx(0xa400001aUL,N)
+        { 20, 0, 0,  2 }, /* RTC CUI */
+        { 21, 0, 0,  2 }, /* RTC CUI */
-static struct ipr_data sh7709_ipr_map[] = {
+        { 22, 0, 0,  2 }, /* RTC CUI */
-        [16]            = { IPRA(12), 2 }, /* TMU TUNI0 */
-        [17]            = { IPRA(8),  4 }, /* TMU TUNI1 */
+        { 23, 1, 4,  3 }, /* SCI */
-        [18 ... 19]     = { IPRA(4),  1 }, /* TMU TUNI1 */
+        { 24, 1, 4,  3 }, /* SCI */
-        [20 ... 22]     = { IPRA(0),  2 }, /* RTC CUI */
+        { 25, 1, 4,  3 }, /* SCI */
-        [23 ... 26]     = { IPRB(4),  3 }, /* SCI */
+        { 26, 1, 4,  3 }, /* SCI */
-        [27]            = { IPRB(12), 2 }, /* WDT ITI */
+        { 27, 1, 12, 3 }, /* WDT ITI */
-        [32]            = { IPRC(0),  1 }, /* IRQ 0 */
-        [33]            = { IPRC(4),  1 }, /* IRQ 1 */
+        { 32, 2, 0,  1 }, /* IRQ 0 */
-        [34]            = { IPRC(8),  1 }, /* IRQ 2 APM */
+        { 33, 2, 4,  1 }, /* IRQ 1 */
-        [35]            = { IPRC(12), 1 }, /* IRQ 3 TOUCHSCREEN */
+        { 34, 2, 8,  1 }, /* IRQ 2 APM */
-        [36]            = { IPRD(0),  1 }, /* IRQ 4 */
+        { 35, 2, 12, 1 }, /* IRQ 3 TOUCHSCREEN */
-        [37]            = { IPRD(4),  1 }, /* IRQ 5 */
-        [48 ... 51]     = { IPRE(12), 7 }, /* DMA */
+        { 36, 3, 0,  1 }, /* IRQ 4 */
-        [52 ... 55]     = { IPRE(8),  3 }, /* IRDA */
+        { 37, 3, 4,  1 }, /* IRQ 5 */
-        [56 ... 59]     = { IPRE(4),  3 }, /* SCIF */
+        { 48, 4, 12, 7 }, /* DMA */
+        { 49, 4, 12, 7 }, /* DMA */
+        { 50, 4, 12, 7 }, /* DMA */
+        { 51, 4, 12, 7 }, /* DMA */
+        { 52, 4, 8,  3 }, /* IRDA */
+        { 53, 4, 8,  3 }, /* IRDA */
+        { 54, 4, 8,  3 }, /* IRDA */
+        { 55, 4, 8,  3 }, /* IRDA */
+        { 56, 4, 4,  3 }, /* SCIF */
+        { 57, 4, 4,  3 }, /* SCIF */
+        { 58, 4, 4,  3 }, /* SCIF */
+        { 59, 4, 4,  3 }, /* SCIF */
+};
+static unsigned long ipr_offsets[] = {
+        0xfffffee2,     /* 0: IPRA */
+        0xfffffee4,     /* 1: IPRB */
+        0xa4000016,     /* 2: IPRC */
+        0xa4000018,     /* 3: IPRD */
+        0xa400001a,     /* 4: IPRE */
+};
+static struct ipr_desc ipr_irq_desc = {
+        .ipr_offsets    = ipr_offsets,
+        .nr_offsets     = ARRAY_SIZE(ipr_offsets),
+        .ipr_data       = ipr_irq_table,
+        .nr_irqs        = ARRAY_SIZE(ipr_irq_table),
+        .chip = {
+                .name   = "IPR-sh7709",
+        },
 };
-void __init init_IRQ_ipr()
+void __init init_IRQ_ipr(void)
 {
-        make_ipr_irq(sh7709_ipr_map, ARRAY_SIZE(sh7709_ipr_map));
+        register_ipr_controller(&ipr_irq_desc);
 }
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
index 51760a7e7f..f40e6dac33 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7710.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
@@ -49,7 +49,7 @@ static int __init sh7710_devices_setup(void)
 }
 __initcall(sh7710_devices_setup);
-static struct ipr_data sh7710_ipr_map[] = {
+static struct ipr_data ipr_irq_table[] = {
        /* IRQ, IPR-idx, shift, priority */
        { 16, 0, 12, 2 }, /* TMU0 TUNI*/
        { 17, 0,  8, 2 }, /* TMU1 TUNI */
@@ -78,26 +78,30 @@ static struct ipr_data sh7710_ipr_map[] = {
 };
 static unsigned long ipr_offsets[] = {
-        0xA414FEE2      /* 0: IPRA */
+        0xA414FEE2,     /* 0: IPRA */
-,       0xA414FEE4      /* 1: IPRB */
+        0xA414FEE4,     /* 1: IPRB */
-,       0xA4140016      /* 2: IPRC */
+        0xA4140016,     /* 2: IPRC */
-,       0xA4140018      /* 3: IPRD */
+        0xA4140018,     /* 3: IPRD */
-,       0xA414001A      /* 4: IPRE */
+        0xA414001A,     /* 4: IPRE */
-,       0xA4080000      /* 5: IPRF */
+        0xA4080000,     /* 5: IPRF */
-,       0xA4080002      /* 6: IPRG */
+        0xA4080002,     /* 6: IPRG */
-,       0xA4080004      /* 7: IPRH */
+        0xA4080004,     /* 7: IPRH */
-,       0xA4080006      /* 8: IPRI */
+        0xA4080006,     /* 8: IPRI */
 };
-/* given the IPR index return the address of the IPR register */
+static struct ipr_desc ipr_irq_desc = {
-unsigned int map_ipridx_to_addr(int idx)
+        .ipr_offsets    = ipr_offsets,
-{
+        .nr_offsets     = ARRAY_SIZE(ipr_offsets),
-        if (idx >= ARRAY_SIZE(ipr_offsets))
-                return 0;
+        .ipr_data       = ipr_irq_table,
-        return ipr_offsets[idx];
+        .nr_irqs        = ARRAY_SIZE(ipr_irq_table),
-}
+        .chip = {
+                .name   = "IPR-sh7710",
+        },
+};
-void __init init_IRQ_ipr()
+void __init init_IRQ_ipr(void)
 {
-        make_ipr_irq(sh7710_ipr_map, ARRAY_SIZE(sh7710_ipr_map));
+        register_ipr_controller(&ipr_irq_desc);
 }
diff --git a/arch/sh/kernel/cpu/sh4/Makefile b/arch/sh/kernel/cpu/sh4/Makefile
index 8add10bd82..dadd6bffc1 100644
--- a/arch/sh/kernel/cpu/sh4/Makefile
+++ b/arch/sh/kernel/cpu/sh4/Makefile
@@ -10,7 +10,11 @@ obj-$(CONFIG_SH_STORE_QUEUES)		+= sq.o
 # CPU subtype setup
 obj-$(CONFIG_CPU_SUBTYPE_SH7750)        += setup-sh7750.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7750R)       += setup-sh7750.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7750S)       += setup-sh7750.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7091)        += setup-sh7750.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7751)        += setup-sh7750.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7751R)       += setup-sh7750.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7760)        += setup-sh7760.o
 obj-$(CONFIG_CPU_SUBTYPE_SH4_202)       += setup-sh4-202.o
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index fab2eb0719..66c3f75647 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -141,6 +141,14 @@ int __init detect_cpu_and_cache_system(void)
                        current_cpu_data.flags |= CPU_HAS_LLSC;
                }
                break;
+        case 0x4000:    /* 1st cut */
+        case 0x4001:    /* 2nd cut */
+                current_cpu_data.type = CPU_SHX3;
+                current_cpu_data.icache.ways = 4;
+                current_cpu_data.dcache.ways = 4;
+                current_cpu_data.flags |= CPU_HAS_FPU | CPU_HAS_PERF_COUNTER |
+                                          CPU_HAS_LLSC;
+                break;
        case 0x8000:
                current_cpu_data.type = CPU_ST40RA;
                current_cpu_data.flags |= CPU_HAS_FPU;
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
index 03b14cf78d..da153bcdfe 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
@@ -82,7 +82,7 @@ static int __init sh7750_devices_setup(void)
 }
 __initcall(sh7750_devices_setup);
-static struct ipr_data sh7750_ipr_map[] = {
+static struct ipr_data ipr_irq_table[] = {
        /* IRQ, IPR-idx, shift, priority */
        { 16, 0, 12, 2 }, /* TMU0 TUNI*/
        { 17, 0, 12, 2 }, /* TMU1 TUNI */
@@ -106,8 +106,27 @@ static struct ipr_data sh7750_ipr_map[] = {
        { 38, 2,  8, 7 }, /* DMAC DMAE */
 };
+static unsigned long ipr_offsets[] = {
+        0xffd00004UL,   /* 0: IPRA */
+        0xffd00008UL,   /* 1: IPRB */
+        0xffd0000cUL,   /* 2: IPRC */
+        0xffd00010UL,   /* 3: IPRD */
+};
+static struct ipr_desc ipr_irq_desc = {
+        .ipr_offsets    = ipr_offsets,
+        .nr_offsets     = ARRAY_SIZE(ipr_offsets),
+        .ipr_data       = ipr_irq_table,
+        .nr_irqs        = ARRAY_SIZE(ipr_irq_table),
+        .chip = {
+                .name   = "IPR-sh7750",
+        },
+};
 #ifdef CONFIG_CPU_SUBTYPE_SH7751
-static struct ipr_data sh7751_ipr_map[] = {
+static struct ipr_data ipr_irq_table_sh7751[] = {
        { 44, 2,  8, 7 }, /* DMAC DMTE4 */
        { 45, 2,  8, 7 }, /* DMAC DMTE5 */
        { 46, 2,  8, 7 }, /* DMAC DMTE6 */
@@ -118,21 +137,26 @@ static struct ipr_data sh7751_ipr_map[] = {
        /*{ 72, INTPRI00,  8, ? },*/ /* TMU3 TUNI */
        /*{ 76, INTPRI00, 12, ? },*/ /* TMU4 TUNI */
 };
-#endif
-static unsigned long ipr_offsets[] = {
+static struct ipr_desc ipr_irq_desc_sh7751 = {
-        0xffd00004UL,   /* 0: IPRA */
+        .ipr_offsets    = ipr_offsets,
-        0xffd00008UL,   /* 1: IPRB */
+        .nr_offsets     = ARRAY_SIZE(ipr_offsets),
-        0xffd0000cUL,   /* 2: IPRC */
-        0xffd00010UL,   /* 3: IPRD */
+        .ipr_data       = ipr_irq_table_sh7751,
+        .nr_irqs        = ARRAY_SIZE(ipr_irq_table_sh7751),
+        .chip = {
+                .name   = "IPR-sh7751",
+        },
 };
+#endif
-/* given the IPR index return the address of the IPR register */
+void __init init_IRQ_ipr(void)
-unsigned int map_ipridx_to_addr(int idx)
 {
-        if (idx >= ARRAY_SIZE(ipr_offsets))
+        register_ipr_controller(&ipr_irq_desc);
-                return 0;
+#ifdef CONFIG_CPU_SUBTYPE_SH7751
-        return ipr_offsets[idx];
+        register_ipr_controller(&ipr_irq_desc_sh7751);
+#endif
 }
 #define INTC_ICR        0xffd00000UL
@@ -143,11 +167,3 @@ void ipr_irq_enable_irlm(void)
 {
        ctrl_outw(ctrl_inw(INTC_ICR) | INTC_ICR_IRLM, INTC_ICR);
 }
-void __init init_IRQ_ipr()
-{
-        make_ipr_irq(sh7750_ipr_map, ARRAY_SIZE(sh7750_ipr_map));
-#ifdef CONFIG_CPU_SUBTYPE_SH7751
-        make_ipr_irq(sh7751_ipr_map, ARRAY_SIZE(sh7751_ipr_map));
-#endif
-}
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7760.c b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
index b7c702821e..3df1697556 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7760.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
@@ -96,7 +96,25 @@ static struct intc2_data intc2_irq_table[] = {
        {109,12,  0, 4,  0,  3},        /* CMTI */
 };
-static struct ipr_data sh7760_ipr_map[] = {
+static struct intc2_desc intc2_irq_desc __read_mostly = {
+        .prio_base      = 0xfe080000,
+        .msk_base       = 0xfe080040,
+        .mskclr_base    = 0xfe080060,
+        .intc2_data     = intc2_irq_table,
+        .nr_irqs        = ARRAY_SIZE(intc2_irq_table),
+        .chip = {
+                .name   = "INTC2-sh7760",
+        },
+};
+void __init init_IRQ_intc2(void)
+{
+        register_intc2_controller(&intc2_irq_desc);
+}
+static struct ipr_data ipr_irq_table[] = {
        /* IRQ, IPR-idx, shift, priority */
        { 16, 0, 12, 2 }, /* TMU0 TUNI*/
        { 17, 0,  8, 2 }, /* TMU1 TUNI */
@@ -133,20 +151,19 @@ static unsigned long ipr_offsets[] = {
        0xffd00010UL,   /* 3: IPRD */
 };
-/* given the IPR index return the address of the IPR register */
+static struct ipr_desc ipr_irq_desc = {
-unsigned int map_ipridx_to_addr(int idx)
+        .ipr_offsets    = ipr_offsets,
-{
+        .nr_offsets     = ARRAY_SIZE(ipr_offsets),
-        if (idx >= ARRAY_SIZE(ipr_offsets))
-                return 0;
-        return ipr_offsets[idx];
-}
-void __init init_IRQ_intc2(void)
+        .ipr_data       = ipr_irq_table,
-{
+        .nr_irqs        = ARRAY_SIZE(ipr_irq_table),
-        make_intc2_irq(intc2_irq_table, ARRAY_SIZE(intc2_irq_table));
-}
+        .chip = {
+                .name   = "IPR-sh7760",
+        },
+};
-void __init  init_IRQ_ipr(void)
+void __init init_IRQ_ipr(void)
 {
-        make_ipr_irq(sh7760_ipr_map, ARRAY_SIZE(sh7760_ipr_map));
+        register_ipr_controller(&ipr_irq_desc);
 }
diff --git a/arch/sh/kernel/cpu/sh4a/Makefile b/arch/sh/kernel/cpu/sh4a/Makefile
index ab7422f8f8..4006232864 100644
--- a/arch/sh/kernel/cpu/sh4a/Makefile
+++ b/arch/sh/kernel/cpu/sh4a/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_CPU_SUBTYPE_SH7785)	+= setup-sh7785.o
 obj-$(CONFIG_CPU_SUBTYPE_SH73180)       += setup-sh73180.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7343)        += setup-sh7343.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7722)        += setup-sh7722.o
+obj-$(CONFIG_CPU_SUBTYPE_SHX3)          += setup-shx3.o
 # Primary on-chip clocks (common)
 clock-$(CONFIG_CPU_SUBTYPE_SH73180)     := clock-sh73180.o
@@ -17,5 +18,6 @@ clock-$(CONFIG_CPU_SUBTYPE_SH7780)	:= clock-sh7780.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7785)      := clock-sh7785.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7343)      := clock-sh7343.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7722)      := clock-sh7722.o
+clock-$(CONFIG_CPU_SUBTYPE_SHX3)        := clock-shx3.o
 obj-y   += $(clock-y)
diff --git a/arch/sh/kernel/cpu/sh4a/clock-shx3.c b/arch/sh/kernel/cpu/sh4a/clock-shx3.c
new file mode 100644
index 0000000000..c630b29e06
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh4a/clock-shx3.c
@@ -0,0 +1,135 @@
+/*
+ * arch/sh/kernel/cpu/sh4/clock-shx3.c
+ *
+ * SH-X3 support for the clock framework
+ *
+ *  Copyright (C) 2006-2007  Renesas Technology Corp.
+ *  Copyright (C) 2006-2007  Renesas Solutions Corp.
+ *  Copyright (C) 2006-2007  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <asm/clock.h>
+#include <asm/freq.h>
+#include <asm/io.h>
+static int ifc_divisors[] = { 1, 2, 4 ,6 };
+static int bfc_divisors[] = { 1, 1, 1, 1, 1, 12, 16, 18, 24, 32, 36, 48 };
+static int pfc_divisors[] = { 1, 1, 1, 1, 1, 1, 1, 18, 24, 32, 36, 48 };
+static int cfc_divisors[] = { 1, 1, 4, 6 };
+#define IFC_POS         28
+#define IFC_MSK         0x0003
+#define BFC_MSK         0x000f
+#define PFC_MSK         0x000f
+#define CFC_MSK         0x0003
+#define BFC_POS         16
+#define PFC_POS         0
+#define CFC_POS         20
+static void master_clk_init(struct clk *clk)
+{
+        clk->rate *= pfc_divisors[(ctrl_inl(FRQCR) >> PFC_POS) & PFC_MSK];
+}
+static struct clk_ops shx3_master_clk_ops = {
+        .init           = master_clk_init,
+};
+static void module_clk_recalc(struct clk *clk)
+{
+        int idx = ((ctrl_inl(FRQCR) >> PFC_POS) & PFC_MSK);
+        clk->rate = clk->parent->rate / pfc_divisors[idx];
+}
+static struct clk_ops shx3_module_clk_ops = {
+        .recalc         = module_clk_recalc,
+};
+static void bus_clk_recalc(struct clk *clk)
+{
+        int idx = ((ctrl_inl(FRQCR) >> BFC_POS) & BFC_MSK);
+        clk->rate = clk->parent->rate / bfc_divisors[idx];
+}
+static struct clk_ops shx3_bus_clk_ops = {
+        .recalc         = bus_clk_recalc,
+};
+static void cpu_clk_recalc(struct clk *clk)
+{
+        int idx = ((ctrl_inl(FRQCR) >> IFC_POS) & IFC_MSK);
+        clk->rate = clk->parent->rate / ifc_divisors[idx];
+}
+static struct clk_ops shx3_cpu_clk_ops = {
+        .recalc         = cpu_clk_recalc,
+};
+static struct clk_ops *shx3_clk_ops[] = {
+        &shx3_master_clk_ops,
+        &shx3_module_clk_ops,
+        &shx3_bus_clk_ops,
+        &shx3_cpu_clk_ops,
+};
+void __init arch_init_clk_ops(struct clk_ops **ops, int idx)
+{
+        if (idx < ARRAY_SIZE(shx3_clk_ops))
+                *ops = shx3_clk_ops[idx];
+}
+static void shyway_clk_recalc(struct clk *clk)
+{
+        int idx = ((ctrl_inl(FRQCR) >> CFC_POS) & CFC_MSK);
+        clk->rate = clk->parent->rate / cfc_divisors[idx];
+}
+static struct clk_ops shx3_shyway_clk_ops = {
+        .recalc         = shyway_clk_recalc,
+};
+static struct clk shx3_shyway_clk = {
+        .name           = "shyway_clk",
+        .flags          = CLK_ALWAYS_ENABLED,
+        .ops            = &shx3_shyway_clk_ops,
+};
+/*
+ * Additional SHx3-specific on-chip clocks that aren't already part of the
+ * clock framework
+ */
+static struct clk *shx3_onchip_clocks[] = {
+        &shx3_shyway_clk,
+};
+static int __init shx3_clk_init(void)
+{
+        struct clk *clk = clk_get(NULL, "master_clk");
+        int i;
+        for (i = 0; i < ARRAY_SIZE(shx3_onchip_clocks); i++) {
+                struct clk *clkp = shx3_onchip_clocks[i];
+                clkp->parent = clk;
+                clk_register(clkp);
+                clk_enable(clkp);
+        }
+        /*
+         * Now that we have the rest of the clocks registered, we need to
+         * force the parent clock to propagate so that these clocks will
+         * automatically figure out their rate. We cheat by handing the
+         * parent clock its current rate and forcing child propagation.
+         */
+        clk_set_rate(clk, clk_get_rate(clk));
+        clk_put(clk);
+        return 0;
+}
+arch_initcall(shx3_clk_init);
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index 1143fbf65f..a3e159ef6d 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -1,7 +1,7 @@
 /*
 * SH7722 Setup
 *
- *  Copyright (C) 2006  Paul Mundt
+ *  Copyright (C) 2006 - 2007  Paul Mundt
 *
 * This file is subject to the terms and conditions of the GNU General Public
 * License.  See the file "COPYING" in the main directory of this archive
@@ -10,6 +10,8 @@
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/serial.h>
+#include <linux/mm.h>
+#include <asm/mmzone.h>
 #include <asm/sci.h>
 static struct plat_sci_port sci_platform_data[] = {
@@ -42,7 +44,7 @@ static int __init sh7722_devices_setup(void)
 }
 __initcall(sh7722_devices_setup);
-static struct ipr_data sh7722_ipr_map[] = {
+static struct ipr_data ipr_irq_table[] = {
        /* IRQ, IPR-idx, shift, prio */
        { 16, 0, 12, 2 }, /* TMU0 */
        { 17, 0,  8, 2 }, /* TMU1 */
@@ -67,14 +69,25 @@ static unsigned long ipr_offsets[] = {
        0xa408002c, /* 11: IPRL */
 };
-unsigned int map_ipridx_to_addr(int idx)
+static struct ipr_desc ipr_irq_desc = {
+        .ipr_offsets    = ipr_offsets,
+        .nr_offsets     = ARRAY_SIZE(ipr_offsets),
+        .ipr_data       = ipr_irq_table,
+        .nr_irqs        = ARRAY_SIZE(ipr_irq_table),
+        .chip = {
+                .name   = "IPR-sh7722",
+        },
+};
+void __init init_IRQ_ipr(void)
 {
-        if (unlikely(idx >= ARRAY_SIZE(ipr_offsets)))
+        register_ipr_controller(&ipr_irq_desc);
-                return 0;
-        return ipr_offsets[idx];
 }
-void __init init_IRQ_ipr(void)
+void __init plat_mem_setup(void)
 {
-        make_ipr_irq(sh7722_ipr_map, ARRAY_SIZE(sh7722_ipr_map));
+        /* Register the URAM space as Node 1 */
+        setup_bootmem_node(1, 0x055f0000, 0x05610000);
 }
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
index 9aeaa2ddaa..b57c760bff 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
@@ -102,7 +102,20 @@ static struct intc2_data intc2_irq_table[] = {
        { 68, 0x14,  8, 0, 18, 2 },     /* PCIC4 */
 };
+static struct intc2_desc intc2_irq_desc __read_mostly = {
+        .prio_base      = 0xffd40000,
+        .msk_base       = 0xffd40038,
+        .mskclr_base    = 0xffd4003c,
+        .intc2_data     = intc2_irq_table,
+        .nr_irqs        = ARRAY_SIZE(intc2_irq_table),
+        .chip = {
+                .name   = "INTC2-sh7780",
+        },
+};
 void __init init_IRQ_intc2(void)
 {
-        make_intc2_irq(intc2_irq_table, ARRAY_SIZE(intc2_irq_table));
+        register_intc2_controller(&intc2_irq_desc);
 }
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
index 07b0de82cf..ce10ec5d69 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
@@ -97,7 +97,21 @@ static struct intc2_data intc2_irq_table[] = {
        { 60, 12, 16, 0, 7, 3 },        /* SCIF5 ERI, RXI, BRI, TXI */
 };
+static struct intc2_desc intc2_irq_desc __read_mostly = {
+        .prio_base      = 0xffd40000,
+        .msk_base       = 0xffd40038,
+        .mskclr_base    = 0xffd4003c,
+        .intc2_data     = intc2_irq_table,
+        .nr_irqs        = ARRAY_SIZE(intc2_irq_table),
+        .chip = {
+                .name   = "INTC2-sh7785",
+        },
+};
 void __init init_IRQ_intc2(void)
 {
-        make_intc2_irq(intc2_irq_table, ARRAY_SIZE(intc2_irq_table));
+        register_intc2_controller(&intc2_irq_desc);
 }
diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
new file mode 100644
index 0000000000..70683ea12b
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
@@ -0,0 +1,85 @@
+/*
+ * SH-X3 Setup
+ *
+ *  Copyright (C) 2007  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <linux/io.h>
+#include <asm/sci.h>
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xffc30000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 40, 41, 43, 42 },
+        }, {
+                .mapbase        = 0xffc40000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 44, 45, 47, 46 },
+        }, {
+                .mapbase        = 0xffc50000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 48, 49, 51, 50 },
+        }, {
+                .mapbase        = 0xffc60000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 52, 53, 55, 54 },
+        }, {
+                .flags = 0,
+        }
+};
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+static struct platform_device *shx3_devices[] __initdata = {
+        &sci_device,
+};
+static int __init shx3_devices_setup(void)
+{
+        return platform_add_devices(shx3_devices,
+                                    ARRAY_SIZE(shx3_devices));
+}
+__initcall(shx3_devices_setup);
+static struct intc2_data intc2_irq_table[] = {
+        { 16, 0, 0, 0, 1, 2 },          /* TMU0 */
+        { 40, 4, 0, 0x20, 0, 3 },       /* SCIF0 ERI */
+        { 41, 4, 0, 0x20, 1, 3 },       /* SCIF0 RXI */
+        { 42, 4, 0, 0x20, 2, 3 },       /* SCIF0 BRI */
+        { 43, 4, 0, 0x20, 3, 3 },       /* SCIF0 TXI */
+};
+static struct intc2_desc intc2_irq_desc __read_mostly = {
+        .prio_base      = 0xfe410000,
+        .msk_base       = 0xfe410820,
+        .mskclr_base    = 0xfe410850,
+        .intc2_data     = intc2_irq_table,
+        .nr_irqs        = ARRAY_SIZE(intc2_irq_table),
+        .chip = {
+                .name   = "INTC2-SHX3",
+        },
+};
+void __init init_IRQ_intc2(void)
+{
+        register_intc2_controller(&intc2_irq_desc);
+}
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index 27b923c45b..2789779886 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -158,15 +158,11 @@ asmlinkage int do_IRQ(unsigned int irq, struct pt_regs *regs)
 }
 #ifdef CONFIG_4KSTACKS
-/*
- * These should really be __section__(".bss.page_aligned") as well, but
- * gcc's 3.0 and earlier don't handle that correctly.
- */
 static char softirq_stack[NR_CPUS * THREAD_SIZE]
-                __attribute__((__aligned__(THREAD_SIZE)));
+                __attribute__((__section__(".bss.page_aligned")));
 static char hardirq_stack[NR_CPUS * THREAD_SIZE]
-                __attribute__((__aligned__(THREAD_SIZE)));
+                __attribute__((__section__(".bss.page_aligned")));
 /*
 * allocate per-cpu stacks for hardirq and for softirq processing
diff --git a/arch/sh/kernel/machvec.c b/arch/sh/kernel/machvec.c
new file mode 100644
index 0000000000..23c5948f01
--- /dev/null
+++ b/arch/sh/kernel/machvec.c
@@ -0,0 +1,130 @@
+/*
+ * arch/sh/kernel/machvec.c
+ *
+ * The SuperH machine vector setup handlers, yanked from setup.c
+ *
+ *  Copyright (C) 1999  Niibe Yutaka
+ *  Copyright (C) 2002 - 2007 Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/string.h>
+#include <asm/machvec.h>
+#include <asm/sections.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#define MV_NAME_SIZE 32
+#define for_each_mv(mv) \
+        for ((mv) = (struct sh_machine_vector *)&__machvec_start; \
+             (mv) && (unsigned long)(mv) < (unsigned long)&__machvec_end; \
+             (mv)++)
+static struct sh_machine_vector * __init get_mv_byname(const char *name)
+{
+        struct sh_machine_vector *mv;
+        for_each_mv(mv)
+                if (strcasecmp(name, mv->mv_name) == 0)
+                        return mv;
+        return NULL;
+}
+static unsigned int __initdata machvec_selected;
+static int __init early_parse_mv(char *from)
+{
+        char mv_name[MV_NAME_SIZE] = "";
+        char *mv_end;
+        char *mv_comma;
+        int mv_len;
+        struct sh_machine_vector *mvp;
+        mv_end = strchr(from, ' ');
+        if (mv_end == NULL)
+                mv_end = from + strlen(from);
+        mv_comma = strchr(from, ',');
+        mv_len = mv_end - from;
+        if (mv_len > (MV_NAME_SIZE-1))
+                mv_len = MV_NAME_SIZE-1;
+        memcpy(mv_name, from, mv_len);
+        mv_name[mv_len] = '\0';
+        from = mv_end;
+        machvec_selected = 1;
+        /* Boot with the generic vector */
+        if (strcmp(mv_name, "generic") == 0)
+                return 0;
+        mvp = get_mv_byname(mv_name);
+        if (unlikely(!mvp)) {
+                printk("Available vectors:\n\n\t'%s', ", sh_mv.mv_name);
+                for_each_mv(mvp)
+                        printk("'%s', ", mvp->mv_name);
+                printk("\n\n");
+                panic("Failed to select machvec '%s' -- halting.\n",
+                      mv_name);
+        } else
+                sh_mv = *mvp;
+        return 0;
+}
+early_param("sh_mv", early_parse_mv);
+void __init sh_mv_setup(void)
+{
+        /*
+         * Only overload the machvec if one hasn't been selected on
+         * the command line with sh_mv=
+         */
+        if (!machvec_selected) {
+                unsigned long machvec_size;
+                machvec_size = ((unsigned long)&__machvec_end -
+                                (unsigned long)&__machvec_start);
+                /*
+                 * If the machvec hasn't been preselected, use the first
+                 * vector (usually the only one) from .machvec.init.
+                 */
+                if (machvec_size >= sizeof(struct sh_machine_vector))
+                        sh_mv = *(struct sh_machine_vector *)&__machvec_start;
+        }
+        printk(KERN_NOTICE "Booting machvec: %s\n", get_system_type());
+        /*
+         * Manually walk the vec, fill in anything that the board hasn't yet
+         * by hand, wrapping to the generic implementation.
+         */
+#define mv_set(elem) do { \
+        if (!sh_mv.mv_##elem) \
+                sh_mv.mv_##elem = generic_##elem; \
+} while (0)
+        mv_set(inb);    mv_set(inw);    mv_set(inl);
+        mv_set(outb);   mv_set(outw);   mv_set(outl);
+        mv_set(inb_p);  mv_set(inw_p);  mv_set(inl_p);
+        mv_set(outb_p); mv_set(outw_p); mv_set(outl_p);
+        mv_set(insb);   mv_set(insw);   mv_set(insl);
+        mv_set(outsb);  mv_set(outsw);  mv_set(outsl);
+        mv_set(readb);  mv_set(readw);  mv_set(readl);
+        mv_set(writeb); mv_set(writew); mv_set(writel);
+        mv_set(ioport_map);
+        mv_set(ioport_unmap);
+        mv_set(irq_demux);
+        if (!sh_mv.mv_nr_irqs)
+                sh_mv.mv_nr_irqs = NR_IRQS;
+}
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index a11e2aa73c..6334a4c54c 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -17,6 +17,7 @@
 #include <linux/kexec.h>
 #include <linux/kdebug.h>
 #include <linux/tick.h>
+#include <linux/reboot.h>
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
 #include <asm/pgalloc.h>
@@ -319,9 +320,7 @@ static void ubc_set_tracing(int asid, unsigned long pc)
        ctrl_outl(pc, UBC_BARA);
 #ifdef CONFIG_MMU
-        /* We don't have any ASID settings for the SH-2! */
+        ctrl_outb(asid, UBC_BASRA);
-        if (current_cpu_data.type != CPU_SH7604)
-                ctrl_outb(asid, UBC_BASRA);
 #endif
        ctrl_outl(0, UBC_BAMRA);
@@ -405,8 +404,8 @@ asmlinkage int sys_fork(unsigned long r4, unsigned long r5,
                        unsigned long r6, unsigned long r7,
                        struct pt_regs __regs)
 {
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
 #ifdef CONFIG_MMU
+        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
        return do_fork(SIGCHLD, regs->regs[15], regs, 0, NULL, NULL);
 #else
        /* fork almost works, enough to trick you into looking elsewhere :-( */
@@ -449,23 +448,20 @@ asmlinkage int sys_vfork(unsigned long r4, unsigned long r5,
 /*
 * sys_execve() executes a new program.
 */
-asmlinkage int sys_execve(char *ufilename, char **uargv,
+asmlinkage int sys_execve(char __user *ufilename, char __user * __user *uargv,
-                          char **uenvp, unsigned long r7,
+                          char __user * __user *uenvp, unsigned long r7,
                          struct pt_regs __regs)
 {
        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
        int error;
        char *filename;
-        filename = getname((char __user *)ufilename);
+        filename = getname(ufilename);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                goto out;
-        error = do_execve(filename,
+        error = do_execve(filename, uargv, uenvp, regs);
-                          (char __user * __user *)uargv,
-                          (char __user * __user *)uenvp,
-                          regs);
        if (error == 0) {
                task_lock(current);
                current->ptrace &= ~PT_DTRACE;
diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace.c
index 3fb5fc0b55..891d1d46c9 100644
--- a/arch/sh/kernel/ptrace.c
+++ b/arch/sh/kernel/ptrace.c
@@ -91,17 +91,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        switch (request) {
        /* when I and D space are separate, these will need to be fixed. */
        case PTRACE_PEEKTEXT: /* read word at location addr. */
-        case PTRACE_PEEKDATA: {
+        case PTRACE_PEEKDATA:
-                unsigned long tmp;
+                ret = generic_ptrace_peekdata(child, addr, data);
-                int copied;
-                copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
-                ret = -EIO;
-                if (copied != sizeof(tmp))
-                        break;
-                ret = put_user(tmp,(unsigned long *) data);
-                break;
-        }
        /* read the word at location addr in the USER area. */
        case PTRACE_PEEKUSR: {
@@ -128,17 +119,14 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                        tmp = !!tsk_used_math(child);
                else
                        tmp = 0;
-                ret = put_user(tmp, (unsigned long *)data);
+                ret = put_user(tmp, (unsigned long __user *)data);
                break;
        }
        /* when I and D space are separate, this will have to be fixed. */
        case PTRACE_POKETEXT: /* write the word at location addr. */
        case PTRACE_POKEDATA:
-                ret = 0;
+                ret = generic_ptrace_pokedata(child, addr, data);
-                if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data))
-                        break;
-                ret = -EIO;
                break;
        case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
@@ -196,7 +184,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        case PTRACE_SINGLESTEP: {  /* set the trap flag. */
                long pc;
-                struct pt_regs *dummy = NULL;
+                struct pt_regs *regs = NULL;
                ret = -EIO;
                if (!valid_signal(data))
@@ -207,7 +195,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                        child->ptrace |= PT_DTRACE;
                }
-                pc = get_stack_long(child, (long)&dummy->pc);
+                pc = get_stack_long(child, (long)&regs->pc);
                /* Next scheduling will set up UBC */
                if (child->thread.ubc_pc == 0)
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index c277291359..de8e6e2f2c 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -23,6 +23,7 @@
 #include <linux/kexec.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
+#include <asm/page.h>
 #include <asm/sections.h>
 #include <asm/irq.h>
 #include <asm/setup.h>
@@ -41,20 +42,19 @@ extern void * __rd_start, * __rd_end;
 * The bigger value means no problem.
 */
 struct sh_cpuinfo boot_cpu_data = { CPU_SH_NONE, 10000000, };
+/*
+ * The machine vector. First entry in .machvec.init, or clobbered by
+ * sh_mv= on the command line, prior to .machvec.init teardown.
+ */
+struct sh_machine_vector sh_mv = { .mv_name = "generic", };
 #ifdef CONFIG_VT
 struct screen_info screen_info;
 #endif
-#if defined(CONFIG_SH_UNKNOWN)
-struct sh_machine_vector sh_mv;
-#endif
 extern int root_mountflags;
-#define MV_NAME_SIZE 32
-static struct sh_machine_vector* __init get_mv_byname(const char* name);
 /*
 * This is set up by the setup-routine at boot-time
 */
@@ -80,131 +80,17 @@ static struct resource data_resource = { .name = "Kernel data", };
 unsigned long memory_start, memory_end;
-static inline void parse_cmdline (char ** cmdline_p, char mv_name[MV_NAME_SIZE],
+static int __init early_parse_mem(char *p)
-                                  struct sh_machine_vector** mvp,
-                                  unsigned long *mv_io_base)
 {
-        char c = ' ', *to = command_line, *from = COMMAND_LINE;
+        unsigned long size;
-        int len = 0;
-        /* Save unparsed command line copy for /proc/cmdline */
-        memcpy(boot_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);
-        boot_command_line[COMMAND_LINE_SIZE-1] = '\0';
        memory_start = (unsigned long)PAGE_OFFSET+__MEMORY_START;
-        memory_end = memory_start + __MEMORY_SIZE;
+        size = memparse(p, &p);
+        memory_end = memory_start + size;
-        for (;;) {
-                /*
-                 * "mem=XXX[kKmM]" defines a size of memory.
-                 */
-                if (c == ' ' && !memcmp(from, "mem=", 4)) {
-                        if (to != command_line)
-                                to--;
-                        {
-                                unsigned long mem_size;
-                                mem_size = memparse(from+4, &from);
-                                memory_end = memory_start + mem_size;
-                        }
-                }
-                if (c == ' ' && !memcmp(from, "sh_mv=", 6)) {
-                        char* mv_end;
-                        char* mv_comma;
-                        int mv_len;
-                        if (to != command_line)
-                                to--;
-                        from += 6;
-                        mv_end = strchr(from, ' ');
-                        if (mv_end == NULL)
-                                mv_end = from + strlen(from);
-                        mv_comma = strchr(from, ',');
-                        if ((mv_comma != NULL) && (mv_comma < mv_end)) {
-                                int ints[3];
-                                get_options(mv_comma+1, ARRAY_SIZE(ints), ints);
-                                *mv_io_base = ints[1];
-                                mv_len = mv_comma - from;
-                        } else {
-                                mv_len = mv_end - from;
-                        }
-                        if (mv_len > (MV_NAME_SIZE-1))
-                                mv_len = MV_NAME_SIZE-1;
-                        memcpy(mv_name, from, mv_len);
-                        mv_name[mv_len] = '\0';
-                        from = mv_end;
-                        *mvp = get_mv_byname(mv_name);
-                }
-                c = *(from++);
-                if (!c)
-                        break;
-                if (COMMAND_LINE_SIZE <= ++len)
-                        break;
-                *(to++) = c;
-        }
-        *to = '\0';
-        *cmdline_p = command_line;
-}
-static int __init sh_mv_setup(char **cmdline_p)
-{
-#ifdef CONFIG_SH_UNKNOWN
-        extern struct sh_machine_vector mv_unknown;
-#endif
-        struct sh_machine_vector *mv = NULL;
-        char mv_name[MV_NAME_SIZE] = "";
-        unsigned long mv_io_base = 0;
-        parse_cmdline(cmdline_p, mv_name, &mv, &mv_io_base);
-#ifdef CONFIG_SH_UNKNOWN
-        if (mv == NULL) {
-                mv = &mv_unknown;
-                if (*mv_name != '\0') {
-                        printk("Warning: Unsupported machine %s, using unknown\n",
-                               mv_name);
-                }
-        }
-        sh_mv = *mv;
-#endif
-        /*
-         * Manually walk the vec, fill in anything that the board hasn't yet
-         * by hand, wrapping to the generic implementation.
-         */
-#define mv_set(elem) do { \
-        if (!sh_mv.mv_##elem) \
-                sh_mv.mv_##elem = generic_##elem; \
-} while (0)
-        mv_set(inb);    mv_set(inw);    mv_set(inl);
-        mv_set(outb);   mv_set(outw);   mv_set(outl);
-        mv_set(inb_p);  mv_set(inw_p);  mv_set(inl_p);
-        mv_set(outb_p); mv_set(outw_p); mv_set(outl_p);
-        mv_set(insb);   mv_set(insw);   mv_set(insl);
-        mv_set(outsb);  mv_set(outsw);  mv_set(outsl);
-        mv_set(readb);  mv_set(readw);  mv_set(readl);
-        mv_set(writeb); mv_set(writew); mv_set(writel);
-        mv_set(ioport_map);
-        mv_set(ioport_unmap);
-        mv_set(irq_demux);
-#ifdef CONFIG_SH_UNKNOWN
-        __set_io_port_base(mv_io_base);
-#endif
-        if (!sh_mv.mv_nr_irqs)
-                sh_mv.mv_nr_irqs = NR_IRQS;
        return 0;
 }
+early_param("mem", early_parse_mem);
 /*
 * Register fully available low RAM pages with the bootmem allocator.
@@ -230,7 +116,7 @@ static void __init register_bootmem_low_pages(void)
        free_bootmem(PFN_PHYS(curr_pfn), PFN_PHYS(pages));
 }
-void __init setup_bootmem_allocator(unsigned long start_pfn)
+void __init setup_bootmem_allocator(unsigned long free_pfn)
 {
        unsigned long bootmap_size;
@@ -239,9 +125,10 @@ void __init setup_bootmem_allocator(unsigned long start_pfn)
         * bootstrap step all allocations (until the page allocator
         * is intact) must be done via bootmem_alloc().
         */
-        bootmap_size = init_bootmem_node(NODE_DATA(0), start_pfn,
+        bootmap_size = init_bootmem_node(NODE_DATA(0), free_pfn,
                                         min_low_pfn, max_low_pfn);
+        add_active_range(0, min_low_pfn, max_low_pfn);
        register_bootmem_low_pages();
        node_set_online(0);
@@ -254,7 +141,7 @@ void __init setup_bootmem_allocator(unsigned long start_pfn)
         * an invalid RAM area.
         */
        reserve_bootmem(__MEMORY_START+PAGE_SIZE,
-                (PFN_PHYS(start_pfn)+bootmap_size+PAGE_SIZE-1)-__MEMORY_START);
+                (PFN_PHYS(free_pfn)+bootmap_size+PAGE_SIZE-1)-__MEMORY_START);
        /*
         * reserve physical page 0 - it's a special BIOS page on many boxes,
@@ -262,6 +149,8 @@ void __init setup_bootmem_allocator(unsigned long start_pfn)
         */
        reserve_bootmem(__MEMORY_START, PAGE_SIZE);
+        sparse_memory_present_with_active_regions(0);
 #ifdef CONFIG_BLK_DEV_INITRD
        ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
        if (&__rd_start != &__rd_end) {
@@ -315,10 +204,6 @@ void __init setup_arch(char **cmdline_p)
 {
        enable_mmu();
-#ifdef CONFIG_CMDLINE_BOOL
-        strcpy(COMMAND_LINE, CONFIG_CMDLINE);
-#endif
        ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
 #ifdef CONFIG_BLK_DEV_RAM
@@ -339,9 +224,22 @@ void __init setup_arch(char **cmdline_p)
        data_resource.start = virt_to_phys(_etext);
        data_resource.end = virt_to_phys(_edata)-1;
+        memory_start = (unsigned long)PAGE_OFFSET+__MEMORY_START;
+        memory_end = memory_start + __MEMORY_SIZE;
+#ifdef CONFIG_CMDLINE_BOOL
+        strlcpy(command_line, CONFIG_CMDLINE, sizeof(command_line));
+#else
+        strlcpy(command_line, COMMAND_LINE, sizeof(command_line));
+#endif
+        /* Save unparsed command line copy for /proc/cmdline */
+        memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
+        *cmdline_p = command_line;
        parse_early_param();
-        sh_mv_setup(cmdline_p);
+        sh_mv_setup();
        /*
         * Find the highest page frame number we have available
@@ -355,8 +253,9 @@ void __init setup_arch(char **cmdline_p)
        min_low_pfn = __MEMORY_START >> PAGE_SHIFT;
        nodes_clear(node_online_map);
+        /* Setup bootmem with available RAM */
        setup_memory();
-        paging_init();
        sparse_init();
 #ifdef CONFIG_DUMMY_CONSOLE
@@ -366,46 +265,13 @@ void __init setup_arch(char **cmdline_p)
        /* Perform the machine specific initialisation */
        if (likely(sh_mv.mv_setup))
                sh_mv.mv_setup(cmdline_p);
-}
-struct sh_machine_vector* __init get_mv_byname(const char* name)
-{
-        extern long __machvec_start, __machvec_end;
-        struct sh_machine_vector *all_vecs =
-                (struct sh_machine_vector *)&__machvec_start;
-        int i, n = ((unsigned long)&__machvec_end
-                    - (unsigned long)&__machvec_start)/
-                sizeof(struct sh_machine_vector);
-        for (i = 0; i < n; ++i) {
-                struct sh_machine_vector *mv = &all_vecs[i];
-                if (mv == NULL)
-                        continue;
-                if (strcasecmp(name, get_system_type()) == 0) {
-                        return mv;
-                }
-        }
-        return NULL;
-}
-static struct cpu cpu[NR_CPUS];
-static int __init topology_init(void)
-{
-        int cpu_id;
-        for_each_possible_cpu(cpu_id)
+        paging_init();
-                register_cpu(&cpu[cpu_id], cpu_id);
-        return 0;
 }
-subsys_initcall(topology_init);
 static const char *cpu_name[] = {
        [CPU_SH7206]    = "SH7206",     [CPU_SH7619]    = "SH7619",
-        [CPU_SH7604]    = "SH7604",     [CPU_SH7300]    = "SH7300",
+        [CPU_SH7300]    = "SH7300",
        [CPU_SH7705]    = "SH7705",     [CPU_SH7706]    = "SH7706",
        [CPU_SH7707]    = "SH7707",     [CPU_SH7708]    = "SH7708",
        [CPU_SH7709]    = "SH7709",     [CPU_SH7710]    = "SH7710",
@@ -419,7 +285,7 @@ static const char *cpu_name[] = {
        [CPU_SH7770]    = "SH7770",     [CPU_SH7780]    = "SH7780",
        [CPU_SH7781]    = "SH7781",     [CPU_SH7343]    = "SH7343",
        [CPU_SH7785]    = "SH7785",     [CPU_SH7722]    = "SH7722",
-        [CPU_SH_NONE]   = "Unknown"
+        [CPU_SHX3]      = "SH-X3",      [CPU_SH_NONE]   = "Unknown"
 };
 const char *get_cpu_subtype(struct sh_cpuinfo *c)
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c
index c1cfcb9f04..c968dcf09e 100644
--- a/arch/sh/kernel/sh_ksyms.c
+++ b/arch/sh/kernel/sh_ksyms.c
@@ -78,6 +78,16 @@ DECLARE_EXPORT(__movstr);
 DECLARE_EXPORT(__movmem_i4_even);
 DECLARE_EXPORT(__movmem_i4_odd);
 DECLARE_EXPORT(__movmemSI12_i4);
+#if (__GNUC_MINOR__ == 2 || defined(__GNUC_STM_RELEASE__))
+/*
+ * GCC 4.2 emits these for division, as do GCC 4.1.x versions of the ST
+ * compiler which include backported patches.
+ */
+DECLARE_EXPORT(__sdivsi3_i4i);
+DECLARE_EXPORT(__udiv_qrnnd_16);
+DECLARE_EXPORT(__udivsi3_i4i);
+#endif
 #else /* GCC 3.x */
 DECLARE_EXPORT(__movstr_i4_even);
 DECLARE_EXPORT(__movstr_i4_odd);
diff --git a/arch/sh/kernel/signal.c b/arch/sh/kernel/signal.c
index e323e29987..706d81ccd1 100644
--- a/arch/sh/kernel/signal.c
+++ b/arch/sh/kernel/signal.c
@@ -23,6 +23,7 @@
 #include <linux/personality.h>
 #include <linux/binfmts.h>
 #include <linux/freezer.h>
+#include <linux/io.h>
 #include <asm/system.h>
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
@@ -261,7 +262,7 @@ asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5,
                goto badframe;
        /* It is more difficult to avoid calling this function than to
           call it and ignore errors.  */
-        do_sigaltstack(&st, NULL, regs->regs[15]);
+        do_sigaltstack((const stack_t __user *)&st, NULL, (unsigned long)frame);
        return r0;
diff --git a/arch/sh/kernel/syscalls.S b/arch/sh/kernel/syscalls.S
index 7db1c2dc59..ff5656e60c 100644
--- a/arch/sh/kernel/syscalls.S
+++ b/arch/sh/kernel/syscalls.S
@@ -308,9 +308,9 @@ ENTRY(sys_call_table)
        .long sys_utimes
        .long sys_fadvise64_64_wrapper
        .long sys_ni_syscall    /* Reserved for vserver */
-        .long sys_ni_syscall    /* Reserved for mbind */
+        .long sys_mbind
-        .long sys_ni_syscall    /* 275 - get_mempolicy */
+        .long sys_get_mempolicy         /* 275 */
-        .long sys_ni_syscall    /* set_mempolicy */
+        .long sys_set_mempolicy
        .long sys_mq_open
        .long sys_mq_unlink
        .long sys_mq_timedsend
diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c
index 2d997e2a5b..097ebd49f1 100644
--- a/arch/sh/kernel/timers/timer-tmu.c
+++ b/arch/sh/kernel/timers/timer-tmu.c
@@ -30,7 +30,7 @@
 static int tmu_timer_start(void)
 {
-        ctrl_outb(ctrl_inb(TMU_TSTR) | 0x3, TMU_TSTR);
+        ctrl_outb(ctrl_inb(TMU_012_TSTR) | 0x3, TMU_012_TSTR);
        return 0;
 }
@@ -52,7 +52,7 @@ static void tmu0_timer_set_interval(unsigned long interval, unsigned int reload)
 static int tmu_timer_stop(void)
 {
-        ctrl_outb(ctrl_inb(TMU_TSTR) & ~0x3, TMU_TSTR);
+        ctrl_outb(ctrl_inb(TMU_012_TSTR) & ~0x3, TMU_012_TSTR);
        return 0;
 }
@@ -174,7 +174,8 @@ static int tmu_timer_init(void)
 #if !defined(CONFIG_CPU_SUBTYPE_SH7300) && \
    !defined(CONFIG_CPU_SUBTYPE_SH7760) && \
-    !defined(CONFIG_CPU_SUBTYPE_SH7785)
+    !defined(CONFIG_CPU_SUBTYPE_SH7785) && \
+    !defined(CONFIG_CPU_SUBTYPE_SHX3)
        ctrl_outb(TMU_TOCR_INIT, TMU_TOCR);
 #endif
diff --git a/arch/sh/kernel/topology.c b/arch/sh/kernel/topology.c
new file mode 100644
index 0000000000..9b5844a1bd
--- /dev/null
+++ b/arch/sh/kernel/topology.c
@@ -0,0 +1,49 @@
+/*
+ * arch/sh/kernel/topology.c
+ *
+ *  Copyright (C) 2007  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/cpu.h>
+#include <linux/cpumask.h>
+#include <linux/init.h>
+#include <linux/percpu.h>
+#include <linux/node.h>
+#include <linux/nodemask.h>
+static DEFINE_PER_CPU(struct cpu, cpu_devices);
+static int __init topology_init(void)
+{
+        int i, ret;
+#ifdef CONFIG_NEED_MULTIPLE_NODES
+        for_each_online_node(i)
+                register_one_node(i);
+#endif
+        for_each_present_cpu(i) {
+                ret = register_cpu(&per_cpu(cpu_devices, i), i);
+                if (unlikely(ret))
+                        printk(KERN_WARNING "%s: register_cpu %d failed (%d)\n",
+                               __FUNCTION__, i, ret);
+        }
+#if defined(CONFIG_NUMA) && !defined(CONFIG_SMP)
+        /*
+         * In the UP case, make sure the CPU association is still
+         * registered under each node. Without this, sysfs fails
+         * to make the connection between nodes other than node0
+         * and cpu0.
+         */
+        for_each_online_node(i)
+                if (i != numa_node_id())
+                        register_cpu_under_node(raw_smp_processor_id(), i);
+#endif
+        return 0;
+}
+subsys_initcall(topology_init);
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index 8f18930d5b..502d43e478 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -103,6 +103,7 @@ void die(const char * str, struct pt_regs * regs, long err)
                         (unsigned long)task_stack_page(current));
        bust_spinlocks(0);
+        add_taint(TAINT_DIE);
        spin_unlock_irq(&die_lock);
        if (kexec_should_crash(current))
@@ -584,7 +585,7 @@ uspace_segv:
                info.si_signo = SIGBUS;
                info.si_errno = 0;
                info.si_code = si_code;
-                info.si_addr = (void *) address;
+                info.si_addr = (void __user *)address;
                force_sig_info(SIGBUS, &info, current);
        } else {
                if (regs->pc & 1)
@@ -617,7 +618,7 @@ uspace_segv:
 */
 int is_dsp_inst(struct pt_regs *regs)
 {
-        unsigned short inst;
+        unsigned short inst = 0;
        /*
         * Safe guard if DSP mode is already enabled or we're lacking
@@ -645,7 +646,6 @@ asmlinkage void do_divide_error(unsigned long r4, unsigned long r5,
                                unsigned long r6, unsigned long r7,
                                struct pt_regs __regs)
 {
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
        siginfo_t info;
        switch (r4) {
@@ -874,7 +874,7 @@ void __init trap_init(void)
 void handle_BUG(struct pt_regs *regs)
 {
        enum bug_trap_type tt;
-        tt = report_bug(regs->pc);
+        tt = report_bug(regs->pc, regs);
        if (tt == BUG_TRAP_TYPE_WARN) {
                regs->pc += 2;
                return;
diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index 4c5b57e9c3..0696402f44 100644
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -97,18 +97,20 @@ SECTIONS
  __initramfs_end = .;
 #endif
+ . = ALIGN(4);
  __machvec_start = .;
-  .init.machvec : { *(.init.machvec) }
+  .machvec.init : { *(.machvec.init) }
  __machvec_end = .;
-  . = ALIGN(PAGE_SIZE);
-  __init_end = .;
-  . = ALIGN(4);
-  __bss_start = .;              /* BSS */
-  .bss : { *(.bss) }
-  . = ALIGN(4);
+  . = ALIGN(PAGE_SIZE);
-  _end = . ;
+  .bss : {
+        __init_end = .;
+        __bss_start = .;                /* BSS */
+        *(.bss.page_aligned)
+        *(.bss)
+        . = ALIGN(4);
+        _end = . ;
+  }
  /* When something in the kernel is NOT compiled as a module, the
   * module cleanup code and data are put into these segments.  Both
diff --git a/arch/sh/lib/div64-generic.c b/arch/sh/lib/div64-generic.c
index c02473afd5..4bef3b5d96 100644
--- a/arch/sh/lib/div64-generic.c
+++ b/arch/sh/lib/div64-generic.c
@@ -4,16 +4,15 @@
 #include <linux/types.h>
-extern u64 __xdiv64_32(u64 n, u32 d);
+extern uint64_t __xdiv64_32(u64 n, u32 d);
-u64 __div64_32(u64 *xp, u32 y)
+uint32_t __div64_32(u64 *xp, u32 y)
 {
-        u64 rem;
+        uint32_t rem;
-        u64 q = __xdiv64_32(*xp, y);
+        uint64_t q = __xdiv64_32(*xp, y);
        rem = *xp - q * y;
        *xp = q;
        return rem;
 }
diff --git a/arch/sh/lib/div64.S b/arch/sh/lib/div64.S
index eefc275d64..5ee7334ea6 100644
--- a/arch/sh/lib/div64.S
+++ b/arch/sh/lib/div64.S
@@ -1,12 +1,12 @@
 /*      
- * unsigned long long __xdiv64_32(unsigned long long n, unsigned long d); 
+ * unsigned long __xdiv64_32(unsigned long long n, unsigned long d); 
 */
 #include <linux/linkage.h>
 .text
 ENTRY(__xdiv64_32)
-#ifdef  __LITTLE_ENDIAN__
+#ifdef CONFIG_CPU_LITTLE_ENDIAN
        mov     r4, r0
        mov     r5, r1
 #else
@@ -34,7 +34,7 @@ ENTRY(__xdiv64_32)
        rotcl   r0
        div1    r6, r1
        .endr
-#ifdef  __LITTLE_ENDIAN__
+#ifdef CONFIG_CPU_LITTLE_ENDIAN
        mov     r2, r1
        rts
         rotcl  r0
diff --git a/arch/sh/math-emu/math.c b/arch/sh/math-emu/math.c
index a38e1eed9e..ac2d7abd25 100644
--- a/arch/sh/math-emu/math.c
+++ b/arch/sh/math-emu/math.c
@@ -507,6 +507,7 @@ static int ieee_fpe_handler(struct pt_regs *regs)
        unsigned short insn = *(unsigned short *)regs->pc;
        unsigned short finsn;
        unsigned long nextpc;
+        siginfo_t info;
        int nib[4] = {
                (insn >> 12) & 0xf,
                (insn >> 8) & 0xf,
@@ -559,9 +560,11 @@ static int ieee_fpe_handler(struct pt_regs *regs)
                                ~(FPSCR_CAUSE_MASK | FPSCR_FLAG_MASK);
                        set_tsk_thread_flag(tsk, TIF_USEDFPU);
                } else {
-                        tsk->thread.trap_no = 11;
+                        info.si_signo = SIGFPE;
-                        tsk->thread.error_code = 0;
+                        info.si_errno = 0;
-                        force_sig(SIGFPE, tsk);
+                        info.si_code = FPE_FLTINV;
+                        info.si_addr = (void __user *)regs->pc;
+                        force_sig_info(SIGFPE, &info, tsk);
                }
                regs->pc = nextpc;
@@ -576,14 +579,17 @@ asmlinkage void do_fpu_error(unsigned long r4, unsigned long r5,
                             struct pt_regs regs)
 {
        struct task_struct *tsk = current;
+        siginfo_t info;
        if (ieee_fpe_handler (&regs))
                return;
        regs.pc += 2;
-        tsk->thread.trap_no = 11;
+        info.si_signo = SIGFPE;
-        tsk->thread.error_code = 0;
+        info.si_errno = 0;
-        force_sig(SIGFPE, tsk);
+        info.si_code = FPE_FLTINV;
+        info.si_addr = (void __user *)regs.pc;
+        force_sig_info(SIGFPE, &info, tsk);
 }
 /**
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 253346d7b3..28d79a474c 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -1,5 +1,3 @@
-menu "Processor selection"
 #
 # Processor families
 #
@@ -38,27 +36,31 @@ config CPU_SUBTYPE_ST40
 config CPU_SHX2
        bool
+config CPU_SHX3
+        bool
+choice
+        prompt "Processor sub-type selection"
 #
 # Processor subtypes
 #
-comment "SH-2 Processor Support"
+# SH-2 Processor Support
-config CPU_SUBTYPE_SH7604
-        bool "Support SH7604 processor"
-        select CPU_SH2
 config CPU_SUBTYPE_SH7619
        bool "Support SH7619 processor"
        select CPU_SH2
+        select CPU_HAS_IPR_IRQ
-comment "SH-2A Processor Support"
+# SH-2A Processor Support
 config CPU_SUBTYPE_SH7206
        bool "Support SH7206 processor"
        select CPU_SH2A
+        select CPU_HAS_IPR_IRQ
-comment "SH-3 Processor Support"
+# SH-3 Processor Support
 config CPU_SUBTYPE_SH7300
        bool "Support SH7300 processor"
@@ -113,7 +115,7 @@ config CPU_SUBTYPE_SH7712
        help
          Select SH7712 if you have a SH3-DSP SH7712 CPU.
-comment "SH-4 Processor Support"
+# SH-4 Processor Support
 config CPU_SUBTYPE_SH7750
        bool "Support SH7750 processor"
@@ -125,7 +127,7 @@ config CPU_SUBTYPE_SH7750
 config CPU_SUBTYPE_SH7091
        bool "Support SH7091 processor"
        select CPU_SH4
-        select CPU_SUBTYPE_SH7750
+        select CPU_HAS_IPR_IRQ
        help
          Select SH7091 if you have an SH-4 based Sega device (such as
          the Dreamcast, Naomi, and Naomi 2).
@@ -133,13 +135,11 @@ config CPU_SUBTYPE_SH7091
 config CPU_SUBTYPE_SH7750R
        bool "Support SH7750R processor"
        select CPU_SH4
-        select CPU_SUBTYPE_SH7750
        select CPU_HAS_IPR_IRQ
 config CPU_SUBTYPE_SH7750S
        bool "Support SH7750S processor"
        select CPU_SH4
-        select CPU_SUBTYPE_SH7750
        select CPU_HAS_IPR_IRQ
 config CPU_SUBTYPE_SH7751
@@ -153,7 +153,6 @@ config CPU_SUBTYPE_SH7751
 config CPU_SUBTYPE_SH7751R
        bool "Support SH7751R processor"
        select CPU_SH4
-        select CPU_SUBTYPE_SH7751
        select CPU_HAS_IPR_IRQ
 config CPU_SUBTYPE_SH7760
@@ -166,7 +165,7 @@ config CPU_SUBTYPE_SH4_202
        bool "Support SH4-202 processor"
        select CPU_SH4
-comment "ST40 Processor Support"
+# ST40 Processor Support
 config CPU_SUBTYPE_ST40STB1
        bool "Support ST40STB1/ST40RA processors"
@@ -181,7 +180,7 @@ config CPU_SUBTYPE_ST40GX1
        help
          Select ST40GX1 if you have a ST40GX1 CPU.
-comment "SH-4A Processor Support"
+# SH-4A Processor Support
 config CPU_SUBTYPE_SH7770
        bool "Support SH7770 processor"
@@ -198,7 +197,13 @@ config CPU_SUBTYPE_SH7785
        select CPU_SHX2
        select CPU_HAS_INTC2_IRQ
-comment "SH4AL-DSP Processor Support"
+config CPU_SUBTYPE_SHX3
+        bool "Support SH-X3 processor"
+        select CPU_SH4A
+        select CPU_SHX3
+        select CPU_HAS_INTC2_IRQ
+# SH4AL-DSP Processor Support
 config CPU_SUBTYPE_SH73180
        bool "Support SH73180 processor"
@@ -213,8 +218,10 @@ config CPU_SUBTYPE_SH7722
        select CPU_SH4AL_DSP
        select CPU_SHX2
        select CPU_HAS_IPR_IRQ
+        select ARCH_SPARSEMEM_ENABLE
+        select SYS_SUPPORTS_NUMA
-endmenu
+endchoice
 menu "Memory management options"
@@ -266,7 +273,7 @@ config MEMORY_SIZE
 config 32BIT
        bool "Support 32-bit physical addressing through PMB"
-        depends on CPU_SH4A && MMU && (!X2TLB || BROKEN)
+        depends on MMU && (CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785)
        default y
        help
          If you say Y here, physical addressing will be extended to
@@ -295,6 +302,17 @@ config VSYSCALL
          For systems with an MMU that can afford to give up a page,
          (the default value) say Y.
+config NUMA
+        bool "Non Uniform Memory Access (NUMA) Support"
+        depends on MMU && SYS_SUPPORTS_NUMA && EXPERIMENTAL
+        default n
+        help
+          Some SH systems have many various memories scattered around
+          the address space, each with varying latencies. This enables
+          support for these blocks by binding them to nodes and allowing
+          memory policies to be used for prioritizing and controlling
+          allocation behaviour.
 config NODES_SHIFT
        int
        default "1"
@@ -302,14 +320,34 @@ config NODES_SHIFT
 config ARCH_FLATMEM_ENABLE
        def_bool y
+        depends on !NUMA
+config ARCH_SPARSEMEM_ENABLE
+        def_bool y
+        select SPARSEMEM_STATIC
+config ARCH_SPARSEMEM_DEFAULT
+        def_bool y
 config MAX_ACTIVE_REGIONS
        int
+        default "2" if (CPU_SUBTYPE_SH7722 && SPARSEMEM)
        default "1"
 config ARCH_POPULATES_NODE_MAP
        def_bool y
+config ARCH_SELECT_MEMORY_MODEL
+        def_bool y
+config ARCH_ENABLE_MEMORY_HOTPLUG
+        def_bool y
+        depends on SPARSEMEM
+config ARCH_MEMORY_PROBE
+        def_bool y
+        depends on MEMORY_HOTPLUG
 choice
        prompt "Kernel page size"
        default PAGE_SIZE_4KB
@@ -394,15 +432,4 @@ config SH_WRITETHROUGH
          If unsure, say N.
-config SH_OCRAM
-        bool "Operand Cache RAM (OCRAM) support"
-        help
-          Selecting this option will automatically tear down the number of
-          sets in the dcache by half, which in turn exposes a memory range.
-          The addresses for the OC RAM base will vary according to the
-          processor version. Consult vendor documentation for specifics.
-          If unsure, say N.
 endmenu
diff --git a/arch/sh/mm/Makefile b/arch/sh/mm/Makefile
index 3ffd7f68c0..d677d7f3af 100644
--- a/arch/sh/mm/Makefile
+++ b/arch/sh/mm/Makefile
@@ -8,9 +8,6 @@ obj-$(CONFIG_CPU_SH2)	+= cache-sh2.o
 obj-$(CONFIG_CPU_SH3)   += cache-sh3.o
 obj-$(CONFIG_CPU_SH4)   += cache-sh4.o
-obj-$(CONFIG_DMA_PAGE_OPS)      += pg-dma.o
-obj-$(CONFIG_HUGETLB_PAGE)      += hugetlbpage.o
 mmu-y                   := fault-nommu.o tlb-nommu.o pg-nommu.o
 mmu-$(CONFIG_MMU)       := fault.o clear_page.o copy_page.o tlb-flush.o \
                           ioremap.o
@@ -27,5 +24,7 @@ obj-$(CONFIG_CPU_SH4)		+= tlb-sh4.o pg-sh4.o
 obj-$(CONFIG_SH7705_CACHE_32KB) += pg-sh7705.o
 endif
+obj-$(CONFIG_HUGETLB_PAGE)      += hugetlbpage.o
 obj-$(CONFIG_SH7705_CACHE_32KB) += cache-sh7705.o
 obj-$(CONFIG_32BIT)             += pmb.o
+obj-$(CONFIG_NUMA)              += numa.o
diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c
index c878faa4ae..0b3eaf6fbb 100644
--- a/arch/sh/mm/fault.c
+++ b/arch/sh/mm/fault.c
@@ -32,7 +32,6 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
        struct task_struct *tsk;
        struct mm_struct *mm;
        struct vm_area_struct * vma;
-        unsigned long page;
        int si_code;
        siginfo_t info;
@@ -170,24 +169,38 @@ no_context:
 * terminate things with extreme prejudice.
 *
 */
-        if (address < PAGE_SIZE)
-                printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference");
+        bust_spinlocks(1);
-        else
-                printk(KERN_ALERT "Unable to handle kernel paging request");
+        if (oops_may_print()) {
-        printk(" at virtual address %08lx\n", address);
+                __typeof__(pte_val(__pte(0))) page;
-        printk(KERN_ALERT "pc = %08lx\n", regs->pc);
-        page = (unsigned long)get_TTB();
+                if (address < PAGE_SIZE)
-        if (page) {
+                        printk(KERN_ALERT "Unable to handle kernel NULL "
-                page = ((unsigned long *) page)[address >> PGDIR_SHIFT];
+                                          "pointer dereference");
-                printk(KERN_ALERT "*pde = %08lx\n", page);
+                else
-                if (page & _PAGE_PRESENT) {
+                        printk(KERN_ALERT "Unable to handle kernel paging "
-                        page &= PAGE_MASK;
+                                          "request");
-                        address &= 0x003ff000;
+                printk(" at virtual address %08lx\n", address);
-                        page = ((unsigned long *) __va(page))[address >> PAGE_SHIFT];
+                printk(KERN_ALERT "pc = %08lx\n", regs->pc);
-                        printk(KERN_ALERT "*pte = %08lx\n", page);
+                page = (unsigned long)get_TTB();
+                if (page) {
+                        page = ((__typeof__(page) *) __va(page))[address >>
+                                                                 PGDIR_SHIFT];
+                        printk(KERN_ALERT "*pde = %08lx\n", page);
+                        if (page & _PAGE_PRESENT) {
+                                page &= PAGE_MASK;
+                                address &= 0x003ff000;
+                                page = ((__typeof__(page) *)
+                                                __va(page))[address >>
+                                                            PAGE_SHIFT];
+                                printk(KERN_ALERT "*pte = %08lx\n", page);
+                        }
                }
        }
        die("Oops", regs, writeaccess);
+        bust_spinlocks(0);
        do_exit(SIGKILL);
 /*
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index e0e644ff32..82b68c789a 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -18,6 +18,7 @@
 #include <asm/mmu_context.h>
 #include <asm/tlb.h>
 #include <asm/cacheflush.h>
+#include <asm/sections.h>
 #include <asm/cache.h>
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
@@ -36,14 +37,11 @@ void show_mem(void)
        show_free_areas();
        for_each_online_pgdat(pgdat) {
-                struct page *page, *end;
+                unsigned long flags, i;
-                unsigned long flags;
                pgdat_resize_lock(pgdat, &flags);
-                page = pgdat->node_mem_map;
+                for (i = 0; i < pgdat->node_spanned_pages; i++) {
-                end = page + pgdat->node_spanned_pages;
+                        struct page *page = pgdat_page_nr(pgdat, i);
-                do {
                        total++;
                        if (PageReserved(page))
                                reserved++;
@@ -55,9 +53,7 @@ void show_mem(void)
                                free++;
                        else
                                shared += page_count(page) - 1;
-                        page++;
+                }
-                } while (page < end);
                pgdat_resize_unlock(pgdat, &flags);
        }
@@ -137,16 +133,12 @@ void __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot)
 }
 #endif  /* CONFIG_MMU */
-/* References to section boundaries */
-extern char _text, _etext, _edata, __bss_start, _end;
-extern char __init_begin, __init_end;
 /*
 * paging_init() sets up the page tables
 */
 void __init paging_init(void)
 {
+        unsigned long max_zone_pfns[MAX_NR_ZONES];
        int nid;
        /* We don't need to map the kernel through the TLB, as
@@ -158,43 +150,39 @@ void __init paging_init(void)
         * check for a null value. */
        set_TTB(swapper_pg_dir);
+        memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
        for_each_online_node(nid) {
                pg_data_t *pgdat = NODE_DATA(nid);
-                unsigned long max_zone_pfns[MAX_NR_ZONES];
                unsigned long low, start_pfn;
-                memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
                start_pfn = pgdat->bdata->node_boot_start >> PAGE_SHIFT;
                low = pgdat->bdata->node_low_pfn;
-                max_zone_pfns[ZONE_NORMAL] = low;
+                if (max_zone_pfns[ZONE_NORMAL] < low)
-                add_active_range(nid, start_pfn, low);
+                        max_zone_pfns[ZONE_NORMAL] = low;
                printk("Node %u: start_pfn = 0x%lx, low = 0x%lx\n",
                       nid, start_pfn, low);
-                free_area_init_nodes(max_zone_pfns);
-                printk("Node %u: mem_map starts at %p\n",
-                       pgdat->node_id, pgdat->node_mem_map);
        }
+        free_area_init_nodes(max_zone_pfns);
 }
 static struct kcore_list kcore_mem, kcore_vmalloc;
 void __init mem_init(void)
 {
-        int codesize, reservedpages, datasize, initsize;
+        int codesize, datasize, initsize;
        int nid;
-        reservedpages = 0;
+        num_physpages = 0;
+        high_memory = NULL;
        for_each_online_node(nid) {
                pg_data_t *pgdat = NODE_DATA(nid);
                unsigned long node_pages = 0;
                void *node_high_memory;
-                int i;
                num_physpages += pgdat->node_present_pages;
@@ -203,13 +191,9 @@ void __init mem_init(void)
                totalram_pages += node_pages;
-                for (i = 0; i < node_pages; i++)
+                node_high_memory = (void *)__va((pgdat->node_start_pfn +
-                        if (PageReserved(pgdat->node_mem_map + i))
+                                                 pgdat->node_spanned_pages) <<
-                                reservedpages++;
+                                                 PAGE_SHIFT);
-                node_high_memory = (void *)((pgdat->node_start_pfn +
-                                             pgdat->node_spanned_pages) <<
-                                                PAGE_SHIFT);
                if (node_high_memory > high_memory)
                        high_memory = node_high_memory;
        }
@@ -239,11 +223,10 @@ void __init mem_init(void)
                   VMALLOC_END - VMALLOC_START);
        printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
-               "%dk reserved, %dk data, %dk init)\n",
+               "%dk data, %dk init)\n",
                (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
-                totalram_pages << (PAGE_SHIFT-10),
+                num_physpages << (PAGE_SHIFT-10),
                codesize >> 10,
-                reservedpages << (PAGE_SHIFT-10),
                datasize >> 10,
                initsize >> 10);
@@ -264,7 +247,9 @@ void free_initmem(void)
                free_page(addr);
                totalram_pages++;
        }
-        printk ("Freeing unused kernel memory: %dk freed\n", (&__init_end - &__init_begin) >> 10);
+        printk("Freeing unused kernel memory: %ldk freed\n",
+               ((unsigned long)&__init_end -
+                (unsigned long)&__init_begin) >> 10);
 }
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -277,6 +262,50 @@ void free_initrd_mem(unsigned long start, unsigned long end)
                free_page(p);
                totalram_pages++;
        }
-        printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
+        printk("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
+}
+#endif
+#ifdef CONFIG_MEMORY_HOTPLUG
+void online_page(struct page *page)
+{
+        ClearPageReserved(page);
+        init_page_count(page);
+        __free_page(page);
+        totalram_pages++;
+        num_physpages++;
 }
+int arch_add_memory(int nid, u64 start, u64 size)
+{
+        pg_data_t *pgdat;
+        unsigned long start_pfn = start >> PAGE_SHIFT;
+        unsigned long nr_pages = size >> PAGE_SHIFT;
+        int ret;
+        pgdat = NODE_DATA(nid);
+        /* We only have ZONE_NORMAL, so this is easy.. */
+        ret = __add_pages(pgdat->node_zones + ZONE_NORMAL, start_pfn, nr_pages);
+        if (unlikely(ret))
+                printk("%s: Failed, __add_pages() == %d\n", __FUNCTION__, ret);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(arch_add_memory);
+int remove_memory(u64 start, u64 size)
+{
+        return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(remove_memory);
+#ifdef CONFIG_NUMA
+int memory_add_physaddr_to_nid(u64 addr)
+{
+        /* Node 0 for now.. */
+        return 0;
+}
+EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
+#endif
 #endif
diff --git a/arch/sh/mm/numa.c b/arch/sh/mm/numa.c
new file mode 100644
index 0000000000..8aff065dd3
--- /dev/null
+++ b/arch/sh/mm/numa.c
@@ -0,0 +1,92 @@
+/*
+ * arch/sh/mm/numa.c - Multiple node support for SH machines
+ *
+ *  Copyright (C) 2007  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/module.h>
+#include <linux/bootmem.h>
+#include <linux/mm.h>
+#include <linux/numa.h>
+#include <linux/pfn.h>
+#include <asm/sections.h>
+static bootmem_data_t plat_node_bdata[MAX_NUMNODES];
+struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
+EXPORT_SYMBOL_GPL(node_data);
+/*
+ * On SH machines the conventional approach is to stash system RAM
+ * in node 0, and other memory blocks in to node 1 and up, ordered by
+ * latency. Each node's pgdat is node-local at the beginning of the node,
+ * immediately followed by the node mem map.
+ */
+void __init setup_memory(void)
+{
+        unsigned long free_pfn = PFN_UP(__pa(_end));
+        /*
+         * Node 0 sets up its pgdat at the first available pfn,
+         * and bumps it up before setting up the bootmem allocator.
+         */
+        NODE_DATA(0) = pfn_to_kaddr(free_pfn);
+        memset(NODE_DATA(0), 0, sizeof(struct pglist_data));
+        free_pfn += PFN_UP(sizeof(struct pglist_data));
+        NODE_DATA(0)->bdata = &plat_node_bdata[0];
+        /* Set up node 0 */
+        setup_bootmem_allocator(free_pfn);
+        /* Give the platforms a chance to hook up their nodes */
+        plat_mem_setup();
+}
+void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end)
+{
+        unsigned long bootmap_pages, bootmap_start, bootmap_size;
+        unsigned long start_pfn, free_pfn, end_pfn;
+        /* Don't allow bogus node assignment */
+        BUG_ON(nid > MAX_NUMNODES || nid == 0);
+        /*
+         * The free pfn starts at the beginning of the range, and is
+         * advanced as necessary for pgdat and node map allocations.
+         */
+        free_pfn = start_pfn = start >> PAGE_SHIFT;
+        end_pfn = end >> PAGE_SHIFT;
+        add_active_range(nid, start_pfn, end_pfn);
+        /* Node-local pgdat */
+        NODE_DATA(nid) = pfn_to_kaddr(free_pfn);
+        free_pfn += PFN_UP(sizeof(struct pglist_data));
+        memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));
+        NODE_DATA(nid)->bdata = &plat_node_bdata[nid];
+        NODE_DATA(nid)->node_start_pfn = start_pfn;
+        NODE_DATA(nid)->node_spanned_pages = end_pfn - start_pfn;
+        /* Node-local bootmap */
+        bootmap_pages = bootmem_bootmap_pages(end_pfn - start_pfn);
+        bootmap_start = (unsigned long)pfn_to_kaddr(free_pfn);
+        bootmap_size = init_bootmem_node(NODE_DATA(nid), free_pfn, start_pfn,
+                                    end_pfn);
+        free_bootmem_with_active_regions(nid, end_pfn);
+        /* Reserve the pgdat and bootmap space with the bootmem allocator */
+        reserve_bootmem_node(NODE_DATA(nid), start_pfn << PAGE_SHIFT,
+                             sizeof(struct pglist_data));
+        reserve_bootmem_node(NODE_DATA(nid), free_pfn << PAGE_SHIFT,
+                             bootmap_pages << PAGE_SHIFT);
+        /* It's up */
+        node_set_online(nid);
+        /* Kick sparsemem */
+        sparse_memory_present_with_active_regions(nid);
+}
diff --git a/arch/sh/mm/pg-dma.c b/arch/sh/mm/pg-dma.c
deleted file mode 100644
index bb23679369..0000000000
--- a/arch/sh/mm/pg-dma.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * arch/sh/mm/pg-dma.c
- *
- * Fast clear_page()/copy_page() implementation using the SH DMAC
- *
- * Copyright (C) 2003  Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <asm/semaphore.h>
-#include <asm/mmu_context.h>
-#include <asm/addrspace.h>
-#include <asm/atomic.h>
-#include <asm/page.h>
-#include <asm/dma.h>
-#include <asm/io.h>
-/* Channel to use for page ops, must be dual-address mode capable. */
-static int dma_channel = CONFIG_DMA_PAGE_OPS_CHANNEL;
-static void copy_page_dma(void *to, void *from)
-{
-        /* 
-         * This doesn't seem to get triggered until further along in the
-         * boot process, at which point the DMAC is already initialized.
-         * Fix this in the same fashion as clear_page_dma() in the event
-         * that this crashes due to the DMAC not being initialized.
-         */
-        flush_icache_range((unsigned long)from, PAGE_SIZE);
-        dma_write_page(dma_channel, (unsigned long)from, (unsigned long)to);
-        dma_wait_for_completion(dma_channel);
-}
-static void clear_page_dma(void *to)
-{
-        /*
-         * We get invoked quite early on, if the DMAC hasn't been initialized
-         * yet, fall back on the slow manual implementation.
-         */
-        if (dma_info[dma_channel].chan != dma_channel) {
-                clear_page_slow(to);
-                return;
-        }
-        dma_write_page(dma_channel, (unsigned long)empty_zero_page,
-                                    (unsigned long)to);
-        /*
-         * FIXME: Something is a bit racy here, if we poll the counter right
-         * away, we seem to lock. flushing the page from the dcache doesn't
-         * seem to make a difference one way or the other, though either a full
-         * icache or dcache flush does.
-         *
-         * The location of this is important as well, and must happen prior to
-         * the completion loop but after the transfer was initiated.
-         *
-         * Oddly enough, this doesn't appear to be an issue for copy_page()..
-         */
-        flush_icache_range((unsigned long)to, PAGE_SIZE);
-        dma_wait_for_completion(dma_channel);
-}
-static int __init pg_dma_init(void)
-{
-        int ret;
-        
-        ret = request_dma(dma_channel, "page ops");
-        if (ret != 0)
-                return ret;
-        copy_page = copy_page_dma;
-        clear_page = clear_page_dma;
-        return ret;
-}
-static void __exit pg_dma_exit(void)
-{
-        free_dma(dma_channel);
-}
-module_init(pg_dma_init);
-module_exit(pg_dma_exit);
-MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>");
-MODULE_DESCRIPTION("Optimized page copy/clear routines using a dual-address mode capable DMAC channel");
-MODULE_LICENSE("GPL");
diff --git a/arch/sh/tools/Makefile b/arch/sh/tools/Makefile
index 3c370a1132..567516b58a 100644
--- a/arch/sh/tools/Makefile
+++ b/arch/sh/tools/Makefile
@@ -12,4 +12,5 @@
 include/asm-sh/machtypes.h: $(src)/gen-mach-types $(src)/mach-types
        @echo '  Generating $@'
+        $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi
        $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }
diff --git a/arch/sh/tools/mach-types b/arch/sh/tools/mach-types
index fb40f188af..4b5e930509 100644
--- a/arch/sh/tools/mach-types
+++ b/arch/sh/tools/mach-types
@@ -18,7 +18,6 @@ SE			SH_SOLUTION_ENGINE
 HP6XX                   SH_HP6XX
 HD64461                 HD64461
 HD64465                 HD64465
-SATURN                  SH_SATURN
 DREAMCAST               SH_DREAMCAST
 MPC1211                 SH_MPC1211
 SNAPGEAR                SH_SECUREEDGE5410
@@ -34,3 +33,4 @@ R7785RP			SH_R7785RP
 TITAN                   SH_TITAN
 SHMIN                   SH_SHMIN
 7710VOIPGW              SH_7710VOIPGW
+LBOXRE2                 SH_LBOX_RE2
diff --git a/arch/sh64/kernel/ptrace.c b/arch/sh64/kernel/ptrace.c
index 4e95e18b46..df06c64774 100644
--- a/arch/sh64/kernel/ptrace.c
+++ b/arch/sh64/kernel/ptrace.c
@@ -129,17 +129,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        switch (request) {
        /* when I and D space are separate, these will need to be fixed. */
        case PTRACE_PEEKTEXT: /* read word at location addr. */
-        case PTRACE_PEEKDATA: {
+        case PTRACE_PEEKDATA:
-                unsigned long tmp;
+                ret = generic_ptrace_peekdata(child, addr, data);
-                int copied;
-                copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
-                ret = -EIO;
-                if (copied != sizeof(tmp))
-                        break;
-                ret = put_user(tmp,(unsigned long *) data);
                break;
-        }
        /* read the word at location addr in the USER area. */
        case PTRACE_PEEKUSR: {
@@ -166,10 +158,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        /* when I and D space are separate, this will have to be fixed. */
        case PTRACE_POKETEXT: /* write the word at location addr. */
        case PTRACE_POKEDATA:
-                ret = 0;
+                ret = generic_ptrace_pokedata(child, addr, data);
-                if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data))
-                        break;
-                ret = -EIO;
                break;
        case PTRACE_POKEUSR:
diff --git a/arch/sh64/lib/c-checksum.c b/arch/sh64/lib/c-checksum.c
index 4b2676380d..bd55017602 100644
--- a/arch/sh64/lib/c-checksum.c
+++ b/arch/sh64/lib/c-checksum.c
@@ -213,3 +213,4 @@ __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
        return (__wsum)result;
 }
+EXPORT_SYMBOL(csum_tcpudp_nofold);
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index fbcc00c6c0..603d83ad65 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -21,6 +21,9 @@ config GENERIC_ISA_DMA
        bool
        default y
+config ARCH_NO_VIRT_TO_BUS
+        def_bool y
 source "init/Kconfig"
 menu "General machine setup"
@@ -210,10 +213,16 @@ config PCI
          CP-1200, JavaEngine-1, Corona, Red October, and Serengeti SGSC.
          All of these platforms are extremely obscure, so say N if unsure.
+config PCI_SYSCALL
+        def_bool PCI
 source "drivers/pci/Kconfig"
 endif
+config NO_DMA
+        def_bool !PCI
 config SUN_OPENPROMFS
        tristate "Openprom tree appears in /proc/openprom"
        help
diff --git a/arch/sparc/kernel/smp.c b/arch/sparc/kernel/smp.c
index 4d9ad59031..4fea3ac7bf 100644
--- a/arch/sparc/kernel/smp.c
+++ b/arch/sparc/kernel/smp.c
@@ -68,16 +68,6 @@ void __cpuinit smp_store_cpu_info(int id)
        cpu_data(id).prom_node = cpu_node;
        cpu_data(id).mid = cpu_get_hwmid(cpu_node);
-        /* this is required to tune the scheduler correctly */
-        /* is it possible to have CPUs with different cache sizes? */
-        if (id == boot_cpu_id) {
-                int cache_line,cache_nlines;
-                cache_line = 0x20;
-                cache_line = prom_getintdefault(cpu_node, "ecache-line-size", cache_line);
-                cache_nlines = 0x8000;
-                cache_nlines = prom_getintdefault(cpu_node, "ecache-nlines", cache_nlines);
-                max_cache_size = cache_line * cache_nlines;
-        }
        if (cpu_data(id).mid < 0)
                panic("No MID found for CPU%d at node 0x%08d", id, cpu_node);
 }
diff --git a/arch/sparc/kernel/traps.c b/arch/sparc/kernel/traps.c
index dc9ffea2a4..3bc3bff51e 100644
--- a/arch/sparc/kernel/traps.c
+++ b/arch/sparc/kernel/traps.c
@@ -101,6 +101,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
        printk("%s(%d): %s [#%d]\n", current->comm, current->pid, str, ++die_counter);
        show_regs(regs);
+        add_taint(TAINT_DIE);
        __SAVE; __SAVE; __SAVE; __SAVE;
        __SAVE; __SAVE; __SAVE; __SAVE;
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index e5eaa8072a..ca26232da7 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -160,9 +160,6 @@ static inline int srmmu_pte_none(pte_t pte)
 static inline int srmmu_pte_present(pte_t pte)
 { return ((pte_val(pte) & SRMMU_ET_MASK) == SRMMU_ET_PTE); }
-static inline int srmmu_pte_read(pte_t pte)
-{ return !(pte_val(pte) & SRMMU_NOREAD); }
 static inline void srmmu_pte_clear(pte_t *ptep)
 { srmmu_set_pte(ptep, __pte(0)); }
@@ -2181,7 +2178,6 @@ void __init ld_mmu_srmmu(void)
        BTFIXUPSET_CALL(pte_present, srmmu_pte_present, BTFIXUPCALL_NORM);
        BTFIXUPSET_CALL(pte_clear, srmmu_pte_clear, BTFIXUPCALL_SWAPO0G0);
-        BTFIXUPSET_CALL(pte_read, srmmu_pte_read, BTFIXUPCALL_NORM);
        BTFIXUPSET_CALL(pmd_bad, srmmu_pmd_bad, BTFIXUPCALL_NORM);
        BTFIXUPSET_CALL(pmd_present, srmmu_pmd_present, BTFIXUPCALL_NORM);
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c
index 436021ceb2..bdd835fba0 100644
--- a/arch/sparc/mm/sun4c.c
+++ b/arch/sparc/mm/sun4c.c
@@ -1748,11 +1748,6 @@ static int sun4c_pte_present(pte_t pte)
 }
 static void sun4c_pte_clear(pte_t *ptep)        { *ptep = __pte(0); }
-static int sun4c_pte_read(pte_t pte)
-{
-        return (pte_val(pte) & _SUN4C_PAGE_READ);
-}
 static int sun4c_pmd_bad(pmd_t pmd)
 {
        return (((pmd_val(pmd) & ~PAGE_MASK) != PGD_TABLE) ||
@@ -2212,7 +2207,6 @@ void __init ld_mmu_sun4c(void)
        BTFIXUPSET_CALL(pte_present, sun4c_pte_present, BTFIXUPCALL_NORM);
        BTFIXUPSET_CALL(pte_clear, sun4c_pte_clear, BTFIXUPCALL_STG0O0);
-        BTFIXUPSET_CALL(pte_read, sun4c_pte_read, BTFIXUPCALL_NORM);
        BTFIXUPSET_CALL(pmd_bad, sun4c_pmd_bad, BTFIXUPCALL_NORM);
        BTFIXUPSET_CALL(pmd_present, sun4c_pmd_present, BTFIXUPCALL_NORM);
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 89a1b469b9..df6ee71894 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -62,6 +62,9 @@ config AUDIT_ARCH
        bool
        default y
+config ARCH_NO_VIRT_TO_BUS
+        def_bool y
 choice
        prompt "Kernel page size"
        default SPARC64_PAGE_SIZE_8KB
@@ -108,6 +111,15 @@ config SECCOMP
 source kernel/Kconfig.hz
+config HOTPLUG_CPU
+        bool "Support for hot-pluggable CPUs"
+        depends on SMP
+        select HOTPLUG
+        ---help---
+          Say Y here to experiment with turning CPUs off and on.  CPUs
+          can be controlled through /sys/devices/system/cpu/cpu#.
+          Say N if you want to disable CPU hotplug.
 source "init/Kconfig"
 config SYSVIPC_COMPAT
@@ -305,6 +317,12 @@ config SUN_IO
        bool
        default y
+config SUN_LDOMS
+        bool "Sun Logical Domains support"
+        help
+          Say Y here is you want to support virtual devices via
+          Logical Domains.
 config PCI
        bool "PCI support"
        select ARCH_SUPPORTS_MSI
@@ -320,8 +338,10 @@ config PCI
          doesn't.
 config PCI_DOMAINS
-        bool
+        def_bool PCI
-        default PCI
+config PCI_SYSCALL
+        def_bool PCI
 source "drivers/pci/Kconfig"
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 65840a62bb..45ebf91a28 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc1
+# Linux kernel version: 2.6.22
-# Mon May 14 04:17:48 2007
+# Tue Jul 17 01:19:52 2007
 #
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
@@ -42,12 +42,11 @@ CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=18
@@ -82,22 +81,15 @@ CONFIG_SLUB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_BLK_DEV_BSG=y
 #
 # IO Schedulers
@@ -156,12 +148,15 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_NR_QUICK=1
+CONFIG_VIRT_TO_BUS=y
 CONFIG_SBUS=y
 CONFIG_SBUSCHAR=y
 CONFIG_SUN_AUXIO=y
 CONFIG_SUN_IO=y
+# CONFIG_SUN_LDOMS is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
@@ -246,10 +241,6 @@ CONFIG_IPV6_TUNNEL=m
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 CONFIG_IP_DCCP=m
 CONFIG_INET_DCCP_DIAG=m
 CONFIG_IP_DCCP_ACKVEC=y
@@ -269,15 +260,7 @@ CONFIG_IP_DCCP_CCID3_RTO=100
 #
 # CONFIG_IP_DCCP_DEBUG is not set
 # CONFIG_NET_DCCPPROBE is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -314,6 +297,7 @@ CONFIG_NET_TCPPROBE=m
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 #
 # Device Drivers
@@ -328,26 +312,10 @@ CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 CONFIG_CONNECTOR=m
 # CONFIG_MTD is not set
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-#
-# Block devices
-#
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -364,18 +332,11 @@ CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD_WCACHE=y
 CONFIG_ATA_OVER_ETH=m
+CONFIG_MISC_DEVICES=y
-#
-# Misc devices
-#
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
@@ -440,6 +401,7 @@ CONFIG_BLK_DEV_IDEDMA=y
 #
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
@@ -505,7 +467,6 @@ CONFIG_ISCSI_TCP=m
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_ESP_CORE is not set
 # CONFIG_SCSI_SUNESP is not set
 # CONFIG_SCSI_SRP is not set
 # CONFIG_ATA is not set
@@ -545,30 +506,16 @@ CONFIG_DM_ZERO=m
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 CONFIG_DUMMY=m
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
 # CONFIG_PHYLIB is not set
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=m
 # CONFIG_SUNLANCE is not set
@@ -578,10 +525,6 @@ CONFIG_MII=m
 # CONFIG_SUNGEM is not set
 CONFIG_CASSINI=m
 # CONFIG_NET_VENDOR_3COM is not set
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_NET_PCI=y
@@ -617,7 +560,6 @@ CONFIG_E1000_NAPI=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
@@ -631,11 +573,6 @@ CONFIG_NETDEV_10000=y
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
 # CONFIG_MLX4_CORE is not set
-CONFIG_MLX4_DEBUG=y
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 #
@@ -665,6 +602,7 @@ CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_MPPE=m
 CONFIG_PPPOE=m
+# CONFIG_PPPOL2TP is not set
 # CONFIG_SLIP is not set
 CONFIG_SLHC=m
 # CONFIG_NET_FC is not set
@@ -677,10 +615,6 @@ CONFIG_SLHC=m
 # ISDN subsystem
 #
 # CONFIG_ISDN is not set
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 #
@@ -688,6 +622,7 @@ CONFIG_SLHC=m
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 #
 # Userland interfaces
@@ -733,7 +668,6 @@ CONFIG_INPUT_SPARCSPKR=y
 # CONFIG_INPUT_POWERMATE is not set
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_POLLDEV is not set
 #
 # Hardware I/O ports
@@ -773,10 +707,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
@@ -785,10 +715,6 @@ CONFIG_RTC=y
 # CONFIG_APPLICOM is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -822,6 +748,7 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
@@ -833,11 +760,13 @@ CONFIG_I2C_ALGOBIT=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -848,11 +777,8 @@ CONFIG_I2C_ALGOBIT=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
@@ -949,6 +875,8 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_SBUS is not set
+# CONFIG_FB_XVR500 is not set
+# CONFIG_FB_XVR2500 is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_RIVA is not set
@@ -970,9 +898,6 @@ CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
-# CONFIG_FB_XVR500 is not set
-# CONFIG_FB_XVR2500 is not set
-# CONFIG_FB_PCI is not set
 # CONFIG_FB_VIRTUAL is not set
 #
@@ -1118,10 +1043,7 @@ CONFIG_SND_SUN_CS4231=m
 #
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
-#
-# HID Devices
-#
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
@@ -1132,10 +1054,7 @@ CONFIG_USB_HID=y
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 # CONFIG_HID_FF is not set
 CONFIG_USB_HIDDEV=y
+CONFIG_USB_SUPPORT=y
-#
-# USB support
-#
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1157,7 +1076,6 @@ CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -1165,6 +1083,7 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 #
 # USB Device Class drivers
@@ -1256,17 +1175,9 @@ CONFIG_USB_STORAGE=m
 #
 # LED Triggers
 #
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
 #
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-#
 # Real Time Clock
 #
 # CONFIG_RTC_CLASS is not set
@@ -1387,7 +1298,6 @@ CONFIG_RAMFS=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 #
 # Partition Types
@@ -1465,8 +1375,10 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHED_DEBUG is not set
 CONFIG_SCHEDSTATS=y
 # CONFIG_TIMER_STATS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
@@ -1496,10 +1408,10 @@ CONFIG_FORCED_INLINING=y
 CONFIG_KEYS=y
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 # CONFIG_SECURITY is not set
+CONFIG_XOR_BLOCKS=m
-#
+CONFIG_ASYNC_CORE=m
-# Cryptographic options
+CONFIG_ASYNC_MEMCPY=m
-#
+CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1539,10 +1451,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_HW=y
-#
-# Hardware crypto devices
-#
 #
 # Library routines
diff --git a/arch/sparc64/kernel/Makefile b/arch/sparc64/kernel/Makefile
index f964bf28d2..b66876bf41 100644
--- a/arch/sparc64/kernel/Makefile
+++ b/arch/sparc64/kernel/Makefile
@@ -18,7 +18,7 @@ obj-$(CONFIG_STACKTRACE) += stacktrace.o
 obj-$(CONFIG_PCI)        += ebus.o isa.o pci_common.o pci_iommu.o \
                            pci_psycho.o pci_sabre.o pci_schizo.o \
                            pci_sun4v.o pci_sun4v_asm.o pci_fire.o
-obj-$(CONFIG_SMP)        += smp.o trampoline.o
+obj-$(CONFIG_SMP)        += smp.o trampoline.o hvtramp.o
 obj-$(CONFIG_SPARC32_COMPAT) += sys32.o sys_sparc32.o signal32.o
 obj-$(CONFIG_BINFMT_ELF32) += binfmt_elf32.o
 obj-$(CONFIG_BINFMT_AOUT32) += binfmt_aout32.o
@@ -26,6 +26,7 @@ obj-$(CONFIG_MODULES) += module.o
 obj-$(CONFIG_US3_FREQ) += us3_cpufreq.o
 obj-$(CONFIG_US2E_FREQ) += us2e_cpufreq.o
 obj-$(CONFIG_KPROBES) += kprobes.o
+obj-$(CONFIG_SUN_LDOMS) += ldc.o vio.o viohs.o ds.o
 obj-$(CONFIG_AUDIT) += audit.o
 obj-$(CONFIG_AUDIT)$(CONFIG_SPARC32_COMPAT) += compat_audit.o
 obj-y += $(obj-yy)
diff --git a/arch/sparc64/kernel/ds.c b/arch/sparc64/kernel/ds.c
new file mode 100644
index 0000000000..fa1f04d756
--- /dev/null
+++ b/arch/sparc64/kernel/ds.c
@@ -0,0 +1,1187 @@
+/* ds.c: Domain Services driver for Logical Domains
+ *
+ * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/sched.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <linux/kthread.h>
+#include <linux/cpu.h>
+#include <asm/ldc.h>
+#include <asm/vio.h>
+#include <asm/power.h>
+#include <asm/mdesc.h>
+#include <asm/head.h>
+#include <asm/irq.h>
+#define DRV_MODULE_NAME         "ds"
+#define PFX DRV_MODULE_NAME     ": "
+#define DRV_MODULE_VERSION      "1.0"
+#define DRV_MODULE_RELDATE      "Jul 11, 2007"
+static char version[] __devinitdata =
+        DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
+MODULE_AUTHOR("David S. Miller (davem@davemloft.net)");
+MODULE_DESCRIPTION("Sun LDOM domain services driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_MODULE_VERSION);
+struct ds_msg_tag {
+        __u32                   type;
+#define DS_INIT_REQ             0x00
+#define DS_INIT_ACK             0x01
+#define DS_INIT_NACK            0x02
+#define DS_REG_REQ              0x03
+#define DS_REG_ACK              0x04
+#define DS_REG_NACK             0x05
+#define DS_UNREG_REQ            0x06
+#define DS_UNREG_ACK            0x07
+#define DS_UNREG_NACK           0x08
+#define DS_DATA                 0x09
+#define DS_NACK                 0x0a
+        __u32                   len;
+};
+/* Result codes */
+#define DS_OK                   0x00
+#define DS_REG_VER_NACK         0x01
+#define DS_REG_DUP              0x02
+#define DS_INV_HDL              0x03
+#define DS_TYPE_UNKNOWN         0x04
+struct ds_version {
+        __u16                   major;
+        __u16                   minor;
+};
+struct ds_ver_req {
+        struct ds_msg_tag       tag;
+        struct ds_version       ver;
+};
+struct ds_ver_ack {
+        struct ds_msg_tag       tag;
+        __u16                   minor;
+};
+struct ds_ver_nack {
+        struct ds_msg_tag       tag;
+        __u16                   major;
+};
+struct ds_reg_req {
+        struct ds_msg_tag       tag;
+        __u64                   handle;
+        __u16                   major;
+        __u16                   minor;
+        char                    svc_id[0];
+};
+struct ds_reg_ack {
+        struct ds_msg_tag       tag;
+        __u64                   handle;
+        __u16                   minor;
+};
+struct ds_reg_nack {
+        struct ds_msg_tag       tag;
+        __u64                   handle;
+        __u16                   major;
+};
+struct ds_unreg_req {
+        struct ds_msg_tag       tag;
+        __u64                   handle;
+};
+struct ds_unreg_ack {
+        struct ds_msg_tag       tag;
+        __u64                   handle;
+};
+struct ds_unreg_nack {
+        struct ds_msg_tag       tag;
+        __u64                   handle;
+};
+struct ds_data {
+        struct ds_msg_tag       tag;
+        __u64                   handle;
+};
+struct ds_data_nack {
+        struct ds_msg_tag       tag;
+        __u64                   handle;
+        __u64                   result;
+};
+struct ds_cap_state {
+        __u64                   handle;
+        void                    (*data)(struct ldc_channel *lp,
+                                        struct ds_cap_state *cp,
+                                        void *buf, int len);
+        const char              *service_id;
+        u8                      state;
+#define CAP_STATE_UNKNOWN       0x00
+#define CAP_STATE_REG_SENT      0x01
+#define CAP_STATE_REGISTERED    0x02
+};
+static void md_update_data(struct ldc_channel *lp, struct ds_cap_state *cp,
+                           void *buf, int len);
+static void domain_shutdown_data(struct ldc_channel *lp,
+                                 struct ds_cap_state *cp,
+                                 void *buf, int len);
+static void domain_panic_data(struct ldc_channel *lp,
+                              struct ds_cap_state *cp,
+                              void *buf, int len);
+#ifdef CONFIG_HOTPLUG_CPU
+static void dr_cpu_data(struct ldc_channel *lp,
+                        struct ds_cap_state *cp,
+                        void *buf, int len);
+#endif
+static void ds_pri_data(struct ldc_channel *lp,
+                        struct ds_cap_state *cp,
+                        void *buf, int len);
+static void ds_var_data(struct ldc_channel *lp,
+                        struct ds_cap_state *cp,
+                        void *buf, int len);
+struct ds_cap_state ds_states[] = {
+        {
+                .service_id     = "md-update",
+                .data           = md_update_data,
+        },
+        {
+                .service_id     = "domain-shutdown",
+                .data           = domain_shutdown_data,
+        },
+        {
+                .service_id     = "domain-panic",
+                .data           = domain_panic_data,
+        },
+#ifdef CONFIG_HOTPLUG_CPU
+        {
+                .service_id     = "dr-cpu",
+                .data           = dr_cpu_data,
+        },
+#endif
+        {
+                .service_id     = "pri",
+                .data           = ds_pri_data,
+        },
+        {
+                .service_id     = "var-config",
+                .data           = ds_var_data,
+        },
+        {
+                .service_id     = "var-config-backup",
+                .data           = ds_var_data,
+        },
+};
+static DEFINE_SPINLOCK(ds_lock);
+struct ds_info {
+        struct ldc_channel      *lp;
+        u8                      hs_state;
+#define DS_HS_START             0x01
+#define DS_HS_DONE              0x02
+        void                    *rcv_buf;
+        int                     rcv_buf_len;
+};
+static struct ds_info *ds_info;
+static struct ds_cap_state *find_cap(u64 handle)
+{
+        unsigned int index = handle >> 32;
+        if (index >= ARRAY_SIZE(ds_states))
+                return NULL;
+        return &ds_states[index];
+}
+static struct ds_cap_state *find_cap_by_string(const char *name)
+{
+        int i;
+        for (i = 0; i < ARRAY_SIZE(ds_states); i++) {
+                if (strcmp(ds_states[i].service_id, name))
+                        continue;
+                return &ds_states[i];
+        }
+        return NULL;
+}
+static int __ds_send(struct ldc_channel *lp, void *data, int len)
+{
+        int err, limit = 1000;
+        err = -EINVAL;
+        while (limit-- > 0) {
+                err = ldc_write(lp, data, len);
+                if (!err || (err != -EAGAIN))
+                        break;
+                udelay(1);
+        }
+        return err;
+}
+static int ds_send(struct ldc_channel *lp, void *data, int len)
+{
+        unsigned long flags;
+        int err;
+        spin_lock_irqsave(&ds_lock, flags);
+        err = __ds_send(lp, data, len);
+        spin_unlock_irqrestore(&ds_lock, flags);
+        return err;
+}
+struct ds_md_update_req {
+        __u64                           req_num;
+};
+struct ds_md_update_res {
+        __u64                           req_num;
+        __u32                           result;
+};
+static void md_update_data(struct ldc_channel *lp,
+                           struct ds_cap_state *dp,
+                           void *buf, int len)
+{
+        struct ds_data *dpkt = buf;
+        struct ds_md_update_req *rp;
+        struct {
+                struct ds_data          data;
+                struct ds_md_update_res res;
+        } pkt;
+        rp = (struct ds_md_update_req *) (dpkt + 1);
+        printk(KERN_INFO PFX "Machine description update.\n");
+        mdesc_update();
+        memset(&pkt, 0, sizeof(pkt));
+        pkt.data.tag.type = DS_DATA;
+        pkt.data.tag.len = sizeof(pkt) - sizeof(struct ds_msg_tag);
+        pkt.data.handle = dp->handle;
+        pkt.res.req_num = rp->req_num;
+        pkt.res.result = DS_OK;
+        ds_send(lp, &pkt, sizeof(pkt));
+}
+struct ds_shutdown_req {
+        __u64                           req_num;
+        __u32                           ms_delay;
+};
+struct ds_shutdown_res {
+        __u64                           req_num;
+        __u32                           result;
+        char                            reason[1];
+};
+static void domain_shutdown_data(struct ldc_channel *lp,
+                                 struct ds_cap_state *dp,
+                                 void *buf, int len)
+{
+        struct ds_data *dpkt = buf;
+        struct ds_shutdown_req *rp;
+        struct {
+                struct ds_data          data;
+                struct ds_shutdown_res  res;
+        } pkt;
+        rp = (struct ds_shutdown_req *) (dpkt + 1);
+        printk(KERN_ALERT PFX "Shutdown request from "
+               "LDOM manager received.\n");
+        memset(&pkt, 0, sizeof(pkt));
+        pkt.data.tag.type = DS_DATA;
+        pkt.data.tag.len = sizeof(pkt) - sizeof(struct ds_msg_tag);
+        pkt.data.handle = dp->handle;
+        pkt.res.req_num = rp->req_num;
+        pkt.res.result = DS_OK;
+        pkt.res.reason[0] = 0;
+        ds_send(lp, &pkt, sizeof(pkt));
+        wake_up_powerd();
+}
+struct ds_panic_req {
+        __u64                           req_num;
+};
+struct ds_panic_res {
+        __u64                           req_num;
+        __u32                           result;
+        char                            reason[1];
+};
+static void domain_panic_data(struct ldc_channel *lp,
+                              struct ds_cap_state *dp,
+                              void *buf, int len)
+{
+        struct ds_data *dpkt = buf;
+        struct ds_panic_req *rp;
+        struct {
+                struct ds_data          data;
+                struct ds_panic_res     res;
+        } pkt;
+        rp = (struct ds_panic_req *) (dpkt + 1);
+        printk(KERN_ALERT PFX "Panic request from "
+               "LDOM manager received.\n");
+        memset(&pkt, 0, sizeof(pkt));
+        pkt.data.tag.type = DS_DATA;
+        pkt.data.tag.len = sizeof(pkt) - sizeof(struct ds_msg_tag);
+        pkt.data.handle = dp->handle;
+        pkt.res.req_num = rp->req_num;
+        pkt.res.result = DS_OK;
+        pkt.res.reason[0] = 0;
+        ds_send(lp, &pkt, sizeof(pkt));
+        panic("PANIC requested by LDOM manager.");
+}
+#ifdef CONFIG_HOTPLUG_CPU
+struct dr_cpu_tag {
+        __u64                           req_num;
+        __u32                           type;
+#define DR_CPU_CONFIGURE                0x43
+#define DR_CPU_UNCONFIGURE              0x55
+#define DR_CPU_FORCE_UNCONFIGURE        0x46
+#define DR_CPU_STATUS                   0x53
+/* Responses */
+#define DR_CPU_OK                       0x6f
+#define DR_CPU_ERROR                    0x65
+        __u32                           num_records;
+};
+struct dr_cpu_resp_entry {
+        __u32                           cpu;
+        __u32                           result;
+#define DR_CPU_RES_OK                   0x00
+#define DR_CPU_RES_FAILURE              0x01
+#define DR_CPU_RES_BLOCKED              0x02
+#define DR_CPU_RES_CPU_NOT_RESPONDING   0x03
+#define DR_CPU_RES_NOT_IN_MD            0x04
+        __u32                           stat;
+#define DR_CPU_STAT_NOT_PRESENT         0x00
+#define DR_CPU_STAT_UNCONFIGURED        0x01
+#define DR_CPU_STAT_CONFIGURED          0x02
+        __u32                           str_off;
+};
+static void __dr_cpu_send_error(struct ds_cap_state *cp, struct ds_data *data)
+{
+        struct dr_cpu_tag *tag = (struct dr_cpu_tag *) (data + 1);
+        struct ds_info *dp = ds_info;
+        struct {
+                struct ds_data          data;
+                struct dr_cpu_tag       tag;
+        } pkt;
+        int msg_len;
+        memset(&pkt, 0, sizeof(pkt));
+        pkt.data.tag.type = DS_DATA;
+        pkt.data.handle = cp->handle;
+        pkt.tag.req_num = tag->req_num;
+        pkt.tag.type = DR_CPU_ERROR;
+        pkt.tag.num_records = 0;
+        msg_len = (sizeof(struct ds_data) +
+                   sizeof(struct dr_cpu_tag));
+        pkt.data.tag.len = msg_len - sizeof(struct ds_msg_tag);
+        __ds_send(dp->lp, &pkt, msg_len);
+}
+static void dr_cpu_send_error(struct ds_cap_state *cp, struct ds_data *data)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&ds_lock, flags);
+        __dr_cpu_send_error(cp, data);
+        spin_unlock_irqrestore(&ds_lock, flags);
+}
+#define CPU_SENTINEL    0xffffffff
+static void purge_dups(u32 *list, u32 num_ents)
+{
+        unsigned int i;
+        for (i = 0; i < num_ents; i++) {
+                u32 cpu = list[i];
+                unsigned int j;
+                if (cpu == CPU_SENTINEL)
+                        continue;
+                for (j = i + 1; j < num_ents; j++) {
+                        if (list[j] == cpu)
+                                list[j] = CPU_SENTINEL;
+                }
+        }
+}
+static int dr_cpu_size_response(int ncpus)
+{
+        return (sizeof(struct ds_data) +
+                sizeof(struct dr_cpu_tag) +
+                (sizeof(struct dr_cpu_resp_entry) * ncpus));
+}
+static void dr_cpu_init_response(struct ds_data *resp, u64 req_num,
+                                 u64 handle, int resp_len, int ncpus,
+                                 cpumask_t *mask, u32 default_stat)
+{
+        struct dr_cpu_resp_entry *ent;
+        struct dr_cpu_tag *tag;
+        int i, cpu;
+        tag = (struct dr_cpu_tag *) (resp + 1);
+        ent = (struct dr_cpu_resp_entry *) (tag + 1);
+        resp->tag.type = DS_DATA;
+        resp->tag.len = resp_len - sizeof(struct ds_msg_tag);
+        resp->handle = handle;
+        tag->req_num = req_num;
+        tag->type = DR_CPU_OK;
+        tag->num_records = ncpus;
+        i = 0;
+        for_each_cpu_mask(cpu, *mask) {
+                ent[i].cpu = cpu;
+                ent[i].result = DR_CPU_RES_OK;
+                ent[i].stat = default_stat;
+                i++;
+        }
+        BUG_ON(i != ncpus);
+}
+static void dr_cpu_mark(struct ds_data *resp, int cpu, int ncpus,
+                        u32 res, u32 stat)
+{
+        struct dr_cpu_resp_entry *ent;
+        struct dr_cpu_tag *tag;
+        int i;
+        tag = (struct dr_cpu_tag *) (resp + 1);
+        ent = (struct dr_cpu_resp_entry *) (tag + 1);
+        for (i = 0; i < ncpus; i++) {
+                if (ent[i].cpu != cpu)
+                        continue;
+                ent[i].result = res;
+                ent[i].stat = stat;
+                break;
+        }
+}
+static int dr_cpu_configure(struct ds_cap_state *cp, u64 req_num,
+                            cpumask_t *mask)
+{
+        struct ds_data *resp;
+        int resp_len, ncpus, cpu;
+        unsigned long flags;
+        ncpus = cpus_weight(*mask);
+        resp_len = dr_cpu_size_response(ncpus);
+        resp = kzalloc(resp_len, GFP_KERNEL);
+        if (!resp)
+                return -ENOMEM;
+        dr_cpu_init_response(resp, req_num, cp->handle,
+                             resp_len, ncpus, mask,
+                             DR_CPU_STAT_CONFIGURED);
+        mdesc_fill_in_cpu_data(*mask);
+        for_each_cpu_mask(cpu, *mask) {
+                int err;
+                printk(KERN_INFO PFX "Starting cpu %d...\n", cpu);
+                err = cpu_up(cpu);
+                if (err) {
+                        __u32 res = DR_CPU_RES_FAILURE;
+                        __u32 stat = DR_CPU_STAT_UNCONFIGURED;
+                        if (!cpu_present(cpu)) {
+                                /* CPU not present in MD */
+                                res = DR_CPU_RES_NOT_IN_MD;
+                                stat = DR_CPU_STAT_NOT_PRESENT;
+                        } else if (err == -ENODEV) {
+                                /* CPU did not call in successfully */
+                                res = DR_CPU_RES_CPU_NOT_RESPONDING;
+                        }
+                        printk(KERN_INFO PFX "CPU startup failed err=%d\n",
+                               err);
+                        dr_cpu_mark(resp, cpu, ncpus, res, stat);
+                }
+        }
+        spin_lock_irqsave(&ds_lock, flags);
+        __ds_send(ds_info->lp, resp, resp_len);
+        spin_unlock_irqrestore(&ds_lock, flags);
+        kfree(resp);
+        /* Redistribute IRQs, taking into account the new cpus.  */
+        fixup_irqs();
+        return 0;
+}
+static int dr_cpu_unconfigure(struct ds_cap_state *cp, u64 req_num,
+                              cpumask_t *mask)
+{
+        struct ds_data *resp;
+        int resp_len, ncpus, cpu;
+        unsigned long flags;
+        ncpus = cpus_weight(*mask);
+        resp_len = dr_cpu_size_response(ncpus);
+        resp = kzalloc(resp_len, GFP_KERNEL);
+        if (!resp)
+                return -ENOMEM;
+        dr_cpu_init_response(resp, req_num, cp->handle,
+                             resp_len, ncpus, mask,
+                             DR_CPU_STAT_UNCONFIGURED);
+        for_each_cpu_mask(cpu, *mask) {
+                int err;
+                printk(KERN_INFO PFX "CPU[%d]: Shutting down cpu %d...\n",
+                       smp_processor_id(), cpu);
+                err = cpu_down(cpu);
+                if (err)
+                        dr_cpu_mark(resp, cpu, ncpus,
+                                    DR_CPU_RES_FAILURE,
+                                    DR_CPU_STAT_CONFIGURED);
+        }
+        spin_lock_irqsave(&ds_lock, flags);
+        __ds_send(ds_info->lp, resp, resp_len);
+        spin_unlock_irqrestore(&ds_lock, flags);
+        kfree(resp);
+        return 0;
+}
+static void dr_cpu_data(struct ldc_channel *lp,
+                        struct ds_cap_state *cp,
+                        void *buf, int len)
+{
+        struct ds_data *data = buf;
+        struct dr_cpu_tag *tag = (struct dr_cpu_tag *) (data + 1);
+        u32 *cpu_list = (u32 *) (tag + 1);
+        u64 req_num = tag->req_num;
+        cpumask_t mask;
+        unsigned int i;
+        int err;
+        switch (tag->type) {
+        case DR_CPU_CONFIGURE:
+        case DR_CPU_UNCONFIGURE:
+        case DR_CPU_FORCE_UNCONFIGURE:
+                break;
+        default:
+                dr_cpu_send_error(cp, data);
+                return;
+        }
+        purge_dups(cpu_list, tag->num_records);
+        cpus_clear(mask);
+        for (i = 0; i < tag->num_records; i++) {
+                if (cpu_list[i] == CPU_SENTINEL)
+                        continue;
+                if (cpu_list[i] < NR_CPUS)
+                        cpu_set(cpu_list[i], mask);
+        }
+        if (tag->type == DR_CPU_CONFIGURE)
+                err = dr_cpu_configure(cp, req_num, &mask);
+        else
+                err = dr_cpu_unconfigure(cp, req_num, &mask);
+        if (err)
+                dr_cpu_send_error(cp, data);
+}
+#endif /* CONFIG_HOTPLUG_CPU */
+struct ds_pri_msg {
+        __u64                           req_num;
+        __u64                           type;
+#define DS_PRI_REQUEST                  0x00
+#define DS_PRI_DATA                     0x01
+#define DS_PRI_UPDATE                   0x02
+};
+static void ds_pri_data(struct ldc_channel *lp,
+                        struct ds_cap_state *dp,
+                        void *buf, int len)
+{
+        struct ds_data *dpkt = buf;
+        struct ds_pri_msg *rp;
+        rp = (struct ds_pri_msg *) (dpkt + 1);
+        printk(KERN_INFO PFX "PRI REQ [%lx:%lx], len=%d\n",
+               rp->req_num, rp->type, len);
+}
+struct ds_var_hdr {
+        __u32                           type;
+#define DS_VAR_SET_REQ                  0x00
+#define DS_VAR_DELETE_REQ               0x01
+#define DS_VAR_SET_RESP                 0x02
+#define DS_VAR_DELETE_RESP              0x03
+};
+struct ds_var_set_msg {
+        struct ds_var_hdr               hdr;
+        char                            name_and_value[0];
+};
+struct ds_var_delete_msg {
+        struct ds_var_hdr               hdr;
+        char                            name[0];
+};
+struct ds_var_resp {
+        struct ds_var_hdr               hdr;
+        __u32                           result;
+#define DS_VAR_SUCCESS                  0x00
+#define DS_VAR_NO_SPACE                 0x01
+#define DS_VAR_INVALID_VAR              0x02
+#define DS_VAR_INVALID_VAL              0x03
+#define DS_VAR_NOT_PRESENT              0x04
+};
+static DEFINE_MUTEX(ds_var_mutex);
+static int ds_var_doorbell;
+static int ds_var_response;
+static void ds_var_data(struct ldc_channel *lp,
+                        struct ds_cap_state *dp,
+                        void *buf, int len)
+{
+        struct ds_data *dpkt = buf;
+        struct ds_var_resp *rp;
+        rp = (struct ds_var_resp *) (dpkt + 1);
+        if (rp->hdr.type != DS_VAR_SET_RESP &&
+            rp->hdr.type != DS_VAR_DELETE_RESP)
+                return;
+        ds_var_response = rp->result;
+        wmb();
+        ds_var_doorbell = 1;
+}
+void ldom_set_var(const char *var, const char *value)
+{
+        struct ds_info *dp = ds_info;
+        struct ds_cap_state *cp;
+        cp = find_cap_by_string("var-config");
+        if (cp->state != CAP_STATE_REGISTERED)
+                cp = find_cap_by_string("var-config-backup");
+        if (cp->state == CAP_STATE_REGISTERED) {
+                union {
+                        struct {
+                                struct ds_data          data;
+                                struct ds_var_set_msg   msg;
+                        } header;
+                        char                    all[512];
+                } pkt;
+                unsigned long flags;
+                char  *base, *p;
+                int msg_len, loops;
+                memset(&pkt, 0, sizeof(pkt));
+                pkt.header.data.tag.type = DS_DATA;
+                pkt.header.data.handle = cp->handle;
+                pkt.header.msg.hdr.type = DS_VAR_SET_REQ;
+                base = p = &pkt.header.msg.name_and_value[0];
+                strcpy(p, var);
+                p += strlen(var) + 1;
+                strcpy(p, value);
+                p += strlen(value) + 1;
+                msg_len = (sizeof(struct ds_data) +
+                           sizeof(struct ds_var_set_msg) +
+                           (p - base));
+                msg_len = (msg_len + 3) & ~3;
+                pkt.header.data.tag.len = msg_len - sizeof(struct ds_msg_tag);
+                mutex_lock(&ds_var_mutex);
+                spin_lock_irqsave(&ds_lock, flags);
+                ds_var_doorbell = 0;
+                ds_var_response = -1;
+                __ds_send(dp->lp, &pkt, msg_len);
+                spin_unlock_irqrestore(&ds_lock, flags);
+                loops = 1000;
+                while (ds_var_doorbell == 0) {
+                        if (loops-- < 0)
+                                break;
+                        barrier();
+                        udelay(100);
+                }
+                mutex_unlock(&ds_var_mutex);
+                if (ds_var_doorbell == 0 ||
+                    ds_var_response != DS_VAR_SUCCESS)
+                        printk(KERN_ERR PFX "var-config [%s:%s] "
+                               "failed, response(%d).\n",
+                               var, value,
+                               ds_var_response);
+        } else {
+                printk(KERN_ERR PFX "var-config not registered so "
+                       "could not set (%s) variable to (%s).\n",
+                       var, value);
+        }
+}
+void ldom_reboot(const char *boot_command)
+{
+        /* Don't bother with any of this if the boot_command
+         * is empty.
+         */
+        if (boot_command && strlen(boot_command)) {
+                char full_boot_str[256];
+                strcpy(full_boot_str, "boot ");
+                strcpy(full_boot_str + strlen("boot "), boot_command);
+                ldom_set_var("reboot-command", full_boot_str);
+        }
+        sun4v_mach_sir();
+}
+void ldom_power_off(void)
+{
+        sun4v_mach_exit(0);
+}
+static void ds_conn_reset(struct ds_info *dp)
+{
+        printk(KERN_ERR PFX "ds_conn_reset() from %p\n",
+               __builtin_return_address(0));
+}
+static int register_services(struct ds_info *dp)
+{
+        struct ldc_channel *lp = dp->lp;
+        int i;
+        for (i = 0; i < ARRAY_SIZE(ds_states); i++) {
+                struct {
+                        struct ds_reg_req req;
+                        u8 id_buf[256];
+                } pbuf;
+                struct ds_cap_state *cp = &ds_states[i];
+                int err, msg_len;
+                u64 new_count;
+                if (cp->state == CAP_STATE_REGISTERED)
+                        continue;
+                new_count = sched_clock() & 0xffffffff;
+                cp->handle = ((u64) i << 32) | new_count;
+                msg_len = (sizeof(struct ds_reg_req) +
+                           strlen(cp->service_id));
+                memset(&pbuf, 0, sizeof(pbuf));
+                pbuf.req.tag.type = DS_REG_REQ;
+                pbuf.req.tag.len = (msg_len - sizeof(struct ds_msg_tag));
+                pbuf.req.handle = cp->handle;
+                pbuf.req.major = 1;
+                pbuf.req.minor = 0;
+                strcpy(pbuf.req.svc_id, cp->service_id);
+                err = __ds_send(lp, &pbuf, msg_len);
+                if (err > 0)
+                        cp->state = CAP_STATE_REG_SENT;
+        }
+        return 0;
+}
+static int ds_handshake(struct ds_info *dp, struct ds_msg_tag *pkt)
+{
+        if (dp->hs_state == DS_HS_START) {
+                if (pkt->type != DS_INIT_ACK)
+                        goto conn_reset;
+                dp->hs_state = DS_HS_DONE;
+                return register_services(dp);
+        }
+        if (dp->hs_state != DS_HS_DONE)
+                goto conn_reset;
+        if (pkt->type == DS_REG_ACK) {
+                struct ds_reg_ack *ap = (struct ds_reg_ack *) pkt;
+                struct ds_cap_state *cp = find_cap(ap->handle);
+                if (!cp) {
+                        printk(KERN_ERR PFX "REG ACK for unknown handle %lx\n",
+                               ap->handle);
+                        return 0;
+                }
+                printk(KERN_INFO PFX "Registered %s service.\n",
+                       cp->service_id);
+                cp->state = CAP_STATE_REGISTERED;
+        } else if (pkt->type == DS_REG_NACK) {
+                struct ds_reg_nack *np = (struct ds_reg_nack *) pkt;
+                struct ds_cap_state *cp = find_cap(np->handle);
+                if (!cp) {
+                        printk(KERN_ERR PFX "REG NACK for "
+                               "unknown handle %lx\n",
+                               np->handle);
+                        return 0;
+                }
+                printk(KERN_INFO PFX "Could not register %s service\n",
+                       cp->service_id);
+                cp->state = CAP_STATE_UNKNOWN;
+        }
+        return 0;
+conn_reset:
+        ds_conn_reset(dp);
+        return -ECONNRESET;
+}
+static void __send_ds_nack(struct ds_info *dp, u64 handle)
+{
+        struct ds_data_nack nack = {
+                .tag = {
+                        .type = DS_NACK,
+                        .len = (sizeof(struct ds_data_nack) -
+                                sizeof(struct ds_msg_tag)),
+                },
+                .handle = handle,
+                .result = DS_INV_HDL,
+        };
+        __ds_send(dp->lp, &nack, sizeof(nack));
+}
+static LIST_HEAD(ds_work_list);
+static DECLARE_WAIT_QUEUE_HEAD(ds_wait);
+struct ds_queue_entry {
+        struct list_head                list;
+        int                             req_len;
+        int                             __pad;
+        u64                             req[0];
+};
+static void process_ds_work(void)
+{
+        struct ds_queue_entry *qp, *tmp;
+        static struct ds_info *dp;
+        unsigned long flags;
+        LIST_HEAD(todo);
+        spin_lock_irqsave(&ds_lock, flags);
+        list_splice(&ds_work_list, &todo);
+        INIT_LIST_HEAD(&ds_work_list);
+        spin_unlock_irqrestore(&ds_lock, flags);
+        dp = ds_info;
+        list_for_each_entry_safe(qp, tmp, &todo, list) {
+                struct ds_data *dpkt = (struct ds_data *) qp->req;
+                struct ds_cap_state *cp = find_cap(dpkt->handle);
+                int req_len = qp->req_len;
+                if (!cp) {
+                        printk(KERN_ERR PFX "Data for unknown handle %lu\n",
+                               dpkt->handle);
+                        spin_lock_irqsave(&ds_lock, flags);
+                        __send_ds_nack(dp, dpkt->handle);
+                        spin_unlock_irqrestore(&ds_lock, flags);
+                } else {
+                        cp->data(dp->lp, cp, dpkt, req_len);
+                }
+                list_del(&qp->list);
+                kfree(qp);
+        }
+}
+static int ds_thread(void *__unused)
+{
+        DEFINE_WAIT(wait);
+        while (1) {
+                prepare_to_wait(&ds_wait, &wait, TASK_INTERRUPTIBLE);
+                if (list_empty(&ds_work_list))
+                        schedule();
+                finish_wait(&ds_wait, &wait);
+                if (kthread_should_stop())
+                        break;
+                process_ds_work();
+        }
+        return 0;
+}
+static int ds_data(struct ds_info *dp, struct ds_msg_tag *pkt, int len)
+{
+        struct ds_data *dpkt = (struct ds_data *) pkt;
+        struct ds_queue_entry *qp;
+        qp = kmalloc(sizeof(struct ds_queue_entry) + len, GFP_ATOMIC);
+        if (!qp) {
+                __send_ds_nack(dp, dpkt->handle);
+        } else {
+                memcpy(&qp->req, pkt, len);
+                list_add_tail(&qp->list, &ds_work_list);
+                wake_up(&ds_wait);
+        }
+        return 0;
+}
+static void ds_up(struct ds_info *dp)
+{
+        struct ldc_channel *lp = dp->lp;
+        struct ds_ver_req req;
+        int err;
+        req.tag.type = DS_INIT_REQ;
+        req.tag.len = sizeof(req) - sizeof(struct ds_msg_tag);
+        req.ver.major = 1;
+        req.ver.minor = 0;
+        err = __ds_send(lp, &req, sizeof(req));
+        if (err > 0)
+                dp->hs_state = DS_HS_START;
+}
+static void ds_reset(struct ds_info *dp)
+{
+        int i;
+        dp->hs_state = 0;
+        for (i = 0; i < ARRAY_SIZE(ds_states); i++) {
+                struct ds_cap_state *cp = &ds_states[i];
+                cp->state = CAP_STATE_UNKNOWN;
+        }
+}
+static void ds_event(void *arg, int event)
+{
+        struct ds_info *dp = arg;
+        struct ldc_channel *lp = dp->lp;
+        unsigned long flags;
+        int err;
+        spin_lock_irqsave(&ds_lock, flags);
+        if (event == LDC_EVENT_UP) {
+                ds_up(dp);
+                spin_unlock_irqrestore(&ds_lock, flags);
+                return;
+        }
+        if (event == LDC_EVENT_RESET) {
+                ds_reset(dp);
+                spin_unlock_irqrestore(&ds_lock, flags);
+                return;
+        }
+        if (event != LDC_EVENT_DATA_READY) {
+                printk(KERN_WARNING PFX "Unexpected LDC event %d\n", event);
+                spin_unlock_irqrestore(&ds_lock, flags);
+                return;
+        }
+        err = 0;
+        while (1) {
+                struct ds_msg_tag *tag;
+                err = ldc_read(lp, dp->rcv_buf, sizeof(*tag));
+                if (unlikely(err < 0)) {
+                        if (err == -ECONNRESET)
+                                ds_conn_reset(dp);
+                        break;
+                }
+                if (err == 0)
+                        break;
+                tag = dp->rcv_buf;
+                err = ldc_read(lp, tag + 1, tag->len);
+                if (unlikely(err < 0)) {
+                        if (err == -ECONNRESET)
+                                ds_conn_reset(dp);
+                        break;
+                }
+                if (err < tag->len)
+                        break;
+                if (tag->type < DS_DATA)
+                        err = ds_handshake(dp, dp->rcv_buf);
+                else
+                        err = ds_data(dp, dp->rcv_buf,
+                                      sizeof(*tag) + err);
+                if (err == -ECONNRESET)
+                        break;
+        }
+        spin_unlock_irqrestore(&ds_lock, flags);
+}
+static int __devinit ds_probe(struct vio_dev *vdev,
+                              const struct vio_device_id *id)
+{
+        static int ds_version_printed;
+        struct ldc_channel_config ds_cfg = {
+                .event          = ds_event,
+                .mtu            = 4096,
+                .mode           = LDC_MODE_STREAM,
+        };
+        struct ldc_channel *lp;
+        struct ds_info *dp;
+        int err;
+        if (ds_version_printed++ == 0)
+                printk(KERN_INFO "%s", version);
+        dp = kzalloc(sizeof(*dp), GFP_KERNEL);
+        err = -ENOMEM;
+        if (!dp)
+                goto out_err;
+        dp->rcv_buf = kzalloc(4096, GFP_KERNEL);
+        if (!dp->rcv_buf)
+                goto out_free_dp;
+        dp->rcv_buf_len = 4096;
+        ds_cfg.tx_irq = vdev->tx_irq;
+        ds_cfg.rx_irq = vdev->rx_irq;
+        lp = ldc_alloc(vdev->channel_id, &ds_cfg, dp);
+        if (IS_ERR(lp)) {
+                err = PTR_ERR(lp);
+                goto out_free_rcv_buf;
+        }
+        dp->lp = lp;
+        err = ldc_bind(lp, "DS");
+        if (err)
+                goto out_free_ldc;
+        ds_info = dp;
+        start_powerd();
+        return err;
+out_free_ldc:
+        ldc_free(dp->lp);
+out_free_rcv_buf:
+        kfree(dp->rcv_buf);
+out_free_dp:
+        kfree(dp);
+out_err:
+        return err;
+}
+static int ds_remove(struct vio_dev *vdev)
+{
+        return 0;
+}
+static struct vio_device_id ds_match[] = {
+        {
+                .type = "domain-services-port",
+        },
+        {},
+};
+static struct vio_driver ds_driver = {
+        .id_table       = ds_match,
+        .probe          = ds_probe,
+        .remove         = ds_remove,
+        .driver         = {
+                .name   = "ds",
+                .owner  = THIS_MODULE,
+        }
+};
+static int __init ds_init(void)
+{
+        int i;
+        for (i = 0; i < ARRAY_SIZE(ds_states); i++)
+                ds_states[i].handle = ((u64)i << 32);
+        kthread_run(ds_thread, NULL, "kldomd");
+        return vio_register_driver(&ds_driver);
+}
+subsys_initcall(ds_init);
diff --git a/arch/sparc64/kernel/hvtramp.S b/arch/sparc64/kernel/hvtramp.S
new file mode 100644
index 0000000000..a55c252e18
--- /dev/null
+++ b/arch/sparc64/kernel/hvtramp.S
@@ -0,0 +1,140 @@
+/* hvtramp.S: Hypervisor start-cpu trampoline code.
+ *
+ * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
+ */
+#include <asm/thread_info.h>
+#include <asm/hypervisor.h>
+#include <asm/scratchpad.h>
+#include <asm/spitfire.h>
+#include <asm/hvtramp.h>
+#include <asm/pstate.h>
+#include <asm/ptrace.h>
+#include <asm/head.h>
+#include <asm/asi.h>
+        .text
+        .align          8
+        .globl          hv_cpu_startup, hv_cpu_startup_end
+        /* This code executes directly out of the hypervisor
+         * with physical addressing (va==pa).  %o0 contains
+         * our client argument which for Linux points to
+         * a descriptor data structure which defines the
+         * MMU entries we need to load up.
+         *
+         * After we set things up we enable the MMU and call
+         * into the kernel.
+         *
+         * First setup basic privileged cpu state.
+         */
+hv_cpu_startup:
+        SET_GL(0)
+        wrpr            %g0, 15, %pil
+        wrpr            %g0, 0, %canrestore
+        wrpr            %g0, 0, %otherwin
+        wrpr            %g0, 6, %cansave
+        wrpr            %g0, 6, %cleanwin
+        wrpr            %g0, 0, %cwp
+        wrpr            %g0, 0, %wstate
+        wrpr            %g0, 0, %tl
+        sethi           %hi(sparc64_ttable_tl0), %g1
+        wrpr            %g1, %tba
+        mov             %o0, %l0
+        lduw            [%l0 + HVTRAMP_DESCR_CPU], %g1
+        mov             SCRATCHPAD_CPUID, %g2
+        stxa            %g1, [%g2] ASI_SCRATCHPAD
+        ldx             [%l0 + HVTRAMP_DESCR_FAULT_INFO_VA], %g2
+        stxa            %g2, [%g0] ASI_SCRATCHPAD
+        mov             0, %l1
+        lduw            [%l0 + HVTRAMP_DESCR_NUM_MAPPINGS], %l2
+        add             %l0, HVTRAMP_DESCR_MAPS, %l3
+1:      ldx             [%l3 + HVTRAMP_MAPPING_VADDR], %o0
+        clr             %o1
+        ldx             [%l3 + HVTRAMP_MAPPING_TTE], %o2
+        mov             HV_MMU_IMMU | HV_MMU_DMMU, %o3
+        mov             HV_FAST_MMU_MAP_PERM_ADDR, %o5
+        ta              HV_FAST_TRAP
+        brnz,pn         %o0, 80f
+         nop
+        add             %l1, 1, %l1
+        cmp             %l1, %l2
+        blt,a,pt        %xcc, 1b
+         add            %l3, HVTRAMP_MAPPING_SIZE, %l3
+        ldx             [%l0 + HVTRAMP_DESCR_FAULT_INFO_PA], %o0
+        mov             HV_FAST_MMU_FAULT_AREA_CONF, %o5
+        ta              HV_FAST_TRAP
+        brnz,pn         %o0, 80f
+         nop
+        wrpr            %g0, (PSTATE_PRIV | PSTATE_PEF), %pstate
+        ldx             [%l0 + HVTRAMP_DESCR_THREAD_REG], %l6
+        mov             1, %o0
+        set             1f, %o1
+        mov             HV_FAST_MMU_ENABLE, %o5
+        ta              HV_FAST_TRAP
+        ba,pt           %xcc, 80f
+         nop
+1:
+        wr              %g0, 0, %fprs
+        wr              %g0, ASI_P, %asi
+        mov             PRIMARY_CONTEXT, %g7
+        stxa            %g0, [%g7] ASI_MMU
+        membar          #Sync
+        mov             SECONDARY_CONTEXT, %g7
+        stxa            %g0, [%g7] ASI_MMU
+        membar          #Sync
+        mov             %l6, %g6
+        ldx             [%g6 + TI_TASK], %g4
+        mov             1, %g5
+        sllx            %g5, THREAD_SHIFT, %g5
+        sub             %g5, (STACKFRAME_SZ + STACK_BIAS), %g5
+        add             %g6, %g5, %sp
+        mov             0, %fp
+        call            init_irqwork_curcpu
+         nop
+        call            hard_smp_processor_id
+         nop
+        mov             %o0, %o1
+        mov             0, %o0
+        mov             0, %o2
+        call            sun4v_init_mondo_queues
+         mov            1, %o3
+        call            init_cur_cpu_trap
+         mov            %g6, %o0
+        wrpr            %g0, (PSTATE_PRIV | PSTATE_PEF | PSTATE_IE), %pstate
+        call            smp_callin
+         nop
+        call            cpu_idle
+         mov            0, %o0
+        call            cpu_panic
+         nop
+80:     ba,pt           %xcc, 80b
+         nop
+        .align          8
+hv_cpu_startup_end:
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index e60d283f60..8cb3358674 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -293,6 +293,11 @@ static void sun4u_irq_enable(unsigned int virt_irq)
        }
 }
+static void sun4u_set_affinity(unsigned int virt_irq, cpumask_t mask)
+{
+        sun4u_irq_enable(virt_irq);
+}
 static void sun4u_irq_disable(unsigned int virt_irq)
 {
        struct irq_handler_data *data = get_irq_chip_data(virt_irq);
@@ -309,6 +314,10 @@ static void sun4u_irq_disable(unsigned int virt_irq)
 static void sun4u_irq_end(unsigned int virt_irq)
 {
        struct irq_handler_data *data = get_irq_chip_data(virt_irq);
+        struct irq_desc *desc = irq_desc + virt_irq;
+        if (unlikely(desc->status & (IRQ_DISABLED|IRQ_INPROGRESS)))
+                return;
        if (likely(data))
                upa_writeq(ICLR_IDLE, data->iclr);
@@ -329,6 +338,10 @@ static void sun4v_irq_enable(unsigned int virt_irq)
                if (err != HV_EOK)
                        printk("sun4v_intr_settarget(%x,%lu): err(%d)\n",
                               ino, cpuid, err);
+                err = sun4v_intr_setstate(ino, HV_INTR_STATE_IDLE);
+                if (err != HV_EOK)
+                        printk("sun4v_intr_setstate(%x): "
+                               "err(%d)\n", ino, err);
                err = sun4v_intr_setenabled(ino, HV_INTR_ENABLED);
                if (err != HV_EOK)
                        printk("sun4v_intr_setenabled(%x): err(%d)\n",
@@ -336,6 +349,24 @@ static void sun4v_irq_enable(unsigned int virt_irq)
        }
 }
+static void sun4v_set_affinity(unsigned int virt_irq, cpumask_t mask)
+{
+        struct ino_bucket *bucket = virt_irq_to_bucket(virt_irq);
+        unsigned int ino = bucket - &ivector_table[0];
+        if (likely(bucket)) {
+                unsigned long cpuid;
+                int err;
+                cpuid = irq_choose_cpu(virt_irq);
+                err = sun4v_intr_settarget(ino, cpuid);
+                if (err != HV_EOK)
+                        printk("sun4v_intr_settarget(%x,%lu): err(%d)\n",
+                               ino, cpuid, err);
+        }
+}
 static void sun4v_irq_disable(unsigned int virt_irq)
 {
        struct ino_bucket *bucket = virt_irq_to_bucket(virt_irq);
@@ -369,6 +400,10 @@ static void sun4v_irq_end(unsigned int virt_irq)
 {
        struct ino_bucket *bucket = virt_irq_to_bucket(virt_irq);
        unsigned int ino = bucket - &ivector_table[0];
+        struct irq_desc *desc = irq_desc + virt_irq;
+        if (unlikely(desc->status & (IRQ_DISABLED|IRQ_INPROGRESS)))
+                return;
        if (likely(bucket)) {
                int err;
@@ -400,6 +435,12 @@ static void sun4v_virq_enable(unsigned int virt_irq)
                               "err(%d)\n",
                               dev_handle, dev_ino, cpuid, err);
                err = sun4v_vintr_set_state(dev_handle, dev_ino,
+                                            HV_INTR_STATE_IDLE);
+                if (err != HV_EOK)
+                        printk("sun4v_vintr_set_state(%lx,%lx,"
+                                "HV_INTR_STATE_IDLE): err(%d)\n",
+                               dev_handle, dev_ino, err);
+                err = sun4v_vintr_set_valid(dev_handle, dev_ino,
                                            HV_INTR_ENABLED);
                if (err != HV_EOK)
                        printk("sun4v_vintr_set_state(%lx,%lx,"
@@ -408,6 +449,28 @@ static void sun4v_virq_enable(unsigned int virt_irq)
        }
 }
+static void sun4v_virt_set_affinity(unsigned int virt_irq, cpumask_t mask)
+{
+        struct ino_bucket *bucket = virt_irq_to_bucket(virt_irq);
+        unsigned int ino = bucket - &ivector_table[0];
+        if (likely(bucket)) {
+                unsigned long cpuid, dev_handle, dev_ino;
+                int err;
+                cpuid = irq_choose_cpu(virt_irq);
+                dev_handle = ino & IMAP_IGN;
+                dev_ino = ino & IMAP_INO;
+                err = sun4v_vintr_set_target(dev_handle, dev_ino, cpuid);
+                if (err != HV_EOK)
+                        printk("sun4v_vintr_set_target(%lx,%lx,%lu): "
+                               "err(%d)\n",
+                               dev_handle, dev_ino, cpuid, err);
+        }
+}
 static void sun4v_virq_disable(unsigned int virt_irq)
 {
        struct ino_bucket *bucket = virt_irq_to_bucket(virt_irq);
@@ -420,7 +483,7 @@ static void sun4v_virq_disable(unsigned int virt_irq)
                dev_handle = ino & IMAP_IGN;
                dev_ino = ino & IMAP_INO;
-                err = sun4v_vintr_set_state(dev_handle, dev_ino,
+                err = sun4v_vintr_set_valid(dev_handle, dev_ino,
                                            HV_INTR_DISABLED);
                if (err != HV_EOK)
                        printk("sun4v_vintr_set_state(%lx,%lx,"
@@ -433,6 +496,10 @@ static void sun4v_virq_end(unsigned int virt_irq)
 {
        struct ino_bucket *bucket = virt_irq_to_bucket(virt_irq);
        unsigned int ino = bucket - &ivector_table[0];
+        struct irq_desc *desc = irq_desc + virt_irq;
+        if (unlikely(desc->status & (IRQ_DISABLED|IRQ_INPROGRESS)))
+                return;
        if (likely(bucket)) {
                unsigned long dev_handle, dev_ino;
@@ -467,6 +534,7 @@ static struct irq_chip sun4u_irq = {
        .enable         = sun4u_irq_enable,
        .disable        = sun4u_irq_disable,
        .end            = sun4u_irq_end,
+        .set_affinity   = sun4u_set_affinity,
 };
 static struct irq_chip sun4u_irq_ack = {
@@ -475,6 +543,7 @@ static struct irq_chip sun4u_irq_ack = {
        .disable        = sun4u_irq_disable,
        .ack            = run_pre_handler,
        .end            = sun4u_irq_end,
+        .set_affinity   = sun4u_set_affinity,
 };
 static struct irq_chip sun4v_irq = {
@@ -482,6 +551,7 @@ static struct irq_chip sun4v_irq = {
        .enable         = sun4v_irq_enable,
        .disable        = sun4v_irq_disable,
        .end            = sun4v_irq_end,
+        .set_affinity   = sun4v_set_affinity,
 };
 static struct irq_chip sun4v_irq_ack = {
@@ -490,6 +560,7 @@ static struct irq_chip sun4v_irq_ack = {
        .disable        = sun4v_irq_disable,
        .ack            = run_pre_handler,
        .end            = sun4v_irq_end,
+        .set_affinity   = sun4v_set_affinity,
 };
 #ifdef CONFIG_PCI_MSI
@@ -501,6 +572,7 @@ static struct irq_chip sun4v_msi = {
        .disable        = sun4v_msi_disable,
        .ack            = run_pre_handler,
        .end            = sun4v_irq_end,
+        .set_affinity   = sun4v_set_affinity,
 };
 #endif
@@ -509,6 +581,7 @@ static struct irq_chip sun4v_virq = {
        .enable         = sun4v_virq_enable,
        .disable        = sun4v_virq_disable,
        .end            = sun4v_virq_end,
+        .set_affinity   = sun4v_virt_set_affinity,
 };
 static struct irq_chip sun4v_virq_ack = {
@@ -517,6 +590,7 @@ static struct irq_chip sun4v_virq_ack = {
        .disable        = sun4v_virq_disable,
        .ack            = run_pre_handler,
        .end            = sun4v_virq_end,
+        .set_affinity   = sun4v_virt_set_affinity,
 };
 void irq_install_pre_handler(int virt_irq,
@@ -729,6 +803,26 @@ void handler_irq(int irq, struct pt_regs *regs)
        set_irq_regs(old_regs);
 }
+#ifdef CONFIG_HOTPLUG_CPU
+void fixup_irqs(void)
+{
+        unsigned int irq;
+        for (irq = 0; irq < NR_IRQS; irq++) {
+                unsigned long flags;
+                spin_lock_irqsave(&irq_desc[irq].lock, flags);
+                if (irq_desc[irq].action &&
+                    !(irq_desc[irq].status & IRQ_PER_CPU)) {
+                        if (irq_desc[irq].chip->set_affinity)
+                                irq_desc[irq].chip->set_affinity(irq,
+                                        irq_desc[irq].affinity);
+                }
+                spin_unlock_irqrestore(&irq_desc[irq].lock, flags);
+        }
+}
+#endif
 struct sun5_timer {
        u64     count0;
        u64     limit0;
diff --git a/arch/sparc64/kernel/ldc.c b/arch/sparc64/kernel/ldc.c
new file mode 100644
index 0000000000..85a2be0b09
--- /dev/null
+++ b/arch/sparc64/kernel/ldc.c
@@ -0,0 +1,2373 @@
+/* ldc.c: Logical Domain Channel link-layer protocol driver.
+ *
+ * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/scatterlist.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/init.h>
+#include <asm/hypervisor.h>
+#include <asm/iommu.h>
+#include <asm/page.h>
+#include <asm/ldc.h>
+#include <asm/mdesc.h>
+#define DRV_MODULE_NAME         "ldc"
+#define PFX DRV_MODULE_NAME     ": "
+#define DRV_MODULE_VERSION      "1.0"
+#define DRV_MODULE_RELDATE      "June 25, 2007"
+static char version[] __devinitdata =
+        DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
+#define LDC_PACKET_SIZE         64
+/* Packet header layout for unreliable and reliable mode frames.
+ * When in RAW mode, packets are simply straight 64-byte payloads
+ * with no headers.
+ */
+struct ldc_packet {
+        u8                      type;
+#define LDC_CTRL                0x01
+#define LDC_DATA                0x02
+#define LDC_ERR                 0x10
+        u8                      stype;
+#define LDC_INFO                0x01
+#define LDC_ACK                 0x02
+#define LDC_NACK                0x04
+        u8                      ctrl;
+#define LDC_VERS                0x01 /* Link Version            */
+#define LDC_RTS                 0x02 /* Request To Send         */
+#define LDC_RTR                 0x03 /* Ready To Receive        */
+#define LDC_RDX                 0x04 /* Ready for Data eXchange */
+#define LDC_CTRL_MSK            0x0f
+        u8                      env;
+#define LDC_LEN                 0x3f
+#define LDC_FRAG_MASK           0xc0
+#define LDC_START               0x40
+#define LDC_STOP                0x80
+        u32                     seqid;
+        union {
+                u8              u_data[LDC_PACKET_SIZE - 8];
+                struct {
+                        u32     pad;
+                        u32     ackid;
+                        u8      r_data[LDC_PACKET_SIZE - 8 - 8];
+                } r;
+        } u;
+};
+struct ldc_version {
+        u16 major;
+        u16 minor;
+};
+/* Ordered from largest major to lowest.  */
+static struct ldc_version ver_arr[] = {
+        { .major = 1, .minor = 0 },
+};
+#define LDC_DEFAULT_MTU                 (4 * LDC_PACKET_SIZE)
+#define LDC_DEFAULT_NUM_ENTRIES         (PAGE_SIZE / LDC_PACKET_SIZE)
+struct ldc_channel;
+struct ldc_mode_ops {
+        int (*write)(struct ldc_channel *, const void *, unsigned int);
+        int (*read)(struct ldc_channel *, void *, unsigned int);
+};
+static const struct ldc_mode_ops raw_ops;
+static const struct ldc_mode_ops nonraw_ops;
+static const struct ldc_mode_ops stream_ops;
+int ldom_domaining_enabled;
+struct ldc_iommu {
+        /* Protects arena alloc/free.  */
+        spinlock_t                      lock;
+        struct iommu_arena              arena;
+        struct ldc_mtable_entry         *page_table;
+};
+struct ldc_channel {
+        /* Protects all operations that depend upon channel state.  */
+        spinlock_t                      lock;
+        unsigned long                   id;
+        u8                              *mssbuf;
+        u32                             mssbuf_len;
+        u32                             mssbuf_off;
+        struct ldc_packet               *tx_base;
+        unsigned long                   tx_head;
+        unsigned long                   tx_tail;
+        unsigned long                   tx_num_entries;
+        unsigned long                   tx_ra;
+        unsigned long                   tx_acked;
+        struct ldc_packet               *rx_base;
+        unsigned long                   rx_head;
+        unsigned long                   rx_tail;
+        unsigned long                   rx_num_entries;
+        unsigned long                   rx_ra;
+        u32                             rcv_nxt;
+        u32                             snd_nxt;
+        unsigned long                   chan_state;
+        struct ldc_channel_config       cfg;
+        void                            *event_arg;
+        const struct ldc_mode_ops       *mops;
+        struct ldc_iommu                iommu;
+        struct ldc_version              ver;
+        u8                              hs_state;
+#define LDC_HS_CLOSED                   0x00
+#define LDC_HS_OPEN                     0x01
+#define LDC_HS_GOTVERS                  0x02
+#define LDC_HS_SENTRTR                  0x03
+#define LDC_HS_GOTRTR                   0x04
+#define LDC_HS_COMPLETE                 0x10
+        u8                              flags;
+#define LDC_FLAG_ALLOCED_QUEUES         0x01
+#define LDC_FLAG_REGISTERED_QUEUES      0x02
+#define LDC_FLAG_REGISTERED_IRQS        0x04
+#define LDC_FLAG_RESET                  0x10
+        u8                              mss;
+        u8                              state;
+#define LDC_IRQ_NAME_MAX                32
+        char                            rx_irq_name[LDC_IRQ_NAME_MAX];
+        char                            tx_irq_name[LDC_IRQ_NAME_MAX];
+        struct hlist_head               mh_list;
+        struct hlist_node               list;
+};
+#define ldcdbg(TYPE, f, a...) \
+do {    if (lp->cfg.debug & LDC_DEBUG_##TYPE) \
+                printk(KERN_INFO PFX "ID[%lu] " f, lp->id, ## a); \
+} while (0)
+static const char *state_to_str(u8 state)
+{
+        switch (state) {
+        case LDC_STATE_INVALID:
+                return "INVALID";
+        case LDC_STATE_INIT:
+                return "INIT";
+        case LDC_STATE_BOUND:
+                return "BOUND";
+        case LDC_STATE_READY:
+                return "READY";
+        case LDC_STATE_CONNECTED:
+                return "CONNECTED";
+        default:
+                return "<UNKNOWN>";
+        }
+}
+static void ldc_set_state(struct ldc_channel *lp, u8 state)
+{
+        ldcdbg(STATE, "STATE (%s) --> (%s)\n",
+               state_to_str(lp->state),
+               state_to_str(state));
+        lp->state = state;
+}
+static unsigned long __advance(unsigned long off, unsigned long num_entries)
+{
+        off += LDC_PACKET_SIZE;
+        if (off == (num_entries * LDC_PACKET_SIZE))
+                off = 0;
+        return off;
+}
+static unsigned long rx_advance(struct ldc_channel *lp, unsigned long off)
+{
+        return __advance(off, lp->rx_num_entries);
+}
+static unsigned long tx_advance(struct ldc_channel *lp, unsigned long off)
+{
+        return __advance(off, lp->tx_num_entries);
+}
+static struct ldc_packet *handshake_get_tx_packet(struct ldc_channel *lp,
+                                                  unsigned long *new_tail)
+{
+        struct ldc_packet *p;
+        unsigned long t;
+        t = tx_advance(lp, lp->tx_tail);
+        if (t == lp->tx_head)
+                return NULL;
+        *new_tail = t;
+        p = lp->tx_base;
+        return p + (lp->tx_tail / LDC_PACKET_SIZE);
+}
+/* When we are in reliable or stream mode, have to track the next packet
+ * we haven't gotten an ACK for in the TX queue using tx_acked.  We have
+ * to be careful not to stomp over the queue past that point.  During
+ * the handshake, we don't have TX data packets pending in the queue
+ * and that's why handshake_get_tx_packet() need not be mindful of
+ * lp->tx_acked.
+ */
+static unsigned long head_for_data(struct ldc_channel *lp)
+{
+        if (lp->cfg.mode == LDC_MODE_STREAM)
+                return lp->tx_acked;
+        return lp->tx_head;
+}
+static int tx_has_space_for(struct ldc_channel *lp, unsigned int size)
+{
+        unsigned long limit, tail, new_tail, diff;
+        unsigned int mss;
+        limit = head_for_data(lp);
+        tail = lp->tx_tail;
+        new_tail = tx_advance(lp, tail);
+        if (new_tail == limit)
+                return 0;
+        if (limit > new_tail)
+                diff = limit - new_tail;
+        else
+                diff = (limit +
+                        ((lp->tx_num_entries * LDC_PACKET_SIZE) - new_tail));
+        diff /= LDC_PACKET_SIZE;
+        mss = lp->mss;
+        if (diff * mss < size)
+                return 0;
+        return 1;
+}
+static struct ldc_packet *data_get_tx_packet(struct ldc_channel *lp,
+                                             unsigned long *new_tail)
+{
+        struct ldc_packet *p;
+        unsigned long h, t;
+        h = head_for_data(lp);
+        t = tx_advance(lp, lp->tx_tail);
+        if (t == h)
+                return NULL;
+        *new_tail = t;
+        p = lp->tx_base;
+        return p + (lp->tx_tail / LDC_PACKET_SIZE);
+}
+static int set_tx_tail(struct ldc_channel *lp, unsigned long tail)
+{
+        unsigned long orig_tail = lp->tx_tail;
+        int limit = 1000;
+        lp->tx_tail = tail;
+        while (limit-- > 0) {
+                unsigned long err;
+                err = sun4v_ldc_tx_set_qtail(lp->id, tail);
+                if (!err)
+                        return 0;
+                if (err != HV_EWOULDBLOCK) {
+                        lp->tx_tail = orig_tail;
+                        return -EINVAL;
+                }
+                udelay(1);
+        }
+        lp->tx_tail = orig_tail;
+        return -EBUSY;
+}
+/* This just updates the head value in the hypervisor using
+ * a polling loop with a timeout.  The caller takes care of
+ * upating software state representing the head change, if any.
+ */
+static int __set_rx_head(struct ldc_channel *lp, unsigned long head)
+{
+        int limit = 1000;
+        while (limit-- > 0) {
+                unsigned long err;
+                err = sun4v_ldc_rx_set_qhead(lp->id, head);
+                if (!err)
+                        return 0;
+                if (err != HV_EWOULDBLOCK)
+                        return -EINVAL;
+                udelay(1);
+        }
+        return -EBUSY;
+}
+static int send_tx_packet(struct ldc_channel *lp,
+                          struct ldc_packet *p,
+                          unsigned long new_tail)
+{
+        BUG_ON(p != (lp->tx_base + (lp->tx_tail / LDC_PACKET_SIZE)));
+        return set_tx_tail(lp, new_tail);
+}
+static struct ldc_packet *handshake_compose_ctrl(struct ldc_channel *lp,
+                                                 u8 stype, u8 ctrl,
+                                                 void *data, int dlen,
+                                                 unsigned long *new_tail)
+{
+        struct ldc_packet *p = handshake_get_tx_packet(lp, new_tail);
+        if (p) {
+                memset(p, 0, sizeof(*p));
+                p->type = LDC_CTRL;
+                p->stype = stype;
+                p->ctrl = ctrl;
+                if (data)
+                        memcpy(p->u.u_data, data, dlen);
+        }
+        return p;
+}
+static int start_handshake(struct ldc_channel *lp)
+{
+        struct ldc_packet *p;
+        struct ldc_version *ver;
+        unsigned long new_tail;
+        ver = &ver_arr[0];
+        ldcdbg(HS, "SEND VER INFO maj[%u] min[%u]\n",
+               ver->major, ver->minor);
+        p = handshake_compose_ctrl(lp, LDC_INFO, LDC_VERS,
+                                   ver, sizeof(*ver), &new_tail);
+        if (p) {
+                int err = send_tx_packet(lp, p, new_tail);
+                if (!err)
+                        lp->flags &= ~LDC_FLAG_RESET;
+                return err;
+        }
+        return -EBUSY;
+}
+static int send_version_nack(struct ldc_channel *lp,
+                             u16 major, u16 minor)
+{
+        struct ldc_packet *p;
+        struct ldc_version ver;
+        unsigned long new_tail;
+        ver.major = major;
+        ver.minor = minor;
+        p = handshake_compose_ctrl(lp, LDC_NACK, LDC_VERS,
+                                   &ver, sizeof(ver), &new_tail);
+        if (p) {
+                ldcdbg(HS, "SEND VER NACK maj[%u] min[%u]\n",
+                       ver.major, ver.minor);
+                return send_tx_packet(lp, p, new_tail);
+        }
+        return -EBUSY;
+}
+static int send_version_ack(struct ldc_channel *lp,
+                            struct ldc_version *vp)
+{
+        struct ldc_packet *p;
+        unsigned long new_tail;
+        p = handshake_compose_ctrl(lp, LDC_ACK, LDC_VERS,
+                                   vp, sizeof(*vp), &new_tail);
+        if (p) {
+                ldcdbg(HS, "SEND VER ACK maj[%u] min[%u]\n",
+                       vp->major, vp->minor);
+                return send_tx_packet(lp, p, new_tail);
+        }
+        return -EBUSY;
+}
+static int send_rts(struct ldc_channel *lp)
+{
+        struct ldc_packet *p;
+        unsigned long new_tail;
+        p = handshake_compose_ctrl(lp, LDC_INFO, LDC_RTS, NULL, 0,
+                                   &new_tail);
+        if (p) {
+                p->env = lp->cfg.mode;
+                p->seqid = 0;
+                lp->rcv_nxt = 0;
+                ldcdbg(HS, "SEND RTS env[0x%x] seqid[0x%x]\n",
+                       p->env, p->seqid);
+                return send_tx_packet(lp, p, new_tail);
+        }
+        return -EBUSY;
+}
+static int send_rtr(struct ldc_channel *lp)
+{
+        struct ldc_packet *p;
+        unsigned long new_tail;
+        p = handshake_compose_ctrl(lp, LDC_INFO, LDC_RTR, NULL, 0,
+                                   &new_tail);
+        if (p) {
+                p->env = lp->cfg.mode;
+                p->seqid = 0;
+                ldcdbg(HS, "SEND RTR env[0x%x] seqid[0x%x]\n",
+                       p->env, p->seqid);
+                return send_tx_packet(lp, p, new_tail);
+        }
+        return -EBUSY;
+}
+static int send_rdx(struct ldc_channel *lp)
+{
+        struct ldc_packet *p;
+        unsigned long new_tail;
+        p = handshake_compose_ctrl(lp, LDC_INFO, LDC_RDX, NULL, 0,
+                                   &new_tail);
+        if (p) {
+                p->env = 0;
+                p->seqid = ++lp->snd_nxt;
+                p->u.r.ackid = lp->rcv_nxt;
+                ldcdbg(HS, "SEND RDX env[0x%x] seqid[0x%x] ackid[0x%x]\n",
+                       p->env, p->seqid, p->u.r.ackid);
+                return send_tx_packet(lp, p, new_tail);
+        }
+        return -EBUSY;
+}
+static int send_data_nack(struct ldc_channel *lp, struct ldc_packet *data_pkt)
+{
+        struct ldc_packet *p;
+        unsigned long new_tail;
+        int err;
+        p = data_get_tx_packet(lp, &new_tail);
+        if (!p)
+                return -EBUSY;
+        memset(p, 0, sizeof(*p));
+        p->type = data_pkt->type;
+        p->stype = LDC_NACK;
+        p->ctrl = data_pkt->ctrl & LDC_CTRL_MSK;
+        p->seqid = lp->snd_nxt + 1;
+        p->u.r.ackid = lp->rcv_nxt;
+        ldcdbg(HS, "SEND DATA NACK type[0x%x] ctl[0x%x] seq[0x%x] ack[0x%x]\n",
+               p->type, p->ctrl, p->seqid, p->u.r.ackid);
+        err = send_tx_packet(lp, p, new_tail);
+        if (!err)
+                lp->snd_nxt++;
+        return err;
+}
+static int ldc_abort(struct ldc_channel *lp)
+{
+        unsigned long hv_err;
+        ldcdbg(STATE, "ABORT\n");
+        /* We report but do not act upon the hypervisor errors because
+         * there really isn't much we can do if they fail at this point.
+         */
+        hv_err = sun4v_ldc_tx_qconf(lp->id, lp->tx_ra, lp->tx_num_entries);
+        if (hv_err)
+                printk(KERN_ERR PFX "ldc_abort: "
+                       "sun4v_ldc_tx_qconf(%lx,%lx,%lx) failed, err=%lu\n",
+                       lp->id, lp->tx_ra, lp->tx_num_entries, hv_err);
+        hv_err = sun4v_ldc_tx_get_state(lp->id,
+                                        &lp->tx_head,
+                                        &lp->tx_tail,
+                                        &lp->chan_state);
+        if (hv_err)
+                printk(KERN_ERR PFX "ldc_abort: "
+                       "sun4v_ldc_tx_get_state(%lx,...) failed, err=%lu\n",
+                       lp->id, hv_err);
+        hv_err = sun4v_ldc_rx_qconf(lp->id, lp->rx_ra, lp->rx_num_entries);
+        if (hv_err)
+                printk(KERN_ERR PFX "ldc_abort: "
+                       "sun4v_ldc_rx_qconf(%lx,%lx,%lx) failed, err=%lu\n",
+                       lp->id, lp->rx_ra, lp->rx_num_entries, hv_err);
+        /* Refetch the RX queue state as well, because we could be invoked
+         * here in the queue processing context.
+         */
+        hv_err = sun4v_ldc_rx_get_state(lp->id,
+                                        &lp->rx_head,
+                                        &lp->rx_tail,
+                                        &lp->chan_state);
+        if (hv_err)
+                printk(KERN_ERR PFX "ldc_abort: "
+                       "sun4v_ldc_rx_get_state(%lx,...) failed, err=%lu\n",
+                       lp->id, hv_err);
+        return -ECONNRESET;
+}
+static struct ldc_version *find_by_major(u16 major)
+{
+        struct ldc_version *ret = NULL;
+        int i;
+        for (i = 0; i < ARRAY_SIZE(ver_arr); i++) {
+                struct ldc_version *v = &ver_arr[i];
+                if (v->major <= major) {
+                        ret = v;
+                        break;
+                }
+        }
+        return ret;
+}
+static int process_ver_info(struct ldc_channel *lp, struct ldc_version *vp)
+{
+        struct ldc_version *vap;
+        int err;
+        ldcdbg(HS, "GOT VERSION INFO major[%x] minor[%x]\n",
+               vp->major, vp->minor);
+        if (lp->hs_state == LDC_HS_GOTVERS) {
+                lp->hs_state = LDC_HS_OPEN;
+                memset(&lp->ver, 0, sizeof(lp->ver));
+        }
+        vap = find_by_major(vp->major);
+        if (!vap) {
+                err = send_version_nack(lp, 0, 0);
+        } else if (vap->major != vp->major) {
+                err = send_version_nack(lp, vap->major, vap->minor);
+        } else {
+                struct ldc_version ver = *vp;
+                if (ver.minor > vap->minor)
+                        ver.minor = vap->minor;
+                err = send_version_ack(lp, &ver);
+                if (!err) {
+                        lp->ver = ver;
+                        lp->hs_state = LDC_HS_GOTVERS;
+                }
+        }
+        if (err)
+                return ldc_abort(lp);
+        return 0;
+}
+static int process_ver_ack(struct ldc_channel *lp, struct ldc_version *vp)
+{
+        ldcdbg(HS, "GOT VERSION ACK major[%x] minor[%x]\n",
+               vp->major, vp->minor);
+        if (lp->hs_state == LDC_HS_GOTVERS) {
+                if (lp->ver.major != vp->major ||
+                    lp->ver.minor != vp->minor)
+                        return ldc_abort(lp);
+        } else {
+                lp->ver = *vp;
+                lp->hs_state = LDC_HS_GOTVERS;
+        }
+        if (send_rts(lp))
+                return ldc_abort(lp);
+        return 0;
+}
+static int process_ver_nack(struct ldc_channel *lp, struct ldc_version *vp)
+{
+        struct ldc_version *vap;
+        if ((vp->major == 0 && vp->minor == 0) ||
+            !(vap = find_by_major(vp->major))) {
+                return ldc_abort(lp);
+        } else {
+                struct ldc_packet *p;
+                unsigned long new_tail;
+                p = handshake_compose_ctrl(lp, LDC_INFO, LDC_VERS,
+                                           vap, sizeof(*vap),
+                                           &new_tail);
+                if (p)
+                        return send_tx_packet(lp, p, new_tail);
+                else
+                        return ldc_abort(lp);
+        }
+}
+static int process_version(struct ldc_channel *lp,
+                           struct ldc_packet *p)
+{
+        struct ldc_version *vp;
+        vp = (struct ldc_version *) p->u.u_data;
+        switch (p->stype) {
+        case LDC_INFO:
+                return process_ver_info(lp, vp);
+        case LDC_ACK:
+                return process_ver_ack(lp, vp);
+        case LDC_NACK:
+                return process_ver_nack(lp, vp);
+        default:
+                return ldc_abort(lp);
+        }
+}
+static int process_rts(struct ldc_channel *lp,
+                       struct ldc_packet *p)
+{
+        ldcdbg(HS, "GOT RTS stype[%x] seqid[%x] env[%x]\n",
+               p->stype, p->seqid, p->env);
+        if (p->stype     != LDC_INFO       ||
+            lp->hs_state != LDC_HS_GOTVERS ||
+            p->env       != lp->cfg.mode)
+                return ldc_abort(lp);
+        lp->snd_nxt = p->seqid;
+        lp->rcv_nxt = p->seqid;
+        lp->hs_state = LDC_HS_SENTRTR;
+        if (send_rtr(lp))
+                return ldc_abort(lp);
+        return 0;
+}
+static int process_rtr(struct ldc_channel *lp,
+                       struct ldc_packet *p)
+{
+        ldcdbg(HS, "GOT RTR stype[%x] seqid[%x] env[%x]\n",
+               p->stype, p->seqid, p->env);
+        if (p->stype     != LDC_INFO ||
+            p->env       != lp->cfg.mode)
+                return ldc_abort(lp);
+        lp->snd_nxt = p->seqid;
+        lp->hs_state = LDC_HS_COMPLETE;
+        ldc_set_state(lp, LDC_STATE_CONNECTED);
+        send_rdx(lp);
+        return LDC_EVENT_UP;
+}
+static int rx_seq_ok(struct ldc_channel *lp, u32 seqid)
+{
+        return lp->rcv_nxt + 1 == seqid;
+}
+static int process_rdx(struct ldc_channel *lp,
+                       struct ldc_packet *p)
+{
+        ldcdbg(HS, "GOT RDX stype[%x] seqid[%x] env[%x] ackid[%x]\n",
+               p->stype, p->seqid, p->env, p->u.r.ackid);
+        if (p->stype != LDC_INFO ||
+            !(rx_seq_ok(lp, p->seqid)))
+                return ldc_abort(lp);
+        lp->rcv_nxt = p->seqid;
+        lp->hs_state = LDC_HS_COMPLETE;
+        ldc_set_state(lp, LDC_STATE_CONNECTED);
+        return LDC_EVENT_UP;
+}
+static int process_control_frame(struct ldc_channel *lp,
+                                 struct ldc_packet *p)
+{
+        switch (p->ctrl) {
+        case LDC_VERS:
+                return process_version(lp, p);
+        case LDC_RTS:
+                return process_rts(lp, p);
+        case LDC_RTR:
+                return process_rtr(lp, p);
+        case LDC_RDX:
+                return process_rdx(lp, p);
+        default:
+                return ldc_abort(lp);
+        }
+}
+static int process_error_frame(struct ldc_channel *lp,
+                               struct ldc_packet *p)
+{
+        return ldc_abort(lp);
+}
+static int process_data_ack(struct ldc_channel *lp,
+                            struct ldc_packet *ack)
+{
+        unsigned long head = lp->tx_acked;
+        u32 ackid = ack->u.r.ackid;
+        while (1) {
+                struct ldc_packet *p = lp->tx_base + (head / LDC_PACKET_SIZE);
+                head = tx_advance(lp, head);
+                if (p->seqid == ackid) {
+                        lp->tx_acked = head;
+                        return 0;
+                }
+                if (head == lp->tx_tail)
+                        return ldc_abort(lp);
+        }
+        return 0;
+}
+static void send_events(struct ldc_channel *lp, unsigned int event_mask)
+{
+        if (event_mask & LDC_EVENT_RESET)
+                lp->cfg.event(lp->event_arg, LDC_EVENT_RESET);
+        if (event_mask & LDC_EVENT_UP)
+                lp->cfg.event(lp->event_arg, LDC_EVENT_UP);
+        if (event_mask & LDC_EVENT_DATA_READY)
+                lp->cfg.event(lp->event_arg, LDC_EVENT_DATA_READY);
+}
+static irqreturn_t ldc_rx(int irq, void *dev_id)
+{
+        struct ldc_channel *lp = dev_id;
+        unsigned long orig_state, hv_err, flags;
+        unsigned int event_mask;
+        spin_lock_irqsave(&lp->lock, flags);
+        orig_state = lp->chan_state;
+        hv_err = sun4v_ldc_rx_get_state(lp->id,
+                                        &lp->rx_head,
+                                        &lp->rx_tail,
+                                        &lp->chan_state);
+        ldcdbg(RX, "RX state[0x%02lx:0x%02lx] head[0x%04lx] tail[0x%04lx]\n",
+               orig_state, lp->chan_state, lp->rx_head, lp->rx_tail);
+        event_mask = 0;
+        if (lp->cfg.mode == LDC_MODE_RAW &&
+            lp->chan_state == LDC_CHANNEL_UP) {
+                lp->hs_state = LDC_HS_COMPLETE;
+                ldc_set_state(lp, LDC_STATE_CONNECTED);
+                event_mask |= LDC_EVENT_UP;
+                orig_state = lp->chan_state;
+        }
+        /* If we are in reset state, flush the RX queue and ignore
+         * everything.
+         */
+        if (lp->flags & LDC_FLAG_RESET) {
+                (void) __set_rx_head(lp, lp->rx_tail);
+                goto out;
+        }
+        /* Once we finish the handshake, we let the ldc_read()
+         * paths do all of the control frame and state management.
+         * Just trigger the callback.
+         */
+        if (lp->hs_state == LDC_HS_COMPLETE) {
+handshake_complete:
+                if (lp->chan_state != orig_state) {
+                        unsigned int event = LDC_EVENT_RESET;
+                        if (lp->chan_state == LDC_CHANNEL_UP)
+                                event = LDC_EVENT_UP;
+                        event_mask |= event;
+                }
+                if (lp->rx_head != lp->rx_tail)
+                        event_mask |= LDC_EVENT_DATA_READY;
+                goto out;
+        }
+        if (lp->chan_state != orig_state)
+                goto out;
+        while (lp->rx_head != lp->rx_tail) {
+                struct ldc_packet *p;
+                unsigned long new;
+                int err;
+                p = lp->rx_base + (lp->rx_head / LDC_PACKET_SIZE);
+                switch (p->type) {
+                case LDC_CTRL:
+                        err = process_control_frame(lp, p);
+                        if (err > 0)
+                                event_mask |= err;
+                        break;
+                case LDC_DATA:
+                        event_mask |= LDC_EVENT_DATA_READY;
+                        err = 0;
+                        break;
+                case LDC_ERR:
+                        err = process_error_frame(lp, p);
+                        break;
+                default:
+                        err = ldc_abort(lp);
+                        break;
+                }
+                if (err < 0)
+                        break;
+                new = lp->rx_head;
+                new += LDC_PACKET_SIZE;
+                if (new == (lp->rx_num_entries * LDC_PACKET_SIZE))
+                        new = 0;
+                lp->rx_head = new;
+                err = __set_rx_head(lp, new);
+                if (err < 0) {
+                        (void) ldc_abort(lp);
+                        break;
+                }
+                if (lp->hs_state == LDC_HS_COMPLETE)
+                        goto handshake_complete;
+        }
+out:
+        spin_unlock_irqrestore(&lp->lock, flags);
+        send_events(lp, event_mask);
+        return IRQ_HANDLED;
+}
+static irqreturn_t ldc_tx(int irq, void *dev_id)
+{
+        struct ldc_channel *lp = dev_id;
+        unsigned long flags, hv_err, orig_state;
+        unsigned int event_mask = 0;
+        spin_lock_irqsave(&lp->lock, flags);
+        orig_state = lp->chan_state;
+        hv_err = sun4v_ldc_tx_get_state(lp->id,
+                                        &lp->tx_head,
+                                        &lp->tx_tail,
+                                        &lp->chan_state);
+        ldcdbg(TX, " TX state[0x%02lx:0x%02lx] head[0x%04lx] tail[0x%04lx]\n",
+               orig_state, lp->chan_state, lp->tx_head, lp->tx_tail);
+        if (lp->cfg.mode == LDC_MODE_RAW &&
+            lp->chan_state == LDC_CHANNEL_UP) {
+                lp->hs_state = LDC_HS_COMPLETE;
+                ldc_set_state(lp, LDC_STATE_CONNECTED);
+                event_mask |= LDC_EVENT_UP;
+        }
+        spin_unlock_irqrestore(&lp->lock, flags);
+        send_events(lp, event_mask);
+        return IRQ_HANDLED;
+}
+/* XXX ldc_alloc() and ldc_free() needs to run under a mutex so
+ * XXX that addition and removal from the ldc_channel_list has
+ * XXX atomicity, otherwise the __ldc_channel_exists() check is
+ * XXX totally pointless as another thread can slip into ldc_alloc()
+ * XXX and add a channel with the same ID.  There also needs to be
+ * XXX a spinlock for ldc_channel_list.
+ */
+static HLIST_HEAD(ldc_channel_list);
+static int __ldc_channel_exists(unsigned long id)
+{
+        struct ldc_channel *lp;
+        struct hlist_node *n;
+        hlist_for_each_entry(lp, n, &ldc_channel_list, list) {
+                if (lp->id == id)
+                        return 1;
+        }
+        return 0;
+}
+static int alloc_queue(const char *name, unsigned long num_entries,
+                       struct ldc_packet **base, unsigned long *ra)
+{
+        unsigned long size, order;
+        void *q;
+        size = num_entries * LDC_PACKET_SIZE;
+        order = get_order(size);
+        q = (void *) __get_free_pages(GFP_KERNEL, order);
+        if (!q) {
+                printk(KERN_ERR PFX "Alloc of %s queue failed with "
+                       "size=%lu order=%lu\n", name, size, order);
+                return -ENOMEM;
+        }
+        memset(q, 0, PAGE_SIZE << order);
+        *base = q;
+        *ra = __pa(q);
+        return 0;
+}
+static void free_queue(unsigned long num_entries, struct ldc_packet *q)
+{
+        unsigned long size, order;
+        if (!q)
+                return;
+        size = num_entries * LDC_PACKET_SIZE;
+        order = get_order(size);
+        free_pages((unsigned long)q, order);
+}
+/* XXX Make this configurable... XXX */
+#define LDC_IOTABLE_SIZE        (8 * 1024)
+static int ldc_iommu_init(struct ldc_channel *lp)
+{
+        unsigned long sz, num_tsb_entries, tsbsize, order;
+        struct ldc_iommu *iommu = &lp->iommu;
+        struct ldc_mtable_entry *table;
+        unsigned long hv_err;
+        int err;
+        num_tsb_entries = LDC_IOTABLE_SIZE;
+        tsbsize = num_tsb_entries * sizeof(struct ldc_mtable_entry);
+        spin_lock_init(&iommu->lock);
+        sz = num_tsb_entries / 8;
+        sz = (sz + 7UL) & ~7UL;
+        iommu->arena.map = kzalloc(sz, GFP_KERNEL);
+        if (!iommu->arena.map) {
+                printk(KERN_ERR PFX "Alloc of arena map failed, sz=%lu\n", sz);
+                return -ENOMEM;
+        }
+        iommu->arena.limit = num_tsb_entries;
+        order = get_order(tsbsize);
+        table = (struct ldc_mtable_entry *)
+                __get_free_pages(GFP_KERNEL, order);
+        err = -ENOMEM;
+        if (!table) {
+                printk(KERN_ERR PFX "Alloc of MTE table failed, "
+                       "size=%lu order=%lu\n", tsbsize, order);
+                goto out_free_map;
+        }
+        memset(table, 0, PAGE_SIZE << order);
+        iommu->page_table = table;
+        hv_err = sun4v_ldc_set_map_table(lp->id, __pa(table),
+                                         num_tsb_entries);
+        err = -EINVAL;
+        if (hv_err)
+                goto out_free_table;
+        return 0;
+out_free_table:
+        free_pages((unsigned long) table, order);
+        iommu->page_table = NULL;
+out_free_map:
+        kfree(iommu->arena.map);
+        iommu->arena.map = NULL;
+        return err;
+}
+static void ldc_iommu_release(struct ldc_channel *lp)
+{
+        struct ldc_iommu *iommu = &lp->iommu;
+        unsigned long num_tsb_entries, tsbsize, order;
+        (void) sun4v_ldc_set_map_table(lp->id, 0, 0);
+        num_tsb_entries = iommu->arena.limit;
+        tsbsize = num_tsb_entries * sizeof(struct ldc_mtable_entry);
+        order = get_order(tsbsize);
+        free_pages((unsigned long) iommu->page_table, order);
+        iommu->page_table = NULL;
+        kfree(iommu->arena.map);
+        iommu->arena.map = NULL;
+}
+struct ldc_channel *ldc_alloc(unsigned long id,
+                              const struct ldc_channel_config *cfgp,
+                              void *event_arg)
+{
+        struct ldc_channel *lp;
+        const struct ldc_mode_ops *mops;
+        unsigned long dummy1, dummy2, hv_err;
+        u8 mss, *mssbuf;
+        int err;
+        err = -ENODEV;
+        if (!ldom_domaining_enabled)
+                goto out_err;
+        err = -EINVAL;
+        if (!cfgp)
+                goto out_err;
+        switch (cfgp->mode) {
+        case LDC_MODE_RAW:
+                mops = &raw_ops;
+                mss = LDC_PACKET_SIZE;
+                break;
+        case LDC_MODE_UNRELIABLE:
+                mops = &nonraw_ops;
+                mss = LDC_PACKET_SIZE - 8;
+                break;
+        case LDC_MODE_STREAM:
+                mops = &stream_ops;
+                mss = LDC_PACKET_SIZE - 8 - 8;
+                break;
+        default:
+                goto out_err;
+        }
+        if (!cfgp->event || !event_arg || !cfgp->rx_irq || !cfgp->tx_irq)
+                goto out_err;
+        hv_err = sun4v_ldc_tx_qinfo(id, &dummy1, &dummy2);
+        err = -ENODEV;
+        if (hv_err == HV_ECHANNEL)
+                goto out_err;
+        err = -EEXIST;
+        if (__ldc_channel_exists(id))
+                goto out_err;
+        mssbuf = NULL;
+        lp = kzalloc(sizeof(*lp), GFP_KERNEL);
+        err = -ENOMEM;
+        if (!lp)
+                goto out_err;
+        spin_lock_init(&lp->lock);
+        lp->id = id;
+        err = ldc_iommu_init(lp);
+        if (err)
+                goto out_free_ldc;
+        lp->mops = mops;
+        lp->mss = mss;
+        lp->cfg = *cfgp;
+        if (!lp->cfg.mtu)
+                lp->cfg.mtu = LDC_DEFAULT_MTU;
+        if (lp->cfg.mode == LDC_MODE_STREAM) {
+                mssbuf = kzalloc(lp->cfg.mtu, GFP_KERNEL);
+                if (!mssbuf) {
+                        err = -ENOMEM;
+                        goto out_free_iommu;
+                }
+                lp->mssbuf = mssbuf;
+        }
+        lp->event_arg = event_arg;
+        /* XXX allow setting via ldc_channel_config to override defaults
+         * XXX or use some formula based upon mtu
+         */
+        lp->tx_num_entries = LDC_DEFAULT_NUM_ENTRIES;
+        lp->rx_num_entries = LDC_DEFAULT_NUM_ENTRIES;
+        err = alloc_queue("TX", lp->tx_num_entries,
+                          &lp->tx_base, &lp->tx_ra);
+        if (err)
+                goto out_free_mssbuf;
+        err = alloc_queue("RX", lp->rx_num_entries,
+                          &lp->rx_base, &lp->rx_ra);
+        if (err)
+                goto out_free_txq;
+        lp->flags |= LDC_FLAG_ALLOCED_QUEUES;
+        lp->hs_state = LDC_HS_CLOSED;
+        ldc_set_state(lp, LDC_STATE_INIT);
+        INIT_HLIST_NODE(&lp->list);
+        hlist_add_head(&lp->list, &ldc_channel_list);
+        INIT_HLIST_HEAD(&lp->mh_list);
+        return lp;
+out_free_txq:
+        free_queue(lp->tx_num_entries, lp->tx_base);
+out_free_mssbuf:
+        if (mssbuf)
+                kfree(mssbuf);
+out_free_iommu:
+        ldc_iommu_release(lp);
+out_free_ldc:
+        kfree(lp);
+out_err:
+        return ERR_PTR(err);
+}
+EXPORT_SYMBOL(ldc_alloc);
+void ldc_free(struct ldc_channel *lp)
+{
+        if (lp->flags & LDC_FLAG_REGISTERED_IRQS) {
+                free_irq(lp->cfg.rx_irq, lp);
+                free_irq(lp->cfg.tx_irq, lp);
+        }
+        if (lp->flags & LDC_FLAG_REGISTERED_QUEUES) {
+                sun4v_ldc_tx_qconf(lp->id, 0, 0);
+                sun4v_ldc_rx_qconf(lp->id, 0, 0);
+                lp->flags &= ~LDC_FLAG_REGISTERED_QUEUES;
+        }
+        if (lp->flags & LDC_FLAG_ALLOCED_QUEUES) {
+                free_queue(lp->tx_num_entries, lp->tx_base);
+                free_queue(lp->rx_num_entries, lp->rx_base);
+                lp->flags &= ~LDC_FLAG_ALLOCED_QUEUES;
+        }
+        hlist_del(&lp->list);
+        if (lp->mssbuf)
+                kfree(lp->mssbuf);
+        ldc_iommu_release(lp);
+        kfree(lp);
+}
+EXPORT_SYMBOL(ldc_free);
+/* Bind the channel.  This registers the LDC queues with
+ * the hypervisor and puts the channel into a pseudo-listening
+ * state.  This does not initiate a handshake, ldc_connect() does
+ * that.
+ */
+int ldc_bind(struct ldc_channel *lp, const char *name)
+{
+        unsigned long hv_err, flags;
+        int err = -EINVAL;
+        spin_lock_irqsave(&lp->lock, flags);
+        if (!name)
+                goto out_err;
+        if (lp->state != LDC_STATE_INIT)
+                goto out_err;
+        snprintf(lp->rx_irq_name, LDC_IRQ_NAME_MAX, "%s RX", name);
+        snprintf(lp->tx_irq_name, LDC_IRQ_NAME_MAX, "%s TX", name);
+        err = request_irq(lp->cfg.rx_irq, ldc_rx,
+                          IRQF_SAMPLE_RANDOM | IRQF_SHARED,
+                          lp->rx_irq_name, lp);
+        if (err)
+                goto out_err;
+        err = request_irq(lp->cfg.tx_irq, ldc_tx,
+                          IRQF_SAMPLE_RANDOM | IRQF_SHARED,
+                          lp->tx_irq_name, lp);
+        if (err)
+                goto out_free_rx_irq;
+        lp->flags |= LDC_FLAG_REGISTERED_IRQS;
+        err = -ENODEV;
+        hv_err = sun4v_ldc_tx_qconf(lp->id, 0, 0);
+        if (hv_err)
+                goto out_free_tx_irq;
+        hv_err = sun4v_ldc_tx_qconf(lp->id, lp->tx_ra, lp->tx_num_entries);
+        if (hv_err)
+                goto out_free_tx_irq;
+        hv_err = sun4v_ldc_rx_qconf(lp->id, 0, 0);
+        if (hv_err)
+                goto out_unmap_tx;
+        hv_err = sun4v_ldc_rx_qconf(lp->id, lp->rx_ra, lp->rx_num_entries);
+        if (hv_err)
+                goto out_unmap_tx;
+        lp->flags |= LDC_FLAG_REGISTERED_QUEUES;
+        hv_err = sun4v_ldc_tx_get_state(lp->id,
+                                        &lp->tx_head,
+                                        &lp->tx_tail,
+                                        &lp->chan_state);
+        err = -EBUSY;
+        if (hv_err)
+                goto out_unmap_rx;
+        lp->tx_acked = lp->tx_head;
+        lp->hs_state = LDC_HS_OPEN;
+        ldc_set_state(lp, LDC_STATE_BOUND);
+        spin_unlock_irqrestore(&lp->lock, flags);
+        return 0;
+out_unmap_rx:
+        lp->flags &= ~LDC_FLAG_REGISTERED_QUEUES;
+        sun4v_ldc_rx_qconf(lp->id, 0, 0);
+out_unmap_tx:
+        sun4v_ldc_tx_qconf(lp->id, 0, 0);
+out_free_tx_irq:
+        lp->flags &= ~LDC_FLAG_REGISTERED_IRQS;
+        free_irq(lp->cfg.tx_irq, lp);
+out_free_rx_irq:
+        free_irq(lp->cfg.rx_irq, lp);
+out_err:
+        spin_unlock_irqrestore(&lp->lock, flags);
+        return err;
+}
+EXPORT_SYMBOL(ldc_bind);
+int ldc_connect(struct ldc_channel *lp)
+{
+        unsigned long flags;
+        int err;
+        if (lp->cfg.mode == LDC_MODE_RAW)
+                return -EINVAL;
+        spin_lock_irqsave(&lp->lock, flags);
+        if (!(lp->flags & LDC_FLAG_ALLOCED_QUEUES) ||
+            !(lp->flags & LDC_FLAG_REGISTERED_QUEUES) ||
+            lp->hs_state != LDC_HS_OPEN)
+                err = -EINVAL;
+        else
+                err = start_handshake(lp);
+        spin_unlock_irqrestore(&lp->lock, flags);
+        return err;
+}
+EXPORT_SYMBOL(ldc_connect);
+int ldc_disconnect(struct ldc_channel *lp)
+{
+        unsigned long hv_err, flags;
+        int err;
+        if (lp->cfg.mode == LDC_MODE_RAW)
+                return -EINVAL;
+        if (!(lp->flags & LDC_FLAG_ALLOCED_QUEUES) ||
+            !(lp->flags & LDC_FLAG_REGISTERED_QUEUES))
+                return -EINVAL;
+        spin_lock_irqsave(&lp->lock, flags);
+        err = -ENODEV;
+        hv_err = sun4v_ldc_tx_qconf(lp->id, 0, 0);
+        if (hv_err)
+                goto out_err;
+        hv_err = sun4v_ldc_tx_qconf(lp->id, lp->tx_ra, lp->tx_num_entries);
+        if (hv_err)
+                goto out_err;
+        hv_err = sun4v_ldc_rx_qconf(lp->id, 0, 0);
+        if (hv_err)
+                goto out_err;
+        hv_err = sun4v_ldc_rx_qconf(lp->id, lp->rx_ra, lp->rx_num_entries);
+        if (hv_err)
+                goto out_err;
+        ldc_set_state(lp, LDC_STATE_BOUND);
+        lp->hs_state = LDC_HS_OPEN;
+        lp->flags |= LDC_FLAG_RESET;
+        spin_unlock_irqrestore(&lp->lock, flags);
+        return 0;
+out_err:
+        sun4v_ldc_tx_qconf(lp->id, 0, 0);
+        sun4v_ldc_rx_qconf(lp->id, 0, 0);
+        free_irq(lp->cfg.tx_irq, lp);
+        free_irq(lp->cfg.rx_irq, lp);
+        lp->flags &= ~(LDC_FLAG_REGISTERED_IRQS |
+                       LDC_FLAG_REGISTERED_QUEUES);
+        ldc_set_state(lp, LDC_STATE_INIT);
+        spin_unlock_irqrestore(&lp->lock, flags);
+        return err;
+}
+EXPORT_SYMBOL(ldc_disconnect);
+int ldc_state(struct ldc_channel *lp)
+{
+        return lp->state;
+}
+EXPORT_SYMBOL(ldc_state);
+static int write_raw(struct ldc_channel *lp, const void *buf, unsigned int size)
+{
+        struct ldc_packet *p;
+        unsigned long new_tail;
+        int err;
+        if (size > LDC_PACKET_SIZE)
+                return -EMSGSIZE;
+        p = data_get_tx_packet(lp, &new_tail);
+        if (!p)
+                return -EAGAIN;
+        memcpy(p, buf, size);
+        err = send_tx_packet(lp, p, new_tail);
+        if (!err)
+                err = size;
+        return err;
+}
+static int read_raw(struct ldc_channel *lp, void *buf, unsigned int size)
+{
+        struct ldc_packet *p;
+        unsigned long hv_err, new;
+        int err;
+        if (size < LDC_PACKET_SIZE)
+                return -EINVAL;
+        hv_err = sun4v_ldc_rx_get_state(lp->id,
+                                        &lp->rx_head,
+                                        &lp->rx_tail,
+                                        &lp->chan_state);
+        if (hv_err)
+                return ldc_abort(lp);
+        if (lp->chan_state == LDC_CHANNEL_DOWN ||
+            lp->chan_state == LDC_CHANNEL_RESETTING)
+                return -ECONNRESET;
+        if (lp->rx_head == lp->rx_tail)
+                return 0;
+        p = lp->rx_base + (lp->rx_head / LDC_PACKET_SIZE);
+        memcpy(buf, p, LDC_PACKET_SIZE);
+        new = rx_advance(lp, lp->rx_head);
+        lp->rx_head = new;
+        err = __set_rx_head(lp, new);
+        if (err < 0)
+                err = -ECONNRESET;
+        else
+                err = LDC_PACKET_SIZE;
+        return err;
+}
+static const struct ldc_mode_ops raw_ops = {
+        .write          =       write_raw,
+        .read           =       read_raw,
+};
+static int write_nonraw(struct ldc_channel *lp, const void *buf,
+                        unsigned int size)
+{
+        unsigned long hv_err, tail;
+        unsigned int copied;
+        u32 seq;
+        int err;
+        hv_err = sun4v_ldc_tx_get_state(lp->id, &lp->tx_head, &lp->tx_tail,
+                                        &lp->chan_state);
+        if (unlikely(hv_err))
+                return -EBUSY;
+        if (unlikely(lp->chan_state != LDC_CHANNEL_UP))
+                return ldc_abort(lp);
+        if (!tx_has_space_for(lp, size))
+                return -EAGAIN;
+        seq = lp->snd_nxt;
+        copied = 0;
+        tail = lp->tx_tail;
+        while (copied < size) {
+                struct ldc_packet *p = lp->tx_base + (tail / LDC_PACKET_SIZE);
+                u8 *data = ((lp->cfg.mode == LDC_MODE_UNRELIABLE) ?
+                            p->u.u_data :
+                            p->u.r.r_data);
+                int data_len;
+                p->type = LDC_DATA;
+                p->stype = LDC_INFO;
+                p->ctrl = 0;
+                data_len = size - copied;
+                if (data_len > lp->mss)
+                        data_len = lp->mss;
+                BUG_ON(data_len > LDC_LEN);
+                p->env = (data_len |
+                          (copied == 0 ? LDC_START : 0) |
+                          (data_len == size - copied ? LDC_STOP : 0));
+                p->seqid = ++seq;
+                ldcdbg(DATA, "SENT DATA [%02x:%02x:%02x:%02x:%08x]\n",
+                       p->type,
+                       p->stype,
+                       p->ctrl,
+                       p->env,
+                       p->seqid);
+                memcpy(data, buf, data_len);
+                buf += data_len;
+                copied += data_len;
+                tail = tx_advance(lp, tail);
+        }
+        err = set_tx_tail(lp, tail);
+        if (!err) {
+                lp->snd_nxt = seq;
+                err = size;
+        }
+        return err;
+}
+static int rx_bad_seq(struct ldc_channel *lp, struct ldc_packet *p,
+                      struct ldc_packet *first_frag)
+{
+        int err;
+        if (first_frag)
+                lp->rcv_nxt = first_frag->seqid - 1;
+        err = send_data_nack(lp, p);
+        if (err)
+                return err;
+        err = __set_rx_head(lp, lp->rx_tail);
+        if (err < 0)
+                return ldc_abort(lp);
+        return 0;
+}
+static int data_ack_nack(struct ldc_channel *lp, struct ldc_packet *p)
+{
+        if (p->stype & LDC_ACK) {
+                int err = process_data_ack(lp, p);
+                if (err)
+                        return err;
+        }
+        if (p->stype & LDC_NACK)
+                return ldc_abort(lp);
+        return 0;
+}
+static int rx_data_wait(struct ldc_channel *lp, unsigned long cur_head)
+{
+        unsigned long dummy;
+        int limit = 1000;
+        ldcdbg(DATA, "DATA WAIT cur_head[%lx] rx_head[%lx] rx_tail[%lx]\n",
+               cur_head, lp->rx_head, lp->rx_tail);
+        while (limit-- > 0) {
+                unsigned long hv_err;
+                hv_err = sun4v_ldc_rx_get_state(lp->id,
+                                                &dummy,
+                                                &lp->rx_tail,
+                                                &lp->chan_state);
+                if (hv_err)
+                        return ldc_abort(lp);
+                if (lp->chan_state == LDC_CHANNEL_DOWN ||
+                    lp->chan_state == LDC_CHANNEL_RESETTING)
+                        return -ECONNRESET;
+                if (cur_head != lp->rx_tail) {
+                        ldcdbg(DATA, "DATA WAIT DONE "
+                               "head[%lx] tail[%lx] chan_state[%lx]\n",
+                               dummy, lp->rx_tail, lp->chan_state);
+                        return 0;
+                }
+                udelay(1);
+        }
+        return -EAGAIN;
+}
+static int rx_set_head(struct ldc_channel *lp, unsigned long head)
+{
+        int err = __set_rx_head(lp, head);
+        if (err < 0)
+                return ldc_abort(lp);
+        lp->rx_head = head;
+        return 0;
+}
+static void send_data_ack(struct ldc_channel *lp)
+{
+        unsigned long new_tail;
+        struct ldc_packet *p;
+        p = data_get_tx_packet(lp, &new_tail);
+        if (likely(p)) {
+                int err;
+                memset(p, 0, sizeof(*p));
+                p->type = LDC_DATA;
+                p->stype = LDC_ACK;
+                p->ctrl = 0;
+                p->seqid = lp->snd_nxt + 1;
+                p->u.r.ackid = lp->rcv_nxt;
+                err = send_tx_packet(lp, p, new_tail);
+                if (!err)
+                        lp->snd_nxt++;
+        }
+}
+static int read_nonraw(struct ldc_channel *lp, void *buf, unsigned int size)
+{
+        struct ldc_packet *first_frag;
+        unsigned long hv_err, new;
+        int err, copied;
+        hv_err = sun4v_ldc_rx_get_state(lp->id,
+                                        &lp->rx_head,
+                                        &lp->rx_tail,
+                                        &lp->chan_state);
+        if (hv_err)
+                return ldc_abort(lp);
+        if (lp->chan_state == LDC_CHANNEL_DOWN ||
+            lp->chan_state == LDC_CHANNEL_RESETTING)
+                return -ECONNRESET;
+        if (lp->rx_head == lp->rx_tail)
+                return 0;
+        first_frag = NULL;
+        copied = err = 0;
+        new = lp->rx_head;
+        while (1) {
+                struct ldc_packet *p;
+                int pkt_len;
+                BUG_ON(new == lp->rx_tail);
+                p = lp->rx_base + (new / LDC_PACKET_SIZE);
+                ldcdbg(RX, "RX read pkt[%02x:%02x:%02x:%02x:%08x:%08x] "
+                       "rcv_nxt[%08x]\n",
+                       p->type,
+                       p->stype,
+                       p->ctrl,
+                       p->env,
+                       p->seqid,
+                       p->u.r.ackid,
+                       lp->rcv_nxt);
+                if (unlikely(!rx_seq_ok(lp, p->seqid))) {
+                        err = rx_bad_seq(lp, p, first_frag);
+                        copied = 0;
+                        break;
+                }
+                if (p->type & LDC_CTRL) {
+                        err = process_control_frame(lp, p);
+                        if (err < 0)
+                                break;
+                        err = 0;
+                }
+                lp->rcv_nxt = p->seqid;
+                if (!(p->type & LDC_DATA)) {
+                        new = rx_advance(lp, new);
+                        goto no_data;
+                }
+                if (p->stype & (LDC_ACK | LDC_NACK)) {
+                        err = data_ack_nack(lp, p);
+                        if (err)
+                                break;
+                }
+                if (!(p->stype & LDC_INFO)) {
+                        new = rx_advance(lp, new);
+                        err = rx_set_head(lp, new);
+                        if (err)
+                                break;
+                        goto no_data;
+                }
+                pkt_len = p->env & LDC_LEN;
+                /* Every initial packet starts with the START bit set.
+                 *
+                 * Singleton packets will have both START+STOP set.
+                 *
+                 * Fragments will have START set in the first frame, STOP
+                 * set in the last frame, and neither bit set in middle
+                 * frames of the packet.
+                 *
+                 * Therefore if we are at the beginning of a packet and
+                 * we don't see START, or we are in the middle of a fragmented
+                 * packet and do see START, we are unsynchronized and should
+                 * flush the RX queue.
+                 */
+                if ((first_frag == NULL && !(p->env & LDC_START)) ||
+                    (first_frag != NULL &&  (p->env & LDC_START))) {
+                        if (!first_frag)
+                                new = rx_advance(lp, new);
+                        err = rx_set_head(lp, new);
+                        if (err)
+                                break;
+                        if (!first_frag)
+                                goto no_data;
+                }
+                if (!first_frag)
+                        first_frag = p;
+                if (pkt_len > size - copied) {
+                        /* User didn't give us a big enough buffer,
+                         * what to do?  This is a pretty serious error.
+                         *
+                         * Since we haven't updated the RX ring head to
+                         * consume any of the packets, signal the error
+                         * to the user and just leave the RX ring alone.
+                         *
+                         * This seems the best behavior because this allows
+                         * a user of the LDC layer to start with a small
+                         * RX buffer for ldc_read() calls and use -EMSGSIZE
+                         * as a cue to enlarge it's read buffer.
+                         */
+                        err = -EMSGSIZE;
+                        break;
+                }
+                /* Ok, we are gonna eat this one.  */
+                new = rx_advance(lp, new);
+                memcpy(buf,
+                       (lp->cfg.mode == LDC_MODE_UNRELIABLE ?
+                        p->u.u_data : p->u.r.r_data), pkt_len);
+                buf += pkt_len;
+                copied += pkt_len;
+                if (p->env & LDC_STOP)
+                        break;
+no_data:
+                if (new == lp->rx_tail) {
+                        err = rx_data_wait(lp, new);
+                        if (err)
+                                break;
+                }
+        }
+        if (!err)
+                err = rx_set_head(lp, new);
+        if (err && first_frag)
+                lp->rcv_nxt = first_frag->seqid - 1;
+        if (!err) {
+                err = copied;
+                if (err > 0 && lp->cfg.mode != LDC_MODE_UNRELIABLE)
+                        send_data_ack(lp);
+        }
+        return err;
+}
+static const struct ldc_mode_ops nonraw_ops = {
+        .write          =       write_nonraw,
+        .read           =       read_nonraw,
+};
+static int write_stream(struct ldc_channel *lp, const void *buf,
+                        unsigned int size)
+{
+        if (size > lp->cfg.mtu)
+                size = lp->cfg.mtu;
+        return write_nonraw(lp, buf, size);
+}
+static int read_stream(struct ldc_channel *lp, void *buf, unsigned int size)
+{
+        if (!lp->mssbuf_len) {
+                int err = read_nonraw(lp, lp->mssbuf, lp->cfg.mtu);
+                if (err < 0)
+                        return err;
+                lp->mssbuf_len = err;
+                lp->mssbuf_off = 0;
+        }
+        if (size > lp->mssbuf_len)
+                size = lp->mssbuf_len;
+        memcpy(buf, lp->mssbuf + lp->mssbuf_off, size);
+        lp->mssbuf_off += size;
+        lp->mssbuf_len -= size;
+        return size;
+}
+static const struct ldc_mode_ops stream_ops = {
+        .write          =       write_stream,
+        .read           =       read_stream,
+};
+int ldc_write(struct ldc_channel *lp, const void *buf, unsigned int size)
+{
+        unsigned long flags;
+        int err;
+        if (!buf)
+                return -EINVAL;
+        if (!size)
+                return 0;
+        spin_lock_irqsave(&lp->lock, flags);
+        if (lp->hs_state != LDC_HS_COMPLETE)
+                err = -ENOTCONN;
+        else
+                err = lp->mops->write(lp, buf, size);
+        spin_unlock_irqrestore(&lp->lock, flags);
+        return err;
+}
+EXPORT_SYMBOL(ldc_write);
+int ldc_read(struct ldc_channel *lp, void *buf, unsigned int size)
+{
+        unsigned long flags;
+        int err;
+        if (!buf)
+                return -EINVAL;
+        if (!size)
+                return 0;
+        spin_lock_irqsave(&lp->lock, flags);
+        if (lp->hs_state != LDC_HS_COMPLETE)
+                err = -ENOTCONN;
+        else
+                err = lp->mops->read(lp, buf, size);
+        spin_unlock_irqrestore(&lp->lock, flags);
+        return err;
+}
+EXPORT_SYMBOL(ldc_read);
+static long arena_alloc(struct ldc_iommu *iommu, unsigned long npages)
+{
+        struct iommu_arena *arena = &iommu->arena;
+        unsigned long n, i, start, end, limit;
+        int pass;
+        limit = arena->limit;
+        start = arena->hint;
+        pass = 0;
+again:
+        n = find_next_zero_bit(arena->map, limit, start);
+        end = n + npages;
+        if (unlikely(end >= limit)) {
+                if (likely(pass < 1)) {
+                        limit = start;
+                        start = 0;
+                        pass++;
+                        goto again;
+                } else {
+                        /* Scanned the whole thing, give up. */
+                        return -1;
+                }
+        }
+        for (i = n; i < end; i++) {
+                if (test_bit(i, arena->map)) {
+                        start = i + 1;
+                        goto again;
+                }
+        }
+        for (i = n; i < end; i++)
+                __set_bit(i, arena->map);
+        arena->hint = end;
+        return n;
+}
+#define COOKIE_PGSZ_CODE        0xf000000000000000ULL
+#define COOKIE_PGSZ_CODE_SHIFT  60ULL
+static u64 pagesize_code(void)
+{
+        switch (PAGE_SIZE) {
+        default:
+        case (8ULL * 1024ULL):
+                return 0;
+        case (64ULL * 1024ULL):
+                return 1;
+        case (512ULL * 1024ULL):
+                return 2;
+        case (4ULL * 1024ULL * 1024ULL):
+                return 3;
+        case (32ULL * 1024ULL * 1024ULL):
+                return 4;
+        case (256ULL * 1024ULL * 1024ULL):
+                return 5;
+        }
+}
+static u64 make_cookie(u64 index, u64 pgsz_code, u64 page_offset)
+{
+        return ((pgsz_code << COOKIE_PGSZ_CODE_SHIFT) |
+                (index << PAGE_SHIFT) |
+                page_offset);
+}
+static u64 cookie_to_index(u64 cookie, unsigned long *shift)
+{
+        u64 szcode = cookie >> COOKIE_PGSZ_CODE_SHIFT;
+        cookie &= ~COOKIE_PGSZ_CODE;
+        *shift = szcode * 3;
+        return (cookie >> (13ULL + (szcode * 3ULL)));
+}
+static struct ldc_mtable_entry *alloc_npages(struct ldc_iommu *iommu,
+                                             unsigned long npages)
+{
+        long entry;
+        entry = arena_alloc(iommu, npages);
+        if (unlikely(entry < 0))
+                return NULL;
+        return iommu->page_table + entry;
+}
+static u64 perm_to_mte(unsigned int map_perm)
+{
+        u64 mte_base;
+        mte_base = pagesize_code();
+        if (map_perm & LDC_MAP_SHADOW) {
+                if (map_perm & LDC_MAP_R)
+                        mte_base |= LDC_MTE_COPY_R;
+                if (map_perm & LDC_MAP_W)
+                        mte_base |= LDC_MTE_COPY_W;
+        }
+        if (map_perm & LDC_MAP_DIRECT) {
+                if (map_perm & LDC_MAP_R)
+                        mte_base |= LDC_MTE_READ;
+                if (map_perm & LDC_MAP_W)
+                        mte_base |= LDC_MTE_WRITE;
+                if (map_perm & LDC_MAP_X)
+                        mte_base |= LDC_MTE_EXEC;
+        }
+        if (map_perm & LDC_MAP_IO) {
+                if (map_perm & LDC_MAP_R)
+                        mte_base |= LDC_MTE_IOMMU_R;
+                if (map_perm & LDC_MAP_W)
+                        mte_base |= LDC_MTE_IOMMU_W;
+        }
+        return mte_base;
+}
+static int pages_in_region(unsigned long base, long len)
+{
+        int count = 0;
+        do {
+                unsigned long new = (base + PAGE_SIZE) & PAGE_MASK;
+                len -= (new - base);
+                base = new;
+                count++;
+        } while (len > 0);
+        return count;
+}
+struct cookie_state {
+        struct ldc_mtable_entry         *page_table;
+        struct ldc_trans_cookie         *cookies;
+        u64                             mte_base;
+        u64                             prev_cookie;
+        u32                             pte_idx;
+        u32                             nc;
+};
+static void fill_cookies(struct cookie_state *sp, unsigned long pa,
+                         unsigned long off, unsigned long len)
+{
+        do {
+                unsigned long tlen, new = pa + PAGE_SIZE;
+                u64 this_cookie;
+                sp->page_table[sp->pte_idx].mte = sp->mte_base | pa;
+                tlen = PAGE_SIZE;
+                if (off)
+                        tlen = PAGE_SIZE - off;
+                if (tlen > len)
+                        tlen = len;
+                this_cookie = make_cookie(sp->pte_idx,
+                                          pagesize_code(), off);
+                off = 0;
+                if (this_cookie == sp->prev_cookie) {
+                        sp->cookies[sp->nc - 1].cookie_size += tlen;
+                } else {
+                        sp->cookies[sp->nc].cookie_addr = this_cookie;
+                        sp->cookies[sp->nc].cookie_size = tlen;
+                        sp->nc++;
+                }
+                sp->prev_cookie = this_cookie + tlen;
+                sp->pte_idx++;
+                len -= tlen;
+                pa = new;
+        } while (len > 0);
+}
+static int sg_count_one(struct scatterlist *sg)
+{
+        unsigned long base = page_to_pfn(sg->page) << PAGE_SHIFT;
+        long len = sg->length;
+        if ((sg->offset | len) & (8UL - 1))
+                return -EFAULT;
+        return pages_in_region(base + sg->offset, len);
+}
+static int sg_count_pages(struct scatterlist *sg, int num_sg)
+{
+        int count;
+        int i;
+        count = 0;
+        for (i = 0; i < num_sg; i++) {
+                int err = sg_count_one(sg + i);
+                if (err < 0)
+                        return err;
+                count += err;
+        }
+        return count;
+}
+int ldc_map_sg(struct ldc_channel *lp,
+               struct scatterlist *sg, int num_sg,
+               struct ldc_trans_cookie *cookies, int ncookies,
+               unsigned int map_perm)
+{
+        unsigned long i, npages, flags;
+        struct ldc_mtable_entry *base;
+        struct cookie_state state;
+        struct ldc_iommu *iommu;
+        int err;
+        if (map_perm & ~LDC_MAP_ALL)
+                return -EINVAL;
+        err = sg_count_pages(sg, num_sg);
+        if (err < 0)
+                return err;
+        npages = err;
+        if (err > ncookies)
+                return -EMSGSIZE;
+        iommu = &lp->iommu;
+        spin_lock_irqsave(&iommu->lock, flags);
+        base = alloc_npages(iommu, npages);
+        spin_unlock_irqrestore(&iommu->lock, flags);
+        if (!base)
+                return -ENOMEM;
+        state.page_table = iommu->page_table;
+        state.cookies = cookies;
+        state.mte_base = perm_to_mte(map_perm);
+        state.prev_cookie = ~(u64)0;
+        state.pte_idx = (base - iommu->page_table);
+        state.nc = 0;
+        for (i = 0; i < num_sg; i++)
+                fill_cookies(&state, page_to_pfn(sg[i].page) << PAGE_SHIFT,
+                             sg[i].offset, sg[i].length);
+        return state.nc;
+}
+EXPORT_SYMBOL(ldc_map_sg);
+int ldc_map_single(struct ldc_channel *lp,
+                   void *buf, unsigned int len,
+                   struct ldc_trans_cookie *cookies, int ncookies,
+                   unsigned int map_perm)
+{
+        unsigned long npages, pa, flags;
+        struct ldc_mtable_entry *base;
+        struct cookie_state state;
+        struct ldc_iommu *iommu;
+        if ((map_perm & ~LDC_MAP_ALL) || (ncookies < 1))
+                return -EINVAL;
+        pa = __pa(buf);
+        if ((pa | len) & (8UL - 1))
+                return -EFAULT;
+        npages = pages_in_region(pa, len);
+        iommu = &lp->iommu;
+        spin_lock_irqsave(&iommu->lock, flags);
+        base = alloc_npages(iommu, npages);
+        spin_unlock_irqrestore(&iommu->lock, flags);
+        if (!base)
+                return -ENOMEM;
+        state.page_table = iommu->page_table;
+        state.cookies = cookies;
+        state.mte_base = perm_to_mte(map_perm);
+        state.prev_cookie = ~(u64)0;
+        state.pte_idx = (base - iommu->page_table);
+        state.nc = 0;
+        fill_cookies(&state, (pa & PAGE_MASK), (pa & ~PAGE_MASK), len);
+        BUG_ON(state.nc != 1);
+        return state.nc;
+}
+EXPORT_SYMBOL(ldc_map_single);
+static void free_npages(unsigned long id, struct ldc_iommu *iommu,
+                        u64 cookie, u64 size)
+{
+        struct iommu_arena *arena = &iommu->arena;
+        unsigned long i, shift, index, npages;
+        struct ldc_mtable_entry *base;
+        npages = PAGE_ALIGN(((cookie & ~PAGE_MASK) + size)) >> PAGE_SHIFT;
+        index = cookie_to_index(cookie, &shift);
+        base = iommu->page_table + index;
+        BUG_ON(index > arena->limit ||
+               (index + npages) > arena->limit);
+        for (i = 0; i < npages; i++) {
+                if (base->cookie)
+                        sun4v_ldc_revoke(id, cookie + (i << shift),
+                                         base->cookie);
+                base->mte = 0;
+                __clear_bit(index + i, arena->map);
+        }
+}
+void ldc_unmap(struct ldc_channel *lp, struct ldc_trans_cookie *cookies,
+               int ncookies)
+{
+        struct ldc_iommu *iommu = &lp->iommu;
+        unsigned long flags;
+        int i;
+        spin_lock_irqsave(&iommu->lock, flags);
+        for (i = 0; i < ncookies; i++) {
+                u64 addr = cookies[i].cookie_addr;
+                u64 size = cookies[i].cookie_size;
+                free_npages(lp->id, iommu, addr, size);
+        }
+        spin_unlock_irqrestore(&iommu->lock, flags);
+}
+EXPORT_SYMBOL(ldc_unmap);
+int ldc_copy(struct ldc_channel *lp, int copy_dir,
+             void *buf, unsigned int len, unsigned long offset,
+             struct ldc_trans_cookie *cookies, int ncookies)
+{
+        unsigned int orig_len;
+        unsigned long ra;
+        int i;
+        if (copy_dir != LDC_COPY_IN && copy_dir != LDC_COPY_OUT) {
+                printk(KERN_ERR PFX "ldc_copy: ID[%lu] Bad copy_dir[%d]\n",
+                       lp->id, copy_dir);
+                return -EINVAL;
+        }
+        ra = __pa(buf);
+        if ((ra | len | offset) & (8UL - 1)) {
+                printk(KERN_ERR PFX "ldc_copy: ID[%lu] Unaligned buffer "
+                       "ra[%lx] len[%x] offset[%lx]\n",
+                       lp->id, ra, len, offset);
+                return -EFAULT;
+        }
+        if (lp->hs_state != LDC_HS_COMPLETE ||
+            (lp->flags & LDC_FLAG_RESET)) {
+                printk(KERN_ERR PFX "ldc_copy: ID[%lu] Link down hs_state[%x] "
+                       "flags[%x]\n", lp->id, lp->hs_state, lp->flags);
+                return -ECONNRESET;
+        }
+        orig_len = len;
+        for (i = 0; i < ncookies; i++) {
+                unsigned long cookie_raddr = cookies[i].cookie_addr;
+                unsigned long this_len = cookies[i].cookie_size;
+                unsigned long actual_len;
+                if (unlikely(offset)) {
+                        unsigned long this_off = offset;
+                        if (this_off > this_len)
+                                this_off = this_len;
+                        offset -= this_off;
+                        this_len -= this_off;
+                        if (!this_len)
+                                continue;
+                        cookie_raddr += this_off;
+                }
+                if (this_len > len)
+                        this_len = len;
+                while (1) {
+                        unsigned long hv_err;
+                        hv_err = sun4v_ldc_copy(lp->id, copy_dir,
+                                                cookie_raddr, ra,
+                                                this_len, &actual_len);
+                        if (unlikely(hv_err)) {
+                                printk(KERN_ERR PFX "ldc_copy: ID[%lu] "
+                                       "HV error %lu\n",
+                                       lp->id, hv_err);
+                                if (lp->hs_state != LDC_HS_COMPLETE ||
+                                    (lp->flags & LDC_FLAG_RESET))
+                                        return -ECONNRESET;
+                                else
+                                        return -EFAULT;
+                        }
+                        cookie_raddr += actual_len;
+                        ra += actual_len;
+                        len -= actual_len;
+                        if (actual_len == this_len)
+                                break;
+                        this_len -= actual_len;
+                }
+                if (!len)
+                        break;
+        }
+        /* It is caller policy what to do about short copies.
+         * For example, a networking driver can declare the
+         * packet a runt and drop it.
+         */
+        return orig_len - len;
+}
+EXPORT_SYMBOL(ldc_copy);
+void *ldc_alloc_exp_dring(struct ldc_channel *lp, unsigned int len,
+                          struct ldc_trans_cookie *cookies, int *ncookies,
+                          unsigned int map_perm)
+{
+        void *buf;
+        int err;
+        if (len & (8UL - 1))
+                return ERR_PTR(-EINVAL);
+        buf = kzalloc(len, GFP_KERNEL);
+        if (!buf)
+                return ERR_PTR(-ENOMEM);
+        err = ldc_map_single(lp, buf, len, cookies, *ncookies, map_perm);
+        if (err < 0) {
+                kfree(buf);
+                return ERR_PTR(err);
+        }
+        *ncookies = err;
+        return buf;
+}
+EXPORT_SYMBOL(ldc_alloc_exp_dring);
+void ldc_free_exp_dring(struct ldc_channel *lp, void *buf, unsigned int len,
+                        struct ldc_trans_cookie *cookies, int ncookies)
+{
+        ldc_unmap(lp, cookies, ncookies);
+        kfree(buf);
+}
+EXPORT_SYMBOL(ldc_free_exp_dring);
+static int __init ldc_init(void)
+{
+        unsigned long major, minor;
+        struct mdesc_handle *hp;
+        const u64 *v;
+        u64 mp;
+        hp = mdesc_grab();
+        if (!hp)
+                return -ENODEV;
+        mp = mdesc_node_by_name(hp, MDESC_NODE_NULL, "platform");
+        if (mp == MDESC_NODE_NULL)
+                return -ENODEV;
+        v = mdesc_get_property(hp, mp, "domaining-enabled", NULL);
+        if (!v)
+                return -ENODEV;
+        major = 1;
+        minor = 0;
+        if (sun4v_hvapi_register(HV_GRP_LDOM, major, &minor)) {
+                printk(KERN_INFO PFX "Could not register LDOM hvapi.\n");
+                return -ENODEV;
+        }
+        printk(KERN_INFO "%s", version);
+        if (!*v) {
+                printk(KERN_INFO PFX "Domaining disabled.\n");
+                return -ENODEV;
+        }
+        ldom_domaining_enabled = 1;
+        return 0;
+}
+core_initcall(ldc_init);
diff --git a/arch/sparc64/kernel/mdesc.c b/arch/sparc64/kernel/mdesc.c
index f0e16045fb..302ba5e5a0 100644
--- a/arch/sparc64/kernel/mdesc.c
+++ b/arch/sparc64/kernel/mdesc.c
@@ -6,6 +6,9 @@
 #include <linux/types.h>
 #include <linux/bootmem.h>
 #include <linux/log2.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/mm.h>
 #include <asm/hypervisor.h>
 #include <asm/mdesc.h>
@@ -29,7 +32,7 @@ struct mdesc_hdr {
        u32     node_sz; /* node block size */
        u32     name_sz; /* name block size */
        u32     data_sz; /* data block size */
-};
+} __attribute__((aligned(16)));
 struct mdesc_elem {
        u8      tag;
@@ -53,306 +56,468 @@ struct mdesc_elem {
        } d;
 };
-static struct mdesc_hdr *main_mdesc;
+struct mdesc_mem_ops {
-static struct mdesc_node *allnodes;
+        struct mdesc_handle *(*alloc)(unsigned int mdesc_size);
+        void (*free)(struct mdesc_handle *handle);
+};
-static struct mdesc_node *allnodes_tail;
+struct mdesc_handle {
-static unsigned int unique_id;
+        struct list_head        list;
+        struct mdesc_mem_ops    *mops;
+        void                    *self_base;
+        atomic_t                refcnt;
+        unsigned int            handle_size;
+        struct mdesc_hdr        mdesc;
+};
-static struct mdesc_node **mdesc_hash;
+static void mdesc_handle_init(struct mdesc_handle *hp,
-static unsigned int mdesc_hash_size;
+                              unsigned int handle_size,
+                              void *base)
+{
+        BUG_ON(((unsigned long)&hp->mdesc) & (16UL - 1));
-static inline unsigned int node_hashfn(u64 node)
+        memset(hp, 0, handle_size);
+        INIT_LIST_HEAD(&hp->list);
+        hp->self_base = base;
+        atomic_set(&hp->refcnt, 1);
+        hp->handle_size = handle_size;
+}
+static struct mdesc_handle *mdesc_bootmem_alloc(unsigned int mdesc_size)
 {
-        return ((unsigned int) (node ^ (node >> 8) ^ (node >> 16)))
+        struct mdesc_handle *hp;
-                & (mdesc_hash_size - 1);
+        unsigned int handle_size, alloc_size;
+        handle_size = (sizeof(struct mdesc_handle) -
+                       sizeof(struct mdesc_hdr) +
+                       mdesc_size);
+        alloc_size = PAGE_ALIGN(handle_size);
+        hp = __alloc_bootmem(alloc_size, PAGE_SIZE, 0UL);
+        if (hp)
+                mdesc_handle_init(hp, handle_size, hp);
+        return hp;
 }
-static inline void hash_node(struct mdesc_node *mp)
+static void mdesc_bootmem_free(struct mdesc_handle *hp)
 {
-        struct mdesc_node **head = &mdesc_hash[node_hashfn(mp->node)];
+        unsigned int alloc_size, handle_size = hp->handle_size;
+        unsigned long start, end;
-        mp->hash_next = *head;
+        BUG_ON(atomic_read(&hp->refcnt) != 0);
-        *head = mp;
+        BUG_ON(!list_empty(&hp->list));
-        if (allnodes_tail) {
+        alloc_size = PAGE_ALIGN(handle_size);
-                allnodes_tail->allnodes_next = mp;
-                allnodes_tail = mp;
+        start = (unsigned long) hp;
-        } else {
+        end = start + alloc_size;
-                allnodes = allnodes_tail = mp;
+        while (start < end) {
+                struct page *p;
+                p = virt_to_page(start);
+                ClearPageReserved(p);
+                __free_page(p);
+                start += PAGE_SIZE;
        }
 }
-static struct mdesc_node *find_node(u64 node)
+static struct mdesc_mem_ops bootmem_mdesc_memops = {
+        .alloc = mdesc_bootmem_alloc,
+        .free  = mdesc_bootmem_free,
+};
+static struct mdesc_handle *mdesc_kmalloc(unsigned int mdesc_size)
 {
-        struct mdesc_node *mp = mdesc_hash[node_hashfn(node)];
+        unsigned int handle_size;
+        void *base;
+        handle_size = (sizeof(struct mdesc_handle) -
+                       sizeof(struct mdesc_hdr) +
+                       mdesc_size);
+        base = kmalloc(handle_size + 15, GFP_KERNEL | __GFP_NOFAIL);
+        if (base) {
+                struct mdesc_handle *hp;
+                unsigned long addr;
-        while (mp) {
+                addr = (unsigned long)base;
-                if (mp->node == node)
+                addr = (addr + 15UL) & ~15UL;
-                        return mp;
+                hp = (struct mdesc_handle *) addr;
-                mp = mp->hash_next;
+                mdesc_handle_init(hp, handle_size, base);
+                return hp;
        }
        return NULL;
 }
-struct property *md_find_property(const struct mdesc_node *mp,
+static void mdesc_kfree(struct mdesc_handle *hp)
-                                  const char *name,
-                                  int *lenp)
 {
-        struct property *pp;
+        BUG_ON(atomic_read(&hp->refcnt) != 0);
+        BUG_ON(!list_empty(&hp->list));
-        for (pp = mp->properties; pp != 0; pp = pp->next) {
+        kfree(hp->self_base);
-                if (strcasecmp(pp->name, name) == 0) {
-                        if (lenp)
-                                *lenp = pp->length;
-                        break;
-                }
-        }
-        return pp;
 }
-EXPORT_SYMBOL(md_find_property);
-/*
+static struct mdesc_mem_ops kmalloc_mdesc_memops = {
- * Find a property with a given name for a given node
+        .alloc = mdesc_kmalloc,
- * and return the value.
+        .free  = mdesc_kfree,
- */
+};
-const void *md_get_property(const struct mdesc_node *mp, const char *name,
-                            int *lenp)
+static struct mdesc_handle *mdesc_alloc(unsigned int mdesc_size,
+                                        struct mdesc_mem_ops *mops)
 {
-        struct property *pp = md_find_property(mp, name, lenp);
+        struct mdesc_handle *hp = mops->alloc(mdesc_size);
-        return pp ? pp->value : NULL;
+        if (hp)
+                hp->mops = mops;
+        return hp;
 }
-EXPORT_SYMBOL(md_get_property);
-struct mdesc_node *md_find_node_by_name(struct mdesc_node *from,
+static void mdesc_free(struct mdesc_handle *hp)
-                                        const char *name)
 {
-        struct mdesc_node *mp;
+        hp->mops->free(hp);
+}
-        mp = from ? from->allnodes_next : allnodes;
+static struct mdesc_handle *cur_mdesc;
-        for (; mp != NULL; mp = mp->allnodes_next) {
+static LIST_HEAD(mdesc_zombie_list);
-                if (strcmp(mp->name, name) == 0)
+static DEFINE_SPINLOCK(mdesc_lock);
-                        break;
+struct mdesc_handle *mdesc_grab(void)
+{
+        struct mdesc_handle *hp;
+        unsigned long flags;
+        spin_lock_irqsave(&mdesc_lock, flags);
+        hp = cur_mdesc;
+        if (hp)
+                atomic_inc(&hp->refcnt);
+        spin_unlock_irqrestore(&mdesc_lock, flags);
+        return hp;
+}
+EXPORT_SYMBOL(mdesc_grab);
+void mdesc_release(struct mdesc_handle *hp)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&mdesc_lock, flags);
+        if (atomic_dec_and_test(&hp->refcnt)) {
+                list_del_init(&hp->list);
+                hp->mops->free(hp);
        }
-        return mp;
+        spin_unlock_irqrestore(&mdesc_lock, flags);
 }
-EXPORT_SYMBOL(md_find_node_by_name);
+EXPORT_SYMBOL(mdesc_release);
-static unsigned int mdesc_early_allocated;
+static DEFINE_MUTEX(mdesc_mutex);
+static struct mdesc_notifier_client *client_list;
-static void * __init mdesc_early_alloc(unsigned long size)
+void mdesc_register_notifier(struct mdesc_notifier_client *client)
 {
-        void *ret;
+        u64 node;
-        ret = __alloc_bootmem(size, SMP_CACHE_BYTES, 0UL);
+        mutex_lock(&mdesc_mutex);
-        if (ret == NULL) {
+        client->next = client_list;
-                prom_printf("MDESC: alloc of %lu bytes failed.\n", size);
+        client_list = client;
-                prom_halt();
-        }
-        memset(ret, 0, size);
+        mdesc_for_each_node_by_name(cur_mdesc, node, client->node_name)
+                client->add(cur_mdesc, node);
-        mdesc_early_allocated += size;
+        mutex_unlock(&mdesc_mutex);
+}
-        return ret;
+/* Run 'func' on nodes which are in A but not in B.  */
+static void invoke_on_missing(const char *name,
+                              struct mdesc_handle *a,
+                              struct mdesc_handle *b,
+                              void (*func)(struct mdesc_handle *, u64))
+{
+        u64 node;
+        mdesc_for_each_node_by_name(a, node, name) {
+                const u64 *id = mdesc_get_property(a, node, "id", NULL);
+                int found = 0;
+                u64 fnode;
+                mdesc_for_each_node_by_name(b, fnode, name) {
+                        const u64 *fid = mdesc_get_property(b, fnode,
+                                                            "id", NULL);
+                        if (*id == *fid) {
+                                found = 1;
+                                break;
+                        }
+                }
+                if (!found)
+                        func(a, node);
+        }
 }
-static unsigned int __init count_arcs(struct mdesc_elem *ep)
+static void notify_one(struct mdesc_notifier_client *p,
+                       struct mdesc_handle *old_hp,
+                       struct mdesc_handle *new_hp)
 {
-        unsigned int ret = 0;
+        invoke_on_missing(p->node_name, old_hp, new_hp, p->remove);
+        invoke_on_missing(p->node_name, new_hp, old_hp, p->add);
+}
-        ep++;
+static void mdesc_notify_clients(struct mdesc_handle *old_hp,
-        while (ep->tag != MD_NODE_END) {
+                                 struct mdesc_handle *new_hp)
-                if (ep->tag == MD_PROP_ARC)
+{
-                        ret++;
+        struct mdesc_notifier_client *p = client_list;
-                ep++;
+        while (p) {
+                notify_one(p, old_hp, new_hp);
+                p = p->next;
        }
-        return ret;
 }
-static void __init mdesc_node_alloc(u64 node, struct mdesc_elem *ep, const char *names)
+void mdesc_update(void)
 {
-        unsigned int num_arcs = count_arcs(ep);
+        unsigned long len, real_len, status;
-        struct mdesc_node *mp;
+        struct mdesc_handle *hp, *orig_hp;
+        unsigned long flags;
-        mp = mdesc_early_alloc(sizeof(*mp) +
+        mutex_lock(&mdesc_mutex);
-                               (num_arcs * sizeof(struct mdesc_arc)));
-        mp->name = names + ep->name_offset;
-        mp->node = node;
-        mp->unique_id = unique_id++;
-        mp->num_arcs = num_arcs;
-        hash_node(mp);
+        (void) sun4v_mach_desc(0UL, 0UL, &len);
+        hp = mdesc_alloc(len, &kmalloc_mdesc_memops);
+        if (!hp) {
+                printk(KERN_ERR "MD: mdesc alloc fails\n");
+                goto out;
+        }
+        status = sun4v_mach_desc(__pa(&hp->mdesc), len, &real_len);
+        if (status != HV_EOK || real_len > len) {
+                printk(KERN_ERR "MD: mdesc reread fails with %lu\n",
+                       status);
+                atomic_dec(&hp->refcnt);
+                mdesc_free(hp);
+                goto out;
+        }
+        spin_lock_irqsave(&mdesc_lock, flags);
+        orig_hp = cur_mdesc;
+        cur_mdesc = hp;
+        spin_unlock_irqrestore(&mdesc_lock, flags);
+        mdesc_notify_clients(orig_hp, hp);
+        spin_lock_irqsave(&mdesc_lock, flags);
+        if (atomic_dec_and_test(&orig_hp->refcnt))
+                mdesc_free(orig_hp);
+        else
+                list_add(&orig_hp->list, &mdesc_zombie_list);
+        spin_unlock_irqrestore(&mdesc_lock, flags);
+out:
+        mutex_unlock(&mdesc_mutex);
 }
-static inline struct mdesc_elem *node_block(struct mdesc_hdr *mdesc)
+static struct mdesc_elem *node_block(struct mdesc_hdr *mdesc)
 {
        return (struct mdesc_elem *) (mdesc + 1);
 }
-static inline void *name_block(struct mdesc_hdr *mdesc)
+static void *name_block(struct mdesc_hdr *mdesc)
 {
        return ((void *) node_block(mdesc)) + mdesc->node_sz;
 }
-static inline void *data_block(struct mdesc_hdr *mdesc)
+static void *data_block(struct mdesc_hdr *mdesc)
 {
        return ((void *) name_block(mdesc)) + mdesc->name_sz;
 }
-/* In order to avoid recursion (the graph can be very deep) we use a
+u64 mdesc_node_by_name(struct mdesc_handle *hp,
- * two pass algorithm.  First we allocate all the nodes and hash them.
+                       u64 from_node, const char *name)
- * Then we iterate over each node, filling in the arcs and properties.
- */
-static void __init build_all_nodes(struct mdesc_hdr *mdesc)
 {
-        struct mdesc_elem *start, *ep;
+        struct mdesc_elem *ep = node_block(&hp->mdesc);
-        struct mdesc_node *mp;
+        const char *names = name_block(&hp->mdesc);
-        const char *names;
+        u64 last_node = hp->mdesc.node_sz / 16;
-        void *data;
+        u64 ret;
-        u64 last_node;
+        if (from_node == MDESC_NODE_NULL) {
+                ret = from_node = 0;
+        } else if (from_node >= last_node) {
+                return MDESC_NODE_NULL;
+        } else {
+                ret = ep[from_node].d.val;
+        }
-        start = ep = node_block(mdesc);
+        while (ret < last_node) {
-        last_node = mdesc->node_sz / 16;
+                if (ep[ret].tag != MD_NODE)
+                        return MDESC_NODE_NULL;
+                if (!strcmp(names + ep[ret].name_offset, name))
+                        break;
+                ret = ep[ret].d.val;
+        }
+        if (ret >= last_node)
+                ret = MDESC_NODE_NULL;
+        return ret;
+}
+EXPORT_SYMBOL(mdesc_node_by_name);
-        names = name_block(mdesc);
+const void *mdesc_get_property(struct mdesc_handle *hp, u64 node,
+                               const char *name, int *lenp)
+{
+        const char *names = name_block(&hp->mdesc);
+        u64 last_node = hp->mdesc.node_sz / 16;
+        void *data = data_block(&hp->mdesc);
+        struct mdesc_elem *ep;
-        while (1) {
+        if (node == MDESC_NODE_NULL || node >= last_node)
-                u64 node = ep - start;
+                return NULL;
-                if (ep->tag == MD_LIST_END)
+        ep = node_block(&hp->mdesc) + node;
+        ep++;
+        for (; ep->tag != MD_NODE_END; ep++) {
+                void *val = NULL;
+                int len = 0;
+                switch (ep->tag) {
+                case MD_PROP_VAL:
+                        val = &ep->d.val;
+                        len = 8;
                        break;
-                if (ep->tag != MD_NODE) {
+                case MD_PROP_STR:
-                        prom_printf("MDESC: Inconsistent element list.\n");
+                case MD_PROP_DATA:
-                        prom_halt();
+                        val = data + ep->d.data.data_offset;
-                }
+                        len = ep->d.data.data_len;
+                        break;
-                mdesc_node_alloc(node, ep, names);
-                if (ep->d.val >= last_node) {
+                default:
-                        printk("MDESC: Warning, early break out of node scan.\n");
-                        printk("MDESC: Next node [%lu] last_node [%lu].\n",
-                               node, last_node);
                        break;
                }
+                if (!val)
+                        continue;
-                ep = start + ep->d.val;
+                if (!strcmp(names + ep->name_offset, name)) {
+                        if (lenp)
+                                *lenp = len;
+                        return val;
+                }
        }
-        data = data_block(mdesc);
+        return NULL;
-        for (mp = allnodes; mp; mp = mp->allnodes_next) {
+}
-                struct mdesc_elem *ep = start + mp->node;
+EXPORT_SYMBOL(mdesc_get_property);
-                struct property **link = &mp->properties;
-                unsigned int this_arc = 0;
-                ep++;
-                while (ep->tag != MD_NODE_END) {
-                        switch (ep->tag) {
-                        case MD_PROP_ARC: {
-                                struct mdesc_node *target;
-                                if (this_arc >= mp->num_arcs) {
-                                        prom_printf("MDESC: ARC overrun [%u:%u]\n",
-                                                    this_arc, mp->num_arcs);
-                                        prom_halt();
-                                }
-                                target = find_node(ep->d.val);
-                                if (!target) {
-                                        printk("MDESC: Warning, arc points to "
-                                               "missing node, ignoring.\n");
-                                        break;
-                                }
-                                mp->arcs[this_arc].name =
-                                        (names + ep->name_offset);
-                                mp->arcs[this_arc].arc = target;
-                                this_arc++;
-                                break;
-                        }
-                        case MD_PROP_VAL:
+u64 mdesc_next_arc(struct mdesc_handle *hp, u64 from, const char *arc_type)
-                        case MD_PROP_STR:
+{
-                        case MD_PROP_DATA: {
+        struct mdesc_elem *ep, *base = node_block(&hp->mdesc);
-                                struct property *p = mdesc_early_alloc(sizeof(*p));
+        const char *names = name_block(&hp->mdesc);
+        u64 last_node = hp->mdesc.node_sz / 16;
-                                p->unique_id = unique_id++;
-                                p->name = (char *) names + ep->name_offset;
-                                if (ep->tag == MD_PROP_VAL) {
-                                        p->value = &ep->d.val;
-                                        p->length = 8;
-                                } else {
-                                        p->value = data + ep->d.data.data_offset;
-                                        p->length = ep->d.data.data_len;
-                                }
-                                *link = p;
-                                link = &p->next;
-                                break;
-                        }
-                        case MD_NOOP:
+        if (from == MDESC_NODE_NULL || from >= last_node)
-                                break;
+                return MDESC_NODE_NULL;
-                        default:
+        ep = base + from;
-                                printk("MDESC: Warning, ignoring unknown tag type %02x\n",
-                                       ep->tag);
+        ep++;
-                        }
+        for (; ep->tag != MD_NODE_END; ep++) {
-                        ep++;
+                if (ep->tag != MD_PROP_ARC)
-                }
+                        continue;
+                if (strcmp(names + ep->name_offset, arc_type))
+                        continue;
+                return ep - base;
        }
+        return MDESC_NODE_NULL;
 }
+EXPORT_SYMBOL(mdesc_next_arc);
-static unsigned int __init count_nodes(struct mdesc_hdr *mdesc)
+u64 mdesc_arc_target(struct mdesc_handle *hp, u64 arc)
 {
-        struct mdesc_elem *ep = node_block(mdesc);
+        struct mdesc_elem *ep, *base = node_block(&hp->mdesc);
-        struct mdesc_elem *end;
-        unsigned int cnt = 0;
-        end = ((void *)ep) + mdesc->node_sz;
+        ep = base + arc;
-        while (ep < end) {
-                if (ep->tag == MD_NODE)
+        return ep->d.val;
-                        cnt++;
-                ep++;
-        }
-        return cnt;
 }
+EXPORT_SYMBOL(mdesc_arc_target);
+const char *mdesc_node_name(struct mdesc_handle *hp, u64 node)
+{
+        struct mdesc_elem *ep, *base = node_block(&hp->mdesc);
+        const char *names = name_block(&hp->mdesc);
+        u64 last_node = hp->mdesc.node_sz / 16;
+        if (node == MDESC_NODE_NULL || node >= last_node)
+                return NULL;
+        ep = base + node;
+        if (ep->tag != MD_NODE)
+                return NULL;
+        return names + ep->name_offset;
+}
+EXPORT_SYMBOL(mdesc_node_name);
 static void __init report_platform_properties(void)
 {
-        struct mdesc_node *pn = md_find_node_by_name(NULL, "platform");
+        struct mdesc_handle *hp = mdesc_grab();
+        u64 pn = mdesc_node_by_name(hp, MDESC_NODE_NULL, "platform");
        const char *s;
        const u64 *v;
-        if (!pn) {
+        if (pn == MDESC_NODE_NULL) {
                prom_printf("No platform node in machine-description.\n");
                prom_halt();
        }
-        s = md_get_property(pn, "banner-name", NULL);
+        s = mdesc_get_property(hp, pn, "banner-name", NULL);
        printk("PLATFORM: banner-name [%s]\n", s);
-        s = md_get_property(pn, "name", NULL);
+        s = mdesc_get_property(hp, pn, "name", NULL);
        printk("PLATFORM: name [%s]\n", s);
-        v = md_get_property(pn, "hostid", NULL);
+        v = mdesc_get_property(hp, pn, "hostid", NULL);
        if (v)
                printk("PLATFORM: hostid [%08lx]\n", *v);
-        v = md_get_property(pn, "serial#", NULL);
+        v = mdesc_get_property(hp, pn, "serial#", NULL);
        if (v)
                printk("PLATFORM: serial# [%08lx]\n", *v);
-        v = md_get_property(pn, "stick-frequency", NULL);
+        v = mdesc_get_property(hp, pn, "stick-frequency", NULL);
        printk("PLATFORM: stick-frequency [%08lx]\n", *v);
-        v = md_get_property(pn, "mac-address", NULL);
+        v = mdesc_get_property(hp, pn, "mac-address", NULL);
        if (v)
                printk("PLATFORM: mac-address [%lx]\n", *v);
-        v = md_get_property(pn, "watchdog-resolution", NULL);
+        v = mdesc_get_property(hp, pn, "watchdog-resolution", NULL);
        if (v)
                printk("PLATFORM: watchdog-resolution [%lu ms]\n", *v);
-        v = md_get_property(pn, "watchdog-max-timeout", NULL);
+        v = mdesc_get_property(hp, pn, "watchdog-max-timeout", NULL);
        if (v)
                printk("PLATFORM: watchdog-max-timeout [%lu ms]\n", *v);
-        v = md_get_property(pn, "max-cpus", NULL);
+        v = mdesc_get_property(hp, pn, "max-cpus", NULL);
        if (v)
                printk("PLATFORM: max-cpus [%lu]\n", *v);
+#ifdef CONFIG_SMP
+        {
+                int max_cpu, i;
+                if (v) {
+                        max_cpu = *v;
+                        if (max_cpu > NR_CPUS)
+                                max_cpu = NR_CPUS;
+                } else {
+                        max_cpu = NR_CPUS;
+                }
+                for (i = 0; i < max_cpu; i++)
+                        cpu_set(i, cpu_possible_map);
+        }
+#endif
+        mdesc_release(hp);
 }
 static int inline find_in_proplist(const char *list, const char *match, int len)
@@ -369,15 +534,17 @@ static int inline find_in_proplist(const char *list, const char *match, int len)
        return 0;
 }
-static void __init fill_in_one_cache(cpuinfo_sparc *c, struct mdesc_node *mp)
+static void __devinit fill_in_one_cache(cpuinfo_sparc *c,
+                                        struct mdesc_handle *hp,
+                                        u64 mp)
 {
-        const u64 *level = md_get_property(mp, "level", NULL);
+        const u64 *level = mdesc_get_property(hp, mp, "level", NULL);
-        const u64 *size = md_get_property(mp, "size", NULL);
+        const u64 *size = mdesc_get_property(hp, mp, "size", NULL);
-        const u64 *line_size = md_get_property(mp, "line-size", NULL);
+        const u64 *line_size = mdesc_get_property(hp, mp, "line-size", NULL);
        const char *type;
        int type_len;
-        type = md_get_property(mp, "type", &type_len);
+        type = mdesc_get_property(hp, mp, "type", &type_len);
        switch (*level) {
        case 1:
@@ -400,48 +567,45 @@ static void __init fill_in_one_cache(cpuinfo_sparc *c, struct mdesc_node *mp)
        }
        if (*level == 1) {
-                unsigned int i;
+                u64 a;
-                for (i = 0; i < mp->num_arcs; i++) {
+                mdesc_for_each_arc(a, hp, mp, MDESC_ARC_TYPE_FWD) {
-                        struct mdesc_node *t = mp->arcs[i].arc;
+                        u64 target = mdesc_arc_target(hp, a);
+                        const char *name = mdesc_node_name(hp, target);
-                        if (strcmp(mp->arcs[i].name, "fwd"))
-                                continue;
-                        if (!strcmp(t->name, "cache"))
+                        if (!strcmp(name, "cache"))
-                                fill_in_one_cache(c, t);
+                                fill_in_one_cache(c, hp, target);
                }
        }
 }
-static void __init mark_core_ids(struct mdesc_node *mp, int core_id)
+static void __devinit mark_core_ids(struct mdesc_handle *hp, u64 mp,
+                                    int core_id)
 {
-        unsigned int i;
+        u64 a;
-        for (i = 0; i < mp->num_arcs; i++) {
+        mdesc_for_each_arc(a, hp, mp, MDESC_ARC_TYPE_BACK) {
-                struct mdesc_node *t = mp->arcs[i].arc;
+                u64 t = mdesc_arc_target(hp, a);
+                const char *name;
                const u64 *id;
-                if (strcmp(mp->arcs[i].name, "back"))
+                name = mdesc_node_name(hp, t);
-                        continue;
+                if (!strcmp(name, "cpu")) {
+                        id = mdesc_get_property(hp, t, "id", NULL);
-                if (!strcmp(t->name, "cpu")) {
-                        id = md_get_property(t, "id", NULL);
                        if (*id < NR_CPUS)
                                cpu_data(*id).core_id = core_id;
                } else {
-                        unsigned int j;
+                        u64 j;
-                        for (j = 0; j < t->num_arcs; j++) {
+                        mdesc_for_each_arc(j, hp, t, MDESC_ARC_TYPE_BACK) {
-                                struct mdesc_node *n = t->arcs[j].arc;
+                                u64 n = mdesc_arc_target(hp, j);
+                                const char *n_name;
-                                if (strcmp(t->arcs[j].name, "back"))
-                                        continue;
-                                if (strcmp(n->name, "cpu"))
+                                n_name = mdesc_node_name(hp, n);
+                                if (strcmp(n_name, "cpu"))
                                        continue;
-                                id = md_get_property(n, "id", NULL);
+                                id = mdesc_get_property(hp, n, "id", NULL);
                                if (*id < NR_CPUS)
                                        cpu_data(*id).core_id = core_id;
                        }
@@ -449,78 +613,81 @@ static void __init mark_core_ids(struct mdesc_node *mp, int core_id)
        }
 }
-static void __init set_core_ids(void)
+static void __devinit set_core_ids(struct mdesc_handle *hp)
 {
-        struct mdesc_node *mp;
        int idx;
+        u64 mp;
        idx = 1;
-        md_for_each_node_by_name(mp, "cache") {
+        mdesc_for_each_node_by_name(hp, mp, "cache") {
-                const u64 *level = md_get_property(mp, "level", NULL);
+                const u64 *level;
                const char *type;
                int len;
+                level = mdesc_get_property(hp, mp, "level", NULL);
                if (*level != 1)
                        continue;
-                type = md_get_property(mp, "type", &len);
+                type = mdesc_get_property(hp, mp, "type", &len);
                if (!find_in_proplist(type, "instn", len))
                        continue;
-                mark_core_ids(mp, idx);
+                mark_core_ids(hp, mp, idx);
                idx++;
        }
 }
-static void __init mark_proc_ids(struct mdesc_node *mp, int proc_id)
+static void __devinit mark_proc_ids(struct mdesc_handle *hp, u64 mp,
+                                    int proc_id)
 {
-        int i;
+        u64 a;
-        for (i = 0; i < mp->num_arcs; i++) {
+        mdesc_for_each_arc(a, hp, mp, MDESC_ARC_TYPE_BACK) {
-                struct mdesc_node *t = mp->arcs[i].arc;
+                u64 t = mdesc_arc_target(hp, a);
+                const char *name;
                const u64 *id;
-                if (strcmp(mp->arcs[i].name, "back"))
+                name = mdesc_node_name(hp, t);
+                if (strcmp(name, "cpu"))
                        continue;
-                if (strcmp(t->name, "cpu"))
+                id = mdesc_get_property(hp, t, "id", NULL);
-                        continue;
-                id = md_get_property(t, "id", NULL);
                if (*id < NR_CPUS)
                        cpu_data(*id).proc_id = proc_id;
        }
 }
-static void __init __set_proc_ids(const char *exec_unit_name)
+static void __devinit __set_proc_ids(struct mdesc_handle *hp,
+                                     const char *exec_unit_name)
 {
-        struct mdesc_node *mp;
        int idx;
+        u64 mp;
        idx = 0;
-        md_for_each_node_by_name(mp, exec_unit_name) {
+        mdesc_for_each_node_by_name(hp, mp, exec_unit_name) {
                const char *type;
                int len;
-                type = md_get_property(mp, "type", &len);
+                type = mdesc_get_property(hp, mp, "type", &len);
                if (!find_in_proplist(type, "int", len) &&
                    !find_in_proplist(type, "integer", len))
                        continue;
-                mark_proc_ids(mp, idx);
+                mark_proc_ids(hp, mp, idx);
                idx++;
        }
 }
-static void __init set_proc_ids(void)
+static void __devinit set_proc_ids(struct mdesc_handle *hp)
 {
-        __set_proc_ids("exec_unit");
+        __set_proc_ids(hp, "exec_unit");
-        __set_proc_ids("exec-unit");
+        __set_proc_ids(hp, "exec-unit");
 }
-static void __init get_one_mondo_bits(const u64 *p, unsigned int *mask, unsigned char def)
+static void __devinit get_one_mondo_bits(const u64 *p, unsigned int *mask,
+                                         unsigned char def)
 {
        u64 val;
@@ -538,35 +705,37 @@ use_default:
        *mask = ((1U << def) * 64U) - 1U;
 }
-static void __init get_mondo_data(struct mdesc_node *mp, struct trap_per_cpu *tb)
+static void __devinit get_mondo_data(struct mdesc_handle *hp, u64 mp,
+                                     struct trap_per_cpu *tb)
 {
        const u64 *val;
-        val = md_get_property(mp, "q-cpu-mondo-#bits", NULL);
+        val = mdesc_get_property(hp, mp, "q-cpu-mondo-#bits", NULL);
        get_one_mondo_bits(val, &tb->cpu_mondo_qmask, 7);
-        val = md_get_property(mp, "q-dev-mondo-#bits", NULL);
+        val = mdesc_get_property(hp, mp, "q-dev-mondo-#bits", NULL);
        get_one_mondo_bits(val, &tb->dev_mondo_qmask, 7);
-        val = md_get_property(mp, "q-resumable-#bits", NULL);
+        val = mdesc_get_property(hp, mp, "q-resumable-#bits", NULL);
        get_one_mondo_bits(val, &tb->resum_qmask, 6);
-        val = md_get_property(mp, "q-nonresumable-#bits", NULL);
+        val = mdesc_get_property(hp, mp, "q-nonresumable-#bits", NULL);
        get_one_mondo_bits(val, &tb->nonresum_qmask, 2);
 }
-static void __init mdesc_fill_in_cpu_data(void)
+void __devinit mdesc_fill_in_cpu_data(cpumask_t mask)
 {
-        struct mdesc_node *mp;
+        struct mdesc_handle *hp = mdesc_grab();
+        u64 mp;
        ncpus_probed = 0;
-        md_for_each_node_by_name(mp, "cpu") {
+        mdesc_for_each_node_by_name(hp, mp, "cpu") {
-                const u64 *id = md_get_property(mp, "id", NULL);
+                const u64 *id = mdesc_get_property(hp, mp, "id", NULL);
-                const u64 *cfreq = md_get_property(mp, "clock-frequency", NULL);
+                const u64 *cfreq = mdesc_get_property(hp, mp, "clock-frequency", NULL);
                struct trap_per_cpu *tb;
                cpuinfo_sparc *c;
-                unsigned int i;
                int cpuid;
+                u64 a;
                ncpus_probed++;
@@ -575,6 +744,8 @@ static void __init mdesc_fill_in_cpu_data(void)
 #ifdef CONFIG_SMP
                if (cpuid >= NR_CPUS)
                        continue;
+                if (!cpu_isset(cpuid, mask))
+                        continue;
 #else
                /* On uniprocessor we only want the values for the
                 * real physical cpu the kernel booted onto, however
@@ -589,35 +760,30 @@ static void __init mdesc_fill_in_cpu_data(void)
                c->clock_tick = *cfreq;
                tb = &trap_block[cpuid];
-                get_mondo_data(mp, tb);
+                get_mondo_data(hp, mp, tb);
-                for (i = 0; i < mp->num_arcs; i++) {
-                        struct mdesc_node *t = mp->arcs[i].arc;
-                        unsigned int j;
-                        if (strcmp(mp->arcs[i].name, "fwd"))
+                mdesc_for_each_arc(a, hp, mp, MDESC_ARC_TYPE_FWD) {
-                                continue;
+                        u64 j, t = mdesc_arc_target(hp, a);
+                        const char *t_name;
-                        if (!strcmp(t->name, "cache")) {
+                        t_name = mdesc_node_name(hp, t);
-                                fill_in_one_cache(c, t);
+                        if (!strcmp(t_name, "cache")) {
+                                fill_in_one_cache(c, hp, t);
                                continue;
                        }
-                        for (j = 0; j < t->num_arcs; j++) {
+                        mdesc_for_each_arc(j, hp, t, MDESC_ARC_TYPE_FWD) {
-                                struct mdesc_node *n;
+                                u64 n = mdesc_arc_target(hp, j);
+                                const char *n_name;
-                                n = t->arcs[j].arc;
-                                if (strcmp(t->arcs[j].name, "fwd"))
-                                        continue;
-                                if (!strcmp(n->name, "cache"))
+                                n_name = mdesc_node_name(hp, n);
-                                        fill_in_one_cache(c, n);
+                                if (!strcmp(n_name, "cache"))
+                                        fill_in_one_cache(c, hp, n);
                        }
                }
 #ifdef CONFIG_SMP
                cpu_set(cpuid, cpu_present_map);
-                cpu_set(cpuid, phys_cpu_present_map);
 #endif
                c->core_id = 0;
@@ -628,45 +794,43 @@ static void __init mdesc_fill_in_cpu_data(void)
        sparc64_multi_core = 1;
 #endif
-        set_core_ids();
+        set_core_ids(hp);
-        set_proc_ids();
+        set_proc_ids(hp);
        smp_fill_in_sib_core_maps();
+        mdesc_release(hp);
 }
 void __init sun4v_mdesc_init(void)
 {
+        struct mdesc_handle *hp;
        unsigned long len, real_len, status;
+        cpumask_t mask;
        (void) sun4v_mach_desc(0UL, 0UL, &len);
        printk("MDESC: Size is %lu bytes.\n", len);
-        main_mdesc = mdesc_early_alloc(len);
+        hp = mdesc_alloc(len, &bootmem_mdesc_memops);
+        if (hp == NULL) {
+                prom_printf("MDESC: alloc of %lu bytes failed.\n", len);
+                prom_halt();
+        }
-        status = sun4v_mach_desc(__pa(main_mdesc), len, &real_len);
+        status = sun4v_mach_desc(__pa(&hp->mdesc), len, &real_len);
        if (status != HV_EOK || real_len > len) {
                prom_printf("sun4v_mach_desc fails, err(%lu), "
                            "len(%lu), real_len(%lu)\n",
                            status, len, real_len);
+                mdesc_free(hp);
                prom_halt();
        }
-        len = count_nodes(main_mdesc);
+        cur_mdesc = hp;
-        printk("MDESC: %lu nodes.\n", len);
-        len = roundup_pow_of_two(len);
-        mdesc_hash = mdesc_early_alloc(len * sizeof(struct mdesc_node *));
-        mdesc_hash_size = len;
-        printk("MDESC: Hash size %lu entries.\n", len);
-        build_all_nodes(main_mdesc);
-        printk("MDESC: Built graph with %u bytes of memory.\n",
-               mdesc_early_allocated);
        report_platform_properties();
-        mdesc_fill_in_cpu_data();
+        cpus_setall(mask);
+        mdesc_fill_in_cpu_data(mask);
 }
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index 81f4a5ea05..55ad1b899b 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -448,6 +448,7 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
                 */
                pci_read_config_dword(dev, PCI_CLASS_REVISION, &class);
                dev->class = class >> 8;
+                dev->revision = class & 0xff;
                sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),
                        dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));
diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c
index 5d6adea396..8dd4294ad2 100644
--- a/arch/sparc64/kernel/power.c
+++ b/arch/sparc64/kernel/power.c
@@ -1,7 +1,6 @@
-/* $Id: power.c,v 1.10 2001/12/11 01:57:16 davem Exp $
+/* power.c: Power management driver.
- * power.c: Power management driver.
 *
- * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ * Copyright (C) 1999, 2007 David S. Miller (davem@davemloft.net)
 */
 #include <linux/kernel.h>
@@ -19,6 +18,7 @@
 #include <asm/prom.h>
 #include <asm/of_device.h>
 #include <asm/io.h>
+#include <asm/power.h>
 #include <asm/sstate.h>
 #include <linux/unistd.h>
@@ -29,24 +29,26 @@
 */
 int scons_pwroff = 1; 
-#ifdef CONFIG_PCI
-#include <linux/pci.h>
 static void __iomem *power_reg;
 static DECLARE_WAIT_QUEUE_HEAD(powerd_wait);
 static int button_pressed;
-static irqreturn_t power_handler(int irq, void *dev_id)
+void wake_up_powerd(void)
 {
        if (button_pressed == 0) {
                button_pressed = 1;
                wake_up(&powerd_wait);
        }
+}
+static irqreturn_t power_handler(int irq, void *dev_id)
+{
+        wake_up_powerd();
        /* FIXME: Check registers for status... */
        return IRQ_HANDLED;
 }
-#endif /* CONFIG_PCI */
 extern void machine_halt(void);
 extern void machine_alt_power_off(void);
@@ -56,19 +58,18 @@ void machine_power_off(void)
 {
        sstate_poweroff();
        if (!serial_console || scons_pwroff) {
-#ifdef CONFIG_PCI
                if (power_reg) {
                        /* Both register bits seem to have the
                         * same effect, so until I figure out
                         * what the difference is...
                         */
                        writel(AUXIO_PCIO_CPWR_OFF | AUXIO_PCIO_SPWR_OFF, power_reg);
-                } else
+                } else {
-#endif /* CONFIG_PCI */
                        if (poweroff_method != NULL) {
                                poweroff_method();
                                /* not reached */
                        }
+                }
        }
        machine_halt();
 }
@@ -76,7 +77,6 @@ void machine_power_off(void)
 void (*pm_power_off)(void) = machine_power_off;
 EXPORT_SYMBOL(pm_power_off);
-#ifdef CONFIG_PCI
 static int powerd(void *__unused)
 {
        static char *envp[] = { "HOME=/", "TERM=linux", "PATH=/sbin:/usr/sbin:/bin:/usr/bin", NULL };
@@ -86,7 +86,7 @@ static int powerd(void *__unused)
        daemonize("powerd");
        add_wait_queue(&powerd_wait, &wait);
-again:
        for (;;) {
                set_task_state(current, TASK_INTERRUPTIBLE);
                if (button_pressed)
@@ -100,16 +100,28 @@ again:
        /* Ok, down we go... */
        button_pressed = 0;
        if (kernel_execve("/sbin/shutdown", argv, envp) < 0) {
-                printk("powerd: shutdown execution failed\n");
+                printk(KERN_ERR "powerd: shutdown execution failed\n");
-                add_wait_queue(&powerd_wait, &wait);
+                machine_power_off();
-                goto again;
        }
        return 0;
 }
+int start_powerd(void)
+{
+        int err;
+        err = kernel_thread(powerd, NULL, CLONE_FS);
+        if (err < 0)
+                printk(KERN_ERR "power: Failed to start power daemon.\n");
+        else
+                printk(KERN_INFO "power: powerd running.\n");
+        return err;
+}
 static int __init has_button_interrupt(unsigned int irq, struct device_node *dp)
 {
-        if (irq == PCI_IRQ_NONE)
+        if (irq == 0xffffffff)
                return 0;
        if (!of_find_property(dp, "button", NULL))
                return 0;
@@ -130,17 +142,14 @@ static int __devinit power_probe(struct of_device *op, const struct of_device_id
        poweroff_method = machine_halt;  /* able to use the standard halt */
        if (has_button_interrupt(irq, op->node)) {
-                if (kernel_thread(powerd, NULL, CLONE_FS) < 0) {
+                if (start_powerd() < 0)
-                        printk("Failed to start power daemon.\n");
                        return 0;
-                }
-                printk("powerd running.\n");
                if (request_irq(irq,
                                power_handler, 0, "power", NULL) < 0)
-                        printk("power: Error, cannot register IRQ handler.\n");
+                        printk(KERN_ERR "power: Cannot setup IRQ handler.\n");
        } else {
-                printk("not using powerd.\n");
+                printk(KERN_INFO "power: Not using powerd.\n");
        }
        return 0;
@@ -164,4 +173,3 @@ void __init power_init(void)
        of_register_driver(&power_driver, &of_bus_type);
        return;
 }
-#endif /* CONFIG_PCI */
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index f5f97e2c66..93557507ec 100644
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -29,6 +29,7 @@
 #include <linux/compat.h>
 #include <linux/tick.h>
 #include <linux/init.h>
+#include <linux/cpu.h>
 #include <asm/oplib.h>
 #include <asm/uaccess.h>
@@ -49,7 +50,7 @@
 /* #define VERBOSE_SHOWREGS */
-static void sparc64_yield(void)
+static void sparc64_yield(int cpu)
 {
        if (tlb_type != hypervisor)
                return;
@@ -57,7 +58,7 @@ static void sparc64_yield(void)
        clear_thread_flag(TIF_POLLING_NRFLAG);
        smp_mb__after_clear_bit();
-        while (!need_resched()) {
+        while (!need_resched() && !cpu_is_offline(cpu)) {
                unsigned long pstate;
                /* Disable interrupts. */
@@ -68,7 +69,7 @@ static void sparc64_yield(void)
                        : "=&r" (pstate)
                        : "i" (PSTATE_IE));
-                if (!need_resched())
+                if (!need_resched() && !cpu_is_offline(cpu))
                        sun4v_cpu_yield();
                /* Re-enable interrupts. */
@@ -86,15 +87,25 @@ static void sparc64_yield(void)
 /* The idle loop on sparc64. */
 void cpu_idle(void)
 {
+        int cpu = smp_processor_id();
        set_thread_flag(TIF_POLLING_NRFLAG);
        while(1) {
                tick_nohz_stop_sched_tick();
-                while (!need_resched())
-                        sparc64_yield();
+                while (!need_resched() && !cpu_is_offline(cpu))
+                        sparc64_yield(cpu);
                tick_nohz_restart_sched_tick();
                preempt_enable_no_resched();
+#ifdef CONFIG_HOTPLUG_CPU
+                if (cpu_is_offline(cpu))
+                        cpu_play_dead();
+#endif
                schedule();
                preempt_disable();
        }
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c
index 61036b3466..5d220302cd 100644
--- a/arch/sparc64/kernel/prom.c
+++ b/arch/sparc64/kernel/prom.c
@@ -1808,7 +1808,7 @@ static void __init of_fill_in_cpu_data(void)
 #ifdef CONFIG_SMP
                cpu_set(cpuid, cpu_present_map);
-                cpu_set(cpuid, phys_cpu_present_map);
+                cpu_set(cpuid, cpu_possible_map);
 #endif
        }
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 7490cc670a..aafde3dd9f 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -442,7 +442,6 @@ static int show_cpuinfo(struct seq_file *m, void *__unused)
                   "D$ parity tl1\t: %u\n"
                   "I$ parity tl1\t: %u\n"
 #ifndef CONFIG_SMP
-                   "Cpu0Bogo\t: %lu.%02lu\n"
                   "Cpu0ClkTck\t: %016lx\n"
 #endif
                   ,
@@ -457,9 +456,7 @@ static int show_cpuinfo(struct seq_file *m, void *__unused)
                   dcache_parity_tl1_occurred,
                   icache_parity_tl1_occurred
 #ifndef CONFIG_SMP
-                   , cpu_data(0).udelay_val/(500000/HZ),
+                   , cpu_data(0).clock_tick
-                   (cpu_data(0).udelay_val/(5000/HZ)) % 100,
-                   cpu_data(0).clock_tick
 #endif
                );
 #ifdef CONFIG_SMP
diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c
index 203e873010..fb13775b36 100644
--- a/arch/sparc64/kernel/signal.c
+++ b/arch/sparc64/kernel/signal.c
@@ -289,9 +289,7 @@ void do_rt_sigreturn(struct pt_regs *regs)
        struct rt_signal_frame __user *sf;
        unsigned long tpc, tnpc, tstate;
        __siginfo_fpu_t __user *fpu_save;
-        mm_segment_t old_fs;
        sigset_t set;
-        stack_t st;
        int err;
        /* Always make any pending restarted system calls return -EINTR */
@@ -327,20 +325,13 @@ void do_rt_sigreturn(struct pt_regs *regs)
                err |= restore_fpu_state(regs, &sf->fpu_state);
        err |= __copy_from_user(&set, &sf->mask, sizeof(sigset_t));
-        err |= __copy_from_user(&st, &sf->stack, sizeof(stack_t));
+        err |= do_sigaltstack(&sf->stack, NULL, (unsigned long)sf);
-        
        if (err)
                goto segv;
-                
        regs->tpc = tpc;
        regs->tnpc = tnpc;
-        
-        /* It is more difficult to avoid calling this function than to
-           call it and ignore errors.  */
-        old_fs = get_fs();
-        set_fs(KERNEL_DS);
-        do_sigaltstack((const stack_t __user *) &st, NULL, (unsigned long)sf);
-        set_fs(old_fs);
        sigdelsetmask(&set, ~_BLOCKABLE);
        spin_lock_irq(&current->sighand->siglock);
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 4dcd7d0b60..b448d33321 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -1,6 +1,6 @@
 /* smp.c: Sparc64 SMP support.
 *
- * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
+ * Copyright (C) 1997, 2007 David S. Miller (davem@davemloft.net)
 */
 #include <linux/module.h>
@@ -28,6 +28,8 @@
 #include <asm/tlbflush.h>
 #include <asm/mmu_context.h>
 #include <asm/cpudata.h>
+#include <asm/hvtramp.h>
+#include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/irq_regs.h>
@@ -41,22 +43,26 @@
 #include <asm/sections.h>
 #include <asm/prom.h>
 #include <asm/mdesc.h>
+#include <asm/ldc.h>
+#include <asm/hypervisor.h>
 extern void calibrate_delay(void);
 int sparc64_multi_core __read_mostly;
-/* Please don't make this stuff initdata!!!  --DaveM */
+cpumask_t cpu_possible_map __read_mostly = CPU_MASK_NONE;
-unsigned char boot_cpu_id;
 cpumask_t cpu_online_map __read_mostly = CPU_MASK_NONE;
-cpumask_t phys_cpu_present_map __read_mostly = CPU_MASK_NONE;
 cpumask_t cpu_sibling_map[NR_CPUS] __read_mostly =
        { [0 ... NR_CPUS-1] = CPU_MASK_NONE };
 cpumask_t cpu_core_map[NR_CPUS] __read_mostly =
        { [0 ... NR_CPUS-1] = CPU_MASK_NONE };
+EXPORT_SYMBOL(cpu_possible_map);
+EXPORT_SYMBOL(cpu_online_map);
+EXPORT_SYMBOL(cpu_sibling_map);
+EXPORT_SYMBOL(cpu_core_map);
 static cpumask_t smp_commenced_mask;
-static cpumask_t cpu_callout_map;
 void smp_info(struct seq_file *m)
 {
@@ -73,18 +79,17 @@ void smp_bogo(struct seq_file *m)
        
        for_each_online_cpu(i)
                seq_printf(m,
-                           "Cpu%dBogo\t: %lu.%02lu\n"
                           "Cpu%dClkTck\t: %016lx\n",
-                           i, cpu_data(i).udelay_val / (500000/HZ),
-                           (cpu_data(i).udelay_val / (5000/HZ)) % 100,
                           i, cpu_data(i).clock_tick);
 }
+static __cacheline_aligned_in_smp DEFINE_SPINLOCK(call_lock);
 extern void setup_sparc64_timer(void);
 static volatile unsigned long callin_flag = 0;
-void __init smp_callin(void)
+void __devinit smp_callin(void)
 {
        int cpuid = hard_smp_processor_id();
@@ -102,8 +107,6 @@ void __init smp_callin(void)
        local_irq_enable();
-        calibrate_delay();
-        cpu_data(cpuid).udelay_val = loops_per_jiffy;
        callin_flag = 1;
        __asm__ __volatile__("membar #Sync\n\t"
                             "flush  %%g6" : : : "memory");
@@ -120,7 +123,9 @@ void __init smp_callin(void)
        while (!cpu_isset(cpuid, smp_commenced_mask))
                rmb();
+        spin_lock(&call_lock);
        cpu_set(cpuid, cpu_online_map);
+        spin_unlock(&call_lock);
        /* idle thread is expected to have preempt disabled */
        preempt_disable();
@@ -268,6 +273,67 @@ static void smp_synchronize_one_tick(int cpu)
        spin_unlock_irqrestore(&itc_sync_lock, flags);
 }
+#if defined(CONFIG_SUN_LDOMS) && defined(CONFIG_HOTPLUG_CPU)
+/* XXX Put this in some common place. XXX */
+static unsigned long kimage_addr_to_ra(void *p)
+{
+        unsigned long val = (unsigned long) p;
+        return kern_base + (val - KERNBASE);
+}
+static void ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg)
+{
+        extern unsigned long sparc64_ttable_tl0;
+        extern unsigned long kern_locked_tte_data;
+        extern int bigkernel;
+        struct hvtramp_descr *hdesc;
+        unsigned long trampoline_ra;
+        struct trap_per_cpu *tb;
+        u64 tte_vaddr, tte_data;
+        unsigned long hv_err;
+        hdesc = kzalloc(sizeof(*hdesc), GFP_KERNEL);
+        if (!hdesc) {
+                printk(KERN_ERR "ldom_startcpu_cpuid: Cannot allocate "
+                       "hvtramp_descr.\n");
+                return;
+        }
+        hdesc->cpu = cpu;
+        hdesc->num_mappings = (bigkernel ? 2 : 1);
+        tb = &trap_block[cpu];
+        tb->hdesc = hdesc;
+        hdesc->fault_info_va = (unsigned long) &tb->fault_info;
+        hdesc->fault_info_pa = kimage_addr_to_ra(&tb->fault_info);
+        hdesc->thread_reg = thread_reg;
+        tte_vaddr = (unsigned long) KERNBASE;
+        tte_data = kern_locked_tte_data;
+        hdesc->maps[0].vaddr = tte_vaddr;
+        hdesc->maps[0].tte   = tte_data;
+        if (bigkernel) {
+                tte_vaddr += 0x400000;
+                tte_data  += 0x400000;
+                hdesc->maps[1].vaddr = tte_vaddr;
+                hdesc->maps[1].tte   = tte_data;
+        }
+        trampoline_ra = kimage_addr_to_ra(hv_cpu_startup);
+        hv_err = sun4v_cpu_start(cpu, trampoline_ra,
+                                 kimage_addr_to_ra(&sparc64_ttable_tl0),
+                                 __pa(hdesc));
+        if (hv_err)
+                printk(KERN_ERR "ldom_startcpu_cpuid: sun4v_cpu_start() "
+                       "gives error %lu\n", hv_err);
+}
+#endif
 extern void sun4v_init_mondo_queues(int use_bootmem, int cpu, int alloc, int load);
 extern unsigned long sparc64_cpu_startup;
@@ -280,6 +346,7 @@ static struct thread_info *cpu_new_thread = NULL;
 static int __devinit smp_boot_one_cpu(unsigned int cpu)
 {
+        struct trap_per_cpu *tb = &trap_block[cpu];
        unsigned long entry =
                (unsigned long)(&sparc64_cpu_startup);
        unsigned long cookie =
@@ -290,20 +357,25 @@ static int __devinit smp_boot_one_cpu(unsigned int cpu)
        p = fork_idle(cpu);
        callin_flag = 0;
        cpu_new_thread = task_thread_info(p);
-        cpu_set(cpu, cpu_callout_map);
        if (tlb_type == hypervisor) {
                /* Alloc the mondo queues, cpu will load them.  */
                sun4v_init_mondo_queues(0, cpu, 1, 0);
-                prom_startcpu_cpuid(cpu, entry, cookie);
+#if defined(CONFIG_SUN_LDOMS) && defined(CONFIG_HOTPLUG_CPU)
+                if (ldom_domaining_enabled)
+                        ldom_startcpu_cpuid(cpu,
+                                            (unsigned long) cpu_new_thread);
+                else
+#endif
+                        prom_startcpu_cpuid(cpu, entry, cookie);
        } else {
                struct device_node *dp = of_find_node_by_cpuid(cpu);
                prom_startcpu(dp->node, entry, cookie);
        }
-        for (timeout = 0; timeout < 5000000; timeout++) {
+        for (timeout = 0; timeout < 50000; timeout++) {
                if (callin_flag)
                        break;
                udelay(100);
@@ -313,11 +385,15 @@ static int __devinit smp_boot_one_cpu(unsigned int cpu)
                ret = 0;
        } else {
                printk("Processor %d is stuck.\n", cpu);
-                cpu_clear(cpu, cpu_callout_map);
                ret = -ENODEV;
        }
        cpu_new_thread = NULL;
+        if (tb->hdesc) {
+                kfree(tb->hdesc);
+                tb->hdesc = NULL;
+        }
        return ret;
 }
@@ -720,7 +796,6 @@ struct call_data_struct {
        int wait;
 };
-static __cacheline_aligned_in_smp DEFINE_SPINLOCK(call_lock);
 static struct call_data_struct *call_data;
 extern unsigned long xcall_call_function;
@@ -1152,61 +1227,14 @@ void smp_penguin_jailcell(int irq, struct pt_regs *regs)
        preempt_enable();
 }
-void __init smp_tick_init(void)
-{
-        boot_cpu_id = hard_smp_processor_id();
-}
 /* /proc/profile writes can call this, don't __init it please. */
 int setup_profiling_timer(unsigned int multiplier)
 {
        return -EINVAL;
 }
-static void __init smp_tune_scheduling(void)
-{
-        unsigned int smallest = ~0U;
-        int i;
-        for (i = 0; i < NR_CPUS; i++) {
-                unsigned int val = cpu_data(i).ecache_size;
-                if (val && val < smallest)
-                        smallest = val;
-        }
-        /* Any value less than 256K is nonsense.  */
-        if (smallest < (256U * 1024U))
-                smallest = 256 * 1024;
-        max_cache_size = smallest;
-        if (smallest < 1U * 1024U * 1024U)
-                printk(KERN_INFO "Using max_cache_size of %uKB\n",
-                       smallest / 1024U);
-        else
-                printk(KERN_INFO "Using max_cache_size of %uMB\n",
-                       smallest / 1024U / 1024U);
-}
-/* Constrain the number of cpus to max_cpus.  */
 void __init smp_prepare_cpus(unsigned int max_cpus)
 {
-        int i;
-        if (num_possible_cpus() > max_cpus) {
-                for_each_possible_cpu(i) {
-                        if (i != boot_cpu_id) {
-                                cpu_clear(i, phys_cpu_present_map);
-                                cpu_clear(i, cpu_present_map);
-                                if (num_possible_cpus() <= max_cpus)
-                                        break;
-                        }
-                }
-        }
-        cpu_data(boot_cpu_id).udelay_val = loops_per_jiffy;
-        smp_tune_scheduling();
 }
 void __devinit smp_prepare_boot_cpu(void)
@@ -1217,30 +1245,32 @@ void __devinit smp_fill_in_sib_core_maps(void)
 {
        unsigned int i;
-        for_each_possible_cpu(i) {
+        for_each_present_cpu(i) {
                unsigned int j;
+                cpus_clear(cpu_core_map[i]);
                if (cpu_data(i).core_id == 0) {
                        cpu_set(i, cpu_core_map[i]);
                        continue;
                }
-                for_each_possible_cpu(j) {
+                for_each_present_cpu(j) {
                        if (cpu_data(i).core_id ==
                            cpu_data(j).core_id)
                                cpu_set(j, cpu_core_map[i]);
                }
        }
-        for_each_possible_cpu(i) {
+        for_each_present_cpu(i) {
                unsigned int j;
+                cpus_clear(cpu_sibling_map[i]);
                if (cpu_data(i).proc_id == -1) {
                        cpu_set(i, cpu_sibling_map[i]);
                        continue;
                }
-                for_each_possible_cpu(j) {
+                for_each_present_cpu(j) {
                        if (cpu_data(i).proc_id ==
                            cpu_data(j).proc_id)
                                cpu_set(j, cpu_sibling_map[i]);
@@ -1269,18 +1299,112 @@ int __cpuinit __cpu_up(unsigned int cpu)
        return ret;
 }
-void __init smp_cpus_done(unsigned int max_cpus)
+#ifdef CONFIG_HOTPLUG_CPU
+void cpu_play_dead(void)
 {
-        unsigned long bogosum = 0;
+        int cpu = smp_processor_id();
+        unsigned long pstate;
+        idle_task_exit();
+        if (tlb_type == hypervisor) {
+                struct trap_per_cpu *tb = &trap_block[cpu];
+                sun4v_cpu_qconf(HV_CPU_QUEUE_CPU_MONDO,
+                                tb->cpu_mondo_pa, 0);
+                sun4v_cpu_qconf(HV_CPU_QUEUE_DEVICE_MONDO,
+                                tb->dev_mondo_pa, 0);
+                sun4v_cpu_qconf(HV_CPU_QUEUE_RES_ERROR,
+                                tb->resum_mondo_pa, 0);
+                sun4v_cpu_qconf(HV_CPU_QUEUE_NONRES_ERROR,
+                                tb->nonresum_mondo_pa, 0);
+        }
+        cpu_clear(cpu, smp_commenced_mask);
+        membar_safe("#Sync");
+        local_irq_disable();
+        __asm__ __volatile__(
+                "rdpr   %%pstate, %0\n\t"
+                "wrpr   %0, %1, %%pstate"
+                : "=r" (pstate)
+                : "i" (PSTATE_IE));
+        while (1)
+                barrier();
+}
+int __cpu_disable(void)
+{
+        int cpu = smp_processor_id();
+        cpuinfo_sparc *c;
        int i;
-        for_each_online_cpu(i)
+        for_each_cpu_mask(i, cpu_core_map[cpu])
-                bogosum += cpu_data(i).udelay_val;
+                cpu_clear(cpu, cpu_core_map[i]);
-        printk("Total of %ld processors activated "
+        cpus_clear(cpu_core_map[cpu]);
-               "(%lu.%02lu BogoMIPS).\n",
-               (long) num_online_cpus(),
+        for_each_cpu_mask(i, cpu_sibling_map[cpu])
-               bogosum/(500000/HZ),
+                cpu_clear(cpu, cpu_sibling_map[i]);
-               (bogosum/(5000/HZ))%100);
+        cpus_clear(cpu_sibling_map[cpu]);
+        c = &cpu_data(cpu);
+        c->core_id = 0;
+        c->proc_id = -1;
+        spin_lock(&call_lock);
+        cpu_clear(cpu, cpu_online_map);
+        spin_unlock(&call_lock);
+        smp_wmb();
+        /* Make sure no interrupts point to this cpu.  */
+        fixup_irqs();
+        local_irq_enable();
+        mdelay(1);
+        local_irq_disable();
+        return 0;
+}
+void __cpu_die(unsigned int cpu)
+{
+        int i;
+        for (i = 0; i < 100; i++) {
+                smp_rmb();
+                if (!cpu_isset(cpu, smp_commenced_mask))
+                        break;
+                msleep(100);
+        }
+        if (cpu_isset(cpu, smp_commenced_mask)) {
+                printk(KERN_ERR "CPU %u didn't die...\n", cpu);
+        } else {
+#if defined(CONFIG_SUN_LDOMS)
+                unsigned long hv_err;
+                int limit = 100;
+                do {
+                        hv_err = sun4v_cpu_stop(cpu);
+                        if (hv_err == HV_EOK) {
+                                cpu_clear(cpu, cpu_present_map);
+                                break;
+                        }
+                } while (--limit > 0);
+                if (limit <= 0) {
+                        printk(KERN_ERR "sun4v_cpu_stop() fails err=%lu\n",
+                               hv_err);
+                }
+#endif
+        }
+}
+#endif
+void __init smp_cpus_done(unsigned int max_cpus)
+{
 }
 void smp_send_reschedule(int cpu)
diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c
index 6fa7616128..719d676c2d 100644
--- a/arch/sparc64/kernel/sparc64_ksyms.c
+++ b/arch/sparc64/kernel/sparc64_ksyms.c
@@ -1,7 +1,6 @@
-/* $Id: sparc64_ksyms.c,v 1.121 2002/02/09 19:49:31 davem Exp $
+/* arch/sparc64/kernel/sparc64_ksyms.c: Sparc64 specific ksyms support.
- * arch/sparc64/kernel/sparc64_ksyms.c: Sparc64 specific ksyms support.
 *
- * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
+ * Copyright (C) 1996, 2007 David S. Miller (davem@davemloft.net)
 * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be)
 * Copyright (C) 1999 Jakub Jelinek (jj@ultra.linux.cz)
 */
@@ -28,7 +27,6 @@
 #include <net/compat.h>
 #include <asm/oplib.h>
-#include <asm/delay.h>
 #include <asm/system.h>
 #include <asm/auxio.h>
 #include <asm/pgtable.h>
@@ -124,10 +122,6 @@ EXPORT_SYMBOL(__write_lock);
 EXPORT_SYMBOL(__write_unlock);
 EXPORT_SYMBOL(__write_trylock);
-/* CPU online map and active count.  */
-EXPORT_SYMBOL(cpu_online_map);
-EXPORT_SYMBOL(phys_cpu_present_map);
 EXPORT_SYMBOL(smp_call_function);
 #endif /* CONFIG_SMP */
@@ -330,12 +324,6 @@ EXPORT_SYMBOL(memset);
 EXPORT_SYMBOL(memmove);
 EXPORT_SYMBOL(strncmp);
-/* Delay routines. */
-EXPORT_SYMBOL(__udelay);
-EXPORT_SYMBOL(__ndelay);
-EXPORT_SYMBOL(__const_udelay);
-EXPORT_SYMBOL(__delay);
 void VISenter(void);
 /* RAID code needs this */
 EXPORT_SYMBOL(VISenter);
diff --git a/arch/sparc64/kernel/sysfs.c b/arch/sparc64/kernel/sysfs.c
index cdb1477af8..52816c7be0 100644
--- a/arch/sparc64/kernel/sysfs.c
+++ b/arch/sparc64/kernel/sysfs.c
@@ -193,7 +193,6 @@ static ssize_t show_##NAME(struct sys_device *dev, char *buf) \
 }
 SHOW_CPUDATA_ULONG_NAME(clock_tick, clock_tick);
-SHOW_CPUDATA_ULONG_NAME(udelay_val, udelay_val);
 SHOW_CPUDATA_UINT_NAME(l1_dcache_size, dcache_size);
 SHOW_CPUDATA_UINT_NAME(l1_dcache_line_size, dcache_line_size);
 SHOW_CPUDATA_UINT_NAME(l1_icache_size, icache_size);
@@ -203,7 +202,6 @@ SHOW_CPUDATA_UINT_NAME(l2_cache_line_size, ecache_line_size);
 static struct sysdev_attribute cpu_core_attrs[] = {
        _SYSDEV_ATTR(clock_tick,          0444, show_clock_tick, NULL),
-        _SYSDEV_ATTR(udelay_val,          0444, show_udelay_val, NULL),
        _SYSDEV_ATTR(l1_dcache_size,      0444, show_l1_dcache_size, NULL),
        _SYSDEV_ATTR(l1_dcache_line_size, 0444, show_l1_dcache_line_size, NULL),
        _SYSDEV_ATTR(l1_icache_size,      0444, show_l1_icache_size, NULL),
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index a31a043924..62e316ab13 100644
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -849,9 +849,6 @@ static unsigned long sparc64_init_timers(void)
 {
        struct device_node *dp;
        unsigned long clock;
-#ifdef CONFIG_SMP
-        extern void smp_tick_init(void);
-#endif
        dp = of_find_node_by_path("/");
        if (tlb_type == spitfire) {
@@ -874,10 +871,6 @@ static unsigned long sparc64_init_timers(void)
                clock = of_getintprop_default(dp, "stick-frequency", 0);
        }
-#ifdef CONFIG_SMP
-        smp_tick_init();
-#endif
        return clock;
 }
@@ -1038,10 +1031,31 @@ static void __init setup_clockevent_multiplier(unsigned long hz)
        sparc64_clockevent.mult = mult;
 }
+static unsigned long tb_ticks_per_usec __read_mostly;
+void __delay(unsigned long loops)
+{
+        unsigned long bclock, now;
+        bclock = tick_ops->get_tick();
+        do {
+                now = tick_ops->get_tick();
+        } while ((now-bclock) < loops);
+}
+EXPORT_SYMBOL(__delay);
+void udelay(unsigned long usecs)
+{
+        __delay(tb_ticks_per_usec * usecs);
+}
+EXPORT_SYMBOL(udelay);
 void __init time_init(void)
 {
        unsigned long clock = sparc64_init_timers();
+        tb_ticks_per_usec = clock / USEC_PER_SEC;
        timer_ticks_per_nsec_quotient =
                clocksource_hz2mult(clock, SPARC64_NSEC_PER_CYC_SHIFT);
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c
index 00a9e3286c..6ef2d299fb 100644
--- a/arch/sparc64/kernel/traps.c
+++ b/arch/sparc64/kernel/traps.c
@@ -2225,6 +2225,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
        notify_die(DIE_OOPS, str, regs, 0, 255, SIGSEGV);
        __asm__ __volatile__("flushw");
        __show_regs(regs);
+        add_taint(TAINT_DIE);
        if (regs->tstate & TSTATE_PRIV) {
                struct reg_window *rw = (struct reg_window *)
                        (regs->u_regs[UREG_FP] + STACK_BIAS);
diff --git a/arch/sparc64/kernel/vio.c b/arch/sparc64/kernel/vio.c
new file mode 100644
index 0000000000..8d3cc4fdb5
--- /dev/null
+++ b/arch/sparc64/kernel/vio.c
@@ -0,0 +1,423 @@
+/* vio.c: Virtual I/O channel devices probing infrastructure.
+ *
+ *    Copyright (c) 2003-2005 IBM Corp.
+ *     Dave Engebretsen engebret@us.ibm.com
+ *     Santiago Leon santil@us.ibm.com
+ *     Hollis Blanchard <hollisb@us.ibm.com>
+ *     Stephen Rothwell
+ *
+ * Adapted to sparc64 by David S. Miller davem@davemloft.net
+ */
+#include <linux/kernel.h>
+#include <linux/irq.h>
+#include <linux/init.h>
+#include <asm/mdesc.h>
+#include <asm/vio.h>
+static inline int find_in_proplist(const char *list, const char *match,
+                                   int len)
+{
+        while (len > 0) {
+                int l;
+                if (!strcmp(list, match))
+                        return 1;
+                l = strlen(list) + 1;
+                list += l;
+                len -= l;
+        }
+        return 0;
+}
+static const struct vio_device_id *vio_match_device(
+        const struct vio_device_id *matches,
+        const struct vio_dev *dev)
+{
+        const char *type, *compat;
+        int len;
+        type = dev->type;
+        compat = dev->compat;
+        len = dev->compat_len;
+        while (matches->type[0] || matches->compat[0]) {
+                int match = 1;
+                if (matches->type[0])
+                        match &= !strcmp(matches->type, type);
+                if (matches->compat[0]) {
+                        match &= len &&
+                                find_in_proplist(compat, matches->compat, len);
+                }
+                if (match)
+                        return matches;
+                matches++;
+        }
+        return NULL;
+}
+static int vio_bus_match(struct device *dev, struct device_driver *drv)
+{
+        struct vio_dev *vio_dev = to_vio_dev(dev);
+        struct vio_driver *vio_drv = to_vio_driver(drv);
+        const struct vio_device_id *matches = vio_drv->id_table;
+        if (!matches)
+                return 0;
+        return vio_match_device(matches, vio_dev) != NULL;
+}
+static int vio_device_probe(struct device *dev)
+{
+        struct vio_dev *vdev = to_vio_dev(dev);
+        struct vio_driver *drv = to_vio_driver(dev->driver);
+        const struct vio_device_id *id;
+        int error = -ENODEV;
+        if (drv->probe) {
+                id = vio_match_device(drv->id_table, vdev);
+                if (id)
+                        error = drv->probe(vdev, id);
+        }
+        return error;
+}
+static int vio_device_remove(struct device *dev)
+{
+        struct vio_dev *vdev = to_vio_dev(dev);
+        struct vio_driver *drv = to_vio_driver(dev->driver);
+        if (drv->remove)
+                return drv->remove(vdev);
+        return 1;
+}
+static ssize_t devspec_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct vio_dev *vdev = to_vio_dev(dev);
+        const char *str = "none";
+        if (!strcmp(vdev->type, "network"))
+                str = "vnet";
+        else if (!strcmp(vdev->type, "block"))
+                str = "vdisk";
+        return sprintf(buf, "%s\n", str);
+}
+static ssize_t type_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct vio_dev *vdev = to_vio_dev(dev);
+        return sprintf(buf, "%s\n", vdev->type);
+}
+static struct device_attribute vio_dev_attrs[] = {
+        __ATTR_RO(devspec),
+        __ATTR_RO(type),
+        __ATTR_NULL
+};
+static struct bus_type vio_bus_type = {
+        .name           = "vio",
+        .dev_attrs      = vio_dev_attrs,
+        .match          = vio_bus_match,
+        .probe          = vio_device_probe,
+        .remove         = vio_device_remove,
+};
+int vio_register_driver(struct vio_driver *viodrv)
+{
+        viodrv->driver.bus = &vio_bus_type;
+        return driver_register(&viodrv->driver);
+}
+EXPORT_SYMBOL(vio_register_driver);
+void vio_unregister_driver(struct vio_driver *viodrv)
+{
+        driver_unregister(&viodrv->driver);
+}
+EXPORT_SYMBOL(vio_unregister_driver);
+static void __devinit vio_dev_release(struct device *dev)
+{
+        kfree(to_vio_dev(dev));
+}
+static ssize_t
+show_pciobppath_attr(struct device *dev, struct device_attribute *attr,
+                     char *buf)
+{
+        struct vio_dev *vdev;
+        struct device_node *dp;
+        vdev = to_vio_dev(dev);
+        dp = vdev->dp;
+        return snprintf (buf, PAGE_SIZE, "%s\n", dp->full_name);
+}
+static DEVICE_ATTR(obppath, S_IRUSR | S_IRGRP | S_IROTH,
+                   show_pciobppath_attr, NULL);
+struct device_node *cdev_node;
+static struct vio_dev *root_vdev;
+static u64 cdev_cfg_handle;
+static void vio_fill_channel_info(struct mdesc_handle *hp, u64 mp,
+                                  struct vio_dev *vdev)
+{
+        u64 a;
+        mdesc_for_each_arc(a, hp, mp, MDESC_ARC_TYPE_FWD) {
+                const u64 *chan_id;
+                const u64 *irq;
+                u64 target;
+                target = mdesc_arc_target(hp, a);
+                irq = mdesc_get_property(hp, target, "tx-ino", NULL);
+                if (irq)
+                        vdev->tx_irq = sun4v_build_virq(cdev_cfg_handle, *irq);
+                irq = mdesc_get_property(hp, target, "rx-ino", NULL);
+                if (irq)
+                        vdev->rx_irq = sun4v_build_virq(cdev_cfg_handle, *irq);
+                chan_id = mdesc_get_property(hp, target, "id", NULL);
+                if (chan_id)
+                        vdev->channel_id = *chan_id;
+        }
+}
+static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp,
+                                      struct device *parent)
+{
+        const char *type, *compat, *bus_id_name;
+        struct device_node *dp;
+        struct vio_dev *vdev;
+        int err, tlen, clen;
+        const u64 *id;
+        type = mdesc_get_property(hp, mp, "device-type", &tlen);
+        if (!type) {
+                type = mdesc_get_property(hp, mp, "name", &tlen);
+                if (!type) {
+                        type = mdesc_node_name(hp, mp);
+                        tlen = strlen(type) + 1;
+                }
+        }
+        if (tlen > VIO_MAX_TYPE_LEN) {
+                printk(KERN_ERR "VIO: Type string [%s] is too long.\n",
+                       type);
+                return NULL;
+        }
+        bus_id_name = type;
+        if (!strcmp(type, "domain-services-port"))
+                bus_id_name = "ds";
+        if (strlen(bus_id_name) >= KOBJ_NAME_LEN - 4) {
+                printk(KERN_ERR "VIO: bus_id_name [%s] is too long.\n",
+                       bus_id_name);
+                return NULL;
+        }
+        compat = mdesc_get_property(hp, mp, "device-type", &clen);
+        if (!compat) {
+                clen = 0;
+        } else if (clen > VIO_MAX_COMPAT_LEN) {
+                printk(KERN_ERR "VIO: Compat len %d for [%s] is too long.\n",
+                       clen, type);
+                return NULL;
+        }
+        vdev = kzalloc(sizeof(*vdev), GFP_KERNEL);
+        if (!vdev) {
+                printk(KERN_ERR "VIO: Could not allocate vio_dev\n");
+                return NULL;
+        }
+        vdev->mp = mp;
+        memcpy(vdev->type, type, tlen);
+        if (compat)
+                memcpy(vdev->compat, compat, clen);
+        else
+                memset(vdev->compat, 0, sizeof(vdev->compat));
+        vdev->compat_len = clen;
+        vdev->channel_id = ~0UL;
+        vdev->tx_irq = ~0;
+        vdev->rx_irq = ~0;
+        vio_fill_channel_info(hp, mp, vdev);
+        id = mdesc_get_property(hp, mp, "id", NULL);
+        if (!id)
+                snprintf(vdev->dev.bus_id, BUS_ID_SIZE, "%s",
+                         bus_id_name);
+        else
+                snprintf(vdev->dev.bus_id, BUS_ID_SIZE, "%s-%lu",
+                         bus_id_name, *id);
+        vdev->dev.parent = parent;
+        vdev->dev.bus = &vio_bus_type;
+        vdev->dev.release = vio_dev_release;
+        if (parent == NULL) {
+                dp = cdev_node;
+        } else if (to_vio_dev(parent) == root_vdev) {
+                dp = of_get_next_child(cdev_node, NULL);
+                while (dp) {
+                        if (!strcmp(dp->type, type))
+                                break;
+                        dp = of_get_next_child(cdev_node, dp);
+                }
+        } else {
+                dp = to_vio_dev(parent)->dp;
+        }
+        vdev->dp = dp;
+        printk(KERN_ERR "VIO: Adding device %s\n", vdev->dev.bus_id);
+        err = device_register(&vdev->dev);
+        if (err) {
+                printk(KERN_ERR "VIO: Could not register device %s, err=%d\n",
+                       vdev->dev.bus_id, err);
+                kfree(vdev);
+                return NULL;
+        }
+        if (vdev->dp)
+                err = sysfs_create_file(&vdev->dev.kobj,
+                                        &dev_attr_obppath.attr);
+        return vdev;
+}
+static void vio_add(struct mdesc_handle *hp, u64 node)
+{
+        (void) vio_create_one(hp, node, &root_vdev->dev);
+}
+static int vio_md_node_match(struct device *dev, void *arg)
+{
+        struct vio_dev *vdev = to_vio_dev(dev);
+        if (vdev->mp == (u64) arg)
+                return 1;
+        return 0;
+}
+static void vio_remove(struct mdesc_handle *hp, u64 node)
+{
+        struct device *dev;
+        dev = device_find_child(&root_vdev->dev, (void *) node,
+                                vio_md_node_match);
+        if (dev) {
+                printk(KERN_INFO "VIO: Removing device %s\n", dev->bus_id);
+                device_unregister(dev);
+        }
+}
+static struct mdesc_notifier_client vio_device_notifier = {
+        .add            = vio_add,
+        .remove         = vio_remove,
+        .node_name      = "virtual-device-port",
+};
+static struct mdesc_notifier_client vio_ds_notifier = {
+        .add            = vio_add,
+        .remove         = vio_remove,
+        .node_name      = "domain-services-port",
+};
+const char *channel_devices_node = "channel-devices";
+const char *channel_devices_compat = "SUNW,sun4v-channel-devices";
+const char *cfg_handle_prop = "cfg-handle";
+static int __init vio_init(void)
+{
+        struct mdesc_handle *hp;
+        const char *compat;
+        const u64 *cfg_handle;
+        int err, len;
+        u64 root;
+        err = bus_register(&vio_bus_type);
+        if (err) {
+                printk(KERN_ERR "VIO: Could not register bus type err=%d\n",
+                       err);
+                return err;
+        }
+        hp = mdesc_grab();
+        if (!hp)
+                return 0;
+        root = mdesc_node_by_name(hp, MDESC_NODE_NULL, channel_devices_node);
+        if (root == MDESC_NODE_NULL) {
+                printk(KERN_INFO "VIO: No channel-devices MDESC node.\n");
+                mdesc_release(hp);
+                return 0;
+        }
+        cdev_node = of_find_node_by_name(NULL, "channel-devices");
+        err = -ENODEV;
+        if (!cdev_node) {
+                printk(KERN_INFO "VIO: No channel-devices OBP node.\n");
+                goto out_release;
+        }
+        compat = mdesc_get_property(hp, root, "compatible", &len);
+        if (!compat) {
+                printk(KERN_ERR "VIO: Channel devices lacks compatible "
+                       "property\n");
+                goto out_release;
+        }
+        if (!find_in_proplist(compat, channel_devices_compat, len)) {
+                printk(KERN_ERR "VIO: Channel devices node lacks (%s) "
+                       "compat entry.\n", channel_devices_compat);
+                goto out_release;
+        }
+        cfg_handle = mdesc_get_property(hp, root, cfg_handle_prop, NULL);
+        if (!cfg_handle) {
+                printk(KERN_ERR "VIO: Channel devices lacks %s property\n",
+                       cfg_handle_prop);
+                goto out_release;
+        }
+        cdev_cfg_handle = *cfg_handle;
+        root_vdev = vio_create_one(hp, root, NULL);
+        err = -ENODEV;
+        if (!root_vdev) {
+                printk(KERN_ERR "VIO: Coult not create root device.\n");
+                goto out_release;
+        }
+        mdesc_register_notifier(&vio_device_notifier);
+        mdesc_register_notifier(&vio_ds_notifier);
+        mdesc_release(hp);
+        return err;
+out_release:
+        mdesc_release(hp);
+        return err;
+}
+postcore_initcall(vio_init);
diff --git a/arch/sparc64/kernel/viohs.c b/arch/sparc64/kernel/viohs.c
new file mode 100644
index 0000000000..09126fc338
--- /dev/null
+++ b/arch/sparc64/kernel/viohs.c
@@ -0,0 +1,822 @@
+/* viohs.c: LDOM Virtual I/O handshake helper layer.
+ *
+ * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/string.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <asm/ldc.h>
+#include <asm/vio.h>
+int vio_ldc_send(struct vio_driver_state *vio, void *data, int len)
+{
+        int err, limit = 1000;
+        err = -EINVAL;
+        while (limit-- > 0) {
+                err = ldc_write(vio->lp, data, len);
+                if (!err || (err != -EAGAIN))
+                        break;
+                udelay(1);
+        }
+        return err;
+}
+EXPORT_SYMBOL(vio_ldc_send);
+static int send_ctrl(struct vio_driver_state *vio,
+                     struct vio_msg_tag *tag, int len)
+{
+        tag->sid = vio_send_sid(vio);
+        return vio_ldc_send(vio, tag, len);
+}
+static void init_tag(struct vio_msg_tag *tag, u8 type, u8 stype, u16 stype_env)
+{
+        tag->type = type;
+        tag->stype = stype;
+        tag->stype_env = stype_env;
+}
+static int send_version(struct vio_driver_state *vio, u16 major, u16 minor)
+{
+        struct vio_ver_info pkt;
+        vio->_local_sid = (u32) sched_clock();
+        memset(&pkt, 0, sizeof(pkt));
+        init_tag(&pkt.tag, VIO_TYPE_CTRL, VIO_SUBTYPE_INFO, VIO_VER_INFO);
+        pkt.major = major;
+        pkt.minor = minor;
+        pkt.dev_class = vio->dev_class;
+        viodbg(HS, "SEND VERSION INFO maj[%u] min[%u] devclass[%u]\n",
+               major, minor, vio->dev_class);
+        return send_ctrl(vio, &pkt.tag, sizeof(pkt));
+}
+static int start_handshake(struct vio_driver_state *vio)
+{
+        int err;
+        viodbg(HS, "START HANDSHAKE\n");
+        vio->hs_state = VIO_HS_INVALID;
+        err = send_version(vio,
+                           vio->ver_table[0].major,
+                           vio->ver_table[0].minor);
+        if (err < 0)
+                return err;
+        return 0;
+}
+static void flush_rx_dring(struct vio_driver_state *vio)
+{
+        struct vio_dring_state *dr;
+        u64 ident;
+        BUG_ON(!(vio->dr_state & VIO_DR_STATE_RXREG));
+        dr = &vio->drings[VIO_DRIVER_RX_RING];
+        ident = dr->ident;
+        BUG_ON(!vio->desc_buf);
+        kfree(vio->desc_buf);
+        vio->desc_buf = NULL;
+        memset(dr, 0, sizeof(*dr));
+        dr->ident = ident;
+}
+void vio_link_state_change(struct vio_driver_state *vio, int event)
+{
+        if (event == LDC_EVENT_UP) {
+                vio->hs_state = VIO_HS_INVALID;
+                switch (vio->dev_class) {
+                case VDEV_NETWORK:
+                case VDEV_NETWORK_SWITCH:
+                        vio->dr_state = (VIO_DR_STATE_TXREQ |
+                                         VIO_DR_STATE_RXREQ);
+                        break;
+                case VDEV_DISK:
+                        vio->dr_state = VIO_DR_STATE_TXREQ;
+                        break;
+                case VDEV_DISK_SERVER:
+                        vio->dr_state = VIO_DR_STATE_RXREQ;
+                        break;
+                }
+                start_handshake(vio);
+        } else if (event == LDC_EVENT_RESET) {
+                vio->hs_state = VIO_HS_INVALID;
+                if (vio->dr_state & VIO_DR_STATE_RXREG)
+                        flush_rx_dring(vio);
+                vio->dr_state = 0x00;
+                memset(&vio->ver, 0, sizeof(vio->ver));
+                ldc_disconnect(vio->lp);
+        }
+}
+EXPORT_SYMBOL(vio_link_state_change);
+static int handshake_failure(struct vio_driver_state *vio)
+{
+        struct vio_dring_state *dr;
+        /* XXX Put policy here...  Perhaps start a timer to fire
+         * XXX in 100 ms, which will bring the link up and retry
+         * XXX the handshake.
+         */
+        viodbg(HS, "HANDSHAKE FAILURE\n");
+        vio->dr_state &= ~(VIO_DR_STATE_TXREG |
+                           VIO_DR_STATE_RXREG);
+        dr = &vio->drings[VIO_DRIVER_RX_RING];
+        memset(dr, 0, sizeof(*dr));
+        kfree(vio->desc_buf);
+        vio->desc_buf = NULL;
+        vio->desc_buf_len = 0;
+        vio->hs_state = VIO_HS_INVALID;
+        return -ECONNRESET;
+}
+static int process_unknown(struct vio_driver_state *vio, void *arg)
+{
+        struct vio_msg_tag *pkt = arg;
+        viodbg(HS, "UNKNOWN CONTROL [%02x:%02x:%04x:%08x]\n",
+               pkt->type, pkt->stype, pkt->stype_env, pkt->sid);
+        printk(KERN_ERR "vio: ID[%lu] Resetting connection.\n",
+               vio->vdev->channel_id);
+        ldc_disconnect(vio->lp);
+        return -ECONNRESET;
+}
+static int send_dreg(struct vio_driver_state *vio)
+{
+        struct vio_dring_state *dr = &vio->drings[VIO_DRIVER_TX_RING];
+        union {
+                struct vio_dring_register pkt;
+                char all[sizeof(struct vio_dring_register) +
+                         (sizeof(struct ldc_trans_cookie) *
+                          dr->ncookies)];
+        } u;
+        int i;
+        memset(&u, 0, sizeof(u));
+        init_tag(&u.pkt.tag, VIO_TYPE_CTRL, VIO_SUBTYPE_INFO, VIO_DRING_REG);
+        u.pkt.dring_ident = 0;
+        u.pkt.num_descr = dr->num_entries;
+        u.pkt.descr_size = dr->entry_size;
+        u.pkt.options = VIO_TX_DRING;
+        u.pkt.num_cookies = dr->ncookies;
+        viodbg(HS, "SEND DRING_REG INFO ndesc[%u] dsz[%u] opt[0x%x] "
+               "ncookies[%u]\n",
+               u.pkt.num_descr, u.pkt.descr_size, u.pkt.options,
+               u.pkt.num_cookies);
+        for (i = 0; i < dr->ncookies; i++) {
+                u.pkt.cookies[i] = dr->cookies[i];
+                viodbg(HS, "DRING COOKIE(%d) [%016llx:%016llx]\n",
+                       i,
+                       (unsigned long long) u.pkt.cookies[i].cookie_addr,
+                       (unsigned long long) u.pkt.cookies[i].cookie_size);
+        }
+        return send_ctrl(vio, &u.pkt.tag, sizeof(u));
+}
+static int send_rdx(struct vio_driver_state *vio)
+{
+        struct vio_rdx pkt;
+        memset(&pkt, 0, sizeof(pkt));
+        init_tag(&pkt.tag, VIO_TYPE_CTRL, VIO_SUBTYPE_INFO, VIO_RDX);
+        viodbg(HS, "SEND RDX INFO\n");
+        return send_ctrl(vio, &pkt.tag, sizeof(pkt));
+}
+static int send_attr(struct vio_driver_state *vio)
+{
+        return vio->ops->send_attr(vio);
+}
+static struct vio_version *find_by_major(struct vio_driver_state *vio,
+                                         u16 major)
+{
+        struct vio_version *ret = NULL;
+        int i;
+        for (i = 0; i < vio->ver_table_entries; i++) {
+                struct vio_version *v = &vio->ver_table[i];
+                if (v->major <= major) {
+                        ret = v;
+                        break;
+                }
+        }
+        return ret;
+}
+static int process_ver_info(struct vio_driver_state *vio,
+                            struct vio_ver_info *pkt)
+{
+        struct vio_version *vap;
+        int err;
+        viodbg(HS, "GOT VERSION INFO maj[%u] min[%u] devclass[%u]\n",
+               pkt->major, pkt->minor, pkt->dev_class);
+        if (vio->hs_state != VIO_HS_INVALID) {
+                /* XXX Perhaps invoke start_handshake? XXX */
+                memset(&vio->ver, 0, sizeof(vio->ver));
+                vio->hs_state = VIO_HS_INVALID;
+        }
+        vap = find_by_major(vio, pkt->major);
+        vio->_peer_sid = pkt->tag.sid;
+        if (!vap) {
+                pkt->tag.stype = VIO_SUBTYPE_NACK;
+                pkt->major = 0;
+                pkt->minor = 0;
+                viodbg(HS, "SEND VERSION NACK maj[0] min[0]\n");
+                err = send_ctrl(vio, &pkt->tag, sizeof(*pkt));
+        } else if (vap->major != pkt->major) {
+                pkt->tag.stype = VIO_SUBTYPE_NACK;
+                pkt->major = vap->major;
+                pkt->minor = vap->minor;
+                viodbg(HS, "SEND VERSION NACK maj[%u] min[%u]\n",
+                       pkt->major, pkt->minor);
+                err = send_ctrl(vio, &pkt->tag, sizeof(*pkt));
+        } else {
+                struct vio_version ver = {
+                        .major = pkt->major,
+                        .minor = pkt->minor,
+                };
+                if (ver.minor > vap->minor)
+                        ver.minor = vap->minor;
+                pkt->minor = ver.minor;
+                pkt->tag.stype = VIO_SUBTYPE_ACK;
+                viodbg(HS, "SEND VERSION ACK maj[%u] min[%u]\n",
+                       pkt->major, pkt->minor);
+                err = send_ctrl(vio, &pkt->tag, sizeof(*pkt));
+                if (err > 0) {
+                        vio->ver = ver;
+                        vio->hs_state = VIO_HS_GOTVERS;
+                }
+        }
+        if (err < 0)
+                return handshake_failure(vio);
+        return 0;
+}
+static int process_ver_ack(struct vio_driver_state *vio,
+                           struct vio_ver_info *pkt)
+{
+        viodbg(HS, "GOT VERSION ACK maj[%u] min[%u] devclass[%u]\n",
+               pkt->major, pkt->minor, pkt->dev_class);
+        if (vio->hs_state & VIO_HS_GOTVERS) {
+                if (vio->ver.major != pkt->major ||
+                    vio->ver.minor != pkt->minor) {
+                        pkt->tag.stype = VIO_SUBTYPE_NACK;
+                        (void) send_ctrl(vio, &pkt->tag, sizeof(*pkt));
+                        return handshake_failure(vio);
+                }
+        } else {
+                vio->ver.major = pkt->major;
+                vio->ver.minor = pkt->minor;
+                vio->hs_state = VIO_HS_GOTVERS;
+        }
+        switch (vio->dev_class) {
+        case VDEV_NETWORK:
+        case VDEV_DISK:
+                if (send_attr(vio) < 0)
+                        return handshake_failure(vio);
+                break;
+        default:
+                break;
+        }
+        return 0;
+}
+static int process_ver_nack(struct vio_driver_state *vio,
+                            struct vio_ver_info *pkt)
+{
+        struct vio_version *nver;
+        viodbg(HS, "GOT VERSION NACK maj[%u] min[%u] devclass[%u]\n",
+               pkt->major, pkt->minor, pkt->dev_class);
+        if ((pkt->major == 0 && pkt->minor == 0) ||
+            !(nver = find_by_major(vio, pkt->major)))
+                return handshake_failure(vio);
+        if (send_version(vio, nver->major, nver->minor) < 0)
+                return handshake_failure(vio);
+        return 0;
+}
+static int process_ver(struct vio_driver_state *vio, struct vio_ver_info *pkt)
+{
+        switch (pkt->tag.stype) {
+        case VIO_SUBTYPE_INFO:
+                return process_ver_info(vio, pkt);
+        case VIO_SUBTYPE_ACK:
+                return process_ver_ack(vio, pkt);
+        case VIO_SUBTYPE_NACK:
+                return process_ver_nack(vio, pkt);
+        default:
+                return handshake_failure(vio);
+        };
+}
+static int process_attr(struct vio_driver_state *vio, void *pkt)
+{
+        int err;
+        if (!(vio->hs_state & VIO_HS_GOTVERS))
+                return handshake_failure(vio);
+        err = vio->ops->handle_attr(vio, pkt);
+        if (err < 0) {
+                return handshake_failure(vio);
+        } else {
+                vio->hs_state |= VIO_HS_GOT_ATTR;
+                if ((vio->dr_state & VIO_DR_STATE_TXREQ) &&
+                    !(vio->hs_state & VIO_HS_SENT_DREG)) {
+                        if (send_dreg(vio) < 0)
+                                return handshake_failure(vio);
+                        vio->hs_state |= VIO_HS_SENT_DREG;
+                }
+        }
+        return 0;
+}
+static int all_drings_registered(struct vio_driver_state *vio)
+{
+        int need_rx, need_tx;
+        need_rx = (vio->dr_state & VIO_DR_STATE_RXREQ);
+        need_tx = (vio->dr_state & VIO_DR_STATE_TXREQ);
+        if (need_rx &&
+            !(vio->dr_state & VIO_DR_STATE_RXREG))
+                return 0;
+        if (need_tx &&
+            !(vio->dr_state & VIO_DR_STATE_TXREG))
+                return 0;
+        return 1;
+}
+static int process_dreg_info(struct vio_driver_state *vio,
+                             struct vio_dring_register *pkt)
+{
+        struct vio_dring_state *dr;
+        int i, len;
+        viodbg(HS, "GOT DRING_REG INFO ident[%llx] "
+               "ndesc[%u] dsz[%u] opt[0x%x] ncookies[%u]\n",
+               (unsigned long long) pkt->dring_ident,
+               pkt->num_descr, pkt->descr_size, pkt->options,
+               pkt->num_cookies);
+        if (!(vio->dr_state & VIO_DR_STATE_RXREQ))
+                goto send_nack;
+        if (vio->dr_state & VIO_DR_STATE_RXREG)
+                goto send_nack;
+        BUG_ON(vio->desc_buf);
+        vio->desc_buf = kzalloc(pkt->descr_size, GFP_ATOMIC);
+        if (!vio->desc_buf)
+                goto send_nack;
+        vio->desc_buf_len = pkt->descr_size;
+        dr = &vio->drings[VIO_DRIVER_RX_RING];
+        dr->num_entries = pkt->num_descr;
+        dr->entry_size = pkt->descr_size;
+        dr->ncookies = pkt->num_cookies;
+        for (i = 0; i < dr->ncookies; i++) {
+                dr->cookies[i] = pkt->cookies[i];
+                viodbg(HS, "DRING COOKIE(%d) [%016llx:%016llx]\n",
+                       i,
+                       (unsigned long long)
+                       pkt->cookies[i].cookie_addr,
+                       (unsigned long long)
+                       pkt->cookies[i].cookie_size);
+        }
+        pkt->tag.stype = VIO_SUBTYPE_ACK;
+        pkt->dring_ident = ++dr->ident;
+        viodbg(HS, "SEND DRING_REG ACK ident[%llx]\n",
+               (unsigned long long) pkt->dring_ident);
+        len = (sizeof(*pkt) +
+               (dr->ncookies * sizeof(struct ldc_trans_cookie)));
+        if (send_ctrl(vio, &pkt->tag, len) < 0)
+                goto send_nack;
+        vio->dr_state |= VIO_DR_STATE_RXREG;
+        return 0;
+send_nack:
+        pkt->tag.stype = VIO_SUBTYPE_NACK;
+        viodbg(HS, "SEND DRING_REG NACK\n");
+        (void) send_ctrl(vio, &pkt->tag, sizeof(*pkt));
+        return handshake_failure(vio);
+}
+static int process_dreg_ack(struct vio_driver_state *vio,
+                            struct vio_dring_register *pkt)
+{
+        struct vio_dring_state *dr;
+        viodbg(HS, "GOT DRING_REG ACK ident[%llx] "
+               "ndesc[%u] dsz[%u] opt[0x%x] ncookies[%u]\n",
+               (unsigned long long) pkt->dring_ident,
+               pkt->num_descr, pkt->descr_size, pkt->options,
+               pkt->num_cookies);
+        dr = &vio->drings[VIO_DRIVER_TX_RING];
+        if (!(vio->dr_state & VIO_DR_STATE_TXREQ))
+                return handshake_failure(vio);
+        dr->ident = pkt->dring_ident;
+        vio->dr_state |= VIO_DR_STATE_TXREG;
+        if (all_drings_registered(vio)) {
+                if (send_rdx(vio) < 0)
+                        return handshake_failure(vio);
+                vio->hs_state = VIO_HS_SENT_RDX;
+        }
+        return 0;
+}
+static int process_dreg_nack(struct vio_driver_state *vio,
+                             struct vio_dring_register *pkt)
+{
+        viodbg(HS, "GOT DRING_REG NACK ident[%llx] "
+               "ndesc[%u] dsz[%u] opt[0x%x] ncookies[%u]\n",
+               (unsigned long long) pkt->dring_ident,
+               pkt->num_descr, pkt->descr_size, pkt->options,
+               pkt->num_cookies);
+        return handshake_failure(vio);
+}
+static int process_dreg(struct vio_driver_state *vio,
+                        struct vio_dring_register *pkt)
+{
+        if (!(vio->hs_state & VIO_HS_GOTVERS))
+                return handshake_failure(vio);
+        switch (pkt->tag.stype) {
+        case VIO_SUBTYPE_INFO:
+                return process_dreg_info(vio, pkt);
+        case VIO_SUBTYPE_ACK:
+                return process_dreg_ack(vio, pkt);
+        case VIO_SUBTYPE_NACK:
+                return process_dreg_nack(vio, pkt);
+        default:
+                return handshake_failure(vio);
+        }
+}
+static int process_dunreg(struct vio_driver_state *vio,
+                          struct vio_dring_unregister *pkt)
+{
+        struct vio_dring_state *dr = &vio->drings[VIO_DRIVER_RX_RING];
+        viodbg(HS, "GOT DRING_UNREG\n");
+        if (pkt->dring_ident != dr->ident)
+                return 0;
+        vio->dr_state &= ~VIO_DR_STATE_RXREG;
+        memset(dr, 0, sizeof(*dr));
+        kfree(vio->desc_buf);
+        vio->desc_buf = NULL;
+        vio->desc_buf_len = 0;
+        return 0;
+}
+static int process_rdx_info(struct vio_driver_state *vio, struct vio_rdx *pkt)
+{
+        viodbg(HS, "GOT RDX INFO\n");
+        pkt->tag.stype = VIO_SUBTYPE_ACK;
+        viodbg(HS, "SEND RDX ACK\n");
+        if (send_ctrl(vio, &pkt->tag, sizeof(*pkt)) < 0)
+                return handshake_failure(vio);
+        vio->hs_state |= VIO_HS_SENT_RDX_ACK;
+        return 0;
+}
+static int process_rdx_ack(struct vio_driver_state *vio, struct vio_rdx *pkt)
+{
+        viodbg(HS, "GOT RDX ACK\n");
+        if (!(vio->hs_state & VIO_HS_SENT_RDX))
+                return handshake_failure(vio);
+        vio->hs_state |= VIO_HS_GOT_RDX_ACK;
+        return 0;
+}
+static int process_rdx_nack(struct vio_driver_state *vio, struct vio_rdx *pkt)
+{
+        viodbg(HS, "GOT RDX NACK\n");
+        return handshake_failure(vio);
+}
+static int process_rdx(struct vio_driver_state *vio, struct vio_rdx *pkt)
+{
+        if (!all_drings_registered(vio))
+                handshake_failure(vio);
+        switch (pkt->tag.stype) {
+        case VIO_SUBTYPE_INFO:
+                return process_rdx_info(vio, pkt);
+        case VIO_SUBTYPE_ACK:
+                return process_rdx_ack(vio, pkt);
+        case VIO_SUBTYPE_NACK:
+                return process_rdx_nack(vio, pkt);
+        default:
+                return handshake_failure(vio);
+        }
+}
+int vio_control_pkt_engine(struct vio_driver_state *vio, void *pkt)
+{
+        struct vio_msg_tag *tag = pkt;
+        u8 prev_state = vio->hs_state;
+        int err;
+        switch (tag->stype_env) {
+        case VIO_VER_INFO:
+                err = process_ver(vio, pkt);
+                break;
+        case VIO_ATTR_INFO:
+                err = process_attr(vio, pkt);
+                break;
+        case VIO_DRING_REG:
+                err = process_dreg(vio, pkt);
+                break;
+        case VIO_DRING_UNREG:
+                err = process_dunreg(vio, pkt);
+                break;
+        case VIO_RDX:
+                err = process_rdx(vio, pkt);
+                break;
+        default:
+                err = process_unknown(vio, pkt);
+                break;
+        }
+        if (!err &&
+            vio->hs_state != prev_state &&
+            (vio->hs_state & VIO_HS_COMPLETE))
+                vio->ops->handshake_complete(vio);
+        return err;
+}
+EXPORT_SYMBOL(vio_control_pkt_engine);
+void vio_conn_reset(struct vio_driver_state *vio)
+{
+}
+EXPORT_SYMBOL(vio_conn_reset);
+/* The issue is that the Solaris virtual disk server just mirrors the
+ * SID values it gets from the client peer.  So we work around that
+ * here in vio_{validate,send}_sid() so that the drivers don't need
+ * to be aware of this crap.
+ */
+int vio_validate_sid(struct vio_driver_state *vio, struct vio_msg_tag *tp)
+{
+        u32 sid;
+        /* Always let VERSION+INFO packets through unchecked, they
+         * define the new SID.
+         */
+        if (tp->type == VIO_TYPE_CTRL &&
+            tp->stype == VIO_SUBTYPE_INFO &&
+            tp->stype_env == VIO_VER_INFO)
+                return 0;
+        /* Ok, now figure out which SID to use.  */
+        switch (vio->dev_class) {
+        case VDEV_NETWORK:
+        case VDEV_NETWORK_SWITCH:
+        case VDEV_DISK_SERVER:
+        default:
+                sid = vio->_peer_sid;
+                break;
+        case VDEV_DISK:
+                sid = vio->_local_sid;
+                break;
+        }
+        if (sid == tp->sid)
+                return 0;
+        viodbg(DATA, "BAD SID tag->sid[%08x] peer_sid[%08x] local_sid[%08x]\n",
+               tp->sid, vio->_peer_sid, vio->_local_sid);
+        return -EINVAL;
+}
+EXPORT_SYMBOL(vio_validate_sid);
+u32 vio_send_sid(struct vio_driver_state *vio)
+{
+        switch (vio->dev_class) {
+        case VDEV_NETWORK:
+        case VDEV_NETWORK_SWITCH:
+        case VDEV_DISK:
+        default:
+                return vio->_local_sid;
+        case VDEV_DISK_SERVER:
+                return vio->_peer_sid;
+        }
+}
+EXPORT_SYMBOL(vio_send_sid);
+extern int vio_ldc_alloc(struct vio_driver_state *vio,
+                         struct ldc_channel_config *base_cfg,
+                         void *event_arg)
+{
+        struct ldc_channel_config cfg = *base_cfg;
+        struct ldc_channel *lp;
+        cfg.tx_irq = vio->vdev->tx_irq;
+        cfg.rx_irq = vio->vdev->rx_irq;
+        lp = ldc_alloc(vio->vdev->channel_id, &cfg, event_arg);
+        if (IS_ERR(lp))
+                return PTR_ERR(lp);
+        vio->lp = lp;
+        return 0;
+}
+EXPORT_SYMBOL(vio_ldc_alloc);
+void vio_ldc_free(struct vio_driver_state *vio)
+{
+        ldc_free(vio->lp);
+        vio->lp = NULL;
+        kfree(vio->desc_buf);
+        vio->desc_buf = NULL;
+        vio->desc_buf_len = 0;
+}
+EXPORT_SYMBOL(vio_ldc_free);
+void vio_port_up(struct vio_driver_state *vio)
+{
+        unsigned long flags;
+        int err, state;
+        spin_lock_irqsave(&vio->lock, flags);
+        state = ldc_state(vio->lp);
+        err = 0;
+        if (state == LDC_STATE_INIT) {
+                err = ldc_bind(vio->lp, vio->name);
+                if (err)
+                        printk(KERN_WARNING "%s: Port %lu bind failed, "
+                               "err=%d\n",
+                               vio->name, vio->vdev->channel_id, err);
+        }
+        if (!err) {
+                err = ldc_connect(vio->lp);
+                if (err)
+                        printk(KERN_WARNING "%s: Port %lu connect failed, "
+                               "err=%d\n",
+                               vio->name, vio->vdev->channel_id, err);
+        }
+        if (err) {
+                unsigned long expires = jiffies + HZ;
+                expires = round_jiffies(expires);
+                mod_timer(&vio->timer, expires);
+        }
+        spin_unlock_irqrestore(&vio->lock, flags);
+}
+EXPORT_SYMBOL(vio_port_up);
+static void vio_port_timer(unsigned long _arg)
+{
+        struct vio_driver_state *vio = (struct vio_driver_state *) _arg;
+        vio_port_up(vio);
+}
+int vio_driver_init(struct vio_driver_state *vio, struct vio_dev *vdev,
+                    u8 dev_class, struct vio_version *ver_table,
+                    int ver_table_size, struct vio_driver_ops *ops,
+                    char *name)
+{
+        switch (dev_class) {
+        case VDEV_NETWORK:
+        case VDEV_NETWORK_SWITCH:
+        case VDEV_DISK:
+        case VDEV_DISK_SERVER:
+                break;
+        default:
+                return -EINVAL;
+        }
+        if (!ops->send_attr ||
+            !ops->handle_attr ||
+            !ops->handshake_complete)
+                return -EINVAL;
+        if (!ver_table || ver_table_size < 0)
+                return -EINVAL;
+        if (!name)
+                return -EINVAL;
+        spin_lock_init(&vio->lock);
+        vio->name = name;
+        vio->dev_class = dev_class;
+        vio->vdev = vdev;
+        vio->ver_table = ver_table;
+        vio->ver_table_entries = ver_table_size;
+        vio->ops = ops;
+        setup_timer(&vio->timer, vio_port_timer, (unsigned long) vio);
+        return 0;
+}
+EXPORT_SYMBOL(vio_driver_init);
diff --git a/arch/sparc64/lib/Makefile b/arch/sparc64/lib/Makefile
index 4a725d8985..c4a6d6e7d0 100644
--- a/arch/sparc64/lib/Makefile
+++ b/arch/sparc64/lib/Makefile
@@ -14,6 +14,6 @@ lib-y := PeeCeeI.o copy_page.o clear_page.o strlen.o strncmp.o \
         NGmemcpy.o NGcopy_from_user.o NGcopy_to_user.o NGpatch.o \
         NGpage.o NGbzero.o \
         copy_in_user.o user_fixup.o memmove.o \
-         mcount.o ipcsum.o rwsem.o xor.o delay.o
+         mcount.o ipcsum.o rwsem.o xor.o
 obj-y += iomap.o
diff --git a/arch/sparc64/lib/delay.c b/arch/sparc64/lib/delay.c
deleted file mode 100644
index fb27e54a03..0000000000
--- a/arch/sparc64/lib/delay.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* delay.c: Delay loops for sparc64
- *
- * Copyright (C) 2004, 2006 David S. Miller <davem@davemloft.net>
- *
- * Based heavily upon x86 variant which is:
- *      Copyright (C) 1993 Linus Torvalds
- *      Copyright (C) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
- */
-#include <linux/delay.h>
-#include <asm/timer.h>
-void __delay(unsigned long loops)
-{
-        unsigned long bclock, now;
-        
-        bclock = tick_ops->get_tick();
-        do {
-                now = tick_ops->get_tick();
-        } while ((now-bclock) < loops);
-}
-/* We used to multiply by HZ after shifting down by 32 bits
- * but that runs into problems for higher values of HZ and
- * slow cpus.
- */
-void __const_udelay(unsigned long n)
-{
-        n *= 4;
-        n *= (cpu_data(raw_smp_processor_id()).udelay_val * (HZ/4));
-        n >>= 32;
-        __delay(n + 1);
-}
-void __udelay(unsigned long n)
-{
-        __const_udelay(n * 0x10c7UL);
-}
-void __ndelay(unsigned long n)
-{
-        __const_udelay(n * 0x5UL);
-}
diff --git a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c
index f3e0c14e9e..33c5b7da31 100644
--- a/arch/sparc64/prom/misc.c
+++ b/arch/sparc64/prom/misc.c
@@ -14,6 +14,7 @@
 #include <asm/openprom.h>
 #include <asm/oplib.h>
 #include <asm/system.h>
+#include <asm/ldc.h>
 int prom_service_exists(const char *service_name)
 {
@@ -37,6 +38,10 @@ void prom_sun4v_guest_soft_state(void)
 /* Reset and reboot the machine with the command 'bcommand'. */
 void prom_reboot(const char *bcommand)
 {
+#ifdef CONFIG_SUN_LDOMS
+        if (ldom_domaining_enabled)
+                ldom_reboot(bcommand);
+#endif
        p1275_cmd("boot", P1275_ARG(0, P1275_ARG_IN_STRING) |
                  P1275_INOUT(1, 0), bcommand);
 }
@@ -91,6 +96,10 @@ void prom_cmdline(void)
 */
 void prom_halt(void)
 {
+#ifdef CONFIG_SUN_LDOMS
+        if (ldom_domaining_enabled)
+                ldom_power_off();
+#endif
 again:
        p1275_cmd("exit", P1275_INOUT(0, 0));
        goto again; /* PROM is out to get me -DaveM */
@@ -98,6 +107,10 @@ again:
 void prom_halt_power_off(void)
 {
+#ifdef CONFIG_SUN_LDOMS
+        if (ldom_domaining_enabled)
+                ldom_power_off();
+#endif
        p1275_cmd("SUNW,power-off", P1275_INOUT(0, 0));
        /* if nothing else helps, we just halt */
diff --git a/arch/sparc64/prom/p1275.c b/arch/sparc64/prom/p1275.c
index 2b32c48986..7fcccc0e19 100644
--- a/arch/sparc64/prom/p1275.c
+++ b/arch/sparc64/prom/p1275.c
@@ -16,6 +16,7 @@
 #include <asm/system.h>
 #include <asm/spitfire.h>
 #include <asm/pstate.h>
+#include <asm/ldc.h>
 struct {
        long prom_callback;                     /* 0x00 */
diff --git a/arch/sparc64/prom/tree.c b/arch/sparc64/prom/tree.c
index 500f05e2cf..17b7ecfe7c 100644
--- a/arch/sparc64/prom/tree.c
+++ b/arch/sparc64/prom/tree.c
@@ -13,6 +13,7 @@
 #include <asm/openprom.h>
 #include <asm/oplib.h>
+#include <asm/ldc.h>
 /* Return the child of node 'node' or zero if no this node has no
 * direct descendent.
@@ -261,9 +262,17 @@ int prom_node_has_property(int node, const char *prop)
 int
 prom_setprop(int node, const char *pname, char *value, int size)
 {
-        if(size == 0) return 0;
+        if (size == 0)
-        if((pname == 0) || (value == 0)) return 0;
+                return 0;
+        if ((pname == 0) || (value == 0))
+                return 0;
        
+#ifdef CONFIG_SUN_LDOMS
+        if (ldom_domaining_enabled) {
+                ldom_set_var(pname, value);
+                return 0;
+        }
+#endif
        return p1275_cmd ("setprop", P1275_ARG(1,P1275_ARG_IN_STRING)|
                                          P1275_ARG(2,P1275_ARG_IN_BUF)|
                                          P1275_INOUT(4, 1), 
diff --git a/arch/um/Kconfig.debug b/arch/um/Kconfig.debug
index 09c1aca633..c86f5eb29f 100644
--- a/arch/um/Kconfig.debug
+++ b/arch/um/Kconfig.debug
@@ -47,4 +47,13 @@ config GCOV
        If you're involved in UML kernel development and want to use gcov,
        say Y.  If you're unsure, say N.
+config DEBUG_STACK_USAGE
+        bool "Stack utilization instrumentation"
+        default N
+        help
+          Track the maximum kernel stack usage - this will look at each
+          kernel stack at process exit and log it if it's the deepest
+          stack seen so far.
+          This option will slow down process creation and destruction somewhat.
 endmenu
diff --git a/arch/um/config.release b/arch/um/config.release
deleted file mode 100644
index fc68bcb929..0000000000
--- a/arch/um/config.release
+++ /dev/null
@@ -1,333 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_USERMODE=y
-# CONFIG_ISA is not set
-# CONFIG_SBUS is not set
-# CONFIG_PCI is not set
-CONFIG_UID16=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-#
-# General Setup
-#
-CONFIG_STDIO_CONSOLE=y
-CONFIG_NET=y
-CONFIG_SYSVIPC=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_SYSCTL=y
-CONFIG_BINFMT_AOUT=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=256
-CONFIG_SSL=y
-CONFIG_HOSTFS=y
-CONFIG_MCONSOLE=y
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_HOST_2G_2G is not set
-# CONFIG_UML_SMP is not set
-# CONFIG_SMP is not set
-CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
-CONFIG_CON_CHAN="xterm"
-CONFIG_SSL_CHAN="pty"
-CONFIG_NEST_LEVEL=0
-CONFIG_KERNEL_HALF_GIGS=1
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_KMOD=y
-#
-# Devices
-#
-CONFIG_BLK_DEV_UBD=y
-# CONFIG_BLK_DEV_UBD_SYNC is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_NBD=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_MMAPPER is not set
-CONFIG_UML_SOUND=y
-CONFIG_SOUND=y
-CONFIG_HOSTAUDIO=y
-# CONFIG_UML_WATCHDOG is not set
-# CONFIG_TTY_LOG is not set
-CONFIG_FD_CHAN=y
-# CONFIG_NULL_CHAN is not set
-CONFIG_PORT_CHAN=y
-CONFIG_PTY_CHAN=y
-CONFIG_TTY_CHAN=y
-CONFIG_XTERM_CHAN=y
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-# CONFIG_NETLINK_DEV is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_FILTER is not set
-CONFIG_UNIX=y
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_INET_ECN is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_IPV6 is not set
-# CONFIG_KHTTPD is not set
-# CONFIG_ATM is not set
-# CONFIG_VLAN_8021Q is not set
-#
-#  
-#
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_DECNET is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_LLC is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-#
-# Network device support
-#
-CONFIG_UML_NET=y
-CONFIG_UML_NET_ETHERTAP=y
-CONFIG_UML_NET_TUNTAP=y
-CONFIG_UML_NET_SLIP=y
-CONFIG_UML_NET_DAEMON=y
-CONFIG_UML_NET_MCAST=y
-CONFIG_NETDEVICES=y
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-CONFIG_DUMMY=y
-CONFIG_BONDING=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=y
-# CONFIG_ETHERTAP is not set
-#
-# Ethernet (10 or 100Mbit)
-#
-# CONFIG_NET_ETHERNET is not set
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_MYRI_SBUS is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPP_FILTER is not set
-# CONFIG_PPP_ASYNC is not set
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPPOE=m
-CONFIG_SLIP=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-# CONFIG_SLIP_MODE_SLIP6 is not set
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-# CONFIG_NET_FC is not set
-# CONFIG_RCPCI is not set
-CONFIG_SHAPER=m
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-#
-# File systems
-#
-CONFIG_QUOTA=y
-CONFIG_AUTOFS_FS=m
-CONFIG_AUTOFS4_FS=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-CONFIG_ADFS_FS=m
-# CONFIG_ADFS_FS_RW is not set
-CONFIG_AFFS_FS=m
-CONFIG_HFS_FS=m
-CONFIG_BFS_FS=m
-CONFIG_EXT3_FS=y
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_UMSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-CONFIG_CRAMFS=m
-CONFIG_TMPFS=y
-CONFIG_RAMFS=m
-CONFIG_ISO9660_FS=y
-# CONFIG_JOLIET is not set
-# CONFIG_ZISOFS is not set
-CONFIG_MINIX_FS=m
-CONFIG_VXFS_FS=m
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-CONFIG_HPFS_FS=m
-CONFIG_PROC_FS=y
-CONFIG_DEVFS_FS=y
-CONFIG_DEVFS_MOUNT=y
-# CONFIG_DEVFS_DEBUG is not set
-CONFIG_DEVPTS_FS=y
-CONFIG_QNX4FS_FS=m
-# CONFIG_QNX4FS_RW is not set
-CONFIG_ROMFS_FS=m
-CONFIG_EXT2_FS=y
-CONFIG_SYSV_FS=m
-CONFIG_UDF_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-#
-# Network File Systems
-#
-# CONFIG_CODA_FS is not set
-# CONFIG_INTERMEZZO_FS is not set
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-# CONFIG_ROOT_NFS is not set
-CONFIG_NFSD=y
-CONFIG_NFSD_V3=y
-CONFIG_SUNRPC=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-# CONFIG_SMB_FS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-# CONFIG_NCPFS_NFS_NS is not set
-# CONFIG_NCPFS_OS2_NS is not set
-# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_NLS is not set
-# CONFIG_NCPFS_EXTRAS is not set
-# CONFIG_ZISOFS_FS is not set
-CONFIG_ZLIB_FS_INFLATE=m
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_SMB_NLS is not set
-CONFIG_NLS=y
-#
-# Native Language Support
-#
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ISO8859_1 is not set
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-# CONFIG_BLK_DEV_MD is not set
-# CONFIG_MD_LINEAR is not set
-# CONFIG_MD_RAID0 is not set
-# CONFIG_MD_RAID1 is not set
-# CONFIG_MD_RAID5 is not set
-# CONFIG_MD_MULTIPATH is not set
-# CONFIG_BLK_DEV_LVM is not set
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-#
-# Kernel hacking
-#
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_PT_PROXY is not set
-# CONFIG_GPROF is not set
-# CONFIG_GCOV is not set
diff --git a/arch/um/defconfig b/arch/um/defconfig
index a54d0efeca..a25cd25d55 100644
--- a/arch/um/defconfig
+++ b/arch/um/defconfig
@@ -189,7 +189,7 @@ CONFIG_XTERM_CHAN=y
 # CONFIG_NOCONFIG_CHAN is not set
 CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
 CONFIG_CON_CHAN="xterm"
-CONFIG_SSL_CHAN="pty"
+CONFIG_SSL_CHAN="pts"
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -527,3 +527,4 @@ CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_GPROF is not set
 # CONFIG_GCOV is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 3aa3516117..368d3e97df 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -203,22 +203,37 @@ void chan_enable_winch(struct list_head *chans, struct tty_struct *tty)
        }
 }
-void enable_chan(struct line *line)
+int enable_chan(struct line *line)
 {
        struct list_head *ele;
        struct chan *chan;
+        int err;
        list_for_each(ele, &line->chan_list){
                chan = list_entry(ele, struct chan, list);
-                if(open_one_chan(chan))
+                err = open_one_chan(chan);
+                if (err) {
+                        if (chan->primary)
+                                goto out_close;
                        continue;
+                }
                if(chan->enabled)
                        continue;
-                line_setup_irq(chan->fd, chan->input, chan->output, line,
+                err = line_setup_irq(chan->fd, chan->input, chan->output, line,
-                               chan);
+                                     chan);
+                if (err)
+                        goto out_close;
                chan->enabled = 1;
        }
+        return 0;
+ out_close:
+        close_chan(&line->chan_list, 0);
+        return err;
 }
 /* Items are added in IRQ context, when free_irq can't be called, and
diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
index 13f0bf852b..4d438f36ea 100644
--- a/arch/um/drivers/chan_user.c
+++ b/arch/um/drivers/chan_user.c
@@ -51,19 +51,21 @@ error:
 /*
 * UML SIGWINCH handling
 *
- * The point of this is to handle SIGWINCH on consoles which have host ttys and
+ * The point of this is to handle SIGWINCH on consoles which have host
- * relay them inside UML to whatever might be running on the console and cares
+ * ttys and relay them inside UML to whatever might be running on the
- * about the window size (since SIGWINCH notifies about terminal size changes).
+ * console and cares about the window size (since SIGWINCH notifies
+ * about terminal size changes).
 *
- * So, we have a separate thread for each host tty attached to a UML device
+ * So, we have a separate thread for each host tty attached to a UML
- * (side-issue - I'm annoyed that one thread can't have multiple controlling
+ * device (side-issue - I'm annoyed that one thread can't have
- * ttys for purposed of handling SIGWINCH, but I imagine there are other reasons
+ * multiple controlling ttys for the purpose of handling SIGWINCH, but
- * that doesn't make any sense).
+ * I imagine there are other reasons that doesn't make any sense).
 *
- * SIGWINCH can't be received synchronously, so you have to set up to receive it
+ * SIGWINCH can't be received synchronously, so you have to set up to
- * as a signal.  That being the case, if you are going to wait for it, it is
+ * receive it as a signal.  That being the case, if you are going to
- * convenient to sit in sigsuspend() and wait for the signal to bounce you out of
+ * wait for it, it is convenient to sit in sigsuspend() and wait for
- * it (see below for how we make sure to exit only on SIGWINCH).
+ * the signal to bounce you out of it (see below for how we make sure
+ * to exit only on SIGWINCH).
 */
 static void winch_handler(int sig)
@@ -112,7 +114,8 @@ static int winch_thread(void *arg)
        err = os_new_tty_pgrp(pty_fd, os_getpid());
        if(err < 0){
-                printk("winch_thread : new_tty_pgrp failed, err = %d\n", -err);
+                printk("winch_thread : new_tty_pgrp failed on fd %d, "
+                       "err = %d\n", pty_fd, -err);
                exit(1);
        }
@@ -126,8 +129,9 @@ static int winch_thread(void *arg)
                       "err = %d\n", -count);
        while(1){
-                /* This will be interrupted by SIGWINCH only, since other signals
+                /* This will be interrupted by SIGWINCH only, since
-                 * are blocked.*/
+                 * other signals are blocked.
+                 */
                sigsuspend(&sigs);
                count = os_write_file(pipe_fd, &c, sizeof(c));
@@ -137,10 +141,10 @@ static int winch_thread(void *arg)
        }
 }
-static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out)
+static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out,
+                       unsigned long *stack_out)
 {
        struct winch_data data;
-        unsigned long stack;
        int fds[2], n, err;
        char c;
@@ -153,9 +157,11 @@ static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out)
        data = ((struct winch_data) { .pty_fd           = fd,
                                      .pipe_fd          = fds[1] } );
        /* CLONE_FILES so this thread doesn't hold open files which are open
-         * now, but later closed.  This is a problem with /dev/net/tun.
+         * now, but later closed in a different thread.  This is a
+         * problem with /dev/net/tun, which if held open by this
+         * thread, prevents the TUN/TAP device from being reused.
         */
-        err = run_helper_thread(winch_thread, &data, CLONE_FILES, &stack, 0);
+        err = run_helper_thread(winch_thread, &data, CLONE_FILES, stack_out);
        if(err < 0){
                printk("fork of winch_thread failed - errno = %d\n", -err);
                goto out_close;
@@ -170,7 +176,13 @@ static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out)
                err = -EINVAL;
                goto out_close;
        }
-        return err ;
+        if (os_set_fd_block(*fd_out, 0)) {
+                printk("winch_tramp: failed to set thread_fd non-blocking.\n");
+                goto out_close;
+        }
+        return err;
 out_close:
        os_close_file(fds[1]);
@@ -181,25 +193,25 @@ static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out)
 void register_winch(int fd, struct tty_struct *tty)
 {
-        int pid, thread, thread_fd = -1;
+        unsigned long stack;
-        int count;
+        int pid, thread, count, thread_fd = -1;
        char c = 1;
        if(!isatty(fd))
                return;
        pid = tcgetpgrp(fd);
-        if(!CHOOSE_MODE_PROC(is_tracer_winch, is_skas_winch, pid, fd,
+        if (!CHOOSE_MODE_PROC(is_tracer_winch, is_skas_winch, pid, fd, tty) &&
-                             tty) && (pid == -1)){
+            (pid == -1)) {
-                thread = winch_tramp(fd, tty, &thread_fd);
+                thread = winch_tramp(fd, tty, &thread_fd, &stack);
-                if(thread > 0){
+                if (thread < 0)
-                        register_winch_irq(thread_fd, fd, thread, tty);
+                        return;
-                        count = os_write_file(thread_fd, &c, sizeof(c));
+                register_winch_irq(thread_fd, fd, thread, tty, stack);
-                        if(count != sizeof(c))
-                                printk("register_winch : failed to write "
+                count = os_write_file(thread_fd, &c, sizeof(c));
-                                       "synchronization byte, err = %d\n",
+                if(count != sizeof(c))
-                                        -count);
+                        printk("register_winch : failed to write "
-                }
+                               "synchronization byte, err = %d\n", -count);
        }
 }
diff --git a/arch/um/drivers/cow_sys.h b/arch/um/drivers/cow_sys.h
index 15453845d2..ca8c9e11a3 100644
--- a/arch/um/drivers/cow_sys.h
+++ b/arch/um/drivers/cow_sys.h
@@ -8,7 +8,7 @@
 static inline void *cow_malloc(int size)
 {
-        return um_kmalloc(size);
+        return kmalloc(size, UM_GFP_KERNEL);
 }
 static inline void cow_free(void *ptr)
diff --git a/arch/um/drivers/daemon_user.c b/arch/um/drivers/daemon_user.c
index b869e38996..8d2008f066 100644
--- a/arch/um/drivers/daemon_user.c
+++ b/arch/um/drivers/daemon_user.c
@@ -35,7 +35,7 @@ static struct sockaddr_un *new_addr(void *name, int len)
 {
        struct sockaddr_un *sun;
-        sun = um_kmalloc(sizeof(struct sockaddr_un));
+        sun = kmalloc(sizeof(struct sockaddr_un), UM_GFP_KERNEL);
        if(sun == NULL){
                printk("new_addr: allocation of sockaddr_un failed\n");
                return NULL;
@@ -83,7 +83,7 @@ static int connect_to_switch(struct daemon_data *pri)
                goto out_close;
        }
-        sun = um_kmalloc(sizeof(struct sockaddr_un));
+        sun = kmalloc(sizeof(struct sockaddr_un), UM_GFP_KERNEL);
        if(sun == NULL){
                printk("new_addr: allocation of sockaddr_un failed\n");
                err = -ENOMEM;
diff --git a/arch/um/drivers/fd.c b/arch/um/drivers/fd.c
index 7f083ec47a..39c01ffd45 100644
--- a/arch/um/drivers/fd.c
+++ b/arch/um/drivers/fd.c
@@ -37,7 +37,7 @@ static void *fd_init(char *str, int device, const struct chan_opts *opts)
                printk("fd_init : couldn't parse file descriptor '%s'\n", str);
                return(NULL);
        }
-        data = um_kmalloc(sizeof(*data));
+        data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
        if(data == NULL) return(NULL);
        *data = ((struct fd_chan) { .fd         = n,
                                    .raw        = opts->raw });
diff --git a/arch/um/drivers/harddog_user.c b/arch/um/drivers/harddog_user.c
index 5eeecf8917..1171790f74 100644
--- a/arch/um/drivers/harddog_user.c
+++ b/arch/um/drivers/harddog_user.c
@@ -68,7 +68,7 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
                args = pid_args;
        }
-        pid = run_helper(pre_exec, &data, args, NULL);
+        pid = run_helper(pre_exec, &data, args);
        os_close_file(out_fds[0]);
        os_close_file(in_fds[1]);
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 4bd40bb43e..3e0b68e297 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -454,7 +454,10 @@ int line_open(struct line *lines, struct tty_struct *tty)
        tty->driver_data = line;
        line->tty = tty;
-        enable_chan(line);
+        err = enable_chan(line);
+        if (err)
+                return err;
        INIT_DELAYED_WORK(&line->task, line_timer_cb);
        if(!line->sigio){
@@ -746,8 +749,24 @@ struct winch {
        int tty_fd;
        int pid;
        struct tty_struct *tty;
+        unsigned long stack;
 };
+static void free_winch(struct winch *winch, int free_irq_ok)
+{
+        list_del(&winch->list);
+        if (winch->pid != -1)
+                os_kill_process(winch->pid, 1);
+        if (winch->fd != -1)
+                os_close_file(winch->fd);
+        if (winch->stack != 0)
+                free_stack(winch->stack, 0);
+        if (free_irq_ok)
+                free_irq(WINCH_IRQ, winch);
+        kfree(winch);
+}
 static irqreturn_t winch_interrupt(int irq, void *data)
 {
        struct winch *winch = data;
@@ -764,12 +783,13 @@ static irqreturn_t winch_interrupt(int irq, void *data)
                                       "errno = %d\n", -err);
                                printk("fd %d is losing SIGWINCH support\n",
                                       winch->tty_fd);
+                                free_winch(winch, 0);
                                return IRQ_HANDLED;
                        }
                        goto out;
                }
        }
-        tty  = winch->tty;
+        tty = winch->tty;
        if (tty != NULL) {
                line = tty->driver_data;
                chan_window_size(&line->chan_list, &tty->winsize.ws_row,
@@ -782,43 +802,44 @@ static irqreturn_t winch_interrupt(int irq, void *data)
        return IRQ_HANDLED;
 }
-void register_winch_irq(int fd, int tty_fd, int pid, struct tty_struct *tty)
+void register_winch_irq(int fd, int tty_fd, int pid, struct tty_struct *tty,
+                        unsigned long stack)
 {
        struct winch *winch;
        winch = kmalloc(sizeof(*winch), GFP_KERNEL);
        if (winch == NULL) {
                printk("register_winch_irq - kmalloc failed\n");
-                return;
+                goto cleanup;
        }
        *winch = ((struct winch) { .list        = LIST_HEAD_INIT(winch->list),
                                   .fd          = fd,
                                   .tty_fd      = tty_fd,
                                   .pid         = pid,
-                                   .tty         = tty });
+                                   .tty         = tty,
+                                   .stack       = stack });
+        if (um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt,
+                           IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
+                           "winch", winch) < 0) {
+                printk("register_winch_irq - failed to register IRQ\n");
+                goto out_free;
+        }
        spin_lock(&winch_handler_lock);
        list_add(&winch->list, &winch_handlers);
        spin_unlock(&winch_handler_lock);
-        if(um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt,
+        return;
-                          IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
-                          "winch", winch) < 0)
-                printk("register_winch_irq - failed to register IRQ\n");
-}
-static void free_winch(struct winch *winch)
-{
-        list_del(&winch->list);
-        if(winch->pid != -1)
-                os_kill_process(winch->pid, 1);
-        if(winch->fd != -1)
-                os_close_file(winch->fd);
-        free_irq(WINCH_IRQ, winch);
+ out_free:
        kfree(winch);
+ cleanup:
+        os_kill_process(pid, 1);
+        os_close_file(fd);
+        if (stack != 0)
+                free_stack(stack, 0);
 }
 static void unregister_winch(struct tty_struct *tty)
@@ -831,7 +852,7 @@ static void unregister_winch(struct tty_struct *tty)
        list_for_each(ele, &winch_handlers){
                winch = list_entry(ele, struct winch, list);
                if(winch->tty == tty){
-                        free_winch(winch);
+                        free_winch(winch, 1);
                        break;
                }
        }
@@ -847,7 +868,7 @@ static void winch_cleanup(void)
        list_for_each_safe(ele, next, &winch_handlers){
                winch = list_entry(ele, struct winch, list);
-                free_winch(winch);
+                free_winch(winch, 1);
        }
        spin_unlock(&winch_handler_lock);
diff --git a/arch/um/drivers/mcast_user.c b/arch/um/drivers/mcast_user.c
index d319db16d4..236a3dfc29 100644
--- a/arch/um/drivers/mcast_user.c
+++ b/arch/um/drivers/mcast_user.c
@@ -30,7 +30,7 @@ static struct sockaddr_in *new_addr(char *addr, unsigned short port)
 {
        struct sockaddr_in *sin;
-        sin = um_kmalloc(sizeof(struct sockaddr_in));
+        sin = kmalloc(sizeof(struct sockaddr_in), UM_GFP_KERNEL);
        if(sin == NULL){
                printk("new_addr: allocation of sockaddr_in failed\n");
                return NULL;
diff --git a/arch/um/drivers/mconsole_user.c b/arch/um/drivers/mconsole_user.c
index 62e5ad6318..f31e71546e 100644
--- a/arch/um/drivers/mconsole_user.c
+++ b/arch/um/drivers/mconsole_user.c
@@ -86,8 +86,9 @@ int mconsole_get_request(int fd, struct mc_request *req)
        int len;
        req->originlen = sizeof(req->origin);
-        req->len = recvfrom(fd, &req->request, sizeof(req->request), 0,
+        req->len = recvfrom(fd, &req->request, sizeof(req->request),
-                            (struct sockaddr *) req->origin, &req->originlen);
+                            MSG_DONTWAIT, (struct sockaddr *) req->origin,
+                            &req->originlen);
        if (req->len < 0)
                return 0;
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 3503cff867..da946e3e1b 100644
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -187,7 +187,7 @@ static int change_tramp(char **argv, char *output, int output_len)
        }
        pe_data.close_me = fds[0];
        pe_data.stdout = fds[1];
-        pid = run_helper(change_pre_exec, &pe_data, argv, NULL);
+        pid = run_helper(change_pre_exec, &pe_data, argv);
        if (pid > 0)    /* Avoid hang as we won't get data in failure case. */
                read_output(fds[0], output, output_len);
@@ -217,7 +217,7 @@ static void change(char *dev, char *what, unsigned char *addr,
                netmask[2], netmask[3]);
        output_len = UM_KERN_PAGE_SIZE;
-        output = um_kmalloc(output_len);
+        output = kmalloc(output_len, UM_GFP_KERNEL);
        if(output == NULL)
                printk("change : failed to allocate output buffer\n");
diff --git a/arch/um/drivers/pcap_user.c b/arch/um/drivers/pcap_user.c
index 483aa15222..1316456e2a 100644
--- a/arch/um/drivers/pcap_user.c
+++ b/arch/um/drivers/pcap_user.c
@@ -53,7 +53,7 @@ static int pcap_open(void *data)
                        return -EIO;
                }
-                pri->compiled = um_kmalloc(sizeof(struct bpf_program));
+                pri->compiled = kmalloc(sizeof(struct bpf_program), UM_GFP_KERNEL);
                if(pri->compiled == NULL){
                        printk(UM_KERN_ERR "pcap_open : kmalloc failed\n");
                        return -ENOMEM;
diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c
index 3f6357d24b..c799b00012 100644
--- a/arch/um/drivers/port_user.c
+++ b/arch/um/drivers/port_user.c
@@ -50,7 +50,7 @@ static void *port_init(char *str, int device, const struct chan_opts *opts)
        if(kern_data == NULL)
                return NULL;
-        data = um_kmalloc(sizeof(*data));
+        data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
        if(data == NULL)
                goto err;
@@ -188,7 +188,7 @@ int port_connection(int fd, int *socket, int *pid_out)
                { .sock_fd              = new,
                  .pipe_fd              = socket[1] });
-        err = run_helper(port_pre_exec, &data, argv, NULL);
+        err = run_helper(port_pre_exec, &data, argv);
        if(err < 0)
                goto out_shutdown;
diff --git a/arch/um/drivers/pty.c b/arch/um/drivers/pty.c
index df4976c9ee..1e3fd619a8 100644
--- a/arch/um/drivers/pty.c
+++ b/arch/um/drivers/pty.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
 * Licensed under the GPL
 */
@@ -7,12 +7,14 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#include <fcntl.h>
 #include <errno.h>
 #include <termios.h>
+#include <sys/stat.h>
 #include "chan_user.h"
-#include "user.h"
-#include "kern_util.h"
 #include "os.h"
+#include "user.h"
+#include "kern_constants.h"
 #include "um_malloc.h"
 struct pty_chan {
@@ -27,12 +29,14 @@ static void *pty_chan_init(char *str, int device, const struct chan_opts *opts)
 {
        struct pty_chan *data;
-        data = um_kmalloc(sizeof(*data));
+        data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
-        if(data == NULL) return(NULL);
+        if (data == NULL)
+                return NULL;
        *data = ((struct pty_chan) { .announce          = opts->announce, 
                                     .dev               = device,
                                     .raw               = opts->raw });
-        return(data);
+        return data;
 }
 static int pts_open(int input, int output, int primary, void *d,
@@ -43,31 +47,35 @@ static int pts_open(int input, int output, int primary, void *d,
        int fd, err;
        fd = get_pty();
-        if(fd < 0){
+        if (fd < 0) {
                err = -errno;
-                printk("open_pts : Failed to open pts\n");
+                printk(UM_KERN_ERR "open_pts : Failed to open pts\n");
                return err;
        }
-        if(data->raw){
+        if (data->raw) {
                CATCH_EINTR(err = tcgetattr(fd, &data->tt));
-                if(err)
+                if (err)
-                        return(err);
+                        return err;
                err = raw(fd);
-                if(err)
+                if (err)
-                        return(err);
+                        return err;
        }
        dev = ptsname(fd);
        sprintf(data->dev_name, "%s", dev);
        *dev_out = data->dev_name;
        if (data->announce)
                (*data->announce)(dev, data->dev);
-        return(fd);
+        return fd;
 }
 static int getmaster(char *line)
 {
+        struct stat buf;
        char *pty, *bank, *cp;
        int master, err;
@@ -75,24 +83,29 @@ static int getmaster(char *line)
        for (bank = "pqrs"; *bank; bank++) {
                line[strlen("/dev/pty")] = *bank;
                *pty = '0';
-                if (os_stat_file(line, NULL) < 0)
+                /* Did we hit the end ? */
+                if ((stat(line, &buf) < 0) && (errno == ENOENT))
                        break;
                for (cp = "0123456789abcdef"; *cp; cp++) {
                        *pty = *cp;
-                        master = os_open_file(line, of_rdwr(OPENFLAGS()), 0);
+                        master = open(line, O_RDWR);
                        if (master >= 0) {
                                char *tp = &line[strlen("/dev/")];
                                /* verify slave side is usable */
                                *tp = 't';
-                                err = os_access(line, OS_ACC_RW_OK);
+                                err = access(line, R_OK | W_OK);
                                *tp = 'p';
-                                if(err == 0) return(master);
+                                if(!err)
-                                (void) os_close_file(master);
+                                        return master;
+                                close(master);
                        }
                }
        }
-        return(-1);
+        printk(UM_KERN_ERR "getmaster - no usable host pty devices\n");
+        return -ENOENT;
 }
 static int pty_open(int input, int output, int primary, void *d,
@@ -103,20 +116,22 @@ static int pty_open(int input, int output, int primary, void *d,
        char dev[sizeof("/dev/ptyxx\0")] = "/dev/ptyxx";
        fd = getmaster(dev);
-        if(fd < 0)
+        if (fd < 0)
-                return(-errno);
+                return fd;
        if(data->raw){
                err = raw(fd);
-                if(err)
+                if (err)
-                        return(err);
+                        return err;
        }
        
-        if(data->announce) (*data->announce)(dev, data->dev);
+        if (data->announce)
+                (*data->announce)(dev, data->dev);
        sprintf(data->dev_name, "%s", dev);
        *dev_out = data->dev_name;
-        return(fd);
+        return fd;
 }
 const struct chan_ops pty_ops = {
@@ -144,14 +159,3 @@ const struct chan_ops pts_ops = {
        .free           = generic_free,
        .winch          = 0,
 };
-/*
- * 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/drivers/slip_user.c b/arch/um/drivers/slip_user.c
index 78f0e515da..c0b73c28cf 100644
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
@@ -85,13 +85,13 @@ static int slip_tramp(char **argv, int fd)
        pe_data.stdin = fd;
        pe_data.stdout = fds[1];
        pe_data.close_me = fds[0];
-        err = run_helper(slip_pre_exec, &pe_data, argv, NULL);
+        err = run_helper(slip_pre_exec, &pe_data, argv);
        if(err < 0)
                goto out_close;
        pid = err;
        output_len = UM_KERN_PAGE_SIZE;
-        output = um_kmalloc(output_len);
+        output = kmalloc(output_len, UM_GFP_KERNEL);
        if(output == NULL){
                printk("slip_tramp : failed to allocate output buffer\n");
                os_kill_process(pid, 1);
diff --git a/arch/um/drivers/slirp_user.c b/arch/um/drivers/slirp_user.c
index 39f889fe99..0e462f64f2 100644
--- a/arch/um/drivers/slirp_user.c
+++ b/arch/um/drivers/slirp_user.c
@@ -42,7 +42,7 @@ static int slirp_tramp(char **argv, int fd)
        pe_data.stdin = fd;
        pe_data.stdout = fd;
-        pid = run_helper(slirp_pre_exec, &pe_data, argv, NULL);
+        pid = run_helper(slirp_pre_exec, &pe_data, argv);
        return(pid);
 }
diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c
index fd09ad9e9c..875d60d0c6 100644
--- a/arch/um/drivers/ssl.c
+++ b/arch/um/drivers/ssl.c
@@ -42,8 +42,6 @@ static struct chan_opts opts = {
        .announce       = ssl_announce,
        .xterm_title    = "Serial Line #%d",
        .raw            = 1,
-        .tramp_stack    = 0,
-        .in_kernel      = 1,
 };
 static int ssl_config(char *str, char **error_out);
@@ -99,7 +97,13 @@ static int ssl_remove(int n, char **error_out)
 static int ssl_open(struct tty_struct *tty, struct file *filp)
 {
-        return line_open(serial_lines, tty);
+        int err = line_open(serial_lines, tty);
+        if (err)
+                printk(KERN_ERR "Failed to open serial line %d, err = %d\n",
+                       tty->index, err);
+        return err;
 }
 #if 0
diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
index 2bb4193ac1..656036e90b 100644
--- a/arch/um/drivers/stdio_console.c
+++ b/arch/um/drivers/stdio_console.c
@@ -46,8 +46,6 @@ static struct chan_opts opts = {
        .announce       = stdio_announce,
        .xterm_title    = "Virtual Console #%d",
        .raw            = 1,
-        .tramp_stack    = 0,
-        .in_kernel      = 1,
 };
 static int con_config(char *str, char **error_out);
@@ -101,7 +99,12 @@ static int con_remove(int n, char **error_out)
 static int con_open(struct tty_struct *tty, struct file *filp)
 {
-        return line_open(vts, tty);
+        int err = line_open(vts, tty);
+        if (err)
+                printk(KERN_ERR "Failed to open console %d, err = %d\n",
+                       tty->index, err);
+        return err;
 }
 /* Set in an initcall, checked in an exitcall */
diff --git a/arch/um/drivers/tty.c b/arch/um/drivers/tty.c
index c07d0d5627..a9f87e19c5 100644
--- a/arch/um/drivers/tty.c
+++ b/arch/um/drivers/tty.c
@@ -29,7 +29,7 @@ static void *tty_chan_init(char *str, int device, const struct chan_opts *opts)
        }
        str++;
-        data = um_kmalloc(sizeof(*data));
+        data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
        if(data == NULL)
                return NULL;
        *data = ((struct tty_chan) { .dev       = str,
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 2e09f162c4..fc27f6c72b 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -712,6 +712,8 @@ static int ubd_add(int n, char **error_out)
        ubd_dev->queue->queuedata = ubd_dev;
        blk_queue_max_hw_segments(ubd_dev->queue, MAX_SG);
+        if(ubd_dev->cow.file != NULL)
+                blk_queue_max_sectors(ubd_dev->queue, 8 * sizeof(long));
        err = ubd_disk_register(MAJOR_NR, ubd_dev->size, n, &ubd_gendisk[n]);
        if(err){
                *error_out = "Failed to register device";
@@ -1083,7 +1085,7 @@ static void do_ubd_request(request_queue_t *q)
 {
        struct io_thread_req *io_req;
        struct request *req;
-        int n;
+        int n, last_sectors;
        while(1){
                struct ubd *dev = q->queuedata;
@@ -1099,9 +1101,11 @@ static void do_ubd_request(request_queue_t *q)
                }
                req = dev->request;
+                last_sectors = 0;
                while(dev->start_sg < dev->end_sg){
                        struct scatterlist *sg = &dev->sg[dev->start_sg];
+                        req->sector += last_sectors;
                        io_req = kmalloc(sizeof(struct io_thread_req),
                                         GFP_ATOMIC);
                        if(io_req == NULL){
@@ -1113,6 +1117,7 @@ static void do_ubd_request(request_queue_t *q)
                                        (unsigned long long) req->sector << 9,
                                        sg->offset, sg->length, sg->page);
+                        last_sectors = sg->length >> 9;
                        n = os_write_file(thread_fd, &io_req,
                                          sizeof(struct io_thread_req *));
                        if(n != sizeof(struct io_thread_req *)){
@@ -1124,7 +1129,6 @@ static void do_ubd_request(request_queue_t *q)
                                return;
                        }
-                        req->sector += sg->length >> 9;
                        dev->start_sg++;
                }
                dev->end_sg = 0;
diff --git a/arch/um/drivers/ubd_user.c b/arch/um/drivers/ubd_user.c
index 4707b3f14c..41d254bd38 100644
--- a/arch/um/drivers/ubd_user.c
+++ b/arch/um/drivers/ubd_user.c
@@ -43,6 +43,12 @@ int start_io_thread(unsigned long sp, int *fd_out)
        kernel_fd = fds[0];
        *fd_out = fds[1];
+        err = os_set_fd_block(*fd_out, 0);
+        if (err) {
+                printk("start_io_thread - failed to set nonblocking I/O.\n");
+                goto out_close;
+        }
        pid = clone(io_thread, (void *) sp, CLONE_FILES | CLONE_VM | SIGCHLD,
                    NULL);
        if(pid < 0){
diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
index 571c2b3325..fd817e5415 100644
--- a/arch/um/drivers/xterm.c
+++ b/arch/um/drivers/xterm.c
@@ -1,22 +1,20 @@
 /* 
- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
 * Licensed under the GPL
 */
-#include <stdio.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
 #include <termios.h>
-#include <signal.h>
-#include <sched.h>
-#include <sys/socket.h>
-#include "kern_util.h"
 #include "chan_user.h"
-#include "user.h"
 #include "os.h"
+#include "init.h"
+#include "user.h"
 #include "xterm.h"
+#include "kern_constants.h"
 struct xterm_chan {
        int pid;
@@ -25,25 +23,21 @@ struct xterm_chan {
        int device;
        int raw;
        struct termios tt;
-        unsigned long stack;
-        int direct_rcv;
 };
-/* Not static because it's called directly by the tt mode gdb code */
+static void *xterm_init(char *str, int device, const struct chan_opts *opts)
-void *xterm_init(char *str, int device, const struct chan_opts *opts)
 {
        struct xterm_chan *data;
        data = malloc(sizeof(*data));
-        if(data == NULL) return(NULL);
+        if (data == NULL)
-        *data = ((struct xterm_chan) { .pid             = -1, 
+                return NULL;
+        *data = ((struct xterm_chan) { .pid             = -1,
                                       .helper_pid      = -1,
-                                       .device          = device, 
+                                       .device          = device,
                                       .title           = opts->xterm_title,
-                                       .raw             = opts->raw,
+                                       .raw             = opts->raw } );
-                                       .stack           = opts->tramp_stack,
+        return data;
-                                       .direct_rcv      = !opts->in_kernel } );
-        return(data);
 }
 /* Only changed by xterm_setup, which is a setup */
@@ -57,16 +51,22 @@ static int __init xterm_setup(char *line, int *add)
        terminal_emulator = line;
        line = strchr(line, ',');
-        if(line == NULL) return(0);
+        if (line == NULL)
+                return 0;
        *line++ = '\0';
-        if(*line) title_switch = line;
+        if (*line)
+                title_switch = line;
        line = strchr(line, ',');
-        if(line == NULL) return(0);
+        if (line == NULL)
+                return 0;
        *line++ = '\0';
-        if(*line) exec_switch = line;
+        if (*line)
+                exec_switch = line;
-        return(0);
+        return 0;
 }
 __uml_setup("xterm=", xterm_setup,
@@ -82,107 +82,128 @@ __uml_setup("xterm=", xterm_setup,
 "    are 'xterm=gnome-terminal,-t,-x'.\n\n"
 );
-/* XXX This badly needs some cleaning up in the error paths
+static int xterm_open(int input, int output, int primary, void *d,
- * Not static because it's called directly by the tt mode gdb code
- */
-int xterm_open(int input, int output, int primary, void *d,
                      char **dev_out)
 {
        struct xterm_chan *data = d;
-        unsigned long stack;
        int pid, fd, new, err;
        char title[256], file[] = "/tmp/xterm-pipeXXXXXX";
-        char *argv[] = { terminal_emulator, title_switch, title, exec_switch, 
+        char *argv[] = { terminal_emulator, title_switch, title, exec_switch,
                         "/usr/lib/uml/port-helper", "-uml-socket",
                         file, NULL };
-        if(os_access(argv[4], OS_ACC_X_OK) < 0)
+        if (access(argv[4], X_OK) < 0)
                argv[4] = "port-helper";
        /* Check that DISPLAY is set, this doesn't guarantee the xterm
         * will work but w/o it we can be pretty sure it won't. */
-        if (!getenv("DISPLAY")) {
+        if (getenv("DISPLAY") == NULL) {
-                printk("xterm_open: $DISPLAY not set.\n");
+                printk(UM_KERN_ERR "xterm_open: $DISPLAY not set.\n");
                return -ENODEV;
        }
+        /*
+         * This business of getting a descriptor to a temp file,
+         * deleting the file and closing the descriptor is just to get
+         * a known-unused name for the Unix socket that we really
+         * want.
+         */
        fd = mkstemp(file);
-        if(fd < 0){
+        if (fd < 0) {
                err = -errno;
-                printk("xterm_open : mkstemp failed, errno = %d\n", errno);
+                printk(UM_KERN_ERR "xterm_open : mkstemp failed, errno = %d\n",
+                       errno);
                return err;
        }
-        if(unlink(file)){
+        if (unlink(file)) {
                err = -errno;
-                printk("xterm_open : unlink failed, errno = %d\n", errno);
+                printk(UM_KERN_ERR "xterm_open : unlink failed, errno = %d\n",
+                       errno);
                return err;
        }
-        os_close_file(fd);
+        close(fd);
        fd = os_create_unix_socket(file, sizeof(file), 1);
-        if(fd < 0){
+        if (fd < 0) {
-                printk("xterm_open : create_unix_socket failed, errno = %d\n", 
+                printk(UM_KERN_ERR "xterm_open : create_unix_socket failed, "
-                       -fd);
+                       "errno = %d\n", -fd);
-                return(fd);
+                return fd;
        }
        sprintf(title, data->title, data->device);
-        stack = data->stack;
+        pid = run_helper(NULL, NULL, argv);
-        pid = run_helper(NULL, NULL, argv, &stack);
+        if (pid < 0) {
-        if(pid < 0){
+                err = pid;
-                printk("xterm_open : run_helper failed, errno = %d\n", -pid);
+                printk(UM_KERN_ERR "xterm_open : run_helper failed, "
-                return(pid);
+                       "errno = %d\n", -err);
+                goto out_close1;
        }
-        if (data->direct_rcv) {
+        err = os_set_fd_block(fd, 0);
-                new = os_rcv_fd(fd, &data->helper_pid);
+        if (err < 0) {
-        } else {
+                printk(UM_KERN_ERR "xterm_open : failed to set descriptor "
-                err = os_set_fd_block(fd, 0);
+                       "non-blocking, err = %d\n", -err);
-                if(err < 0){
+                goto out_kill;
-                        printk("xterm_open : failed to set descriptor "
-                               "non-blocking, err = %d\n", -err);
-                        return(err);
-                }
-                new = xterm_fd(fd, &data->helper_pid);
        }
-        if(new < 0){
-                printk("xterm_open : os_rcv_fd failed, err = %d\n", -new);
+        new = xterm_fd(fd, &data->helper_pid);
-                goto out;
+        if (new < 0) {
+                err = new;
+                printk(UM_KERN_ERR "xterm_open : os_rcv_fd failed, err = %d\n",
+                       -err);
+                goto out_kill;
+        }
+        err = os_set_fd_block(new, 0);
+        if (err) {
+                printk(UM_KERN_ERR "xterm_open : failed to set xterm "
+                       "descriptor non-blocking, err = %d\n", -err);
+                goto out_close2;
        }
        CATCH_EINTR(err = tcgetattr(new, &data->tt));
-        if(err){
+        if (err) {
                new = err;
-                goto out;
+                goto out_close2;
        }
-        if(data->raw){
+        if (data->raw) {
                err = raw(new);
-                if(err){
+                if (err) {
                        new = err;
-                        goto out;
+                        goto out_close2;
                }
        }
+        unlink(file);
        data->pid = pid;
        *dev_out = NULL;
- out:
-        unlink(file);
+        return new;
-        return(new);
+ out_close2:
+        close(new);
+ out_kill:
+        os_kill_process(pid, 1);
+ out_close1:
+        close(fd);
+        return err;
 }
-/* Not static because it's called directly by the tt mode gdb code */
+static void xterm_close(int fd, void *d)
-void xterm_close(int fd, void *d)
 {
        struct xterm_chan *data = d;
        
-        if(data->pid != -1) 
+        if (data->pid != -1)
                os_kill_process(data->pid, 1);
        data->pid = -1;
-        if(data->helper_pid != -1) 
+        if (data->helper_pid != -1)
                os_kill_process(data->helper_pid, 0);
        data->helper_pid = -1;
        os_close_file(fd);
 }
@@ -203,14 +224,3 @@ const struct chan_ops xterm_ops = {
        .free           = xterm_free,
        .winch          = 1,
 };
-/*
- * 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/drivers/xterm_kern.c b/arch/um/drivers/xterm_kern.c
index a4ce7058e1..b646bccef3 100644
--- a/arch/um/drivers/xterm_kern.c
+++ b/arch/um/drivers/xterm_kern.c
@@ -1,18 +1,14 @@
 /* 
- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
 * Licensed under the GPL
 */
-#include "linux/errno.h"
+#include <linux/slab.h>
-#include "linux/slab.h"
+#include <linux/completion.h>
-#include "linux/signal.h"
+#include <linux/irqreturn.h>
-#include "linux/interrupt.h"
+#include <asm/irq.h>
-#include "asm/irq.h"
-#include "irq_user.h"
 #include "irq_kern.h"
-#include "kern_util.h"
 #include "os.h"
-#include "xterm.h"
 struct xterm_wait {
        struct completion ready;
@@ -27,12 +23,13 @@ static irqreturn_t xterm_interrupt(int irq, void *data)
        int fd;
        fd = os_rcv_fd(xterm->fd, &xterm->pid);
-        if(fd == -EAGAIN)
+        if (fd == -EAGAIN)
-                return(IRQ_NONE);
+                return IRQ_NONE;
        xterm->new_fd = fd;
        complete(&xterm->ready);
-        return(IRQ_HANDLED);
+        return IRQ_HANDLED;
 }
 int xterm_fd(int socket, int *pid_out)
@@ -41,22 +38,21 @@ int xterm_fd(int socket, int *pid_out)
        int err, ret;
        data = kmalloc(sizeof(*data), GFP_KERNEL);
-        if(data == NULL){
+        if (data == NULL) {
                printk(KERN_ERR "xterm_fd : failed to allocate xterm_wait\n");
-                return(-ENOMEM);
+                return -ENOMEM;
        }
        /* This is a locked semaphore... */
-        *data = ((struct xterm_wait) 
+        *data = ((struct xterm_wait) { .fd              = socket,
-                { .fd           = socket,
+                                       .pid             = -1,
-                  .pid          = -1,
+                                       .new_fd          = -1 });
-                  .new_fd       = -1 });
        init_completion(&data->ready);
-        err = um_request_irq(XTERM_IRQ, socket, IRQ_READ, xterm_interrupt, 
+        err = um_request_irq(XTERM_IRQ, socket, IRQ_READ, xterm_interrupt,
                             IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
                             "xterm", data);
-        if (err){
+        if (err) {
                printk(KERN_ERR "xterm_fd : failed to get IRQ for xterm, "
                       "err = %d\n",  err);
                ret = err;
@@ -76,16 +72,5 @@ int xterm_fd(int socket, int *pid_out)
 out:
        kfree(data);
-        return(ret);
+        return ret;
 }
-/*
- * 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/chan_kern.h b/arch/um/include/chan_kern.h
index c4b41bb103..624b5100a3 100644
--- a/arch/um/include/chan_kern.h
+++ b/arch/um/include/chan_kern.h
@@ -40,7 +40,7 @@ extern int console_open_chan(struct line *line, struct console *co);
 extern void deactivate_chan(struct list_head *chans, int irq);
 extern void reactivate_chan(struct list_head *chans, int irq);
 extern void chan_enable_winch(struct list_head *chans, struct tty_struct *tty);
-extern void enable_chan(struct line *line);
+extern int enable_chan(struct line *line);
 extern void close_chan(struct list_head *chans, int delay_free_irq);
 extern int chan_window_size(struct list_head *chans, 
                             unsigned short *rows_out, 
diff --git a/arch/um/include/chan_user.h b/arch/um/include/chan_user.h
index 38f16d812e..5a2263e05b 100644
--- a/arch/um/include/chan_user.h
+++ b/arch/um/include/chan_user.h
@@ -12,8 +12,6 @@ struct chan_opts {
        void (*const announce)(char *dev_name, int dev);
        char *xterm_title;
        const int raw;
-        const unsigned long tramp_stack;
-        const int in_kernel;
 };
 enum chan_init_pri { INIT_STATIC, INIT_ALL, INIT_ONE };
@@ -44,7 +42,8 @@ extern void generic_free(void *data);
 struct tty_struct;
 extern void register_winch(int fd,  struct tty_struct *tty);
-extern void register_winch_irq(int fd, int tty_fd, int pid, struct tty_struct *tty);
+extern void register_winch_irq(int fd, int tty_fd, int pid,
+                               struct tty_struct *tty, unsigned long stack);
 #define __channel_help(fn, prefix) \
 __uml_help(fn, prefix "[0-9]*=<channel description>\n" \
diff --git a/arch/um/include/common-offsets.h b/arch/um/include/common-offsets.h
index 7376ee44e3..6eee343e53 100644
--- a/arch/um/include/common-offsets.h
+++ b/arch/um/include/common-offsets.h
@@ -27,6 +27,9 @@ DEFINE(UM_ELFCLASS64, ELFCLASS64);
 DEFINE(UM_NR_CPUS, NR_CPUS);
+DEFINE(UM_GFP_KERNEL, GFP_KERNEL);
+DEFINE(UM_GFP_ATOMIC, GFP_ATOMIC);
 /* For crypto assembler code. */
 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
diff --git a/arch/um/include/os.h b/arch/um/include/os.h
index 4d9fb26387..930b261ea4 100644
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
@@ -239,11 +239,9 @@ extern unsigned long __do_user_copy(void *to, const void *from, int n,
 /* execvp.c */
 extern int execvp_noalloc(char *buf, const char *file, char *const argv[]);
 /* helper.c */
-extern int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
+extern int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv);
-                      unsigned long *stack_out);
 extern int run_helper_thread(int (*proc)(void *), void *arg,
-                             unsigned int flags, unsigned long *stack_out,
+                             unsigned int flags, unsigned long *stack_out);
-                             int stack_order);
 extern int helper_wait(int pid);
diff --git a/arch/um/include/um_malloc.h b/arch/um/include/um_malloc.h
index e6d7c5aa3f..0ad17cb83d 100644
--- a/arch/um/include/um_malloc.h
+++ b/arch/um/include/um_malloc.h
@@ -6,11 +6,17 @@
 #ifndef __UM_MALLOC_H__
 #define __UM_MALLOC_H__
-extern void *um_kmalloc(int size);
+#include "kern_constants.h"
-extern void *um_kmalloc_atomic(int size);
+extern void *__kmalloc(int size, int flags);
+static inline void *kmalloc(int size, int flags)
+{
+        return __kmalloc(size, flags);
+}
 extern void kfree(const void *ptr);
-extern void *um_vmalloc(int size);
+extern void *vmalloc(unsigned long size);
 extern void vfree(void *ptr);
 #endif /* __UM_MALLOC_H__ */
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index dba04d88b4..9870febdbe 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -30,7 +30,6 @@
 #include "irq_kern.h"
 #include "os.h"
 #include "sigio.h"
-#include "um_malloc.h"
 #include "misc_constants.h"
 #include "as-layout.h"
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index 8d2c549653..bfa52f206b 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -46,7 +46,6 @@
 #include "mode.h"
 #include "mode_kern.h"
 #include "choose-mode.h"
-#include "um_malloc.h"
 /* This is a per-cpu array.  A processor only modifies its entry and it only
 * cares about its entry, so it's OK if another processor is modifying its
@@ -262,21 +261,6 @@ void dump_thread(struct pt_regs *regs, struct user *u)
 {
 }
-void *um_kmalloc(int size)
-{
-        return kmalloc(size, GFP_KERNEL);
-}
-void *um_kmalloc_atomic(int size)
-{
-        return kmalloc(size, GFP_ATOMIC);
-}
-void *um_vmalloc(int size)
-{
-        return vmalloc(size);
-}
 int __cant_sleep(void) {
        return in_atomic() || irqs_disabled() || in_interrupt();
        /* Is in_interrupt() really needed? */
diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
index 627742d894..6916c8888d 100644
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
@@ -52,17 +52,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        switch (request) {
                /* when I and D space are separate, these will need to be fixed. */
        case PTRACE_PEEKTEXT: /* read word at location addr. */ 
-        case PTRACE_PEEKDATA: {
+        case PTRACE_PEEKDATA:
-                unsigned long tmp;
+                ret = generic_ptrace_peekdata(child, addr, data);
-                int copied;
-                ret = -EIO;
-                copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
-                if (copied != sizeof(tmp))
-                        break;
-                ret = put_user(tmp, p);
                break;
-        }
        /* read the word at location addr in the USER area. */
        case PTRACE_PEEKUSR:
@@ -72,11 +64,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        /* when I and D space are separate, this will have to be fixed. */
        case PTRACE_POKETEXT: /* write the word at location addr. */
        case PTRACE_POKEDATA:
-                ret = -EIO;
+                ret = generic_ptrace_pokedata(child, addr, data);
-                if (access_process_vm(child, addr, &data, sizeof(data), 
-                                      1) != sizeof(data))
-                        break;
-                ret = 0;
                break;
        case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
diff --git a/arch/um/os-Linux/aio.c b/arch/um/os-Linux/aio.c
index 9bf944f6a1..b126df4ea1 100644
--- a/arch/um/os-Linux/aio.c
+++ b/arch/um/os-Linux/aio.c
@@ -177,6 +177,7 @@ static int do_not_aio(struct aio_thread_req *req)
 static int aio_req_fd_r = -1;
 static int aio_req_fd_w = -1;
 static int aio_pid = -1;
+static unsigned long aio_stack;
 static int not_aio_thread(void *arg)
 {
@@ -212,7 +213,6 @@ static int not_aio_thread(void *arg)
 static int init_aio_24(void)
 {
-        unsigned long stack;
        int fds[2], err;
        err = os_pipe(fds, 1, 1);
@@ -227,7 +227,7 @@ static int init_aio_24(void)
                goto out_close_pipe;
        err = run_helper_thread(not_aio_thread, NULL,
-                                CLONE_FILES | CLONE_VM | SIGCHLD, &stack, 0);
+                                CLONE_FILES | CLONE_VM | SIGCHLD, &aio_stack);
        if(err < 0)
                goto out_close_pipe;
@@ -252,7 +252,6 @@ out:
 #define DEFAULT_24_AIO 0
 static int init_aio_26(void)
 {
-        unsigned long stack;
        int err;
        if(io_setup(256, &ctx)){
@@ -263,7 +262,7 @@ static int init_aio_26(void)
        }
        err = run_helper_thread(aio_thread, NULL,
-                                CLONE_FILES | CLONE_VM | SIGCHLD, &stack, 0);
+                                CLONE_FILES | CLONE_VM | SIGCHLD, &aio_stack);
        if(err < 0)
                return err;
@@ -365,8 +364,10 @@ __initcall(init_aio);
 static void exit_aio(void)
 {
-        if(aio_pid != -1)
+        if (aio_pid != -1) {
                os_kill_process(aio_pid, 1);
+                free_stack(aio_stack, 0);
+        }
 }
 __uml_exitcall(exit_aio);
diff --git a/arch/um/os-Linux/drivers/ethertap_user.c b/arch/um/os-Linux/drivers/ethertap_user.c
index acba301612..61d3953c7a 100644
--- a/arch/um/os-Linux/drivers/ethertap_user.c
+++ b/arch/um/os-Linux/drivers/ethertap_user.c
@@ -54,7 +54,7 @@ static void etap_change(int op, unsigned char *addr, unsigned char *netmask,
                return;
        }
-        output = um_kmalloc(UM_KERN_PAGE_SIZE);
+        output = kmalloc(UM_KERN_PAGE_SIZE, UM_GFP_KERNEL);
        if(output == NULL)
                printk("etap_change : Failed to allocate output buffer\n");
        read_output(fd, output, UM_KERN_PAGE_SIZE);
@@ -117,7 +117,7 @@ static int etap_tramp(char *dev, char *gate, int control_me,
        pe_data.control_remote = control_remote;
        pe_data.control_me = control_me;
        pe_data.data_me = data_me;
-        pid = run_helper(etap_pre_exec, &pe_data, args, NULL);
+        pid = run_helper(etap_pre_exec, &pe_data, args);
        if(pid < 0)
                err = pid;
@@ -166,7 +166,7 @@ static int etap_open(void *data)
        err = etap_tramp(pri->dev_name, pri->gate_addr, control_fds[0], 
                         control_fds[1], data_fds[0], data_fds[1]);
        output_len = UM_KERN_PAGE_SIZE;
-        output = um_kmalloc(output_len);
+        output = kmalloc(output_len, UM_GFP_KERNEL);
        read_output(control_fds[0], output, output_len);
        if(output == NULL)
diff --git a/arch/um/os-Linux/drivers/tuntap_user.c b/arch/um/os-Linux/drivers/tuntap_user.c
index 11a9779dc9..f848b4ea93 100644
--- a/arch/um/os-Linux/drivers/tuntap_user.c
+++ b/arch/um/os-Linux/drivers/tuntap_user.c
@@ -83,7 +83,7 @@ static int tuntap_open_tramp(char *gate, int *fd_out, int me, int remote,
        data.stdout = remote;
        data.close_me = me;
-        pid = run_helper(tuntap_pre_exec, &data, argv, NULL);
+        pid = run_helper(tuntap_pre_exec, &data, argv);
        if(pid < 0)
                return -pid;
diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c
index 97bed16bf4..d81af7b858 100644
--- a/arch/um/os-Linux/helper.c
+++ b/arch/um/os-Linux/helper.c
@@ -44,17 +44,13 @@ static int helper_child(void *arg)
 /* Returns either the pid of the child process we run or -E* on failure.
 * XXX The alloc_stack here breaks if this is called in the tracing thread, so
 * we need to receive a preallocated stack (a local buffer is ok). */
-int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
+int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv)
-               unsigned long *stack_out)
 {
        struct helper_data data;
        unsigned long stack, sp;
        int pid, fds[2], ret, n;
-        if ((stack_out != NULL) && (*stack_out != 0))
+        stack = alloc_stack(0, __cant_sleep());
-                stack = *stack_out;
-        else
-                stack = alloc_stack(0, __cant_sleep());
        if (stack == 0)
                return -ENOMEM;
@@ -76,8 +72,8 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
        data.pre_data = pre_data;
        data.argv = argv;
        data.fd = fds[1];
-        data.buf = __cant_sleep() ? um_kmalloc_atomic(PATH_MAX) :
+        data.buf = __cant_sleep() ? kmalloc(PATH_MAX, UM_GFP_ATOMIC) :
-                                        um_kmalloc(PATH_MAX);
+                                        kmalloc(PATH_MAX, UM_GFP_KERNEL);
        pid = clone(helper_child, (void *) sp, CLONE_VM | SIGCHLD, &data);
        if (pid < 0) {
                ret = -errno;
@@ -113,22 +109,21 @@ out_close:
                close(fds[1]);
        close(fds[0]);
 out_free:
-        if ((stack_out == NULL) || (*stack_out == 0))
+        free_stack(stack, 0);
-                free_stack(stack, 0);
        return ret;
 }
 int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags,
-                      unsigned long *stack_out, int stack_order)
+                      unsigned long *stack_out)
 {
        unsigned long stack, sp;
        int pid, status, err;
-        stack = alloc_stack(stack_order, __cant_sleep());
+        stack = alloc_stack(0, __cant_sleep());
        if (stack == 0)
                return -ENOMEM;
-        sp = stack + (UM_KERN_PAGE_SIZE << stack_order) - sizeof(void *);
+        sp = stack + UM_KERN_PAGE_SIZE - sizeof(void *);
        pid = clone(proc, (void *) sp, flags | SIGCHLD, arg);
        if (pid < 0) {
                err = -errno;
@@ -147,7 +142,7 @@ int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags,
                if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0))
                        printk("run_helper_thread - thread returned status "
                               "0x%x\n", status);
-                free_stack(stack, stack_order);
+                free_stack(stack, 0);
        } else
                *stack_out = stack;
        return pid;
diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c
index fb510d4048..e85f4995a0 100644
--- a/arch/um/os-Linux/main.c
+++ b/arch/um/os-Linux/main.c
@@ -235,8 +235,8 @@ void *__wrap_malloc(int size)
                return __real_malloc(size);
        else if(size <= UM_KERN_PAGE_SIZE)
                /* finding contiguous pages can be hard*/
-                ret = um_kmalloc(size);
+                ret = kmalloc(size, UM_GFP_KERNEL);
-        else ret = um_vmalloc(size);
+        else ret = vmalloc(size);
        /* glibc people insist that if malloc fails, errno should be
         * set by malloc as well. So we do.
diff --git a/arch/um/os-Linux/sigio.c b/arch/um/os-Linux/sigio.c
index 8d4e0c6b8c..dc03e9cccb 100644
--- a/arch/um/os-Linux/sigio.c
+++ b/arch/um/os-Linux/sigio.c
@@ -26,6 +26,7 @@
 * exitcall.
 */
 static int write_sigio_pid = -1;
+static unsigned long write_sigio_stack;
 /* These arrays are initialized before the sigio thread is started, and
 * the descriptors closed after it is killed.  So, it can't see them change.
@@ -104,7 +105,7 @@ static int need_poll(struct pollfds *polls, int n)
        if(n <= polls->size)
                return 0;
-        new = um_kmalloc_atomic(n * sizeof(struct pollfd));
+        new = kmalloc(n * sizeof(struct pollfd), UM_GFP_ATOMIC);
        if(new == NULL){
                printk("need_poll : failed to allocate new pollfds\n");
                return -ENOMEM;
@@ -144,8 +145,10 @@ static void update_thread(void)
        return;
 fail:
        /* Critical section start */
-        if(write_sigio_pid != -1)
+        if (write_sigio_pid != -1) {
                os_kill_process(write_sigio_pid, 1);
+                free_stack(write_sigio_stack, 0);
+        }
        write_sigio_pid = -1;
        close(sigio_private[0]);
        close(sigio_private[1]);
@@ -230,7 +233,7 @@ static struct pollfd *setup_initial_poll(int fd)
 {
        struct pollfd *p;
-        p = um_kmalloc(sizeof(struct pollfd));
+        p = kmalloc(sizeof(struct pollfd), UM_GFP_KERNEL);
        if (p == NULL) {
                printk("setup_initial_poll : failed to allocate poll\n");
                return NULL;
@@ -243,7 +246,6 @@ static struct pollfd *setup_initial_poll(int fd)
 static void write_sigio_workaround(void)
 {
-        unsigned long stack;
        struct pollfd *p;
        int err;
        int l_write_sigio_fds[2];
@@ -293,7 +295,8 @@ static void write_sigio_workaround(void)
        memcpy(sigio_private, l_sigio_private, sizeof(l_sigio_private));
        write_sigio_pid = run_helper_thread(write_sigio_thread, NULL,
-                                            CLONE_FILES | CLONE_VM, &stack, 0);
+                                            CLONE_FILES | CLONE_VM,
+                                            &write_sigio_stack);
        if (write_sigio_pid < 0)
                goto out_clear;
@@ -356,10 +359,12 @@ out:
 static void sigio_cleanup(void)
 {
-        if(write_sigio_pid != -1){
+        if (write_sigio_pid == -1)
-                os_kill_process(write_sigio_pid, 1);
+                return;
-                write_sigio_pid = -1;
-        }
+        os_kill_process(write_sigio_pid, 1);
+        free_stack(write_sigio_stack, 0);
+        write_sigio_pid = -1;
 }
 __uml_exitcall(sigio_cleanup);
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index 46c00cc429..ba9af8d620 100644
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
@@ -41,7 +41,7 @@ int is_skas_winch(int pid, int fd, void *data)
        if(pid != os_getpgrp())
                return(0);
-        register_winch_irq(-1, fd, -1, data);
+        register_winch_irq(-1, fd, -1, data, 0);
        return(1);
 }
diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c
index 3f33165ada..419b2d5ff6 100644
--- a/arch/um/os-Linux/user_syms.c
+++ b/arch/um/os-Linux/user_syms.c
@@ -5,7 +5,8 @@
 * so I *must* declare good prototypes for them and then EXPORT them.
 * The kernel code uses the macro defined by include/linux/string.h,
 * so I undef macros; the userspace code does not include that and I
- * add an EXPORT for the glibc one.*/
+ * add an EXPORT for the glibc one.
+ */
 #undef strlen
 #undef strstr
@@ -61,12 +62,18 @@ EXPORT_SYMBOL_PROTO(dup2);
 EXPORT_SYMBOL_PROTO(__xstat);
 EXPORT_SYMBOL_PROTO(__lxstat);
 EXPORT_SYMBOL_PROTO(__lxstat64);
+EXPORT_SYMBOL_PROTO(__fxstat64);
 EXPORT_SYMBOL_PROTO(lseek);
 EXPORT_SYMBOL_PROTO(lseek64);
 EXPORT_SYMBOL_PROTO(chown);
+EXPORT_SYMBOL_PROTO(fchown);
 EXPORT_SYMBOL_PROTO(truncate);
+EXPORT_SYMBOL_PROTO(ftruncate64);
 EXPORT_SYMBOL_PROTO(utime);
+EXPORT_SYMBOL_PROTO(utimes);
+EXPORT_SYMBOL_PROTO(futimes);
 EXPORT_SYMBOL_PROTO(chmod);
+EXPORT_SYMBOL_PROTO(fchmod);
 EXPORT_SYMBOL_PROTO(rename);
 EXPORT_SYMBOL_PROTO(__xmknod);
@@ -102,14 +109,3 @@ EXPORT_SYMBOL(__stack_smash_handler);
 extern long __guard __attribute__((weak));
 EXPORT_SYMBOL(__guard);
-/*
- * 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/v850/kernel/ptrace.c b/arch/v850/kernel/ptrace.c
index a9b0934309..a458ac941b 100644
--- a/arch/v850/kernel/ptrace.c
+++ b/arch/v850/kernel/ptrace.c
@@ -117,24 +117,16 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        int rval;
        switch (request) {
-                unsigned long val, copied;
+                unsigned long val;
        case PTRACE_PEEKTEXT: /* read word at location addr. */
        case PTRACE_PEEKDATA:
-                copied = access_process_vm(child, addr, &val, sizeof(val), 0);
+                rval = generic_ptrace_peekdata(child, addr, data);
-                rval = -EIO;
-                if (copied != sizeof(val))
-                        break;
-                rval = put_user(val, (unsigned long *)data);
                goto out;
        case PTRACE_POKETEXT: /* write the word at location addr. */
        case PTRACE_POKEDATA:
-                rval = 0;
+                rval = generic_ptrace_pokedata(child, addr, data);
-                if (access_process_vm(child, addr, &data, sizeof(data), 1)
-                    == sizeof(data))
-                        break;
-                rval = -EIO;
                goto out;
        /* Read/write the word at location ADDR in the registers.  */
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 5ce94430c0..14bf8ce3ea 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -427,6 +427,10 @@ config NR_CPUS
          This is purely to save memory - each supported CPU requires
          memory in the static kernel configuration.
+config PHYSICAL_ALIGN
+        hex
+        default "0x200000"
 config HOTPLUG_CPU
        bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)"
        depends on SMP && HOTPLUG && EXPERIMENTAL
@@ -770,8 +774,8 @@ menu "Instrumentation Support"
 source "arch/x86_64/oprofile/Kconfig"
 config KPROBES
-        bool "Kprobes (EXPERIMENTAL)"
+        bool "Kprobes"
-        depends on KALLSYMS && EXPERIMENTAL && MODULES
+        depends on KALLSYMS && MODULES
        help
          Kprobes allows you to trap at almost any kernel address and
          execute a callback function.  register_kprobe() establishes
diff --git a/arch/x86_64/boot/Makefile b/arch/x86_64/boot/Makefile
index ee6f6505f9..67096389de 100644
--- a/arch/x86_64/boot/Makefile
+++ b/arch/x86_64/boot/Makefile
@@ -1,135 +1,9 @@
 #
 # arch/x86_64/boot/Makefile
 #
-# This file is subject to the terms and conditions of the GNU General Public
+# The actual boot code is shared with i386 including the Makefile.
-# License.  See the file "COPYING" in the main directory of this archive
+# So tell kbuild that we fetch the code from i386 and include the
-# for more details.
+# Makefile from i386 too.
-#
-# Copyright (C) 1994 by Linus Torvalds
-#
-# ROOT_DEV specifies the default root-device when making the image.
-# This can be either FLOPPY, CURRENT, /dev/xxxx or empty, in which case
-# the default of FLOPPY is used by 'build'.
-ROOT_DEV := CURRENT
-# If you want to preset the SVGA mode, uncomment the next line and
-# set SVGA_MODE to whatever number you want.
-# Set it to -DSVGA_MODE=NORMAL_VGA if you just want the EGA/VGA mode.
-# The number is the same as you would ordinarily press at bootup.
-SVGA_MODE := -DSVGA_MODE=NORMAL_VGA
-# If you want the RAM disk device, define this to be the size in blocks.
-#RAMDISK := -DRAMDISK=512
-targets         := vmlinux.bin bootsect bootsect.o \
-                   setup setup.o bzImage mtools.conf
-EXTRA_CFLAGS := -m32
-hostprogs-y     := tools/build
-HOST_EXTRACFLAGS += $(LINUXINCLUDE)
-subdir-         := compressed/  #Let make clean descend in compressed/
-# ---------------------------------------------------------------------------
-$(obj)/bzImage: IMAGE_OFFSET := 0x100000
-$(obj)/bzImage: EXTRA_AFLAGS := $(SVGA_MODE) $(RAMDISK) -D__BIG_KERNEL__
-$(obj)/bzImage: BUILDFLAGS   := -b
-quiet_cmd_image = BUILD   $@
-cmd_image = $(obj)/tools/build $(BUILDFLAGS) $(obj)/bootsect $(obj)/setup \
-            $(obj)/vmlinux.bin $(ROOT_DEV) > $@
-$(obj)/bzImage: $(obj)/bootsect $(obj)/setup \
-                              $(obj)/vmlinux.bin $(obj)/tools/build FORCE
-        $(call if_changed,image)
-        @echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
-$(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE
-        $(call if_changed,objcopy)
-LDFLAGS_bootsect := -Ttext 0x0 -s --oformat binary
-LDFLAGS_setup    := -Ttext 0x0 -s --oformat binary -e begtext
-$(obj)/setup $(obj)/bootsect: %: %.o FORCE
-        $(call if_changed,ld)
-$(obj)/compressed/vmlinux: FORCE
-        $(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@
-# Set this if you want to pass append arguments to the zdisk/fdimage/isoimage kernel
-FDARGS = 
-# Set this if you want an initrd included with the zdisk/fdimage/isoimage kernel
-FDINITRD =
-image_cmdline = default linux $(FDARGS) $(if $(FDINITRD),initrd=initrd.img,)
-$(obj)/mtools.conf: $(src)/mtools.conf.in
-        sed -e 's|@OBJ@|$(obj)|g' < $< > $@
-# This requires write access to /dev/fd0
-zdisk: $(BOOTIMAGE) $(obj)/mtools.conf
-        MTOOLSRC=$(obj)/mtools.conf mformat a:                  ; sync
-        syslinux /dev/fd0                                       ; sync
-        echo '$(image_cmdline)' | \
-                MTOOLSRC=$(obj)/mtools.conf mcopy - a:syslinux.cfg
-        if [ -f '$(FDINITRD)' ] ; then \
-                MTOOLSRC=$(obj)/mtools.conf mcopy '$(FDINITRD)' a:initrd.img ; \
-        fi
-        MTOOLSRC=$(obj)/mtools.conf mcopy $(BOOTIMAGE) a:linux  ; sync
-# These require being root or having syslinux 2.02 or higher installed
-fdimage fdimage144: $(BOOTIMAGE) $(obj)/mtools.conf
-        dd if=/dev/zero of=$(obj)/fdimage bs=1024 count=1440
-        MTOOLSRC=$(obj)/mtools.conf mformat v:                  ; sync
-        syslinux $(obj)/fdimage                                 ; sync
-        echo '$(image_cmdline)' | \
-                MTOOLSRC=$(obj)/mtools.conf mcopy - v:syslinux.cfg
-        if [ -f '$(FDINITRD)' ] ; then \
-                MTOOLSRC=$(obj)/mtools.conf mcopy '$(FDINITRD)' v:initrd.img ; \
-        fi
-        MTOOLSRC=$(obj)/mtools.conf mcopy $(BOOTIMAGE) v:linux  ; sync
-fdimage288: $(BOOTIMAGE) $(obj)/mtools.conf
-        dd if=/dev/zero of=$(obj)/fdimage bs=1024 count=2880
-        MTOOLSRC=$(obj)/mtools.conf mformat w:                  ; sync
-        syslinux $(obj)/fdimage                                 ; sync
-        echo '$(image_cmdline)' | \
-                MTOOLSRC=$(obj)/mtools.conf mcopy - w:syslinux.cfg
-        if [ -f '$(FDINITRD)' ] ; then \
-                MTOOLSRC=$(obj)/mtools.conf mcopy '$(FDINITRD)' w:initrd.img ; \
-        fi
-        MTOOLSRC=$(obj)/mtools.conf mcopy $(BOOTIMAGE) w:linux  ; sync
-isoimage: $(BOOTIMAGE)
-        -rm -rf $(obj)/isoimage
-        mkdir $(obj)/isoimage
-        for i in lib lib64 share end ; do \
-                if [ -f /usr/$$i/syslinux/isolinux.bin ] ; then \
-                        cp /usr/$$i/syslinux/isolinux.bin $(obj)/isoimage ; \
-                        break ; \
-                fi ; \
-                if [ $$i = end ] ; then exit 1 ; fi ; \
-        done
-        cp $(BOOTIMAGE) $(obj)/isoimage/linux
-        echo '$(image_cmdline)' > $(obj)/isoimage/isolinux.cfg
-        if [ -f '$(FDINITRD)' ] ; then \
-                cp '$(FDINITRD)' $(obj)/isoimage/initrd.img ; \
-        fi
-        mkisofs -J -r -o $(obj)/image.iso -b isolinux.bin -c boot.cat \
-                -no-emul-boot -boot-load-size 4 -boot-info-table \
-                $(obj)/isoimage
-        rm -rf $(obj)/isoimage
-zlilo: $(BOOTIMAGE)
-        if [ -f $(INSTALL_PATH)/vmlinuz ]; then mv $(INSTALL_PATH)/vmlinuz $(INSTALL_PATH)/vmlinuz.old; fi
-        if [ -f $(INSTALL_PATH)/System.map ]; then mv $(INSTALL_PATH)/System.map $(INSTALL_PATH)/System.old; fi
-        cat $(BOOTIMAGE) > $(INSTALL_PATH)/vmlinuz
-        cp System.map $(INSTALL_PATH)/
-        if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi
-install:
+src := arch/i386/boot
-        sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"
+include $(src)/Makefile
diff --git a/arch/x86_64/boot/bootsect.S b/arch/x86_64/boot/bootsect.S
deleted file mode 100644
index 011b7a4993..0000000000
--- a/arch/x86_64/boot/bootsect.S
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *      bootsect.S              Copyright (C) 1991, 1992 Linus Torvalds
- *
- *      modified by Drew Eckhardt
- *      modified by Bruce Evans (bde)
- *      modified by Chris Noe (May 1999) (as86 -> gas)
- *      gutted by H. Peter Anvin (Jan 2003)
- *
- * BIG FAT NOTE: We're in real mode using 64k segments.  Therefore segment
- * addresses must be multiplied by 16 to obtain their respective linear
- * addresses. To avoid confusion, linear addresses are written using leading
- * hex while segment addresses are written as segment:offset.
- *
- */
-#include <asm/boot.h>
-SETUPSECTS      = 4                     /* default nr of setup-sectors */
-BOOTSEG         = 0x07C0                /* original address of boot-sector */
-INITSEG         = DEF_INITSEG           /* we move boot here - out of the way */
-SETUPSEG        = DEF_SETUPSEG          /* setup starts here */
-SYSSEG          = DEF_SYSSEG            /* system loaded at 0x10000 (65536) */
-SYSSIZE         = DEF_SYSSIZE           /* system size: # of 16-byte clicks */
-                                        /* to be loaded */
-ROOT_DEV        = 0                     /* ROOT_DEV is now written by "build" */
-SWAP_DEV        = 0                     /* SWAP_DEV is now written by "build" */
-#ifndef SVGA_MODE
-#define SVGA_MODE ASK_VGA
-#endif
-#ifndef RAMDISK
-#define RAMDISK 0
-#endif
-#ifndef ROOT_RDONLY
-#define ROOT_RDONLY 1
-#endif
-.code16
-.text
-.global _start
-_start:
-        # Normalize the start address
-        jmpl    $BOOTSEG, $start2
-start2:
-        movw    %cs, %ax
-        movw    %ax, %ds
-        movw    %ax, %es
-        movw    %ax, %ss
-        movw    $0x7c00, %sp
-        sti
-        cld
-        movw    $bugger_off_msg, %si
-msg_loop:
-        lodsb
-        andb    %al, %al
-        jz      die
-        movb    $0xe, %ah
-        movw    $7, %bx
-        int     $0x10
-        jmp     msg_loop
-die:
-        # Allow the user to press a key, then reboot
-        xorw    %ax, %ax
-        int     $0x16
-        int     $0x19
-        # int 0x19 should never return.  In case it does anyway,
-        # invoke the BIOS reset code...
-        ljmp    $0xf000,$0xfff0
-bugger_off_msg:
-        .ascii  "Direct booting from floppy is no longer supported.\r\n"
-        .ascii  "Please use a boot loader program instead.\r\n"
-        .ascii  "\n"
-        .ascii  "Remove disk and press any key to reboot . . .\r\n"
-        .byte   0
-        # Kernel attributes; used by setup
-        .org 497
-setup_sects:    .byte SETUPSECTS
-root_flags:     .word ROOT_RDONLY
-syssize:        .word SYSSIZE
-swap_dev:       .word SWAP_DEV
-ram_size:       .word RAMDISK
-vid_mode:       .word SVGA_MODE
-root_dev:       .word ROOT_DEV
-boot_flag:      .word 0xAA55
diff --git a/arch/x86_64/boot/compressed/Makefile b/arch/x86_64/boot/compressed/Makefile
index 705a3e33d7..c9f2da7496 100644
--- a/arch/x86_64/boot/compressed/Makefile
+++ b/arch/x86_64/boot/compressed/Makefile
@@ -7,11 +7,12 @@
 #
 targets         := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
-EXTRA_AFLAGS    := -traditional
-# cannot use EXTRA_CFLAGS because base CFLAGS contains -mkernel which conflicts with
+CFLAGS := -m64 -D__KERNEL__ $(LINUXINCLUDE) -O2  \
-# -m32
+          -fno-strict-aliasing -fPIC -mcmodel=small \
-CFLAGS := -m64 -D__KERNEL__ -Iinclude -O2  -fno-strict-aliasing -fPIC -mcmodel=small -fno-builtin
+           $(call cc-option, -ffreestanding) \
+           $(call cc-option, -fno-stack-protector)
+AFLAGS  := $(CFLAGS) -D__ASSEMBLY__
 LDFLAGS := -m elf_x86_64
 LDFLAGS_vmlinux := -T
diff --git a/arch/x86_64/boot/compressed/head.S b/arch/x86_64/boot/compressed/head.S
index f9d5692a01..1312bfaff3 100644
--- a/arch/x86_64/boot/compressed/head.S
+++ b/arch/x86_64/boot/compressed/head.S
@@ -46,10 +46,10 @@ startup_32:
 * at and where we were actually loaded at.  This can only be done
 * with a short local call on x86.  Nothing  else will tell us what
 * address we are running at.  The reserved chunk of the real-mode
- * data at 0x34-0x3f are used as the stack for this calculation.
+ * data at 0x1e4 (defined as a scratch field) are used as the stack
- * Only 4 bytes are needed.
+ * for this calculation. Only 4 bytes are needed.
 */
-        leal    0x40(%esi), %esp
+        leal    (0x1e4+4)(%esi), %esp
        call    1f
 1:      popl    %ebp
        subl    $1b, %ebp
diff --git a/arch/x86_64/boot/install.sh b/arch/x86_64/boot/install.sh
deleted file mode 100644
index baaa2369bd..0000000000
--- a/arch/x86_64/boot/install.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-. $srctree/arch/i386/boot/install.sh
diff --git a/arch/x86_64/boot/mtools.conf.in b/arch/x86_64/boot/mtools.conf.in
deleted file mode 100644
index efd6d2490c..0000000000
--- a/arch/x86_64/boot/mtools.conf.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# mtools configuration file for "make (b)zdisk"
-#
-# Actual floppy drive
-drive a:
-  file="/dev/fd0"
-# 1.44 MB floppy disk image
-drive v:
-  file="@OBJ@/fdimage" cylinders=80 heads=2 sectors=18 filter
-# 2.88 MB floppy disk image (mostly for virtual uses)
-drive w:
-  file="@OBJ@/fdimage" cylinders=80 heads=2 sectors=36 filter
diff --git a/arch/x86_64/boot/setup.S b/arch/x86_64/boot/setup.S
deleted file mode 100644
index e9e33f9496..0000000000
--- a/arch/x86_64/boot/setup.S
+++ /dev/null
@@ -1,826 +0,0 @@
-/*
- *      setup.S         Copyright (C) 1991, 1992 Linus Torvalds
- *
- * setup.s is responsible for getting the system data from the BIOS,
- * and putting them into the appropriate places in system memory.
- * both setup.s and system has been loaded by the bootblock.
- *
- * This code asks the bios for memory/disk/other parameters, and
- * puts them in a "safe" place: 0x90000-0x901FF, ie where the
- * boot-block used to be. It is then up to the protected mode
- * system to read them from there before the area is overwritten
- * for buffer-blocks.
- *
- * Move PS/2 aux init code to psaux.c
- * (troyer@saifr00.cfsat.Honeywell.COM) 03Oct92
- *
- * some changes and additional features by Christoph Niemann,
- * March 1993/June 1994 (Christoph.Niemann@linux.org)
- *
- * add APM BIOS checking by Stephen Rothwell, May 1994
- * (sfr@canb.auug.org.au)
- *
- * High load stuff, initrd support and position independency
- * by Hans Lermen & Werner Almesberger, February 1996
- * <lermen@elserv.ffm.fgan.de>, <almesber@lrc.epfl.ch>
- *
- * Video handling moved to video.S by Martin Mares, March 1996
- * <mj@k332.feld.cvut.cz>
- *
- * Extended memory detection scheme retwiddled by orc@pell.chi.il.us (david
- * parsons) to avoid loadlin confusion, July 1997
- *
- * Transcribed from Intel (as86) -> AT&T (gas) by Chris Noe, May 1999.
- * <stiker@northlink.com>
- *
- * Fix to work around buggy BIOSes which don't use carry bit correctly
- * and/or report extended memory in CX/DX for e801h memory size detection 
- * call.  As a result the kernel got wrong figures.  The int15/e801h docs
- * from Ralf Brown interrupt list seem to indicate AX/BX should be used
- * anyway.  So to avoid breaking many machines (presumably there was a reason
- * to orginally use CX/DX instead of AX/BX), we do a kludge to see
- * if CX/DX have been changed in the e801 call and if so use AX/BX .
- * Michael Miller, April 2001 <michaelm@mjmm.org>
- *
- * Added long mode checking and SSE force. March 2003, Andi Kleen.              
- */
-#include <asm/segment.h>
-#include <linux/utsrelease.h>
-#include <linux/compile.h>
-#include <asm/boot.h>
-#include <asm/e820.h>
-#include <asm/page.h>
-#include <asm/setup.h>
-/* Signature words to ensure LILO loaded us right */
-#define SIG1    0xAA55
-#define SIG2    0x5A5A
-INITSEG  = DEF_INITSEG          # 0x9000, we move boot here, out of the way
-SYSSEG   = DEF_SYSSEG           # 0x1000, system loaded at 0x10000 (65536).
-SETUPSEG = DEF_SETUPSEG         # 0x9020, this is the current segment
-                                # ... and the former contents of CS
-DELTA_INITSEG = SETUPSEG - INITSEG      # 0x0020
-.code16
-.globl begtext, begdata, begbss, endtext, enddata, endbss
-.text
-begtext:
-.data
-begdata:
-.bss
-begbss:
-.text
-start:
-        jmp     trampoline
-# This is the setup header, and it must start at %cs:2 (old 0x9020:2)
-                .ascii  "HdrS"          # header signature
-                .word   0x0206          # header version number (>= 0x0105)
-                                        # or else old loadlin-1.5 will fail)
-realmode_swtch: .word   0, 0            # default_switch, SETUPSEG
-start_sys_seg:  .word   SYSSEG
-                .word   kernel_version  # pointing to kernel version string
-                                        # above section of header is compatible
-                                        # with loadlin-1.5 (header v1.5). Don't
-                                        # change it.
-type_of_loader: .byte   0               # = 0, old one (LILO, Loadlin,
-                                        #      Bootlin, SYSLX, bootsect...)
-                                        # See Documentation/i386/boot.txt for
-                                        # assigned ids
-        
-# flags, unused bits must be zero (RFU) bit within loadflags
-loadflags:
-LOADED_HIGH     = 1                     # If set, the kernel is loaded high
-CAN_USE_HEAP    = 0x80                  # If set, the loader also has set
-                                        # heap_end_ptr to tell how much
-                                        # space behind setup.S can be used for
-                                        # heap purposes.
-                                        # Only the loader knows what is free
-#ifndef __BIG_KERNEL__
-                .byte   0
-#else
-                .byte   LOADED_HIGH
-#endif
-setup_move_size: .word  0x8000          # size to move, when setup is not
-                                        # loaded at 0x90000. We will move setup 
-                                        # to 0x90000 then just before jumping
-                                        # into the kernel. However, only the
-                                        # loader knows how much data behind
-                                        # us also needs to be loaded.
-code32_start:                           # here loaders can put a different
-                                        # start address for 32-bit code.
-#ifndef __BIG_KERNEL__
-                .long   0x1000          #   0x1000 = default for zImage
-#else
-                .long   0x100000        # 0x100000 = default for big kernel
-#endif
-ramdisk_image:  .long   0               # address of loaded ramdisk image
-                                        # Here the loader puts the 32-bit
-                                        # address where it loaded the image.
-                                        # This only will be read by the kernel.
-ramdisk_size:   .long   0               # its size in bytes
-bootsect_kludge:
-                .long   0               # obsolete
-heap_end_ptr:   .word   modelist+1024   # (Header version 0x0201 or later)
-                                        # space from here (exclusive) down to
-                                        # end of setup code can be used by setup
-                                        # for local heap purposes.
-pad1:           .word   0
-cmd_line_ptr:   .long 0                 # (Header version 0x0202 or later)
-                                        # If nonzero, a 32-bit pointer
-                                        # to the kernel command line.
-                                        # The command line should be
-                                        # located between the start of
-                                        # setup and the end of low
-                                        # memory (0xa0000), or it may
-                                        # get overwritten before it
-                                        # gets read.  If this field is
-                                        # used, there is no longer
-                                        # anything magical about the
-                                        # 0x90000 segment; the setup
-                                        # can be located anywhere in
-                                        # low memory 0x10000 or higher.
-ramdisk_max:    .long 0xffffffff
-kernel_alignment:  .long 0x200000       # physical addr alignment required for
-                                        # protected mode relocatable kernel
-#ifdef CONFIG_RELOCATABLE
-relocatable_kernel:    .byte 1
-#else
-relocatable_kernel:    .byte 0
-#endif
-pad2:                  .byte 0
-pad3:                  .word 0
-cmdline_size:   .long   COMMAND_LINE_SIZE-1     #length of the command line,
-                                                #added with boot protocol
-                                                #version 2.06
-trampoline:     call    start_of_setup
-                .align 16
-                                        # The offset at this point is 0x240
-                .space  (0xeff-0x240+1) # E820 & EDD space (ending at 0xeff)
-# End of setup header #####################################################
-start_of_setup:
-# Bootlin depends on this being done early
-        movw    $0x01500, %ax
-        movb    $0x81, %dl
-        int     $0x13
-#ifdef SAFE_RESET_DISK_CONTROLLER
-# Reset the disk controller.
-        movw    $0x0000, %ax
-        movb    $0x80, %dl
-        int     $0x13
-#endif
-# Set %ds = %cs, we know that SETUPSEG = %cs at this point
-        movw    %cs, %ax                # aka SETUPSEG
-        movw    %ax, %ds
-# Check signature at end of setup
-        cmpw    $SIG1, setup_sig1
-        jne     bad_sig
-        cmpw    $SIG2, setup_sig2
-        jne     bad_sig
-        jmp     good_sig1
-# Routine to print asciiz string at ds:si
-prtstr:
-        lodsb
-        andb    %al, %al
-        jz      fin
-        call    prtchr
-        jmp     prtstr
-fin:    ret
-# Space printing
-prtsp2: call    prtspc          # Print double space
-prtspc: movb    $0x20, %al      # Print single space (note: fall-thru)
-prtchr: 
-        pushw   %ax
-        pushw   %cx
-        movw    $0007,%bx
-        movw    $0x01, %cx
-        movb    $0x0e, %ah
-        int     $0x10
-        popw    %cx
-        popw    %ax
-        ret
-beep:   movb    $0x07, %al
-        jmp     prtchr
-        
-no_sig_mess: .string    "No setup signature found ..."
-good_sig1:
-        jmp     good_sig
-# We now have to find the rest of the setup code/data
-bad_sig:
-        movw    %cs, %ax                        # SETUPSEG
-        subw    $DELTA_INITSEG, %ax             # INITSEG
-        movw    %ax, %ds
-        xorb    %bh, %bh
-        movb    (497), %bl                      # get setup sect from bootsect
-        subw    $4, %bx                         # LILO loads 4 sectors of setup
-        shlw    $8, %bx                         # convert to words (1sect=2^8 words)
-        movw    %bx, %cx
-        shrw    $3, %bx                         # convert to segment
-        addw    $SYSSEG, %bx
-        movw    %bx, %cs:start_sys_seg
-# Move rest of setup code/data to here
-        movw    $2048, %di                      # four sectors loaded by LILO
-        subw    %si, %si
-        movw    %cs, %ax                        # aka SETUPSEG
-        movw    %ax, %es
-        movw    $SYSSEG, %ax
-        movw    %ax, %ds
-        rep
-        movsw
-        movw    %cs, %ax                        # aka SETUPSEG
-        movw    %ax, %ds
-        cmpw    $SIG1, setup_sig1
-        jne     no_sig
-        cmpw    $SIG2, setup_sig2
-        jne     no_sig
-        jmp     good_sig
-no_sig:
-        lea     no_sig_mess, %si
-        call    prtstr
-no_sig_loop:
-        jmp     no_sig_loop
-good_sig:
-        movw    %cs, %ax                        # aka SETUPSEG
-        subw    $DELTA_INITSEG, %ax             # aka INITSEG
-        movw    %ax, %ds
-# Check if an old loader tries to load a big-kernel
-        testb   $LOADED_HIGH, %cs:loadflags     # Do we have a big kernel?
-        jz      loader_ok                       # No, no danger for old loaders.
-        cmpb    $0, %cs:type_of_loader          # Do we have a loader that
-                                                # can deal with us?
-        jnz     loader_ok                       # Yes, continue.
-        pushw   %cs                             # No, we have an old loader,
-        popw    %ds                             # die. 
-        lea     loader_panic_mess, %si
-        call    prtstr
-        jmp     no_sig_loop
-loader_panic_mess: .string "Wrong loader, giving up..."
-loader_ok:
-        /* check for long mode. */
-        /* we have to do this before the VESA setup, otherwise the user
-           can't see the error message. */
-        
-        pushw   %ds
-        movw    %cs,%ax
-        movw    %ax,%ds
-        
-        call verify_cpu
-        testl %eax,%eax
-        jz sse_ok
-no_longmode:
-        call    beep
-        lea     long_mode_panic,%si
-        call    prtstr
-no_longmode_loop:               
-        jmp     no_longmode_loop
-long_mode_panic:
-        .string "Your CPU does not support long mode. Use a 32bit distribution."
-        .byte 0
-#include "../kernel/verify_cpu.S"
-sse_ok:
-        popw    %ds
-        
-# tell BIOS we want to go to long mode
-        movl  $0xec00,%eax      # declare target operating mode
-        movl  $2,%ebx           # long mode
-        int $0x15                       
-        
-# Get memory size (extended mem, kB)
-        xorl    %eax, %eax
-        movl    %eax, (0x1e0)
-#ifndef STANDARD_MEMORY_BIOS_CALL
-        movb    %al, (E820NR)
-# Try three different memory detection schemes.  First, try
-# e820h, which lets us assemble a memory map, then try e801h,
-# which returns a 32-bit memory size, and finally 88h, which
-# returns 0-64m
-# method E820H:
-# the memory map from hell.  e820h returns memory classified into
-# a whole bunch of different types, and allows memory holes and
-# everything.  We scan through this memory map and build a list
-# of the first 32 memory areas, which we return at [E820MAP].
-# This is documented at http://www.acpi.info/, in the ACPI 2.0 specification.
-#define SMAP  0x534d4150
-meme820:
-        xorl    %ebx, %ebx                      # continuation counter
-        movw    $E820MAP, %di                   # point into the whitelist
-                                                # so we can have the bios
-                                                # directly write into it.
-jmpe820:
-        movl    $0x0000e820, %eax               # e820, upper word zeroed
-        movl    $SMAP, %edx                     # ascii 'SMAP'
-        movl    $20, %ecx                       # size of the e820rec
-        pushw   %ds                             # data record.
-        popw    %es
-        int     $0x15                           # make the call
-        jc      bail820                         # fall to e801 if it fails
-        cmpl    $SMAP, %eax                     # check the return is `SMAP'
-        jne     bail820                         # fall to e801 if it fails
-#       cmpl    $1, 16(%di)                     # is this usable memory?
-#       jne     again820
-        # If this is usable memory, we save it by simply advancing %di by
-        # sizeof(e820rec).
-        #
-good820:
-        movb    (E820NR), %al                   # up to 128 entries
-        cmpb    $E820MAX, %al
-        jae     bail820
-        incb    (E820NR)
-        movw    %di, %ax
-        addw    $20, %ax
-        movw    %ax, %di
-again820:
-        cmpl    $0, %ebx                        # check to see if
-        jne     jmpe820                         # %ebx is set to EOF
-bail820:
-# method E801H:
-# memory size is in 1k chunksizes, to avoid confusing loadlin.
-# we store the 0xe801 memory size in a completely different place,
-# because it will most likely be longer than 16 bits.
-# (use 1e0 because that's what Larry Augustine uses in his
-# alternative new memory detection scheme, and it's sensible
-# to write everything into the same place.)
-meme801:
-        stc                                     # fix to work around buggy
-        xorw    %cx,%cx                         # BIOSes which don't clear/set
-        xorw    %dx,%dx                         # carry on pass/error of
-                                                # e801h memory size call
-                                                # or merely pass cx,dx though
-                                                # without changing them.
-        movw    $0xe801, %ax
-        int     $0x15
-        jc      mem88
-        cmpw    $0x0, %cx                       # Kludge to handle BIOSes
-        jne     e801usecxdx                     # which report their extended
-        cmpw    $0x0, %dx                       # memory in AX/BX rather than
-        jne     e801usecxdx                     # CX/DX.  The spec I have read
-        movw    %ax, %cx                        # seems to indicate AX/BX 
-        movw    %bx, %dx                        # are more reasonable anyway...
-e801usecxdx:
-        andl    $0xffff, %edx                   # clear sign extend
-        shll    $6, %edx                        # and go from 64k to 1k chunks
-        movl    %edx, (0x1e0)                   # store extended memory size
-        andl    $0xffff, %ecx                   # clear sign extend
-        addl    %ecx, (0x1e0)                   # and add lower memory into
-                                                # total size.
-# Ye Olde Traditional Methode.  Returns the memory size (up to 16mb or
-# 64mb, depending on the bios) in ax.
-mem88:
-#endif
-        movb    $0x88, %ah
-        int     $0x15
-        movw    %ax, (2)
-# Set the keyboard repeat rate to the max
-        movw    $0x0305, %ax
-        xorw    %bx, %bx
-        int     $0x16
-# Check for video adapter and its parameters and allow the
-# user to browse video modes.
-        call    video                           # NOTE: we need %ds pointing
-                                                # to bootsector
-# Get hd0 data...
-        xorw    %ax, %ax
-        movw    %ax, %ds
-        ldsw    (4 * 0x41), %si
-        movw    %cs, %ax                        # aka SETUPSEG
-        subw    $DELTA_INITSEG, %ax             # aka INITSEG
-        pushw   %ax
-        movw    %ax, %es
-        movw    $0x0080, %di
-        movw    $0x10, %cx
-        pushw   %cx
-        cld
-        rep
-        movsb
-# Get hd1 data...
-        xorw    %ax, %ax
-        movw    %ax, %ds
-        ldsw    (4 * 0x46), %si
-        popw    %cx
-        popw    %es
-        movw    $0x0090, %di
-        rep
-        movsb
-# Check that there IS a hd1 :-)
-        movw    $0x01500, %ax
-        movb    $0x81, %dl
-        int     $0x13
-        jc      no_disk1
-        
-        cmpb    $3, %ah
-        je      is_disk1
-no_disk1:
-        movw    %cs, %ax                        # aka SETUPSEG
-        subw    $DELTA_INITSEG, %ax             # aka INITSEG
-        movw    %ax, %es
-        movw    $0x0090, %di
-        movw    $0x10, %cx
-        xorw    %ax, %ax
-        cld
-        rep
-        stosb
-is_disk1:
-# Check for PS/2 pointing device
-        movw    %cs, %ax                        # aka SETUPSEG
-        subw    $DELTA_INITSEG, %ax             # aka INITSEG
-        movw    %ax, %ds
-        movb    $0, (0x1ff)                     # default is no pointing device
-        int     $0x11                           # int 0x11: equipment list
-        testb   $0x04, %al                      # check if mouse installed
-        jz      no_psmouse
-        movb    $0xAA, (0x1ff)                  # device present
-no_psmouse:
-#include "../../i386/boot/edd.S"
-# Now we want to move to protected mode ...
-        cmpw    $0, %cs:realmode_swtch
-        jz      rmodeswtch_normal
-        lcall   *%cs:realmode_swtch
-        jmp     rmodeswtch_end
-rmodeswtch_normal:
-        pushw   %cs
-        call    default_switch
-rmodeswtch_end:
-# we get the code32 start address and modify the below 'jmpi'
-# (loader may have changed it)
-        movl    %cs:code32_start, %eax
-        movl    %eax, %cs:code32
-# Now we move the system to its rightful place ... but we check if we have a
-# big-kernel. In that case we *must* not move it ...
-        testb   $LOADED_HIGH, %cs:loadflags
-        jz      do_move0                        # .. then we have a normal low
-                                                # loaded zImage
-                                                # .. or else we have a high
-                                                # loaded bzImage
-        jmp     end_move                        # ... and we skip moving
-do_move0:
-        movw    $0x100, %ax                     # start of destination segment
-        movw    %cs, %bp                        # aka SETUPSEG
-        subw    $DELTA_INITSEG, %bp             # aka INITSEG
-        movw    %cs:start_sys_seg, %bx          # start of source segment
-        cld
-do_move:
-        movw    %ax, %es                        # destination segment
-        incb    %ah                             # instead of add ax,#0x100
-        movw    %bx, %ds                        # source segment
-        addw    $0x100, %bx
-        subw    %di, %di
-        subw    %si, %si
-        movw    $0x800, %cx
-        rep
-        movsw
-        cmpw    %bp, %bx                        # assume start_sys_seg > 0x200,
-                                                # so we will perhaps read one
-                                                # page more than needed, but
-                                                # never overwrite INITSEG
-                                                # because destination is a
-                                                # minimum one page below source
-        jb      do_move
-end_move:
-# then we load the segment descriptors
-        movw    %cs, %ax                        # aka SETUPSEG
-        movw    %ax, %ds
-                
-# Check whether we need to be downward compatible with version <=201
-        cmpl    $0, cmd_line_ptr
-        jne     end_move_self           # loader uses version >=202 features
-        cmpb    $0x20, type_of_loader
-        je      end_move_self           # bootsect loader, we know of it
-# Boot loader doesnt support boot protocol version 2.02.
-# If we have our code not at 0x90000, we need to move it there now.
-# We also then need to move the params behind it (commandline)
-# Because we would overwrite the code on the current IP, we move
-# it in two steps, jumping high after the first one.
-        movw    %cs, %ax
-        cmpw    $SETUPSEG, %ax
-        je      end_move_self
-        cli                                     # make sure we really have
-                                                # interrupts disabled !
-                                                # because after this the stack
-                                                # should not be used
-        subw    $DELTA_INITSEG, %ax             # aka INITSEG
-        movw    %ss, %dx
-        cmpw    %ax, %dx
-        jb      move_self_1
-        addw    $INITSEG, %dx
-        subw    %ax, %dx                        # this will go into %ss after
-                                                # the move
-move_self_1:
-        movw    %ax, %ds
-        movw    $INITSEG, %ax                   # real INITSEG
-        movw    %ax, %es
-        movw    %cs:setup_move_size, %cx
-        std                                     # we have to move up, so we use
-                                                # direction down because the
-                                                # areas may overlap
-        movw    %cx, %di
-        decw    %di
-        movw    %di, %si
-        subw    $move_self_here+0x200, %cx
-        rep
-        movsb
-        ljmp    $SETUPSEG, $move_self_here
-move_self_here:
-        movw    $move_self_here+0x200, %cx
-        rep
-        movsb
-        movw    $SETUPSEG, %ax
-        movw    %ax, %ds
-        movw    %dx, %ss
-end_move_self:                                  # now we are at the right place
-        lidt    idt_48                          # load idt with 0,0
-        xorl    %eax, %eax                      # Compute gdt_base
-        movw    %ds, %ax                        # (Convert %ds:gdt to a linear ptr)
-        shll    $4, %eax
-        addl    $gdt, %eax
-        movl    %eax, (gdt_48+2)
-        lgdt    gdt_48                          # load gdt with whatever is
-                                                # appropriate
-# that was painless, now we enable a20
-        call    empty_8042
-        movb    $0xD1, %al                      # command write
-        outb    %al, $0x64
-        call    empty_8042
-        movb    $0xDF, %al                      # A20 on
-        outb    %al, $0x60
-        call    empty_8042
-#
-#       You must preserve the other bits here. Otherwise embarrasing things
-#       like laptops powering off on boot happen. Corrected version by Kira
-#       Brown from Linux 2.2
-#
-        inb     $0x92, %al                      # 
-        orb     $02, %al                        # "fast A20" version
-        outb    %al, $0x92                      # some chips have only this
-# wait until a20 really *is* enabled; it can take a fair amount of
-# time on certain systems; Toshiba Tecras are known to have this
-# problem.  The memory location used here (0x200) is the int 0x80
-# vector, which should be safe to use.
-        xorw    %ax, %ax                        # segment 0x0000
-        movw    %ax, %fs
-        decw    %ax                             # segment 0xffff (HMA)
-        movw    %ax, %gs
-a20_wait:
-        incw    %ax                             # unused memory location <0xfff0
-        movw    %ax, %fs:(0x200)                # we use the "int 0x80" vector
-        cmpw    %gs:(0x210), %ax                # and its corresponding HMA addr
-        je      a20_wait                        # loop until no longer aliased
-# make sure any possible coprocessor is properly reset..
-        xorw    %ax, %ax
-        outb    %al, $0xf0
-        call    delay
-        outb    %al, $0xf1
-        call    delay
-# well, that went ok, I hope. Now we mask all interrupts - the rest
-# is done in init_IRQ().
-        movb    $0xFF, %al                      # mask all interrupts for now
-        outb    %al, $0xA1
-        call    delay
-        
-        movb    $0xFB, %al                      # mask all irq's but irq2 which
-        outb    %al, $0x21                      # is cascaded
-# Well, that certainly wasn't fun :-(. Hopefully it works, and we don't
-# need no steenking BIOS anyway (except for the initial loading :-).
-# The BIOS-routine wants lots of unnecessary data, and it's less
-# "interesting" anyway. This is how REAL programmers do it.
-#
-# Well, now's the time to actually move into protected mode. To make
-# things as simple as possible, we do no register set-up or anything,
-# we let the gnu-compiled 32-bit programs do that. We just jump to
-# absolute address 0x1000 (or the loader supplied one),
-# in 32-bit protected mode.
-#
-# Note that the short jump isn't strictly needed, although there are
-# reasons why it might be a good idea. It won't hurt in any case.
-        movw    $1, %ax                         # protected mode (PE) bit
-        lmsw    %ax                             # This is it!
-        jmp     flush_instr
-flush_instr:
-        xorw    %bx, %bx                        # Flag to indicate a boot
-        xorl    %esi, %esi                      # Pointer to real-mode code
-        movw    %cs, %si
-        subw    $DELTA_INITSEG, %si
-        shll    $4, %esi                        # Convert to 32-bit pointer
-# NOTE: For high loaded big kernels we need a
-#       jmpi    0x100000,__KERNEL_CS
-#
-#       but we yet haven't reloaded the CS register, so the default size 
-#       of the target offset still is 16 bit.
-#       However, using an operand prefix (0x66), the CPU will properly
-#       take our 48 bit far pointer. (INTeL 80386 Programmer's Reference
-#       Manual, Mixing 16-bit and 32-bit code, page 16-6)
-        .byte 0x66, 0xea                        # prefix + jmpi-opcode
-code32: .long   0x1000                          # will be set to 0x100000
-                                                # for big kernels
-        .word   __KERNEL_CS
-# Here's a bunch of information about your current kernel..
-kernel_version: .ascii  UTS_RELEASE
-                .ascii  " ("
-                .ascii  LINUX_COMPILE_BY
-                .ascii  "@"
-                .ascii  LINUX_COMPILE_HOST
-                .ascii  ") "
-                .ascii  UTS_VERSION
-                .byte   0
-# This is the default real mode switch routine.
-# to be called just before protected mode transition
-default_switch:
-        cli                                     # no interrupts allowed !
-        movb    $0x80, %al                      # disable NMI for bootup
-                                                # sequence
-        outb    %al, $0x70
-        lret
-# This routine checks that the keyboard command queue is empty
-# (after emptying the output buffers)
-#
-# Some machines have delusions that the keyboard buffer is always full
-# with no keyboard attached...
-#
-# If there is no keyboard controller, we will usually get 0xff
-# to all the reads.  With each IO taking a microsecond and
-# a timeout of 100,000 iterations, this can take about half a
-# second ("delay" == outb to port 0x80). That should be ok,
-# and should also be plenty of time for a real keyboard controller
-# to empty.
-#
-empty_8042:
-        pushl   %ecx
-        movl    $100000, %ecx
-empty_8042_loop:
-        decl    %ecx
-        jz      empty_8042_end_loop
-        call    delay
-        inb     $0x64, %al                      # 8042 status port
-        testb   $1, %al                         # output buffer?
-        jz      no_output
-        call    delay
-        inb     $0x60, %al                      # read it
-        jmp     empty_8042_loop
-no_output:
-        testb   $2, %al                         # is input buffer full?
-        jnz     empty_8042_loop                 # yes - loop
-empty_8042_end_loop:
-        popl    %ecx
-        ret
-# Read the cmos clock. Return the seconds in al
-gettime:
-        pushw   %cx
-        movb    $0x02, %ah
-        int     $0x1a
-        movb    %dh, %al                        # %dh contains the seconds
-        andb    $0x0f, %al
-        movb    %dh, %ah
-        movb    $0x04, %cl
-        shrb    %cl, %ah
-        aad
-        popw    %cx
-        ret
-# Delay is needed after doing I/O
-delay:
-        outb    %al,$0x80
-        ret
-# Descriptor tables
-gdt:
-        .word   0, 0, 0, 0                      # dummy
-        .word   0, 0, 0, 0                      # unused
-        .word   0xFFFF                          # 4Gb - (0x100000*0x1000 = 4Gb)
-        .word   0                               # base address = 0
-        .word   0x9A00                          # code read/exec
-        .word   0x00CF                          # granularity = 4096, 386
-                                                #  (+5th nibble of limit)
-        .word   0xFFFF                          # 4Gb - (0x100000*0x1000 = 4Gb)
-        .word   0                               # base address = 0
-        .word   0x9200                          # data read/write
-        .word   0x00CF                          # granularity = 4096, 386
-                                                #  (+5th nibble of limit)
-gdt_end:
-idt_48:
-        .word   0                               # idt limit = 0
-        .word   0, 0                            # idt base = 0L
-gdt_48:
-        .word   gdt_end-gdt-1                   # gdt limit
-        .word   0, 0                            # gdt base (filled in later)
-# Include video setup & detection code
-#include "../../i386/boot/video.S"
-# Setup signature -- must be last
-setup_sig1:     .word   SIG1
-setup_sig2:     .word   SIG2
-# After this point, there is some free space which is used by the video mode
-# handling code to store the temporary mode table (not used by the kernel).
-modelist:
-.text
-endtext:
-.data
-enddata:
-.bss
-endbss:
diff --git a/arch/x86_64/boot/tools/build.c b/arch/x86_64/boot/tools/build.c
deleted file mode 100644
index eae8669170..0000000000
--- a/arch/x86_64/boot/tools/build.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- *  Copyright (C) 1991, 1992  Linus Torvalds
- *  Copyright (C) 1997 Martin Mares
- */
-/*
- * This file builds a disk-image from three different files:
- *
- * - bootsect: compatibility mbr which prints an error message if
- *             someone tries to boot the kernel directly.
- * - setup: 8086 machine code, sets up system parm
- * - system: 80386 code for actual system
- *
- * It does some checking that all files are of the correct type, and
- * just writes the result to stdout, removing headers and padding to
- * the right amount. It also writes some system data to stderr.
- */
-/*
- * Changes by tytso to allow root device specification
- * High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996
- * Cross compiling fixes by Gertjan van Wingerde, July 1996
- * Rewritten by Martin Mares, April 1997
- */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/sysmacros.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <asm/boot.h>
-typedef unsigned char byte;
-typedef unsigned short word;
-typedef unsigned long u32;
-#define DEFAULT_MAJOR_ROOT 0
-#define DEFAULT_MINOR_ROOT 0
-/* Minimal number of setup sectors (see also bootsect.S) */
-#define SETUP_SECTS 4
-byte buf[1024];
-int fd;
-int is_big_kernel;
-void die(const char * str, ...)
-{
-        va_list args;
-        va_start(args, str);
-        vfprintf(stderr, str, args);
-        fputc('\n', stderr);
-        exit(1);
-}
-void file_open(const char *name)
-{
-        if ((fd = open(name, O_RDONLY, 0)) < 0)
-                die("Unable to open `%s': %m", name);
-}
-void usage(void)
-{
-        die("Usage: build [-b] bootsect setup system [rootdev] [> image]");
-}
-int main(int argc, char ** argv)
-{
-        unsigned int i, c, sz, setup_sectors;
-        u32 sys_size;
-        byte major_root, minor_root;
-        struct stat sb;
-        if (argc > 2 && !strcmp(argv[1], "-b"))
-          {
-            is_big_kernel = 1;
-            argc--, argv++;
-          }
-        if ((argc < 4) || (argc > 5))
-                usage();
-        if (argc > 4) {
-                if (!strcmp(argv[4], "CURRENT")) {
-                        if (stat("/", &sb)) {
-                                perror("/");
-                                die("Couldn't stat /");
-                        }
-                        major_root = major(sb.st_dev);
-                        minor_root = minor(sb.st_dev);
-                } else if (strcmp(argv[4], "FLOPPY")) {
-                        if (stat(argv[4], &sb)) {
-                                perror(argv[4]);
-                                die("Couldn't stat root device.");
-                        }
-                        major_root = major(sb.st_rdev);
-                        minor_root = minor(sb.st_rdev);
-                } else {
-                        major_root = 0;
-                        minor_root = 0;
-                }
-        } else {
-                major_root = DEFAULT_MAJOR_ROOT;
-                minor_root = DEFAULT_MINOR_ROOT;
-        }
-        fprintf(stderr, "Root device is (%d, %d)\n", major_root, minor_root);
-        file_open(argv[1]);
-        i = read(fd, buf, sizeof(buf));
-        fprintf(stderr,"Boot sector %d bytes.\n",i);
-        if (i != 512)
-                die("Boot block must be exactly 512 bytes");
-        if (buf[510] != 0x55 || buf[511] != 0xaa)
-                die("Boot block hasn't got boot flag (0xAA55)");
-        buf[508] = minor_root;
-        buf[509] = major_root;
-        if (write(1, buf, 512) != 512)
-                die("Write call failed");
-        close (fd);
-        file_open(argv[2]);                                 /* Copy the setup code */
-        for (i=0 ; (c=read(fd, buf, sizeof(buf)))>0 ; i+=c )
-                if (write(1, buf, c) != c)
-                        die("Write call failed");
-        if (c != 0)
-                die("read-error on `setup'");
-        close (fd);
-        setup_sectors = (i + 511) / 512;        /* Pad unused space with zeros */
-        /* for compatibility with ancient versions of LILO. */
-        if (setup_sectors < SETUP_SECTS)
-                setup_sectors = SETUP_SECTS;
-        fprintf(stderr, "Setup is %d bytes.\n", i);
-        memset(buf, 0, sizeof(buf));
-        while (i < setup_sectors * 512) {
-                c = setup_sectors * 512 - i;
-                if (c > sizeof(buf))
-                        c = sizeof(buf);
-                if (write(1, buf, c) != c)
-                        die("Write call failed");
-                i += c;
-        }
-        file_open(argv[3]);
-        if (fstat (fd, &sb))
-                die("Unable to stat `%s': %m", argv[3]);
-        sz = sb.st_size;
-        fprintf (stderr, "System is %d kB\n", sz/1024);
-        sys_size = (sz + 15) / 16;
-        if (!is_big_kernel && sys_size > DEF_SYSSIZE)
-                die("System is too big. Try using bzImage or modules.");
-        while (sz > 0) {
-                int l, n;
-                l = (sz > sizeof(buf)) ? sizeof(buf) : sz;
-                if ((n=read(fd, buf, l)) != l) {
-                        if (n < 0)
-                                die("Error reading %s: %m", argv[3]);
-                        else
-                                die("%s: Unexpected EOF", argv[3]);
-                }
-                if (write(1, buf, l) != l)
-                        die("Write failed");
-                sz -= l;
-        }
-        close(fd);
-        if (lseek(1, 497, SEEK_SET) != 497)                 /* Write sizes to the bootsector */
-                die("Output: seek failed");
-        buf[0] = setup_sectors;
-        if (write(1, buf, 1) != 1)
-                die("Write of setup sector count failed");
-        if (lseek(1, 500, SEEK_SET) != 500)
-                die("Output: seek failed");
-        buf[0] = (sys_size & 0xff);
-        buf[1] = ((sys_size >> 8) & 0xff);
-        buf[2] = ((sys_size >> 16) & 0xff);
-        buf[3] = ((sys_size >> 24) & 0xff);
-        if (write(1, buf, 4) != 4)
-                die("Write of image length failed");
-        return 0;                                           /* Everything is OK */
-}
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
index 47565c3345..3f66e970d8 100644
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
@@ -526,7 +526,7 @@ ia32_sys_call_table:
        .quad sys_init_module
        .quad sys_delete_module
        .quad quiet_ni_syscall          /* 130  get_kernel_syms */
-        .quad sys_quotactl
+        .quad sys32_quotactl
        .quad sys_getpgid
        .quad sys_fchdir
        .quad quiet_ni_syscall  /* bdflush */
@@ -719,4 +719,5 @@ ia32_sys_call_table:
        .quad compat_sys_signalfd
        .quad compat_sys_timerfd
        .quad sys_eventfd
+        .quad sys32_fallocate
 ia32_syscall_end:
diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86_64/ia32/sys_ia32.c
index 99a78a3cce..bee96d6144 100644
--- a/arch/x86_64/ia32/sys_ia32.c
+++ b/arch/x86_64/ia32/sys_ia32.c
@@ -879,3 +879,11 @@ asmlinkage long sys32_fadvise64(int fd, unsigned offset_lo, unsigned offset_hi,
        return sys_fadvise64_64(fd, ((u64)offset_hi << 32) | offset_lo,
                                len, advice);
 }
+asmlinkage long sys32_fallocate(int fd, int mode, unsigned offset_lo,
+                                unsigned offset_hi, unsigned len_lo,
+                                unsigned len_hi)
+{
+        return sys_fallocate(fd, mode, ((u64)offset_hi << 32) | offset_lo,
+                             ((u64)len_hi << 32) | len_lo);
+}
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index de1de8a2fd..47f1dc30bf 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -44,6 +44,7 @@ obj-$(CONFIG_PCI)		+= early-quirks.o
 obj-y                           += topology.o
 obj-y                           += intel_cacheinfo.o
+obj-y                           += addon_cpuid_features.o
 obj-y                           += pcspeaker.o
 CFLAGS_vsyscall.o               := $(PROFILING) -g0
@@ -55,6 +56,7 @@ cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../i386/kernel/cpuid.o
 topology-y                     += ../../i386/kernel/topology.o
 microcode-$(subst m,y,$(CONFIG_MICROCODE))  += ../../i386/kernel/microcode.o
 intel_cacheinfo-y               += ../../i386/kernel/cpu/intel_cacheinfo.o
+addon_cpuid_features-y          += ../../i386/kernel/cpu/addon_cpuid_features.o
 quirks-y                        += ../../i386/kernel/quirks.o
 i8237-y                         += ../../i386/kernel/i8237.o
 msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../i386/kernel/msr.o
diff --git a/arch/x86_64/kernel/cpufreq/Kconfig b/arch/x86_64/kernel/cpufreq/Kconfig
index c0749d2479..a3fd51926c 100644
--- a/arch/x86_64/kernel/cpufreq/Kconfig
+++ b/arch/x86_64/kernel/cpufreq/Kconfig
@@ -48,10 +48,6 @@ config X86_SPEEDSTEP_CENTRINO
          If in doubt, say N.
-config X86_SPEEDSTEP_CENTRINO_ACPI
-        bool
-        depends on X86_SPEEDSTEP_CENTRINO
 config X86_ACPI_CPUFREQ
        tristate "ACPI Processor P-States driver"
        select CPU_FREQ_TABLE
@@ -73,7 +69,7 @@ comment "shared options"
 config X86_ACPI_CPUFREQ_PROC_INTF
        bool "/proc/acpi/processor/../performance interface (deprecated)"
        depends on PROC_FS
-        depends on X86_ACPI_CPUFREQ || X86_SPEEDSTEP_CENTRINO_ACPI || X86_POWERNOW_K8_ACPI
+        depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K8_ACPI
        help
          This enables the deprecated /proc/acpi/processor/../performance
          interface. While it is helpful for debugging, the generic,
diff --git a/arch/x86_64/kernel/early_printk.c b/arch/x86_64/kernel/early_printk.c
index 296d2b0c5d..fd9aff3f38 100644
--- a/arch/x86_64/kernel/early_printk.c
+++ b/arch/x86_64/kernel/early_printk.c
@@ -6,6 +6,7 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/fcntl.h>
+#include <xen/hvc-console.h>
 /* Simple VGA output */
@@ -242,6 +243,10 @@ static int __init setup_early_printk(char *buf)
                simnow_init(buf + 6);
                early_console = &simnow_console;
                keep_early = 1;
+#ifdef CONFIG_HVC_XEN
+        } else if (!strncmp(buf, "xen", 3)) {
+                early_console = &xenboot_console;
+#endif
        }
        if (keep_early)
diff --git a/arch/x86_64/kernel/head.S b/arch/x86_64/kernel/head.S
index 1fab487dee..941c84baec 100644
--- a/arch/x86_64/kernel/head.S
+++ b/arch/x86_64/kernel/head.S
@@ -73,7 +73,11 @@ startup_64:
        addq    %rbp, init_level4_pgt + (511*8)(%rip)
        addq    %rbp, level3_ident_pgt + 0(%rip)
        addq    %rbp, level3_kernel_pgt + (510*8)(%rip)
+        addq    %rbp, level3_kernel_pgt + (511*8)(%rip)
+        addq    %rbp, level2_fixmap_pgt + (506*8)(%rip)
        /* Add an Identity mapping if I am above 1G */
        leaq    _text(%rip), %rdi
@@ -314,7 +318,16 @@ NEXT_PAGE(level3_kernel_pgt)
        .fill   510,8,0
        /* (2^48-(2*1024*1024*1024)-((2^39)*511))/(2^30) = 510 */
        .quad   level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
-        .fill   1,8,0
+        .quad   level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
+NEXT_PAGE(level2_fixmap_pgt)
+        .fill   506,8,0
+        .quad   level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
+        /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
+        .fill   5,8,0
+NEXT_PAGE(level1_fixmap_pgt)
+        .fill   512,8,0
 NEXT_PAGE(level2_ident_pgt)
        /* Since I easily can, map the first 1G.
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index d8bfe31547..1c6c6f7245 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -1492,6 +1492,7 @@ static void ack_lapic_irq (unsigned int irq)
 static void end_lapic_irq (unsigned int i) { /* nothing */ }
 static struct hw_interrupt_type lapic_irq_type __read_mostly = {
+        .name = "local-APIC",
        .typename = "local-APIC-edge",
        .startup = NULL, /* startup_irq() not used for IRQ0 */
        .shutdown = NULL, /* shutdown_irq() not used for IRQ0 */
diff --git a/arch/x86_64/kernel/irq.c b/arch/x86_64/kernel/irq.c
index 3eaceac324..39cb3fa83e 100644
--- a/arch/x86_64/kernel/irq.c
+++ b/arch/x86_64/kernel/irq.c
@@ -144,17 +144,43 @@ void fixup_irqs(cpumask_t map)
        for (irq = 0; irq < NR_IRQS; irq++) {
                cpumask_t mask;
+                int break_affinity = 0;
+                int set_affinity = 1;
                if (irq == 2)
                        continue;
+                /* interrupt's are disabled at this point */
+                spin_lock(&irq_desc[irq].lock);
+                if (!irq_has_action(irq) ||
+                    cpus_equal(irq_desc[irq].affinity, map)) {
+                        spin_unlock(&irq_desc[irq].lock);
+                        continue;
+                }
                cpus_and(mask, irq_desc[irq].affinity, map);
-                if (any_online_cpu(mask) == NR_CPUS) {
+                if (cpus_empty(mask)) {
-                        printk("Breaking affinity for irq %i\n", irq);
+                        break_affinity = 1;
                        mask = map;
                }
+                if (irq_desc[irq].chip->mask)
+                        irq_desc[irq].chip->mask(irq);
                if (irq_desc[irq].chip->set_affinity)
                        irq_desc[irq].chip->set_affinity(irq, mask);
-                else if (irq_desc[irq].action && !(warned++))
+                else if (!(warned++))
+                        set_affinity = 0;
+                if (irq_desc[irq].chip->unmask)
+                        irq_desc[irq].chip->unmask(irq);
+                spin_unlock(&irq_desc[irq].lock);
+                if (break_affinity && set_affinity)
+                        printk("Broke affinity for irq %i\n", irq);
+                else if (!set_affinity)
                        printk("Cannot set affinity for irq %i\n", irq);
        }
diff --git a/arch/x86_64/kernel/mce.c b/arch/x86_64/kernel/mce.c
index a14375dd54..f3fb817455 100644
--- a/arch/x86_64/kernel/mce.c
+++ b/arch/x86_64/kernel/mce.c
@@ -174,7 +174,7 @@ static void do_mce_trigger(void)
        if (events != atomic_read(&mce_logged) && trigger[0]) {
                /* Small race window, but should be harmless.  */
                atomic_set(&mce_logged, events);
-                call_usermodehelper(trigger, trigger_argv, NULL, -1);
+                call_usermodehelper(trigger, trigger_argv, NULL, UMH_NO_WAIT);
        }
 }
@@ -497,15 +497,17 @@ static ssize_t mce_read(struct file *filp, char __user *ubuf, size_t usize, loff
        for (i = 0; i < next; i++) {            
                unsigned long start = jiffies;
                while (!mcelog.entry[i].finished) {
-                        if (!time_before(jiffies, start + 2)) {
+                        if (time_after_eq(jiffies, start + 2)) {
                                memset(mcelog.entry + i,0, sizeof(struct mce));
-                                continue;
+                                goto timeout;
                        }
                        cpu_relax();
                }
                smp_rmb();
                err |= copy_to_user(buf, mcelog.entry + i, sizeof(struct mce));
                buf += sizeof(struct mce); 
+ timeout:
+                ;
        } 
        memset(mcelog.entry, 0, next * sizeof(struct mce));
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c
index 931c64bad5..edbbc59b75 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
@@ -296,7 +296,7 @@ static DEFINE_PER_CPU(unsigned, last_irq_sum);
 static DEFINE_PER_CPU(local_t, alert_counter);
 static DEFINE_PER_CPU(int, nmi_touch);
-void touch_nmi_watchdog (void)
+void touch_nmi_watchdog(void)
 {
        if (nmi_watchdog > 0) {
                unsigned cpu;
@@ -306,8 +306,10 @@ void touch_nmi_watchdog (void)
                 * do it ourselves because the alert count increase is not
                 * atomic.
                 */
-                for_each_present_cpu (cpu)
+                for_each_present_cpu(cpu) {
-                        per_cpu(nmi_touch, cpu) = 1;
+                        if (per_cpu(nmi_touch, cpu) != 1)
+                                per_cpu(nmi_touch, cpu) = 1;
+                }
        }
        touch_softlockup_watchdog();
diff --git a/arch/x86_64/kernel/pci-dma.c b/arch/x86_64/kernel/pci-dma.c
index 9f80aad3fe..90f6315d02 100644
--- a/arch/x86_64/kernel/pci-dma.c
+++ b/arch/x86_64/kernel/pci-dma.c
@@ -22,8 +22,7 @@ EXPORT_SYMBOL(bad_dma_address);
 int iommu_bio_merge __read_mostly = 0;
 EXPORT_SYMBOL(iommu_bio_merge);
-int iommu_sac_force __read_mostly = 0;
+static int iommu_sac_force __read_mostly = 0;
-EXPORT_SYMBOL(iommu_sac_force);
 int no_iommu __read_mostly;
 #ifdef CONFIG_IOMMU_DEBUG
diff --git a/arch/x86_64/kernel/ptrace.c b/arch/x86_64/kernel/ptrace.c
index 9409117b9f..e83cc67155 100644
--- a/arch/x86_64/kernel/ptrace.c
+++ b/arch/x86_64/kernel/ptrace.c
@@ -102,16 +102,25 @@ unsigned long convert_rip_to_linear(struct task_struct *child, struct pt_regs *r
                u32 *desc;
                unsigned long base;
-                down(&child->mm->context.sem);
+                seg &= ~7UL;
-                desc = child->mm->context.ldt + (seg & ~7);
-                base = (desc[0] >> 16) | ((desc[1] & 0xff) << 16) | (desc[1] & 0xff000000);
-                /* 16-bit code segment? */
+                down(&child->mm->context.sem);
-                if (!((desc[1] >> 22) & 1))
+                if (unlikely((seg >> 3) >= child->mm->context.size))
-                        addr &= 0xffff;
+                        addr = -1L; /* bogus selector, access would fault */
-                addr += base;
+                else {
+                        desc = child->mm->context.ldt + seg;
+                        base = ((desc[0] >> 16) |
+                                ((desc[1] & 0xff) << 16) |
+                                (desc[1] & 0xff000000));
+                        /* 16-bit code segment? */
+                        if (!((desc[1] >> 22) & 1))
+                                addr &= 0xffff;
+                        addr += base;
+                }
                up(&child->mm->context.sem);
        }
        return addr;
 }
@@ -313,17 +322,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        switch (request) {
        /* when I and D space are separate, these will need to be fixed. */
        case PTRACE_PEEKTEXT: /* read word at location addr. */ 
-        case PTRACE_PEEKDATA: {
+        case PTRACE_PEEKDATA:
-                unsigned long tmp;
+                ret = generic_ptrace_peekdata(child, addr, data);
-                int copied;
-                copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
-                ret = -EIO;
-                if (copied != sizeof(tmp))
-                        break;
-                ret = put_user(tmp,(unsigned long __user *) data);
                break;
-        }
        /* read the word at location addr in the USER area. */
        case PTRACE_PEEKUSR: {
@@ -367,10 +368,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        /* when I and D space are separate, this will have to be fixed. */
        case PTRACE_POKETEXT: /* write the word at location addr. */
        case PTRACE_POKEDATA:
-                ret = 0;
+                ret = generic_ptrace_pokedata(child, addr, data);
-                if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data))
-                        break;
-                ret = -EIO;
                break;
        case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index eb6524f3ac..33ef718f8c 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -846,6 +846,8 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
                        c->x86_capability[2] = cpuid_edx(0x80860001);
        }
+        init_scattered_cpuid_features(c);
        c->apicid = phys_pkg_id(0);
        /*
@@ -931,7 +933,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
                "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",
                "pat", "pse36", "pn", "clflush", NULL, "dts", "acpi", "mmx",
-                "fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", NULL,
+                "fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", "pbe",
                /* AMD-defined */
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -947,10 +949,11 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                /* Other (Linux-defined) */
-                "cxmmx", NULL, "cyrix_arr", "centaur_mcr", NULL,
+                "cxmmx", "k6_mtrr", "cyrix_arr", "centaur_mcr",
-                "constant_tsc", NULL, NULL,
+                NULL, NULL, NULL, NULL,
-                "up", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                "constant_tsc", "up", NULL, "arch_perfmon",
-                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                "pebs", "bts", NULL, "sync_rdtsc",
+                "rep_good", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                /* Intel-defined (#2) */
@@ -961,7 +964,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                /* VIA/Cyrix/Centaur-defined */
                NULL, NULL, "rng", "rng_en", NULL, NULL, "ace", "ace_en",
-                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                "ace2", "ace2_en", "phe", "phe_en", "pmm", "pmm_en", NULL, NULL,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -972,6 +975,12 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                "osvw", "ibs", NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                /* Auxiliary (Linux-defined) */
+                "ida", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
        };
        static char *x86_power_flags[] = { 
                "ts",   /* temperature sensor */
diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c
index 2ff4685916..0694940b2e 100644
--- a/arch/x86_64/kernel/smp.c
+++ b/arch/x86_64/kernel/smp.c
@@ -357,7 +357,7 @@ __smp_call_function_single(int cpu, void (*func) (void *info), void *info,
 }
 /*
- * smp_call_function_single - Run a function on another CPU
+ * smp_call_function_single - Run a function on a specific CPU
 * @func: The function to run. This must be fast and non-blocking.
 * @info: An arbitrary pointer to pass to the function.
 * @nonatomic: Currently unused.
@@ -374,14 +374,18 @@ int smp_call_function_single (int cpu, void (*func) (void *info), void *info,
 {
        /* prevent preemption and reschedule on another processor */
        int me = get_cpu();
+        /* Can deadlock when called with interrupts disabled */
+        WARN_ON(irqs_disabled());
        if (cpu == me) {
+                local_irq_disable();
+                func(info);
+                local_irq_enable();
                put_cpu();
                return 0;
        }
-        /* Can deadlock when called with interrupts disabled */
-        WARN_ON(irqs_disabled());
        spin_lock_bh(&call_lock);
        __smp_call_function_single(cpu, func, info, nonatomic, wait);
        spin_unlock_bh(&call_lock);
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index aac1c0be54..74cbeb2e99 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -330,6 +330,7 @@ static int print_trace_stack(void *data, char *name)
 static void print_trace_address(void *data, unsigned long addr)
 {
+        touch_nmi_watchdog();
        printk_address(addr);
 }
@@ -518,6 +519,7 @@ void __kprobes __die(const char * str, struct pt_regs * regs, long err)
        printk("\n");
        notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV);
        show_registers(regs);
+        add_taint(TAINT_DIE);
        /* Executive summary in case the oops scrolled away */
        printk(KERN_ALERT "RIP ");
        printk_address(regs->rip); 
@@ -531,7 +533,7 @@ void die(const char * str, struct pt_regs * regs, long err)
        unsigned long flags = oops_begin();
        if (!user_mode(regs))
-                report_bug(regs->rip);
+                report_bug(regs->rip, regs);
        __die(str, regs, err);
        oops_end(flags);
diff --git a/arch/x86_64/kernel/verify_cpu.S b/arch/x86_64/kernel/verify_cpu.S
index e035f59481..45b6f8a975 100644
--- a/arch/x86_64/kernel/verify_cpu.S
+++ b/arch/x86_64/kernel/verify_cpu.S
@@ -37,20 +37,6 @@ verify_cpu:
        pushl   $0                      # Kill any dangerous flags
        popfl
-        /* minimum CPUID flags for x86-64 as defined by AMD */
-#define M(x) (1<<(x))
-#define M2(a,b) M(a)|M(b)
-#define M4(a,b,c,d) M(a)|M(b)|M(c)|M(d)
-#define SSE_MASK \
-        (M2(X86_FEATURE_XMM,X86_FEATURE_XMM2))
-#define REQUIRED_MASK1 \
-        (M4(X86_FEATURE_FPU,X86_FEATURE_PSE,X86_FEATURE_TSC,X86_FEATURE_MSR)|\
-         M4(X86_FEATURE_PAE,X86_FEATURE_CX8,X86_FEATURE_PGE,X86_FEATURE_CMOV)|\
-         M(X86_FEATURE_FXSR))
-#define REQUIRED_MASK2 \
-        (M(X86_FEATURE_LM - 32))
        pushfl                          # standard way to check for cpuid
        popl    %eax
        movl    %eax,%ebx
@@ -79,8 +65,8 @@ verify_cpu:
 verify_cpu_noamd:
        movl    $0x1,%eax               # Does the cpu have what it takes
        cpuid
-        andl    $REQUIRED_MASK1,%edx
+        andl    $REQUIRED_MASK0,%edx
-        xorl    $REQUIRED_MASK1,%edx
+        xorl    $REQUIRED_MASK0,%edx
        jnz     verify_cpu_no_longmode
        movl    $0x80000000,%eax        # See if extended cpuid is implemented
@@ -90,8 +76,8 @@ verify_cpu_noamd:
        movl    $0x80000001,%eax        # Does the cpu have what it takes
        cpuid
-        andl    $REQUIRED_MASK2,%edx
+        andl    $REQUIRED_MASK1,%edx
-        xorl    $REQUIRED_MASK2,%edx
+        xorl    $REQUIRED_MASK1,%edx
        jnz     verify_cpu_no_longmode
 verify_cpu_sse_test:
diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c
index 14104ff630..06a13d9b69 100644
--- a/arch/xtensa/kernel/ptrace.c
+++ b/arch/xtensa/kernel/ptrace.c
@@ -50,18 +50,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        switch (request) {
        case PTRACE_PEEKTEXT: /* read word at location addr. */
        case PTRACE_PEEKDATA:
-        {
+                ret = generic_ptrace_peekdata(child, addr, data);
-                unsigned long tmp;
-                int copied;
-                copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
-                ret = -EIO;
-                if (copied != sizeof(tmp))
-                        break;
-                ret = put_user(tmp,(unsigned long *) data);
                goto out;
-        }
        /* Read the word at location addr in the USER area.  */
@@ -138,10 +128,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        case PTRACE_POKETEXT: /* write the word at location addr. */
        case PTRACE_POKEDATA:
-                if (access_process_vm(child, addr, &data, sizeof(data), 1)
+                ret = generic_ptrace_pokedata(child, addr, data);
-                    == sizeof(data))
-                        break;
-                ret = -EIO;
                goto out;
        case PTRACE_POKEUSR:
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index 693ab26848..c5e62f9d9f 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -482,6 +482,7 @@ void die(const char * str, struct pt_regs * regs, long err)
        if (!user_mode(regs))
                show_stack(NULL, (unsigned long*)regs->areg[1]);
+        add_taint(TAINT_DIE);
        spin_unlock_irq(&die_lock);
        if (in_interrupt())
author	Steve French <sfrench@us.ibm.com>	2007-07-18 20:38:57 -0400
committer	Steve French <sfrench@us.ibm.com>	2007-07-18 20:38:57 -0400
commit	1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch)
tree	860b95e9a499ade4060848740fc6ce1fbb4e4e8d /arch
parent	70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff)
parent	5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff)