Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree

diff --combined arch/microblaze/Kconfig
index f39c9275a29b478676da6f36972de632ac2a2611,cd5837e298b2a6d10db695d5776be3f3b5697459..b008168ae946b6e479c690911c8d2f0e451b1017
--- 1/arch/microblaze/Kconfig
--- 2/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@@ -6,8 -6,15 +6,15 @@@ mainmenu "Linux/Microblaze Kernel Confi
  config MICROBLAZE
        def_bool y
        select HAVE_LMB
+       select HAVE_FUNCTION_TRACER
+       select HAVE_FUNCTION_TRACE_MCOUNT_TEST
+       select HAVE_FUNCTION_GRAPH_TRACER
+       select HAVE_DYNAMIC_FTRACE
+       select HAVE_FTRACE_MCOUNT_RECORD
        select USB_ARCH_HAS_EHCI
        select ARCH_WANT_OPTIONAL_GPIOLIB
+       select HAVE_OPROFILE
+       select TRACING_SUPPORT
  
  config SWAP
        def_bool n
@@@ -57,12 -64,24 +64,24 @@@ config GENERIC_GPI
  config GENERIC_CSUM
        def_bool y
  
+ config STACKTRACE_SUPPORT
+       def_bool y
+ 
+ config LOCKDEP_SUPPORT
+       def_bool y
+ 
+ config HAVE_LATENCYTOP_SUPPORT
+       def_bool y
+ 
  config PCI
        def_bool n
  
  config NO_DMA
        def_bool y
  
+ config DTC
+       def_bool y
+ 
  source "init/Kconfig"
  
  source "kernel/Kconfig.freezer"
@@@ -71,7 -90,7 +90,7 @@@ source "arch/microblaze/platform/Kconfi
  
  menu "Processor type and features"
  
- source kernel/time/Kconfig
+ source "kernel/time/Kconfig"
  
  source "kernel/Kconfig.preempt"
  
@@@ -111,7 -130,6 +130,7 @@@ config CMDLINE_FORC
  
  config OF
        def_bool y
 +      select OF_FLATTREE
  
  config PROC_DEVICETREE
        bool "Support for device tree in /proc"

diff --combined arch/powerpc/Kconfig
index 2a75c6ae2a8b174bd4a66ecd769bde7188f4fa88,ba3948c700727b212aa2952e729176b7c1501442..50c9af43e0170ac66b283dc2d57bdc28cbc35d96
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -56,6 -56,16 +56,16 @@@ config IRQ_PER_CP
        bool
        default y
  
+ config NR_IRQS
+       int "Number of virtual interrupt numbers"
+       range 32 512
+       default "512"
+       help
+         This defines the number of virtual interrupt numbers the kernel
+         can manage. Virtual interrupt numbers are what you see in
+         /proc/interrupts. If you configure your system to have too few,
+         drivers will fail to load or worse - handle with care.
+ 
  config STACKTRACE_SUPPORT
        bool
        default y
@@@ -163,7 -173,6 +173,7 @@@ config PPC_O
  
  config OF
        def_bool y
 +      select OF_FLATTREE
  
  config PPC_UDBG_16550
        bool
@@@ -200,24 -209,14 +210,14 @@@ config DEFAULT_UIMAG
  config REDBOOT
        bool
  
- config HIBERNATE_32
-       bool
-       depends on (PPC_PMAC && !SMP) || BROKEN
-       default y
- 
- config HIBERNATE_64
-       bool
-       depends on BROKEN || (PPC_PMAC64 && EXPERIMENTAL)
-       default y
- 
  config ARCH_HIBERNATION_POSSIBLE
        bool
-       depends on (PPC64 && HIBERNATE_64) || (PPC32 && HIBERNATE_32)
        default y
  
  config ARCH_SUSPEND_POSSIBLE
        def_bool y
-       depends on ADB_PMU || PPC_EFIKA || PPC_LITE5200 || PPC_83xx
+       depends on ADB_PMU || PPC_EFIKA || PPC_LITE5200 || PPC_83xx || \
+                  PPC_85xx || PPC_86xx
  
  config PPC_DCR_NATIVE
        bool
@@@ -321,6 -320,10 +321,10 @@@ config HOTPLUG_CP
  
          Say N if you are unsure.
  
+ config ARCH_CPU_PROBE_RELEASE
+       def_bool y
+       depends on HOTPLUG_CPU
+ 
  config ARCH_ENABLE_MEMORY_HOTPLUG
        def_bool y
  
@@@ -379,6 -382,19 +383,19 @@@ config IRQ_ALL_CPU
          CPU.  Generally saying Y is safe, although some problems have been
          reported with SMP Power Macintoshes with this option enabled.
  
+ config SPARSE_IRQ
+       bool "Support sparse irq numbering"
+       default y
+       help
+         This enables support for sparse irqs. This is useful for distro
+         kernels that want to define a high CONFIG_NR_CPUS value but still
+         want to have low kernel memory footprint on smaller machines.
+ 
+         ( Sparse IRQs can also be beneficial on NUMA boxes, as they spread
+           out the irq_desc[] array in a more NUMA-friendly way. )
+ 
+         If you don't know what to do here, say Y.
+ 
  config NUMA
        bool "NUMA support"
        depends on PPC64
@@@ -653,6 -669,14 +670,14 @@@ config FSL_PC
        select PPC_INDIRECT_PCI
        select PCI_QUIRKS
  
+ config FSL_PMC
+       bool
+       default y
+       depends on SUSPEND && (PPC_85xx || PPC_86xx)
+       help
+         Freescale MPC85xx/MPC86xx power management controller support
+         (suspend/resume). For MPC83xx see platforms/83xx/suspend.c
+ 
  config 4xx_SOC
        bool
  
@@@ -680,7 -704,7 +705,7 @@@ config PPC_PCI_CHOIC
  config PCI
        bool "PCI support" if PPC_PCI_CHOICE
        default y if !40x && !CPM2 && !8xx && !PPC_83xx \
-               && !PPC_85xx && !PPC_86xx
+               && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON
        default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
        default PCI_QSPAN if !4xx && !CPM2 && 8xx
        select ARCH_SUPPORTS_MSI

diff --combined arch/sparc/kernel/of_device_64.c
index 036f18ae59a64941d3ce92fc062458fea2dcc259,0a6f2d1798d11b37b5f8570b8bafb0326531d164..b3d4cb5d21b333c54fee00998491644397eb92d1
--- 1/arch/sparc/kernel/of_device_64.c
--- 2/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@@ -104,9 -104,19 +104,19 @@@ static int of_bus_pci_map(u32 *addr, co
        int i;
  
        /* Check address type match */
-       if ((addr[0] ^ range[0]) & 0x03000000)
-               return -EINVAL;
+       if (!((addr[0] ^ range[0]) & 0x03000000))
+               goto type_match;
+ 
+       /* Special exception, we can map a 64-bit address into
+        * a 32-bit range.
+        */
+       if ((addr[0] & 0x03000000) == 0x03000000 &&
+           (range[0] & 0x03000000) == 0x02000000)
+               goto type_match;
+ 
+       return -EINVAL;
  
+ type_match:
        if (of_out_of_range(addr + 1, range + 1, range + na + pna,
                            na - 1, ns))
                return -EINVAL;
@@@ -666,7 -676,7 +676,7 @@@ static struct of_device * __init scan_o
        if (!parent)
                dev_set_name(&op->dev, "root");
        else
 -              dev_set_name(&op->dev, "%08x", dp->node);
 +              dev_set_name(&op->dev, "%08x", dp->phandle);
  
        if (of_device_register(op)) {
                printk("%s: Could not register of device.\n",

diff --combined drivers/video/aty/atyfb_base.c
index bb20987d58afe4e22c4eb6484bc6673d412c4d26,1ddeb4c34763a3db66b6f2e3c863ff56747c300e..5f1b5807a48fd79fc43a09470facd03d8b4d7ece
--- 1/drivers/video/aty/atyfb_base.c
--- 2/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@@ -3104,7 -3104,7 +3104,7 @@@ static int __devinit atyfb_setup_sparc(
        }
  
        dp = pci_device_to_OF_node(pdev);
 -      if (node == dp->node) {
 +      if (node == dp->phandle) {
                struct fb_var_screeninfo *var = &default_var;
                unsigned int N, P, Q, M, T, R;
                u32 v_total, h_total;
@@@ -3276,7 -3276,7 +3276,7 @@@ static void __devinit aty_init_lcd(stru
                                txtformat = "24 bit interface";
                                break;
                        default:
-                               txtformat = "unkown format";
+                               txtformat = "unknown format";
                        }
                } else {
                        switch (format & 7) {
@@@ -3299,7 -3299,7 +3299,7 @@@
                                txtformat = "262144 colours (FDPI-2 mode)";
                                break;
                        default:
-                               txtformat = "unkown format";
+                               txtformat = "unknown format";
                        }
                }
                PRINTKI("%s%s %s monitor detected: %s\n",