aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-02-02 03:05:22 -0500
committerGrant Likely <grant.likely@secretlab.ca>2010-02-02 03:05:22 -0500
commitfb7899b1f0b748ef966071f5dc23c59ebd57d08f (patch)
tree2f13f9d8607871a60334608524e8b4e9447f5309 /arch
parent212b3c8b8ab94d983c2e0ee1821f17dd5b4e0859 (diff)
parentabe94c756c08d50566c09a65b9c7fe72f83071c5 (diff)
Merge commit 'v2.6.33-rc6' into secretlab/next-spi
Diffstat (limited to 'arch')
-rw-r--r--arch/alpha/include/asm/topology.h3
-rw-r--r--arch/arm/Kconfig70
-rw-r--r--arch/arm/Makefile4
-rw-r--r--arch/arm/boot/compressed/head.S8
-rw-r--r--arch/arm/boot/compressed/misc.c13
-rw-r--r--arch/arm/include/asm/cacheflush.h20
-rw-r--r--arch/arm/kernel/debug.S20
-rw-r--r--arch/arm/kernel/elf.c9
-rw-r--r--arch/arm/mach-davinci/include/mach/keyscan.h1
-rw-r--r--arch/arm/mach-gemini/include/mach/uncompress.h4
-rw-r--r--arch/arm/mach-kirkwood/rd88f6192-nas-setup.c6
-rw-r--r--arch/arm/mach-omap1/clock.c6
-rw-r--r--arch/arm/mach-omap2/clock34xx_data.c4
-rw-r--r--arch/arm/mach-omap2/clock44xx_data.c62
-rw-r--r--arch/arm/mach-omap2/cpuidle34xx.c2
-rw-r--r--arch/arm/mach-omap2/gpmc.c2
-rw-r--r--arch/arm/mach-omap2/id.c41
-rw-r--r--arch/arm/mach-omap2/irq.c18
-rw-r--r--arch/arm/mach-omap2/mux.c27
-rw-r--r--arch/arm/mach-omap2/mux.h24
-rw-r--r--arch/arm/mach-omap2/omap_hwmod.c3
-rw-r--r--arch/arm/mach-omap2/pm-debug.c12
-rw-r--r--arch/arm/mach-omap2/pm.h8
-rw-r--r--arch/arm/mach-omap2/pm34xx.c47
-rw-r--r--arch/arm/mach-omap2/prcm.c11
-rw-r--r--arch/arm/mach-omap2/prm.h2
-rw-r--r--arch/arm/mach-omap2/prm44xx.h32
-rw-r--r--arch/arm/mach-omap2/sleep34xx.S13
-rw-r--r--arch/arm/mach-orion5x/dns323-setup.c33
-rw-r--r--arch/arm/mach-orion5x/wrt350n-v2-setup.c79
-rw-r--r--arch/arm/mach-pxa/corgi.c1
-rw-r--r--arch/arm/mach-pxa/include/mach/mfp-pxa25x.h6
-rw-r--r--arch/arm/mach-pxa/irq.c14
-rw-r--r--arch/arm/mach-s3c2440/mach-mini2440.c36
-rw-r--r--arch/arm/mach-s3c6410/mach-hmt.c2
-rw-r--r--arch/arm/mach-s3c6410/mach-smdk6410.c1
-rw-r--r--arch/arm/mm/mmu.c2
-rw-r--r--arch/arm/mm/proc-v6.S2
-rw-r--r--arch/arm/mm/proc-v7.S11
-rw-r--r--arch/arm/plat-mxc/include/mach/uncompress.h4
-rw-r--r--arch/arm/plat-omap/common.c26
-rw-r--r--arch/arm/plat-omap/dma.c2
-rw-r--r--arch/arm/plat-omap/dmtimer.c13
-rw-r--r--arch/arm/plat-omap/include/plat/cpu.h1
-rw-r--r--arch/arm/plat-omap/include/plat/irqs.h3
-rw-r--r--arch/arm/plat-omap/include/plat/omap_hwmod.h1
-rw-r--r--arch/arm/plat-orion/pcie.c6
-rw-r--r--arch/arm/plat-s3c/dev-nand.c4
-rw-r--r--arch/arm/tools/mach-types60
-rw-r--r--arch/m68knommu/platform/coldfire/pit.c1
-rw-r--r--arch/microblaze/Kconfig2
-rw-r--r--arch/microblaze/include/asm/ptrace.h14
-rw-r--r--arch/microblaze/include/asm/unistd.h5
-rw-r--r--arch/microblaze/kernel/prom_parse.c2
-rw-r--r--arch/microblaze/kernel/syscall_table.S2
-rw-r--r--arch/mips/Kconfig1
-rw-r--r--arch/mips/boot/compressed/Makefile9
-rw-r--r--arch/mips/boot/compressed/decompress.c4
-rw-r--r--arch/mips/include/asm/irq.h1
-rw-r--r--arch/mips/include/asm/mach-powertv/asic_reg_map.h90
-rw-r--r--arch/mips/include/asm/mach-powertv/asic_regs.h135
-rw-r--r--arch/mips/include/asm/mipsregs.h12
-rw-r--r--arch/mips/kernel/cevt-r4k.c2
-rw-r--r--arch/mips/kernel/traps.c6
-rw-r--r--arch/mips/powertv/asic/asic-calliope.c131
-rw-r--r--arch/mips/powertv/asic/asic-cronus.c131
-rw-r--r--arch/mips/powertv/asic/asic-zeus.c131
-rw-r--r--arch/mips/powertv/asic/asic_devices.c46
-rw-r--r--arch/powerpc/boot/Makefile4
-rwxr-xr-xarch/powerpc/boot/wrapper7
-rw-r--r--arch/powerpc/configs/52xx/cm5200_defconfig75
-rw-r--r--arch/powerpc/configs/52xx/lite5200b_defconfig90
-rw-r--r--arch/powerpc/configs/52xx/motionpro_defconfig79
-rw-r--r--arch/powerpc/configs/52xx/pcm030_defconfig83
-rw-r--r--arch/powerpc/configs/52xx/tqm5200_defconfig79
-rw-r--r--arch/powerpc/configs/83xx/asp8347_defconfig88
-rw-r--r--arch/powerpc/configs/83xx/kmeter1_defconfig68
-rw-r--r--arch/powerpc/configs/83xx/mpc8313_rdb_defconfig97
-rw-r--r--arch/powerpc/configs/83xx/mpc8315_rdb_defconfig100
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_mds_defconfig89
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_rdb_defconfig93
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itx_defconfig95
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig92
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_mds_defconfig86
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_mds_defconfig89
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_rdk_defconfig87
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_mds_defconfig89
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_rdb_defconfig91
-rw-r--r--arch/powerpc/configs/83xx/sbc834x_defconfig85
-rw-r--r--arch/powerpc/configs/85xx/ksi8560_defconfig69
-rw-r--r--arch/powerpc/configs/85xx/mpc8540_ads_defconfig69
-rw-r--r--arch/powerpc/configs/85xx/mpc8560_ads_defconfig76
-rw-r--r--arch/powerpc/configs/85xx/mpc85xx_cds_defconfig75
-rw-r--r--arch/powerpc/configs/85xx/sbc8548_defconfig77
-rw-r--r--arch/powerpc/configs/85xx/sbc8560_defconfig72
-rw-r--r--arch/powerpc/configs/85xx/socrates_defconfig99
-rw-r--r--arch/powerpc/configs/85xx/stx_gp3_defconfig87
-rw-r--r--arch/powerpc/configs/85xx/tqm8540_defconfig89
-rw-r--r--arch/powerpc/configs/85xx/tqm8541_defconfig90
-rw-r--r--arch/powerpc/configs/85xx/tqm8548_defconfig95
-rw-r--r--arch/powerpc/configs/85xx/tqm8555_defconfig90
-rw-r--r--arch/powerpc/configs/85xx/tqm8560_defconfig90
-rw-r--r--arch/powerpc/configs/85xx/xes_mpc85xx_defconfig103
-rw-r--r--arch/powerpc/configs/86xx/gef_ppc9a_defconfig102
-rw-r--r--arch/powerpc/configs/86xx/gef_sbc310_defconfig99
-rw-r--r--arch/powerpc/configs/86xx/gef_sbc610_defconfig92
-rw-r--r--arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig88
-rw-r--r--arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig90
-rw-r--r--arch/powerpc/configs/86xx/sbc8641d_defconfig81
-rw-r--r--arch/powerpc/configs/adder875_defconfig57
-rw-r--r--arch/powerpc/configs/c2k_defconfig90
-rw-r--r--arch/powerpc/configs/ep8248e_defconfig64
-rw-r--r--arch/powerpc/configs/ep88xc_defconfig55
-rw-r--r--arch/powerpc/configs/linkstation_defconfig96
-rw-r--r--arch/powerpc/configs/mgcoge_defconfig74
-rw-r--r--arch/powerpc/configs/mgsuvd_defconfig63
-rw-r--r--arch/powerpc/configs/mpc5200_defconfig106
-rw-r--r--arch/powerpc/configs/mpc7448_hpc2_defconfig79
-rw-r--r--arch/powerpc/configs/mpc8272_ads_defconfig70
-rw-r--r--arch/powerpc/configs/mpc83xx_defconfig92
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig97
-rw-r--r--arch/powerpc/configs/mpc85xx_smp_defconfig97
-rw-r--r--arch/powerpc/configs/mpc866_ads_defconfig65
-rw-r--r--arch/powerpc/configs/mpc86xx_defconfig93
-rw-r--r--arch/powerpc/configs/mpc885_ads_defconfig55
-rw-r--r--arch/powerpc/configs/pq2fads_defconfig72
-rw-r--r--arch/powerpc/configs/prpmc2800_defconfig94
-rw-r--r--arch/powerpc/configs/storcenter_defconfig86
-rw-r--r--arch/powerpc/include/asm/topology.h4
-rw-r--r--arch/powerpc/kernel/head_8xx.S12
-rw-r--r--arch/powerpc/kernel/rtas-proc.c14
-rw-r--r--arch/powerpc/kernel/smp.c12
-rw-r--r--arch/powerpc/kernel/swsusp_32.S2
-rw-r--r--arch/powerpc/kernel/time.c11
-rw-r--r--arch/powerpc/kvm/Kconfig2
-rw-r--r--arch/powerpc/mm/mmap_64.c4
-rw-r--r--arch/powerpc/platforms/cell/spufs/coredump.c2
-rw-r--r--arch/powerpc/platforms/iseries/vio.c2
-rw-r--r--arch/powerpc/platforms/pseries/dlpar.c18
-rw-r--r--arch/powerpc/platforms/pseries/xics.c12
-rw-r--r--arch/s390/include/asm/bug.h4
-rw-r--r--arch/s390/include/asm/irqflags.h9
-rw-r--r--arch/s390/include/asm/sigp.h20
-rw-r--r--arch/s390/include/asm/thread_info.h12
-rw-r--r--arch/s390/include/asm/unistd.h6
-rw-r--r--arch/s390/kernel/compat_linux.c41
-rw-r--r--arch/s390/kernel/compat_wrapper.S9
-rw-r--r--arch/s390/kernel/entry.S1
-rw-r--r--arch/s390/kernel/entry64.S1
-rw-r--r--arch/s390/kernel/process.c3
-rw-r--r--arch/s390/kernel/ptrace.c8
-rw-r--r--arch/s390/kernel/setup.c8
-rw-r--r--arch/s390/kernel/signal.c12
-rw-r--r--arch/s390/kernel/smp.c9
-rw-r--r--arch/s390/kernel/syscalls.S1
-rw-r--r--arch/s390/kernel/topology.c2
-rw-r--r--arch/s390/kvm/intercept.c4
-rw-r--r--arch/s390/lib/spinlock.c2
-rw-r--r--arch/s390/mm/mmap.c4
-rw-r--r--arch/sh/boards/mach-ecovec24/setup.c8
-rw-r--r--arch/sh/boards/mach-se/7724/setup.c2
-rw-r--r--arch/sh/include/asm/unistd_32.h5
-rw-r--r--arch/sh/include/asm/unistd_64.h3
-rw-r--r--arch/sh/kernel/process_64.c2
-rw-r--r--arch/sh/kernel/syscalls_32.S1
-rw-r--r--arch/sh/kernel/syscalls_64.S1
-rw-r--r--arch/sh/tools/Makefile2
-rw-r--r--arch/sparc/Kconfig5
-rw-r--r--arch/sparc/configs/sparc32_defconfig87
-rw-r--r--arch/sparc/configs/sparc64_defconfig131
-rw-r--r--arch/sparc/include/asm/elf_64.h13
-rw-r--r--arch/sparc/include/asm/io_32.h2
-rw-r--r--arch/sparc/include/asm/page_32.h2
-rw-r--r--arch/sparc/include/asm/param.h19
-rw-r--r--arch/sparc/include/asm/thread_info_64.h4
-rw-r--r--arch/sparc/include/asm/timex_32.h1
-rw-r--r--arch/sparc/include/asm/topology_64.h4
-rw-r--r--arch/sparc/include/asm/uaccess_32.h2
-rw-r--r--arch/sparc/include/asm/uaccess_64.h2
-rw-r--r--arch/sparc/kernel/central.c4
-rw-r--r--arch/sparc/kernel/irq_64.c41
-rw-r--r--arch/sparc/kernel/pcic.c103
-rw-r--r--arch/sparc/kernel/perf_event.c627
-rw-r--r--arch/sparc/kernel/process_64.c8
-rw-r--r--arch/sparc/kernel/sys_sparc_64.c6
-rw-r--r--arch/sparc/kernel/time_32.c116
-rw-r--r--arch/sparc/mm/fault_32.c12
-rw-r--r--arch/sparc/mm/fault_64.c13
-rw-r--r--arch/um/drivers/mconsole_kern.c49
-rw-r--r--arch/x86/Kconfig6
-rw-r--r--arch/x86/ia32/ia32_aout.c11
-rw-r--r--arch/x86/include/asm/cpu_debug.h127
-rw-r--r--arch/x86/include/asm/elf.h10
-rw-r--r--arch/x86/include/asm/hpet.h1
-rw-r--r--arch/x86/include/asm/mce.h3
-rw-r--r--arch/x86/include/asm/microcode.h2
-rw-r--r--arch/x86/include/asm/perf_event.h1
-rw-r--r--arch/x86/include/asm/thread_info.h2
-rw-r--r--arch/x86/include/asm/uv/uv_hub.h12
-rw-r--r--arch/x86/kernel/acpi/boot.c22
-rw-r--r--arch/x86/kernel/aperture_64.c1
-rw-r--r--arch/x86/kernel/apic/apic.c15
-rw-r--r--arch/x86/kernel/apic/apic_flat_64.c5
-rw-r--r--arch/x86/kernel/apic/probe_64.c8
-rw-r--r--arch/x86/kernel/apic/x2apic_uv_x.c26
-rw-r--r--arch/x86/kernel/cpu/Makefile2
-rw-r--r--arch/x86/kernel/cpu/cpu_debug.c688
-rw-r--r--arch/x86/kernel/cpu/perf_event.c7
-rw-r--r--arch/x86/kernel/cpuid.c2
-rw-r--r--arch/x86/kernel/dumpstack.c14
-rw-r--r--arch/x86/kernel/hpet.c8
-rw-r--r--arch/x86/kernel/microcode_amd.c44
-rw-r--r--arch/x86/kernel/microcode_core.c6
-rw-r--r--arch/x86/kernel/msr.c2
-rw-r--r--arch/x86/kernel/process.c14
-rw-r--r--arch/x86/kernel/process_64.c11
-rw-r--r--arch/x86/kernel/quirks.c13
-rw-r--r--arch/x86/kvm/lapic.c11
-rw-r--r--arch/x86/kvm/mmu.c6
-rw-r--r--arch/x86/kvm/paging_tmpl.h4
-rw-r--r--arch/x86/kvm/x86.c6
-rw-r--r--arch/x86/mm/kmmio.c7
-rw-r--r--arch/x86/mm/srat_64.c4
-rw-r--r--arch/x86/pci/Makefile2
-rw-r--r--arch/x86/pci/intel_bus.c94
-rw-r--r--arch/x86/xen/enlighten.c4
226 files changed, 5804 insertions, 3331 deletions
diff --git a/arch/alpha/include/asm/topology.h b/arch/alpha/include/asm/topology.h
index 36b3a30ba0e5..9251e13e144f 100644
--- a/arch/alpha/include/asm/topology.h
+++ b/arch/alpha/include/asm/topology.h
@@ -28,6 +28,9 @@ static const struct cpumask *cpumask_of_node(int node)
28{ 28{
29 int cpu; 29 int cpu;
30 30
31 if (node == -1)
32 return cpu_all_mask;
33
31 cpumask_clear(&node_to_cpumask_map[node]); 34 cpumask_clear(&node_to_cpumask_map[node]);
32 35
33 for_each_online_cpu(cpu) { 36 for_each_online_cpu(cpu) {
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c2238cd474c7..4c33ca82f9b1 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -729,14 +729,26 @@ config ARCH_U8500
729 729
730endchoice 730endchoice
731 731
732source "arch/arm/mach-aaec2000/Kconfig"
733
734source "arch/arm/mach-at91/Kconfig"
735
736source "arch/arm/mach-bcmring/Kconfig"
737
732source "arch/arm/mach-clps711x/Kconfig" 738source "arch/arm/mach-clps711x/Kconfig"
733 739
740source "arch/arm/mach-davinci/Kconfig"
741
742source "arch/arm/mach-dove/Kconfig"
743
734source "arch/arm/mach-ep93xx/Kconfig" 744source "arch/arm/mach-ep93xx/Kconfig"
735 745
736source "arch/arm/mach-footbridge/Kconfig" 746source "arch/arm/mach-footbridge/Kconfig"
737 747
738source "arch/arm/mach-gemini/Kconfig" 748source "arch/arm/mach-gemini/Kconfig"
739 749
750source "arch/arm/mach-h720x/Kconfig"
751
740source "arch/arm/mach-integrator/Kconfig" 752source "arch/arm/mach-integrator/Kconfig"
741 753
742source "arch/arm/mach-iop32x/Kconfig" 754source "arch/arm/mach-iop32x/Kconfig"
@@ -751,16 +763,26 @@ source "arch/arm/mach-ixp2000/Kconfig"
751 763
752source "arch/arm/mach-ixp23xx/Kconfig" 764source "arch/arm/mach-ixp23xx/Kconfig"
753 765
766source "arch/arm/mach-kirkwood/Kconfig"
767
768source "arch/arm/mach-ks8695/Kconfig"
769
770source "arch/arm/mach-lh7a40x/Kconfig"
771
754source "arch/arm/mach-loki/Kconfig" 772source "arch/arm/mach-loki/Kconfig"
755 773
774source "arch/arm/mach-msm/Kconfig"
775
756source "arch/arm/mach-mv78xx0/Kconfig" 776source "arch/arm/mach-mv78xx0/Kconfig"
757 777
758source "arch/arm/mach-pxa/Kconfig" 778source "arch/arm/plat-mxc/Kconfig"
759source "arch/arm/plat-pxa/Kconfig"
760 779
761source "arch/arm/mach-mmp/Kconfig" 780source "arch/arm/mach-netx/Kconfig"
762 781
763source "arch/arm/mach-sa1100/Kconfig" 782source "arch/arm/mach-nomadik/Kconfig"
783source "arch/arm/plat-nomadik/Kconfig"
784
785source "arch/arm/mach-ns9xxx/Kconfig"
764 786
765source "arch/arm/plat-omap/Kconfig" 787source "arch/arm/plat-omap/Kconfig"
766 788
@@ -770,9 +792,14 @@ source "arch/arm/mach-omap2/Kconfig"
770 792
771source "arch/arm/mach-orion5x/Kconfig" 793source "arch/arm/mach-orion5x/Kconfig"
772 794
773source "arch/arm/mach-kirkwood/Kconfig" 795source "arch/arm/mach-pxa/Kconfig"
796source "arch/arm/plat-pxa/Kconfig"
774 797
775source "arch/arm/mach-dove/Kconfig" 798source "arch/arm/mach-mmp/Kconfig"
799
800source "arch/arm/mach-realview/Kconfig"
801
802source "arch/arm/mach-sa1100/Kconfig"
776 803
777source "arch/arm/plat-samsung/Kconfig" 804source "arch/arm/plat-samsung/Kconfig"
778source "arch/arm/plat-s3c24xx/Kconfig" 805source "arch/arm/plat-s3c24xx/Kconfig"
@@ -800,41 +827,14 @@ if ARCH_S5PC1XX
800source "arch/arm/mach-s5pc100/Kconfig" 827source "arch/arm/mach-s5pc100/Kconfig"
801endif 828endif
802 829
803source "arch/arm/mach-lh7a40x/Kconfig" 830source "arch/arm/mach-u300/Kconfig"
804 831
805source "arch/arm/mach-h720x/Kconfig" 832source "arch/arm/mach-ux500/Kconfig"
806 833
807source "arch/arm/mach-versatile/Kconfig" 834source "arch/arm/mach-versatile/Kconfig"
808 835
809source "arch/arm/mach-aaec2000/Kconfig"
810
811source "arch/arm/mach-realview/Kconfig"
812
813source "arch/arm/mach-at91/Kconfig"
814
815source "arch/arm/plat-mxc/Kconfig"
816
817source "arch/arm/mach-nomadik/Kconfig"
818source "arch/arm/plat-nomadik/Kconfig"
819
820source "arch/arm/mach-netx/Kconfig"
821
822source "arch/arm/mach-ns9xxx/Kconfig"
823
824source "arch/arm/mach-davinci/Kconfig"
825
826source "arch/arm/mach-ks8695/Kconfig"
827
828source "arch/arm/mach-msm/Kconfig"
829
830source "arch/arm/mach-u300/Kconfig"
831
832source "arch/arm/mach-w90x900/Kconfig" 836source "arch/arm/mach-w90x900/Kconfig"
833 837
834source "arch/arm/mach-bcmring/Kconfig"
835
836source "arch/arm/mach-ux500/Kconfig"
837
838# Definitions to make life easier 838# Definitions to make life easier
839config ARCH_ACORN 839config ARCH_ACORN
840 bool 840 bool
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index e9da08483b3c..9e7582572741 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -146,6 +146,7 @@ machine-$(CONFIG_ARCH_MX1) := mx1
146machine-$(CONFIG_ARCH_MX2) := mx2 146machine-$(CONFIG_ARCH_MX2) := mx2
147machine-$(CONFIG_ARCH_MX25) := mx25 147machine-$(CONFIG_ARCH_MX25) := mx25
148machine-$(CONFIG_ARCH_MX3) := mx3 148machine-$(CONFIG_ARCH_MX3) := mx3
149machine-$(CONFIG_ARCH_MXC91231) := mxc91231
149machine-$(CONFIG_ARCH_NETX) := netx 150machine-$(CONFIG_ARCH_NETX) := netx
150machine-$(CONFIG_ARCH_NOMADIK) := nomadik 151machine-$(CONFIG_ARCH_NOMADIK) := nomadik
151machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx 152machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx
@@ -171,12 +172,12 @@ machine-$(CONFIG_ARCH_U8500) := ux500
171machine-$(CONFIG_ARCH_VERSATILE) := versatile 172machine-$(CONFIG_ARCH_VERSATILE) := versatile
172machine-$(CONFIG_ARCH_W90X900) := w90x900 173machine-$(CONFIG_ARCH_W90X900) := w90x900
173machine-$(CONFIG_FOOTBRIDGE) := footbridge 174machine-$(CONFIG_FOOTBRIDGE) := footbridge
174machine-$(CONFIG_ARCH_MXC91231) := mxc91231
175 175
176# Platform directory name. This list is sorted alphanumerically 176# Platform directory name. This list is sorted alphanumerically
177# by CONFIG_* macro name. 177# by CONFIG_* macro name.
178plat-$(CONFIG_ARCH_MXC) := mxc 178plat-$(CONFIG_ARCH_MXC) := mxc
179plat-$(CONFIG_ARCH_OMAP) := omap 179plat-$(CONFIG_ARCH_OMAP) := omap
180plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx
180plat-$(CONFIG_PLAT_IOP) := iop 181plat-$(CONFIG_PLAT_IOP) := iop
181plat-$(CONFIG_PLAT_NOMADIK) := nomadik 182plat-$(CONFIG_PLAT_NOMADIK) := nomadik
182plat-$(CONFIG_PLAT_ORION) := orion 183plat-$(CONFIG_PLAT_ORION) := orion
@@ -184,7 +185,6 @@ plat-$(CONFIG_PLAT_PXA) := pxa
184plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c samsung 185plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c samsung
185plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c samsung 186plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c samsung
186plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx s3c samsung 187plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx s3c samsung
187plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx
188 188
189ifeq ($(CONFIG_ARCH_EBSA110),y) 189ifeq ($(CONFIG_ARCH_EBSA110),y)
190# This is what happens if you forget the IOCS16 line. 190# This is what happens if you forget the IOCS16 line.
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index d356af7cef82..4fddc509e78e 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -27,6 +27,14 @@
27 .macro writeb, ch, rb 27 .macro writeb, ch, rb
28 mcr p14, 0, \ch, c0, c5, 0 28 mcr p14, 0, \ch, c0, c5, 0
29 .endm 29 .endm
30#elif defined(CONFIG_CPU_V7)
31 .macro loadsp, rb
32 .endm
33 .macro writeb, ch, rb
34wait: mrc p14, 0, pc, c0, c1, 0
35 bcs wait
36 mcr p14, 0, \ch, c0, c5, 0
37 .endm
30#elif defined(CONFIG_CPU_XSCALE) 38#elif defined(CONFIG_CPU_XSCALE)
31 .macro loadsp, rb 39 .macro loadsp, rb
32 .endm 40 .endm
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
index 7e0fe4d42c7b..56a0d116d271 100644
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
@@ -53,6 +53,18 @@ static void icedcc_putc(int ch)
53 53
54 asm("mcr p14, 0, %0, c0, c5, 0" : : "r" (ch)); 54 asm("mcr p14, 0, %0, c0, c5, 0" : : "r" (ch));
55} 55}
56
57#elif defined(CONFIG_CPU_V7)
58
59static void icedcc_putc(int ch)
60{
61 asm(
62 "wait: mrc p14, 0, pc, c0, c1, 0 \n\
63 bcs wait \n\
64 mcr p14, 0, %0, c0, c5, 0 "
65 : : "r" (ch));
66}
67
56#elif defined(CONFIG_CPU_XSCALE) 68#elif defined(CONFIG_CPU_XSCALE)
57 69
58static void icedcc_putc(int ch) 70static void icedcc_putc(int ch)
@@ -88,7 +100,6 @@ static void icedcc_putc(int ch)
88#endif 100#endif
89 101
90#define putc(ch) icedcc_putc(ch) 102#define putc(ch) icedcc_putc(ch)
91#define flush() do { } while (0)
92#endif 103#endif
93 104
94static void putstr(const char *ptr) 105static void putstr(const char *ptr)
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
index 730aefcfbee3..c77d2fa1f6e5 100644
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
@@ -154,16 +154,16 @@
154 * Please note that the implementation of these, and the required 154 * Please note that the implementation of these, and the required
155 * effects are cache-type (VIVT/VIPT/PIPT) specific. 155 * effects are cache-type (VIVT/VIPT/PIPT) specific.
156 * 156 *
157 * flush_cache_kern_all() 157 * flush_kern_all()
158 * 158 *
159 * Unconditionally clean and invalidate the entire cache. 159 * Unconditionally clean and invalidate the entire cache.
160 * 160 *
161 * flush_cache_user_mm(mm) 161 * flush_user_all()
162 * 162 *
163 * Clean and invalidate all user space cache entries 163 * Clean and invalidate all user space cache entries
164 * before a change of page tables. 164 * before a change of page tables.
165 * 165 *
166 * flush_cache_user_range(start, end, flags) 166 * flush_user_range(start, end, flags)
167 * 167 *
168 * Clean and invalidate a range of cache entries in the 168 * Clean and invalidate a range of cache entries in the
169 * specified address space before a change of page tables. 169 * specified address space before a change of page tables.
@@ -179,6 +179,20 @@
179 * - start - virtual start address 179 * - start - virtual start address
180 * - end - virtual end address 180 * - end - virtual end address
181 * 181 *
182 * coherent_user_range(start, end)
183 *
184 * Ensure coherency between the Icache and the Dcache in the
185 * region described by start, end. If you have non-snooping
186 * Harvard caches, you need to implement this function.
187 * - start - virtual start address
188 * - end - virtual end address
189 *
190 * flush_kern_dcache_area(kaddr, size)
191 *
192 * Ensure that the data held in page is written back.
193 * - kaddr - page address
194 * - size - region size
195 *
182 * DMA Cache Coherency 196 * DMA Cache Coherency
183 * =================== 197 * ===================
184 * 198 *
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index b121b6053cce..5c91addcaebc 100644
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -49,6 +49,26 @@
491002: 491002:
50 .endm 50 .endm
51 51
52#elif defined(CONFIG_CPU_V7)
53
54 .macro addruart, rx
55 .endm
56
57 .macro senduart, rd, rx
58 mcr p14, 0, \rd, c0, c5, 0
59 .endm
60
61 .macro busyuart, rd, rx
62busy: mrc p14, 0, pc, c0, c1, 0
63 bcs busy
64 .endm
65
66 .macro waituart, rd, rx
67wait: mrc p14, 0, pc, c0, c1, 0
68 bcs wait
69
70 .endm
71
52#elif defined(CONFIG_CPU_XSCALE) 72#elif defined(CONFIG_CPU_XSCALE)
53 73
54 .macro addruart, rx 74 .macro addruart, rx
diff --git a/arch/arm/kernel/elf.c b/arch/arm/kernel/elf.c
index 950391f194c4..d4a0da1e48f4 100644
--- a/arch/arm/kernel/elf.c
+++ b/arch/arm/kernel/elf.c
@@ -78,15 +78,6 @@ int arm_elf_read_implies_exec(const struct elf32_hdr *x, int executable_stack)
78 return 1; 78 return 1;
79 if (cpu_architecture() < CPU_ARCH_ARMv6) 79 if (cpu_architecture() < CPU_ARCH_ARMv6)
80 return 1; 80 return 1;
81#if !defined(CONFIG_AEABI) || defined(CONFIG_OABI_COMPAT)
82 /*
83 * If we have support for OABI programs, we can never allow NX
84 * support - our signal syscall restart mechanism relies upon
85 * being able to execute code placed on the user stack.
86 */
87 return 1;
88#else
89 return 0; 81 return 0;
90#endif
91} 82}
92EXPORT_SYMBOL(arm_elf_read_implies_exec); 83EXPORT_SYMBOL(arm_elf_read_implies_exec);
diff --git a/arch/arm/mach-davinci/include/mach/keyscan.h b/arch/arm/mach-davinci/include/mach/keyscan.h
index b4e21a2976d1..7a560e05bda8 100644
--- a/arch/arm/mach-davinci/include/mach/keyscan.h
+++ b/arch/arm/mach-davinci/include/mach/keyscan.h
@@ -29,6 +29,7 @@ enum davinci_matrix_types {
29}; 29};
30 30
31struct davinci_ks_platform_data { 31struct davinci_ks_platform_data {
32 int (*device_enable)(struct device *dev);
32 unsigned short *keymap; 33 unsigned short *keymap;
33 u32 keymapsize; 34 u32 keymapsize;
34 u8 rep:1; 35 u8 rep:1;
diff --git a/arch/arm/mach-gemini/include/mach/uncompress.h b/arch/arm/mach-gemini/include/mach/uncompress.h
index 59c5df7e716c..5483f61a8061 100644
--- a/arch/arm/mach-gemini/include/mach/uncompress.h
+++ b/arch/arm/mach-gemini/include/mach/uncompress.h
@@ -30,7 +30,9 @@ static inline void putc(char c)
30 UART[UART_TX] = c; 30 UART[UART_TX] = c;
31} 31}
32 32
33#define flush() do { } while (0) 33static inline void flush(void)
34{
35}
34 36
35/* 37/*
36 * nothing to do 38 * nothing to do
diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
index 8bf4153d0840..3bf6304158f6 100644
--- a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
+++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
@@ -13,6 +13,7 @@
13#include <linux/platform_device.h> 13#include <linux/platform_device.h>
14#include <linux/ata_platform.h> 14#include <linux/ata_platform.h>
15#include <linux/mv643xx_eth.h> 15#include <linux/mv643xx_eth.h>
16#include <linux/gpio.h>
16#include <linux/spi/flash.h> 17#include <linux/spi/flash.h>
17#include <linux/spi/spi.h> 18#include <linux/spi/spi.h>
18#include <linux/spi/orion_spi.h> 19#include <linux/spi/orion_spi.h>
@@ -53,6 +54,11 @@ static void __init rd88f6192_init(void)
53 */ 54 */
54 kirkwood_init(); 55 kirkwood_init();
55 56
57 orion_gpio_set_valid(RD88F6192_GPIO_USB_VBUS, 1);
58 if (gpio_request(RD88F6192_GPIO_USB_VBUS, "USB VBUS") != 0 ||
59 gpio_direction_output(RD88F6192_GPIO_USB_VBUS, 1) != 0)
60 pr_err("RD-88F6192-NAS: failed to setup USB VBUS GPIO\n");
61
56 kirkwood_ehci_init(); 62 kirkwood_ehci_init();
57 kirkwood_ge00_init(&rd88f6192_ge00_data); 63 kirkwood_ge00_init(&rd88f6192_ge00_data);
58 kirkwood_sata_init(&rd88f6192_sata_data); 64 kirkwood_sata_init(&rd88f6192_sata_data);
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 2ba9ab953731..04f1d29cba2c 100644
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -214,8 +214,8 @@ int omap1_select_table_rate(struct clk *clk, unsigned long rate)
214 struct mpu_rate * ptr; 214 struct mpu_rate * ptr;
215 unsigned long dpll1_rate, ref_rate; 215 unsigned long dpll1_rate, ref_rate;
216 216
217 dpll1_rate = clk_get_rate(ck_dpll1_p); 217 dpll1_rate = ck_dpll1_p->rate;
218 ref_rate = clk_get_rate(ck_ref_p); 218 ref_rate = ck_ref_p->rate;
219 219
220 for (ptr = omap1_rate_table; ptr->rate; ptr++) { 220 for (ptr = omap1_rate_table; ptr->rate; ptr++) {
221 if (ptr->xtal != ref_rate) 221 if (ptr->xtal != ref_rate)
@@ -306,7 +306,7 @@ long omap1_round_to_table_rate(struct clk *clk, unsigned long rate)
306 long highest_rate; 306 long highest_rate;
307 unsigned long ref_rate; 307 unsigned long ref_rate;
308 308
309 ref_rate = clk_get_rate(ck_ref_p); 309 ref_rate = ck_ref_p->rate;
310 310
311 highest_rate = -EINVAL; 311 highest_rate = -EINVAL;
312 312
diff --git a/arch/arm/mach-omap2/clock34xx_data.c b/arch/arm/mach-omap2/clock34xx_data.c
index c6031d74d6f6..74930e3158e3 100644
--- a/arch/arm/mach-omap2/clock34xx_data.c
+++ b/arch/arm/mach-omap2/clock34xx_data.c
@@ -671,7 +671,6 @@ static struct clk dpll4_m3x2_ck = {
671 .name = "dpll4_m3x2_ck", 671 .name = "dpll4_m3x2_ck",
672 .ops = &clkops_omap2_dflt_wait, 672 .ops = &clkops_omap2_dflt_wait,
673 .parent = &dpll4_m3_ck, 673 .parent = &dpll4_m3_ck,
674 .init = &omap2_init_clksel_parent,
675 .enable_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN), 674 .enable_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN),
676 .enable_bit = OMAP3430_PWRDN_TV_SHIFT, 675 .enable_bit = OMAP3430_PWRDN_TV_SHIFT,
677 .flags = INVERT_ENABLE, 676 .flags = INVERT_ENABLE,
@@ -811,7 +810,6 @@ static struct clk dpll4_m6x2_ck = {
811 .name = "dpll4_m6x2_ck", 810 .name = "dpll4_m6x2_ck",
812 .ops = &clkops_omap2_dflt_wait, 811 .ops = &clkops_omap2_dflt_wait,
813 .parent = &dpll4_m6_ck, 812 .parent = &dpll4_m6_ck,
814 .init = &omap2_init_clksel_parent,
815 .enable_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN), 813 .enable_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN),
816 .enable_bit = OMAP3430_PWRDN_EMU_PERIPH_SHIFT, 814 .enable_bit = OMAP3430_PWRDN_EMU_PERIPH_SHIFT,
817 .flags = INVERT_ENABLE, 815 .flags = INVERT_ENABLE,
@@ -1047,7 +1045,6 @@ static struct clk iva2_ck = {
1047 .name = "iva2_ck", 1045 .name = "iva2_ck",
1048 .ops = &clkops_omap2_dflt_wait, 1046 .ops = &clkops_omap2_dflt_wait,
1049 .parent = &dpll2_m2_ck, 1047 .parent = &dpll2_m2_ck,
1050 .init = &omap2_init_clksel_parent,
1051 .enable_reg = OMAP_CM_REGADDR(OMAP3430_IVA2_MOD, CM_FCLKEN), 1048 .enable_reg = OMAP_CM_REGADDR(OMAP3430_IVA2_MOD, CM_FCLKEN),
1052 .enable_bit = OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_SHIFT, 1049 .enable_bit = OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_SHIFT,
1053 .clkdm_name = "iva2_clkdm", 1050 .clkdm_name = "iva2_clkdm",
@@ -1121,7 +1118,6 @@ static struct clk gfx_l3_ck = {
1121 .name = "gfx_l3_ck", 1118 .name = "gfx_l3_ck",
1122 .ops = &clkops_omap2_dflt_wait, 1119 .ops = &clkops_omap2_dflt_wait,
1123 .parent = &l3_ick, 1120 .parent = &l3_ick,
1124 .init = &omap2_init_clksel_parent,
1125 .enable_reg = OMAP_CM_REGADDR(GFX_MOD, CM_ICLKEN), 1121 .enable_reg = OMAP_CM_REGADDR(GFX_MOD, CM_ICLKEN),
1126 .enable_bit = OMAP_EN_GFX_SHIFT, 1122 .enable_bit = OMAP_EN_GFX_SHIFT,
1127 .recalc = &followparent_recalc, 1123 .recalc = &followparent_recalc,
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c
index 2210e227d78a..9d882bcb56e3 100644
--- a/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@ -346,37 +346,37 @@ static struct clk aess_fclk = {
346}; 346};
347 347
348static const struct clksel_rate div31_1to31_rates[] = { 348static const struct clksel_rate div31_1to31_rates[] = {
349 { .div = 1, .val = 0, .flags = RATE_IN_4430 }, 349 { .div = 1, .val = 1, .flags = RATE_IN_4430 },
350 { .div = 2, .val = 1, .flags = RATE_IN_4430 }, 350 { .div = 2, .val = 2, .flags = RATE_IN_4430 },
351 { .div = 3, .val = 2, .flags = RATE_IN_4430 }, 351 { .div = 3, .val = 3, .flags = RATE_IN_4430 },
352 { .div = 4, .val = 3, .flags = RATE_IN_4430 }, 352 { .div = 4, .val = 4, .flags = RATE_IN_4430 },
353 { .div = 5, .val = 4, .flags = RATE_IN_4430 }, 353 { .div = 5, .val = 5, .flags = RATE_IN_4430 },
354 { .div = 6, .val = 5, .flags = RATE_IN_4430 }, 354 { .div = 6, .val = 6, .flags = RATE_IN_4430 },
355 { .div = 7, .val = 6, .flags = RATE_IN_4430 }, 355 { .div = 7, .val = 7, .flags = RATE_IN_4430 },
356 { .div = 8, .val = 7, .flags = RATE_IN_4430 }, 356 { .div = 8, .val = 8, .flags = RATE_IN_4430 },
357 { .div = 9, .val = 8, .flags = RATE_IN_4430 }, 357 { .div = 9, .val = 9, .flags = RATE_IN_4430 },
358 { .div = 10, .val = 9, .flags = RATE_IN_4430 }, 358 { .div = 10, .val = 10, .flags = RATE_IN_4430 },
359 { .div = 11, .val = 10, .flags = RATE_IN_4430 }, 359 { .div = 11, .val = 11, .flags = RATE_IN_4430 },
360 { .div = 12, .val = 11, .flags = RATE_IN_4430 }, 360 { .div = 12, .val = 12, .flags = RATE_IN_4430 },
361 { .div = 13, .val = 12, .flags = RATE_IN_4430 }, 361 { .div = 13, .val = 13, .flags = RATE_IN_4430 },
362 { .div = 14, .val = 13, .flags = RATE_IN_4430 }, 362 { .div = 14, .val = 14, .flags = RATE_IN_4430 },
363 { .div = 15, .val = 14, .flags = RATE_IN_4430 }, 363 { .div = 15, .val = 15, .flags = RATE_IN_4430 },
364 { .div = 16, .val = 15, .flags = RATE_IN_4430 }, 364 { .div = 16, .val = 16, .flags = RATE_IN_4430 },
365 { .div = 17, .val = 16, .flags = RATE_IN_4430 }, 365 { .div = 17, .val = 17, .flags = RATE_IN_4430 },
366 { .div = 18, .val = 17, .flags = RATE_IN_4430 }, 366 { .div = 18, .val = 18, .flags = RATE_IN_4430 },
367 { .div = 19, .val = 18, .flags = RATE_IN_4430 }, 367 { .div = 19, .val = 19, .flags = RATE_IN_4430 },
368 { .div = 20, .val = 19, .flags = RATE_IN_4430 }, 368 { .div = 20, .val = 20, .flags = RATE_IN_4430 },
369 { .div = 21, .val = 20, .flags = RATE_IN_4430 }, 369 { .div = 21, .val = 21, .flags = RATE_IN_4430 },
370 { .div = 22, .val = 21, .flags = RATE_IN_4430 }, 370 { .div = 22, .val = 22, .flags = RATE_IN_4430 },
371 { .div = 23, .val = 22, .flags = RATE_IN_4430 }, 371 { .div = 23, .val = 23, .flags = RATE_IN_4430 },
372 { .div = 24, .val = 23, .flags = RATE_IN_4430 }, 372 { .div = 24, .val = 24, .flags = RATE_IN_4430 },
373 { .div = 25, .val = 24, .flags = RATE_IN_4430 }, 373 { .div = 25, .val = 25, .flags = RATE_IN_4430 },
374 { .div = 26, .val = 25, .flags = RATE_IN_4430 }, 374 { .div = 26, .val = 26, .flags = RATE_IN_4430 },
375 { .div = 27, .val = 26, .flags = RATE_IN_4430 }, 375 { .div = 27, .val = 27, .flags = RATE_IN_4430 },
376 { .div = 28, .val = 27, .flags = RATE_IN_4430 }, 376 { .div = 28, .val = 28, .flags = RATE_IN_4430 },
377 { .div = 29, .val = 28, .flags = RATE_IN_4430 }, 377 { .div = 29, .val = 29, .flags = RATE_IN_4430 },
378 { .div = 30, .val = 29, .flags = RATE_IN_4430 }, 378 { .div = 30, .val = 30, .flags = RATE_IN_4430 },
379 { .div = 31, .val = 30, .flags = RATE_IN_4430 }, 379 { .div = 31, .val = 31, .flags = RATE_IN_4430 },
380 { .div = 0 }, 380 { .div = 0 },
381}; 381};
382 382
diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c
index a26d6a08ae3f..12f0cbfc2894 100644
--- a/arch/arm/mach-omap2/cpuidle34xx.c
+++ b/arch/arm/mach-omap2/cpuidle34xx.c
@@ -137,7 +137,7 @@ return_sleep_time:
137 local_irq_enable(); 137 local_irq_enable();
138 local_fiq_enable(); 138 local_fiq_enable();
139 139
140 return (u32)timespec_to_ns(&ts_idle)/1000; 140 return ts_idle.tv_nsec / NSEC_PER_USEC + ts_idle.tv_sec * USEC_PER_SEC;
141} 141}
142 142
143/** 143/**
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index bd8cb5974726..3f1334f62e7a 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -534,6 +534,8 @@ void __init gpmc_init(void)
534 BUG(); 534 BUG();
535 } 535 }
536 536
537 clk_enable(gpmc_l3_clk);
538
537 l = gpmc_read_reg(GPMC_REVISION); 539 l = gpmc_read_reg(GPMC_REVISION);
538 printk(KERN_INFO "GPMC revision %d.%d\n", (l >> 4) & 0x0f, l & 0x0f); 540 printk(KERN_INFO "GPMC revision %d.%d\n", (l >> 4) & 0x0f, l & 0x0f);
539 /* Set smart idle mode and automatic L3 clock gating */ 541 /* Set smart idle mode and automatic L3 clock gating */
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index a091b53657b9..3d65c50bd017 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -188,6 +188,8 @@ void __init omap3_check_revision(void)
188 u16 hawkeye; 188 u16 hawkeye;
189 u8 rev; 189 u8 rev;
190 190
191 omap_chip.oc = CHIP_IS_OMAP3430;
192
191 /* 193 /*
192 * We cannot access revision registers on ES1.0. 194 * We cannot access revision registers on ES1.0.
193 * If the processor type is Cortex-A8 and the revision is 0x0 195 * If the processor type is Cortex-A8 and the revision is 0x0
@@ -196,6 +198,7 @@ void __init omap3_check_revision(void)
196 cpuid = read_cpuid(CPUID_ID); 198 cpuid = read_cpuid(CPUID_ID);
197 if ((((cpuid >> 4) & 0xfff) == 0xc08) && ((cpuid & 0xf) == 0x0)) { 199 if ((((cpuid >> 4) & 0xfff) == 0xc08) && ((cpuid & 0xf) == 0x0)) {
198 omap_revision = OMAP3430_REV_ES1_0; 200 omap_revision = OMAP3430_REV_ES1_0;
201 omap_chip.oc |= CHIP_IS_OMAP3430ES1;
199 return; 202 return;
200 } 203 }
201 204
@@ -216,18 +219,28 @@ void __init omap3_check_revision(void)
216 case 0: /* Take care of early samples */ 219 case 0: /* Take care of early samples */
217 case 1: 220 case 1:
218 omap_revision = OMAP3430_REV_ES2_0; 221 omap_revision = OMAP3430_REV_ES2_0;
222 omap_chip.oc |= CHIP_IS_OMAP3430ES2;
219 break; 223 break;
220 case 2: 224 case 2:
221 omap_revision = OMAP3430_REV_ES2_1; 225 omap_revision = OMAP3430_REV_ES2_1;
226 omap_chip.oc |= CHIP_IS_OMAP3430ES2;
222 break; 227 break;
223 case 3: 228 case 3:
224 omap_revision = OMAP3430_REV_ES3_0; 229 omap_revision = OMAP3430_REV_ES3_0;
230 omap_chip.oc |= CHIP_IS_OMAP3430ES3_0;
225 break; 231 break;
226 case 4: 232 case 4:
233 omap_revision = OMAP3430_REV_ES3_1;
234 omap_chip.oc |= CHIP_IS_OMAP3430ES3_1;
235 break;
236 case 7:
227 /* FALLTHROUGH */ 237 /* FALLTHROUGH */
228 default: 238 default:
229 /* Use the latest known revision as default */ 239 /* Use the latest known revision as default */
230 omap_revision = OMAP3430_REV_ES3_1; 240 omap_revision = OMAP3430_REV_ES3_1_2;
241
242 /* REVISIT: Add CHIP_IS_OMAP3430ES3_1_2? */
243 omap_chip.oc |= CHIP_IS_OMAP3430ES3_1;
231 } 244 }
232 break; 245 break;
233 case 0xb868: 246 case 0xb868:
@@ -235,14 +248,18 @@ void __init omap3_check_revision(void)
235 * 248 *
236 * Set the device to be OMAP3505 here. Actual device 249 * Set the device to be OMAP3505 here. Actual device
237 * is identified later based on the features. 250 * is identified later based on the features.
251 *
252 * REVISIT: AM3505/AM3517 should have their own CHIP_IS
238 */ 253 */
239 omap_revision = OMAP3505_REV(rev); 254 omap_revision = OMAP3505_REV(rev);
255 omap_chip.oc |= CHIP_IS_OMAP3430ES3_1;
240 break; 256 break;
241 case 0xb891: 257 case 0xb891:
242 /* FALLTHROUGH */ 258 /* FALLTHROUGH */
243 default: 259 default:
244 /* Unknown default to latest silicon rev as default*/ 260 /* Unknown default to latest silicon rev as default*/
245 omap_revision = OMAP3630_REV_ES1_0; 261 omap_revision = OMAP3630_REV_ES1_0;
262 omap_chip.oc |= CHIP_IS_OMAP3630ES1;
246 } 263 }
247} 264}
248 265
@@ -360,6 +377,7 @@ void __init omap2_check_revision(void)
360 omap3_check_revision(); 377 omap3_check_revision();
361 omap3_check_features(); 378 omap3_check_features();
362 omap3_cpuinfo(); 379 omap3_cpuinfo();
380 return;
363 } else if (cpu_is_omap44xx()) { 381 } else if (cpu_is_omap44xx()) {
364 omap4_check_revision(); 382 omap4_check_revision();
365 return; 383 return;
@@ -374,27 +392,14 @@ void __init omap2_check_revision(void)
374 if (cpu_is_omap243x()) { 392 if (cpu_is_omap243x()) {
375 /* Currently only supports 2430ES2.1 and 2430-all */ 393 /* Currently only supports 2430ES2.1 and 2430-all */
376 omap_chip.oc |= CHIP_IS_OMAP2430; 394 omap_chip.oc |= CHIP_IS_OMAP2430;
395 return;
377 } else if (cpu_is_omap242x()) { 396 } else if (cpu_is_omap242x()) {
378 /* Currently only supports 2420ES2.1.1 and 2420-all */ 397 /* Currently only supports 2420ES2.1.1 and 2420-all */
379 omap_chip.oc |= CHIP_IS_OMAP2420; 398 omap_chip.oc |= CHIP_IS_OMAP2420;
380 } else if (cpu_is_omap3505() || cpu_is_omap3517()) { 399 return;
381 omap_chip.oc = CHIP_IS_OMAP3430 | CHIP_IS_OMAP3430ES3_1;
382 } else if (cpu_is_omap343x()) {
383 omap_chip.oc = CHIP_IS_OMAP3430;
384 if (omap_rev() == OMAP3430_REV_ES1_0)
385 omap_chip.oc |= CHIP_IS_OMAP3430ES1;
386 else if (omap_rev() >= OMAP3430_REV_ES2_0 &&
387 omap_rev() <= OMAP3430_REV_ES2_1)
388 omap_chip.oc |= CHIP_IS_OMAP3430ES2;
389 else if (omap_rev() == OMAP3430_REV_ES3_0)
390 omap_chip.oc |= CHIP_IS_OMAP3430ES3_0;
391 else if (omap_rev() == OMAP3430_REV_ES3_1)
392 omap_chip.oc |= CHIP_IS_OMAP3430ES3_1;
393 else if (omap_rev() == OMAP3630_REV_ES1_0)
394 omap_chip.oc |= CHIP_IS_OMAP3630ES1;
395 } else {
396 pr_err("Uninitialized omap_chip, please fix!\n");
397 } 400 }
401
402 pr_err("Uninitialized omap_chip, please fix!\n");
398} 403}
399 404
400/* 405/*
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index e9bc782fa414..27054025da2b 100644
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -274,4 +274,22 @@ void omap_intc_restore_context(void)
274 } 274 }
275 /* MIRs are saved and restore with other PRCM registers */ 275 /* MIRs are saved and restore with other PRCM registers */
276} 276}
277
278void omap3_intc_suspend(void)
279{
280 /* A pending interrupt would prevent OMAP from entering suspend */
281 omap_ack_irq(0);
282}
283
284void omap3_intc_prepare_idle(void)
285{
286 /* Disable autoidle as it can stall interrupt controller */
287 intc_bank_write_reg(0, &irq_banks[0], INTC_SYSCONFIG);
288}
289
290void omap3_intc_resume_idle(void)
291{
292 /* Re-enable autoidle */
293 intc_bank_write_reg(1, &irq_banks[0], INTC_SYSCONFIG);
294}
277#endif /* CONFIG_ARCH_OMAP3 */ 295#endif /* CONFIG_ARCH_OMAP3 */
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 459ef23ab8a8..3f59bd12cbbf 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -51,7 +51,7 @@ struct omap_mux_entry {
51static unsigned long mux_phys; 51static unsigned long mux_phys;
52static void __iomem *mux_base; 52static void __iomem *mux_base;
53 53
54static inline u16 omap_mux_read(u16 reg) 54u16 omap_mux_read(u16 reg)
55{ 55{
56 if (cpu_is_omap24xx()) 56 if (cpu_is_omap24xx())
57 return __raw_readb(mux_base + reg); 57 return __raw_readb(mux_base + reg);
@@ -59,7 +59,7 @@ static inline u16 omap_mux_read(u16 reg)
59 return __raw_readw(mux_base + reg); 59 return __raw_readw(mux_base + reg);
60} 60}
61 61
62static inline void omap_mux_write(u16 val, u16 reg) 62void omap_mux_write(u16 val, u16 reg)
63{ 63{
64 if (cpu_is_omap24xx()) 64 if (cpu_is_omap24xx())
65 __raw_writeb(val, mux_base + reg); 65 __raw_writeb(val, mux_base + reg);
@@ -67,6 +67,14 @@ static inline void omap_mux_write(u16 val, u16 reg)
67 __raw_writew(val, mux_base + reg); 67 __raw_writew(val, mux_base + reg);
68} 68}
69 69
70void omap_mux_write_array(struct omap_board_mux *board_mux)
71{
72 while (board_mux->reg_offset != OMAP_MUX_TERMINATOR) {
73 omap_mux_write(board_mux->value, board_mux->reg_offset);
74 board_mux++;
75 }
76}
77
70#if defined(CONFIG_ARCH_OMAP24XX) && defined(CONFIG_OMAP_MUX) 78#if defined(CONFIG_ARCH_OMAP24XX) && defined(CONFIG_OMAP_MUX)
71 79
72static struct omap_mux_cfg arch_mux_cfg; 80static struct omap_mux_cfg arch_mux_cfg;
@@ -833,14 +841,6 @@ static void __init omap_mux_set_cmdline_signals(void)
833 kfree(options); 841 kfree(options);
834} 842}
835 843
836static void __init omap_mux_set_board_signals(struct omap_board_mux *board_mux)
837{
838 while (board_mux->reg_offset != OMAP_MUX_TERMINATOR) {
839 omap_mux_write(board_mux->value, board_mux->reg_offset);
840 board_mux++;
841 }
842}
843
844static int __init omap_mux_copy_names(struct omap_mux *src, 844static int __init omap_mux_copy_names(struct omap_mux *src,
845 struct omap_mux *dst) 845 struct omap_mux *dst)
846{ 846{
@@ -998,12 +998,15 @@ int __init omap_mux_init(u32 mux_pbase, u32 mux_size,
998 omap_mux_package_fixup(package_subset, superset); 998 omap_mux_package_fixup(package_subset, superset);
999 if (package_balls) 999 if (package_balls)
1000 omap_mux_package_init_balls(package_balls, superset); 1000 omap_mux_package_init_balls(package_balls, superset);
1001 omap_mux_set_cmdline_signals();
1002 omap_mux_set_board_signals(board_mux);
1003#endif 1001#endif
1004 1002
1005 omap_mux_init_list(superset); 1003 omap_mux_init_list(superset);
1006 1004
1005#ifdef CONFIG_OMAP_MUX
1006 omap_mux_set_cmdline_signals();
1007 omap_mux_write_array(board_mux);
1008#endif
1009
1007 return 0; 1010 return 0;
1008} 1011}
1009 1012
diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h
index d8b4d5ad2278..f8c2e7a8f063 100644
--- a/arch/arm/mach-omap2/mux.h
+++ b/arch/arm/mach-omap2/mux.h
@@ -147,6 +147,30 @@ u16 omap_mux_get_gpio(int gpio);
147void omap_mux_set_gpio(u16 val, int gpio); 147void omap_mux_set_gpio(u16 val, int gpio);
148 148
149/** 149/**
150 * omap_mux_read() - read mux register
151 * @mux_offset: Offset of the mux register
152 *
153 */
154u16 omap_mux_read(u16 mux_offset);
155
156/**
157 * omap_mux_write() - write mux register
158 * @val: New mux register value
159 * @mux_offset: Offset of the mux register
160 *
161 * This should be only needed for dynamic remuxing of non-gpio signals.
162 */
163void omap_mux_write(u16 val, u16 mux_offset);
164
165/**
166 * omap_mux_write_array() - write an array of mux registers
167 * @board_mux: Array of mux registers terminated by MAP_MUX_TERMINATOR
168 *
169 * This should be only needed for dynamic remuxing of non-gpio signals.
170 */
171void omap_mux_write_array(struct omap_board_mux *board_mux);
172
173/**
150 * omap3_mux_init() - initialize mux system with board specific set 174 * omap3_mux_init() - initialize mux system with board specific set
151 * @board_mux: Board specific mux table 175 * @board_mux: Board specific mux table
152 * @flags: OMAP package type used for the board 176 * @flags: OMAP package type used for the board
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index d8c8545875b1..478ae585ca39 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -94,7 +94,8 @@ static int _update_sysc_cache(struct omap_hwmod *oh)
94 94
95 oh->_sysc_cache = omap_hwmod_readl(oh, oh->sysconfig->sysc_offs); 95 oh->_sysc_cache = omap_hwmod_readl(oh, oh->sysconfig->sysc_offs);
96 96
97 oh->_int_flags |= _HWMOD_SYSCONFIG_LOADED; 97 if (!(oh->sysconfig->sysc_flags & SYSC_NO_CACHE))
98 oh->_int_flags |= _HWMOD_SYSCONFIG_LOADED;
98 99
99 return 0; 100 return 0;
100} 101}
diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
index 860b755d2220..a0866268aa41 100644
--- a/arch/arm/mach-omap2/pm-debug.c
+++ b/arch/arm/mach-omap2/pm-debug.c
@@ -54,8 +54,6 @@ int omap2_pm_debug;
54 regs[reg_count++].val = \ 54 regs[reg_count++].val = \
55 __raw_readl(OMAP2_L4_IO_ADDRESS(0x480fe000 + (off))) 55 __raw_readl(OMAP2_L4_IO_ADDRESS(0x480fe000 + (off)))
56 56
57static int __init pm_dbg_init(void);
58
59void omap2_pm_dump(int mode, int resume, unsigned int us) 57void omap2_pm_dump(int mode, int resume, unsigned int us)
60{ 58{
61 struct reg { 59 struct reg {
@@ -167,6 +165,8 @@ struct dentry *pm_dbg_dir;
167 165
168static int pm_dbg_init_done; 166static int pm_dbg_init_done;
169 167
168static int __init pm_dbg_init(void);
169
170enum { 170enum {
171 DEBUG_FILE_COUNTERS = 0, 171 DEBUG_FILE_COUNTERS = 0,
172 DEBUG_FILE_TIMERS, 172 DEBUG_FILE_TIMERS,
@@ -488,9 +488,11 @@ int pm_dbg_regset_init(int reg_set)
488 488
489static int pwrdm_suspend_get(void *data, u64 *val) 489static int pwrdm_suspend_get(void *data, u64 *val)
490{ 490{
491 *val = omap3_pm_get_suspend_state((struct powerdomain *)data); 491 int ret;
492 ret = omap3_pm_get_suspend_state((struct powerdomain *)data);
493 *val = ret;
492 494
493 if (*val >= 0) 495 if (ret >= 0)
494 return 0; 496 return 0;
495 return *val; 497 return *val;
496} 498}
@@ -604,6 +606,4 @@ static int __init pm_dbg_init(void)
604} 606}
605arch_initcall(pm_dbg_init); 607arch_initcall(pm_dbg_init);
606 608
607#else
608void pm_dbg_update_time(struct powerdomain *pwrdm, int prev) {}
609#endif 609#endif
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h
index 0bf345db7147..7a9c2d004511 100644
--- a/arch/arm/mach-omap2/pm.h
+++ b/arch/arm/mach-omap2/pm.h
@@ -32,12 +32,16 @@ extern struct omap_dm_timer *gptimer_wakeup;
32#ifdef CONFIG_PM_DEBUG 32#ifdef CONFIG_PM_DEBUG
33extern void omap2_pm_dump(int mode, int resume, unsigned int us); 33extern void omap2_pm_dump(int mode, int resume, unsigned int us);
34extern int omap2_pm_debug; 34extern int omap2_pm_debug;
35#else
36#define omap2_pm_dump(mode, resume, us) do {} while (0);
37#define omap2_pm_debug 0
38#endif
39
40#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)
35extern void pm_dbg_update_time(struct powerdomain *pwrdm, int prev); 41extern void pm_dbg_update_time(struct powerdomain *pwrdm, int prev);
36extern int pm_dbg_regset_save(int reg_set); 42extern int pm_dbg_regset_save(int reg_set);
37extern int pm_dbg_regset_init(int reg_set); 43extern int pm_dbg_regset_init(int reg_set);
38#else 44#else
39#define omap2_pm_dump(mode, resume, us) do {} while (0);
40#define omap2_pm_debug 0
41#define pm_dbg_update_time(pwrdm, prev) do {} while (0); 45#define pm_dbg_update_time(pwrdm, prev) do {} while (0);
42#define pm_dbg_regset_save(reg_set) do {} while (0); 46#define pm_dbg_regset_save(reg_set) do {} while (0);
43#define pm_dbg_regset_init(reg_set) do {} while (0); 47#define pm_dbg_regset_init(reg_set) do {} while (0);
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index c6cc809afb79..910a7acf542d 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -26,6 +26,7 @@
26#include <linux/err.h> 26#include <linux/err.h>
27#include <linux/gpio.h> 27#include <linux/gpio.h>
28#include <linux/clk.h> 28#include <linux/clk.h>
29#include <linux/delay.h>
29 30
30#include <plat/sram.h> 31#include <plat/sram.h>
31#include <plat/clockdomain.h> 32#include <plat/clockdomain.h>
@@ -126,7 +127,15 @@ static void omap3_core_save_context(void)
126 /* wait for the save to complete */ 127 /* wait for the save to complete */
127 while (!(omap_ctrl_readl(OMAP343X_CONTROL_GENERAL_PURPOSE_STATUS) 128 while (!(omap_ctrl_readl(OMAP343X_CONTROL_GENERAL_PURPOSE_STATUS)
128 & PADCONF_SAVE_DONE)) 129 & PADCONF_SAVE_DONE))
129 ; 130 udelay(1);
131
132 /*
133 * Force write last pad into memory, as this can fail in some
134 * cases according to erratas 1.157, 1.185
135 */
136 omap_ctrl_writel(omap_ctrl_readl(OMAP343X_PADCONF_ETK_D14),
137 OMAP343X_CONTROL_MEM_WKUP + 0x2a0);
138
130 /* Save the Interrupt controller context */ 139 /* Save the Interrupt controller context */
131 omap_intc_save_context(); 140 omap_intc_save_context();
132 /* Save the GPMC context */ 141 /* Save the GPMC context */
@@ -392,6 +401,7 @@ void omap_sram_idle(void)
392 prm_set_mod_reg_bits(OMAP3430_EN_IO, WKUP_MOD, PM_WKEN); 401 prm_set_mod_reg_bits(OMAP3430_EN_IO, WKUP_MOD, PM_WKEN);
393 omap3_enable_io_chain(); 402 omap3_enable_io_chain();
394 } 403 }
404 omap3_intc_prepare_idle();
395 405
396 /* 406 /*
397 * On EMU/HS devices ROM code restores a SRDC value 407 * On EMU/HS devices ROM code restores a SRDC value
@@ -438,6 +448,7 @@ void omap_sram_idle(void)
438 OMAP3430_GR_MOD, 448 OMAP3430_GR_MOD,
439 OMAP3_PRM_VOLTCTRL_OFFSET); 449 OMAP3_PRM_VOLTCTRL_OFFSET);
440 } 450 }
451 omap3_intc_resume_idle();
441 452
442 /* PER */ 453 /* PER */
443 if (per_next_state < PWRDM_POWER_ON) { 454 if (per_next_state < PWRDM_POWER_ON) {
@@ -578,6 +589,8 @@ static int omap3_pm_suspend(void)
578 } 589 }
579 590
580 omap_uart_prepare_suspend(); 591 omap_uart_prepare_suspend();
592 omap3_intc_suspend();
593
581 omap_sram_idle(); 594 omap_sram_idle();
582 595
583restore: 596restore:
@@ -835,6 +848,8 @@ static void __init prcm_setup_regs(void)
835 CM_AUTOIDLE); 848 CM_AUTOIDLE);
836 } 849 }
837 850
851 omap_ctrl_writel(OMAP3430_AUTOIDLE, OMAP2_CONTROL_SYSCONFIG);
852
838 /* 853 /*
839 * Set all plls to autoidle. This is needed until autoidle is 854 * Set all plls to autoidle. This is needed until autoidle is
840 * enabled by clockfw 855 * enabled by clockfw
@@ -875,15 +890,23 @@ static void __init prcm_setup_regs(void)
875 prm_write_mod_reg(OMAP3430_IO_EN | OMAP3430_WKUP_EN, 890 prm_write_mod_reg(OMAP3430_IO_EN | OMAP3430_WKUP_EN,
876 OCP_MOD, OMAP3_PRM_IRQENABLE_MPU_OFFSET); 891 OCP_MOD, OMAP3_PRM_IRQENABLE_MPU_OFFSET);
877 892
893 /* Enable PM_WKEN to support DSS LPR */
894 prm_write_mod_reg(OMAP3430_PM_WKEN_DSS_EN_DSS,
895 OMAP3430_DSS_MOD, PM_WKEN);
896
878 /* Enable wakeups in PER */ 897 /* Enable wakeups in PER */
879 prm_write_mod_reg(OMAP3430_EN_GPIO2 | OMAP3430_EN_GPIO3 | 898 prm_write_mod_reg(OMAP3430_EN_GPIO2 | OMAP3430_EN_GPIO3 |
880 OMAP3430_EN_GPIO4 | OMAP3430_EN_GPIO5 | 899 OMAP3430_EN_GPIO4 | OMAP3430_EN_GPIO5 |
881 OMAP3430_EN_GPIO6 | OMAP3430_EN_UART3, 900 OMAP3430_EN_GPIO6 | OMAP3430_EN_UART3 |
901 OMAP3430_EN_MCBSP2 | OMAP3430_EN_MCBSP3 |
902 OMAP3430_EN_MCBSP4,
882 OMAP3430_PER_MOD, PM_WKEN); 903 OMAP3430_PER_MOD, PM_WKEN);
883 /* and allow them to wake up MPU */ 904 /* and allow them to wake up MPU */
884 prm_write_mod_reg(OMAP3430_GRPSEL_GPIO2 | OMAP3430_EN_GPIO3 | 905 prm_write_mod_reg(OMAP3430_GRPSEL_GPIO2 | OMAP3430_EN_GPIO3 |
885 OMAP3430_GRPSEL_GPIO4 | OMAP3430_EN_GPIO5 | 906 OMAP3430_GRPSEL_GPIO4 | OMAP3430_EN_GPIO5 |
886 OMAP3430_GRPSEL_GPIO6 | OMAP3430_EN_UART3, 907 OMAP3430_GRPSEL_GPIO6 | OMAP3430_EN_UART3 |
908 OMAP3430_EN_MCBSP2 | OMAP3430_EN_MCBSP3 |
909 OMAP3430_EN_MCBSP4,
887 OMAP3430_PER_MOD, OMAP3430_PM_MPUGRPSEL); 910 OMAP3430_PER_MOD, OMAP3430_PM_MPUGRPSEL);
888 911
889 /* Don't attach IVA interrupts */ 912 /* Don't attach IVA interrupts */
@@ -904,24 +927,6 @@ static void __init prcm_setup_regs(void)
904 /* Clear any pending PRCM interrupts */ 927 /* Clear any pending PRCM interrupts */
905 prm_write_mod_reg(0, OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET); 928 prm_write_mod_reg(0, OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET);
906 929
907 /* Don't attach IVA interrupts */
908 prm_write_mod_reg(0, WKUP_MOD, OMAP3430_PM_IVAGRPSEL);
909 prm_write_mod_reg(0, CORE_MOD, OMAP3430_PM_IVAGRPSEL1);
910 prm_write_mod_reg(0, CORE_MOD, OMAP3430ES2_PM_IVAGRPSEL3);
911 prm_write_mod_reg(0, OMAP3430_PER_MOD, OMAP3430_PM_IVAGRPSEL);
912
913 /* Clear any pending 'reset' flags */
914 prm_write_mod_reg(0xffffffff, MPU_MOD, RM_RSTST);
915 prm_write_mod_reg(0xffffffff, CORE_MOD, RM_RSTST);
916 prm_write_mod_reg(0xffffffff, OMAP3430_PER_MOD, RM_RSTST);
917 prm_write_mod_reg(0xffffffff, OMAP3430_EMU_MOD, RM_RSTST);
918 prm_write_mod_reg(0xffffffff, OMAP3430_NEON_MOD, RM_RSTST);
919 prm_write_mod_reg(0xffffffff, OMAP3430_DSS_MOD, RM_RSTST);
920 prm_write_mod_reg(0xffffffff, OMAP3430ES2_USBHOST_MOD, RM_RSTST);
921
922 /* Clear any pending PRCM interrupts */
923 prm_write_mod_reg(0, OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET);
924
925 omap3_iva_idle(); 930 omap3_iva_idle();
926 omap3_d2d_idle(); 931 omap3_d2d_idle();
927} 932}
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c
index 3ea8177ffb25..cf466ea1dffc 100644
--- a/arch/arm/mach-omap2/prcm.c
+++ b/arch/arm/mach-omap2/prcm.c
@@ -44,7 +44,6 @@ struct omap3_prcm_regs {
44 u32 iva2_cm_clksel2; 44 u32 iva2_cm_clksel2;
45 u32 cm_sysconfig; 45 u32 cm_sysconfig;
46 u32 sgx_cm_clksel; 46 u32 sgx_cm_clksel;
47 u32 wkup_cm_clksel;
48 u32 dss_cm_clksel; 47 u32 dss_cm_clksel;
49 u32 cam_cm_clksel; 48 u32 cam_cm_clksel;
50 u32 per_cm_clksel; 49 u32 per_cm_clksel;
@@ -53,7 +52,6 @@ struct omap3_prcm_regs {
53 u32 pll_cm_autoidle2; 52 u32 pll_cm_autoidle2;
54 u32 pll_cm_clksel4; 53 u32 pll_cm_clksel4;
55 u32 pll_cm_clksel5; 54 u32 pll_cm_clksel5;
56 u32 pll_cm_clken;
57 u32 pll_cm_clken2; 55 u32 pll_cm_clken2;
58 u32 cm_polctrl; 56 u32 cm_polctrl;
59 u32 iva2_cm_fclken; 57 u32 iva2_cm_fclken;
@@ -77,7 +75,6 @@ struct omap3_prcm_regs {
77 u32 usbhost_cm_iclken; 75 u32 usbhost_cm_iclken;
78 u32 iva2_cm_autiidle2; 76 u32 iva2_cm_autiidle2;
79 u32 mpu_cm_autoidle2; 77 u32 mpu_cm_autoidle2;
80 u32 pll_cm_autoidle;
81 u32 iva2_cm_clkstctrl; 78 u32 iva2_cm_clkstctrl;
82 u32 mpu_cm_clkstctrl; 79 u32 mpu_cm_clkstctrl;
83 u32 core_cm_clkstctrl; 80 u32 core_cm_clkstctrl;
@@ -274,7 +271,6 @@ void omap3_prcm_save_context(void)
274 prcm_context.cm_sysconfig = __raw_readl(OMAP3430_CM_SYSCONFIG); 271 prcm_context.cm_sysconfig = __raw_readl(OMAP3430_CM_SYSCONFIG);
275 prcm_context.sgx_cm_clksel = 272 prcm_context.sgx_cm_clksel =
276 cm_read_mod_reg(OMAP3430ES2_SGX_MOD, CM_CLKSEL); 273 cm_read_mod_reg(OMAP3430ES2_SGX_MOD, CM_CLKSEL);
277 prcm_context.wkup_cm_clksel = cm_read_mod_reg(WKUP_MOD, CM_CLKSEL);
278 prcm_context.dss_cm_clksel = 274 prcm_context.dss_cm_clksel =
279 cm_read_mod_reg(OMAP3430_DSS_MOD, CM_CLKSEL); 275 cm_read_mod_reg(OMAP3430_DSS_MOD, CM_CLKSEL);
280 prcm_context.cam_cm_clksel = 276 prcm_context.cam_cm_clksel =
@@ -291,8 +287,6 @@ void omap3_prcm_save_context(void)
291 cm_read_mod_reg(PLL_MOD, OMAP3430ES2_CM_CLKSEL4); 287 cm_read_mod_reg(PLL_MOD, OMAP3430ES2_CM_CLKSEL4);
292 prcm_context.pll_cm_clksel5 = 288 prcm_context.pll_cm_clksel5 =
293 cm_read_mod_reg(PLL_MOD, OMAP3430ES2_CM_CLKSEL5); 289 cm_read_mod_reg(PLL_MOD, OMAP3430ES2_CM_CLKSEL5);
294 prcm_context.pll_cm_clken =
295 cm_read_mod_reg(PLL_MOD, CM_CLKEN);
296 prcm_context.pll_cm_clken2 = 290 prcm_context.pll_cm_clken2 =
297 cm_read_mod_reg(PLL_MOD, OMAP3430ES2_CM_CLKEN2); 291 cm_read_mod_reg(PLL_MOD, OMAP3430ES2_CM_CLKEN2);
298 prcm_context.cm_polctrl = __raw_readl(OMAP3430_CM_POLCTRL); 292 prcm_context.cm_polctrl = __raw_readl(OMAP3430_CM_POLCTRL);
@@ -338,8 +332,6 @@ void omap3_prcm_save_context(void)
338 cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_AUTOIDLE2); 332 cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_AUTOIDLE2);
339 prcm_context.mpu_cm_autoidle2 = 333 prcm_context.mpu_cm_autoidle2 =
340 cm_read_mod_reg(MPU_MOD, CM_AUTOIDLE2); 334 cm_read_mod_reg(MPU_MOD, CM_AUTOIDLE2);
341 prcm_context.pll_cm_autoidle =
342 cm_read_mod_reg(PLL_MOD, CM_AUTOIDLE);
343 prcm_context.iva2_cm_clkstctrl = 335 prcm_context.iva2_cm_clkstctrl =
344 cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_CLKSTCTRL); 336 cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_CLKSTCTRL);
345 prcm_context.mpu_cm_clkstctrl = 337 prcm_context.mpu_cm_clkstctrl =
@@ -431,7 +423,6 @@ void omap3_prcm_restore_context(void)
431 __raw_writel(prcm_context.cm_sysconfig, OMAP3430_CM_SYSCONFIG); 423 __raw_writel(prcm_context.cm_sysconfig, OMAP3430_CM_SYSCONFIG);
432 cm_write_mod_reg(prcm_context.sgx_cm_clksel, OMAP3430ES2_SGX_MOD, 424 cm_write_mod_reg(prcm_context.sgx_cm_clksel, OMAP3430ES2_SGX_MOD,
433 CM_CLKSEL); 425 CM_CLKSEL);
434 cm_write_mod_reg(prcm_context.wkup_cm_clksel, WKUP_MOD, CM_CLKSEL);
435 cm_write_mod_reg(prcm_context.dss_cm_clksel, OMAP3430_DSS_MOD, 426 cm_write_mod_reg(prcm_context.dss_cm_clksel, OMAP3430_DSS_MOD,
436 CM_CLKSEL); 427 CM_CLKSEL);
437 cm_write_mod_reg(prcm_context.cam_cm_clksel, OMAP3430_CAM_MOD, 428 cm_write_mod_reg(prcm_context.cam_cm_clksel, OMAP3430_CAM_MOD,
@@ -448,7 +439,6 @@ void omap3_prcm_restore_context(void)
448 OMAP3430ES2_CM_CLKSEL4); 439 OMAP3430ES2_CM_CLKSEL4);
449 cm_write_mod_reg(prcm_context.pll_cm_clksel5, PLL_MOD, 440 cm_write_mod_reg(prcm_context.pll_cm_clksel5, PLL_MOD,
450 OMAP3430ES2_CM_CLKSEL5); 441 OMAP3430ES2_CM_CLKSEL5);
451 cm_write_mod_reg(prcm_context.pll_cm_clken, PLL_MOD, CM_CLKEN);
452 cm_write_mod_reg(prcm_context.pll_cm_clken2, PLL_MOD, 442 cm_write_mod_reg(prcm_context.pll_cm_clken2, PLL_MOD,
453 OMAP3430ES2_CM_CLKEN2); 443 OMAP3430ES2_CM_CLKEN2);
454 __raw_writel(prcm_context.cm_polctrl, OMAP3430_CM_POLCTRL); 444 __raw_writel(prcm_context.cm_polctrl, OMAP3430_CM_POLCTRL);
@@ -487,7 +477,6 @@ void omap3_prcm_restore_context(void)
487 cm_write_mod_reg(prcm_context.iva2_cm_autiidle2, OMAP3430_IVA2_MOD, 477 cm_write_mod_reg(prcm_context.iva2_cm_autiidle2, OMAP3430_IVA2_MOD,
488 CM_AUTOIDLE2); 478 CM_AUTOIDLE2);
489 cm_write_mod_reg(prcm_context.mpu_cm_autoidle2, MPU_MOD, CM_AUTOIDLE2); 479 cm_write_mod_reg(prcm_context.mpu_cm_autoidle2, MPU_MOD, CM_AUTOIDLE2);
490 cm_write_mod_reg(prcm_context.pll_cm_autoidle, PLL_MOD, CM_AUTOIDLE);
491 cm_write_mod_reg(prcm_context.iva2_cm_clkstctrl, OMAP3430_IVA2_MOD, 480 cm_write_mod_reg(prcm_context.iva2_cm_clkstctrl, OMAP3430_IVA2_MOD,
492 CM_CLKSTCTRL); 481 CM_CLKSTCTRL);
493 cm_write_mod_reg(prcm_context.mpu_cm_clkstctrl, MPU_MOD, CM_CLKSTCTRL); 482 cm_write_mod_reg(prcm_context.mpu_cm_clkstctrl, MPU_MOD, CM_CLKSTCTRL);
diff --git a/arch/arm/mach-omap2/prm.h b/arch/arm/mach-omap2/prm.h
index ea050ce188a7..40f006285163 100644
--- a/arch/arm/mach-omap2/prm.h
+++ b/arch/arm/mach-omap2/prm.h
@@ -24,6 +24,8 @@
24 OMAP2_L4_IO_ADDRESS(OMAP3430_PRM_BASE + (module) + (reg)) 24 OMAP2_L4_IO_ADDRESS(OMAP3430_PRM_BASE + (module) + (reg))
25#define OMAP44XX_PRM_REGADDR(module, reg) \ 25#define OMAP44XX_PRM_REGADDR(module, reg) \
26 OMAP2_L4_IO_ADDRESS(OMAP4430_PRM_BASE + (module) + (reg)) 26 OMAP2_L4_IO_ADDRESS(OMAP4430_PRM_BASE + (module) + (reg))
27#define OMAP44XX_CHIRONSS_REGADDR(module, reg) \
28 OMAP2_L4_IO_ADDRESS(OMAP4430_CHIRONSS_BASE + (module) + (reg))
27 29
28#include "prm44xx.h" 30#include "prm44xx.h"
29 31
diff --git a/arch/arm/mach-omap2/prm44xx.h b/arch/arm/mach-omap2/prm44xx.h
index 89be97f0589d..adb2558bb121 100644
--- a/arch/arm/mach-omap2/prm44xx.h
+++ b/arch/arm/mach-omap2/prm44xx.h
@@ -386,26 +386,26 @@
386 386
387 387
388/* CHIRON_PRCM.CHIRONSS_OCP_SOCKET_PRCM register offsets */ 388/* CHIRON_PRCM.CHIRONSS_OCP_SOCKET_PRCM register offsets */
389#define OMAP4430_REVISION_PRCM OMAP44XX_PRM_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_OCP_SOCKET_PRCM_MOD, 0x0000) 389#define OMAP4430_REVISION_PRCM OMAP44XX_CHIRONSS_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_OCP_SOCKET_PRCM_MOD, 0x0000)
390 390
391/* CHIRON_PRCM.CHIRONSS_DEVICE_PRM register offsets */ 391/* CHIRON_PRCM.CHIRONSS_DEVICE_PRM register offsets */
392#define OMAP4430_CHIRON_PRCM_PRM_RSTST OMAP44XX_PRM_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_DEVICE_PRM_MOD, 0x0000) 392#define OMAP4430_CHIRON_PRCM_PRM_RSTST OMAP44XX_CHIRONSS_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_DEVICE_PRM_MOD, 0x0000)
393 393
394/* CHIRON_PRCM.CHIRONSS_CPU0 register offsets */ 394/* CHIRON_PRCM.CHIRONSS_CPU0 register offsets */
395#define OMAP4430_PM_PDA_CPU0_PWRSTCTRL OMAP44XX_PRM_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU0_MOD, 0x0000) 395#define OMAP4430_PM_PDA_CPU0_PWRSTCTRL OMAP44XX_CHIRONSS_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU0_MOD, 0x0000)
396#define OMAP4430_PM_PDA_CPU0_PWRSTST OMAP44XX_PRM_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU0_MOD, 0x0004) 396#define OMAP4430_PM_PDA_CPU0_PWRSTST OMAP44XX_CHIRONSS_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU0_MOD, 0x0004)
397#define OMAP4430_RM_PDA_CPU0_CPU0_CONTEXT OMAP44XX_PRM_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU0_MOD, 0x0008) 397#define OMAP4430_RM_PDA_CPU0_CPU0_CONTEXT OMAP44XX_CHIRONSS_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU0_MOD, 0x0008)
398#define OMAP4430_RM_PDA_CPU0_CPU0_RSTCTRL OMAP44XX_PRM_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU0_MOD, 0x000c) 398#define OMAP4430_RM_PDA_CPU0_CPU0_RSTCTRL OMAP44XX_CHIRONSS_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU0_MOD, 0x000c)
399#define OMAP4430_RM_PDA_CPU0_CPU0_RSTST OMAP44XX_PRM_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU0_MOD, 0x0010) 399#define OMAP4430_RM_PDA_CPU0_CPU0_RSTST OMAP44XX_CHIRONSS_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU0_MOD, 0x0010)
400#define OMAP4430_CM_PDA_CPU0_CPU0_CLKCTRL OMAP44XX_PRM_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU0_MOD, 0x0014) 400#define OMAP4430_CM_PDA_CPU0_CPU0_CLKCTRL OMAP44XX_CHIRONSS_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU0_MOD, 0x0014)
401#define OMAP4430_CM_PDA_CPU0_CLKSTCTRL OMAP44XX_PRM_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU0_MOD, 0x0018) 401#define OMAP4430_CM_PDA_CPU0_CLKSTCTRL OMAP44XX_CHIRONSS_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU0_MOD, 0x0018)
402 402
403/* CHIRON_PRCM.CHIRONSS_CPU1 register offsets */ 403/* CHIRON_PRCM.CHIRONSS_CPU1 register offsets */
404#define OMAP4430_PM_PDA_CPU1_PWRSTCTRL OMAP44XX_PRM_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU1_MOD, 0x0000) 404#define OMAP4430_PM_PDA_CPU1_PWRSTCTRL OMAP44XX_CHIRONSS_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU1_MOD, 0x0000)
405#define OMAP4430_PM_PDA_CPU1_PWRSTST OMAP44XX_PRM_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU1_MOD, 0x0004) 405#define OMAP4430_PM_PDA_CPU1_PWRSTST OMAP44XX_CHIRONSS_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU1_MOD, 0x0004)
406#define OMAP4430_RM_PDA_CPU1_CPU1_CONTEXT OMAP44XX_PRM_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU1_MOD, 0x0008) 406#define OMAP4430_RM_PDA_CPU1_CPU1_CONTEXT OMAP44XX_CHIRONSS_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU1_MOD, 0x0008)
407#define OMAP4430_RM_PDA_CPU1_CPU1_RSTCTRL OMAP44XX_PRM_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU1_MOD, 0x000c) 407#define OMAP4430_RM_PDA_CPU1_CPU1_RSTCTRL OMAP44XX_CHIRONSS_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU1_MOD, 0x000c)
408#define OMAP4430_RM_PDA_CPU1_CPU1_RSTST OMAP44XX_PRM_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU1_MOD, 0x0010) 408#define OMAP4430_RM_PDA_CPU1_CPU1_RSTST OMAP44XX_CHIRONSS_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU1_MOD, 0x0010)
409#define OMAP4430_CM_PDA_CPU1_CPU1_CLKCTRL OMAP44XX_PRM_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU1_MOD, 0x0014) 409#define OMAP4430_CM_PDA_CPU1_CPU1_CLKCTRL OMAP44XX_CHIRONSS_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU1_MOD, 0x0014)
410#define OMAP4430_CM_PDA_CPU1_CLKSTCTRL OMAP44XX_PRM_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU1_MOD, 0x0018) 410#define OMAP4430_CM_PDA_CPU1_CLKSTCTRL OMAP44XX_CHIRONSS_REGADDR(OMAP4430_CHIRONSS_CHIRONSS_CPU1_MOD, 0x0018)
411#endif 411#endif
diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S
index 15268f8b61de..c3626ea48143 100644
--- a/arch/arm/mach-omap2/sleep34xx.S
+++ b/arch/arm/mach-omap2/sleep34xx.S
@@ -245,7 +245,8 @@ restore:
245 mov r1, #0 @ set task id for ROM code in r1 245 mov r1, #0 @ set task id for ROM code in r1
246 mov r2, #4 @ set some flags in r2, r6 246 mov r2, #4 @ set some flags in r2, r6
247 mov r6, #0xff 247 mov r6, #0xff
248 adr r3, write_aux_control_params @ r3 points to parameters 248 ldr r4, scratchpad_base
249 ldr r3, [r4, #0xBC] @ r3 points to parameters
249 mcr p15, 0, r0, c7, c10, 4 @ data write barrier 250 mcr p15, 0, r0, c7, c10, 4 @ data write barrier
250 mcr p15, 0, r0, c7, c10, 5 @ data memory barrier 251 mcr p15, 0, r0, c7, c10, 5 @ data memory barrier
251 .word 0xE1600071 @ call SMI monitor (smi #1) 252 .word 0xE1600071 @ call SMI monitor (smi #1)
@@ -253,14 +254,14 @@ restore:
253 b logic_l1_restore 254 b logic_l1_restore
254l2_inv_api_params: 255l2_inv_api_params:
255 .word 0x1, 0x00 256 .word 0x1, 0x00
256write_aux_control_params:
257 .word 0x1, 0x72
258l2_inv_gp: 257l2_inv_gp:
259 /* Execute smi to invalidate L2 cache */ 258 /* Execute smi to invalidate L2 cache */
260 mov r12, #0x1 @ set up to invalide L2 259 mov r12, #0x1 @ set up to invalide L2
261smi: .word 0xE1600070 @ Call SMI monitor (smieq) 260smi: .word 0xE1600070 @ Call SMI monitor (smieq)
262 /* Write to Aux control register to set some bits */ 261 /* Write to Aux control register to set some bits */
263 mov r0, #0x72 262 ldr r4, scratchpad_base
263 ldr r3, [r4,#0xBC]
264 ldr r0, [r3,#4]
264 mov r12, #0x3 265 mov r12, #0x3
265 .word 0xE1600070 @ Call SMI monitor (smieq) 266 .word 0xE1600070 @ Call SMI monitor (smieq)
266logic_l1_restore: 267logic_l1_restore:
@@ -271,6 +272,7 @@ logic_l1_restore:
271 272
272 ldr r4, scratchpad_base 273 ldr r4, scratchpad_base
273 ldr r3, [r4,#0xBC] 274 ldr r3, [r4,#0xBC]
275 adds r3, r3, #8
274 ldmia r3!, {r4-r6} 276 ldmia r3!, {r4-r6}
275 mov sp, r4 277 mov sp, r4
276 msr spsr_cxsf, r5 278 msr spsr_cxsf, r5
@@ -387,6 +389,9 @@ usettbr0:
387save_context_wfi: 389save_context_wfi:
388 /*b save_context_wfi*/ @ enable to debug save code 390 /*b save_context_wfi*/ @ enable to debug save code
389 mov r8, r0 /* Store SDRAM address in r8 */ 391 mov r8, r0 /* Store SDRAM address in r8 */
392 mrc p15, 0, r5, c1, c0, 1 @ Read Auxiliary Control Register
393 mov r4, #0x1 @ Number of parameters for restore call
394 stmia r8!, {r4-r5}
390 /* Check what that target sleep state is:stored in r1*/ 395 /* Check what that target sleep state is:stored in r1*/
391 /* 1 - Only L1 and logic lost */ 396 /* 1 - Only L1 and logic lost */
392 /* 2 - Only L2 lost */ 397 /* 2 - Only L2 lost */
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index b31ca4cef365..8f159db4d08a 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -12,6 +12,7 @@
12 12
13#include <linux/kernel.h> 13#include <linux/kernel.h>
14#include <linux/init.h> 14#include <linux/init.h>
15#include <linux/delay.h>
15#include <linux/platform_device.h> 16#include <linux/platform_device.h>
16#include <linux/pci.h> 17#include <linux/pci.h>
17#include <linux/irq.h> 18#include <linux/irq.h>
@@ -32,6 +33,7 @@
32 33
33#define DNS323_GPIO_LED_RIGHT_AMBER 1 34#define DNS323_GPIO_LED_RIGHT_AMBER 1
34#define DNS323_GPIO_LED_LEFT_AMBER 2 35#define DNS323_GPIO_LED_LEFT_AMBER 2
36#define DNS323_GPIO_SYSTEM_UP 3
35#define DNS323_GPIO_LED_POWER 5 37#define DNS323_GPIO_LED_POWER 5
36#define DNS323_GPIO_OVERTEMP 6 38#define DNS323_GPIO_OVERTEMP 6
37#define DNS323_GPIO_RTC 7 39#define DNS323_GPIO_RTC 7
@@ -239,7 +241,7 @@ static struct gpio_led dns323_leds[] = {
239 { 241 {
240 .name = "power:blue", 242 .name = "power:blue",
241 .gpio = DNS323_GPIO_LED_POWER, 243 .gpio = DNS323_GPIO_LED_POWER,
242 .active_low = 1, 244 .default_state = LEDS_GPIO_DEFSTATE_ON,
243 }, { 245 }, {
244 .name = "right:amber", 246 .name = "right:amber",
245 .gpio = DNS323_GPIO_LED_RIGHT_AMBER, 247 .gpio = DNS323_GPIO_LED_RIGHT_AMBER,
@@ -334,7 +336,7 @@ static struct orion5x_mpp_mode dns323_mv88f5182_mpp_modes[] __initdata = {
334 { 0, MPP_UNUSED }, 336 { 0, MPP_UNUSED },
335 { 1, MPP_GPIO }, /* right amber LED (sata ch0) */ 337 { 1, MPP_GPIO }, /* right amber LED (sata ch0) */
336 { 2, MPP_GPIO }, /* left amber LED (sata ch1) */ 338 { 2, MPP_GPIO }, /* left amber LED (sata ch1) */
337 { 3, MPP_UNUSED }, 339 { 3, MPP_GPIO }, /* system up flag */
338 { 4, MPP_GPIO }, /* power button LED */ 340 { 4, MPP_GPIO }, /* power button LED */
339 { 5, MPP_GPIO }, /* power button LED */ 341 { 5, MPP_GPIO }, /* power button LED */
340 { 6, MPP_GPIO }, /* GMT G751-2f overtemp */ 342 { 6, MPP_GPIO }, /* GMT G751-2f overtemp */
@@ -372,13 +374,23 @@ static struct i2c_board_info __initdata dns323_i2c_devices[] = {
372 }, 374 },
373}; 375};
374 376
375/* DNS-323 specific power off method */ 377/* DNS-323 rev. A specific power off method */
376static void dns323_power_off(void) 378static void dns323a_power_off(void)
377{ 379{
378 pr_info("%s: triggering power-off...\n", __func__); 380 pr_info("%s: triggering power-off...\n", __func__);
379 gpio_set_value(DNS323_GPIO_POWER_OFF, 1); 381 gpio_set_value(DNS323_GPIO_POWER_OFF, 1);
380} 382}
381 383
384/* DNS-323 rev B specific power off method */
385static void dns323b_power_off(void)
386{
387 pr_info("%s: triggering power-off...\n", __func__);
388 /* Pin has to be changed to 1 and back to 0 to do actual power off. */
389 gpio_set_value(DNS323_GPIO_POWER_OFF, 1);
390 mdelay(100);
391 gpio_set_value(DNS323_GPIO_POWER_OFF, 0);
392}
393
382static void __init dns323_init(void) 394static void __init dns323_init(void)
383{ 395{
384 /* Setup basic Orion functions. Need to be called early. */ 396 /* Setup basic Orion functions. Need to be called early. */
@@ -424,11 +436,20 @@ static void __init dns323_init(void)
424 if (dns323_dev_id() == MV88F5182_DEV_ID) 436 if (dns323_dev_id() == MV88F5182_DEV_ID)
425 orion5x_sata_init(&dns323_sata_data); 437 orion5x_sata_init(&dns323_sata_data);
426 438
427 /* register dns323 specific power-off method */ 439 /* The 5182 has flag to indicate the system is up. Without this flag
440 * set, power LED will flash and cannot be controlled via leds-gpio.
441 */
442 if (dns323_dev_id() == MV88F5182_DEV_ID)
443 gpio_set_value(DNS323_GPIO_SYSTEM_UP, 1);
444
445 /* Register dns323 specific power-off method */
428 if (gpio_request(DNS323_GPIO_POWER_OFF, "POWEROFF") != 0 || 446 if (gpio_request(DNS323_GPIO_POWER_OFF, "POWEROFF") != 0 ||
429 gpio_direction_output(DNS323_GPIO_POWER_OFF, 0) != 0) 447 gpio_direction_output(DNS323_GPIO_POWER_OFF, 0) != 0)
430 pr_err("DNS323: failed to setup power-off GPIO\n"); 448 pr_err("DNS323: failed to setup power-off GPIO\n");
431 pm_power_off = dns323_power_off; 449 if (dns323_dev_id() == MV88F5182_DEV_ID)
450 pm_power_off = dns323b_power_off;
451 else
452 pm_power_off = dns323a_power_off;
432} 453}
433 454
434/* Warning: D-Link uses a wrong mach-type (=526) in their bootloader */ 455/* Warning: D-Link uses a wrong mach-type (=526) in their bootloader */
diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
index 1b4ad9d5e2eb..cb0feca193d4 100644
--- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
+++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
@@ -15,6 +15,9 @@
15#include <linux/mtd/physmap.h> 15#include <linux/mtd/physmap.h>
16#include <linux/mv643xx_eth.h> 16#include <linux/mv643xx_eth.h>
17#include <linux/ethtool.h> 17#include <linux/ethtool.h>
18#include <linux/leds.h>
19#include <linux/gpio_keys.h>
20#include <linux/input.h>
18#include <net/dsa.h> 21#include <net/dsa.h>
19#include <asm/mach-types.h> 22#include <asm/mach-types.h>
20#include <asm/gpio.h> 23#include <asm/gpio.h>
@@ -24,6 +27,80 @@
24#include "common.h" 27#include "common.h"
25#include "mpp.h" 28#include "mpp.h"
26 29
30/*
31 * LEDs attached to GPIO
32 */
33static struct gpio_led wrt350n_v2_led_pins[] = {
34 {
35 .name = "wrt350nv2:green:power",
36 .gpio = 0,
37 .active_low = 1,
38 }, {
39 .name = "wrt350nv2:green:security",
40 .gpio = 1,
41 .active_low = 1,
42 }, {
43 .name = "wrt350nv2:orange:power",
44 .gpio = 5,
45 .active_low = 1,
46 }, {
47 .name = "wrt350nv2:green:usb",
48 .gpio = 6,
49 .active_low = 1,
50 }, {
51 .name = "wrt350nv2:green:wireless",
52 .gpio = 7,
53 .active_low = 1,
54 },
55};
56
57static struct gpio_led_platform_data wrt350n_v2_led_data = {
58 .leds = wrt350n_v2_led_pins,
59 .num_leds = ARRAY_SIZE(wrt350n_v2_led_pins),
60};
61
62static struct platform_device wrt350n_v2_leds = {
63 .name = "leds-gpio",
64 .id = -1,
65 .dev = {
66 .platform_data = &wrt350n_v2_led_data,
67 },
68};
69
70/*
71 * Buttons attached to GPIO
72 */
73static struct gpio_keys_button wrt350n_v2_buttons[] = {
74 {
75 .code = KEY_RESTART,
76 .gpio = 3,
77 .desc = "Reset Button",
78 .active_low = 1,
79 }, {
80 .code = KEY_WLAN,
81 .gpio = 2,
82 .desc = "WPS Button",
83 .active_low = 1,
84 },
85};
86
87static struct gpio_keys_platform_data wrt350n_v2_button_data = {
88 .buttons = wrt350n_v2_buttons,
89 .nbuttons = ARRAY_SIZE(wrt350n_v2_buttons),
90};
91
92static struct platform_device wrt350n_v2_button_device = {
93 .name = "gpio-keys",
94 .id = -1,
95 .num_resources = 0,
96 .dev = {
97 .platform_data = &wrt350n_v2_button_data,
98 },
99};
100
101/*
102 * General setup
103 */
27static struct orion5x_mpp_mode wrt350n_v2_mpp_modes[] __initdata = { 104static struct orion5x_mpp_mode wrt350n_v2_mpp_modes[] __initdata = {
28 { 0, MPP_GPIO }, /* Power LED green (0=on) */ 105 { 0, MPP_GPIO }, /* Power LED green (0=on) */
29 { 1, MPP_GPIO }, /* Security LED (0=on) */ 106 { 1, MPP_GPIO }, /* Security LED (0=on) */
@@ -140,6 +217,8 @@ static void __init wrt350n_v2_init(void)
140 orion5x_setup_dev_boot_win(WRT350N_V2_NOR_BOOT_BASE, 217 orion5x_setup_dev_boot_win(WRT350N_V2_NOR_BOOT_BASE,
141 WRT350N_V2_NOR_BOOT_SIZE); 218 WRT350N_V2_NOR_BOOT_SIZE);
142 platform_device_register(&wrt350n_v2_nor_flash); 219 platform_device_register(&wrt350n_v2_nor_flash);
220 platform_device_register(&wrt350n_v2_leds);
221 platform_device_register(&wrt350n_v2_button_device);
143} 222}
144 223
145static int __init wrt350n_v2_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 224static int __init wrt350n_v2_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index 74446cf8ae69..da3156d8690b 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -457,6 +457,7 @@ static struct pxaficp_platform_data corgi_ficp_platform_data = {
457 * USB Device Controller 457 * USB Device Controller
458 */ 458 */
459static struct pxa2xx_udc_mach_info udc_info __initdata = { 459static struct pxa2xx_udc_mach_info udc_info __initdata = {
460 .gpio_vbus = -1,
460 /* no connect GPIO; corgi can't tell connection status */ 461 /* no connect GPIO; corgi can't tell connection status */
461 .gpio_pullup = CORGI_GPIO_USB_PULLUP, 462 .gpio_pullup = CORGI_GPIO_USB_PULLUP,
462}; 463};
diff --git a/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h b/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h
index b13dc0269a6d..9c787855cf24 100644
--- a/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h
+++ b/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h
@@ -169,7 +169,6 @@
169#define GPIO86_nSDCS2 MFP_CFG_OUT(GPIO86, AF0, DRIVE_HIGH) 169#define GPIO86_nSDCS2 MFP_CFG_OUT(GPIO86, AF0, DRIVE_HIGH)
170#define GPIO87_nSDCS3 MFP_CFG_OUT(GPIO87, AF0, DRIVE_HIGH) 170#define GPIO87_nSDCS3 MFP_CFG_OUT(GPIO87, AF0, DRIVE_HIGH)
171#define GPIO88_RDnWR MFP_CFG_OUT(GPIO88, AF0, DRIVE_HIGH) 171#define GPIO88_RDnWR MFP_CFG_OUT(GPIO88, AF0, DRIVE_HIGH)
172#define GPIO89_nACRESET MFP_CFG_OUT(GPIO89, AF0, DRIVE_HIGH)
173 172
174/* USB */ 173/* USB */
175#define GPIO9_USB_RCV MFP_CFG_IN(GPIO9, AF1) 174#define GPIO9_USB_RCV MFP_CFG_IN(GPIO9, AF1)
@@ -186,6 +185,9 @@
186#define GPIO30_ASSP_TXD MFP_CFG_OUT(GPIO30, AF3, DRIVE_LOW) 185#define GPIO30_ASSP_TXD MFP_CFG_OUT(GPIO30, AF3, DRIVE_LOW)
187#define GPIO31_ASSP_SFRM_IN MFP_CFG_IN(GPIO31, AF1) 186#define GPIO31_ASSP_SFRM_IN MFP_CFG_IN(GPIO31, AF1)
188#define GPIO31_ASSP_SFRM_OUT MFP_CFG_OUT(GPIO31, AF3, DRIVE_LOW) 187#define GPIO31_ASSP_SFRM_OUT MFP_CFG_OUT(GPIO31, AF3, DRIVE_LOW)
189#endif 188
189/* AC97 */
190#define GPIO89_AC97_nRESET MFP_CFG_OUT(GPIO89, AF0, DRIVE_HIGH)
191#endif /* CONFIG_CPU_PXA26x */
190 192
191#endif /* __ASM_ARCH_MFP_PXA25X_H */ 193#endif /* __ASM_ARCH_MFP_PXA25X_H */
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index 6112af431fa4..1beb40f692fc 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -164,8 +164,11 @@ static int pxa_irq_suspend(struct sys_device *dev, pm_message_t state)
164 saved_icmr[i] = _ICMR(irq); 164 saved_icmr[i] = _ICMR(irq);
165 _ICMR(irq) = 0; 165 _ICMR(irq) = 0;
166 } 166 }
167 for (i = 0; i < pxa_internal_irq_nr; i++) 167
168 saved_ipr[i] = IPR(i); 168 if (cpu_is_pxa27x() || cpu_is_pxa3xx()) {
169 for (i = 0; i < pxa_internal_irq_nr; i++)
170 saved_ipr[i] = IPR(i);
171 }
169 172
170 return 0; 173 return 0;
171} 174}
@@ -174,12 +177,15 @@ static int pxa_irq_resume(struct sys_device *dev)
174{ 177{
175 int i, irq = PXA_IRQ(0); 178 int i, irq = PXA_IRQ(0);
176 179
180 if (cpu_is_pxa27x() || cpu_is_pxa3xx()) {
181 for (i = 0; i < pxa_internal_irq_nr; i++)
182 IPR(i) = saved_ipr[i];
183 }
184
177 for (i = 0; irq < PXA_IRQ(pxa_internal_irq_nr); i++, irq += 32) { 185 for (i = 0; irq < PXA_IRQ(pxa_internal_irq_nr); i++, irq += 32) {
178 _ICMR(irq) = saved_icmr[i]; 186 _ICMR(irq) = saved_icmr[i];
179 _ICLR(irq) = 0; 187 _ICLR(irq) = 0;
180 } 188 }
181 for (i = 0; i < pxa_internal_irq_nr; i++)
182 IPR(i) = saved_ipr[i];
183 189
184 ICCR = 1; 190 ICCR = 1;
185 return 0; 191 return 0;
diff --git a/arch/arm/mach-s3c2440/mach-mini2440.c b/arch/arm/mach-s3c2440/mach-mini2440.c
index 547d4fc99131..2068e9096a43 100644
--- a/arch/arm/mach-s3c2440/mach-mini2440.c
+++ b/arch/arm/mach-s3c2440/mach-mini2440.c
@@ -288,7 +288,7 @@ static struct s3c2410_platform_nand mini2440_nand_info __initdata = {
288 288
289/* DM9000AEP 10/100 ethernet controller */ 289/* DM9000AEP 10/100 ethernet controller */
290 290
291static struct resource mini2440_dm9k_resource[] __initdata = { 291static struct resource mini2440_dm9k_resource[] = {
292 [0] = { 292 [0] = {
293 .start = MACH_MINI2440_DM9K_BASE, 293 .start = MACH_MINI2440_DM9K_BASE,
294 .end = MACH_MINI2440_DM9K_BASE + 3, 294 .end = MACH_MINI2440_DM9K_BASE + 3,
@@ -310,11 +310,11 @@ static struct resource mini2440_dm9k_resource[] __initdata = {
310 * The DM9000 has no eeprom, and it's MAC address is set by 310 * The DM9000 has no eeprom, and it's MAC address is set by
311 * the bootloader before starting the kernel. 311 * the bootloader before starting the kernel.
312 */ 312 */
313static struct dm9000_plat_data mini2440_dm9k_pdata __initdata = { 313static struct dm9000_plat_data mini2440_dm9k_pdata = {
314 .flags = (DM9000_PLATF_16BITONLY | DM9000_PLATF_NO_EEPROM), 314 .flags = (DM9000_PLATF_16BITONLY | DM9000_PLATF_NO_EEPROM),
315}; 315};
316 316
317static struct platform_device mini2440_device_eth __initdata = { 317static struct platform_device mini2440_device_eth = {
318 .name = "dm9000", 318 .name = "dm9000",
319 .id = -1, 319 .id = -1,
320 .num_resources = ARRAY_SIZE(mini2440_dm9k_resource), 320 .num_resources = ARRAY_SIZE(mini2440_dm9k_resource),
@@ -341,7 +341,7 @@ static struct platform_device mini2440_device_eth __initdata = {
341 * | | +----+ +----+ 341 * | | +----+ +----+
342 * ..... 342 * .....
343 */ 343 */
344static struct gpio_keys_button mini2440_buttons[] __initdata = { 344static struct gpio_keys_button mini2440_buttons[] = {
345 { 345 {
346 .gpio = S3C2410_GPG(0), /* K1 */ 346 .gpio = S3C2410_GPG(0), /* K1 */
347 .code = KEY_F1, 347 .code = KEY_F1,
@@ -384,12 +384,12 @@ static struct gpio_keys_button mini2440_buttons[] __initdata = {
384#endif 384#endif
385}; 385};
386 386
387static struct gpio_keys_platform_data mini2440_button_data __initdata = { 387static struct gpio_keys_platform_data mini2440_button_data = {
388 .buttons = mini2440_buttons, 388 .buttons = mini2440_buttons,
389 .nbuttons = ARRAY_SIZE(mini2440_buttons), 389 .nbuttons = ARRAY_SIZE(mini2440_buttons),
390}; 390};
391 391
392static struct platform_device mini2440_button_device __initdata = { 392static struct platform_device mini2440_button_device = {
393 .name = "gpio-keys", 393 .name = "gpio-keys",
394 .id = -1, 394 .id = -1,
395 .dev = { 395 .dev = {
@@ -399,41 +399,41 @@ static struct platform_device mini2440_button_device __initdata = {
399 399
400/* LEDS */ 400/* LEDS */
401 401
402static struct s3c24xx_led_platdata mini2440_led1_pdata __initdata = { 402static struct s3c24xx_led_platdata mini2440_led1_pdata = {
403 .name = "led1", 403 .name = "led1",
404 .gpio = S3C2410_GPB(5), 404 .gpio = S3C2410_GPB(5),
405 .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE, 405 .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
406 .def_trigger = "heartbeat", 406 .def_trigger = "heartbeat",
407}; 407};
408 408
409static struct s3c24xx_led_platdata mini2440_led2_pdata __initdata = { 409static struct s3c24xx_led_platdata mini2440_led2_pdata = {
410 .name = "led2", 410 .name = "led2",
411 .gpio = S3C2410_GPB(6), 411 .gpio = S3C2410_GPB(6),
412 .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE, 412 .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
413 .def_trigger = "nand-disk", 413 .def_trigger = "nand-disk",
414}; 414};
415 415
416static struct s3c24xx_led_platdata mini2440_led3_pdata __initdata = { 416static struct s3c24xx_led_platdata mini2440_led3_pdata = {
417 .name = "led3", 417 .name = "led3",
418 .gpio = S3C2410_GPB(7), 418 .gpio = S3C2410_GPB(7),
419 .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE, 419 .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
420 .def_trigger = "mmc0", 420 .def_trigger = "mmc0",
421}; 421};
422 422
423static struct s3c24xx_led_platdata mini2440_led4_pdata __initdata = { 423static struct s3c24xx_led_platdata mini2440_led4_pdata = {
424 .name = "led4", 424 .name = "led4",
425 .gpio = S3C2410_GPB(8), 425 .gpio = S3C2410_GPB(8),
426 .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE, 426 .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
427 .def_trigger = "", 427 .def_trigger = "",
428}; 428};
429 429
430static struct s3c24xx_led_platdata mini2440_led_backlight_pdata __initdata = { 430static struct s3c24xx_led_platdata mini2440_led_backlight_pdata = {
431 .name = "backlight", 431 .name = "backlight",
432 .gpio = S3C2410_GPG(4), 432 .gpio = S3C2410_GPG(4),
433 .def_trigger = "backlight", 433 .def_trigger = "backlight",
434}; 434};
435 435
436static struct platform_device mini2440_led1 __initdata = { 436static struct platform_device mini2440_led1 = {
437 .name = "s3c24xx_led", 437 .name = "s3c24xx_led",
438 .id = 1, 438 .id = 1,
439 .dev = { 439 .dev = {
@@ -441,7 +441,7 @@ static struct platform_device mini2440_led1 __initdata = {
441 }, 441 },
442}; 442};
443 443
444static struct platform_device mini2440_led2 __initdata = { 444static struct platform_device mini2440_led2 = {
445 .name = "s3c24xx_led", 445 .name = "s3c24xx_led",
446 .id = 2, 446 .id = 2,
447 .dev = { 447 .dev = {
@@ -449,7 +449,7 @@ static struct platform_device mini2440_led2 __initdata = {
449 }, 449 },
450}; 450};
451 451
452static struct platform_device mini2440_led3 __initdata = { 452static struct platform_device mini2440_led3 = {
453 .name = "s3c24xx_led", 453 .name = "s3c24xx_led",
454 .id = 3, 454 .id = 3,
455 .dev = { 455 .dev = {
@@ -457,7 +457,7 @@ static struct platform_device mini2440_led3 __initdata = {
457 }, 457 },
458}; 458};
459 459
460static struct platform_device mini2440_led4 __initdata = { 460static struct platform_device mini2440_led4 = {
461 .name = "s3c24xx_led", 461 .name = "s3c24xx_led",
462 .id = 4, 462 .id = 4,
463 .dev = { 463 .dev = {
@@ -465,7 +465,7 @@ static struct platform_device mini2440_led4 __initdata = {
465 }, 465 },
466}; 466};
467 467
468static struct platform_device mini2440_led_backlight __initdata = { 468static struct platform_device mini2440_led_backlight = {
469 .name = "s3c24xx_led", 469 .name = "s3c24xx_led",
470 .id = 5, 470 .id = 5,
471 .dev = { 471 .dev = {
@@ -475,14 +475,14 @@ static struct platform_device mini2440_led_backlight __initdata = {
475 475
476/* AUDIO */ 476/* AUDIO */
477 477
478static struct s3c24xx_uda134x_platform_data mini2440_audio_pins __initdata = { 478static struct s3c24xx_uda134x_platform_data mini2440_audio_pins = {
479 .l3_clk = S3C2410_GPB(4), 479 .l3_clk = S3C2410_GPB(4),
480 .l3_mode = S3C2410_GPB(2), 480 .l3_mode = S3C2410_GPB(2),
481 .l3_data = S3C2410_GPB(3), 481 .l3_data = S3C2410_GPB(3),
482 .model = UDA134X_UDA1341 482 .model = UDA134X_UDA1341
483}; 483};
484 484
485static struct platform_device mini2440_audio __initdata = { 485static struct platform_device mini2440_audio = {
486 .name = "s3c24xx_uda134x", 486 .name = "s3c24xx_uda134x",
487 .id = 0, 487 .id = 0,
488 .dev = { 488 .dev = {
diff --git a/arch/arm/mach-s3c6410/mach-hmt.c b/arch/arm/mach-s3c6410/mach-hmt.c
index cdd4b5378552..7619456f2ae8 100644
--- a/arch/arm/mach-s3c6410/mach-hmt.c
+++ b/arch/arm/mach-s3c6410/mach-hmt.c
@@ -82,7 +82,7 @@ static int hmt_bl_init(struct device *dev)
82 return ret; 82 return ret;
83} 83}
84 84
85static int hmt_bl_notify(int brightness) 85static int hmt_bl_notify(struct device *dev, int brightness)
86{ 86{
87 /* 87 /*
88 * translate from CIELUV/CIELAB L*->brightness, E.G. from 88 * translate from CIELUV/CIELAB L*->brightness, E.G. from
diff --git a/arch/arm/mach-s3c6410/mach-smdk6410.c b/arch/arm/mach-s3c6410/mach-smdk6410.c
index 480d297c1de2..8969fe73b83f 100644
--- a/arch/arm/mach-s3c6410/mach-smdk6410.c
+++ b/arch/arm/mach-s3c6410/mach-smdk6410.c
@@ -211,6 +211,7 @@ static struct fixed_voltage_config smdk6410_b_pwr_5v_pdata = {
211 .supply_name = "B_PWR_5V", 211 .supply_name = "B_PWR_5V",
212 .microvolts = 5000000, 212 .microvolts = 5000000,
213 .init_data = &smdk6410_b_pwr_5v_data, 213 .init_data = &smdk6410_b_pwr_5v_data,
214 .gpio = -EINVAL,
214}; 215};
215 216
216static struct platform_device smdk6410_b_pwr_5v = { 217static struct platform_device smdk6410_b_pwr_5v = {
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 1708da82da96..761ffede6a23 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -1067,4 +1067,6 @@ void setup_mm_for_reboot(char mode)
1067 pmd[1] = __pmd(pmdval + (1 << (PGDIR_SHIFT - 1))); 1067 pmd[1] = __pmd(pmdval + (1 << (PGDIR_SHIFT - 1)));
1068 flush_pmd_entry(pmd); 1068 flush_pmd_entry(pmd);
1069 } 1069 }
1070
1071 local_flush_tlb_all();
1070} 1072}
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index 395cc90c6613..7a5337ed7d68 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -59,8 +59,6 @@ ENTRY(cpu_v6_proc_fin)
59 * to what would be the reset vector. 59 * to what would be the reset vector.
60 * 60 *
61 * - loc - location to jump to for soft reset 61 * - loc - location to jump to for soft reset
62 *
63 * It is assumed that:
64 */ 62 */
65 .align 5 63 .align 5
66ENTRY(cpu_v6_reset) 64ENTRY(cpu_v6_reset)
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 3a285218fd15..7aaf88a3b7aa 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -45,7 +45,14 @@ ENTRY(cpu_v7_proc_init)
45ENDPROC(cpu_v7_proc_init) 45ENDPROC(cpu_v7_proc_init)
46 46
47ENTRY(cpu_v7_proc_fin) 47ENTRY(cpu_v7_proc_fin)
48 mov pc, lr 48 stmfd sp!, {lr}
49 cpsid if @ disable interrupts
50 bl v7_flush_kern_cache_all
51 mrc p15, 0, r0, c1, c0, 0 @ ctrl register
52 bic r0, r0, #0x1000 @ ...i............
53 bic r0, r0, #0x0006 @ .............ca.
54 mcr p15, 0, r0, c1, c0, 0 @ disable caches
55 ldmfd sp!, {pc}
49ENDPROC(cpu_v7_proc_fin) 56ENDPROC(cpu_v7_proc_fin)
50 57
51/* 58/*
@@ -56,8 +63,6 @@ ENDPROC(cpu_v7_proc_fin)
56 * to what would be the reset vector. 63 * to what would be the reset vector.
57 * 64 *
58 * - loc - location to jump to for soft reset 65 * - loc - location to jump to for soft reset
59 *
60 * It is assumed that:
61 */ 66 */
62 .align 5 67 .align 5
63ENTRY(cpu_v7_reset) 68ENTRY(cpu_v7_reset)
diff --git a/arch/arm/plat-mxc/include/mach/uncompress.h b/arch/arm/plat-mxc/include/mach/uncompress.h
index 4d5d395ad63b..d49384cb1e97 100644
--- a/arch/arm/plat-mxc/include/mach/uncompress.h
+++ b/arch/arm/plat-mxc/include/mach/uncompress.h
@@ -60,7 +60,9 @@ static void putc(int ch)
60 UART(TXR) = ch; 60 UART(TXR) = ch;
61} 61}
62 62
63#define flush() do { } while (0) 63static inline void flush(void)
64{
65}
64 66
65#define MX1_UART1_BASE_ADDR 0x00206000 67#define MX1_UART1_BASE_ADDR 0x00206000
66#define MX25_UART1_BASE_ADDR 0x43f90000 68#define MX25_UART1_BASE_ADDR 0x43f90000
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index bf1eaf3a27d4..dddc0273bc8b 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -172,6 +172,32 @@ unsigned long long sched_clock(void)
172 clocksource_32k.mult, clocksource_32k.shift); 172 clocksource_32k.mult, clocksource_32k.shift);
173} 173}
174 174
175/**
176 * read_persistent_clock - Return time from a persistent clock.
177 *
178 * Reads the time from a source which isn't disabled during PM, the
179 * 32k sync timer. Convert the cycles elapsed since last read into
180 * nsecs and adds to a monotonically increasing timespec.
181 */
182static struct timespec persistent_ts;
183static cycles_t cycles, last_cycles;
184void read_persistent_clock(struct timespec *ts)
185{
186 unsigned long long nsecs;
187 cycles_t delta;
188 struct timespec *tsp = &persistent_ts;
189
190 last_cycles = cycles;
191 cycles = clocksource_32k.read(&clocksource_32k);
192 delta = cycles - last_cycles;
193
194 nsecs = clocksource_cyc2ns(delta,
195 clocksource_32k.mult, clocksource_32k.shift);
196
197 timespec_add_ns(tsp, nsecs);
198 *ts = *tsp;
199}
200
175static int __init omap_init_clocksource_32k(void) 201static int __init omap_init_clocksource_32k(void)
176{ 202{
177 static char err[] __initdata = KERN_ERR 203 static char err[] __initdata = KERN_ERR
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 09d82b3c66ce..728c64204184 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -1183,7 +1183,7 @@ void omap_dma_unlink_lch(int lch_head, int lch_queue)
1183 } 1183 }
1184 1184
1185 if ((dma_chan[lch_head].flags & OMAP_DMA_ACTIVE) || 1185 if ((dma_chan[lch_head].flags & OMAP_DMA_ACTIVE) ||
1186 (dma_chan[lch_head].flags & OMAP_DMA_ACTIVE)) { 1186 (dma_chan[lch_queue].flags & OMAP_DMA_ACTIVE)) {
1187 printk(KERN_ERR "omap_dma: You need to stop the DMA channels " 1187 printk(KERN_ERR "omap_dma: You need to stop the DMA channels "
1188 "before unlinking\n"); 1188 "before unlinking\n");
1189 dump_stack(); 1189 dump_stack();
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 64f407ee0f4e..08ccf8922520 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -551,6 +551,19 @@ void omap_dm_timer_stop(struct omap_dm_timer *timer)
551 if (l & OMAP_TIMER_CTRL_ST) { 551 if (l & OMAP_TIMER_CTRL_ST) {
552 l &= ~0x1; 552 l &= ~0x1;
553 omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l); 553 omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);
554#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
555 defined(CONFIG_ARCH_OMAP4)
556 /* Readback to make sure write has completed */
557 omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);
558 /*
559 * Wait for functional clock period x 3.5 to make sure that
560 * timer is stopped
561 */
562 udelay(3500000 / clk_get_rate(timer->fclk) + 1);
563 /* Ack possibly pending interrupt */
564 omap_dm_timer_write_reg(timer, OMAP_TIMER_STAT_REG,
565 OMAP_TIMER_INT_OVERFLOW);
566#endif
554 } 567 }
555} 568}
556EXPORT_SYMBOL_GPL(omap_dm_timer_stop); 569EXPORT_SYMBOL_GPL(omap_dm_timer_stop);
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index 9a028bdebb06..a162f585b1e3 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -434,6 +434,7 @@ IS_OMAP_TYPE(3517, 0x3517)
434#define OMAP3430_REV_ES2_1 0x34302034 434#define OMAP3430_REV_ES2_1 0x34302034
435#define OMAP3430_REV_ES3_0 0x34303034 435#define OMAP3430_REV_ES3_0 0x34303034
436#define OMAP3430_REV_ES3_1 0x34304034 436#define OMAP3430_REV_ES3_1 0x34304034
437#define OMAP3430_REV_ES3_1_2 0x34305034
437 438
438#define OMAP3630_REV_ES1_0 0x36300034 439#define OMAP3630_REV_ES1_0 0x36300034
439 440
diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h
index 97d6c50c3dcb..c0ab7c80f72e 100644
--- a/arch/arm/plat-omap/include/plat/irqs.h
+++ b/arch/arm/plat-omap/include/plat/irqs.h
@@ -499,6 +499,9 @@ extern void omap_init_irq(void);
499extern int omap_irq_pending(void); 499extern int omap_irq_pending(void);
500void omap_intc_save_context(void); 500void omap_intc_save_context(void);
501void omap_intc_restore_context(void); 501void omap_intc_restore_context(void);
502void omap3_intc_suspend(void);
503void omap3_intc_prepare_idle(void);
504void omap3_intc_resume_idle(void);
502#endif 505#endif
503 506
504#include <mach/hardware.h> 507#include <mach/hardware.h>
diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h
index 007935a921ea..33933256a226 100644
--- a/arch/arm/plat-omap/include/plat/omap_hwmod.h
+++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h
@@ -227,6 +227,7 @@ struct omap_hwmod_ocp_if {
227#define SYSC_HAS_SIDLEMODE (1 << 5) 227#define SYSC_HAS_SIDLEMODE (1 << 5)
228#define SYSC_HAS_MIDLEMODE (1 << 6) 228#define SYSC_HAS_MIDLEMODE (1 << 6)
229#define SYSS_MISSING (1 << 7) 229#define SYSS_MISSING (1 << 7)
230#define SYSC_NO_CACHE (1 << 8) /* XXX SW flag, belongs elsewhere */
230 231
231/* omap_hwmod_sysconfig.clockact flags */ 232/* omap_hwmod_sysconfig.clockact flags */
232#define CLOCKACT_TEST_BOTH 0x0 233#define CLOCKACT_TEST_BOTH 0x0
diff --git a/arch/arm/plat-orion/pcie.c b/arch/arm/plat-orion/pcie.c
index d41d41d78ad9..54c84a492a0f 100644
--- a/arch/arm/plat-orion/pcie.c
+++ b/arch/arm/plat-orion/pcie.c
@@ -133,6 +133,12 @@ static void __init orion_pcie_setup_wins(void __iomem *base,
133 } 133 }
134 134
135 /* 135 /*
136 * Round up 'size' to the nearest power of two.
137 */
138 if ((size & (size - 1)) != 0)
139 size = 1 << fls(size);
140
141 /*
136 * Setup BAR[1] to all DRAM banks. 142 * Setup BAR[1] to all DRAM banks.
137 */ 143 */
138 writel(dram->cs[0].base, base + PCIE_BAR_LO_OFF(1)); 144 writel(dram->cs[0].base, base + PCIE_BAR_LO_OFF(1));
diff --git a/arch/arm/plat-s3c/dev-nand.c b/arch/arm/plat-s3c/dev-nand.c
index 84808ccda70e..a52fb6cf618f 100644
--- a/arch/arm/plat-s3c/dev-nand.c
+++ b/arch/arm/plat-s3c/dev-nand.c
@@ -58,8 +58,8 @@ static int __init s3c_nand_copy_set(struct s3c2410_nand_set *set)
58 return -ENOMEM; 58 return -ENOMEM;
59 } 59 }
60 60
61 size = sizeof(int) * set->nr_chips; 61 if (set->nr_map && set->nr_chips) {
62 if (size) { 62 size = sizeof(int) * set->nr_chips;
63 ptr = kmemdup(set->nr_map, size, GFP_KERNEL); 63 ptr = kmemdup(set->nr_map, size, GFP_KERNEL);
64 set->nr_map = ptr; 64 set->nr_map = ptr;
65 65
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index c3a74ce24ef6..5a79fc6ee818 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -12,7 +12,7 @@
12# 12#
13# http://www.arm.linux.org.uk/developer/machines/?action=new 13# http://www.arm.linux.org.uk/developer/machines/?action=new
14# 14#
15# Last update: Wed Dec 16 20:06:34 2009 15# Last update: Thu Jan 28 22:15:54 2010
16# 16#
17# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number 17# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
18# 18#
@@ -2536,6 +2536,7 @@ davinci_dm6467tevm MACH_DAVINCI_DM6467TEVM DAVINCI_DM6467TEVM 2548
2536c3ax03 MACH_C3AX03 C3AX03 2549 2536c3ax03 MACH_C3AX03 C3AX03 2549
2537mxt_td60 MACH_MXT_TD60 MXT_TD60 2550 2537mxt_td60 MACH_MXT_TD60 MXT_TD60 2550
2538esyx MACH_ESYX ESYX 2551 2538esyx MACH_ESYX ESYX 2551
2539dove_db2 MACH_DOVE_DB2 DOVE_DB2 2552
2539bulldog MACH_BULLDOG BULLDOG 2553 2540bulldog MACH_BULLDOG BULLDOG 2553
2540derell_me2000 MACH_DERELL_ME2000 DERELL_ME2000 2554 2541derell_me2000 MACH_DERELL_ME2000 DERELL_ME2000 2554
2541bcmring_base MACH_BCMRING_BASE BCMRING_BASE 2555 2542bcmring_base MACH_BCMRING_BASE BCMRING_BASE 2555
@@ -2555,6 +2556,7 @@ iseo MACH_ISEO ISEO 2568
2555cezanne MACH_CEZANNE CEZANNE 2569 2556cezanne MACH_CEZANNE CEZANNE 2569
2556lucca MACH_LUCCA LUCCA 2570 2557lucca MACH_LUCCA LUCCA 2570
2557supersmart MACH_SUPERSMART SUPERSMART 2571 2558supersmart MACH_SUPERSMART SUPERSMART 2571
2559arm11_board MACH_CS_MISANO CS_MISANO 2572
2558magnolia2 MACH_MAGNOLIA2 MAGNOLIA2 2573 2560magnolia2 MACH_MAGNOLIA2 MAGNOLIA2 2573
2559emxx MACH_EMXX EMXX 2574 2561emxx MACH_EMXX EMXX 2574
2560outlaw MACH_OUTLAW OUTLAW 2575 2562outlaw MACH_OUTLAW OUTLAW 2575
@@ -2578,3 +2580,59 @@ glacier MACH_GLACIER GLACIER 2592
2578phrazer_bulldog MACH_PHRAZER_BULLDOG PHRAZER_BULLDOG 2593 2580phrazer_bulldog MACH_PHRAZER_BULLDOG PHRAZER_BULLDOG 2593
2579omap3_bulldog MACH_OMAP3_BULLDOG OMAP3_BULLDOG 2594 2581omap3_bulldog MACH_OMAP3_BULLDOG OMAP3_BULLDOG 2594
2580pca101 MACH_PCA101 PCA101 2595 2582pca101 MACH_PCA101 PCA101 2595
2583buzzc MACH_BUZZC BUZZC 2596
2584sasie2 MACH_SASIE2 SASIE2 2597
2585davinci_cio MACH_DAVINCI_CIO DAVINCI_CIO 2598
2586smartmeter_dl MACH_SMARTMETER_DL SMARTMETER_DL 2599
2587wzl6410 MACH_WZL6410 WZL6410 2600
2588wzl6410m MACH_WZL6410M WZL6410M 2601
2589wzl6410f MACH_WZL6410F WZL6410F 2602
2590wzl6410i MACH_WZL6410I WZL6410I 2603
2591spacecom1 MACH_SPACECOM1 SPACECOM1 2604
2592pingu920 MACH_PINGU920 PINGU920 2605
2593bravoc MACH_BRAVOC BRAVOC 2606
2594cybo2440 MACH_CYBO2440 CYBO2440 2607
2595vdssw MACH_VDSSW VDSSW 2608
2596romulus MACH_ROMULUS ROMULUS 2609
2597omap_magic MACH_OMAP_MAGIC OMAP_MAGIC 2610
2598eltd100 MACH_ELTD100 ELTD100 2611
2599capc7117 MACH_CAPC7117 CAPC7117 2612
2600swan MACH_SWAN SWAN 2613
2601veu MACH_VEU VEU 2614
2602rm2 MACH_RM2 RM2 2615
2603tt2100 MACH_TT2100 TT2100 2616
2604venice MACH_VENICE VENICE 2617
2605pc7323 MACH_PC7323 PC7323 2618
2606masp MACH_MASP MASP 2619
2607fujitsu_tvstbsoc0 MACH_FUJITSU_TVSTBSOC FUJITSU_TVSTBSOC 2620
2608fujitsu_tvstbsoc1 MACH_FUJITSU_TVSTBSOC1 FUJITSU_TVSTBSOC1 2621
2609lexikon MACH_LEXIKON LEXIKON 2622
2610mini2440v2 MACH_MINI2440V2 MINI2440V2 2623
2611icontrol MACH_ICONTROL ICONTROL 2624
2612sheevad MACH_SHEEVAD SHEEVAD 2625
2613qsd8x50a_st1_1 MACH_QSD8X50A_ST1_1 QSD8X50A_ST1_1 2626
2614qsd8x50a_st1_5 MACH_QSD8X50A_ST1_5 QSD8X50A_ST1_5 2627
2615bee MACH_BEE BEE 2628
2616mx23evk MACH_MX23EVK MX23EVK 2629
2617ap4evb MACH_AP4EVB AP4EVB 2630
2618stockholm MACH_STOCKHOLM STOCKHOLM 2631
2619lpc_h3131 MACH_LPC_H3131 LPC_H3131 2632
2620stingray MACH_STINGRAY STINGRAY 2633
2621kraken MACH_KRAKEN KRAKEN 2634
2622gw2388 MACH_GW2388 GW2388 2635
2623jadecpu MACH_JADECPU JADECPU 2636
2624carlisle MACH_CARLISLE CARLISLE 2637
2625lux_sf9 MACH_LUX_SFT9 LUX_SFT9 2638
2626nemid_tb MACH_NEMID_TB NEMID_TB 2639
2627terrier MACH_TERRIER TERRIER 2640
2628turbot MACH_TURBOT TURBOT 2641
2629sanddab MACH_SANDDAB SANDDAB 2642
2630mx35_cicada MACH_MX35_CICADA MX35_CICADA 2643
2631ghi2703d MACH_GHI2703D GHI2703D 2644
2632lux_sfx9 MACH_LUX_SFX9 LUX_SFX9 2645
2633lux_sf9g MACH_LUX_SF9G LUX_SF9G 2646
2634lux_edk9 MACH_LUX_EDK9 LUX_EDK9 2647
2635hw90240 MACH_HW90240 HW90240 2648
2636dm365_leopard MACH_DM365_LEOPARD DM365_LEOPARD 2649
2637mityomapl138 MACH_MITYOMAPL138 MITYOMAPL138 2650
2638scat110 MACH_SCAT110 SCAT110 2651
diff --git a/arch/m68knommu/platform/coldfire/pit.c b/arch/m68knommu/platform/coldfire/pit.c
index d8720ee34510..aebea19abd78 100644
--- a/arch/m68knommu/platform/coldfire/pit.c
+++ b/arch/m68knommu/platform/coldfire/pit.c
@@ -146,7 +146,6 @@ static struct clocksource pit_clk = {
146 .read = pit_read_clk, 146 .read = pit_read_clk,
147 .shift = 20, 147 .shift = 20,
148 .mask = CLOCKSOURCE_MASK(32), 148 .mask = CLOCKSOURCE_MASK(32),
149 .flags = CLOCK_SOURCE_IS_CONTINUOUS,
150}; 149};
151 150
152/***************************************************************************/ 151/***************************************************************************/
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index fd53e500be67..cd5837e298b2 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -90,7 +90,7 @@ source "arch/microblaze/platform/Kconfig.platform"
90 90
91menu "Processor type and features" 91menu "Processor type and features"
92 92
93source kernel/time/Kconfig 93source "kernel/time/Kconfig"
94 94
95source "kernel/Kconfig.preempt" 95source "kernel/Kconfig.preempt"
96 96
diff --git a/arch/microblaze/include/asm/ptrace.h b/arch/microblaze/include/asm/ptrace.h
index a917dc517736..d74dbfb92c04 100644
--- a/arch/microblaze/include/asm/ptrace.h
+++ b/arch/microblaze/include/asm/ptrace.h
@@ -54,6 +54,7 @@ struct pt_regs {
54 int pt_mode; 54 int pt_mode;
55}; 55};
56 56
57#ifdef __KERNEL__
57#define kernel_mode(regs) ((regs)->pt_mode) 58#define kernel_mode(regs) ((regs)->pt_mode)
58#define user_mode(regs) (!kernel_mode(regs)) 59#define user_mode(regs) (!kernel_mode(regs))
59 60
@@ -62,6 +63,19 @@ struct pt_regs {
62 63
63void show_regs(struct pt_regs *); 64void show_regs(struct pt_regs *);
64 65
66#else /* __KERNEL__ */
67
68/* pt_regs offsets used by gdbserver etc in ptrace syscalls */
69#define PT_GPR(n) ((n) * sizeof(microblaze_reg_t))
70#define PT_PC (32 * sizeof(microblaze_reg_t))
71#define PT_MSR (33 * sizeof(microblaze_reg_t))
72#define PT_EAR (34 * sizeof(microblaze_reg_t))
73#define PT_ESR (35 * sizeof(microblaze_reg_t))
74#define PT_FSR (36 * sizeof(microblaze_reg_t))
75#define PT_KERNEL_MODE (37 * sizeof(microblaze_reg_t))
76
77#endif /* __KERNEL */
78
65#endif /* __ASSEMBLY__ */ 79#endif /* __ASSEMBLY__ */
66 80
67#endif /* _ASM_MICROBLAZE_PTRACE_H */ 81#endif /* _ASM_MICROBLAZE_PTRACE_H */
diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h
index cb05a07e55e9..2b67e92a773c 100644
--- a/arch/microblaze/include/asm/unistd.h
+++ b/arch/microblaze/include/asm/unistd.h
@@ -377,13 +377,14 @@
377#define __NR_shutdown 359 /* new */ 377#define __NR_shutdown 359 /* new */
378#define __NR_sendmsg 360 /* new */ 378#define __NR_sendmsg 360 /* new */
379#define __NR_recvmsg 361 /* new */ 379#define __NR_recvmsg 361 /* new */
380#define __NR_accept04 362 /* new */ 380#define __NR_accept4 362 /* new */
381#define __NR_preadv 363 /* new */ 381#define __NR_preadv 363 /* new */
382#define __NR_pwritev 364 /* new */ 382#define __NR_pwritev 364 /* new */
383#define __NR_rt_tgsigqueueinfo 365 /* new */ 383#define __NR_rt_tgsigqueueinfo 365 /* new */
384#define __NR_perf_event_open 366 /* new */ 384#define __NR_perf_event_open 366 /* new */
385#define __NR_recvmmsg 367 /* new */
385 386
386#define __NR_syscalls 367 387#define __NR_syscalls 368
387 388
388#ifdef __KERNEL__ 389#ifdef __KERNEL__
389#ifndef __ASSEMBLY__ 390#ifndef __ASSEMBLY__
diff --git a/arch/microblaze/kernel/prom_parse.c b/arch/microblaze/kernel/prom_parse.c
index ae0352ecd5a9..bf7e6c27e318 100644
--- a/arch/microblaze/kernel/prom_parse.c
+++ b/arch/microblaze/kernel/prom_parse.c
@@ -256,7 +256,7 @@ int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq)
256 if (ppdev == NULL) { 256 if (ppdev == NULL) {
257 struct pci_controller *host; 257 struct pci_controller *host;
258 host = pci_bus_to_host(pdev->bus); 258 host = pci_bus_to_host(pdev->bus);
259 ppnode = host ? host->arch_data : NULL; 259 ppnode = host ? host->dn : NULL;
260 /* No node for host bridge ? give up */ 260 /* No node for host bridge ? give up */
261 if (ppnode == NULL) 261 if (ppnode == NULL)
262 return -EINVAL; 262 return -EINVAL;
diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S
index 4088be7d4e29..03376dc814c9 100644
--- a/arch/microblaze/kernel/syscall_table.S
+++ b/arch/microblaze/kernel/syscall_table.S
@@ -366,7 +366,7 @@ ENTRY(sys_call_table)
366 .long sys_shutdown 366 .long sys_shutdown
367 .long sys_sendmsg /* 360 */ 367 .long sys_sendmsg /* 360 */
368 .long sys_recvmsg 368 .long sys_recvmsg
369 .long sys_ni_syscall 369 .long sys_accept4
370 .long sys_ni_syscall 370 .long sys_ni_syscall
371 .long sys_ni_syscall 371 .long sys_ni_syscall
372 .long sys_rt_tgsigqueueinfo /* 365 */ 372 .long sys_rt_tgsigqueueinfo /* 365 */
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 9541171f1220..8b5d174685f0 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1311,6 +1311,7 @@ config SYS_SUPPORTS_ZBOOT
1311 select HAVE_KERNEL_GZIP 1311 select HAVE_KERNEL_GZIP
1312 select HAVE_KERNEL_BZIP2 1312 select HAVE_KERNEL_BZIP2
1313 select HAVE_KERNEL_LZMA 1313 select HAVE_KERNEL_LZMA
1314 select HAVE_KERNEL_LZO
1314 1315
1315config SYS_SUPPORTS_ZBOOT_UART16550 1316config SYS_SUPPORTS_ZBOOT_UART16550
1316 bool 1317 bool
diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index 671d3448fad4..9df903d714d7 100644
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -14,8 +14,11 @@
14 14
15# compressed kernel load addr: VMLINUZ_LOAD_ADDRESS > VMLINUX_LOAD_ADDRESS + VMLINUX_SIZE 15# compressed kernel load addr: VMLINUZ_LOAD_ADDRESS > VMLINUX_LOAD_ADDRESS + VMLINUX_SIZE
16VMLINUX_SIZE := $(shell wc -c $(objtree)/$(KBUILD_IMAGE) 2>/dev/null | cut -d' ' -f1) 16VMLINUX_SIZE := $(shell wc -c $(objtree)/$(KBUILD_IMAGE) 2>/dev/null | cut -d' ' -f1)
17VMLINUX_SIZE := $(shell [ -n "$(VMLINUX_SIZE)" ] && echo $$(($(VMLINUX_SIZE) + (65536 - $(VMLINUX_SIZE) % 65536)))) 17VMLINUX_SIZE := $(shell [ -n "$(VMLINUX_SIZE)" ] && echo -n $$(($(VMLINUX_SIZE) + (65536 - $(VMLINUX_SIZE) % 65536))))
18VMLINUZ_LOAD_ADDRESS := 0x$(shell [ -n "$(VMLINUX_SIZE)" ] && printf %x $$(($(VMLINUX_LOAD_ADDRESS) + $(VMLINUX_SIZE)))) 18# VMLINUZ_LOAD_ADDRESS = concat "high32 of VMLINUX_LOAD_ADDRESS" and "(low32 of VMLINUX_LOAD_ADDRESS) + VMLINUX_SIZE"
19HIGH32 := $(shell A=$(VMLINUX_LOAD_ADDRESS); [ $${\#A} -gt 10 ] && expr substr "$(VMLINUX_LOAD_ADDRESS)" 3 $$(($${\#A} - 10)))
20LOW32 := $(shell [ -n "$(HIGH32)" ] && A=11 || A=3; expr substr "$(VMLINUX_LOAD_ADDRESS)" $${A} 8)
21VMLINUZ_LOAD_ADDRESS := 0x$(shell [ -n "$(VMLINUX_SIZE)" -a -n "$(LOW32)" ] && printf "$(HIGH32)%08x" $$(($(VMLINUX_SIZE) + 0x$(LOW32))))
19 22
20# set the default size of the mallocing area for decompressing 23# set the default size of the mallocing area for decompressing
21BOOT_HEAP_SIZE := 0x400000 24BOOT_HEAP_SIZE := 0x400000
@@ -41,9 +44,11 @@ $(obj)/vmlinux.bin: $(KBUILD_IMAGE)
41suffix_$(CONFIG_KERNEL_GZIP) = gz 44suffix_$(CONFIG_KERNEL_GZIP) = gz
42suffix_$(CONFIG_KERNEL_BZIP2) = bz2 45suffix_$(CONFIG_KERNEL_BZIP2) = bz2
43suffix_$(CONFIG_KERNEL_LZMA) = lzma 46suffix_$(CONFIG_KERNEL_LZMA) = lzma
47suffix_$(CONFIG_KERNEL_LZO) = lzo
44tool_$(CONFIG_KERNEL_GZIP) = gzip 48tool_$(CONFIG_KERNEL_GZIP) = gzip
45tool_$(CONFIG_KERNEL_BZIP2) = bzip2 49tool_$(CONFIG_KERNEL_BZIP2) = bzip2
46tool_$(CONFIG_KERNEL_LZMA) = lzma 50tool_$(CONFIG_KERNEL_LZMA) = lzma
51tool_$(CONFIG_KERNEL_LZO) = lzo
47$(obj)/vmlinux.$(suffix_y): $(obj)/vmlinux.bin 52$(obj)/vmlinux.$(suffix_y): $(obj)/vmlinux.bin
48 $(call if_changed,$(tool_y)) 53 $(call if_changed,$(tool_y))
49 54
diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compressed/decompress.c
index e48fd72898a8..55d02b3a6712 100644
--- a/arch/mips/boot/compressed/decompress.c
+++ b/arch/mips/boot/compressed/decompress.c
@@ -77,6 +77,10 @@ void *memset(void *s, int c, size_t n)
77#include "../../../../lib/decompress_unlzma.c" 77#include "../../../../lib/decompress_unlzma.c"
78#endif 78#endif
79 79
80#ifdef CONFIG_KERNEL_LZO
81#include "../../../../lib/decompress_unlzo.c"
82#endif
83
80void decompress_kernel(unsigned long boot_heap_start) 84void decompress_kernel(unsigned long boot_heap_start)
81{ 85{
82 int zimage_size; 86 int zimage_size;
diff --git a/arch/mips/include/asm/irq.h b/arch/mips/include/asm/irq.h
index 06960364c96b..dea4aed6478f 100644
--- a/arch/mips/include/asm/irq.h
+++ b/arch/mips/include/asm/irq.h
@@ -135,6 +135,7 @@ extern void free_irqno(unsigned int irq);
135#define CP0_LEGACY_COMPARE_IRQ 7 135#define CP0_LEGACY_COMPARE_IRQ 7
136 136
137extern int cp0_compare_irq; 137extern int cp0_compare_irq;
138extern int cp0_compare_irq_shift;
138extern int cp0_perfcount_irq; 139extern int cp0_perfcount_irq;
139 140
140#endif /* _ASM_IRQ_H */ 141#endif /* _ASM_IRQ_H */
diff --git a/arch/mips/include/asm/mach-powertv/asic_reg_map.h b/arch/mips/include/asm/mach-powertv/asic_reg_map.h
new file mode 100644
index 000000000000..6f26cb09828e
--- /dev/null
+++ b/arch/mips/include/asm/mach-powertv/asic_reg_map.h
@@ -0,0 +1,90 @@
1/*
2 * asic_reg_map.h
3 *
4 * A macro-enclosed list of the elements for the register_map structure for
5 * use in defining and manipulating the structure.
6 *
7 * Copyright (C) 2009 Cisco Systems, Inc.
8 *
9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version.
13 *
14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 * GNU General Public License for more details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
22 */
23
24REGISTER_MAP_ELEMENT(eic_slow0_strt_add)
25REGISTER_MAP_ELEMENT(eic_cfg_bits)
26REGISTER_MAP_ELEMENT(eic_ready_status)
27REGISTER_MAP_ELEMENT(chipver3)
28REGISTER_MAP_ELEMENT(chipver2)
29REGISTER_MAP_ELEMENT(chipver1)
30REGISTER_MAP_ELEMENT(chipver0)
31REGISTER_MAP_ELEMENT(uart1_intstat)
32REGISTER_MAP_ELEMENT(uart1_inten)
33REGISTER_MAP_ELEMENT(uart1_config1)
34REGISTER_MAP_ELEMENT(uart1_config2)
35REGISTER_MAP_ELEMENT(uart1_divisorhi)
36REGISTER_MAP_ELEMENT(uart1_divisorlo)
37REGISTER_MAP_ELEMENT(uart1_data)
38REGISTER_MAP_ELEMENT(uart1_status)
39REGISTER_MAP_ELEMENT(int_stat_3)
40REGISTER_MAP_ELEMENT(int_stat_2)
41REGISTER_MAP_ELEMENT(int_stat_1)
42REGISTER_MAP_ELEMENT(int_stat_0)
43REGISTER_MAP_ELEMENT(int_config)
44REGISTER_MAP_ELEMENT(int_int_scan)
45REGISTER_MAP_ELEMENT(ien_int_3)
46REGISTER_MAP_ELEMENT(ien_int_2)
47REGISTER_MAP_ELEMENT(ien_int_1)
48REGISTER_MAP_ELEMENT(ien_int_0)
49REGISTER_MAP_ELEMENT(int_level_3_3)
50REGISTER_MAP_ELEMENT(int_level_3_2)
51REGISTER_MAP_ELEMENT(int_level_3_1)
52REGISTER_MAP_ELEMENT(int_level_3_0)
53REGISTER_MAP_ELEMENT(int_level_2_3)
54REGISTER_MAP_ELEMENT(int_level_2_2)
55REGISTER_MAP_ELEMENT(int_level_2_1)
56REGISTER_MAP_ELEMENT(int_level_2_0)
57REGISTER_MAP_ELEMENT(int_level_1_3)
58REGISTER_MAP_ELEMENT(int_level_1_2)
59REGISTER_MAP_ELEMENT(int_level_1_1)
60REGISTER_MAP_ELEMENT(int_level_1_0)
61REGISTER_MAP_ELEMENT(int_level_0_3)
62REGISTER_MAP_ELEMENT(int_level_0_2)
63REGISTER_MAP_ELEMENT(int_level_0_1)
64REGISTER_MAP_ELEMENT(int_level_0_0)
65REGISTER_MAP_ELEMENT(int_docsis_en)
66REGISTER_MAP_ELEMENT(mips_pll_setup)
67REGISTER_MAP_ELEMENT(usb_fs)
68REGISTER_MAP_ELEMENT(test_bus)
69REGISTER_MAP_ELEMENT(crt_spare)
70REGISTER_MAP_ELEMENT(usb2_ohci_int_mask)
71REGISTER_MAP_ELEMENT(usb2_strap)
72REGISTER_MAP_ELEMENT(ehci_hcapbase)
73REGISTER_MAP_ELEMENT(ohci_hc_revision)
74REGISTER_MAP_ELEMENT(bcm1_bs_lmi_steer)
75REGISTER_MAP_ELEMENT(usb2_control)
76REGISTER_MAP_ELEMENT(usb2_stbus_obc)
77REGISTER_MAP_ELEMENT(usb2_stbus_mess_size)
78REGISTER_MAP_ELEMENT(usb2_stbus_chunk_size)
79REGISTER_MAP_ELEMENT(pcie_regs)
80REGISTER_MAP_ELEMENT(tim_ch)
81REGISTER_MAP_ELEMENT(tim_cl)
82REGISTER_MAP_ELEMENT(gpio_dout)
83REGISTER_MAP_ELEMENT(gpio_din)
84REGISTER_MAP_ELEMENT(gpio_dir)
85REGISTER_MAP_ELEMENT(watchdog)
86REGISTER_MAP_ELEMENT(front_panel)
87REGISTER_MAP_ELEMENT(misc_clk_ctl1)
88REGISTER_MAP_ELEMENT(misc_clk_ctl2)
89REGISTER_MAP_ELEMENT(crt_ext_ctl)
90REGISTER_MAP_ELEMENT(register_maps)
diff --git a/arch/mips/include/asm/mach-powertv/asic_regs.h b/arch/mips/include/asm/mach-powertv/asic_regs.h
index 9a65c93782f9..1e11236c6dbc 100644
--- a/arch/mips/include/asm/mach-powertv/asic_regs.h
+++ b/arch/mips/include/asm/mach-powertv/asic_regs.h
@@ -35,11 +35,12 @@ enum asic_type {
35#define CRONUS_11 0x0B4C1C21 35#define CRONUS_11 0x0B4C1C21
36#define CRONUSLITE_10 0x0B4C1C40 36#define CRONUSLITE_10 0x0B4C1C40
37 37
38#define NAND_FLASH_BASE 0x03000000 38#define NAND_FLASH_BASE 0x03000000
39#define ZEUS_IO_BASE 0x09000000
40#define CALLIOPE_IO_BASE 0x08000000 39#define CALLIOPE_IO_BASE 0x08000000
41#define CRONUS_IO_BASE 0x09000000 40#define CRONUS_IO_BASE 0x09000000
42#define ASIC_IO_SIZE 0x01000000 41#define ZEUS_IO_BASE 0x09000000
42
43#define ASIC_IO_SIZE 0x01000000
43 44
44/* Definitions for backward compatibility */ 45/* Definitions for backward compatibility */
45#define UART1_INTSTAT uart1_intstat 46#define UART1_INTSTAT uart1_intstat
@@ -52,96 +53,62 @@ enum asic_type {
52#define UART1_STATUS uart1_status 53#define UART1_STATUS uart1_status
53 54
54/* ASIC register enumeration */ 55/* ASIC register enumeration */
56union register_map_entry {
57 unsigned long phys;
58 u32 *virt;
59};
60
61#define REGISTER_MAP_ELEMENT(x) union register_map_entry x;
55struct register_map { 62struct register_map {
56 u32 eic_slow0_strt_add; 63#include <asm/mach-powertv/asic_reg_map.h>
57 u32 eic_cfg_bits;
58 u32 eic_ready_status;
59
60 u32 chipver3;
61 u32 chipver2;
62 u32 chipver1;
63 u32 chipver0;
64
65 u32 uart1_intstat;
66 u32 uart1_inten;
67 u32 uart1_config1;
68 u32 uart1_config2;
69 u32 uart1_divisorhi;
70 u32 uart1_divisorlo;
71 u32 uart1_data;
72 u32 uart1_status;
73
74 u32 int_stat_3;
75 u32 int_stat_2;
76 u32 int_stat_1;
77 u32 int_stat_0;
78 u32 int_config;
79 u32 int_int_scan;
80 u32 ien_int_3;
81 u32 ien_int_2;
82 u32 ien_int_1;
83 u32 ien_int_0;
84 u32 int_level_3_3;
85 u32 int_level_3_2;
86 u32 int_level_3_1;
87 u32 int_level_3_0;
88 u32 int_level_2_3;
89 u32 int_level_2_2;
90 u32 int_level_2_1;
91 u32 int_level_2_0;
92 u32 int_level_1_3;
93 u32 int_level_1_2;
94 u32 int_level_1_1;
95 u32 int_level_1_0;
96 u32 int_level_0_3;
97 u32 int_level_0_2;
98 u32 int_level_0_1;
99 u32 int_level_0_0;
100 u32 int_docsis_en;
101
102 u32 mips_pll_setup;
103 u32 usb_fs;
104 u32 test_bus;
105 u32 crt_spare;
106 u32 usb2_ohci_int_mask;
107 u32 usb2_strap;
108 u32 ehci_hcapbase;
109 u32 ohci_hc_revision;
110 u32 bcm1_bs_lmi_steer;
111 u32 usb2_control;
112 u32 usb2_stbus_obc;
113 u32 usb2_stbus_mess_size;
114 u32 usb2_stbus_chunk_size;
115
116 u32 pcie_regs;
117 u32 tim_ch;
118 u32 tim_cl;
119 u32 gpio_dout;
120 u32 gpio_din;
121 u32 gpio_dir;
122 u32 watchdog;
123 u32 front_panel;
124
125 u32 register_maps;
126}; 64};
65#undef REGISTER_MAP_ELEMENT
66
67/**
68 * register_map_offset_phys - add an offset to the physical address
69 * @map: Pointer to the &struct register_map
70 * @offset: Value to add
71 *
72 * Only adds the base to non-zero physical addresses
73 */
74static inline void register_map_offset_phys(struct register_map *map,
75 unsigned long offset)
76{
77#define REGISTER_MAP_ELEMENT(x) do { \
78 if (map->x.phys != 0) \
79 map->x.phys += offset; \
80 } while (false);
81
82#include <asm/mach-powertv/asic_reg_map.h>
83#undef REGISTER_MAP_ELEMENT
84}
85
86/**
87 * register_map_virtualize - Convert &register_map to virtual addresses
88 * @map: Pointer to &register_map to virtualize
89 */
90static inline void register_map_virtualize(struct register_map *map)
91{
92#define REGISTER_MAP_ELEMENT(x) do { \
93 map->x.virt = (!map->x.phys) ? NULL : \
94 UNCAC_ADDR(phys_to_virt(map->x.phys)); \
95 } while (false);
96
97#include <asm/mach-powertv/asic_reg_map.h>
98#undef REGISTER_MAP_ELEMENT
99}
127 100
128extern enum asic_type asic; 101extern struct register_map _asic_register_map;
129extern const struct register_map *register_map;
130extern unsigned long asic_phy_base; /* Physical address of ASIC */
131extern unsigned long asic_base; /* Virtual address of ASIC */
132 102
133/* 103/*
134 * Macros to interface to registers through their ioremapped address 104 * Macros to interface to registers through their ioremapped address
135 * asic_reg_offset Returns the offset of a given register from the start
136 * of the ASIC address space
137 * asic_reg_phys_addr Returns the physical address of the given register 105 * asic_reg_phys_addr Returns the physical address of the given register
138 * asic_reg_addr Returns the iomapped virtual address of the given 106 * asic_reg_addr Returns the iomapped virtual address of the given
139 * register. 107 * register.
140 */ 108 */
141#define asic_reg_offset(x) (register_map->x) 109#define asic_reg_addr(x) (_asic_register_map.x.virt)
142#define asic_reg_phys_addr(x) (asic_phy_base + asic_reg_offset(x)) 110#define asic_reg_phys_addr(x) (virt_to_phys((void *) CAC_ADDR( \
143#define asic_reg_addr(x) \ 111 (unsigned long) asic_reg_addr(x))))
144 ((unsigned int *) (asic_base + asic_reg_offset(x)))
145 112
146/* 113/*
147 * The asic_reg macro is gone. It should be replaced by either asic_read or 114 * The asic_reg macro is gone. It should be replaced by either asic_read or
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index a581d60cbcc2..f4ab3139d737 100644
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -406,6 +406,16 @@
406#define ST0_XX 0x80000000 /* MIPS IV naming */ 406#define ST0_XX 0x80000000 /* MIPS IV naming */
407 407
408/* 408/*
409 * Bitfields and bit numbers in the coprocessor 0 IntCtl register. (MIPSR2)
410 *
411 * Refer to your MIPS R4xx0 manual, chapter 5 for explanation.
412 */
413#define INTCTLB_IPPCI 26
414#define INTCTLF_IPPCI (_ULCAST_(7) << INTCTLB_IPPCI)
415#define INTCTLB_IPTI 29
416#define INTCTLF_IPTI (_ULCAST_(7) << INTCTLB_IPTI)
417
418/*
409 * Bitfields and bit numbers in the coprocessor 0 cause register. 419 * Bitfields and bit numbers in the coprocessor 0 cause register.
410 * 420 *
411 * Refer to your MIPS R4xx0 manual, chapter 5 for explanation. 421 * Refer to your MIPS R4xx0 manual, chapter 5 for explanation.
@@ -434,6 +444,8 @@
434#define CAUSEF_IV (_ULCAST_(1) << 23) 444#define CAUSEF_IV (_ULCAST_(1) << 23)
435#define CAUSEB_CE 28 445#define CAUSEB_CE 28
436#define CAUSEF_CE (_ULCAST_(3) << 28) 446#define CAUSEF_CE (_ULCAST_(3) << 28)
447#define CAUSEB_TI 30
448#define CAUSEF_TI (_ULCAST_(1) << 30)
437#define CAUSEB_BD 31 449#define CAUSEB_BD 31
438#define CAUSEF_BD (_ULCAST_(1) << 31) 450#define CAUSEF_BD (_ULCAST_(1) << 31)
439 451
diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c
index b469ad05d520..0b2450ceb13f 100644
--- a/arch/mips/kernel/cevt-r4k.c
+++ b/arch/mips/kernel/cevt-r4k.c
@@ -97,7 +97,7 @@ void mips_event_handler(struct clock_event_device *dev)
97 */ 97 */
98static int c0_compare_int_pending(void) 98static int c0_compare_int_pending(void)
99{ 99{
100 return (read_c0_cause() >> cp0_compare_irq) & 0x100; 100 return (read_c0_cause() >> cp0_compare_irq_shift) & (1ul << CAUSEB_IP);
101} 101}
102 102
103/* 103/*
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 308e43460864..338dfe8ed002 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1403,6 +1403,7 @@ extern void flush_tlb_handlers(void);
1403 * Timer interrupt 1403 * Timer interrupt
1404 */ 1404 */
1405int cp0_compare_irq; 1405int cp0_compare_irq;
1406int cp0_compare_irq_shift;
1406 1407
1407/* 1408/*
1408 * Performance counter IRQ or -1 if shared with timer 1409 * Performance counter IRQ or -1 if shared with timer
@@ -1493,8 +1494,9 @@ void __cpuinit per_cpu_trap_init(void)
1493 * o read IntCtl.IPPCI to determine the performance counter interrupt 1494 * o read IntCtl.IPPCI to determine the performance counter interrupt
1494 */ 1495 */
1495 if (cpu_has_mips_r2) { 1496 if (cpu_has_mips_r2) {
1496 cp0_compare_irq = (read_c0_intctl() >> 29) & 7; 1497 cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
1497 cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7; 1498 cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;
1499 cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7;
1498 if (cp0_perfcount_irq == cp0_compare_irq) 1500 if (cp0_perfcount_irq == cp0_compare_irq)
1499 cp0_perfcount_irq = -1; 1501 cp0_perfcount_irq = -1;
1500 } else { 1502 } else {
diff --git a/arch/mips/powertv/asic/asic-calliope.c b/arch/mips/powertv/asic/asic-calliope.c
index 03d3884c6270..1ae6623444b2 100644
--- a/arch/mips/powertv/asic/asic-calliope.c
+++ b/arch/mips/powertv/asic/asic-calliope.c
@@ -23,76 +23,79 @@
23 * Description: Defines the platform resources for the SA settop. 23 * Description: Defines the platform resources for the SA settop.
24 */ 24 */
25 25
26#include <linux/init.h>
26#include <asm/mach-powertv/asic.h> 27#include <asm/mach-powertv/asic.h>
27 28
28const struct register_map calliope_register_map = { 29#define CALLIOPE_ADDR(x) (CALLIOPE_IO_BASE + (x))
29 .eic_slow0_strt_add = 0x800000,
30 .eic_cfg_bits = 0x800038,
31 .eic_ready_status = 0x80004c,
32 30
33 .chipver3 = 0xA00800, 31const struct register_map calliope_register_map __initdata = {
34 .chipver2 = 0xA00804, 32 .eic_slow0_strt_add = {.phys = CALLIOPE_ADDR(0x800000)},
35 .chipver1 = 0xA00808, 33 .eic_cfg_bits = {.phys = CALLIOPE_ADDR(0x800038)},
36 .chipver0 = 0xA0080c, 34 .eic_ready_status = {.phys = CALLIOPE_ADDR(0x80004c)},
35
36 .chipver3 = {.phys = CALLIOPE_ADDR(0xA00800)},
37 .chipver2 = {.phys = CALLIOPE_ADDR(0xA00804)},
38 .chipver1 = {.phys = CALLIOPE_ADDR(0xA00808)},
39 .chipver0 = {.phys = CALLIOPE_ADDR(0xA0080c)},
37 40
38 /* The registers of IRBlaster */ 41 /* The registers of IRBlaster */
39 .uart1_intstat = 0xA01800, 42 .uart1_intstat = {.phys = CALLIOPE_ADDR(0xA01800)},
40 .uart1_inten = 0xA01804, 43 .uart1_inten = {.phys = CALLIOPE_ADDR(0xA01804)},
41 .uart1_config1 = 0xA01808, 44 .uart1_config1 = {.phys = CALLIOPE_ADDR(0xA01808)},
42 .uart1_config2 = 0xA0180C, 45 .uart1_config2 = {.phys = CALLIOPE_ADDR(0xA0180C)},
43 .uart1_divisorhi = 0xA01810, 46 .uart1_divisorhi = {.phys = CALLIOPE_ADDR(0xA01810)},
44 .uart1_divisorlo = 0xA01814, 47 .uart1_divisorlo = {.phys = CALLIOPE_ADDR(0xA01814)},
45 .uart1_data = 0xA01818, 48 .uart1_data = {.phys = CALLIOPE_ADDR(0xA01818)},
46 .uart1_status = 0xA0181C, 49 .uart1_status = {.phys = CALLIOPE_ADDR(0xA0181C)},
47 50
48 .int_stat_3 = 0xA02800, 51 .int_stat_3 = {.phys = CALLIOPE_ADDR(0xA02800)},
49 .int_stat_2 = 0xA02804, 52 .int_stat_2 = {.phys = CALLIOPE_ADDR(0xA02804)},
50 .int_stat_1 = 0xA02808, 53 .int_stat_1 = {.phys = CALLIOPE_ADDR(0xA02808)},
51 .int_stat_0 = 0xA0280c, 54 .int_stat_0 = {.phys = CALLIOPE_ADDR(0xA0280c)},
52 .int_config = 0xA02810, 55 .int_config = {.phys = CALLIOPE_ADDR(0xA02810)},
53 .int_int_scan = 0xA02818, 56 .int_int_scan = {.phys = CALLIOPE_ADDR(0xA02818)},
54 .ien_int_3 = 0xA02830, 57 .ien_int_3 = {.phys = CALLIOPE_ADDR(0xA02830)},
55 .ien_int_2 = 0xA02834, 58 .ien_int_2 = {.phys = CALLIOPE_ADDR(0xA02834)},
56 .ien_int_1 = 0xA02838, 59 .ien_int_1 = {.phys = CALLIOPE_ADDR(0xA02838)},
57 .ien_int_0 = 0xA0283c, 60 .ien_int_0 = {.phys = CALLIOPE_ADDR(0xA0283c)},
58 .int_level_3_3 = 0xA02880, 61 .int_level_3_3 = {.phys = CALLIOPE_ADDR(0xA02880)},
59 .int_level_3_2 = 0xA02884, 62 .int_level_3_2 = {.phys = CALLIOPE_ADDR(0xA02884)},
60 .int_level_3_1 = 0xA02888, 63 .int_level_3_1 = {.phys = CALLIOPE_ADDR(0xA02888)},
61 .int_level_3_0 = 0xA0288c, 64 .int_level_3_0 = {.phys = CALLIOPE_ADDR(0xA0288c)},
62 .int_level_2_3 = 0xA02890, 65 .int_level_2_3 = {.phys = CALLIOPE_ADDR(0xA02890)},
63 .int_level_2_2 = 0xA02894, 66 .int_level_2_2 = {.phys = CALLIOPE_ADDR(0xA02894)},
64 .int_level_2_1 = 0xA02898, 67 .int_level_2_1 = {.phys = CALLIOPE_ADDR(0xA02898)},
65 .int_level_2_0 = 0xA0289c, 68 .int_level_2_0 = {.phys = CALLIOPE_ADDR(0xA0289c)},
66 .int_level_1_3 = 0xA028a0, 69 .int_level_1_3 = {.phys = CALLIOPE_ADDR(0xA028a0)},
67 .int_level_1_2 = 0xA028a4, 70 .int_level_1_2 = {.phys = CALLIOPE_ADDR(0xA028a4)},
68 .int_level_1_1 = 0xA028a8, 71 .int_level_1_1 = {.phys = CALLIOPE_ADDR(0xA028a8)},
69 .int_level_1_0 = 0xA028ac, 72 .int_level_1_0 = {.phys = CALLIOPE_ADDR(0xA028ac)},
70 .int_level_0_3 = 0xA028b0, 73 .int_level_0_3 = {.phys = CALLIOPE_ADDR(0xA028b0)},
71 .int_level_0_2 = 0xA028b4, 74 .int_level_0_2 = {.phys = CALLIOPE_ADDR(0xA028b4)},
72 .int_level_0_1 = 0xA028b8, 75 .int_level_0_1 = {.phys = CALLIOPE_ADDR(0xA028b8)},
73 .int_level_0_0 = 0xA028bc, 76 .int_level_0_0 = {.phys = CALLIOPE_ADDR(0xA028bc)},
74 .int_docsis_en = 0xA028F4, 77 .int_docsis_en = {.phys = CALLIOPE_ADDR(0xA028F4)},
75 78
76 .mips_pll_setup = 0x980000, 79 .mips_pll_setup = {.phys = CALLIOPE_ADDR(0x980000)},
77 .usb_fs = 0x980030, /* -default 72800028- */ 80 .usb_fs = {.phys = CALLIOPE_ADDR(0x980030)},
78 .test_bus = 0x9800CC, 81 .test_bus = {.phys = CALLIOPE_ADDR(0x9800CC)},
79 .crt_spare = 0x9800d4, 82 .crt_spare = {.phys = CALLIOPE_ADDR(0x9800d4)},
80 .usb2_ohci_int_mask = 0x9A000c, 83 .usb2_ohci_int_mask = {.phys = CALLIOPE_ADDR(0x9A000c)},
81 .usb2_strap = 0x9A0014, 84 .usb2_strap = {.phys = CALLIOPE_ADDR(0x9A0014)},
82 .ehci_hcapbase = 0x9BFE00, 85 .ehci_hcapbase = {.phys = CALLIOPE_ADDR(0x9BFE00)},
83 .ohci_hc_revision = 0x9BFC00, 86 .ohci_hc_revision = {.phys = CALLIOPE_ADDR(0x9BFC00)},
84 .bcm1_bs_lmi_steer = 0x9E0004, 87 .bcm1_bs_lmi_steer = {.phys = CALLIOPE_ADDR(0x9E0004)},
85 .usb2_control = 0x9E0054, 88 .usb2_control = {.phys = CALLIOPE_ADDR(0x9E0054)},
86 .usb2_stbus_obc = 0x9BFF00, 89 .usb2_stbus_obc = {.phys = CALLIOPE_ADDR(0x9BFF00)},
87 .usb2_stbus_mess_size = 0x9BFF04, 90 .usb2_stbus_mess_size = {.phys = CALLIOPE_ADDR(0x9BFF04)},
88 .usb2_stbus_chunk_size = 0x9BFF08, 91 .usb2_stbus_chunk_size = {.phys = CALLIOPE_ADDR(0x9BFF08)},
89 92
90 .pcie_regs = 0x000000, /* -doesn't exist- */ 93 .pcie_regs = {.phys = 0x000000}, /* -doesn't exist- */
91 .tim_ch = 0xA02C10, 94 .tim_ch = {.phys = CALLIOPE_ADDR(0xA02C10)},
92 .tim_cl = 0xA02C14, 95 .tim_cl = {.phys = CALLIOPE_ADDR(0xA02C14)},
93 .gpio_dout = 0xA02c20, 96 .gpio_dout = {.phys = CALLIOPE_ADDR(0xA02c20)},
94 .gpio_din = 0xA02c24, 97 .gpio_din = {.phys = CALLIOPE_ADDR(0xA02c24)},
95 .gpio_dir = 0xA02c2C, 98 .gpio_dir = {.phys = CALLIOPE_ADDR(0xA02c2C)},
96 .watchdog = 0xA02c30, 99 .watchdog = {.phys = CALLIOPE_ADDR(0xA02c30)},
97 .front_panel = 0x000000, /* -not used- */ 100 .front_panel = {.phys = 0x000000}, /* -not used- */
98}; 101};
diff --git a/arch/mips/powertv/asic/asic-cronus.c b/arch/mips/powertv/asic/asic-cronus.c
index 5f4589c9f83d..5bb64bfb508b 100644
--- a/arch/mips/powertv/asic/asic-cronus.c
+++ b/arch/mips/powertv/asic/asic-cronus.c
@@ -23,76 +23,79 @@
23 * Description: Defines the platform resources for the SA settop. 23 * Description: Defines the platform resources for the SA settop.
24 */ 24 */
25 25
26#include <linux/init.h>
26#include <asm/mach-powertv/asic.h> 27#include <asm/mach-powertv/asic.h>
27 28
28const struct register_map cronus_register_map = { 29#define CRONUS_ADDR(x) (CRONUS_IO_BASE + (x))
29 .eic_slow0_strt_add = 0x000000,
30 .eic_cfg_bits = 0x000038,
31 .eic_ready_status = 0x00004C,
32 30
33 .chipver3 = 0x2A0800, 31const struct register_map cronus_register_map __initdata = {
34 .chipver2 = 0x2A0804, 32 .eic_slow0_strt_add = {.phys = CRONUS_ADDR(0x000000)},
35 .chipver1 = 0x2A0808, 33 .eic_cfg_bits = {.phys = CRONUS_ADDR(0x000038)},
36 .chipver0 = 0x2A080C, 34 .eic_ready_status = {.phys = CRONUS_ADDR(0x00004C)},
35
36 .chipver3 = {.phys = CRONUS_ADDR(0x2A0800)},
37 .chipver2 = {.phys = CRONUS_ADDR(0x2A0804)},
38 .chipver1 = {.phys = CRONUS_ADDR(0x2A0808)},
39 .chipver0 = {.phys = CRONUS_ADDR(0x2A080C)},
37 40
38 /* The registers of IRBlaster */ 41 /* The registers of IRBlaster */
39 .uart1_intstat = 0x2A1800, 42 .uart1_intstat = {.phys = CRONUS_ADDR(0x2A1800)},
40 .uart1_inten = 0x2A1804, 43 .uart1_inten = {.phys = CRONUS_ADDR(0x2A1804)},
41 .uart1_config1 = 0x2A1808, 44 .uart1_config1 = {.phys = CRONUS_ADDR(0x2A1808)},
42 .uart1_config2 = 0x2A180C, 45 .uart1_config2 = {.phys = CRONUS_ADDR(0x2A180C)},
43 .uart1_divisorhi = 0x2A1810, 46 .uart1_divisorhi = {.phys = CRONUS_ADDR(0x2A1810)},
44 .uart1_divisorlo = 0x2A1814, 47 .uart1_divisorlo = {.phys = CRONUS_ADDR(0x2A1814)},
45 .uart1_data = 0x2A1818, 48 .uart1_data = {.phys = CRONUS_ADDR(0x2A1818)},
46 .uart1_status = 0x2A181C, 49 .uart1_status = {.phys = CRONUS_ADDR(0x2A181C)},
47 50
48 .int_stat_3 = 0x2A2800, 51 .int_stat_3 = {.phys = CRONUS_ADDR(0x2A2800)},
49 .int_stat_2 = 0x2A2804, 52 .int_stat_2 = {.phys = CRONUS_ADDR(0x2A2804)},
50 .int_stat_1 = 0x2A2808, 53 .int_stat_1 = {.phys = CRONUS_ADDR(0x2A2808)},
51 .int_stat_0 = 0x2A280C, 54 .int_stat_0 = {.phys = CRONUS_ADDR(0x2A280C)},
52 .int_config = 0x2A2810, 55 .int_config = {.phys = CRONUS_ADDR(0x2A2810)},
53 .int_int_scan = 0x2A2818, 56 .int_int_scan = {.phys = CRONUS_ADDR(0x2A2818)},
54 .ien_int_3 = 0x2A2830, 57 .ien_int_3 = {.phys = CRONUS_ADDR(0x2A2830)},
55 .ien_int_2 = 0x2A2834, 58 .ien_int_2 = {.phys = CRONUS_ADDR(0x2A2834)},
56 .ien_int_1 = 0x2A2838, 59 .ien_int_1 = {.phys = CRONUS_ADDR(0x2A2838)},
57 .ien_int_0 = 0x2A283C, 60 .ien_int_0 = {.phys = CRONUS_ADDR(0x2A283C)},
58 .int_level_3_3 = 0x2A2880, 61 .int_level_3_3 = {.phys = CRONUS_ADDR(0x2A2880)},
59 .int_level_3_2 = 0x2A2884, 62 .int_level_3_2 = {.phys = CRONUS_ADDR(0x2A2884)},
60 .int_level_3_1 = 0x2A2888, 63 .int_level_3_1 = {.phys = CRONUS_ADDR(0x2A2888)},
61 .int_level_3_0 = 0x2A288C, 64 .int_level_3_0 = {.phys = CRONUS_ADDR(0x2A288C)},
62 .int_level_2_3 = 0x2A2890, 65 .int_level_2_3 = {.phys = CRONUS_ADDR(0x2A2890)},
63 .int_level_2_2 = 0x2A2894, 66 .int_level_2_2 = {.phys = CRONUS_ADDR(0x2A2894)},
64 .int_level_2_1 = 0x2A2898, 67 .int_level_2_1 = {.phys = CRONUS_ADDR(0x2A2898)},
65 .int_level_2_0 = 0x2A289C, 68 .int_level_2_0 = {.phys = CRONUS_ADDR(0x2A289C)},
66 .int_level_1_3 = 0x2A28A0, 69 .int_level_1_3 = {.phys = CRONUS_ADDR(0x2A28A0)},
67 .int_level_1_2 = 0x2A28A4, 70 .int_level_1_2 = {.phys = CRONUS_ADDR(0x2A28A4)},
68 .int_level_1_1 = 0x2A28A8, 71 .int_level_1_1 = {.phys = CRONUS_ADDR(0x2A28A8)},
69 .int_level_1_0 = 0x2A28AC, 72 .int_level_1_0 = {.phys = CRONUS_ADDR(0x2A28AC)},
70 .int_level_0_3 = 0x2A28B0, 73 .int_level_0_3 = {.phys = CRONUS_ADDR(0x2A28B0)},
71 .int_level_0_2 = 0x2A28B4, 74 .int_level_0_2 = {.phys = CRONUS_ADDR(0x2A28B4)},
72 .int_level_0_1 = 0x2A28B8, 75 .int_level_0_1 = {.phys = CRONUS_ADDR(0x2A28B8)},
73 .int_level_0_0 = 0x2A28BC, 76 .int_level_0_0 = {.phys = CRONUS_ADDR(0x2A28BC)},
74 .int_docsis_en = 0x2A28F4, 77 .int_docsis_en = {.phys = CRONUS_ADDR(0x2A28F4)},
75 78
76 .mips_pll_setup = 0x1C0000, 79 .mips_pll_setup = {.phys = CRONUS_ADDR(0x1C0000)},
77 .usb_fs = 0x1C0018, 80 .usb_fs = {.phys = CRONUS_ADDR(0x1C0018)},
78 .test_bus = 0x1C00CC, 81 .test_bus = {.phys = CRONUS_ADDR(0x1C00CC)},
79 .crt_spare = 0x1c00d4, 82 .crt_spare = {.phys = CRONUS_ADDR(0x1c00d4)},
80 .usb2_ohci_int_mask = 0x20000C, 83 .usb2_ohci_int_mask = {.phys = CRONUS_ADDR(0x20000C)},
81 .usb2_strap = 0x200014, 84 .usb2_strap = {.phys = CRONUS_ADDR(0x200014)},
82 .ehci_hcapbase = 0x21FE00, 85 .ehci_hcapbase = {.phys = CRONUS_ADDR(0x21FE00)},
83 .ohci_hc_revision = 0x1E0000, 86 .ohci_hc_revision = {.phys = CRONUS_ADDR(0x1E0000)},
84 .bcm1_bs_lmi_steer = 0x2E0008, 87 .bcm1_bs_lmi_steer = {.phys = CRONUS_ADDR(0x2E0008)},
85 .usb2_control = 0x2E004C, 88 .usb2_control = {.phys = CRONUS_ADDR(0x2E004C)},
86 .usb2_stbus_obc = 0x21FF00, 89 .usb2_stbus_obc = {.phys = CRONUS_ADDR(0x21FF00)},
87 .usb2_stbus_mess_size = 0x21FF04, 90 .usb2_stbus_mess_size = {.phys = CRONUS_ADDR(0x21FF04)},
88 .usb2_stbus_chunk_size = 0x21FF08, 91 .usb2_stbus_chunk_size = {.phys = CRONUS_ADDR(0x21FF08)},
89 92
90 .pcie_regs = 0x220000, 93 .pcie_regs = {.phys = CRONUS_ADDR(0x220000)},
91 .tim_ch = 0x2A2C10, 94 .tim_ch = {.phys = CRONUS_ADDR(0x2A2C10)},
92 .tim_cl = 0x2A2C14, 95 .tim_cl = {.phys = CRONUS_ADDR(0x2A2C14)},
93 .gpio_dout = 0x2A2C20, 96 .gpio_dout = {.phys = CRONUS_ADDR(0x2A2C20)},
94 .gpio_din = 0x2A2C24, 97 .gpio_din = {.phys = CRONUS_ADDR(0x2A2C24)},
95 .gpio_dir = 0x2A2C2C, 98 .gpio_dir = {.phys = CRONUS_ADDR(0x2A2C2C)},
96 .watchdog = 0x2A2C30, 99 .watchdog = {.phys = CRONUS_ADDR(0x2A2C30)},
97 .front_panel = 0x2A3800, 100 .front_panel = {.phys = CRONUS_ADDR(0x2A3800)},
98}; 101};
diff --git a/arch/mips/powertv/asic/asic-zeus.c b/arch/mips/powertv/asic/asic-zeus.c
index 1469daab920e..095cbe10ebb9 100644
--- a/arch/mips/powertv/asic/asic-zeus.c
+++ b/arch/mips/powertv/asic/asic-zeus.c
@@ -23,76 +23,79 @@
23 * Description: Defines the platform resources for the SA settop. 23 * Description: Defines the platform resources for the SA settop.
24 */ 24 */
25 25
26#include <linux/init.h>
26#include <asm/mach-powertv/asic.h> 27#include <asm/mach-powertv/asic.h>
27 28
28const struct register_map zeus_register_map = { 29#define ZEUS_ADDR(x) (ZEUS_IO_BASE + (x))
29 .eic_slow0_strt_add = 0x000000,
30 .eic_cfg_bits = 0x000038,
31 .eic_ready_status = 0x00004c,
32 30
33 .chipver3 = 0x280800, 31const struct register_map zeus_register_map __initdata = {
34 .chipver2 = 0x280804, 32 .eic_slow0_strt_add = {.phys = ZEUS_ADDR(0x000000)},
35 .chipver1 = 0x280808, 33 .eic_cfg_bits = {.phys = ZEUS_ADDR(0x000038)},
36 .chipver0 = 0x28080c, 34 .eic_ready_status = {.phys = ZEUS_ADDR(0x00004c)},
35
36 .chipver3 = {.phys = ZEUS_ADDR(0x280800)},
37 .chipver2 = {.phys = ZEUS_ADDR(0x280804)},
38 .chipver1 = {.phys = ZEUS_ADDR(0x280808)},
39 .chipver0 = {.phys = ZEUS_ADDR(0x28080c)},
37 40
38 /* The registers of IRBlaster */ 41 /* The registers of IRBlaster */
39 .uart1_intstat = 0x281800, 42 .uart1_intstat = {.phys = ZEUS_ADDR(0x281800)},
40 .uart1_inten = 0x281804, 43 .uart1_inten = {.phys = ZEUS_ADDR(0x281804)},
41 .uart1_config1 = 0x281808, 44 .uart1_config1 = {.phys = ZEUS_ADDR(0x281808)},
42 .uart1_config2 = 0x28180C, 45 .uart1_config2 = {.phys = ZEUS_ADDR(0x28180C)},
43 .uart1_divisorhi = 0x281810, 46 .uart1_divisorhi = {.phys = ZEUS_ADDR(0x281810)},
44 .uart1_divisorlo = 0x281814, 47 .uart1_divisorlo = {.phys = ZEUS_ADDR(0x281814)},
45 .uart1_data = 0x281818, 48 .uart1_data = {.phys = ZEUS_ADDR(0x281818)},
46 .uart1_status = 0x28181C, 49 .uart1_status = {.phys = ZEUS_ADDR(0x28181C)},
47 50
48 .int_stat_3 = 0x282800, 51 .int_stat_3 = {.phys = ZEUS_ADDR(0x282800)},
49 .int_stat_2 = 0x282804, 52 .int_stat_2 = {.phys = ZEUS_ADDR(0x282804)},
50 .int_stat_1 = 0x282808, 53 .int_stat_1 = {.phys = ZEUS_ADDR(0x282808)},
51 .int_stat_0 = 0x28280c, 54 .int_stat_0 = {.phys = ZEUS_ADDR(0x28280c)},
52 .int_config = 0x282810, 55 .int_config = {.phys = ZEUS_ADDR(0x282810)},
53 .int_int_scan = 0x282818, 56 .int_int_scan = {.phys = ZEUS_ADDR(0x282818)},
54 .ien_int_3 = 0x282830, 57 .ien_int_3 = {.phys = ZEUS_ADDR(0x282830)},
55 .ien_int_2 = 0x282834, 58 .ien_int_2 = {.phys = ZEUS_ADDR(0x282834)},
56 .ien_int_1 = 0x282838, 59 .ien_int_1 = {.phys = ZEUS_ADDR(0x282838)},
57 .ien_int_0 = 0x28283c, 60 .ien_int_0 = {.phys = ZEUS_ADDR(0x28283c)},
58 .int_level_3_3 = 0x282880, 61 .int_level_3_3 = {.phys = ZEUS_ADDR(0x282880)},
59 .int_level_3_2 = 0x282884, 62 .int_level_3_2 = {.phys = ZEUS_ADDR(0x282884)},
60 .int_level_3_1 = 0x282888, 63 .int_level_3_1 = {.phys = ZEUS_ADDR(0x282888)},
61 .int_level_3_0 = 0x28288c, 64 .int_level_3_0 = {.phys = ZEUS_ADDR(0x28288c)},
62 .int_level_2_3 = 0x282890, 65 .int_level_2_3 = {.phys = ZEUS_ADDR(0x282890)},
63 .int_level_2_2 = 0x282894, 66 .int_level_2_2 = {.phys = ZEUS_ADDR(0x282894)},
64 .int_level_2_1 = 0x282898, 67 .int_level_2_1 = {.phys = ZEUS_ADDR(0x282898)},
65 .int_level_2_0 = 0x28289c, 68 .int_level_2_0 = {.phys = ZEUS_ADDR(0x28289c)},
66 .int_level_1_3 = 0x2828a0, 69 .int_level_1_3 = {.phys = ZEUS_ADDR(0x2828a0)},
67 .int_level_1_2 = 0x2828a4, 70 .int_level_1_2 = {.phys = ZEUS_ADDR(0x2828a4)},
68 .int_level_1_1 = 0x2828a8, 71 .int_level_1_1 = {.phys = ZEUS_ADDR(0x2828a8)},
69 .int_level_1_0 = 0x2828ac, 72 .int_level_1_0 = {.phys = ZEUS_ADDR(0x2828ac)},
70 .int_level_0_3 = 0x2828b0, 73 .int_level_0_3 = {.phys = ZEUS_ADDR(0x2828b0)},
71 .int_level_0_2 = 0x2828b4, 74 .int_level_0_2 = {.phys = ZEUS_ADDR(0x2828b4)},
72 .int_level_0_1 = 0x2828b8, 75 .int_level_0_1 = {.phys = ZEUS_ADDR(0x2828b8)},
73 .int_level_0_0 = 0x2828bc, 76 .int_level_0_0 = {.phys = ZEUS_ADDR(0x2828bc)},
74 .int_docsis_en = 0x2828F4, 77 .int_docsis_en = {.phys = ZEUS_ADDR(0x2828F4)},
75 78
76 .mips_pll_setup = 0x1a0000, 79 .mips_pll_setup = {.phys = ZEUS_ADDR(0x1a0000)},
77 .usb_fs = 0x1a0018, 80 .usb_fs = {.phys = ZEUS_ADDR(0x1a0018)},
78 .test_bus = 0x1a0238, 81 .test_bus = {.phys = ZEUS_ADDR(0x1a0238)},
79 .crt_spare = 0x1a0090, 82 .crt_spare = {.phys = ZEUS_ADDR(0x1a0090)},
80 .usb2_ohci_int_mask = 0x1e000c, 83 .usb2_ohci_int_mask = {.phys = ZEUS_ADDR(0x1e000c)},
81 .usb2_strap = 0x1e0014, 84 .usb2_strap = {.phys = ZEUS_ADDR(0x1e0014)},
82 .ehci_hcapbase = 0x1FFE00, 85 .ehci_hcapbase = {.phys = ZEUS_ADDR(0x1FFE00)},
83 .ohci_hc_revision = 0x1FFC00, 86 .ohci_hc_revision = {.phys = ZEUS_ADDR(0x1FFC00)},
84 .bcm1_bs_lmi_steer = 0x2C0008, 87 .bcm1_bs_lmi_steer = {.phys = ZEUS_ADDR(0x2C0008)},
85 .usb2_control = 0x2c01a0, 88 .usb2_control = {.phys = ZEUS_ADDR(0x2c01a0)},
86 .usb2_stbus_obc = 0x1FFF00, 89 .usb2_stbus_obc = {.phys = ZEUS_ADDR(0x1FFF00)},
87 .usb2_stbus_mess_size = 0x1FFF04, 90 .usb2_stbus_mess_size = {.phys = ZEUS_ADDR(0x1FFF04)},
88 .usb2_stbus_chunk_size = 0x1FFF08, 91 .usb2_stbus_chunk_size = {.phys = ZEUS_ADDR(0x1FFF08)},
89 92
90 .pcie_regs = 0x200000, 93 .pcie_regs = {.phys = ZEUS_ADDR(0x200000)},
91 .tim_ch = 0x282C10, 94 .tim_ch = {.phys = ZEUS_ADDR(0x282C10)},
92 .tim_cl = 0x282C14, 95 .tim_cl = {.phys = ZEUS_ADDR(0x282C14)},
93 .gpio_dout = 0x282c20, 96 .gpio_dout = {.phys = ZEUS_ADDR(0x282c20)},
94 .gpio_din = 0x282c24, 97 .gpio_din = {.phys = ZEUS_ADDR(0x282c24)},
95 .gpio_dir = 0x282c2C, 98 .gpio_dir = {.phys = ZEUS_ADDR(0x282c2C)},
96 .watchdog = 0x282c30, 99 .watchdog = {.phys = ZEUS_ADDR(0x282c30)},
97 .front_panel = 0x283800, 100 .front_panel = {.phys = ZEUS_ADDR(0x283800)},
98}; 101};
diff --git a/arch/mips/powertv/asic/asic_devices.c b/arch/mips/powertv/asic/asic_devices.c
index bae82880b6b5..6a882194e063 100644
--- a/arch/mips/powertv/asic/asic_devices.c
+++ b/arch/mips/powertv/asic/asic_devices.c
@@ -67,8 +67,8 @@ enum asic_type asic;
67 67
68unsigned int platform_features; 68unsigned int platform_features;
69unsigned int platform_family; 69unsigned int platform_family;
70const struct register_map *register_map; 70struct register_map _asic_register_map;
71EXPORT_SYMBOL(register_map); /* Exported for testing */ 71EXPORT_SYMBOL(_asic_register_map); /* Exported for testing */
72unsigned long asic_phy_base; 72unsigned long asic_phy_base;
73unsigned long asic_base; 73unsigned long asic_base;
74EXPORT_SYMBOL(asic_base); /* Exported for testing */ 74EXPORT_SYMBOL(asic_base); /* Exported for testing */
@@ -418,6 +418,15 @@ void platform_unconfigure_usb_ohci()
418{ 418{
419} 419}
420 420
421static void __init set_register_map(unsigned long phys_base,
422 const struct register_map *map)
423{
424 asic_phy_base = phys_base;
425 _asic_register_map = *map;
426 register_map_virtualize(&_asic_register_map);
427 asic_base = (unsigned long)ioremap_nocache(phys_base, ASIC_IO_SIZE);
428}
429
421/** 430/**
422 * configure_platform - configuration based on platform type. 431 * configure_platform - configuration based on platform type.
423 */ 432 */
@@ -431,10 +440,7 @@ void __init configure_platform(void)
431 case FAMILY_1500VZF: 440 case FAMILY_1500VZF:
432 platform_features = FFS_CAPABLE; 441 platform_features = FFS_CAPABLE;
433 asic = ASIC_CALLIOPE; 442 asic = ASIC_CALLIOPE;
434 asic_phy_base = CALLIOPE_IO_BASE; 443 set_register_map(CALLIOPE_IO_BASE, &calliope_register_map);
435 register_map = &calliope_register_map;
436 asic_base = (unsigned long)ioremap_nocache(asic_phy_base,
437 ASIC_IO_SIZE);
438 444
439 if (platform_family == FAMILY_1500VZE) { 445 if (platform_family == FAMILY_1500VZE) {
440 gp_resources = non_dvr_vze_calliope_resources; 446 gp_resources = non_dvr_vze_calliope_resources;
@@ -455,10 +461,7 @@ void __init configure_platform(void)
455 platform_features = FFS_CAPABLE | PCIE_CAPABLE | 461 platform_features = FFS_CAPABLE | PCIE_CAPABLE |
456 DISPLAY_CAPABLE; 462 DISPLAY_CAPABLE;
457 asic = ASIC_ZEUS; 463 asic = ASIC_ZEUS;
458 asic_phy_base = ZEUS_IO_BASE; 464 set_register_map(ZEUS_IO_BASE, &zeus_register_map);
459 register_map = &zeus_register_map;
460 asic_base = (unsigned long)ioremap_nocache(asic_phy_base,
461 ASIC_IO_SIZE);
462 gp_resources = non_dvr_zeus_resources; 465 gp_resources = non_dvr_zeus_resources;
463 466
464 pr_info("Platform: 4500 - ZEUS, NON_DVR_CAPABLE\n"); 467 pr_info("Platform: 4500 - ZEUS, NON_DVR_CAPABLE\n");
@@ -471,11 +474,6 @@ void __init configure_platform(void)
471 /* The settop has PCIE but it isn't used, so don't advertise 474 /* The settop has PCIE but it isn't used, so don't advertise
472 * it*/ 475 * it*/
473 platform_features = FFS_CAPABLE | DISPLAY_CAPABLE; 476 platform_features = FFS_CAPABLE | DISPLAY_CAPABLE;
474 asic_phy_base = CRONUS_IO_BASE; /* same as Cronus */
475 register_map = &cronus_register_map; /* same as Cronus */
476 asic_base = (unsigned long)ioremap_nocache(asic_phy_base,
477 ASIC_IO_SIZE);
478 gp_resources = non_dvr_cronuslite_resources;
479 477
480 /* ASIC version will determine if this is a real CronusLite or 478 /* ASIC version will determine if this is a real CronusLite or
481 * Castrati(Cronus) */ 479 * Castrati(Cronus) */
@@ -489,6 +487,9 @@ void __init configure_platform(void)
489 else 487 else
490 asic = ASIC_CRONUSLITE; 488 asic = ASIC_CRONUSLITE;
491 489
490 /* Cronus and Cronus Lite have the same register map */
491 set_register_map(CRONUS_IO_BASE, &cronus_register_map);
492 gp_resources = non_dvr_cronuslite_resources;
492 pr_info("Platform: 4600 - %s, NON_DVR_CAPABLE, " 493 pr_info("Platform: 4600 - %s, NON_DVR_CAPABLE, "
493 "chipversion=0x%08X\n", 494 "chipversion=0x%08X\n",
494 (asic == ASIC_CRONUS) ? "CRONUS" : "CRONUS LITE", 495 (asic == ASIC_CRONUS) ? "CRONUS" : "CRONUS LITE",
@@ -498,10 +499,7 @@ void __init configure_platform(void)
498 case FAMILY_4600VZA: 499 case FAMILY_4600VZA:
499 platform_features = FFS_CAPABLE | DISPLAY_CAPABLE; 500 platform_features = FFS_CAPABLE | DISPLAY_CAPABLE;
500 asic = ASIC_CRONUS; 501 asic = ASIC_CRONUS;
501 asic_phy_base = CRONUS_IO_BASE; 502 set_register_map(CRONUS_IO_BASE, &cronus_register_map);
502 register_map = &cronus_register_map;
503 asic_base = (unsigned long)ioremap_nocache(asic_phy_base,
504 ASIC_IO_SIZE);
505 gp_resources = non_dvr_cronus_resources; 503 gp_resources = non_dvr_cronus_resources;
506 504
507 pr_info("Platform: Vz Class A - CRONUS, NON_DVR_CAPABLE\n"); 505 pr_info("Platform: Vz Class A - CRONUS, NON_DVR_CAPABLE\n");
@@ -512,10 +510,7 @@ void __init configure_platform(void)
512 platform_features = DVR_CAPABLE | PCIE_CAPABLE | 510 platform_features = DVR_CAPABLE | PCIE_CAPABLE |
513 DISPLAY_CAPABLE; 511 DISPLAY_CAPABLE;
514 asic = ASIC_ZEUS; 512 asic = ASIC_ZEUS;
515 asic_phy_base = ZEUS_IO_BASE; 513 set_register_map(ZEUS_IO_BASE, &zeus_register_map);
516 register_map = &zeus_register_map;
517 asic_base = (unsigned long)ioremap_nocache(asic_phy_base,
518 ASIC_IO_SIZE);
519 gp_resources = dvr_zeus_resources; 514 gp_resources = dvr_zeus_resources;
520 515
521 pr_info("Platform: 8500/RNG200 - ZEUS, DVR_CAPABLE\n"); 516 pr_info("Platform: 8500/RNG200 - ZEUS, DVR_CAPABLE\n");
@@ -526,10 +521,7 @@ void __init configure_platform(void)
526 platform_features = DVR_CAPABLE | PCIE_CAPABLE | 521 platform_features = DVR_CAPABLE | PCIE_CAPABLE |
527 DISPLAY_CAPABLE; 522 DISPLAY_CAPABLE;
528 asic = ASIC_CRONUS; 523 asic = ASIC_CRONUS;
529 asic_phy_base = CRONUS_IO_BASE; 524 set_register_map(CRONUS_IO_BASE, &cronus_register_map);
530 register_map = &cronus_register_map;
531 asic_base = (unsigned long)ioremap_nocache(asic_phy_base,
532 ASIC_IO_SIZE);
533 gp_resources = dvr_cronus_resources; 525 gp_resources = dvr_cronus_resources;
534 526
535 pr_info("Platform: 8600/Vz Class B - CRONUS, " 527 pr_info("Platform: 8600/Vz Class B - CRONUS, "
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 826a30a00f59..bb2465bcb327 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -20,7 +20,7 @@
20all: $(obj)/zImage 20all: $(obj)/zImage
21 21
22BOOTCFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ 22BOOTCFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
23 -fno-strict-aliasing -Os -msoft-float -pipe -D__KERNEL__\ 23 -fno-strict-aliasing -Os -msoft-float -pipe \
24 -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \ 24 -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \
25 -isystem $(shell $(CROSS32CC) -print-file-name=include) 25 -isystem $(shell $(CROSS32CC) -print-file-name=include)
26BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc 26BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc
@@ -34,8 +34,6 @@ BOOTCFLAGS += -fno-stack-protector
34endif 34endif
35 35
36BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj) 36BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj)
37BOOTCFLAGS += -include include/linux/autoconf.h -Iarch/powerpc/include
38BOOTCFLAGS += -Iinclude
39 37
40DTS_FLAGS ?= -p 1024 38DTS_FLAGS ?= -p 1024
41 39
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index 390512ae7f86..f4594ed09a20 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -43,6 +43,9 @@ gzip=.gz
43# cross-compilation prefix 43# cross-compilation prefix
44CROSS= 44CROSS=
45 45
46# mkimage wrapper script
47MKIMAGE=$srctree/scripts/mkuboot.sh
48
46# directory for object and other files used by this script 49# directory for object and other files used by this script
47object=arch/powerpc/boot 50object=arch/powerpc/boot
48objbin=$object 51objbin=$object
@@ -267,7 +270,7 @@ membase=`${CROSS}objdump -p "$kernel" | grep -m 1 LOAD | awk '{print $7}'`
267case "$platform" in 270case "$platform" in
268uboot) 271uboot)
269 rm -f "$ofile" 272 rm -f "$ofile"
270 mkimage -A ppc -O linux -T kernel -C gzip -a $membase -e $membase \ 273 ${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a $membase -e $membase \
271 $uboot_version -d "$vmz" "$ofile" 274 $uboot_version -d "$vmz" "$ofile"
272 if [ -z "$cacheit" ]; then 275 if [ -z "$cacheit" ]; then
273 rm -f "$vmz" 276 rm -f "$vmz"
@@ -327,7 +330,7 @@ coff)
327 ;; 330 ;;
328cuboot*) 331cuboot*)
329 gzip -f -9 "$ofile" 332 gzip -f -9 "$ofile"
330 mkimage -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \ 333 ${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
331 $uboot_version -d "$ofile".gz "$ofile" 334 $uboot_version -d "$ofile".gz "$ofile"
332 ;; 335 ;;
333treeboot*) 336treeboot*)
diff --git a/arch/powerpc/configs/52xx/cm5200_defconfig b/arch/powerpc/configs/52xx/cm5200_defconfig
index 0396ce7bffc6..ff9bdb28197d 100644
--- a/arch/powerpc/configs/52xx/cm5200_defconfig
+++ b/arch/powerpc/configs/52xx/cm5200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc4 3# Linux kernel version: 2.6.33-rc2
4# Thu Oct 15 10:33:22 2009 4# Wed Dec 30 14:45:07 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
58CONFIG_GENERIC_BUG=y 59CONFIG_GENERIC_BUG=y
59CONFIG_DTC=y 60CONFIG_DTC=y
60CONFIG_DEFAULT_UIMAGE=y 61CONFIG_DEFAULT_UIMAGE=y
62CONFIG_ARCH_HIBERNATION_POSSIBLE=y
61# CONFIG_PPC_DCR_NATIVE is not set 63# CONFIG_PPC_DCR_NATIVE is not set
62# CONFIG_PPC_DCR_MMIO is not set 64# CONFIG_PPC_DCR_MMIO is not set
63CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 65CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -85,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86CONFIG_TREE_RCU=y 88CONFIG_TREE_RCU=y
87# CONFIG_TREE_PREEMPT_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_TINY_RCU is not set
88# CONFIG_RCU_TRACE is not set 91# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32 92CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set 93# CONFIG_RCU_FANOUT_EXACT is not set
@@ -166,14 +169,41 @@ CONFIG_LBDAF=y
166# IO Schedulers 169# IO Schedulers
167# 170#
168CONFIG_IOSCHED_NOOP=y 171CONFIG_IOSCHED_NOOP=y
169CONFIG_IOSCHED_AS=y
170CONFIG_IOSCHED_DEADLINE=y 172CONFIG_IOSCHED_DEADLINE=y
171CONFIG_IOSCHED_CFQ=y 173CONFIG_IOSCHED_CFQ=y
172CONFIG_DEFAULT_AS=y
173# CONFIG_DEFAULT_DEADLINE is not set 174# CONFIG_DEFAULT_DEADLINE is not set
174# CONFIG_DEFAULT_CFQ is not set 175CONFIG_DEFAULT_CFQ=y
175# CONFIG_DEFAULT_NOOP is not set 176# CONFIG_DEFAULT_NOOP is not set
176CONFIG_DEFAULT_IOSCHED="anticipatory" 177CONFIG_DEFAULT_IOSCHED="cfq"
178# CONFIG_INLINE_SPIN_TRYLOCK is not set
179# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
180# CONFIG_INLINE_SPIN_LOCK is not set
181# CONFIG_INLINE_SPIN_LOCK_BH is not set
182# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
183# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
184CONFIG_INLINE_SPIN_UNLOCK=y
185# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
186CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
187# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
188# CONFIG_INLINE_READ_TRYLOCK is not set
189# CONFIG_INLINE_READ_LOCK is not set
190# CONFIG_INLINE_READ_LOCK_BH is not set
191# CONFIG_INLINE_READ_LOCK_IRQ is not set
192# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
193CONFIG_INLINE_READ_UNLOCK=y
194# CONFIG_INLINE_READ_UNLOCK_BH is not set
195CONFIG_INLINE_READ_UNLOCK_IRQ=y
196# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
197# CONFIG_INLINE_WRITE_TRYLOCK is not set
198# CONFIG_INLINE_WRITE_LOCK is not set
199# CONFIG_INLINE_WRITE_LOCK_BH is not set
200# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
201# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
202CONFIG_INLINE_WRITE_UNLOCK=y
203# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
204CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
205# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
206# CONFIG_MUTEX_SPIN_ON_OWNER is not set
177# CONFIG_FREEZER is not set 207# CONFIG_FREEZER is not set
178 208
179# 209#
@@ -189,6 +219,7 @@ CONFIG_PPC_MPC5200_SIMPLE=y
189# CONFIG_PPC_MEDIA5200 is not set 219# CONFIG_PPC_MEDIA5200 is not set
190# CONFIG_PPC_MPC5200_BUGFIX is not set 220# CONFIG_PPC_MPC5200_BUGFIX is not set
191# CONFIG_PPC_MPC5200_GPIO is not set 221# CONFIG_PPC_MPC5200_GPIO is not set
222# CONFIG_PPC_MPC5200_LPBFIFO is not set
192# CONFIG_PPC_PMAC is not set 223# CONFIG_PPC_PMAC is not set
193# CONFIG_PPC_CELL is not set 224# CONFIG_PPC_CELL is not set
194# CONFIG_PPC_CELL_NATIVE is not set 225# CONFIG_PPC_CELL_NATIVE is not set
@@ -243,6 +274,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
243CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 274CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
244# CONFIG_KEXEC is not set 275# CONFIG_KEXEC is not set
245# CONFIG_CRASH_DUMP is not set 276# CONFIG_CRASH_DUMP is not set
277CONFIG_SPARSE_IRQ=y
246CONFIG_MAX_ACTIVE_REGIONS=32 278CONFIG_MAX_ACTIVE_REGIONS=32
247CONFIG_ARCH_FLATMEM_ENABLE=y 279CONFIG_ARCH_FLATMEM_ENABLE=y
248CONFIG_ARCH_POPULATES_NODE_MAP=y 280CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -259,8 +291,6 @@ CONFIG_MIGRATION=y
259CONFIG_ZONE_DMA_FLAG=1 291CONFIG_ZONE_DMA_FLAG=1
260CONFIG_BOUNCE=y 292CONFIG_BOUNCE=y
261CONFIG_VIRT_TO_BUS=y 293CONFIG_VIRT_TO_BUS=y
262CONFIG_HAVE_MLOCK=y
263CONFIG_HAVE_MLOCKED_PAGE_BIT=y
264# CONFIG_KSM is not set 294# CONFIG_KSM is not set
265CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 295CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
266CONFIG_PPC_4K_PAGES=y 296CONFIG_PPC_4K_PAGES=y
@@ -273,6 +303,7 @@ CONFIG_PROC_DEVICETREE=y
273CONFIG_EXTRA_TARGETS="" 303CONFIG_EXTRA_TARGETS=""
274CONFIG_PM=y 304CONFIG_PM=y
275# CONFIG_PM_DEBUG is not set 305# CONFIG_PM_DEBUG is not set
306# CONFIG_HIBERNATION is not set
276# CONFIG_PM_RUNTIME is not set 307# CONFIG_PM_RUNTIME is not set
277CONFIG_SECCOMP=y 308CONFIG_SECCOMP=y
278CONFIG_ISA_DMA_API=y 309CONFIG_ISA_DMA_API=y
@@ -378,7 +409,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
378# CONFIG_IRDA is not set 409# CONFIG_IRDA is not set
379# CONFIG_BT is not set 410# CONFIG_BT is not set
380# CONFIG_AF_RXRPC is not set 411# CONFIG_AF_RXRPC is not set
381# CONFIG_WIRELESS is not set 412CONFIG_WIRELESS=y
413# CONFIG_CFG80211 is not set
414# CONFIG_LIB80211 is not set
415
416#
417# CFG80211 needs to be enabled for MAC80211
418#
382# CONFIG_WIMAX is not set 419# CONFIG_WIMAX is not set
383# CONFIG_RFKILL is not set 420# CONFIG_RFKILL is not set
384# CONFIG_NET_9P is not set 421# CONFIG_NET_9P is not set
@@ -489,6 +526,10 @@ CONFIG_BLK_DEV=y
489# CONFIG_BLK_DEV_COW_COMMON is not set 526# CONFIG_BLK_DEV_COW_COMMON is not set
490CONFIG_BLK_DEV_LOOP=y 527CONFIG_BLK_DEV_LOOP=y
491# CONFIG_BLK_DEV_CRYPTOLOOP is not set 528# CONFIG_BLK_DEV_CRYPTOLOOP is not set
529
530#
531# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
532#
492# CONFIG_BLK_DEV_NBD is not set 533# CONFIG_BLK_DEV_NBD is not set
493# CONFIG_BLK_DEV_UB is not set 534# CONFIG_BLK_DEV_UB is not set
494CONFIG_BLK_DEV_RAM=y 535CONFIG_BLK_DEV_RAM=y
@@ -587,8 +628,8 @@ CONFIG_FEC_MPC52xx_MDIO=y
587# CONFIG_NETDEV_1000 is not set 628# CONFIG_NETDEV_1000 is not set
588# CONFIG_NETDEV_10000 is not set 629# CONFIG_NETDEV_10000 is not set
589CONFIG_WLAN=y 630CONFIG_WLAN=y
590# CONFIG_WLAN_PRE80211 is not set 631# CONFIG_USB_ZD1201 is not set
591# CONFIG_WLAN_80211 is not set 632# CONFIG_HOSTAP is not set
592 633
593# 634#
594# Enable WiMAX (Networking options) to see the WiMAX drivers 635# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -643,6 +684,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
643CONFIG_SERIAL_MPC52xx=y 684CONFIG_SERIAL_MPC52xx=y
644CONFIG_SERIAL_MPC52xx_CONSOLE=y 685CONFIG_SERIAL_MPC52xx_CONSOLE=y
645CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=57600 686CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=57600
687# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
646CONFIG_UNIX98_PTYS=y 688CONFIG_UNIX98_PTYS=y
647# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 689# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
648CONFIG_LEGACY_PTYS=y 690CONFIG_LEGACY_PTYS=y
@@ -688,7 +730,6 @@ CONFIG_I2C_MPC=y
688# 730#
689# Miscellaneous I2C Chip support 731# Miscellaneous I2C Chip support
690# 732#
691# CONFIG_DS1682 is not set
692# CONFIG_SENSORS_TSL2550 is not set 733# CONFIG_SENSORS_TSL2550 is not set
693# CONFIG_I2C_DEBUG_CORE is not set 734# CONFIG_I2C_DEBUG_CORE is not set
694# CONFIG_I2C_DEBUG_ALGO is not set 735# CONFIG_I2C_DEBUG_ALGO is not set
@@ -735,11 +776,13 @@ CONFIG_SSB_POSSIBLE=y
735# CONFIG_TWL4030_CORE is not set 776# CONFIG_TWL4030_CORE is not set
736# CONFIG_MFD_TMIO is not set 777# CONFIG_MFD_TMIO is not set
737# CONFIG_PMIC_DA903X is not set 778# CONFIG_PMIC_DA903X is not set
779# CONFIG_PMIC_ADP5520 is not set
738# CONFIG_MFD_WM8400 is not set 780# CONFIG_MFD_WM8400 is not set
739# CONFIG_MFD_WM831X is not set 781# CONFIG_MFD_WM831X is not set
740# CONFIG_MFD_WM8350_I2C is not set 782# CONFIG_MFD_WM8350_I2C is not set
741# CONFIG_MFD_PCF50633 is not set 783# CONFIG_MFD_PCF50633 is not set
742# CONFIG_AB3100_CORE is not set 784# CONFIG_AB3100_CORE is not set
785# CONFIG_MFD_88PM8607 is not set
743# CONFIG_REGULATOR is not set 786# CONFIG_REGULATOR is not set
744# CONFIG_MEDIA_SUPPORT is not set 787# CONFIG_MEDIA_SUPPORT is not set
745 788
@@ -797,7 +840,6 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
797# CONFIG_USB_SL811_HCD is not set 840# CONFIG_USB_SL811_HCD is not set
798# CONFIG_USB_R8A66597_HCD is not set 841# CONFIG_USB_R8A66597_HCD is not set
799# CONFIG_USB_HWA_HCD is not set 842# CONFIG_USB_HWA_HCD is not set
800# CONFIG_USB_MUSB_HDRC is not set
801 843
802# 844#
803# USB Device Class drivers 845# USB Device Class drivers
@@ -1137,6 +1179,7 @@ CONFIG_SCHED_DEBUG=y
1137# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1179# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1138# CONFIG_FAULT_INJECTION is not set 1180# CONFIG_FAULT_INJECTION is not set
1139# CONFIG_LATENCYTOP is not set 1181# CONFIG_LATENCYTOP is not set
1182# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1140# CONFIG_DEBUG_PAGEALLOC is not set 1183# CONFIG_DEBUG_PAGEALLOC is not set
1141CONFIG_HAVE_FUNCTION_TRACER=y 1184CONFIG_HAVE_FUNCTION_TRACER=y
1142CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1185CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -1180,7 +1223,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1180# CONFIG_KEYS is not set 1223# CONFIG_KEYS is not set
1181# CONFIG_SECURITY is not set 1224# CONFIG_SECURITY is not set
1182# CONFIG_SECURITYFS is not set 1225# CONFIG_SECURITYFS is not set
1183# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1226# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1227# CONFIG_DEFAULT_SECURITY_SMACK is not set
1228# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1229CONFIG_DEFAULT_SECURITY_DAC=y
1230CONFIG_DEFAULT_SECURITY=""
1184CONFIG_CRYPTO=y 1231CONFIG_CRYPTO=y
1185 1232
1186# 1233#
diff --git a/arch/powerpc/configs/52xx/lite5200b_defconfig b/arch/powerpc/configs/52xx/lite5200b_defconfig
index f5c07fd72239..7b3f4d0ed404 100644
--- a/arch/powerpc/configs/52xx/lite5200b_defconfig
+++ b/arch/powerpc/configs/52xx/lite5200b_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc4 3# Linux kernel version: 2.6.33-rc2
4# Thu Oct 15 10:33:24 2009 4# Wed Dec 30 14:45:09 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
58CONFIG_GENERIC_BUG=y 59CONFIG_GENERIC_BUG=y
59CONFIG_DTC=y 60CONFIG_DTC=y
60CONFIG_DEFAULT_UIMAGE=y 61CONFIG_DEFAULT_UIMAGE=y
62CONFIG_ARCH_HIBERNATION_POSSIBLE=y
61CONFIG_ARCH_SUSPEND_POSSIBLE=y 63CONFIG_ARCH_SUSPEND_POSSIBLE=y
62# CONFIG_PPC_DCR_NATIVE is not set 64# CONFIG_PPC_DCR_NATIVE is not set
63# CONFIG_PPC_DCR_MMIO is not set 65# CONFIG_PPC_DCR_MMIO is not set
@@ -86,6 +88,7 @@ CONFIG_SYSVIPC_SYSCTL=y
86# 88#
87CONFIG_TREE_RCU=y 89CONFIG_TREE_RCU=y
88# CONFIG_TREE_PREEMPT_RCU is not set 90# CONFIG_TREE_PREEMPT_RCU is not set
91# CONFIG_TINY_RCU is not set
89# CONFIG_RCU_TRACE is not set 92# CONFIG_RCU_TRACE is not set
90CONFIG_RCU_FANOUT=32 93CONFIG_RCU_FANOUT=32
91# CONFIG_RCU_FANOUT_EXACT is not set 94# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 176# IO Schedulers
174# 177#
175CONFIG_IOSCHED_NOOP=y 178CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 179CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 180CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 181# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 182CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 183# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 184CONFIG_DEFAULT_IOSCHED="cfq"
185# CONFIG_INLINE_SPIN_TRYLOCK is not set
186# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK is not set
188# CONFIG_INLINE_SPIN_LOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
191CONFIG_INLINE_SPIN_UNLOCK=y
192# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
193CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
194# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
195# CONFIG_INLINE_READ_TRYLOCK is not set
196# CONFIG_INLINE_READ_LOCK is not set
197# CONFIG_INLINE_READ_LOCK_BH is not set
198# CONFIG_INLINE_READ_LOCK_IRQ is not set
199# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
200CONFIG_INLINE_READ_UNLOCK=y
201# CONFIG_INLINE_READ_UNLOCK_BH is not set
202CONFIG_INLINE_READ_UNLOCK_IRQ=y
203# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_WRITE_TRYLOCK is not set
205# CONFIG_INLINE_WRITE_LOCK is not set
206# CONFIG_INLINE_WRITE_LOCK_BH is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
209CONFIG_INLINE_WRITE_UNLOCK=y
210# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
211CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
212# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
213# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184CONFIG_FREEZER=y 214CONFIG_FREEZER=y
185 215
186# 216#
@@ -196,6 +226,7 @@ CONFIG_PPC_LITE5200=y
196# CONFIG_PPC_MEDIA5200 is not set 226# CONFIG_PPC_MEDIA5200 is not set
197# CONFIG_PPC_MPC5200_BUGFIX is not set 227# CONFIG_PPC_MPC5200_BUGFIX is not set
198# CONFIG_PPC_MPC5200_GPIO is not set 228# CONFIG_PPC_MPC5200_GPIO is not set
229# CONFIG_PPC_MPC5200_LPBFIFO is not set
199# CONFIG_PPC_PMAC is not set 230# CONFIG_PPC_PMAC is not set
200# CONFIG_PPC_CELL is not set 231# CONFIG_PPC_CELL is not set
201# CONFIG_PPC_CELL_NATIVE is not set 232# CONFIG_PPC_CELL_NATIVE is not set
@@ -252,6 +283,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
252CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 283CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
253# CONFIG_KEXEC is not set 284# CONFIG_KEXEC is not set
254# CONFIG_CRASH_DUMP is not set 285# CONFIG_CRASH_DUMP is not set
286CONFIG_SPARSE_IRQ=y
255CONFIG_MAX_ACTIVE_REGIONS=32 287CONFIG_MAX_ACTIVE_REGIONS=32
256CONFIG_ARCH_FLATMEM_ENABLE=y 288CONFIG_ARCH_FLATMEM_ENABLE=y
257CONFIG_ARCH_POPULATES_NODE_MAP=y 289CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -268,8 +300,6 @@ CONFIG_MIGRATION=y
268CONFIG_ZONE_DMA_FLAG=1 300CONFIG_ZONE_DMA_FLAG=1
269CONFIG_BOUNCE=y 301CONFIG_BOUNCE=y
270CONFIG_VIRT_TO_BUS=y 302CONFIG_VIRT_TO_BUS=y
271CONFIG_HAVE_MLOCK=y
272CONFIG_HAVE_MLOCKED_PAGE_BIT=y
273# CONFIG_KSM is not set 303# CONFIG_KSM is not set
274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 304CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
275CONFIG_PPC_4K_PAGES=y 305CONFIG_PPC_4K_PAGES=y
@@ -285,6 +315,7 @@ CONFIG_PM=y
285CONFIG_PM_SLEEP=y 315CONFIG_PM_SLEEP=y
286CONFIG_SUSPEND=y 316CONFIG_SUSPEND=y
287CONFIG_SUSPEND_FREEZER=y 317CONFIG_SUSPEND_FREEZER=y
318# CONFIG_HIBERNATION is not set
288# CONFIG_PM_RUNTIME is not set 319# CONFIG_PM_RUNTIME is not set
289CONFIG_SECCOMP=y 320CONFIG_SECCOMP=y
290CONFIG_ISA_DMA_API=y 321CONFIG_ISA_DMA_API=y
@@ -398,7 +429,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
398# CONFIG_IRDA is not set 429# CONFIG_IRDA is not set
399# CONFIG_BT is not set 430# CONFIG_BT is not set
400# CONFIG_AF_RXRPC is not set 431# CONFIG_AF_RXRPC is not set
401# CONFIG_WIRELESS is not set 432CONFIG_WIRELESS=y
433# CONFIG_CFG80211 is not set
434# CONFIG_LIB80211 is not set
435
436#
437# CFG80211 needs to be enabled for MAC80211
438#
402# CONFIG_WIMAX is not set 439# CONFIG_WIMAX is not set
403# CONFIG_RFKILL is not set 440# CONFIG_RFKILL is not set
404# CONFIG_NET_9P is not set 441# CONFIG_NET_9P is not set
@@ -433,6 +470,10 @@ CONFIG_BLK_DEV=y
433# CONFIG_BLK_DEV_COW_COMMON is not set 470# CONFIG_BLK_DEV_COW_COMMON is not set
434CONFIG_BLK_DEV_LOOP=y 471CONFIG_BLK_DEV_LOOP=y
435# CONFIG_BLK_DEV_CRYPTOLOOP is not set 472# CONFIG_BLK_DEV_CRYPTOLOOP is not set
473
474#
475# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
476#
436# CONFIG_BLK_DEV_NBD is not set 477# CONFIG_BLK_DEV_NBD is not set
437# CONFIG_BLK_DEV_SX8 is not set 478# CONFIG_BLK_DEV_SX8 is not set
438CONFIG_BLK_DEV_RAM=y 479CONFIG_BLK_DEV_RAM=y
@@ -443,6 +484,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
443# CONFIG_ATA_OVER_ETH is not set 484# CONFIG_ATA_OVER_ETH is not set
444# CONFIG_BLK_DEV_HD is not set 485# CONFIG_BLK_DEV_HD is not set
445CONFIG_MISC_DEVICES=y 486CONFIG_MISC_DEVICES=y
487# CONFIG_AD525X_DPOT is not set
446# CONFIG_PHANTOM is not set 488# CONFIG_PHANTOM is not set
447# CONFIG_SGI_IOC4 is not set 489# CONFIG_SGI_IOC4 is not set
448# CONFIG_TIFM_CORE is not set 490# CONFIG_TIFM_CORE is not set
@@ -450,6 +492,7 @@ CONFIG_MISC_DEVICES=y
450# CONFIG_ENCLOSURE_SERVICES is not set 492# CONFIG_ENCLOSURE_SERVICES is not set
451# CONFIG_HP_ILO is not set 493# CONFIG_HP_ILO is not set
452# CONFIG_ISL29003 is not set 494# CONFIG_ISL29003 is not set
495# CONFIG_DS1682 is not set
453# CONFIG_C2PORT is not set 496# CONFIG_C2PORT is not set
454 497
455# 498#
@@ -502,7 +545,9 @@ CONFIG_SCSI_LOWLEVEL=y
502# CONFIG_SCSI_BNX2_ISCSI is not set 545# CONFIG_SCSI_BNX2_ISCSI is not set
503# CONFIG_BE2ISCSI is not set 546# CONFIG_BE2ISCSI is not set
504# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 547# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
548# CONFIG_SCSI_HPSA is not set
505# CONFIG_SCSI_3W_9XXX is not set 549# CONFIG_SCSI_3W_9XXX is not set
550# CONFIG_SCSI_3W_SAS is not set
506# CONFIG_SCSI_ACARD is not set 551# CONFIG_SCSI_ACARD is not set
507# CONFIG_SCSI_AACRAID is not set 552# CONFIG_SCSI_AACRAID is not set
508# CONFIG_SCSI_AIC7XXX is not set 553# CONFIG_SCSI_AIC7XXX is not set
@@ -541,6 +586,7 @@ CONFIG_SCSI_LOWLEVEL=y
541# CONFIG_SCSI_NSP32 is not set 586# CONFIG_SCSI_NSP32 is not set
542# CONFIG_SCSI_DEBUG is not set 587# CONFIG_SCSI_DEBUG is not set
543# CONFIG_SCSI_PMCRAID is not set 588# CONFIG_SCSI_PMCRAID is not set
589# CONFIG_SCSI_PM8001 is not set
544# CONFIG_SCSI_SRP is not set 590# CONFIG_SCSI_SRP is not set
545# CONFIG_SCSI_BFA_FC is not set 591# CONFIG_SCSI_BFA_FC is not set
546# CONFIG_SCSI_DH is not set 592# CONFIG_SCSI_DH is not set
@@ -596,15 +642,16 @@ CONFIG_PATA_MPC52xx=y
596# CONFIG_PATA_NS87415 is not set 642# CONFIG_PATA_NS87415 is not set
597# CONFIG_PATA_OPTI is not set 643# CONFIG_PATA_OPTI is not set
598# CONFIG_PATA_OPTIDMA is not set 644# CONFIG_PATA_OPTIDMA is not set
645# CONFIG_PATA_PDC2027X is not set
599# CONFIG_PATA_PDC_OLD is not set 646# CONFIG_PATA_PDC_OLD is not set
600# CONFIG_PATA_RADISYS is not set 647# CONFIG_PATA_RADISYS is not set
601# CONFIG_PATA_RDC is not set 648# CONFIG_PATA_RDC is not set
602# CONFIG_PATA_RZ1000 is not set 649# CONFIG_PATA_RZ1000 is not set
603# CONFIG_PATA_SC1200 is not set 650# CONFIG_PATA_SC1200 is not set
604# CONFIG_PATA_SERVERWORKS is not set 651# CONFIG_PATA_SERVERWORKS is not set
605# CONFIG_PATA_PDC2027X is not set
606# CONFIG_PATA_SIL680 is not set 652# CONFIG_PATA_SIL680 is not set
607# CONFIG_PATA_SIS is not set 653# CONFIG_PATA_SIS is not set
654# CONFIG_PATA_TOSHIBA is not set
608# CONFIG_PATA_VIA is not set 655# CONFIG_PATA_VIA is not set
609# CONFIG_PATA_WINBOND is not set 656# CONFIG_PATA_WINBOND is not set
610# CONFIG_PATA_PLATFORM is not set 657# CONFIG_PATA_PLATFORM is not set
@@ -726,8 +773,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
726# CONFIG_BE2NET is not set 773# CONFIG_BE2NET is not set
727# CONFIG_TR is not set 774# CONFIG_TR is not set
728CONFIG_WLAN=y 775CONFIG_WLAN=y
729# CONFIG_WLAN_PRE80211 is not set 776# CONFIG_AIRO is not set
730# CONFIG_WLAN_80211 is not set 777# CONFIG_ATMEL is not set
778# CONFIG_PRISM54 is not set
779# CONFIG_HOSTAP is not set
731 780
732# 781#
733# Enable WiMAX (Networking options) to see the WiMAX drivers 782# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -741,6 +790,7 @@ CONFIG_WLAN=y
741# CONFIG_NETCONSOLE is not set 790# CONFIG_NETCONSOLE is not set
742# CONFIG_NETPOLL is not set 791# CONFIG_NETPOLL is not set
743# CONFIG_NET_POLL_CONTROLLER is not set 792# CONFIG_NET_POLL_CONTROLLER is not set
793# CONFIG_VMXNET3 is not set
744# CONFIG_ISDN is not set 794# CONFIG_ISDN is not set
745# CONFIG_PHONE is not set 795# CONFIG_PHONE is not set
746 796
@@ -778,6 +828,7 @@ CONFIG_SERIAL_MPC52xx=y
778CONFIG_SERIAL_MPC52xx_CONSOLE=y 828CONFIG_SERIAL_MPC52xx_CONSOLE=y
779CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 829CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
780# CONFIG_SERIAL_JSM is not set 830# CONFIG_SERIAL_JSM is not set
831# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
781CONFIG_UNIX98_PTYS=y 832CONFIG_UNIX98_PTYS=y
782# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 833# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
783CONFIG_LEGACY_PTYS=y 834CONFIG_LEGACY_PTYS=y
@@ -836,11 +887,6 @@ CONFIG_I2C_MPC=y
836# CONFIG_I2C_TAOS_EVM is not set 887# CONFIG_I2C_TAOS_EVM is not set
837 888
838# 889#
839# Graphics adapter I2C/DDC channel drivers
840#
841# CONFIG_I2C_VOODOO3 is not set
842
843#
844# Other I2C/SMBus bus drivers 890# Other I2C/SMBus bus drivers
845# 891#
846# CONFIG_I2C_PCA_PLATFORM is not set 892# CONFIG_I2C_PCA_PLATFORM is not set
@@ -849,7 +895,6 @@ CONFIG_I2C_MPC=y
849# 895#
850# Miscellaneous I2C Chip support 896# Miscellaneous I2C Chip support
851# 897#
852# CONFIG_DS1682 is not set
853# CONFIG_SENSORS_TSL2550 is not set 898# CONFIG_SENSORS_TSL2550 is not set
854# CONFIG_I2C_DEBUG_CORE is not set 899# CONFIG_I2C_DEBUG_CORE is not set
855# CONFIG_I2C_DEBUG_ALGO is not set 900# CONFIG_I2C_DEBUG_ALGO is not set
@@ -884,11 +929,13 @@ CONFIG_SSB_POSSIBLE=y
884# CONFIG_TWL4030_CORE is not set 929# CONFIG_TWL4030_CORE is not set
885# CONFIG_MFD_TMIO is not set 930# CONFIG_MFD_TMIO is not set
886# CONFIG_PMIC_DA903X is not set 931# CONFIG_PMIC_DA903X is not set
932# CONFIG_PMIC_ADP5520 is not set
887# CONFIG_MFD_WM8400 is not set 933# CONFIG_MFD_WM8400 is not set
888# CONFIG_MFD_WM831X is not set 934# CONFIG_MFD_WM831X is not set
889# CONFIG_MFD_WM8350_I2C is not set 935# CONFIG_MFD_WM8350_I2C is not set
890# CONFIG_MFD_PCF50633 is not set 936# CONFIG_MFD_PCF50633 is not set
891# CONFIG_AB3100_CORE is not set 937# CONFIG_AB3100_CORE is not set
938# CONFIG_MFD_88PM8607 is not set
892# CONFIG_REGULATOR is not set 939# CONFIG_REGULATOR is not set
893# CONFIG_MEDIA_SUPPORT is not set 940# CONFIG_MEDIA_SUPPORT is not set
894 941
@@ -1129,6 +1176,7 @@ CONFIG_DEBUG_INFO=y
1129# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1176# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1130# CONFIG_FAULT_INJECTION is not set 1177# CONFIG_FAULT_INJECTION is not set
1131# CONFIG_LATENCYTOP is not set 1178# CONFIG_LATENCYTOP is not set
1179# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1132# CONFIG_DEBUG_PAGEALLOC is not set 1180# CONFIG_DEBUG_PAGEALLOC is not set
1133CONFIG_HAVE_FUNCTION_TRACER=y 1181CONFIG_HAVE_FUNCTION_TRACER=y
1134CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1182CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -1172,7 +1220,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1172# CONFIG_KEYS is not set 1220# CONFIG_KEYS is not set
1173# CONFIG_SECURITY is not set 1221# CONFIG_SECURITY is not set
1174# CONFIG_SECURITYFS is not set 1222# CONFIG_SECURITYFS is not set
1175# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1223# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1224# CONFIG_DEFAULT_SECURITY_SMACK is not set
1225# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1226CONFIG_DEFAULT_SECURITY_DAC=y
1227CONFIG_DEFAULT_SECURITY=""
1176CONFIG_CRYPTO=y 1228CONFIG_CRYPTO=y
1177 1229
1178# 1230#
diff --git a/arch/powerpc/configs/52xx/motionpro_defconfig b/arch/powerpc/configs/52xx/motionpro_defconfig
index 4f77a1bdc8f9..eaae2d469aa0 100644
--- a/arch/powerpc/configs/52xx/motionpro_defconfig
+++ b/arch/powerpc/configs/52xx/motionpro_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc4 3# Linux kernel version: 2.6.33-rc2
4# Thu Oct 15 10:33:22 2009 4# Wed Dec 30 14:45:08 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
58CONFIG_GENERIC_BUG=y 59CONFIG_GENERIC_BUG=y
59CONFIG_DTC=y 60CONFIG_DTC=y
60CONFIG_DEFAULT_UIMAGE=y 61CONFIG_DEFAULT_UIMAGE=y
62CONFIG_ARCH_HIBERNATION_POSSIBLE=y
61# CONFIG_PPC_DCR_NATIVE is not set 63# CONFIG_PPC_DCR_NATIVE is not set
62# CONFIG_PPC_DCR_MMIO is not set 64# CONFIG_PPC_DCR_MMIO is not set
63CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 65CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -85,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86CONFIG_TREE_RCU=y 88CONFIG_TREE_RCU=y
87# CONFIG_TREE_PREEMPT_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_TINY_RCU is not set
88# CONFIG_RCU_TRACE is not set 91# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32 92CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set 93# CONFIG_RCU_FANOUT_EXACT is not set
@@ -166,14 +169,41 @@ CONFIG_LBDAF=y
166# IO Schedulers 169# IO Schedulers
167# 170#
168CONFIG_IOSCHED_NOOP=y 171CONFIG_IOSCHED_NOOP=y
169CONFIG_IOSCHED_AS=y
170CONFIG_IOSCHED_DEADLINE=y 172CONFIG_IOSCHED_DEADLINE=y
171CONFIG_IOSCHED_CFQ=y 173CONFIG_IOSCHED_CFQ=y
172CONFIG_DEFAULT_AS=y
173# CONFIG_DEFAULT_DEADLINE is not set 174# CONFIG_DEFAULT_DEADLINE is not set
174# CONFIG_DEFAULT_CFQ is not set 175CONFIG_DEFAULT_CFQ=y
175# CONFIG_DEFAULT_NOOP is not set 176# CONFIG_DEFAULT_NOOP is not set
176CONFIG_DEFAULT_IOSCHED="anticipatory" 177CONFIG_DEFAULT_IOSCHED="cfq"
178# CONFIG_INLINE_SPIN_TRYLOCK is not set
179# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
180# CONFIG_INLINE_SPIN_LOCK is not set
181# CONFIG_INLINE_SPIN_LOCK_BH is not set
182# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
183# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
184CONFIG_INLINE_SPIN_UNLOCK=y
185# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
186CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
187# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
188# CONFIG_INLINE_READ_TRYLOCK is not set
189# CONFIG_INLINE_READ_LOCK is not set
190# CONFIG_INLINE_READ_LOCK_BH is not set
191# CONFIG_INLINE_READ_LOCK_IRQ is not set
192# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
193CONFIG_INLINE_READ_UNLOCK=y
194# CONFIG_INLINE_READ_UNLOCK_BH is not set
195CONFIG_INLINE_READ_UNLOCK_IRQ=y
196# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
197# CONFIG_INLINE_WRITE_TRYLOCK is not set
198# CONFIG_INLINE_WRITE_LOCK is not set
199# CONFIG_INLINE_WRITE_LOCK_BH is not set
200# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
201# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
202CONFIG_INLINE_WRITE_UNLOCK=y
203# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
204CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
205# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
206# CONFIG_MUTEX_SPIN_ON_OWNER is not set
177# CONFIG_FREEZER is not set 207# CONFIG_FREEZER is not set
178 208
179# 209#
@@ -189,6 +219,7 @@ CONFIG_PPC_MPC5200_SIMPLE=y
189# CONFIG_PPC_MEDIA5200 is not set 219# CONFIG_PPC_MEDIA5200 is not set
190# CONFIG_PPC_MPC5200_BUGFIX is not set 220# CONFIG_PPC_MPC5200_BUGFIX is not set
191# CONFIG_PPC_MPC5200_GPIO is not set 221# CONFIG_PPC_MPC5200_GPIO is not set
222# CONFIG_PPC_MPC5200_LPBFIFO is not set
192# CONFIG_PPC_PMAC is not set 223# CONFIG_PPC_PMAC is not set
193# CONFIG_PPC_CELL is not set 224# CONFIG_PPC_CELL is not set
194# CONFIG_PPC_CELL_NATIVE is not set 225# CONFIG_PPC_CELL_NATIVE is not set
@@ -244,6 +275,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
244CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 275CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
245# CONFIG_KEXEC is not set 276# CONFIG_KEXEC is not set
246# CONFIG_CRASH_DUMP is not set 277# CONFIG_CRASH_DUMP is not set
278CONFIG_SPARSE_IRQ=y
247CONFIG_MAX_ACTIVE_REGIONS=32 279CONFIG_MAX_ACTIVE_REGIONS=32
248CONFIG_ARCH_FLATMEM_ENABLE=y 280CONFIG_ARCH_FLATMEM_ENABLE=y
249CONFIG_ARCH_POPULATES_NODE_MAP=y 281CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -260,8 +292,6 @@ CONFIG_MIGRATION=y
260CONFIG_ZONE_DMA_FLAG=1 292CONFIG_ZONE_DMA_FLAG=1
261CONFIG_BOUNCE=y 293CONFIG_BOUNCE=y
262CONFIG_VIRT_TO_BUS=y 294CONFIG_VIRT_TO_BUS=y
263CONFIG_HAVE_MLOCK=y
264CONFIG_HAVE_MLOCKED_PAGE_BIT=y
265# CONFIG_KSM is not set 295# CONFIG_KSM is not set
266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 296CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
267CONFIG_PPC_4K_PAGES=y 297CONFIG_PPC_4K_PAGES=y
@@ -274,6 +304,7 @@ CONFIG_PROC_DEVICETREE=y
274CONFIG_EXTRA_TARGETS="" 304CONFIG_EXTRA_TARGETS=""
275CONFIG_PM=y 305CONFIG_PM=y
276# CONFIG_PM_DEBUG is not set 306# CONFIG_PM_DEBUG is not set
307# CONFIG_HIBERNATION is not set
277# CONFIG_PM_RUNTIME is not set 308# CONFIG_PM_RUNTIME is not set
278CONFIG_SECCOMP=y 309CONFIG_SECCOMP=y
279CONFIG_ISA_DMA_API=y 310CONFIG_ISA_DMA_API=y
@@ -379,7 +410,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
379# CONFIG_IRDA is not set 410# CONFIG_IRDA is not set
380# CONFIG_BT is not set 411# CONFIG_BT is not set
381# CONFIG_AF_RXRPC is not set 412# CONFIG_AF_RXRPC is not set
382# CONFIG_WIRELESS is not set 413CONFIG_WIRELESS=y
414# CONFIG_CFG80211 is not set
415# CONFIG_LIB80211 is not set
416
417#
418# CFG80211 needs to be enabled for MAC80211
419#
383# CONFIG_WIMAX is not set 420# CONFIG_WIMAX is not set
384# CONFIG_RFKILL is not set 421# CONFIG_RFKILL is not set
385# CONFIG_NET_9P is not set 422# CONFIG_NET_9P is not set
@@ -490,6 +527,10 @@ CONFIG_BLK_DEV=y
490# CONFIG_BLK_DEV_COW_COMMON is not set 527# CONFIG_BLK_DEV_COW_COMMON is not set
491CONFIG_BLK_DEV_LOOP=y 528CONFIG_BLK_DEV_LOOP=y
492# CONFIG_BLK_DEV_CRYPTOLOOP is not set 529# CONFIG_BLK_DEV_CRYPTOLOOP is not set
530
531#
532# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
533#
493# CONFIG_BLK_DEV_NBD is not set 534# CONFIG_BLK_DEV_NBD is not set
494CONFIG_BLK_DEV_RAM=y 535CONFIG_BLK_DEV_RAM=y
495CONFIG_BLK_DEV_RAM_COUNT=16 536CONFIG_BLK_DEV_RAM_COUNT=16
@@ -499,9 +540,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
499# CONFIG_ATA_OVER_ETH is not set 540# CONFIG_ATA_OVER_ETH is not set
500# CONFIG_BLK_DEV_HD is not set 541# CONFIG_BLK_DEV_HD is not set
501CONFIG_MISC_DEVICES=y 542CONFIG_MISC_DEVICES=y
543# CONFIG_AD525X_DPOT is not set
502# CONFIG_ICS932S401 is not set 544# CONFIG_ICS932S401 is not set
503# CONFIG_ENCLOSURE_SERVICES is not set 545# CONFIG_ENCLOSURE_SERVICES is not set
504# CONFIG_ISL29003 is not set 546# CONFIG_ISL29003 is not set
547# CONFIG_DS1682 is not set
505# CONFIG_C2PORT is not set 548# CONFIG_C2PORT is not set
506 549
507# 550#
@@ -610,8 +653,7 @@ CONFIG_FEC_MPC52xx_MDIO=y
610# CONFIG_NETDEV_1000 is not set 653# CONFIG_NETDEV_1000 is not set
611# CONFIG_NETDEV_10000 is not set 654# CONFIG_NETDEV_10000 is not set
612CONFIG_WLAN=y 655CONFIG_WLAN=y
613# CONFIG_WLAN_PRE80211 is not set 656# CONFIG_HOSTAP is not set
614# CONFIG_WLAN_80211 is not set
615 657
616# 658#
617# Enable WiMAX (Networking options) to see the WiMAX drivers 659# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -657,6 +699,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
657CONFIG_SERIAL_MPC52xx=y 699CONFIG_SERIAL_MPC52xx=y
658CONFIG_SERIAL_MPC52xx_CONSOLE=y 700CONFIG_SERIAL_MPC52xx_CONSOLE=y
659CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 701CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
702# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
660CONFIG_UNIX98_PTYS=y 703CONFIG_UNIX98_PTYS=y
661# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 704# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
662CONFIG_LEGACY_PTYS=y 705CONFIG_LEGACY_PTYS=y
@@ -700,7 +743,6 @@ CONFIG_I2C_MPC=y
700# 743#
701# Miscellaneous I2C Chip support 744# Miscellaneous I2C Chip support
702# 745#
703# CONFIG_DS1682 is not set
704# CONFIG_SENSORS_TSL2550 is not set 746# CONFIG_SENSORS_TSL2550 is not set
705# CONFIG_I2C_DEBUG_CORE is not set 747# CONFIG_I2C_DEBUG_CORE is not set
706# CONFIG_I2C_DEBUG_ALGO is not set 748# CONFIG_I2C_DEBUG_ALGO is not set
@@ -745,6 +787,7 @@ CONFIG_HWMON=y
745# CONFIG_SENSORS_GL520SM is not set 787# CONFIG_SENSORS_GL520SM is not set
746# CONFIG_SENSORS_IT87 is not set 788# CONFIG_SENSORS_IT87 is not set
747# CONFIG_SENSORS_LM63 is not set 789# CONFIG_SENSORS_LM63 is not set
790# CONFIG_SENSORS_LM73 is not set
748# CONFIG_SENSORS_LM75 is not set 791# CONFIG_SENSORS_LM75 is not set
749# CONFIG_SENSORS_LM77 is not set 792# CONFIG_SENSORS_LM77 is not set
750# CONFIG_SENSORS_LM78 is not set 793# CONFIG_SENSORS_LM78 is not set
@@ -805,11 +848,13 @@ CONFIG_SSB_POSSIBLE=y
805# CONFIG_TWL4030_CORE is not set 848# CONFIG_TWL4030_CORE is not set
806# CONFIG_MFD_TMIO is not set 849# CONFIG_MFD_TMIO is not set
807# CONFIG_PMIC_DA903X is not set 850# CONFIG_PMIC_DA903X is not set
851# CONFIG_PMIC_ADP5520 is not set
808# CONFIG_MFD_WM8400 is not set 852# CONFIG_MFD_WM8400 is not set
809# CONFIG_MFD_WM831X is not set 853# CONFIG_MFD_WM831X is not set
810# CONFIG_MFD_WM8350_I2C is not set 854# CONFIG_MFD_WM8350_I2C is not set
811# CONFIG_MFD_PCF50633 is not set 855# CONFIG_MFD_PCF50633 is not set
812# CONFIG_AB3100_CORE is not set 856# CONFIG_AB3100_CORE is not set
857# CONFIG_MFD_88PM8607 is not set
813# CONFIG_REGULATOR is not set 858# CONFIG_REGULATOR is not set
814# CONFIG_MEDIA_SUPPORT is not set 859# CONFIG_MEDIA_SUPPORT is not set
815 860
@@ -881,6 +926,7 @@ CONFIG_RTC_DRV_DS1307=y
881# CONFIG_RTC_DRV_PCF8563 is not set 926# CONFIG_RTC_DRV_PCF8563 is not set
882# CONFIG_RTC_DRV_PCF8583 is not set 927# CONFIG_RTC_DRV_PCF8583 is not set
883# CONFIG_RTC_DRV_M41T80 is not set 928# CONFIG_RTC_DRV_M41T80 is not set
929# CONFIG_RTC_DRV_BQ32K is not set
884# CONFIG_RTC_DRV_S35390A is not set 930# CONFIG_RTC_DRV_S35390A is not set
885# CONFIG_RTC_DRV_FM3130 is not set 931# CONFIG_RTC_DRV_FM3130 is not set
886# CONFIG_RTC_DRV_RX8581 is not set 932# CONFIG_RTC_DRV_RX8581 is not set
@@ -902,7 +948,9 @@ CONFIG_RTC_DRV_DS1307=y
902# CONFIG_RTC_DRV_M48T86 is not set 948# CONFIG_RTC_DRV_M48T86 is not set
903# CONFIG_RTC_DRV_M48T35 is not set 949# CONFIG_RTC_DRV_M48T35 is not set
904# CONFIG_RTC_DRV_M48T59 is not set 950# CONFIG_RTC_DRV_M48T59 is not set
951# CONFIG_RTC_DRV_MSM6242 is not set
905# CONFIG_RTC_DRV_BQ4802 is not set 952# CONFIG_RTC_DRV_BQ4802 is not set
953# CONFIG_RTC_DRV_RP5C01 is not set
906# CONFIG_RTC_DRV_V3020 is not set 954# CONFIG_RTC_DRV_V3020 is not set
907 955
908# 956#
@@ -1172,6 +1220,7 @@ CONFIG_DEBUG_INFO=y
1172# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1220# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1173# CONFIG_FAULT_INJECTION is not set 1221# CONFIG_FAULT_INJECTION is not set
1174# CONFIG_LATENCYTOP is not set 1222# CONFIG_LATENCYTOP is not set
1223# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1175# CONFIG_DEBUG_PAGEALLOC is not set 1224# CONFIG_DEBUG_PAGEALLOC is not set
1176CONFIG_HAVE_FUNCTION_TRACER=y 1225CONFIG_HAVE_FUNCTION_TRACER=y
1177CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1226CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -1215,7 +1264,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1215# CONFIG_KEYS is not set 1264# CONFIG_KEYS is not set
1216# CONFIG_SECURITY is not set 1265# CONFIG_SECURITY is not set
1217# CONFIG_SECURITYFS is not set 1266# CONFIG_SECURITYFS is not set
1218# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1267# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1268# CONFIG_DEFAULT_SECURITY_SMACK is not set
1269# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1270CONFIG_DEFAULT_SECURITY_DAC=y
1271CONFIG_DEFAULT_SECURITY=""
1219CONFIG_CRYPTO=y 1272CONFIG_CRYPTO=y
1220 1273
1221# 1274#
diff --git a/arch/powerpc/configs/52xx/pcm030_defconfig b/arch/powerpc/configs/52xx/pcm030_defconfig
index f9168c1a2fa5..1742c0200b75 100644
--- a/arch/powerpc/configs/52xx/pcm030_defconfig
+++ b/arch/powerpc/configs/52xx/pcm030_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc4 3# Linux kernel version: 2.6.33-rc2
4# Thu Oct 15 10:33:25 2009 4# Wed Dec 30 14:45:10 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
58CONFIG_GENERIC_BUG=y 59CONFIG_GENERIC_BUG=y
59CONFIG_DTC=y 60CONFIG_DTC=y
60CONFIG_DEFAULT_UIMAGE=y 61CONFIG_DEFAULT_UIMAGE=y
62CONFIG_ARCH_HIBERNATION_POSSIBLE=y
61# CONFIG_PPC_DCR_NATIVE is not set 63# CONFIG_PPC_DCR_NATIVE is not set
62# CONFIG_PPC_DCR_MMIO is not set 64# CONFIG_PPC_DCR_MMIO is not set
63CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 65CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -87,6 +89,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -172,14 +175,41 @@ CONFIG_LBDAF=y
172# IO Schedulers 175# IO Schedulers
173# 176#
174CONFIG_IOSCHED_NOOP=y 177CONFIG_IOSCHED_NOOP=y
175# CONFIG_IOSCHED_AS is not set
176# CONFIG_IOSCHED_DEADLINE is not set 178# CONFIG_IOSCHED_DEADLINE is not set
177# CONFIG_IOSCHED_CFQ is not set 179# CONFIG_IOSCHED_CFQ is not set
178# CONFIG_DEFAULT_AS is not set
179# CONFIG_DEFAULT_DEADLINE is not set 180# CONFIG_DEFAULT_DEADLINE is not set
180# CONFIG_DEFAULT_CFQ is not set 181# CONFIG_DEFAULT_CFQ is not set
181CONFIG_DEFAULT_NOOP=y 182CONFIG_DEFAULT_NOOP=y
182CONFIG_DEFAULT_IOSCHED="noop" 183CONFIG_DEFAULT_IOSCHED="noop"
184# CONFIG_INLINE_SPIN_TRYLOCK is not set
185# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK is not set
187# CONFIG_INLINE_SPIN_LOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
190# CONFIG_INLINE_SPIN_UNLOCK is not set
191# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
192# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
193# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
194# CONFIG_INLINE_READ_TRYLOCK is not set
195# CONFIG_INLINE_READ_LOCK is not set
196# CONFIG_INLINE_READ_LOCK_BH is not set
197# CONFIG_INLINE_READ_LOCK_IRQ is not set
198# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
199# CONFIG_INLINE_READ_UNLOCK is not set
200# CONFIG_INLINE_READ_UNLOCK_BH is not set
201# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
202# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
203# CONFIG_INLINE_WRITE_TRYLOCK is not set
204# CONFIG_INLINE_WRITE_LOCK is not set
205# CONFIG_INLINE_WRITE_LOCK_BH is not set
206# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
208# CONFIG_INLINE_WRITE_UNLOCK is not set
209# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
210# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
211# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
212# CONFIG_MUTEX_SPIN_ON_OWNER is not set
183# CONFIG_FREEZER is not set 213# CONFIG_FREEZER is not set
184 214
185# 215#
@@ -195,6 +225,7 @@ CONFIG_PPC_MPC5200_SIMPLE=y
195# CONFIG_PPC_MEDIA5200 is not set 225# CONFIG_PPC_MEDIA5200 is not set
196# CONFIG_PPC_MPC5200_BUGFIX is not set 226# CONFIG_PPC_MPC5200_BUGFIX is not set
197# CONFIG_PPC_MPC5200_GPIO is not set 227# CONFIG_PPC_MPC5200_GPIO is not set
228# CONFIG_PPC_MPC5200_LPBFIFO is not set
198# CONFIG_PPC_PMAC is not set 229# CONFIG_PPC_PMAC is not set
199# CONFIG_PPC_CELL is not set 230# CONFIG_PPC_CELL is not set
200# CONFIG_PPC_CELL_NATIVE is not set 231# CONFIG_PPC_CELL_NATIVE is not set
@@ -251,6 +282,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
251CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 282CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
252# CONFIG_KEXEC is not set 283# CONFIG_KEXEC is not set
253# CONFIG_CRASH_DUMP is not set 284# CONFIG_CRASH_DUMP is not set
285CONFIG_SPARSE_IRQ=y
254CONFIG_MAX_ACTIVE_REGIONS=32 286CONFIG_MAX_ACTIVE_REGIONS=32
255CONFIG_ARCH_FLATMEM_ENABLE=y 287CONFIG_ARCH_FLATMEM_ENABLE=y
256CONFIG_ARCH_POPULATES_NODE_MAP=y 288CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -267,8 +299,6 @@ CONFIG_MIGRATION=y
267CONFIG_ZONE_DMA_FLAG=1 299CONFIG_ZONE_DMA_FLAG=1
268CONFIG_BOUNCE=y 300CONFIG_BOUNCE=y
269CONFIG_VIRT_TO_BUS=y 301CONFIG_VIRT_TO_BUS=y
270CONFIG_HAVE_MLOCK=y
271CONFIG_HAVE_MLOCKED_PAGE_BIT=y
272# CONFIG_KSM is not set 302# CONFIG_KSM is not set
273CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 303CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
274CONFIG_PPC_4K_PAGES=y 304CONFIG_PPC_4K_PAGES=y
@@ -385,7 +415,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
385# CONFIG_IRDA is not set 415# CONFIG_IRDA is not set
386# CONFIG_BT is not set 416# CONFIG_BT is not set
387# CONFIG_AF_RXRPC is not set 417# CONFIG_AF_RXRPC is not set
388# CONFIG_WIRELESS is not set 418CONFIG_WIRELESS=y
419# CONFIG_CFG80211 is not set
420# CONFIG_LIB80211 is not set
421
422#
423# CFG80211 needs to be enabled for MAC80211
424#
389# CONFIG_WIMAX is not set 425# CONFIG_WIMAX is not set
390# CONFIG_RFKILL is not set 426# CONFIG_RFKILL is not set
391# CONFIG_NET_9P is not set 427# CONFIG_NET_9P is not set
@@ -585,15 +621,16 @@ CONFIG_PATA_MPC52xx=m
585# CONFIG_PATA_NS87415 is not set 621# CONFIG_PATA_NS87415 is not set
586# CONFIG_PATA_OPTI is not set 622# CONFIG_PATA_OPTI is not set
587# CONFIG_PATA_OPTIDMA is not set 623# CONFIG_PATA_OPTIDMA is not set
624# CONFIG_PATA_PDC2027X is not set
588# CONFIG_PATA_PDC_OLD is not set 625# CONFIG_PATA_PDC_OLD is not set
589# CONFIG_PATA_RADISYS is not set 626# CONFIG_PATA_RADISYS is not set
590# CONFIG_PATA_RDC is not set 627# CONFIG_PATA_RDC is not set
591# CONFIG_PATA_RZ1000 is not set 628# CONFIG_PATA_RZ1000 is not set
592# CONFIG_PATA_SC1200 is not set 629# CONFIG_PATA_SC1200 is not set
593# CONFIG_PATA_SERVERWORKS is not set 630# CONFIG_PATA_SERVERWORKS is not set
594# CONFIG_PATA_PDC2027X is not set
595# CONFIG_PATA_SIL680 is not set 631# CONFIG_PATA_SIL680 is not set
596# CONFIG_PATA_SIS is not set 632# CONFIG_PATA_SIS is not set
633# CONFIG_PATA_TOSHIBA is not set
597# CONFIG_PATA_VIA is not set 634# CONFIG_PATA_VIA is not set
598# CONFIG_PATA_WINBOND is not set 635# CONFIG_PATA_WINBOND is not set
599# CONFIG_PATA_PLATFORM is not set 636# CONFIG_PATA_PLATFORM is not set
@@ -673,8 +710,11 @@ CONFIG_FEC_MPC52xx_MDIO=y
673# CONFIG_NETDEV_10000 is not set 710# CONFIG_NETDEV_10000 is not set
674# CONFIG_TR is not set 711# CONFIG_TR is not set
675CONFIG_WLAN=y 712CONFIG_WLAN=y
676# CONFIG_WLAN_PRE80211 is not set 713# CONFIG_AIRO is not set
677# CONFIG_WLAN_80211 is not set 714# CONFIG_ATMEL is not set
715# CONFIG_PRISM54 is not set
716# CONFIG_USB_ZD1201 is not set
717# CONFIG_HOSTAP is not set
678 718
679# 719#
680# Enable WiMAX (Networking options) to see the WiMAX drivers 720# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -697,6 +737,7 @@ CONFIG_WLAN=y
697# CONFIG_NETCONSOLE is not set 737# CONFIG_NETCONSOLE is not set
698# CONFIG_NETPOLL is not set 738# CONFIG_NETPOLL is not set
699# CONFIG_NET_POLL_CONTROLLER is not set 739# CONFIG_NET_POLL_CONTROLLER is not set
740# CONFIG_VMXNET3 is not set
700# CONFIG_ISDN is not set 741# CONFIG_ISDN is not set
701# CONFIG_PHONE is not set 742# CONFIG_PHONE is not set
702 743
@@ -734,6 +775,7 @@ CONFIG_SERIAL_MPC52xx=y
734CONFIG_SERIAL_MPC52xx_CONSOLE=y 775CONFIG_SERIAL_MPC52xx_CONSOLE=y
735CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=9600 776CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=9600
736# CONFIG_SERIAL_JSM is not set 777# CONFIG_SERIAL_JSM is not set
778# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
737CONFIG_UNIX98_PTYS=y 779CONFIG_UNIX98_PTYS=y
738# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 780# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
739# CONFIG_LEGACY_PTYS is not set 781# CONFIG_LEGACY_PTYS is not set
@@ -791,11 +833,6 @@ CONFIG_I2C_MPC=y
791# CONFIG_I2C_TINY_USB is not set 833# CONFIG_I2C_TINY_USB is not set
792 834
793# 835#
794# Graphics adapter I2C/DDC channel drivers
795#
796# CONFIG_I2C_VOODOO3 is not set
797
798#
799# Other I2C/SMBus bus drivers 836# Other I2C/SMBus bus drivers
800# 837#
801# CONFIG_I2C_PCA_PLATFORM is not set 838# CONFIG_I2C_PCA_PLATFORM is not set
@@ -804,7 +841,6 @@ CONFIG_I2C_MPC=y
804# 841#
805# Miscellaneous I2C Chip support 842# Miscellaneous I2C Chip support
806# 843#
807# CONFIG_DS1682 is not set
808# CONFIG_SENSORS_TSL2550 is not set 844# CONFIG_SENSORS_TSL2550 is not set
809# CONFIG_I2C_DEBUG_CORE is not set 845# CONFIG_I2C_DEBUG_CORE is not set
810# CONFIG_I2C_DEBUG_ALGO is not set 846# CONFIG_I2C_DEBUG_ALGO is not set
@@ -839,11 +875,13 @@ CONFIG_SSB_POSSIBLE=y
839# CONFIG_TWL4030_CORE is not set 875# CONFIG_TWL4030_CORE is not set
840# CONFIG_MFD_TMIO is not set 876# CONFIG_MFD_TMIO is not set
841# CONFIG_PMIC_DA903X is not set 877# CONFIG_PMIC_DA903X is not set
878# CONFIG_PMIC_ADP5520 is not set
842# CONFIG_MFD_WM8400 is not set 879# CONFIG_MFD_WM8400 is not set
843# CONFIG_MFD_WM831X is not set 880# CONFIG_MFD_WM831X is not set
844# CONFIG_MFD_WM8350_I2C is not set 881# CONFIG_MFD_WM8350_I2C is not set
845# CONFIG_MFD_PCF50633 is not set 882# CONFIG_MFD_PCF50633 is not set
846# CONFIG_AB3100_CORE is not set 883# CONFIG_AB3100_CORE is not set
884# CONFIG_MFD_88PM8607 is not set
847# CONFIG_REGULATOR is not set 885# CONFIG_REGULATOR is not set
848# CONFIG_MEDIA_SUPPORT is not set 886# CONFIG_MEDIA_SUPPORT is not set
849 887
@@ -908,7 +946,6 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
908# CONFIG_USB_R8A66597_HCD is not set 946# CONFIG_USB_R8A66597_HCD is not set
909# CONFIG_USB_WHCI_HCD is not set 947# CONFIG_USB_WHCI_HCD is not set
910# CONFIG_USB_HWA_HCD is not set 948# CONFIG_USB_HWA_HCD is not set
911# CONFIG_USB_MUSB_HDRC is not set
912 949
913# 950#
914# USB Device Class drivers 951# USB Device Class drivers
@@ -1011,6 +1048,7 @@ CONFIG_RTC_INTF_DEV=y
1011CONFIG_RTC_DRV_PCF8563=m 1048CONFIG_RTC_DRV_PCF8563=m
1012# CONFIG_RTC_DRV_PCF8583 is not set 1049# CONFIG_RTC_DRV_PCF8583 is not set
1013# CONFIG_RTC_DRV_M41T80 is not set 1050# CONFIG_RTC_DRV_M41T80 is not set
1051# CONFIG_RTC_DRV_BQ32K is not set
1014# CONFIG_RTC_DRV_S35390A is not set 1052# CONFIG_RTC_DRV_S35390A is not set
1015# CONFIG_RTC_DRV_FM3130 is not set 1053# CONFIG_RTC_DRV_FM3130 is not set
1016# CONFIG_RTC_DRV_RX8581 is not set 1054# CONFIG_RTC_DRV_RX8581 is not set
@@ -1032,7 +1070,9 @@ CONFIG_RTC_DRV_PCF8563=m
1032# CONFIG_RTC_DRV_M48T86 is not set 1070# CONFIG_RTC_DRV_M48T86 is not set
1033# CONFIG_RTC_DRV_M48T35 is not set 1071# CONFIG_RTC_DRV_M48T35 is not set
1034# CONFIG_RTC_DRV_M48T59 is not set 1072# CONFIG_RTC_DRV_M48T59 is not set
1073# CONFIG_RTC_DRV_MSM6242 is not set
1035# CONFIG_RTC_DRV_BQ4802 is not set 1074# CONFIG_RTC_DRV_BQ4802 is not set
1075# CONFIG_RTC_DRV_RP5C01 is not set
1036# CONFIG_RTC_DRV_V3020 is not set 1076# CONFIG_RTC_DRV_V3020 is not set
1037 1077
1038# 1078#
@@ -1243,10 +1283,11 @@ CONFIG_FRAME_WARN=1024
1243# CONFIG_DEBUG_FS is not set 1283# CONFIG_DEBUG_FS is not set
1244# CONFIG_HEADERS_CHECK is not set 1284# CONFIG_HEADERS_CHECK is not set
1245# CONFIG_DEBUG_KERNEL is not set 1285# CONFIG_DEBUG_KERNEL is not set
1246# CONFIG_DEBUG_BUGVERBOSE is not set 1286CONFIG_DEBUG_BUGVERBOSE=y
1247# CONFIG_DEBUG_MEMORY_INIT is not set 1287# CONFIG_DEBUG_MEMORY_INIT is not set
1248# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1288# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1249# CONFIG_LATENCYTOP is not set 1289# CONFIG_LATENCYTOP is not set
1290# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1250CONFIG_HAVE_FUNCTION_TRACER=y 1291CONFIG_HAVE_FUNCTION_TRACER=y
1251CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1292CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1252CONFIG_HAVE_DYNAMIC_FTRACE=y 1293CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -1269,7 +1310,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1269# CONFIG_KEYS is not set 1310# CONFIG_KEYS is not set
1270# CONFIG_SECURITY is not set 1311# CONFIG_SECURITY is not set
1271# CONFIG_SECURITYFS is not set 1312# CONFIG_SECURITYFS is not set
1272# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1313# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1314# CONFIG_DEFAULT_SECURITY_SMACK is not set
1315# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1316CONFIG_DEFAULT_SECURITY_DAC=y
1317CONFIG_DEFAULT_SECURITY=""
1273# CONFIG_CRYPTO is not set 1318# CONFIG_CRYPTO is not set
1274CONFIG_PPC_CLOCK=y 1319CONFIG_PPC_CLOCK=y
1275CONFIG_PPC_LIB_RHEAP=y 1320CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/52xx/tqm5200_defconfig b/arch/powerpc/configs/52xx/tqm5200_defconfig
index 75c835c2ae66..3972438db719 100644
--- a/arch/powerpc/configs/52xx/tqm5200_defconfig
+++ b/arch/powerpc/configs/52xx/tqm5200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc4 3# Linux kernel version: 2.6.33-rc2
4# Thu Oct 15 10:33:23 2009 4# Wed Dec 30 14:45:09 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
58CONFIG_GENERIC_BUG=y 59CONFIG_GENERIC_BUG=y
59CONFIG_DTC=y 60CONFIG_DTC=y
60CONFIG_DEFAULT_UIMAGE=y 61CONFIG_DEFAULT_UIMAGE=y
62CONFIG_ARCH_HIBERNATION_POSSIBLE=y
61# CONFIG_PPC_DCR_NATIVE is not set 63# CONFIG_PPC_DCR_NATIVE is not set
62# CONFIG_PPC_DCR_MMIO is not set 64# CONFIG_PPC_DCR_MMIO is not set
63CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 65CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -85,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86CONFIG_TREE_RCU=y 88CONFIG_TREE_RCU=y
87# CONFIG_TREE_PREEMPT_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_TINY_RCU is not set
88# CONFIG_RCU_TRACE is not set 91# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32 92CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set 93# CONFIG_RCU_FANOUT_EXACT is not set
@@ -171,14 +174,41 @@ CONFIG_LBDAF=y
171# IO Schedulers 174# IO Schedulers
172# 175#
173CONFIG_IOSCHED_NOOP=y 176CONFIG_IOSCHED_NOOP=y
174CONFIG_IOSCHED_AS=y
175CONFIG_IOSCHED_DEADLINE=y 177CONFIG_IOSCHED_DEADLINE=y
176CONFIG_IOSCHED_CFQ=y 178CONFIG_IOSCHED_CFQ=y
177CONFIG_DEFAULT_AS=y
178# CONFIG_DEFAULT_DEADLINE is not set 179# CONFIG_DEFAULT_DEADLINE is not set
179# CONFIG_DEFAULT_CFQ is not set 180CONFIG_DEFAULT_CFQ=y
180# CONFIG_DEFAULT_NOOP is not set 181# CONFIG_DEFAULT_NOOP is not set
181CONFIG_DEFAULT_IOSCHED="anticipatory" 182CONFIG_DEFAULT_IOSCHED="cfq"
183# CONFIG_INLINE_SPIN_TRYLOCK is not set
184# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
185# CONFIG_INLINE_SPIN_LOCK is not set
186# CONFIG_INLINE_SPIN_LOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
188# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
189CONFIG_INLINE_SPIN_UNLOCK=y
190# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
191CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
192# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
193# CONFIG_INLINE_READ_TRYLOCK is not set
194# CONFIG_INLINE_READ_LOCK is not set
195# CONFIG_INLINE_READ_LOCK_BH is not set
196# CONFIG_INLINE_READ_LOCK_IRQ is not set
197# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
198CONFIG_INLINE_READ_UNLOCK=y
199# CONFIG_INLINE_READ_UNLOCK_BH is not set
200CONFIG_INLINE_READ_UNLOCK_IRQ=y
201# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
202# CONFIG_INLINE_WRITE_TRYLOCK is not set
203# CONFIG_INLINE_WRITE_LOCK is not set
204# CONFIG_INLINE_WRITE_LOCK_BH is not set
205# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
206# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
207CONFIG_INLINE_WRITE_UNLOCK=y
208# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
209CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
210# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
211# CONFIG_MUTEX_SPIN_ON_OWNER is not set
182# CONFIG_FREEZER is not set 212# CONFIG_FREEZER is not set
183 213
184# 214#
@@ -194,6 +224,7 @@ CONFIG_PPC_MPC5200_SIMPLE=y
194# CONFIG_PPC_MEDIA5200 is not set 224# CONFIG_PPC_MEDIA5200 is not set
195CONFIG_PPC_MPC5200_BUGFIX=y 225CONFIG_PPC_MPC5200_BUGFIX=y
196# CONFIG_PPC_MPC5200_GPIO is not set 226# CONFIG_PPC_MPC5200_GPIO is not set
227# CONFIG_PPC_MPC5200_LPBFIFO is not set
197# CONFIG_PPC_PMAC is not set 228# CONFIG_PPC_PMAC is not set
198# CONFIG_PPC_CELL is not set 229# CONFIG_PPC_CELL is not set
199# CONFIG_PPC_CELL_NATIVE is not set 230# CONFIG_PPC_CELL_NATIVE is not set
@@ -249,6 +280,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
249CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 280CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
250# CONFIG_KEXEC is not set 281# CONFIG_KEXEC is not set
251# CONFIG_CRASH_DUMP is not set 282# CONFIG_CRASH_DUMP is not set
283CONFIG_SPARSE_IRQ=y
252CONFIG_MAX_ACTIVE_REGIONS=32 284CONFIG_MAX_ACTIVE_REGIONS=32
253CONFIG_ARCH_FLATMEM_ENABLE=y 285CONFIG_ARCH_FLATMEM_ENABLE=y
254CONFIG_ARCH_POPULATES_NODE_MAP=y 286CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -265,8 +297,6 @@ CONFIG_MIGRATION=y
265CONFIG_ZONE_DMA_FLAG=1 297CONFIG_ZONE_DMA_FLAG=1
266CONFIG_BOUNCE=y 298CONFIG_BOUNCE=y
267CONFIG_VIRT_TO_BUS=y 299CONFIG_VIRT_TO_BUS=y
268CONFIG_HAVE_MLOCK=y
269CONFIG_HAVE_MLOCKED_PAGE_BIT=y
270# CONFIG_KSM is not set 300# CONFIG_KSM is not set
271CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 301CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
272CONFIG_PPC_4K_PAGES=y 302CONFIG_PPC_4K_PAGES=y
@@ -279,6 +309,7 @@ CONFIG_PROC_DEVICETREE=y
279CONFIG_EXTRA_TARGETS="" 309CONFIG_EXTRA_TARGETS=""
280CONFIG_PM=y 310CONFIG_PM=y
281# CONFIG_PM_DEBUG is not set 311# CONFIG_PM_DEBUG is not set
312# CONFIG_HIBERNATION is not set
282# CONFIG_PM_RUNTIME is not set 313# CONFIG_PM_RUNTIME is not set
283CONFIG_SECCOMP=y 314CONFIG_SECCOMP=y
284CONFIG_ISA_DMA_API=y 315CONFIG_ISA_DMA_API=y
@@ -384,7 +415,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
384# CONFIG_IRDA is not set 415# CONFIG_IRDA is not set
385# CONFIG_BT is not set 416# CONFIG_BT is not set
386# CONFIG_AF_RXRPC is not set 417# CONFIG_AF_RXRPC is not set
387# CONFIG_WIRELESS is not set 418CONFIG_WIRELESS=y
419# CONFIG_CFG80211 is not set
420# CONFIG_LIB80211 is not set
421
422#
423# CFG80211 needs to be enabled for MAC80211
424#
388# CONFIG_WIMAX is not set 425# CONFIG_WIMAX is not set
389# CONFIG_RFKILL is not set 426# CONFIG_RFKILL is not set
390# CONFIG_NET_9P is not set 427# CONFIG_NET_9P is not set
@@ -496,6 +533,10 @@ CONFIG_BLK_DEV=y
496# CONFIG_BLK_DEV_COW_COMMON is not set 533# CONFIG_BLK_DEV_COW_COMMON is not set
497CONFIG_BLK_DEV_LOOP=y 534CONFIG_BLK_DEV_LOOP=y
498# CONFIG_BLK_DEV_CRYPTOLOOP is not set 535# CONFIG_BLK_DEV_CRYPTOLOOP is not set
536
537#
538# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
539#
499# CONFIG_BLK_DEV_NBD is not set 540# CONFIG_BLK_DEV_NBD is not set
500# CONFIG_BLK_DEV_UB is not set 541# CONFIG_BLK_DEV_UB is not set
501CONFIG_BLK_DEV_RAM=y 542CONFIG_BLK_DEV_RAM=y
@@ -607,8 +648,8 @@ CONFIG_FEC_MPC52xx_MDIO=y
607# CONFIG_NETDEV_1000 is not set 648# CONFIG_NETDEV_1000 is not set
608# CONFIG_NETDEV_10000 is not set 649# CONFIG_NETDEV_10000 is not set
609CONFIG_WLAN=y 650CONFIG_WLAN=y
610# CONFIG_WLAN_PRE80211 is not set 651# CONFIG_USB_ZD1201 is not set
611# CONFIG_WLAN_80211 is not set 652# CONFIG_HOSTAP is not set
612 653
613# 654#
614# Enable WiMAX (Networking options) to see the WiMAX drivers 655# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -663,6 +704,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
663CONFIG_SERIAL_MPC52xx=y 704CONFIG_SERIAL_MPC52xx=y
664CONFIG_SERIAL_MPC52xx_CONSOLE=y 705CONFIG_SERIAL_MPC52xx_CONSOLE=y
665CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 706CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
707# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
666CONFIG_UNIX98_PTYS=y 708CONFIG_UNIX98_PTYS=y
667# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 709# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
668CONFIG_LEGACY_PTYS=y 710CONFIG_LEGACY_PTYS=y
@@ -708,7 +750,6 @@ CONFIG_I2C_MPC=y
708# 750#
709# Miscellaneous I2C Chip support 751# Miscellaneous I2C Chip support
710# 752#
711# CONFIG_DS1682 is not set
712# CONFIG_SENSORS_TSL2550 is not set 753# CONFIG_SENSORS_TSL2550 is not set
713# CONFIG_I2C_DEBUG_CORE is not set 754# CONFIG_I2C_DEBUG_CORE is not set
714# CONFIG_I2C_DEBUG_ALGO is not set 755# CONFIG_I2C_DEBUG_ALGO is not set
@@ -753,6 +794,7 @@ CONFIG_HWMON=y
753# CONFIG_SENSORS_GL520SM is not set 794# CONFIG_SENSORS_GL520SM is not set
754# CONFIG_SENSORS_IT87 is not set 795# CONFIG_SENSORS_IT87 is not set
755# CONFIG_SENSORS_LM63 is not set 796# CONFIG_SENSORS_LM63 is not set
797# CONFIG_SENSORS_LM73 is not set
756# CONFIG_SENSORS_LM75 is not set 798# CONFIG_SENSORS_LM75 is not set
757# CONFIG_SENSORS_LM77 is not set 799# CONFIG_SENSORS_LM77 is not set
758# CONFIG_SENSORS_LM78 is not set 800# CONFIG_SENSORS_LM78 is not set
@@ -818,11 +860,13 @@ CONFIG_SSB_POSSIBLE=y
818# CONFIG_TWL4030_CORE is not set 860# CONFIG_TWL4030_CORE is not set
819# CONFIG_MFD_TMIO is not set 861# CONFIG_MFD_TMIO is not set
820# CONFIG_PMIC_DA903X is not set 862# CONFIG_PMIC_DA903X is not set
863# CONFIG_PMIC_ADP5520 is not set
821# CONFIG_MFD_WM8400 is not set 864# CONFIG_MFD_WM8400 is not set
822# CONFIG_MFD_WM831X is not set 865# CONFIG_MFD_WM831X is not set
823# CONFIG_MFD_WM8350_I2C is not set 866# CONFIG_MFD_WM8350_I2C is not set
824# CONFIG_MFD_PCF50633 is not set 867# CONFIG_MFD_PCF50633 is not set
825# CONFIG_AB3100_CORE is not set 868# CONFIG_AB3100_CORE is not set
869# CONFIG_MFD_88PM8607 is not set
826# CONFIG_REGULATOR is not set 870# CONFIG_REGULATOR is not set
827# CONFIG_MEDIA_SUPPORT is not set 871# CONFIG_MEDIA_SUPPORT is not set
828 872
@@ -880,7 +924,6 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
880# CONFIG_USB_SL811_HCD is not set 924# CONFIG_USB_SL811_HCD is not set
881# CONFIG_USB_R8A66597_HCD is not set 925# CONFIG_USB_R8A66597_HCD is not set
882# CONFIG_USB_HWA_HCD is not set 926# CONFIG_USB_HWA_HCD is not set
883# CONFIG_USB_MUSB_HDRC is not set
884 927
885# 928#
886# USB Device Class drivers 929# USB Device Class drivers
@@ -984,6 +1027,7 @@ CONFIG_RTC_DRV_DS1307=y
984# CONFIG_RTC_DRV_PCF8563 is not set 1027# CONFIG_RTC_DRV_PCF8563 is not set
985# CONFIG_RTC_DRV_PCF8583 is not set 1028# CONFIG_RTC_DRV_PCF8583 is not set
986# CONFIG_RTC_DRV_M41T80 is not set 1029# CONFIG_RTC_DRV_M41T80 is not set
1030# CONFIG_RTC_DRV_BQ32K is not set
987# CONFIG_RTC_DRV_S35390A is not set 1031# CONFIG_RTC_DRV_S35390A is not set
988# CONFIG_RTC_DRV_FM3130 is not set 1032# CONFIG_RTC_DRV_FM3130 is not set
989# CONFIG_RTC_DRV_RX8581 is not set 1033# CONFIG_RTC_DRV_RX8581 is not set
@@ -1005,7 +1049,9 @@ CONFIG_RTC_DRV_DS1307=y
1005# CONFIG_RTC_DRV_M48T86 is not set 1049# CONFIG_RTC_DRV_M48T86 is not set
1006# CONFIG_RTC_DRV_M48T35 is not set 1050# CONFIG_RTC_DRV_M48T35 is not set
1007# CONFIG_RTC_DRV_M48T59 is not set 1051# CONFIG_RTC_DRV_M48T59 is not set
1052# CONFIG_RTC_DRV_MSM6242 is not set
1008# CONFIG_RTC_DRV_BQ4802 is not set 1053# CONFIG_RTC_DRV_BQ4802 is not set
1054# CONFIG_RTC_DRV_RP5C01 is not set
1009# CONFIG_RTC_DRV_V3020 is not set 1055# CONFIG_RTC_DRV_V3020 is not set
1010 1056
1011# 1057#
@@ -1275,6 +1321,7 @@ CONFIG_DEBUG_INFO=y
1275# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1321# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1276# CONFIG_FAULT_INJECTION is not set 1322# CONFIG_FAULT_INJECTION is not set
1277# CONFIG_LATENCYTOP is not set 1323# CONFIG_LATENCYTOP is not set
1324# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1278# CONFIG_DEBUG_PAGEALLOC is not set 1325# CONFIG_DEBUG_PAGEALLOC is not set
1279CONFIG_HAVE_FUNCTION_TRACER=y 1326CONFIG_HAVE_FUNCTION_TRACER=y
1280CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1327CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -1318,7 +1365,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1318# CONFIG_KEYS is not set 1365# CONFIG_KEYS is not set
1319# CONFIG_SECURITY is not set 1366# CONFIG_SECURITY is not set
1320# CONFIG_SECURITYFS is not set 1367# CONFIG_SECURITYFS is not set
1321# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1368# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1369# CONFIG_DEFAULT_SECURITY_SMACK is not set
1370# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1371CONFIG_DEFAULT_SECURITY_DAC=y
1372CONFIG_DEFAULT_SECURITY=""
1322CONFIG_CRYPTO=y 1373CONFIG_CRYPTO=y
1323 1374
1324# 1375#
diff --git a/arch/powerpc/configs/83xx/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig
index 466f09ac3153..baa2bbb6c096 100644
--- a/arch/powerpc/configs/83xx/asp8347_defconfig
+++ b/arch/powerpc/configs/83xx/asp8347_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:20 2009 4# Wed Jan 6 09:24:14 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -60,6 +61,7 @@ CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61# CONFIG_DEFAULT_UIMAGE is not set 62# CONFIG_DEFAULT_UIMAGE is not set
62CONFIG_REDBOOT=y 63CONFIG_REDBOOT=y
64CONFIG_ARCH_HIBERNATION_POSSIBLE=y
63CONFIG_ARCH_SUSPEND_POSSIBLE=y 65CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 66# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 67# CONFIG_PPC_DCR_MMIO is not set
@@ -88,6 +90,7 @@ CONFIG_SYSVIPC_SYSCTL=y
88# 90#
89CONFIG_TREE_RCU=y 91CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 92# CONFIG_TREE_PREEMPT_RCU is not set
93# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 94# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 95CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 96# CONFIG_RCU_FANOUT_EXACT is not set
@@ -174,14 +177,41 @@ CONFIG_LBDAF=y
174# IO Schedulers 177# IO Schedulers
175# 178#
176CONFIG_IOSCHED_NOOP=y 179CONFIG_IOSCHED_NOOP=y
177CONFIG_IOSCHED_AS=y
178CONFIG_IOSCHED_DEADLINE=y 180CONFIG_IOSCHED_DEADLINE=y
179CONFIG_IOSCHED_CFQ=y 181CONFIG_IOSCHED_CFQ=y
180CONFIG_DEFAULT_AS=y
181# CONFIG_DEFAULT_DEADLINE is not set 182# CONFIG_DEFAULT_DEADLINE is not set
182# CONFIG_DEFAULT_CFQ is not set 183CONFIG_DEFAULT_CFQ=y
183# CONFIG_DEFAULT_NOOP is not set 184# CONFIG_DEFAULT_NOOP is not set
184CONFIG_DEFAULT_IOSCHED="anticipatory" 185CONFIG_DEFAULT_IOSCHED="cfq"
186# CONFIG_INLINE_SPIN_TRYLOCK is not set
187# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK is not set
189# CONFIG_INLINE_SPIN_LOCK_BH is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
191# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
192CONFIG_INLINE_SPIN_UNLOCK=y
193# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
194CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
195# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
196# CONFIG_INLINE_READ_TRYLOCK is not set
197# CONFIG_INLINE_READ_LOCK is not set
198# CONFIG_INLINE_READ_LOCK_BH is not set
199# CONFIG_INLINE_READ_LOCK_IRQ is not set
200# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
201CONFIG_INLINE_READ_UNLOCK=y
202# CONFIG_INLINE_READ_UNLOCK_BH is not set
203CONFIG_INLINE_READ_UNLOCK_IRQ=y
204# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
205# CONFIG_INLINE_WRITE_TRYLOCK is not set
206# CONFIG_INLINE_WRITE_LOCK is not set
207# CONFIG_INLINE_WRITE_LOCK_BH is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
209# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
210CONFIG_INLINE_WRITE_UNLOCK=y
211# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
212CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
213# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
214# CONFIG_MUTEX_SPIN_ON_OWNER is not set
185# CONFIG_FREEZER is not set 215# CONFIG_FREEZER is not set
186 216
187# 217#
@@ -260,6 +290,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
260CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 290CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
261# CONFIG_KEXEC is not set 291# CONFIG_KEXEC is not set
262# CONFIG_CRASH_DUMP is not set 292# CONFIG_CRASH_DUMP is not set
293CONFIG_SPARSE_IRQ=y
263CONFIG_MAX_ACTIVE_REGIONS=32 294CONFIG_MAX_ACTIVE_REGIONS=32
264CONFIG_ARCH_FLATMEM_ENABLE=y 295CONFIG_ARCH_FLATMEM_ENABLE=y
265CONFIG_ARCH_POPULATES_NODE_MAP=y 296CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -276,8 +307,6 @@ CONFIG_MIGRATION=y
276CONFIG_ZONE_DMA_FLAG=1 307CONFIG_ZONE_DMA_FLAG=1
277CONFIG_BOUNCE=y 308CONFIG_BOUNCE=y
278CONFIG_VIRT_TO_BUS=y 309CONFIG_VIRT_TO_BUS=y
279CONFIG_HAVE_MLOCK=y
280CONFIG_HAVE_MLOCKED_PAGE_BIT=y
281# CONFIG_KSM is not set 310# CONFIG_KSM is not set
282CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 311CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
283CONFIG_PPC_4K_PAGES=y 312CONFIG_PPC_4K_PAGES=y
@@ -404,9 +433,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
404# CONFIG_AF_RXRPC is not set 433# CONFIG_AF_RXRPC is not set
405CONFIG_WIRELESS=y 434CONFIG_WIRELESS=y
406# CONFIG_CFG80211 is not set 435# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
408CONFIG_WIRELESS_OLD_REGULATORY=y
409# CONFIG_WIRELESS_EXT is not set
410# CONFIG_LIB80211 is not set 436# CONFIG_LIB80211 is not set
411 437
412# 438#
@@ -530,6 +556,10 @@ CONFIG_BLK_DEV=y
530# CONFIG_BLK_DEV_COW_COMMON is not set 556# CONFIG_BLK_DEV_COW_COMMON is not set
531CONFIG_BLK_DEV_LOOP=y 557CONFIG_BLK_DEV_LOOP=y
532# CONFIG_BLK_DEV_CRYPTOLOOP is not set 558# CONFIG_BLK_DEV_CRYPTOLOOP is not set
559
560#
561# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
562#
533# CONFIG_BLK_DEV_NBD is not set 563# CONFIG_BLK_DEV_NBD is not set
534# CONFIG_BLK_DEV_SX8 is not set 564# CONFIG_BLK_DEV_SX8 is not set
535# CONFIG_BLK_DEV_UB is not set 565# CONFIG_BLK_DEV_UB is not set
@@ -541,6 +571,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
541# CONFIG_ATA_OVER_ETH is not set 571# CONFIG_ATA_OVER_ETH is not set
542# CONFIG_BLK_DEV_HD is not set 572# CONFIG_BLK_DEV_HD is not set
543CONFIG_MISC_DEVICES=y 573CONFIG_MISC_DEVICES=y
574# CONFIG_AD525X_DPOT is not set
544# CONFIG_PHANTOM is not set 575# CONFIG_PHANTOM is not set
545# CONFIG_SGI_IOC4 is not set 576# CONFIG_SGI_IOC4 is not set
546# CONFIG_TIFM_CORE is not set 577# CONFIG_TIFM_CORE is not set
@@ -548,6 +579,7 @@ CONFIG_MISC_DEVICES=y
548# CONFIG_ENCLOSURE_SERVICES is not set 579# CONFIG_ENCLOSURE_SERVICES is not set
549# CONFIG_HP_ILO is not set 580# CONFIG_HP_ILO is not set
550# CONFIG_ISL29003 is not set 581# CONFIG_ISL29003 is not set
582# CONFIG_DS1682 is not set
551# CONFIG_C2PORT is not set 583# CONFIG_C2PORT is not set
552 584
553# 585#
@@ -581,7 +613,7 @@ CONFIG_HAVE_IDE=y
581# 613#
582 614
583# 615#
584# See the help texts for more information. 616# The newer stack is recommended.
585# 617#
586# CONFIG_FIREWIRE is not set 618# CONFIG_FIREWIRE is not set
587# CONFIG_IEEE1394 is not set 619# CONFIG_IEEE1394 is not set
@@ -668,8 +700,11 @@ CONFIG_GIANFAR=y
668# CONFIG_NETDEV_10000 is not set 700# CONFIG_NETDEV_10000 is not set
669# CONFIG_TR is not set 701# CONFIG_TR is not set
670CONFIG_WLAN=y 702CONFIG_WLAN=y
671# CONFIG_WLAN_PRE80211 is not set 703# CONFIG_AIRO is not set
672# CONFIG_WLAN_80211 is not set 704# CONFIG_ATMEL is not set
705# CONFIG_PRISM54 is not set
706# CONFIG_USB_ZD1201 is not set
707# CONFIG_HOSTAP is not set
673 708
674# 709#
675# Enable WiMAX (Networking options) to see the WiMAX drivers 710# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -691,6 +726,7 @@ CONFIG_WLAN=y
691# CONFIG_NETCONSOLE is not set 726# CONFIG_NETCONSOLE is not set
692# CONFIG_NETPOLL is not set 727# CONFIG_NETPOLL is not set
693# CONFIG_NET_POLL_CONTROLLER is not set 728# CONFIG_NET_POLL_CONTROLLER is not set
729# CONFIG_VMXNET3 is not set
694# CONFIG_ISDN is not set 730# CONFIG_ISDN is not set
695# CONFIG_PHONE is not set 731# CONFIG_PHONE is not set
696 732
@@ -700,6 +736,7 @@ CONFIG_WLAN=y
700CONFIG_INPUT=y 736CONFIG_INPUT=y
701# CONFIG_INPUT_FF_MEMLESS is not set 737# CONFIG_INPUT_FF_MEMLESS is not set
702# CONFIG_INPUT_POLLDEV is not set 738# CONFIG_INPUT_POLLDEV is not set
739# CONFIG_INPUT_SPARSEKMAP is not set
703 740
704# 741#
705# Userland interfaces 742# Userland interfaces
@@ -751,6 +788,7 @@ CONFIG_SERIAL_CORE=y
751CONFIG_SERIAL_CORE_CONSOLE=y 788CONFIG_SERIAL_CORE_CONSOLE=y
752# CONFIG_SERIAL_JSM is not set 789# CONFIG_SERIAL_JSM is not set
753# CONFIG_SERIAL_OF_PLATFORM is not set 790# CONFIG_SERIAL_OF_PLATFORM is not set
791# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
754CONFIG_UNIX98_PTYS=y 792CONFIG_UNIX98_PTYS=y
755# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 793# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
756CONFIG_LEGACY_PTYS=y 794CONFIG_LEGACY_PTYS=y
@@ -807,11 +845,6 @@ CONFIG_I2C_MPC=y
807# CONFIG_I2C_TINY_USB is not set 845# CONFIG_I2C_TINY_USB is not set
808 846
809# 847#
810# Graphics adapter I2C/DDC channel drivers
811#
812# CONFIG_I2C_VOODOO3 is not set
813
814#
815# Other I2C/SMBus bus drivers 848# Other I2C/SMBus bus drivers
816# 849#
817# CONFIG_I2C_PCA_PLATFORM is not set 850# CONFIG_I2C_PCA_PLATFORM is not set
@@ -820,7 +853,6 @@ CONFIG_I2C_MPC=y
820# 853#
821# Miscellaneous I2C Chip support 854# Miscellaneous I2C Chip support
822# 855#
823# CONFIG_DS1682 is not set
824# CONFIG_SENSORS_TSL2550 is not set 856# CONFIG_SENSORS_TSL2550 is not set
825# CONFIG_I2C_DEBUG_CORE is not set 857# CONFIG_I2C_DEBUG_CORE is not set
826# CONFIG_I2C_DEBUG_ALGO is not set 858# CONFIG_I2C_DEBUG_ALGO is not set
@@ -866,6 +898,7 @@ CONFIG_HWMON=y
866# CONFIG_SENSORS_GL520SM is not set 898# CONFIG_SENSORS_GL520SM is not set
867# CONFIG_SENSORS_IT87 is not set 899# CONFIG_SENSORS_IT87 is not set
868# CONFIG_SENSORS_LM63 is not set 900# CONFIG_SENSORS_LM63 is not set
901# CONFIG_SENSORS_LM73 is not set
869# CONFIG_SENSORS_LM75 is not set 902# CONFIG_SENSORS_LM75 is not set
870# CONFIG_SENSORS_LM77 is not set 903# CONFIG_SENSORS_LM77 is not set
871# CONFIG_SENSORS_LM78 is not set 904# CONFIG_SENSORS_LM78 is not set
@@ -904,6 +937,7 @@ CONFIG_HWMON=y
904# CONFIG_SENSORS_W83L786NG is not set 937# CONFIG_SENSORS_W83L786NG is not set
905# CONFIG_SENSORS_W83627HF is not set 938# CONFIG_SENSORS_W83627HF is not set
906# CONFIG_SENSORS_W83627EHF is not set 939# CONFIG_SENSORS_W83627EHF is not set
940# CONFIG_SENSORS_LIS3_I2C is not set
907CONFIG_THERMAL=y 941CONFIG_THERMAL=y
908# CONFIG_THERMAL_HWMON is not set 942# CONFIG_THERMAL_HWMON is not set
909CONFIG_WATCHDOG=y 943CONFIG_WATCHDOG=y
@@ -942,11 +976,13 @@ CONFIG_SSB_POSSIBLE=y
942# CONFIG_TWL4030_CORE is not set 976# CONFIG_TWL4030_CORE is not set
943# CONFIG_MFD_TMIO is not set 977# CONFIG_MFD_TMIO is not set
944# CONFIG_PMIC_DA903X is not set 978# CONFIG_PMIC_DA903X is not set
979# CONFIG_PMIC_ADP5520 is not set
945# CONFIG_MFD_WM8400 is not set 980# CONFIG_MFD_WM8400 is not set
946# CONFIG_MFD_WM831X is not set 981# CONFIG_MFD_WM831X is not set
947# CONFIG_MFD_WM8350_I2C is not set 982# CONFIG_MFD_WM8350_I2C is not set
948# CONFIG_MFD_PCF50633 is not set 983# CONFIG_MFD_PCF50633 is not set
949# CONFIG_AB3100_CORE is not set 984# CONFIG_AB3100_CORE is not set
985# CONFIG_MFD_88PM8607 is not set
950# CONFIG_REGULATOR is not set 986# CONFIG_REGULATOR is not set
951# CONFIG_MEDIA_SUPPORT is not set 987# CONFIG_MEDIA_SUPPORT is not set
952 988
@@ -996,6 +1032,7 @@ CONFIG_USB_MON=y
996CONFIG_USB_EHCI_HCD=y 1032CONFIG_USB_EHCI_HCD=y
997CONFIG_USB_EHCI_ROOT_HUB_TT=y 1033CONFIG_USB_EHCI_ROOT_HUB_TT=y
998# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1034# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1035# CONFIG_XPS_USB_HCD_XILINX is not set
999CONFIG_USB_EHCI_FSL=y 1036CONFIG_USB_EHCI_FSL=y
1000CONFIG_USB_EHCI_HCD_PPC_OF=y 1037CONFIG_USB_EHCI_HCD_PPC_OF=y
1001# CONFIG_USB_OXU210HP_HCD is not set 1038# CONFIG_USB_OXU210HP_HCD is not set
@@ -1101,6 +1138,7 @@ CONFIG_RTC_DRV_DS1374=y
1101# CONFIG_RTC_DRV_PCF8563 is not set 1138# CONFIG_RTC_DRV_PCF8563 is not set
1102# CONFIG_RTC_DRV_PCF8583 is not set 1139# CONFIG_RTC_DRV_PCF8583 is not set
1103# CONFIG_RTC_DRV_M41T80 is not set 1140# CONFIG_RTC_DRV_M41T80 is not set
1141# CONFIG_RTC_DRV_BQ32K is not set
1104# CONFIG_RTC_DRV_S35390A is not set 1142# CONFIG_RTC_DRV_S35390A is not set
1105# CONFIG_RTC_DRV_FM3130 is not set 1143# CONFIG_RTC_DRV_FM3130 is not set
1106# CONFIG_RTC_DRV_RX8581 is not set 1144# CONFIG_RTC_DRV_RX8581 is not set
@@ -1122,7 +1160,9 @@ CONFIG_RTC_DRV_DS1374=y
1122# CONFIG_RTC_DRV_M48T86 is not set 1160# CONFIG_RTC_DRV_M48T86 is not set
1123# CONFIG_RTC_DRV_M48T35 is not set 1161# CONFIG_RTC_DRV_M48T35 is not set
1124# CONFIG_RTC_DRV_M48T59 is not set 1162# CONFIG_RTC_DRV_M48T59 is not set
1163# CONFIG_RTC_DRV_MSM6242 is not set
1125# CONFIG_RTC_DRV_BQ4802 is not set 1164# CONFIG_RTC_DRV_BQ4802 is not set
1165# CONFIG_RTC_DRV_RP5C01 is not set
1126# CONFIG_RTC_DRV_V3020 is not set 1166# CONFIG_RTC_DRV_V3020 is not set
1127 1167
1128# 1168#
@@ -1347,7 +1387,7 @@ CONFIG_FRAME_WARN=1024
1347# CONFIG_DEBUG_KERNEL is not set 1387# CONFIG_DEBUG_KERNEL is not set
1348# CONFIG_SLUB_DEBUG_ON is not set 1388# CONFIG_SLUB_DEBUG_ON is not set
1349# CONFIG_SLUB_STATS is not set 1389# CONFIG_SLUB_STATS is not set
1350# CONFIG_DEBUG_BUGVERBOSE is not set 1390CONFIG_DEBUG_BUGVERBOSE=y
1351# CONFIG_DEBUG_MEMORY_INIT is not set 1391# CONFIG_DEBUG_MEMORY_INIT is not set
1352# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1392# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1353# CONFIG_LATENCYTOP is not set 1393# CONFIG_LATENCYTOP is not set
@@ -1374,7 +1414,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1374# CONFIG_KEYS is not set 1414# CONFIG_KEYS is not set
1375# CONFIG_SECURITY is not set 1415# CONFIG_SECURITY is not set
1376# CONFIG_SECURITYFS is not set 1416# CONFIG_SECURITYFS is not set
1377# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1417# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1418# CONFIG_DEFAULT_SECURITY_SMACK is not set
1419# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1420CONFIG_DEFAULT_SECURITY_DAC=y
1421CONFIG_DEFAULT_SECURITY=""
1378CONFIG_CRYPTO=y 1422CONFIG_CRYPTO=y
1379 1423
1380# 1424#
diff --git a/arch/powerpc/configs/83xx/kmeter1_defconfig b/arch/powerpc/configs/83xx/kmeter1_defconfig
index 6694fb73cd99..8b1aa806e548 100644
--- a/arch/powerpc/configs/83xx/kmeter1_defconfig
+++ b/arch/powerpc/configs/83xx/kmeter1_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:21 2009 4# Wed Jan 6 09:24:14 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -89,6 +91,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
89# 91#
90CONFIG_TREE_RCU=y 92CONFIG_TREE_RCU=y
91# CONFIG_TREE_PREEMPT_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_TINY_RCU is not set
92# CONFIG_RCU_TRACE is not set 95# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32 96CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set 97# CONFIG_RCU_FANOUT_EXACT is not set
@@ -168,14 +171,41 @@ CONFIG_LBDAF=y
168# IO Schedulers 171# IO Schedulers
169# 172#
170CONFIG_IOSCHED_NOOP=y 173CONFIG_IOSCHED_NOOP=y
171# CONFIG_IOSCHED_AS is not set
172# CONFIG_IOSCHED_DEADLINE is not set 174# CONFIG_IOSCHED_DEADLINE is not set
173# CONFIG_IOSCHED_CFQ is not set 175# CONFIG_IOSCHED_CFQ is not set
174# CONFIG_DEFAULT_AS is not set
175# CONFIG_DEFAULT_DEADLINE is not set 176# CONFIG_DEFAULT_DEADLINE is not set
176# CONFIG_DEFAULT_CFQ is not set 177# CONFIG_DEFAULT_CFQ is not set
177CONFIG_DEFAULT_NOOP=y 178CONFIG_DEFAULT_NOOP=y
178CONFIG_DEFAULT_IOSCHED="noop" 179CONFIG_DEFAULT_IOSCHED="noop"
180# CONFIG_INLINE_SPIN_TRYLOCK is not set
181# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
182# CONFIG_INLINE_SPIN_LOCK is not set
183# CONFIG_INLINE_SPIN_LOCK_BH is not set
184# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
185# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
186# CONFIG_INLINE_SPIN_UNLOCK is not set
187# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
188# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
189# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
190# CONFIG_INLINE_READ_TRYLOCK is not set
191# CONFIG_INLINE_READ_LOCK is not set
192# CONFIG_INLINE_READ_LOCK_BH is not set
193# CONFIG_INLINE_READ_LOCK_IRQ is not set
194# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
195# CONFIG_INLINE_READ_UNLOCK is not set
196# CONFIG_INLINE_READ_UNLOCK_BH is not set
197# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
198# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
199# CONFIG_INLINE_WRITE_TRYLOCK is not set
200# CONFIG_INLINE_WRITE_LOCK is not set
201# CONFIG_INLINE_WRITE_LOCK_BH is not set
202# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
203# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
204# CONFIG_INLINE_WRITE_UNLOCK is not set
205# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
206# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
207# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
208# CONFIG_MUTEX_SPIN_ON_OWNER is not set
179# CONFIG_FREEZER is not set 209# CONFIG_FREEZER is not set
180 210
181# 211#
@@ -253,6 +283,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
253CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 283CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
254# CONFIG_KEXEC is not set 284# CONFIG_KEXEC is not set
255# CONFIG_CRASH_DUMP is not set 285# CONFIG_CRASH_DUMP is not set
286CONFIG_SPARSE_IRQ=y
256CONFIG_MAX_ACTIVE_REGIONS=32 287CONFIG_MAX_ACTIVE_REGIONS=32
257CONFIG_ARCH_FLATMEM_ENABLE=y 288CONFIG_ARCH_FLATMEM_ENABLE=y
258CONFIG_ARCH_POPULATES_NODE_MAP=y 289CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -269,8 +300,6 @@ CONFIG_MIGRATION=y
269CONFIG_ZONE_DMA_FLAG=1 300CONFIG_ZONE_DMA_FLAG=1
270CONFIG_BOUNCE=y 301CONFIG_BOUNCE=y
271CONFIG_VIRT_TO_BUS=y 302CONFIG_VIRT_TO_BUS=y
272CONFIG_HAVE_MLOCK=y
273CONFIG_HAVE_MLOCKED_PAGE_BIT=y
274# CONFIG_KSM is not set 303# CONFIG_KSM is not set
275CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 304CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
276CONFIG_PPC_4K_PAGES=y 305CONFIG_PPC_4K_PAGES=y
@@ -384,7 +413,13 @@ CONFIG_LLC=m
384# CONFIG_IRDA is not set 413# CONFIG_IRDA is not set
385# CONFIG_BT is not set 414# CONFIG_BT is not set
386# CONFIG_AF_RXRPC is not set 415# CONFIG_AF_RXRPC is not set
387# CONFIG_WIRELESS is not set 416CONFIG_WIRELESS=y
417# CONFIG_CFG80211 is not set
418# CONFIG_LIB80211 is not set
419
420#
421# CFG80211 needs to be enabled for MAC80211
422#
388# CONFIG_WIMAX is not set 423# CONFIG_WIMAX is not set
389# CONFIG_RFKILL is not set 424# CONFIG_RFKILL is not set
390# CONFIG_NET_9P is not set 425# CONFIG_NET_9P is not set
@@ -512,6 +547,10 @@ CONFIG_BLK_DEV=y
512# CONFIG_BLK_DEV_FD is not set 547# CONFIG_BLK_DEV_FD is not set
513# CONFIG_BLK_DEV_COW_COMMON is not set 548# CONFIG_BLK_DEV_COW_COMMON is not set
514# CONFIG_BLK_DEV_LOOP is not set 549# CONFIG_BLK_DEV_LOOP is not set
550
551#
552# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
553#
515# CONFIG_BLK_DEV_NBD is not set 554# CONFIG_BLK_DEV_NBD is not set
516# CONFIG_BLK_DEV_RAM is not set 555# CONFIG_BLK_DEV_RAM is not set
517# CONFIG_CDROM_PKTCDVD is not set 556# CONFIG_CDROM_PKTCDVD is not set
@@ -581,8 +620,7 @@ CONFIG_UCC_GETH=y
581# CONFIG_MV643XX_ETH is not set 620# CONFIG_MV643XX_ETH is not set
582# CONFIG_NETDEV_10000 is not set 621# CONFIG_NETDEV_10000 is not set
583CONFIG_WLAN=y 622CONFIG_WLAN=y
584# CONFIG_WLAN_PRE80211 is not set 623# CONFIG_HOSTAP is not set
585# CONFIG_WLAN_80211 is not set
586 624
587# 625#
588# Enable WiMAX (Networking options) to see the WiMAX drivers 626# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -652,6 +690,7 @@ CONFIG_SERIAL_CORE=y
652CONFIG_SERIAL_CORE_CONSOLE=y 690CONFIG_SERIAL_CORE_CONSOLE=y
653# CONFIG_SERIAL_OF_PLATFORM is not set 691# CONFIG_SERIAL_OF_PLATFORM is not set
654# CONFIG_SERIAL_QE is not set 692# CONFIG_SERIAL_QE is not set
693# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
655CONFIG_UNIX98_PTYS=y 694CONFIG_UNIX98_PTYS=y
656# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 695# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
657CONFIG_LEGACY_PTYS=y 696CONFIG_LEGACY_PTYS=y
@@ -697,7 +736,6 @@ CONFIG_I2C_MPC=y
697# 736#
698# Miscellaneous I2C Chip support 737# Miscellaneous I2C Chip support
699# 738#
700# CONFIG_DS1682 is not set
701# CONFIG_SENSORS_TSL2550 is not set 739# CONFIG_SENSORS_TSL2550 is not set
702# CONFIG_I2C_DEBUG_CORE is not set 740# CONFIG_I2C_DEBUG_CORE is not set
703# CONFIG_I2C_DEBUG_ALGO is not set 741# CONFIG_I2C_DEBUG_ALGO is not set
@@ -732,11 +770,13 @@ CONFIG_SSB_POSSIBLE=y
732# CONFIG_TWL4030_CORE is not set 770# CONFIG_TWL4030_CORE is not set
733# CONFIG_MFD_TMIO is not set 771# CONFIG_MFD_TMIO is not set
734# CONFIG_PMIC_DA903X is not set 772# CONFIG_PMIC_DA903X is not set
773# CONFIG_PMIC_ADP5520 is not set
735# CONFIG_MFD_WM8400 is not set 774# CONFIG_MFD_WM8400 is not set
736# CONFIG_MFD_WM831X is not set 775# CONFIG_MFD_WM831X is not set
737# CONFIG_MFD_WM8350_I2C is not set 776# CONFIG_MFD_WM8350_I2C is not set
738# CONFIG_MFD_PCF50633 is not set 777# CONFIG_MFD_PCF50633 is not set
739# CONFIG_AB3100_CORE is not set 778# CONFIG_AB3100_CORE is not set
779# CONFIG_MFD_88PM8607 is not set
740# CONFIG_REGULATOR is not set 780# CONFIG_REGULATOR is not set
741# CONFIG_MEDIA_SUPPORT is not set 781# CONFIG_MEDIA_SUPPORT is not set
742 782
@@ -933,7 +973,7 @@ CONFIG_FRAME_WARN=1024
933CONFIG_DEBUG_FS=y 973CONFIG_DEBUG_FS=y
934# CONFIG_HEADERS_CHECK is not set 974# CONFIG_HEADERS_CHECK is not set
935# CONFIG_DEBUG_KERNEL is not set 975# CONFIG_DEBUG_KERNEL is not set
936# CONFIG_DEBUG_BUGVERBOSE is not set 976CONFIG_DEBUG_BUGVERBOSE=y
937# CONFIG_DEBUG_MEMORY_INIT is not set 977# CONFIG_DEBUG_MEMORY_INIT is not set
938# CONFIG_RCU_CPU_STALL_DETECTOR is not set 978# CONFIG_RCU_CPU_STALL_DETECTOR is not set
939# CONFIG_LATENCYTOP is not set 979# CONFIG_LATENCYTOP is not set
@@ -963,7 +1003,11 @@ CONFIG_PRINT_STACK_DEPTH=64
963# CONFIG_KEYS is not set 1003# CONFIG_KEYS is not set
964# CONFIG_SECURITY is not set 1004# CONFIG_SECURITY is not set
965# CONFIG_SECURITYFS is not set 1005# CONFIG_SECURITYFS is not set
966# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1006# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1007# CONFIG_DEFAULT_SECURITY_SMACK is not set
1008# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1009CONFIG_DEFAULT_SECURITY_DAC=y
1010CONFIG_DEFAULT_SECURITY=""
967# CONFIG_CRYPTO is not set 1011# CONFIG_CRYPTO is not set
968# CONFIG_PPC_CLOCK is not set 1012# CONFIG_PPC_CLOCK is not set
969CONFIG_PPC_LIB_RHEAP=y 1013CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
index 86df19f041a4..2f2d98558e44 100644
--- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:22 2009 4# Wed Jan 6 09:24:15 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 176# IO Schedulers
174# 177#
175CONFIG_IOSCHED_NOOP=y 178CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 179CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 180CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 181# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 182CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 183# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 184CONFIG_DEFAULT_IOSCHED="cfq"
185# CONFIG_INLINE_SPIN_TRYLOCK is not set
186# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK is not set
188# CONFIG_INLINE_SPIN_LOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
191CONFIG_INLINE_SPIN_UNLOCK=y
192# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
193CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
194# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
195# CONFIG_INLINE_READ_TRYLOCK is not set
196# CONFIG_INLINE_READ_LOCK is not set
197# CONFIG_INLINE_READ_LOCK_BH is not set
198# CONFIG_INLINE_READ_LOCK_IRQ is not set
199# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
200CONFIG_INLINE_READ_UNLOCK=y
201# CONFIG_INLINE_READ_UNLOCK_BH is not set
202CONFIG_INLINE_READ_UNLOCK_IRQ=y
203# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_WRITE_TRYLOCK is not set
205# CONFIG_INLINE_WRITE_LOCK is not set
206# CONFIG_INLINE_WRITE_LOCK_BH is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
209CONFIG_INLINE_WRITE_UNLOCK=y
210# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
211CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
212# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
213# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184# CONFIG_FREEZER is not set 214# CONFIG_FREEZER is not set
185 215
186# 216#
@@ -259,6 +289,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 289CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 290# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
292CONFIG_SPARSE_IRQ=y
262CONFIG_MAX_ACTIVE_REGIONS=32 293CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 295CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -275,8 +306,6 @@ CONFIG_MIGRATION=y
275CONFIG_ZONE_DMA_FLAG=1 306CONFIG_ZONE_DMA_FLAG=1
276CONFIG_BOUNCE=y 307CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 308CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set 309# CONFIG_KSM is not set
281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 310CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
282CONFIG_PPC_4K_PAGES=y 311CONFIG_PPC_4K_PAGES=y
@@ -404,9 +433,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
404# CONFIG_AF_RXRPC is not set 433# CONFIG_AF_RXRPC is not set
405CONFIG_WIRELESS=y 434CONFIG_WIRELESS=y
406# CONFIG_CFG80211 is not set 435# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
408CONFIG_WIRELESS_OLD_REGULATORY=y
409# CONFIG_WIRELESS_EXT is not set
410# CONFIG_LIB80211 is not set 436# CONFIG_LIB80211 is not set
411 437
412# 438#
@@ -544,6 +570,10 @@ CONFIG_BLK_DEV=y
544# CONFIG_BLK_DEV_COW_COMMON is not set 570# CONFIG_BLK_DEV_COW_COMMON is not set
545CONFIG_BLK_DEV_LOOP=y 571CONFIG_BLK_DEV_LOOP=y
546# CONFIG_BLK_DEV_CRYPTOLOOP is not set 572# CONFIG_BLK_DEV_CRYPTOLOOP is not set
573
574#
575# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
576#
547# CONFIG_BLK_DEV_NBD is not set 577# CONFIG_BLK_DEV_NBD is not set
548# CONFIG_BLK_DEV_SX8 is not set 578# CONFIG_BLK_DEV_SX8 is not set
549# CONFIG_BLK_DEV_UB is not set 579# CONFIG_BLK_DEV_UB is not set
@@ -555,6 +585,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
555# CONFIG_ATA_OVER_ETH is not set 585# CONFIG_ATA_OVER_ETH is not set
556# CONFIG_BLK_DEV_HD is not set 586# CONFIG_BLK_DEV_HD is not set
557CONFIG_MISC_DEVICES=y 587CONFIG_MISC_DEVICES=y
588# CONFIG_AD525X_DPOT is not set
558# CONFIG_PHANTOM is not set 589# CONFIG_PHANTOM is not set
559# CONFIG_SGI_IOC4 is not set 590# CONFIG_SGI_IOC4 is not set
560# CONFIG_TIFM_CORE is not set 591# CONFIG_TIFM_CORE is not set
@@ -562,6 +593,8 @@ CONFIG_MISC_DEVICES=y
562# CONFIG_ENCLOSURE_SERVICES is not set 593# CONFIG_ENCLOSURE_SERVICES is not set
563# CONFIG_HP_ILO is not set 594# CONFIG_HP_ILO is not set
564# CONFIG_ISL29003 is not set 595# CONFIG_ISL29003 is not set
596# CONFIG_DS1682 is not set
597# CONFIG_TI_DAC7512 is not set
565# CONFIG_C2PORT is not set 598# CONFIG_C2PORT is not set
566 599
567# 600#
@@ -615,7 +648,9 @@ CONFIG_SCSI_LOWLEVEL=y
615# CONFIG_SCSI_BNX2_ISCSI is not set 648# CONFIG_SCSI_BNX2_ISCSI is not set
616# CONFIG_BE2ISCSI is not set 649# CONFIG_BE2ISCSI is not set
617# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 650# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
651# CONFIG_SCSI_HPSA is not set
618# CONFIG_SCSI_3W_9XXX is not set 652# CONFIG_SCSI_3W_9XXX is not set
653# CONFIG_SCSI_3W_SAS is not set
619# CONFIG_SCSI_ACARD is not set 654# CONFIG_SCSI_ACARD is not set
620# CONFIG_SCSI_AACRAID is not set 655# CONFIG_SCSI_AACRAID is not set
621# CONFIG_SCSI_AIC7XXX is not set 656# CONFIG_SCSI_AIC7XXX is not set
@@ -653,6 +688,7 @@ CONFIG_SCSI_LOWLEVEL=y
653# CONFIG_SCSI_NSP32 is not set 688# CONFIG_SCSI_NSP32 is not set
654# CONFIG_SCSI_DEBUG is not set 689# CONFIG_SCSI_DEBUG is not set
655# CONFIG_SCSI_PMCRAID is not set 690# CONFIG_SCSI_PMCRAID is not set
691# CONFIG_SCSI_PM8001 is not set
656# CONFIG_SCSI_SRP is not set 692# CONFIG_SCSI_SRP is not set
657# CONFIG_SCSI_BFA_FC is not set 693# CONFIG_SCSI_BFA_FC is not set
658# CONFIG_SCSI_DH is not set 694# CONFIG_SCSI_DH is not set
@@ -680,7 +716,7 @@ CONFIG_MD_RAID1=y
680# 716#
681 717
682# 718#
683# See the help texts for more information. 719# The newer stack is recommended.
684# 720#
685# CONFIG_FIREWIRE is not set 721# CONFIG_FIREWIRE is not set
686# CONFIG_IEEE1394 is not set 722# CONFIG_IEEE1394 is not set
@@ -805,8 +841,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
805# CONFIG_BE2NET is not set 841# CONFIG_BE2NET is not set
806# CONFIG_TR is not set 842# CONFIG_TR is not set
807CONFIG_WLAN=y 843CONFIG_WLAN=y
808# CONFIG_WLAN_PRE80211 is not set 844# CONFIG_AIRO is not set
809# CONFIG_WLAN_80211 is not set 845# CONFIG_ATMEL is not set
846# CONFIG_PRISM54 is not set
847# CONFIG_USB_ZD1201 is not set
848# CONFIG_HOSTAP is not set
810 849
811# 850#
812# Enable WiMAX (Networking options) to see the WiMAX drivers 851# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -829,6 +868,7 @@ CONFIG_WLAN=y
829# CONFIG_NETCONSOLE is not set 868# CONFIG_NETCONSOLE is not set
830# CONFIG_NETPOLL is not set 869# CONFIG_NETPOLL is not set
831# CONFIG_NET_POLL_CONTROLLER is not set 870# CONFIG_NET_POLL_CONTROLLER is not set
871# CONFIG_VMXNET3 is not set
832# CONFIG_ISDN is not set 872# CONFIG_ISDN is not set
833# CONFIG_PHONE is not set 873# CONFIG_PHONE is not set
834 874
@@ -838,6 +878,7 @@ CONFIG_WLAN=y
838CONFIG_INPUT=y 878CONFIG_INPUT=y
839# CONFIG_INPUT_FF_MEMLESS is not set 879# CONFIG_INPUT_FF_MEMLESS is not set
840# CONFIG_INPUT_POLLDEV is not set 880# CONFIG_INPUT_POLLDEV is not set
881# CONFIG_INPUT_SPARSEKMAP is not set
841 882
842# 883#
843# Userland interfaces 884# Userland interfaces
@@ -890,6 +931,7 @@ CONFIG_SERIAL_CORE=y
890CONFIG_SERIAL_CORE_CONSOLE=y 931CONFIG_SERIAL_CORE_CONSOLE=y
891# CONFIG_SERIAL_JSM is not set 932# CONFIG_SERIAL_JSM is not set
892# CONFIG_SERIAL_OF_PLATFORM is not set 933# CONFIG_SERIAL_OF_PLATFORM is not set
934# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
893CONFIG_UNIX98_PTYS=y 935CONFIG_UNIX98_PTYS=y
894# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 936# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
895CONFIG_LEGACY_PTYS=y 937CONFIG_LEGACY_PTYS=y
@@ -947,11 +989,6 @@ CONFIG_I2C_MPC=y
947# CONFIG_I2C_TINY_USB is not set 989# CONFIG_I2C_TINY_USB is not set
948 990
949# 991#
950# Graphics adapter I2C/DDC channel drivers
951#
952# CONFIG_I2C_VOODOO3 is not set
953
954#
955# Other I2C/SMBus bus drivers 992# Other I2C/SMBus bus drivers
956# 993#
957# CONFIG_I2C_PCA_PLATFORM is not set 994# CONFIG_I2C_PCA_PLATFORM is not set
@@ -960,7 +997,6 @@ CONFIG_I2C_MPC=y
960# 997#
961# Miscellaneous I2C Chip support 998# Miscellaneous I2C Chip support
962# 999#
963# CONFIG_DS1682 is not set
964# CONFIG_SENSORS_TSL2550 is not set 1000# CONFIG_SENSORS_TSL2550 is not set
965# CONFIG_I2C_DEBUG_CORE is not set 1001# CONFIG_I2C_DEBUG_CORE is not set
966# CONFIG_I2C_DEBUG_ALGO is not set 1002# CONFIG_I2C_DEBUG_ALGO is not set
@@ -975,6 +1011,8 @@ CONFIG_SPI_MASTER=y
975# 1011#
976CONFIG_SPI_BITBANG=y 1012CONFIG_SPI_BITBANG=y
977# CONFIG_SPI_MPC8xxx is not set 1013# CONFIG_SPI_MPC8xxx is not set
1014# CONFIG_SPI_XILINX is not set
1015# CONFIG_SPI_DESIGNWARE is not set
978 1016
979# 1017#
980# SPI Protocol Masters 1018# SPI Protocol Masters
@@ -1022,6 +1060,7 @@ CONFIG_HWMON=y
1022# CONFIG_SENSORS_IT87 is not set 1060# CONFIG_SENSORS_IT87 is not set
1023# CONFIG_SENSORS_LM63 is not set 1061# CONFIG_SENSORS_LM63 is not set
1024# CONFIG_SENSORS_LM70 is not set 1062# CONFIG_SENSORS_LM70 is not set
1063# CONFIG_SENSORS_LM73 is not set
1025# CONFIG_SENSORS_LM75 is not set 1064# CONFIG_SENSORS_LM75 is not set
1026# CONFIG_SENSORS_LM77 is not set 1065# CONFIG_SENSORS_LM77 is not set
1027# CONFIG_SENSORS_LM78 is not set 1066# CONFIG_SENSORS_LM78 is not set
@@ -1062,6 +1101,7 @@ CONFIG_HWMON=y
1062# CONFIG_SENSORS_W83627HF is not set 1101# CONFIG_SENSORS_W83627HF is not set
1063# CONFIG_SENSORS_W83627EHF is not set 1102# CONFIG_SENSORS_W83627EHF is not set
1064# CONFIG_SENSORS_LIS3_SPI is not set 1103# CONFIG_SENSORS_LIS3_SPI is not set
1104# CONFIG_SENSORS_LIS3_I2C is not set
1065# CONFIG_THERMAL is not set 1105# CONFIG_THERMAL is not set
1066CONFIG_WATCHDOG=y 1106CONFIG_WATCHDOG=y
1067# CONFIG_WATCHDOG_NOWAYOUT is not set 1107# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1099,6 +1139,7 @@ CONFIG_SSB_POSSIBLE=y
1099# CONFIG_TWL4030_CORE is not set 1139# CONFIG_TWL4030_CORE is not set
1100# CONFIG_MFD_TMIO is not set 1140# CONFIG_MFD_TMIO is not set
1101# CONFIG_PMIC_DA903X is not set 1141# CONFIG_PMIC_DA903X is not set
1142# CONFIG_PMIC_ADP5520 is not set
1102# CONFIG_MFD_WM8400 is not set 1143# CONFIG_MFD_WM8400 is not set
1103# CONFIG_MFD_WM831X is not set 1144# CONFIG_MFD_WM831X is not set
1104# CONFIG_MFD_WM8350_I2C is not set 1145# CONFIG_MFD_WM8350_I2C is not set
@@ -1106,6 +1147,8 @@ CONFIG_SSB_POSSIBLE=y
1106# CONFIG_MFD_MC13783 is not set 1147# CONFIG_MFD_MC13783 is not set
1107# CONFIG_AB3100_CORE is not set 1148# CONFIG_AB3100_CORE is not set
1108# CONFIG_EZX_PCAP is not set 1149# CONFIG_EZX_PCAP is not set
1150# CONFIG_MFD_88PM8607 is not set
1151# CONFIG_AB4500_CORE is not set
1109# CONFIG_REGULATOR is not set 1152# CONFIG_REGULATOR is not set
1110# CONFIG_MEDIA_SUPPORT is not set 1153# CONFIG_MEDIA_SUPPORT is not set
1111 1154
@@ -1173,6 +1216,7 @@ CONFIG_USB_MON=y
1173CONFIG_USB_EHCI_HCD=y 1216CONFIG_USB_EHCI_HCD=y
1174CONFIG_USB_EHCI_ROOT_HUB_TT=y 1217CONFIG_USB_EHCI_ROOT_HUB_TT=y
1175# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1218# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1219# CONFIG_XPS_USB_HCD_XILINX is not set
1176CONFIG_USB_EHCI_FSL=y 1220CONFIG_USB_EHCI_FSL=y
1177CONFIG_USB_EHCI_HCD_PPC_OF=y 1221CONFIG_USB_EHCI_HCD_PPC_OF=y
1178# CONFIG_USB_OXU210HP_HCD is not set 1222# CONFIG_USB_OXU210HP_HCD is not set
@@ -1287,15 +1331,17 @@ CONFIG_USB_NET2280=y
1287CONFIG_USB_GADGET_DUALSPEED=y 1331CONFIG_USB_GADGET_DUALSPEED=y
1288# CONFIG_USB_ZERO is not set 1332# CONFIG_USB_ZERO is not set
1289# CONFIG_USB_AUDIO is not set 1333# CONFIG_USB_AUDIO is not set
1290CONFIG_USB_ETH=y 1334CONFIG_USB_ETH=m
1291CONFIG_USB_ETH_RNDIS=y 1335CONFIG_USB_ETH_RNDIS=y
1292# CONFIG_USB_ETH_EEM is not set 1336# CONFIG_USB_ETH_EEM is not set
1293# CONFIG_USB_GADGETFS is not set 1337# CONFIG_USB_GADGETFS is not set
1294# CONFIG_USB_FILE_STORAGE is not set 1338# CONFIG_USB_FILE_STORAGE is not set
1339# CONFIG_USB_MASS_STORAGE is not set
1295# CONFIG_USB_G_SERIAL is not set 1340# CONFIG_USB_G_SERIAL is not set
1296# CONFIG_USB_MIDI_GADGET is not set 1341# CONFIG_USB_MIDI_GADGET is not set
1297# CONFIG_USB_G_PRINTER is not set 1342# CONFIG_USB_G_PRINTER is not set
1298# CONFIG_USB_CDC_COMPOSITE is not set 1343# CONFIG_USB_CDC_COMPOSITE is not set
1344# CONFIG_USB_G_MULTI is not set
1299 1345
1300# 1346#
1301# OTG and related infrastructure 1347# OTG and related infrastructure
@@ -1336,6 +1382,7 @@ CONFIG_RTC_DRV_DS1307=y
1336# CONFIG_RTC_DRV_PCF8563 is not set 1382# CONFIG_RTC_DRV_PCF8563 is not set
1337# CONFIG_RTC_DRV_PCF8583 is not set 1383# CONFIG_RTC_DRV_PCF8583 is not set
1338# CONFIG_RTC_DRV_M41T80 is not set 1384# CONFIG_RTC_DRV_M41T80 is not set
1385# CONFIG_RTC_DRV_BQ32K is not set
1339# CONFIG_RTC_DRV_S35390A is not set 1386# CONFIG_RTC_DRV_S35390A is not set
1340# CONFIG_RTC_DRV_FM3130 is not set 1387# CONFIG_RTC_DRV_FM3130 is not set
1341# CONFIG_RTC_DRV_RX8581 is not set 1388# CONFIG_RTC_DRV_RX8581 is not set
@@ -1365,7 +1412,9 @@ CONFIG_RTC_DRV_DS1307=y
1365# CONFIG_RTC_DRV_M48T86 is not set 1412# CONFIG_RTC_DRV_M48T86 is not set
1366# CONFIG_RTC_DRV_M48T35 is not set 1413# CONFIG_RTC_DRV_M48T35 is not set
1367# CONFIG_RTC_DRV_M48T59 is not set 1414# CONFIG_RTC_DRV_M48T59 is not set
1415# CONFIG_RTC_DRV_MSM6242 is not set
1368# CONFIG_RTC_DRV_BQ4802 is not set 1416# CONFIG_RTC_DRV_BQ4802 is not set
1417# CONFIG_RTC_DRV_RP5C01 is not set
1369# CONFIG_RTC_DRV_V3020 is not set 1418# CONFIG_RTC_DRV_V3020 is not set
1370 1419
1371# 1420#
@@ -1676,7 +1725,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1676# CONFIG_KEYS is not set 1725# CONFIG_KEYS is not set
1677# CONFIG_SECURITY is not set 1726# CONFIG_SECURITY is not set
1678# CONFIG_SECURITYFS is not set 1727# CONFIG_SECURITYFS is not set
1679# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1728# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1729# CONFIG_DEFAULT_SECURITY_SMACK is not set
1730# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1731CONFIG_DEFAULT_SECURITY_DAC=y
1732CONFIG_DEFAULT_SECURITY=""
1680CONFIG_CRYPTO=y 1733CONFIG_CRYPTO=y
1681 1734
1682# 1735#
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
index 7bf71d577033..633e61194603 100644
--- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:23 2009 4# Wed Jan 6 09:24:16 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 176# IO Schedulers
174# 177#
175CONFIG_IOSCHED_NOOP=y 178CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 179CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 180CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 181# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 182CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 183# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 184CONFIG_DEFAULT_IOSCHED="cfq"
185# CONFIG_INLINE_SPIN_TRYLOCK is not set
186# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK is not set
188# CONFIG_INLINE_SPIN_LOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
191CONFIG_INLINE_SPIN_UNLOCK=y
192# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
193CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
194# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
195# CONFIG_INLINE_READ_TRYLOCK is not set
196# CONFIG_INLINE_READ_LOCK is not set
197# CONFIG_INLINE_READ_LOCK_BH is not set
198# CONFIG_INLINE_READ_LOCK_IRQ is not set
199# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
200CONFIG_INLINE_READ_UNLOCK=y
201# CONFIG_INLINE_READ_UNLOCK_BH is not set
202CONFIG_INLINE_READ_UNLOCK_IRQ=y
203# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_WRITE_TRYLOCK is not set
205# CONFIG_INLINE_WRITE_LOCK is not set
206# CONFIG_INLINE_WRITE_LOCK_BH is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
209CONFIG_INLINE_WRITE_UNLOCK=y
210# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
211CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
212# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
213# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184# CONFIG_FREEZER is not set 214# CONFIG_FREEZER is not set
185 215
186# 216#
@@ -259,6 +289,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 289CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 290# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
292CONFIG_SPARSE_IRQ=y
262CONFIG_MAX_ACTIVE_REGIONS=32 293CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 295CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -275,8 +306,6 @@ CONFIG_MIGRATION=y
275CONFIG_ZONE_DMA_FLAG=1 306CONFIG_ZONE_DMA_FLAG=1
276CONFIG_BOUNCE=y 307CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 308CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set 309# CONFIG_KSM is not set
281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 310CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
282CONFIG_PPC_4K_PAGES=y 311CONFIG_PPC_4K_PAGES=y
@@ -404,9 +433,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
404# CONFIG_AF_RXRPC is not set 433# CONFIG_AF_RXRPC is not set
405CONFIG_WIRELESS=y 434CONFIG_WIRELESS=y
406# CONFIG_CFG80211 is not set 435# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
408CONFIG_WIRELESS_OLD_REGULATORY=y
409# CONFIG_WIRELESS_EXT is not set
410# CONFIG_LIB80211 is not set 436# CONFIG_LIB80211 is not set
411 437
412# 438#
@@ -544,6 +570,10 @@ CONFIG_BLK_DEV=y
544# CONFIG_BLK_DEV_COW_COMMON is not set 570# CONFIG_BLK_DEV_COW_COMMON is not set
545CONFIG_BLK_DEV_LOOP=y 571CONFIG_BLK_DEV_LOOP=y
546# CONFIG_BLK_DEV_CRYPTOLOOP is not set 572# CONFIG_BLK_DEV_CRYPTOLOOP is not set
573
574#
575# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
576#
547# CONFIG_BLK_DEV_NBD is not set 577# CONFIG_BLK_DEV_NBD is not set
548# CONFIG_BLK_DEV_SX8 is not set 578# CONFIG_BLK_DEV_SX8 is not set
549# CONFIG_BLK_DEV_UB is not set 579# CONFIG_BLK_DEV_UB is not set
@@ -555,6 +585,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
555# CONFIG_ATA_OVER_ETH is not set 585# CONFIG_ATA_OVER_ETH is not set
556# CONFIG_BLK_DEV_HD is not set 586# CONFIG_BLK_DEV_HD is not set
557CONFIG_MISC_DEVICES=y 587CONFIG_MISC_DEVICES=y
588# CONFIG_AD525X_DPOT is not set
558# CONFIG_PHANTOM is not set 589# CONFIG_PHANTOM is not set
559# CONFIG_SGI_IOC4 is not set 590# CONFIG_SGI_IOC4 is not set
560# CONFIG_TIFM_CORE is not set 591# CONFIG_TIFM_CORE is not set
@@ -562,6 +593,8 @@ CONFIG_MISC_DEVICES=y
562# CONFIG_ENCLOSURE_SERVICES is not set 593# CONFIG_ENCLOSURE_SERVICES is not set
563# CONFIG_HP_ILO is not set 594# CONFIG_HP_ILO is not set
564# CONFIG_ISL29003 is not set 595# CONFIG_ISL29003 is not set
596# CONFIG_DS1682 is not set
597# CONFIG_TI_DAC7512 is not set
565# CONFIG_C2PORT is not set 598# CONFIG_C2PORT is not set
566 599
567# 600#
@@ -615,7 +648,9 @@ CONFIG_SCSI_LOWLEVEL=y
615# CONFIG_SCSI_BNX2_ISCSI is not set 648# CONFIG_SCSI_BNX2_ISCSI is not set
616# CONFIG_BE2ISCSI is not set 649# CONFIG_BE2ISCSI is not set
617# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 650# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
651# CONFIG_SCSI_HPSA is not set
618# CONFIG_SCSI_3W_9XXX is not set 652# CONFIG_SCSI_3W_9XXX is not set
653# CONFIG_SCSI_3W_SAS is not set
619# CONFIG_SCSI_ACARD is not set 654# CONFIG_SCSI_ACARD is not set
620# CONFIG_SCSI_AACRAID is not set 655# CONFIG_SCSI_AACRAID is not set
621# CONFIG_SCSI_AIC7XXX is not set 656# CONFIG_SCSI_AIC7XXX is not set
@@ -654,6 +689,7 @@ CONFIG_SCSI_LOWLEVEL=y
654# CONFIG_SCSI_NSP32 is not set 689# CONFIG_SCSI_NSP32 is not set
655# CONFIG_SCSI_DEBUG is not set 690# CONFIG_SCSI_DEBUG is not set
656# CONFIG_SCSI_PMCRAID is not set 691# CONFIG_SCSI_PMCRAID is not set
692# CONFIG_SCSI_PM8001 is not set
657# CONFIG_SCSI_SRP is not set 693# CONFIG_SCSI_SRP is not set
658# CONFIG_SCSI_BFA_FC is not set 694# CONFIG_SCSI_BFA_FC is not set
659# CONFIG_SCSI_DH is not set 695# CONFIG_SCSI_DH is not set
@@ -709,15 +745,16 @@ CONFIG_ATA_SFF=y
709# CONFIG_PATA_NS87415 is not set 745# CONFIG_PATA_NS87415 is not set
710# CONFIG_PATA_OPTI is not set 746# CONFIG_PATA_OPTI is not set
711# CONFIG_PATA_OPTIDMA is not set 747# CONFIG_PATA_OPTIDMA is not set
748# CONFIG_PATA_PDC2027X is not set
712# CONFIG_PATA_PDC_OLD is not set 749# CONFIG_PATA_PDC_OLD is not set
713# CONFIG_PATA_RADISYS is not set 750# CONFIG_PATA_RADISYS is not set
714# CONFIG_PATA_RDC is not set 751# CONFIG_PATA_RDC is not set
715# CONFIG_PATA_RZ1000 is not set 752# CONFIG_PATA_RZ1000 is not set
716# CONFIG_PATA_SC1200 is not set 753# CONFIG_PATA_SC1200 is not set
717# CONFIG_PATA_SERVERWORKS is not set 754# CONFIG_PATA_SERVERWORKS is not set
718# CONFIG_PATA_PDC2027X is not set
719# CONFIG_PATA_SIL680 is not set 755# CONFIG_PATA_SIL680 is not set
720# CONFIG_PATA_SIS is not set 756# CONFIG_PATA_SIS is not set
757# CONFIG_PATA_TOSHIBA is not set
721# CONFIG_PATA_VIA is not set 758# CONFIG_PATA_VIA is not set
722# CONFIG_PATA_WINBOND is not set 759# CONFIG_PATA_WINBOND is not set
723# CONFIG_PATA_PLATFORM is not set 760# CONFIG_PATA_PLATFORM is not set
@@ -744,7 +781,7 @@ CONFIG_MD_RAID1=y
744# 781#
745 782
746# 783#
747# See the help texts for more information. 784# The newer stack is recommended.
748# 785#
749# CONFIG_FIREWIRE is not set 786# CONFIG_FIREWIRE is not set
750# CONFIG_IEEE1394 is not set 787# CONFIG_IEEE1394 is not set
@@ -869,8 +906,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
869# CONFIG_BE2NET is not set 906# CONFIG_BE2NET is not set
870# CONFIG_TR is not set 907# CONFIG_TR is not set
871CONFIG_WLAN=y 908CONFIG_WLAN=y
872# CONFIG_WLAN_PRE80211 is not set 909# CONFIG_AIRO is not set
873# CONFIG_WLAN_80211 is not set 910# CONFIG_ATMEL is not set
911# CONFIG_PRISM54 is not set
912# CONFIG_USB_ZD1201 is not set
913# CONFIG_HOSTAP is not set
874 914
875# 915#
876# Enable WiMAX (Networking options) to see the WiMAX drivers 916# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -893,6 +933,7 @@ CONFIG_WLAN=y
893# CONFIG_NETCONSOLE is not set 933# CONFIG_NETCONSOLE is not set
894# CONFIG_NETPOLL is not set 934# CONFIG_NETPOLL is not set
895# CONFIG_NET_POLL_CONTROLLER is not set 935# CONFIG_NET_POLL_CONTROLLER is not set
936# CONFIG_VMXNET3 is not set
896# CONFIG_ISDN is not set 937# CONFIG_ISDN is not set
897# CONFIG_PHONE is not set 938# CONFIG_PHONE is not set
898 939
@@ -902,6 +943,7 @@ CONFIG_WLAN=y
902CONFIG_INPUT=y 943CONFIG_INPUT=y
903# CONFIG_INPUT_FF_MEMLESS is not set 944# CONFIG_INPUT_FF_MEMLESS is not set
904# CONFIG_INPUT_POLLDEV is not set 945# CONFIG_INPUT_POLLDEV is not set
946# CONFIG_INPUT_SPARSEKMAP is not set
905 947
906# 948#
907# Userland interfaces 949# Userland interfaces
@@ -954,6 +996,7 @@ CONFIG_SERIAL_CORE=y
954CONFIG_SERIAL_CORE_CONSOLE=y 996CONFIG_SERIAL_CORE_CONSOLE=y
955# CONFIG_SERIAL_JSM is not set 997# CONFIG_SERIAL_JSM is not set
956# CONFIG_SERIAL_OF_PLATFORM is not set 998# CONFIG_SERIAL_OF_PLATFORM is not set
999# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
957CONFIG_UNIX98_PTYS=y 1000CONFIG_UNIX98_PTYS=y
958# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1001# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
959CONFIG_LEGACY_PTYS=y 1002CONFIG_LEGACY_PTYS=y
@@ -1011,11 +1054,6 @@ CONFIG_I2C_MPC=y
1011# CONFIG_I2C_TINY_USB is not set 1054# CONFIG_I2C_TINY_USB is not set
1012 1055
1013# 1056#
1014# Graphics adapter I2C/DDC channel drivers
1015#
1016# CONFIG_I2C_VOODOO3 is not set
1017
1018#
1019# Other I2C/SMBus bus drivers 1057# Other I2C/SMBus bus drivers
1020# 1058#
1021# CONFIG_I2C_PCA_PLATFORM is not set 1059# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1024,7 +1062,6 @@ CONFIG_I2C_MPC=y
1024# 1062#
1025# Miscellaneous I2C Chip support 1063# Miscellaneous I2C Chip support
1026# 1064#
1027# CONFIG_DS1682 is not set
1028# CONFIG_SENSORS_TSL2550 is not set 1065# CONFIG_SENSORS_TSL2550 is not set
1029# CONFIG_I2C_DEBUG_CORE is not set 1066# CONFIG_I2C_DEBUG_CORE is not set
1030# CONFIG_I2C_DEBUG_ALGO is not set 1067# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1039,6 +1076,8 @@ CONFIG_SPI_MASTER=y
1039# 1076#
1040CONFIG_SPI_BITBANG=y 1077CONFIG_SPI_BITBANG=y
1041# CONFIG_SPI_MPC8xxx is not set 1078# CONFIG_SPI_MPC8xxx is not set
1079# CONFIG_SPI_XILINX is not set
1080# CONFIG_SPI_DESIGNWARE is not set
1042 1081
1043# 1082#
1044# SPI Protocol Masters 1083# SPI Protocol Masters
@@ -1086,6 +1125,7 @@ CONFIG_HWMON=y
1086# CONFIG_SENSORS_IT87 is not set 1125# CONFIG_SENSORS_IT87 is not set
1087# CONFIG_SENSORS_LM63 is not set 1126# CONFIG_SENSORS_LM63 is not set
1088# CONFIG_SENSORS_LM70 is not set 1127# CONFIG_SENSORS_LM70 is not set
1128# CONFIG_SENSORS_LM73 is not set
1089# CONFIG_SENSORS_LM75 is not set 1129# CONFIG_SENSORS_LM75 is not set
1090# CONFIG_SENSORS_LM77 is not set 1130# CONFIG_SENSORS_LM77 is not set
1091# CONFIG_SENSORS_LM78 is not set 1131# CONFIG_SENSORS_LM78 is not set
@@ -1126,6 +1166,7 @@ CONFIG_HWMON=y
1126# CONFIG_SENSORS_W83627HF is not set 1166# CONFIG_SENSORS_W83627HF is not set
1127# CONFIG_SENSORS_W83627EHF is not set 1167# CONFIG_SENSORS_W83627EHF is not set
1128# CONFIG_SENSORS_LIS3_SPI is not set 1168# CONFIG_SENSORS_LIS3_SPI is not set
1169# CONFIG_SENSORS_LIS3_I2C is not set
1129# CONFIG_THERMAL is not set 1170# CONFIG_THERMAL is not set
1130CONFIG_WATCHDOG=y 1171CONFIG_WATCHDOG=y
1131# CONFIG_WATCHDOG_NOWAYOUT is not set 1172# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1163,6 +1204,7 @@ CONFIG_SSB_POSSIBLE=y
1163# CONFIG_TWL4030_CORE is not set 1204# CONFIG_TWL4030_CORE is not set
1164# CONFIG_MFD_TMIO is not set 1205# CONFIG_MFD_TMIO is not set
1165# CONFIG_PMIC_DA903X is not set 1206# CONFIG_PMIC_DA903X is not set
1207# CONFIG_PMIC_ADP5520 is not set
1166# CONFIG_MFD_WM8400 is not set 1208# CONFIG_MFD_WM8400 is not set
1167# CONFIG_MFD_WM831X is not set 1209# CONFIG_MFD_WM831X is not set
1168# CONFIG_MFD_WM8350_I2C is not set 1210# CONFIG_MFD_WM8350_I2C is not set
@@ -1170,6 +1212,8 @@ CONFIG_SSB_POSSIBLE=y
1170# CONFIG_MFD_MC13783 is not set 1212# CONFIG_MFD_MC13783 is not set
1171# CONFIG_AB3100_CORE is not set 1213# CONFIG_AB3100_CORE is not set
1172# CONFIG_EZX_PCAP is not set 1214# CONFIG_EZX_PCAP is not set
1215# CONFIG_MFD_88PM8607 is not set
1216# CONFIG_AB4500_CORE is not set
1173# CONFIG_REGULATOR is not set 1217# CONFIG_REGULATOR is not set
1174# CONFIG_MEDIA_SUPPORT is not set 1218# CONFIG_MEDIA_SUPPORT is not set
1175 1219
@@ -1237,6 +1281,7 @@ CONFIG_USB_MON=y
1237CONFIG_USB_EHCI_HCD=y 1281CONFIG_USB_EHCI_HCD=y
1238CONFIG_USB_EHCI_ROOT_HUB_TT=y 1282CONFIG_USB_EHCI_ROOT_HUB_TT=y
1239# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1283# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1284# CONFIG_XPS_USB_HCD_XILINX is not set
1240CONFIG_USB_EHCI_FSL=y 1285CONFIG_USB_EHCI_FSL=y
1241CONFIG_USB_EHCI_HCD_PPC_OF=y 1286CONFIG_USB_EHCI_HCD_PPC_OF=y
1242# CONFIG_USB_OXU210HP_HCD is not set 1287# CONFIG_USB_OXU210HP_HCD is not set
@@ -1351,15 +1396,17 @@ CONFIG_USB_NET2280=y
1351CONFIG_USB_GADGET_DUALSPEED=y 1396CONFIG_USB_GADGET_DUALSPEED=y
1352# CONFIG_USB_ZERO is not set 1397# CONFIG_USB_ZERO is not set
1353# CONFIG_USB_AUDIO is not set 1398# CONFIG_USB_AUDIO is not set
1354CONFIG_USB_ETH=y 1399CONFIG_USB_ETH=m
1355CONFIG_USB_ETH_RNDIS=y 1400CONFIG_USB_ETH_RNDIS=y
1356# CONFIG_USB_ETH_EEM is not set 1401# CONFIG_USB_ETH_EEM is not set
1357# CONFIG_USB_GADGETFS is not set 1402# CONFIG_USB_GADGETFS is not set
1358# CONFIG_USB_FILE_STORAGE is not set 1403# CONFIG_USB_FILE_STORAGE is not set
1404# CONFIG_USB_MASS_STORAGE is not set
1359# CONFIG_USB_G_SERIAL is not set 1405# CONFIG_USB_G_SERIAL is not set
1360# CONFIG_USB_MIDI_GADGET is not set 1406# CONFIG_USB_MIDI_GADGET is not set
1361# CONFIG_USB_G_PRINTER is not set 1407# CONFIG_USB_G_PRINTER is not set
1362# CONFIG_USB_CDC_COMPOSITE is not set 1408# CONFIG_USB_CDC_COMPOSITE is not set
1409# CONFIG_USB_G_MULTI is not set
1363 1410
1364# 1411#
1365# OTG and related infrastructure 1412# OTG and related infrastructure
@@ -1400,6 +1447,7 @@ CONFIG_RTC_DRV_DS1307=y
1400# CONFIG_RTC_DRV_PCF8563 is not set 1447# CONFIG_RTC_DRV_PCF8563 is not set
1401# CONFIG_RTC_DRV_PCF8583 is not set 1448# CONFIG_RTC_DRV_PCF8583 is not set
1402# CONFIG_RTC_DRV_M41T80 is not set 1449# CONFIG_RTC_DRV_M41T80 is not set
1450# CONFIG_RTC_DRV_BQ32K is not set
1403# CONFIG_RTC_DRV_S35390A is not set 1451# CONFIG_RTC_DRV_S35390A is not set
1404# CONFIG_RTC_DRV_FM3130 is not set 1452# CONFIG_RTC_DRV_FM3130 is not set
1405# CONFIG_RTC_DRV_RX8581 is not set 1453# CONFIG_RTC_DRV_RX8581 is not set
@@ -1429,7 +1477,9 @@ CONFIG_RTC_DRV_DS1307=y
1429# CONFIG_RTC_DRV_M48T86 is not set 1477# CONFIG_RTC_DRV_M48T86 is not set
1430# CONFIG_RTC_DRV_M48T35 is not set 1478# CONFIG_RTC_DRV_M48T35 is not set
1431# CONFIG_RTC_DRV_M48T59 is not set 1479# CONFIG_RTC_DRV_M48T59 is not set
1480# CONFIG_RTC_DRV_MSM6242 is not set
1432# CONFIG_RTC_DRV_BQ4802 is not set 1481# CONFIG_RTC_DRV_BQ4802 is not set
1482# CONFIG_RTC_DRV_RP5C01 is not set
1433# CONFIG_RTC_DRV_V3020 is not set 1483# CONFIG_RTC_DRV_V3020 is not set
1434 1484
1435# 1485#
@@ -1740,7 +1790,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1740# CONFIG_KEYS is not set 1790# CONFIG_KEYS is not set
1741# CONFIG_SECURITY is not set 1791# CONFIG_SECURITY is not set
1742# CONFIG_SECURITYFS is not set 1792# CONFIG_SECURITYFS is not set
1743# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1793# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1794# CONFIG_DEFAULT_SECURITY_SMACK is not set
1795# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1796CONFIG_DEFAULT_SECURITY_DAC=y
1797CONFIG_DEFAULT_SECURITY=""
1744CONFIG_CRYPTO=y 1798CONFIG_CRYPTO=y
1745 1799
1746# 1800#
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
index 7def83518a6c..0b4262bd4917 100644
--- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:24 2009 4# Wed Jan 6 09:24:17 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 176# IO Schedulers
174# 177#
175CONFIG_IOSCHED_NOOP=y 178CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 179CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 180CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 181# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 182CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 183# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 184CONFIG_DEFAULT_IOSCHED="cfq"
185# CONFIG_INLINE_SPIN_TRYLOCK is not set
186# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK is not set
188# CONFIG_INLINE_SPIN_LOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
191CONFIG_INLINE_SPIN_UNLOCK=y
192# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
193CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
194# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
195# CONFIG_INLINE_READ_TRYLOCK is not set
196# CONFIG_INLINE_READ_LOCK is not set
197# CONFIG_INLINE_READ_LOCK_BH is not set
198# CONFIG_INLINE_READ_LOCK_IRQ is not set
199# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
200CONFIG_INLINE_READ_UNLOCK=y
201# CONFIG_INLINE_READ_UNLOCK_BH is not set
202CONFIG_INLINE_READ_UNLOCK_IRQ=y
203# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_WRITE_TRYLOCK is not set
205# CONFIG_INLINE_WRITE_LOCK is not set
206# CONFIG_INLINE_WRITE_LOCK_BH is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
209CONFIG_INLINE_WRITE_UNLOCK=y
210# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
211CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
212# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
213# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184# CONFIG_FREEZER is not set 214# CONFIG_FREEZER is not set
185 215
186# 216#
@@ -260,6 +290,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
260CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 290CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
261# CONFIG_KEXEC is not set 291# CONFIG_KEXEC is not set
262# CONFIG_CRASH_DUMP is not set 292# CONFIG_CRASH_DUMP is not set
293CONFIG_SPARSE_IRQ=y
263CONFIG_MAX_ACTIVE_REGIONS=32 294CONFIG_MAX_ACTIVE_REGIONS=32
264CONFIG_ARCH_FLATMEM_ENABLE=y 295CONFIG_ARCH_FLATMEM_ENABLE=y
265CONFIG_ARCH_POPULATES_NODE_MAP=y 296CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -276,8 +307,6 @@ CONFIG_MIGRATION=y
276CONFIG_ZONE_DMA_FLAG=1 307CONFIG_ZONE_DMA_FLAG=1
277CONFIG_BOUNCE=y 308CONFIG_BOUNCE=y
278CONFIG_VIRT_TO_BUS=y 309CONFIG_VIRT_TO_BUS=y
279CONFIG_HAVE_MLOCK=y
280CONFIG_HAVE_MLOCKED_PAGE_BIT=y
281# CONFIG_KSM is not set 310# CONFIG_KSM is not set
282CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 311CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
283CONFIG_PPC_4K_PAGES=y 312CONFIG_PPC_4K_PAGES=y
@@ -404,9 +433,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
404# CONFIG_AF_RXRPC is not set 433# CONFIG_AF_RXRPC is not set
405CONFIG_WIRELESS=y 434CONFIG_WIRELESS=y
406# CONFIG_CFG80211 is not set 435# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
408CONFIG_WIRELESS_OLD_REGULATORY=y
409# CONFIG_WIRELESS_EXT is not set
410# CONFIG_LIB80211 is not set 436# CONFIG_LIB80211 is not set
411 437
412# 438#
@@ -444,6 +470,10 @@ CONFIG_BLK_DEV=y
444# CONFIG_BLK_DEV_COW_COMMON is not set 470# CONFIG_BLK_DEV_COW_COMMON is not set
445CONFIG_BLK_DEV_LOOP=y 471CONFIG_BLK_DEV_LOOP=y
446# CONFIG_BLK_DEV_CRYPTOLOOP is not set 472# CONFIG_BLK_DEV_CRYPTOLOOP is not set
473
474#
475# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
476#
447# CONFIG_BLK_DEV_NBD is not set 477# CONFIG_BLK_DEV_NBD is not set
448# CONFIG_BLK_DEV_SX8 is not set 478# CONFIG_BLK_DEV_SX8 is not set
449CONFIG_BLK_DEV_RAM=y 479CONFIG_BLK_DEV_RAM=y
@@ -454,6 +484,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
454# CONFIG_ATA_OVER_ETH is not set 484# CONFIG_ATA_OVER_ETH is not set
455# CONFIG_BLK_DEV_HD is not set 485# CONFIG_BLK_DEV_HD is not set
456CONFIG_MISC_DEVICES=y 486CONFIG_MISC_DEVICES=y
487# CONFIG_AD525X_DPOT is not set
457# CONFIG_PHANTOM is not set 488# CONFIG_PHANTOM is not set
458# CONFIG_SGI_IOC4 is not set 489# CONFIG_SGI_IOC4 is not set
459# CONFIG_TIFM_CORE is not set 490# CONFIG_TIFM_CORE is not set
@@ -461,6 +492,7 @@ CONFIG_MISC_DEVICES=y
461# CONFIG_ENCLOSURE_SERVICES is not set 492# CONFIG_ENCLOSURE_SERVICES is not set
462# CONFIG_HP_ILO is not set 493# CONFIG_HP_ILO is not set
463# CONFIG_ISL29003 is not set 494# CONFIG_ISL29003 is not set
495# CONFIG_DS1682 is not set
464# CONFIG_C2PORT is not set 496# CONFIG_C2PORT is not set
465 497
466# 498#
@@ -513,7 +545,9 @@ CONFIG_SCSI_LOWLEVEL=y
513# CONFIG_SCSI_BNX2_ISCSI is not set 545# CONFIG_SCSI_BNX2_ISCSI is not set
514# CONFIG_BE2ISCSI is not set 546# CONFIG_BE2ISCSI is not set
515# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 547# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
548# CONFIG_SCSI_HPSA is not set
516# CONFIG_SCSI_3W_9XXX is not set 549# CONFIG_SCSI_3W_9XXX is not set
550# CONFIG_SCSI_3W_SAS is not set
517# CONFIG_SCSI_ACARD is not set 551# CONFIG_SCSI_ACARD is not set
518# CONFIG_SCSI_AACRAID is not set 552# CONFIG_SCSI_AACRAID is not set
519# CONFIG_SCSI_AIC7XXX is not set 553# CONFIG_SCSI_AIC7XXX is not set
@@ -551,6 +585,7 @@ CONFIG_SCSI_LOWLEVEL=y
551# CONFIG_SCSI_NSP32 is not set 585# CONFIG_SCSI_NSP32 is not set
552# CONFIG_SCSI_DEBUG is not set 586# CONFIG_SCSI_DEBUG is not set
553# CONFIG_SCSI_PMCRAID is not set 587# CONFIG_SCSI_PMCRAID is not set
588# CONFIG_SCSI_PM8001 is not set
554# CONFIG_SCSI_SRP is not set 589# CONFIG_SCSI_SRP is not set
555# CONFIG_SCSI_BFA_FC is not set 590# CONFIG_SCSI_BFA_FC is not set
556# CONFIG_SCSI_DH is not set 591# CONFIG_SCSI_DH is not set
@@ -568,7 +603,7 @@ CONFIG_SCSI_LOWLEVEL=y
568# 603#
569 604
570# 605#
571# See the help texts for more information. 606# The newer stack is recommended.
572# 607#
573# CONFIG_FIREWIRE is not set 608# CONFIG_FIREWIRE is not set
574# CONFIG_IEEE1394 is not set 609# CONFIG_IEEE1394 is not set
@@ -675,8 +710,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
675# CONFIG_BE2NET is not set 710# CONFIG_BE2NET is not set
676# CONFIG_TR is not set 711# CONFIG_TR is not set
677CONFIG_WLAN=y 712CONFIG_WLAN=y
678# CONFIG_WLAN_PRE80211 is not set 713# CONFIG_AIRO is not set
679# CONFIG_WLAN_80211 is not set 714# CONFIG_ATMEL is not set
715# CONFIG_PRISM54 is not set
716# CONFIG_HOSTAP is not set
680 717
681# 718#
682# Enable WiMAX (Networking options) to see the WiMAX drivers 719# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -690,6 +727,7 @@ CONFIG_WLAN=y
690# CONFIG_NETCONSOLE is not set 727# CONFIG_NETCONSOLE is not set
691# CONFIG_NETPOLL is not set 728# CONFIG_NETPOLL is not set
692# CONFIG_NET_POLL_CONTROLLER is not set 729# CONFIG_NET_POLL_CONTROLLER is not set
730# CONFIG_VMXNET3 is not set
693# CONFIG_ISDN is not set 731# CONFIG_ISDN is not set
694# CONFIG_PHONE is not set 732# CONFIG_PHONE is not set
695 733
@@ -699,6 +737,7 @@ CONFIG_WLAN=y
699CONFIG_INPUT=y 737CONFIG_INPUT=y
700# CONFIG_INPUT_FF_MEMLESS is not set 738# CONFIG_INPUT_FF_MEMLESS is not set
701# CONFIG_INPUT_POLLDEV is not set 739# CONFIG_INPUT_POLLDEV is not set
740# CONFIG_INPUT_SPARSEKMAP is not set
702 741
703# 742#
704# Userland interfaces 743# Userland interfaces
@@ -751,6 +790,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
751# CONFIG_SERIAL_JSM is not set 790# CONFIG_SERIAL_JSM is not set
752# CONFIG_SERIAL_OF_PLATFORM is not set 791# CONFIG_SERIAL_OF_PLATFORM is not set
753# CONFIG_SERIAL_QE is not set 792# CONFIG_SERIAL_QE is not set
793# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
754CONFIG_UNIX98_PTYS=y 794CONFIG_UNIX98_PTYS=y
755# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 795# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
756CONFIG_LEGACY_PTYS=y 796CONFIG_LEGACY_PTYS=y
@@ -807,11 +847,6 @@ CONFIG_I2C_MPC=y
807# CONFIG_I2C_TAOS_EVM is not set 847# CONFIG_I2C_TAOS_EVM is not set
808 848
809# 849#
810# Graphics adapter I2C/DDC channel drivers
811#
812# CONFIG_I2C_VOODOO3 is not set
813
814#
815# Other I2C/SMBus bus drivers 850# Other I2C/SMBus bus drivers
816# 851#
817# CONFIG_I2C_PCA_PLATFORM is not set 852# CONFIG_I2C_PCA_PLATFORM is not set
@@ -820,7 +855,6 @@ CONFIG_I2C_MPC=y
820# 855#
821# Miscellaneous I2C Chip support 856# Miscellaneous I2C Chip support
822# 857#
823# CONFIG_DS1682 is not set
824# CONFIG_SENSORS_TSL2550 is not set 858# CONFIG_SENSORS_TSL2550 is not set
825# CONFIG_I2C_DEBUG_CORE is not set 859# CONFIG_I2C_DEBUG_CORE is not set
826# CONFIG_I2C_DEBUG_ALGO is not set 860# CONFIG_I2C_DEBUG_ALGO is not set
@@ -866,6 +900,7 @@ CONFIG_HWMON=y
866# CONFIG_SENSORS_GL520SM is not set 900# CONFIG_SENSORS_GL520SM is not set
867# CONFIG_SENSORS_IT87 is not set 901# CONFIG_SENSORS_IT87 is not set
868# CONFIG_SENSORS_LM63 is not set 902# CONFIG_SENSORS_LM63 is not set
903# CONFIG_SENSORS_LM73 is not set
869# CONFIG_SENSORS_LM75 is not set 904# CONFIG_SENSORS_LM75 is not set
870# CONFIG_SENSORS_LM77 is not set 905# CONFIG_SENSORS_LM77 is not set
871# CONFIG_SENSORS_LM78 is not set 906# CONFIG_SENSORS_LM78 is not set
@@ -904,6 +939,7 @@ CONFIG_HWMON=y
904# CONFIG_SENSORS_W83L786NG is not set 939# CONFIG_SENSORS_W83L786NG is not set
905# CONFIG_SENSORS_W83627HF is not set 940# CONFIG_SENSORS_W83627HF is not set
906# CONFIG_SENSORS_W83627EHF is not set 941# CONFIG_SENSORS_W83627EHF is not set
942# CONFIG_SENSORS_LIS3_I2C is not set
907# CONFIG_THERMAL is not set 943# CONFIG_THERMAL is not set
908CONFIG_WATCHDOG=y 944CONFIG_WATCHDOG=y
909# CONFIG_WATCHDOG_NOWAYOUT is not set 945# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -936,11 +972,13 @@ CONFIG_SSB_POSSIBLE=y
936# CONFIG_TWL4030_CORE is not set 972# CONFIG_TWL4030_CORE is not set
937# CONFIG_MFD_TMIO is not set 973# CONFIG_MFD_TMIO is not set
938# CONFIG_PMIC_DA903X is not set 974# CONFIG_PMIC_DA903X is not set
975# CONFIG_PMIC_ADP5520 is not set
939# CONFIG_MFD_WM8400 is not set 976# CONFIG_MFD_WM8400 is not set
940# CONFIG_MFD_WM831X is not set 977# CONFIG_MFD_WM831X is not set
941# CONFIG_MFD_WM8350_I2C is not set 978# CONFIG_MFD_WM8350_I2C is not set
942# CONFIG_MFD_PCF50633 is not set 979# CONFIG_MFD_PCF50633 is not set
943# CONFIG_AB3100_CORE is not set 980# CONFIG_AB3100_CORE is not set
981# CONFIG_MFD_88PM8607 is not set
944# CONFIG_REGULATOR is not set 982# CONFIG_REGULATOR is not set
945# CONFIG_MEDIA_SUPPORT is not set 983# CONFIG_MEDIA_SUPPORT is not set
946 984
@@ -1023,6 +1061,7 @@ CONFIG_RTC_DRV_DS1374=y
1023# CONFIG_RTC_DRV_PCF8563 is not set 1061# CONFIG_RTC_DRV_PCF8563 is not set
1024# CONFIG_RTC_DRV_PCF8583 is not set 1062# CONFIG_RTC_DRV_PCF8583 is not set
1025# CONFIG_RTC_DRV_M41T80 is not set 1063# CONFIG_RTC_DRV_M41T80 is not set
1064# CONFIG_RTC_DRV_BQ32K is not set
1026# CONFIG_RTC_DRV_S35390A is not set 1065# CONFIG_RTC_DRV_S35390A is not set
1027# CONFIG_RTC_DRV_FM3130 is not set 1066# CONFIG_RTC_DRV_FM3130 is not set
1028# CONFIG_RTC_DRV_RX8581 is not set 1067# CONFIG_RTC_DRV_RX8581 is not set
@@ -1044,7 +1083,9 @@ CONFIG_RTC_DRV_DS1374=y
1044# CONFIG_RTC_DRV_M48T86 is not set 1083# CONFIG_RTC_DRV_M48T86 is not set
1045# CONFIG_RTC_DRV_M48T35 is not set 1084# CONFIG_RTC_DRV_M48T35 is not set
1046# CONFIG_RTC_DRV_M48T59 is not set 1085# CONFIG_RTC_DRV_M48T59 is not set
1086# CONFIG_RTC_DRV_MSM6242 is not set
1047# CONFIG_RTC_DRV_BQ4802 is not set 1087# CONFIG_RTC_DRV_BQ4802 is not set
1088# CONFIG_RTC_DRV_RP5C01 is not set
1048# CONFIG_RTC_DRV_V3020 is not set 1089# CONFIG_RTC_DRV_V3020 is not set
1049 1090
1050# 1091#
@@ -1220,7 +1261,7 @@ CONFIG_FRAME_WARN=1024
1220# CONFIG_DEBUG_KERNEL is not set 1261# CONFIG_DEBUG_KERNEL is not set
1221# CONFIG_SLUB_DEBUG_ON is not set 1262# CONFIG_SLUB_DEBUG_ON is not set
1222# CONFIG_SLUB_STATS is not set 1263# CONFIG_SLUB_STATS is not set
1223# CONFIG_DEBUG_BUGVERBOSE is not set 1264CONFIG_DEBUG_BUGVERBOSE=y
1224# CONFIG_DEBUG_MEMORY_INIT is not set 1265# CONFIG_DEBUG_MEMORY_INIT is not set
1225# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1266# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1226# CONFIG_LATENCYTOP is not set 1267# CONFIG_LATENCYTOP is not set
@@ -1247,7 +1288,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1247# CONFIG_KEYS is not set 1288# CONFIG_KEYS is not set
1248# CONFIG_SECURITY is not set 1289# CONFIG_SECURITY is not set
1249# CONFIG_SECURITYFS is not set 1290# CONFIG_SECURITYFS is not set
1250# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1291# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1292# CONFIG_DEFAULT_SECURITY_SMACK is not set
1293# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1294CONFIG_DEFAULT_SECURITY_DAC=y
1295CONFIG_DEFAULT_SECURITY=""
1251CONFIG_CRYPTO=y 1296CONFIG_CRYPTO=y
1252 1297
1253# 1298#
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
index b398b9b2b635..155af009f7b5 100644
--- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:24 2009 4# Wed Jan 6 09:24:18 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 176# IO Schedulers
174# 177#
175CONFIG_IOSCHED_NOOP=y 178CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 179CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 180CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 181# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 182CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 183# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 184CONFIG_DEFAULT_IOSCHED="cfq"
185# CONFIG_INLINE_SPIN_TRYLOCK is not set
186# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK is not set
188# CONFIG_INLINE_SPIN_LOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
191CONFIG_INLINE_SPIN_UNLOCK=y
192# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
193CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
194# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
195# CONFIG_INLINE_READ_TRYLOCK is not set
196# CONFIG_INLINE_READ_LOCK is not set
197# CONFIG_INLINE_READ_LOCK_BH is not set
198# CONFIG_INLINE_READ_LOCK_IRQ is not set
199# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
200CONFIG_INLINE_READ_UNLOCK=y
201# CONFIG_INLINE_READ_UNLOCK_BH is not set
202CONFIG_INLINE_READ_UNLOCK_IRQ=y
203# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_WRITE_TRYLOCK is not set
205# CONFIG_INLINE_WRITE_LOCK is not set
206# CONFIG_INLINE_WRITE_LOCK_BH is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
209CONFIG_INLINE_WRITE_UNLOCK=y
210# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
211CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
212# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
213# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184# CONFIG_FREEZER is not set 214# CONFIG_FREEZER is not set
185 215
186# 216#
@@ -260,6 +290,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
260CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 290CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
261# CONFIG_KEXEC is not set 291# CONFIG_KEXEC is not set
262# CONFIG_CRASH_DUMP is not set 292# CONFIG_CRASH_DUMP is not set
293CONFIG_SPARSE_IRQ=y
263CONFIG_MAX_ACTIVE_REGIONS=32 294CONFIG_MAX_ACTIVE_REGIONS=32
264CONFIG_ARCH_FLATMEM_ENABLE=y 295CONFIG_ARCH_FLATMEM_ENABLE=y
265CONFIG_ARCH_POPULATES_NODE_MAP=y 296CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -276,8 +307,6 @@ CONFIG_MIGRATION=y
276CONFIG_ZONE_DMA_FLAG=1 307CONFIG_ZONE_DMA_FLAG=1
277CONFIG_BOUNCE=y 308CONFIG_BOUNCE=y
278CONFIG_VIRT_TO_BUS=y 309CONFIG_VIRT_TO_BUS=y
279CONFIG_HAVE_MLOCK=y
280CONFIG_HAVE_MLOCKED_PAGE_BIT=y
281# CONFIG_KSM is not set 310# CONFIG_KSM is not set
282CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 311CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
283CONFIG_PPC_4K_PAGES=y 312CONFIG_PPC_4K_PAGES=y
@@ -404,9 +433,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
404# CONFIG_AF_RXRPC is not set 433# CONFIG_AF_RXRPC is not set
405CONFIG_WIRELESS=y 434CONFIG_WIRELESS=y
406# CONFIG_CFG80211 is not set 435# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
408CONFIG_WIRELESS_OLD_REGULATORY=y
409# CONFIG_WIRELESS_EXT is not set
410# CONFIG_LIB80211 is not set 436# CONFIG_LIB80211 is not set
411 437
412# 438#
@@ -445,6 +471,10 @@ CONFIG_BLK_DEV=y
445# CONFIG_BLK_DEV_COW_COMMON is not set 471# CONFIG_BLK_DEV_COW_COMMON is not set
446CONFIG_BLK_DEV_LOOP=y 472CONFIG_BLK_DEV_LOOP=y
447# CONFIG_BLK_DEV_CRYPTOLOOP is not set 473# CONFIG_BLK_DEV_CRYPTOLOOP is not set
474
475#
476# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
477#
448# CONFIG_BLK_DEV_NBD is not set 478# CONFIG_BLK_DEV_NBD is not set
449# CONFIG_BLK_DEV_SX8 is not set 479# CONFIG_BLK_DEV_SX8 is not set
450# CONFIG_BLK_DEV_UB is not set 480# CONFIG_BLK_DEV_UB is not set
@@ -456,6 +486,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
456# CONFIG_ATA_OVER_ETH is not set 486# CONFIG_ATA_OVER_ETH is not set
457# CONFIG_BLK_DEV_HD is not set 487# CONFIG_BLK_DEV_HD is not set
458CONFIG_MISC_DEVICES=y 488CONFIG_MISC_DEVICES=y
489# CONFIG_AD525X_DPOT is not set
459# CONFIG_PHANTOM is not set 490# CONFIG_PHANTOM is not set
460# CONFIG_SGI_IOC4 is not set 491# CONFIG_SGI_IOC4 is not set
461# CONFIG_TIFM_CORE is not set 492# CONFIG_TIFM_CORE is not set
@@ -463,6 +494,8 @@ CONFIG_MISC_DEVICES=y
463# CONFIG_ENCLOSURE_SERVICES is not set 494# CONFIG_ENCLOSURE_SERVICES is not set
464# CONFIG_HP_ILO is not set 495# CONFIG_HP_ILO is not set
465# CONFIG_ISL29003 is not set 496# CONFIG_ISL29003 is not set
497# CONFIG_DS1682 is not set
498# CONFIG_TI_DAC7512 is not set
466# CONFIG_C2PORT is not set 499# CONFIG_C2PORT is not set
467 500
468# 501#
@@ -474,6 +507,7 @@ CONFIG_MISC_DEVICES=y
474# CONFIG_EEPROM_MAX6875 is not set 507# CONFIG_EEPROM_MAX6875 is not set
475# CONFIG_EEPROM_93CX6 is not set 508# CONFIG_EEPROM_93CX6 is not set
476# CONFIG_CB710_CORE is not set 509# CONFIG_CB710_CORE is not set
510# CONFIG_IWMC3200TOP is not set
477CONFIG_HAVE_IDE=y 511CONFIG_HAVE_IDE=y
478# CONFIG_IDE is not set 512# CONFIG_IDE is not set
479 513
@@ -516,7 +550,9 @@ CONFIG_SCSI_LOWLEVEL=y
516# CONFIG_SCSI_BNX2_ISCSI is not set 550# CONFIG_SCSI_BNX2_ISCSI is not set
517# CONFIG_BE2ISCSI is not set 551# CONFIG_BE2ISCSI is not set
518# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 552# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
553# CONFIG_SCSI_HPSA is not set
519# CONFIG_SCSI_3W_9XXX is not set 554# CONFIG_SCSI_3W_9XXX is not set
555# CONFIG_SCSI_3W_SAS is not set
520# CONFIG_SCSI_ACARD is not set 556# CONFIG_SCSI_ACARD is not set
521# CONFIG_SCSI_AACRAID is not set 557# CONFIG_SCSI_AACRAID is not set
522# CONFIG_SCSI_AIC7XXX is not set 558# CONFIG_SCSI_AIC7XXX is not set
@@ -554,6 +590,7 @@ CONFIG_SCSI_LOWLEVEL=y
554# CONFIG_SCSI_NSP32 is not set 590# CONFIG_SCSI_NSP32 is not set
555# CONFIG_SCSI_DEBUG is not set 591# CONFIG_SCSI_DEBUG is not set
556# CONFIG_SCSI_PMCRAID is not set 592# CONFIG_SCSI_PMCRAID is not set
593# CONFIG_SCSI_PM8001 is not set
557# CONFIG_SCSI_SRP is not set 594# CONFIG_SCSI_SRP is not set
558# CONFIG_SCSI_BFA_FC is not set 595# CONFIG_SCSI_BFA_FC is not set
559# CONFIG_SCSI_DH is not set 596# CONFIG_SCSI_DH is not set
@@ -571,7 +608,7 @@ CONFIG_SCSI_LOWLEVEL=y
571# 608#
572 609
573# 610#
574# See the help texts for more information. 611# The newer stack is recommended.
575# 612#
576# CONFIG_FIREWIRE is not set 613# CONFIG_FIREWIRE is not set
577# CONFIG_IEEE1394 is not set 614# CONFIG_IEEE1394 is not set
@@ -680,8 +717,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
680# CONFIG_BE2NET is not set 717# CONFIG_BE2NET is not set
681# CONFIG_TR is not set 718# CONFIG_TR is not set
682CONFIG_WLAN=y 719CONFIG_WLAN=y
683# CONFIG_WLAN_PRE80211 is not set 720# CONFIG_AIRO is not set
684# CONFIG_WLAN_80211 is not set 721# CONFIG_ATMEL is not set
722# CONFIG_PRISM54 is not set
723# CONFIG_USB_ZD1201 is not set
724# CONFIG_HOSTAP is not set
685 725
686# 726#
687# Enable WiMAX (Networking options) to see the WiMAX drivers 727# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -704,6 +744,7 @@ CONFIG_WLAN=y
704# CONFIG_NETCONSOLE is not set 744# CONFIG_NETCONSOLE is not set
705# CONFIG_NETPOLL is not set 745# CONFIG_NETPOLL is not set
706# CONFIG_NET_POLL_CONTROLLER is not set 746# CONFIG_NET_POLL_CONTROLLER is not set
747# CONFIG_VMXNET3 is not set
707# CONFIG_ISDN is not set 748# CONFIG_ISDN is not set
708# CONFIG_PHONE is not set 749# CONFIG_PHONE is not set
709 750
@@ -713,6 +754,7 @@ CONFIG_WLAN=y
713CONFIG_INPUT=y 754CONFIG_INPUT=y
714# CONFIG_INPUT_FF_MEMLESS is not set 755# CONFIG_INPUT_FF_MEMLESS is not set
715# CONFIG_INPUT_POLLDEV is not set 756# CONFIG_INPUT_POLLDEV is not set
757# CONFIG_INPUT_SPARSEKMAP is not set
716 758
717# 759#
718# Userland interfaces 760# Userland interfaces
@@ -766,6 +808,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
766# CONFIG_SERIAL_JSM is not set 808# CONFIG_SERIAL_JSM is not set
767# CONFIG_SERIAL_OF_PLATFORM is not set 809# CONFIG_SERIAL_OF_PLATFORM is not set
768# CONFIG_SERIAL_QE is not set 810# CONFIG_SERIAL_QE is not set
811# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
769CONFIG_UNIX98_PTYS=y 812CONFIG_UNIX98_PTYS=y
770# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 813# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
771CONFIG_LEGACY_PTYS=y 814CONFIG_LEGACY_PTYS=y
@@ -825,11 +868,6 @@ CONFIG_I2C_MPC=y
825# CONFIG_I2C_TINY_USB is not set 868# CONFIG_I2C_TINY_USB is not set
826 869
827# 870#
828# Graphics adapter I2C/DDC channel drivers
829#
830# CONFIG_I2C_VOODOO3 is not set
831
832#
833# Other I2C/SMBus bus drivers 871# Other I2C/SMBus bus drivers
834# 872#
835# CONFIG_I2C_PCA_PLATFORM is not set 873# CONFIG_I2C_PCA_PLATFORM is not set
@@ -838,7 +876,6 @@ CONFIG_I2C_MPC=y
838# 876#
839# Miscellaneous I2C Chip support 877# Miscellaneous I2C Chip support
840# 878#
841# CONFIG_DS1682 is not set
842# CONFIG_SENSORS_TSL2550 is not set 879# CONFIG_SENSORS_TSL2550 is not set
843# CONFIG_I2C_DEBUG_CORE is not set 880# CONFIG_I2C_DEBUG_CORE is not set
844# CONFIG_I2C_DEBUG_ALGO is not set 881# CONFIG_I2C_DEBUG_ALGO is not set
@@ -852,6 +889,8 @@ CONFIG_SPI_MASTER=y
852# 889#
853CONFIG_SPI_BITBANG=y 890CONFIG_SPI_BITBANG=y
854# CONFIG_SPI_MPC8xxx is not set 891# CONFIG_SPI_MPC8xxx is not set
892# CONFIG_SPI_XILINX is not set
893# CONFIG_SPI_DESIGNWARE is not set
855 894
856# 895#
857# SPI Protocol Masters 896# SPI Protocol Masters
@@ -899,6 +938,7 @@ CONFIG_HWMON=y
899# CONFIG_SENSORS_IT87 is not set 938# CONFIG_SENSORS_IT87 is not set
900# CONFIG_SENSORS_LM63 is not set 939# CONFIG_SENSORS_LM63 is not set
901# CONFIG_SENSORS_LM70 is not set 940# CONFIG_SENSORS_LM70 is not set
941# CONFIG_SENSORS_LM73 is not set
902# CONFIG_SENSORS_LM75 is not set 942# CONFIG_SENSORS_LM75 is not set
903# CONFIG_SENSORS_LM77 is not set 943# CONFIG_SENSORS_LM77 is not set
904# CONFIG_SENSORS_LM78 is not set 944# CONFIG_SENSORS_LM78 is not set
@@ -939,6 +979,7 @@ CONFIG_HWMON=y
939# CONFIG_SENSORS_W83627HF is not set 979# CONFIG_SENSORS_W83627HF is not set
940# CONFIG_SENSORS_W83627EHF is not set 980# CONFIG_SENSORS_W83627EHF is not set
941# CONFIG_SENSORS_LIS3_SPI is not set 981# CONFIG_SENSORS_LIS3_SPI is not set
982# CONFIG_SENSORS_LIS3_I2C is not set
942# CONFIG_THERMAL is not set 983# CONFIG_THERMAL is not set
943CONFIG_WATCHDOG=y 984CONFIG_WATCHDOG=y
944# CONFIG_WATCHDOG_NOWAYOUT is not set 985# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -976,6 +1017,7 @@ CONFIG_SSB_POSSIBLE=y
976# CONFIG_TWL4030_CORE is not set 1017# CONFIG_TWL4030_CORE is not set
977# CONFIG_MFD_TMIO is not set 1018# CONFIG_MFD_TMIO is not set
978# CONFIG_PMIC_DA903X is not set 1019# CONFIG_PMIC_DA903X is not set
1020# CONFIG_PMIC_ADP5520 is not set
979# CONFIG_MFD_WM8400 is not set 1021# CONFIG_MFD_WM8400 is not set
980# CONFIG_MFD_WM831X is not set 1022# CONFIG_MFD_WM831X is not set
981# CONFIG_MFD_WM8350_I2C is not set 1023# CONFIG_MFD_WM8350_I2C is not set
@@ -983,6 +1025,8 @@ CONFIG_SSB_POSSIBLE=y
983# CONFIG_MFD_MC13783 is not set 1025# CONFIG_MFD_MC13783 is not set
984# CONFIG_AB3100_CORE is not set 1026# CONFIG_AB3100_CORE is not set
985# CONFIG_EZX_PCAP is not set 1027# CONFIG_EZX_PCAP is not set
1028# CONFIG_MFD_88PM8607 is not set
1029# CONFIG_AB4500_CORE is not set
986# CONFIG_REGULATOR is not set 1030# CONFIG_REGULATOR is not set
987# CONFIG_MEDIA_SUPPORT is not set 1031# CONFIG_MEDIA_SUPPORT is not set
988 1032
@@ -1050,6 +1094,7 @@ CONFIG_USB_MON=y
1050CONFIG_USB_EHCI_HCD=y 1094CONFIG_USB_EHCI_HCD=y
1051# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1095# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1052# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1096# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1097# CONFIG_XPS_USB_HCD_XILINX is not set
1053# CONFIG_USB_EHCI_FSL is not set 1098# CONFIG_USB_EHCI_FSL is not set
1054CONFIG_USB_EHCI_HCD_PPC_OF=y 1099CONFIG_USB_EHCI_HCD_PPC_OF=y
1055# CONFIG_USB_OXU210HP_HCD is not set 1100# CONFIG_USB_OXU210HP_HCD is not set
@@ -1387,7 +1432,7 @@ CONFIG_FRAME_WARN=1024
1387# CONFIG_DEBUG_KERNEL is not set 1432# CONFIG_DEBUG_KERNEL is not set
1388# CONFIG_SLUB_DEBUG_ON is not set 1433# CONFIG_SLUB_DEBUG_ON is not set
1389# CONFIG_SLUB_STATS is not set 1434# CONFIG_SLUB_STATS is not set
1390# CONFIG_DEBUG_BUGVERBOSE is not set 1435CONFIG_DEBUG_BUGVERBOSE=y
1391# CONFIG_DEBUG_MEMORY_INIT is not set 1436# CONFIG_DEBUG_MEMORY_INIT is not set
1392# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1437# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1393# CONFIG_LATENCYTOP is not set 1438# CONFIG_LATENCYTOP is not set
@@ -1414,7 +1459,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1414# CONFIG_KEYS is not set 1459# CONFIG_KEYS is not set
1415# CONFIG_SECURITY is not set 1460# CONFIG_SECURITY is not set
1416# CONFIG_SECURITYFS is not set 1461# CONFIG_SECURITYFS is not set
1417# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1462# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1463# CONFIG_DEFAULT_SECURITY_SMACK is not set
1464# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1465CONFIG_DEFAULT_SECURITY_DAC=y
1466CONFIG_DEFAULT_SECURITY=""
1418CONFIG_CRYPTO=y 1467CONFIG_CRYPTO=y
1419 1468
1420# 1469#
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
index f67317e1934c..ff45f4904488 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:25 2009 4# Wed Jan 6 09:24:19 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 176# IO Schedulers
174# 177#
175CONFIG_IOSCHED_NOOP=y 178CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 179CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 180CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 181# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 182CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 183# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 184CONFIG_DEFAULT_IOSCHED="cfq"
185# CONFIG_INLINE_SPIN_TRYLOCK is not set
186# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK is not set
188# CONFIG_INLINE_SPIN_LOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
191CONFIG_INLINE_SPIN_UNLOCK=y
192# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
193CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
194# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
195# CONFIG_INLINE_READ_TRYLOCK is not set
196# CONFIG_INLINE_READ_LOCK is not set
197# CONFIG_INLINE_READ_LOCK_BH is not set
198# CONFIG_INLINE_READ_LOCK_IRQ is not set
199# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
200CONFIG_INLINE_READ_UNLOCK=y
201# CONFIG_INLINE_READ_UNLOCK_BH is not set
202CONFIG_INLINE_READ_UNLOCK_IRQ=y
203# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_WRITE_TRYLOCK is not set
205# CONFIG_INLINE_WRITE_LOCK is not set
206# CONFIG_INLINE_WRITE_LOCK_BH is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
209CONFIG_INLINE_WRITE_UNLOCK=y
210# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
211CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
212# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
213# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184# CONFIG_FREEZER is not set 214# CONFIG_FREEZER is not set
185 215
186# 216#
@@ -259,6 +289,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 289CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 290# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
292CONFIG_SPARSE_IRQ=y
262CONFIG_MAX_ACTIVE_REGIONS=32 293CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 295CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -275,8 +306,6 @@ CONFIG_MIGRATION=y
275CONFIG_ZONE_DMA_FLAG=1 306CONFIG_ZONE_DMA_FLAG=1
276CONFIG_BOUNCE=y 307CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 308CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set 309# CONFIG_KSM is not set
281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 310CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
282CONFIG_PPC_4K_PAGES=y 311CONFIG_PPC_4K_PAGES=y
@@ -403,9 +432,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
403# CONFIG_AF_RXRPC is not set 432# CONFIG_AF_RXRPC is not set
404CONFIG_WIRELESS=y 433CONFIG_WIRELESS=y
405# CONFIG_CFG80211 is not set 434# CONFIG_CFG80211 is not set
406CONFIG_CFG80211_DEFAULT_PS_VALUE=0
407CONFIG_WIRELESS_OLD_REGULATORY=y
408# CONFIG_WIRELESS_EXT is not set
409# CONFIG_LIB80211 is not set 435# CONFIG_LIB80211 is not set
410 436
411# 437#
@@ -528,6 +554,10 @@ CONFIG_BLK_DEV=y
528# CONFIG_BLK_DEV_COW_COMMON is not set 554# CONFIG_BLK_DEV_COW_COMMON is not set
529CONFIG_BLK_DEV_LOOP=y 555CONFIG_BLK_DEV_LOOP=y
530# CONFIG_BLK_DEV_CRYPTOLOOP is not set 556# CONFIG_BLK_DEV_CRYPTOLOOP is not set
557
558#
559# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
560#
531# CONFIG_BLK_DEV_NBD is not set 561# CONFIG_BLK_DEV_NBD is not set
532# CONFIG_BLK_DEV_SX8 is not set 562# CONFIG_BLK_DEV_SX8 is not set
533# CONFIG_BLK_DEV_UB is not set 563# CONFIG_BLK_DEV_UB is not set
@@ -539,6 +569,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
539# CONFIG_ATA_OVER_ETH is not set 569# CONFIG_ATA_OVER_ETH is not set
540# CONFIG_BLK_DEV_HD is not set 570# CONFIG_BLK_DEV_HD is not set
541CONFIG_MISC_DEVICES=y 571CONFIG_MISC_DEVICES=y
572# CONFIG_AD525X_DPOT is not set
542# CONFIG_PHANTOM is not set 573# CONFIG_PHANTOM is not set
543# CONFIG_SGI_IOC4 is not set 574# CONFIG_SGI_IOC4 is not set
544# CONFIG_TIFM_CORE is not set 575# CONFIG_TIFM_CORE is not set
@@ -546,6 +577,8 @@ CONFIG_MISC_DEVICES=y
546# CONFIG_ENCLOSURE_SERVICES is not set 577# CONFIG_ENCLOSURE_SERVICES is not set
547# CONFIG_HP_ILO is not set 578# CONFIG_HP_ILO is not set
548# CONFIG_ISL29003 is not set 579# CONFIG_ISL29003 is not set
580# CONFIG_DS1682 is not set
581# CONFIG_TI_DAC7512 is not set
549# CONFIG_C2PORT is not set 582# CONFIG_C2PORT is not set
550 583
551# 584#
@@ -647,7 +680,9 @@ CONFIG_SCSI_LOWLEVEL=y
647# CONFIG_SCSI_BNX2_ISCSI is not set 680# CONFIG_SCSI_BNX2_ISCSI is not set
648# CONFIG_BE2ISCSI is not set 681# CONFIG_BE2ISCSI is not set
649# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 682# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
683# CONFIG_SCSI_HPSA is not set
650# CONFIG_SCSI_3W_9XXX is not set 684# CONFIG_SCSI_3W_9XXX is not set
685# CONFIG_SCSI_3W_SAS is not set
651# CONFIG_SCSI_ACARD is not set 686# CONFIG_SCSI_ACARD is not set
652# CONFIG_SCSI_AACRAID is not set 687# CONFIG_SCSI_AACRAID is not set
653# CONFIG_SCSI_AIC7XXX is not set 688# CONFIG_SCSI_AIC7XXX is not set
@@ -686,6 +721,7 @@ CONFIG_SCSI_LOWLEVEL=y
686# CONFIG_SCSI_NSP32 is not set 721# CONFIG_SCSI_NSP32 is not set
687# CONFIG_SCSI_DEBUG is not set 722# CONFIG_SCSI_DEBUG is not set
688# CONFIG_SCSI_PMCRAID is not set 723# CONFIG_SCSI_PMCRAID is not set
724# CONFIG_SCSI_PM8001 is not set
689# CONFIG_SCSI_SRP is not set 725# CONFIG_SCSI_SRP is not set
690# CONFIG_SCSI_BFA_FC is not set 726# CONFIG_SCSI_BFA_FC is not set
691# CONFIG_SCSI_DH is not set 727# CONFIG_SCSI_DH is not set
@@ -741,15 +777,16 @@ CONFIG_SATA_SIL=y
741# CONFIG_PATA_NS87415 is not set 777# CONFIG_PATA_NS87415 is not set
742# CONFIG_PATA_OPTI is not set 778# CONFIG_PATA_OPTI is not set
743# CONFIG_PATA_OPTIDMA is not set 779# CONFIG_PATA_OPTIDMA is not set
780# CONFIG_PATA_PDC2027X is not set
744# CONFIG_PATA_PDC_OLD is not set 781# CONFIG_PATA_PDC_OLD is not set
745# CONFIG_PATA_RADISYS is not set 782# CONFIG_PATA_RADISYS is not set
746# CONFIG_PATA_RDC is not set 783# CONFIG_PATA_RDC is not set
747# CONFIG_PATA_RZ1000 is not set 784# CONFIG_PATA_RZ1000 is not set
748# CONFIG_PATA_SC1200 is not set 785# CONFIG_PATA_SC1200 is not set
749# CONFIG_PATA_SERVERWORKS is not set 786# CONFIG_PATA_SERVERWORKS is not set
750# CONFIG_PATA_PDC2027X is not set
751# CONFIG_PATA_SIL680 is not set 787# CONFIG_PATA_SIL680 is not set
752# CONFIG_PATA_SIS is not set 788# CONFIG_PATA_SIS is not set
789# CONFIG_PATA_TOSHIBA is not set
753# CONFIG_PATA_VIA is not set 790# CONFIG_PATA_VIA is not set
754# CONFIG_PATA_WINBOND is not set 791# CONFIG_PATA_WINBOND is not set
755CONFIG_PATA_PLATFORM=y 792CONFIG_PATA_PLATFORM=y
@@ -777,7 +814,7 @@ CONFIG_MD_RAID1=y
777# 814#
778 815
779# 816#
780# See the help texts for more information. 817# The newer stack is recommended.
781# 818#
782# CONFIG_FIREWIRE is not set 819# CONFIG_FIREWIRE is not set
783# CONFIG_IEEE1394 is not set 820# CONFIG_IEEE1394 is not set
@@ -860,8 +897,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
860# CONFIG_BE2NET is not set 897# CONFIG_BE2NET is not set
861# CONFIG_TR is not set 898# CONFIG_TR is not set
862CONFIG_WLAN=y 899CONFIG_WLAN=y
863# CONFIG_WLAN_PRE80211 is not set 900# CONFIG_AIRO is not set
864# CONFIG_WLAN_80211 is not set 901# CONFIG_ATMEL is not set
902# CONFIG_PRISM54 is not set
903# CONFIG_USB_ZD1201 is not set
904# CONFIG_HOSTAP is not set
865 905
866# 906#
867# Enable WiMAX (Networking options) to see the WiMAX drivers 907# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -884,6 +924,7 @@ CONFIG_WLAN=y
884# CONFIG_NETCONSOLE is not set 924# CONFIG_NETCONSOLE is not set
885# CONFIG_NETPOLL is not set 925# CONFIG_NETPOLL is not set
886# CONFIG_NET_POLL_CONTROLLER is not set 926# CONFIG_NET_POLL_CONTROLLER is not set
927# CONFIG_VMXNET3 is not set
887# CONFIG_ISDN is not set 928# CONFIG_ISDN is not set
888# CONFIG_PHONE is not set 929# CONFIG_PHONE is not set
889 930
@@ -925,6 +966,7 @@ CONFIG_SERIAL_CORE=y
925CONFIG_SERIAL_CORE_CONSOLE=y 966CONFIG_SERIAL_CORE_CONSOLE=y
926# CONFIG_SERIAL_JSM is not set 967# CONFIG_SERIAL_JSM is not set
927# CONFIG_SERIAL_OF_PLATFORM is not set 968# CONFIG_SERIAL_OF_PLATFORM is not set
969# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
928CONFIG_UNIX98_PTYS=y 970CONFIG_UNIX98_PTYS=y
929# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 971# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
930CONFIG_LEGACY_PTYS=y 972CONFIG_LEGACY_PTYS=y
@@ -982,11 +1024,6 @@ CONFIG_I2C_MPC=y
982# CONFIG_I2C_TINY_USB is not set 1024# CONFIG_I2C_TINY_USB is not set
983 1025
984# 1026#
985# Graphics adapter I2C/DDC channel drivers
986#
987# CONFIG_I2C_VOODOO3 is not set
988
989#
990# Other I2C/SMBus bus drivers 1027# Other I2C/SMBus bus drivers
991# 1028#
992# CONFIG_I2C_PCA_PLATFORM is not set 1029# CONFIG_I2C_PCA_PLATFORM is not set
@@ -995,7 +1032,6 @@ CONFIG_I2C_MPC=y
995# 1032#
996# Miscellaneous I2C Chip support 1033# Miscellaneous I2C Chip support
997# 1034#
998# CONFIG_DS1682 is not set
999# CONFIG_SENSORS_TSL2550 is not set 1035# CONFIG_SENSORS_TSL2550 is not set
1000# CONFIG_I2C_DEBUG_CORE is not set 1036# CONFIG_I2C_DEBUG_CORE is not set
1001# CONFIG_I2C_DEBUG_ALGO is not set 1037# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1009,6 +1045,8 @@ CONFIG_SPI_MASTER=y
1009# 1045#
1010CONFIG_SPI_BITBANG=y 1046CONFIG_SPI_BITBANG=y
1011# CONFIG_SPI_MPC8xxx is not set 1047# CONFIG_SPI_MPC8xxx is not set
1048# CONFIG_SPI_XILINX is not set
1049# CONFIG_SPI_DESIGNWARE is not set
1012 1050
1013# 1051#
1014# SPI Protocol Masters 1052# SPI Protocol Masters
@@ -1062,6 +1100,7 @@ CONFIG_SSB_POSSIBLE=y
1062# CONFIG_TWL4030_CORE is not set 1100# CONFIG_TWL4030_CORE is not set
1063# CONFIG_MFD_TMIO is not set 1101# CONFIG_MFD_TMIO is not set
1064# CONFIG_PMIC_DA903X is not set 1102# CONFIG_PMIC_DA903X is not set
1103# CONFIG_PMIC_ADP5520 is not set
1065# CONFIG_MFD_WM8400 is not set 1104# CONFIG_MFD_WM8400 is not set
1066# CONFIG_MFD_WM831X is not set 1105# CONFIG_MFD_WM831X is not set
1067# CONFIG_MFD_WM8350_I2C is not set 1106# CONFIG_MFD_WM8350_I2C is not set
@@ -1069,6 +1108,8 @@ CONFIG_SSB_POSSIBLE=y
1069# CONFIG_MFD_MC13783 is not set 1108# CONFIG_MFD_MC13783 is not set
1070# CONFIG_AB3100_CORE is not set 1109# CONFIG_AB3100_CORE is not set
1071# CONFIG_EZX_PCAP is not set 1110# CONFIG_EZX_PCAP is not set
1111# CONFIG_MFD_88PM8607 is not set
1112# CONFIG_AB4500_CORE is not set
1072# CONFIG_REGULATOR is not set 1113# CONFIG_REGULATOR is not set
1073# CONFIG_MEDIA_SUPPORT is not set 1114# CONFIG_MEDIA_SUPPORT is not set
1074 1115
@@ -1117,6 +1158,7 @@ CONFIG_USB_MON=y
1117CONFIG_USB_EHCI_HCD=y 1158CONFIG_USB_EHCI_HCD=y
1118CONFIG_USB_EHCI_ROOT_HUB_TT=y 1159CONFIG_USB_EHCI_ROOT_HUB_TT=y
1119# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1160# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1161# CONFIG_XPS_USB_HCD_XILINX is not set
1120CONFIG_USB_EHCI_FSL=y 1162CONFIG_USB_EHCI_FSL=y
1121CONFIG_USB_EHCI_HCD_PPC_OF=y 1163CONFIG_USB_EHCI_HCD_PPC_OF=y
1122# CONFIG_USB_OXU210HP_HCD is not set 1164# CONFIG_USB_OXU210HP_HCD is not set
@@ -1235,6 +1277,7 @@ CONFIG_RTC_DRV_DS1307=y
1235# CONFIG_RTC_DRV_PCF8563 is not set 1277# CONFIG_RTC_DRV_PCF8563 is not set
1236# CONFIG_RTC_DRV_PCF8583 is not set 1278# CONFIG_RTC_DRV_PCF8583 is not set
1237# CONFIG_RTC_DRV_M41T80 is not set 1279# CONFIG_RTC_DRV_M41T80 is not set
1280# CONFIG_RTC_DRV_BQ32K is not set
1238# CONFIG_RTC_DRV_S35390A is not set 1281# CONFIG_RTC_DRV_S35390A is not set
1239# CONFIG_RTC_DRV_FM3130 is not set 1282# CONFIG_RTC_DRV_FM3130 is not set
1240# CONFIG_RTC_DRV_RX8581 is not set 1283# CONFIG_RTC_DRV_RX8581 is not set
@@ -1264,7 +1307,9 @@ CONFIG_RTC_DRV_DS1307=y
1264# CONFIG_RTC_DRV_M48T86 is not set 1307# CONFIG_RTC_DRV_M48T86 is not set
1265# CONFIG_RTC_DRV_M48T35 is not set 1308# CONFIG_RTC_DRV_M48T35 is not set
1266# CONFIG_RTC_DRV_M48T59 is not set 1309# CONFIG_RTC_DRV_M48T59 is not set
1310# CONFIG_RTC_DRV_MSM6242 is not set
1267# CONFIG_RTC_DRV_BQ4802 is not set 1311# CONFIG_RTC_DRV_BQ4802 is not set
1312# CONFIG_RTC_DRV_RP5C01 is not set
1268# CONFIG_RTC_DRV_V3020 is not set 1313# CONFIG_RTC_DRV_V3020 is not set
1269 1314
1270# 1315#
@@ -1485,7 +1530,7 @@ CONFIG_FRAME_WARN=1024
1485# CONFIG_DEBUG_KERNEL is not set 1530# CONFIG_DEBUG_KERNEL is not set
1486# CONFIG_SLUB_DEBUG_ON is not set 1531# CONFIG_SLUB_DEBUG_ON is not set
1487# CONFIG_SLUB_STATS is not set 1532# CONFIG_SLUB_STATS is not set
1488# CONFIG_DEBUG_BUGVERBOSE is not set 1533CONFIG_DEBUG_BUGVERBOSE=y
1489# CONFIG_DEBUG_MEMORY_INIT is not set 1534# CONFIG_DEBUG_MEMORY_INIT is not set
1490# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1535# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1491# CONFIG_LATENCYTOP is not set 1536# CONFIG_LATENCYTOP is not set
@@ -1512,7 +1557,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1512# CONFIG_KEYS is not set 1557# CONFIG_KEYS is not set
1513# CONFIG_SECURITY is not set 1558# CONFIG_SECURITY is not set
1514# CONFIG_SECURITYFS is not set 1559# CONFIG_SECURITYFS is not set
1515# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1560# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1561# CONFIG_DEFAULT_SECURITY_SMACK is not set
1562# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1563CONFIG_DEFAULT_SECURITY_DAC=y
1564CONFIG_DEFAULT_SECURITY=""
1516CONFIG_CRYPTO=y 1565CONFIG_CRYPTO=y
1517 1566
1518# 1567#
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
index a668110c10f6..28d8ff3e8fca 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:26 2009 4# Wed Jan 6 09:24:20 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 176# IO Schedulers
174# 177#
175CONFIG_IOSCHED_NOOP=y 178CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 179CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 180CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 181# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 182CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 183# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 184CONFIG_DEFAULT_IOSCHED="cfq"
185# CONFIG_INLINE_SPIN_TRYLOCK is not set
186# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK is not set
188# CONFIG_INLINE_SPIN_LOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
191CONFIG_INLINE_SPIN_UNLOCK=y
192# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
193CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
194# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
195# CONFIG_INLINE_READ_TRYLOCK is not set
196# CONFIG_INLINE_READ_LOCK is not set
197# CONFIG_INLINE_READ_LOCK_BH is not set
198# CONFIG_INLINE_READ_LOCK_IRQ is not set
199# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
200CONFIG_INLINE_READ_UNLOCK=y
201# CONFIG_INLINE_READ_UNLOCK_BH is not set
202CONFIG_INLINE_READ_UNLOCK_IRQ=y
203# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_WRITE_TRYLOCK is not set
205# CONFIG_INLINE_WRITE_LOCK is not set
206# CONFIG_INLINE_WRITE_LOCK_BH is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
209CONFIG_INLINE_WRITE_UNLOCK=y
210# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
211CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
212# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
213# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184# CONFIG_FREEZER is not set 214# CONFIG_FREEZER is not set
185 215
186# 216#
@@ -259,6 +289,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 289CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 290# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
292CONFIG_SPARSE_IRQ=y
262CONFIG_MAX_ACTIVE_REGIONS=32 293CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 295CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -275,8 +306,6 @@ CONFIG_MIGRATION=y
275CONFIG_ZONE_DMA_FLAG=1 306CONFIG_ZONE_DMA_FLAG=1
276CONFIG_BOUNCE=y 307CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 308CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set 309# CONFIG_KSM is not set
281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 310CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
282CONFIG_PPC_4K_PAGES=y 311CONFIG_PPC_4K_PAGES=y
@@ -403,9 +432,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
403# CONFIG_AF_RXRPC is not set 432# CONFIG_AF_RXRPC is not set
404CONFIG_WIRELESS=y 433CONFIG_WIRELESS=y
405# CONFIG_CFG80211 is not set 434# CONFIG_CFG80211 is not set
406CONFIG_CFG80211_DEFAULT_PS_VALUE=0
407CONFIG_WIRELESS_OLD_REGULATORY=y
408# CONFIG_WIRELESS_EXT is not set
409# CONFIG_LIB80211 is not set 435# CONFIG_LIB80211 is not set
410 436
411# 437#
@@ -528,6 +554,10 @@ CONFIG_BLK_DEV=y
528# CONFIG_BLK_DEV_COW_COMMON is not set 554# CONFIG_BLK_DEV_COW_COMMON is not set
529CONFIG_BLK_DEV_LOOP=y 555CONFIG_BLK_DEV_LOOP=y
530# CONFIG_BLK_DEV_CRYPTOLOOP is not set 556# CONFIG_BLK_DEV_CRYPTOLOOP is not set
557
558#
559# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
560#
531# CONFIG_BLK_DEV_NBD is not set 561# CONFIG_BLK_DEV_NBD is not set
532# CONFIG_BLK_DEV_SX8 is not set 562# CONFIG_BLK_DEV_SX8 is not set
533# CONFIG_BLK_DEV_UB is not set 563# CONFIG_BLK_DEV_UB is not set
@@ -539,6 +569,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
539# CONFIG_ATA_OVER_ETH is not set 569# CONFIG_ATA_OVER_ETH is not set
540# CONFIG_BLK_DEV_HD is not set 570# CONFIG_BLK_DEV_HD is not set
541CONFIG_MISC_DEVICES=y 571CONFIG_MISC_DEVICES=y
572# CONFIG_AD525X_DPOT is not set
542# CONFIG_PHANTOM is not set 573# CONFIG_PHANTOM is not set
543# CONFIG_SGI_IOC4 is not set 574# CONFIG_SGI_IOC4 is not set
544# CONFIG_TIFM_CORE is not set 575# CONFIG_TIFM_CORE is not set
@@ -546,6 +577,8 @@ CONFIG_MISC_DEVICES=y
546# CONFIG_ENCLOSURE_SERVICES is not set 577# CONFIG_ENCLOSURE_SERVICES is not set
547# CONFIG_HP_ILO is not set 578# CONFIG_HP_ILO is not set
548# CONFIG_ISL29003 is not set 579# CONFIG_ISL29003 is not set
580# CONFIG_DS1682 is not set
581# CONFIG_TI_DAC7512 is not set
549# CONFIG_C2PORT is not set 582# CONFIG_C2PORT is not set
550 583
551# 584#
@@ -599,7 +632,9 @@ CONFIG_SCSI_LOWLEVEL=y
599# CONFIG_SCSI_BNX2_ISCSI is not set 632# CONFIG_SCSI_BNX2_ISCSI is not set
600# CONFIG_BE2ISCSI is not set 633# CONFIG_BE2ISCSI is not set
601# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 634# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
635# CONFIG_SCSI_HPSA is not set
602# CONFIG_SCSI_3W_9XXX is not set 636# CONFIG_SCSI_3W_9XXX is not set
637# CONFIG_SCSI_3W_SAS is not set
603# CONFIG_SCSI_ACARD is not set 638# CONFIG_SCSI_ACARD is not set
604# CONFIG_SCSI_AACRAID is not set 639# CONFIG_SCSI_AACRAID is not set
605# CONFIG_SCSI_AIC7XXX is not set 640# CONFIG_SCSI_AIC7XXX is not set
@@ -637,6 +672,7 @@ CONFIG_SCSI_LOWLEVEL=y
637# CONFIG_SCSI_NSP32 is not set 672# CONFIG_SCSI_NSP32 is not set
638# CONFIG_SCSI_DEBUG is not set 673# CONFIG_SCSI_DEBUG is not set
639# CONFIG_SCSI_PMCRAID is not set 674# CONFIG_SCSI_PMCRAID is not set
675# CONFIG_SCSI_PM8001 is not set
640# CONFIG_SCSI_SRP is not set 676# CONFIG_SCSI_SRP is not set
641# CONFIG_SCSI_BFA_FC is not set 677# CONFIG_SCSI_BFA_FC is not set
642# CONFIG_SCSI_DH is not set 678# CONFIG_SCSI_DH is not set
@@ -654,7 +690,7 @@ CONFIG_SCSI_LOWLEVEL=y
654# 690#
655 691
656# 692#
657# See the help texts for more information. 693# The newer stack is recommended.
658# 694#
659# CONFIG_FIREWIRE is not set 695# CONFIG_FIREWIRE is not set
660# CONFIG_IEEE1394 is not set 696# CONFIG_IEEE1394 is not set
@@ -737,8 +773,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
737# CONFIG_BE2NET is not set 773# CONFIG_BE2NET is not set
738# CONFIG_TR is not set 774# CONFIG_TR is not set
739CONFIG_WLAN=y 775CONFIG_WLAN=y
740# CONFIG_WLAN_PRE80211 is not set 776# CONFIG_AIRO is not set
741# CONFIG_WLAN_80211 is not set 777# CONFIG_ATMEL is not set
778# CONFIG_PRISM54 is not set
779# CONFIG_USB_ZD1201 is not set
780# CONFIG_HOSTAP is not set
742 781
743# 782#
744# Enable WiMAX (Networking options) to see the WiMAX drivers 783# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -761,6 +800,7 @@ CONFIG_WLAN=y
761# CONFIG_NETCONSOLE is not set 800# CONFIG_NETCONSOLE is not set
762# CONFIG_NETPOLL is not set 801# CONFIG_NETPOLL is not set
763# CONFIG_NET_POLL_CONTROLLER is not set 802# CONFIG_NET_POLL_CONTROLLER is not set
803# CONFIG_VMXNET3 is not set
764# CONFIG_ISDN is not set 804# CONFIG_ISDN is not set
765# CONFIG_PHONE is not set 805# CONFIG_PHONE is not set
766 806
@@ -802,6 +842,7 @@ CONFIG_SERIAL_CORE=y
802CONFIG_SERIAL_CORE_CONSOLE=y 842CONFIG_SERIAL_CORE_CONSOLE=y
803# CONFIG_SERIAL_JSM is not set 843# CONFIG_SERIAL_JSM is not set
804# CONFIG_SERIAL_OF_PLATFORM is not set 844# CONFIG_SERIAL_OF_PLATFORM is not set
845# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
805CONFIG_UNIX98_PTYS=y 846CONFIG_UNIX98_PTYS=y
806# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 847# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
807CONFIG_LEGACY_PTYS=y 848CONFIG_LEGACY_PTYS=y
@@ -859,11 +900,6 @@ CONFIG_I2C_MPC=y
859# CONFIG_I2C_TINY_USB is not set 900# CONFIG_I2C_TINY_USB is not set
860 901
861# 902#
862# Graphics adapter I2C/DDC channel drivers
863#
864# CONFIG_I2C_VOODOO3 is not set
865
866#
867# Other I2C/SMBus bus drivers 903# Other I2C/SMBus bus drivers
868# 904#
869# CONFIG_I2C_PCA_PLATFORM is not set 905# CONFIG_I2C_PCA_PLATFORM is not set
@@ -872,7 +908,6 @@ CONFIG_I2C_MPC=y
872# 908#
873# Miscellaneous I2C Chip support 909# Miscellaneous I2C Chip support
874# 910#
875# CONFIG_DS1682 is not set
876# CONFIG_SENSORS_TSL2550 is not set 911# CONFIG_SENSORS_TSL2550 is not set
877# CONFIG_I2C_DEBUG_CORE is not set 912# CONFIG_I2C_DEBUG_CORE is not set
878# CONFIG_I2C_DEBUG_ALGO is not set 913# CONFIG_I2C_DEBUG_ALGO is not set
@@ -886,6 +921,8 @@ CONFIG_SPI_MASTER=y
886# 921#
887CONFIG_SPI_BITBANG=y 922CONFIG_SPI_BITBANG=y
888# CONFIG_SPI_MPC8xxx is not set 923# CONFIG_SPI_MPC8xxx is not set
924# CONFIG_SPI_XILINX is not set
925# CONFIG_SPI_DESIGNWARE is not set
889 926
890# 927#
891# SPI Protocol Masters 928# SPI Protocol Masters
@@ -939,6 +976,7 @@ CONFIG_SSB_POSSIBLE=y
939# CONFIG_TWL4030_CORE is not set 976# CONFIG_TWL4030_CORE is not set
940# CONFIG_MFD_TMIO is not set 977# CONFIG_MFD_TMIO is not set
941# CONFIG_PMIC_DA903X is not set 978# CONFIG_PMIC_DA903X is not set
979# CONFIG_PMIC_ADP5520 is not set
942# CONFIG_MFD_WM8400 is not set 980# CONFIG_MFD_WM8400 is not set
943# CONFIG_MFD_WM831X is not set 981# CONFIG_MFD_WM831X is not set
944# CONFIG_MFD_WM8350_I2C is not set 982# CONFIG_MFD_WM8350_I2C is not set
@@ -946,6 +984,8 @@ CONFIG_SSB_POSSIBLE=y
946# CONFIG_MFD_MC13783 is not set 984# CONFIG_MFD_MC13783 is not set
947# CONFIG_AB3100_CORE is not set 985# CONFIG_AB3100_CORE is not set
948# CONFIG_EZX_PCAP is not set 986# CONFIG_EZX_PCAP is not set
987# CONFIG_MFD_88PM8607 is not set
988# CONFIG_AB4500_CORE is not set
949# CONFIG_REGULATOR is not set 989# CONFIG_REGULATOR is not set
950# CONFIG_MEDIA_SUPPORT is not set 990# CONFIG_MEDIA_SUPPORT is not set
951 991
@@ -994,6 +1034,7 @@ CONFIG_USB_MON=y
994CONFIG_USB_EHCI_HCD=y 1034CONFIG_USB_EHCI_HCD=y
995CONFIG_USB_EHCI_ROOT_HUB_TT=y 1035CONFIG_USB_EHCI_ROOT_HUB_TT=y
996# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1036# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1037# CONFIG_XPS_USB_HCD_XILINX is not set
997CONFIG_USB_EHCI_FSL=y 1038CONFIG_USB_EHCI_FSL=y
998CONFIG_USB_EHCI_HCD_PPC_OF=y 1039CONFIG_USB_EHCI_HCD_PPC_OF=y
999# CONFIG_USB_OXU210HP_HCD is not set 1040# CONFIG_USB_OXU210HP_HCD is not set
@@ -1112,6 +1153,7 @@ CONFIG_RTC_DRV_DS1307=y
1112# CONFIG_RTC_DRV_PCF8563 is not set 1153# CONFIG_RTC_DRV_PCF8563 is not set
1113# CONFIG_RTC_DRV_PCF8583 is not set 1154# CONFIG_RTC_DRV_PCF8583 is not set
1114# CONFIG_RTC_DRV_M41T80 is not set 1155# CONFIG_RTC_DRV_M41T80 is not set
1156# CONFIG_RTC_DRV_BQ32K is not set
1115# CONFIG_RTC_DRV_S35390A is not set 1157# CONFIG_RTC_DRV_S35390A is not set
1116# CONFIG_RTC_DRV_FM3130 is not set 1158# CONFIG_RTC_DRV_FM3130 is not set
1117# CONFIG_RTC_DRV_RX8581 is not set 1159# CONFIG_RTC_DRV_RX8581 is not set
@@ -1141,7 +1183,9 @@ CONFIG_RTC_DRV_DS1307=y
1141# CONFIG_RTC_DRV_M48T86 is not set 1183# CONFIG_RTC_DRV_M48T86 is not set
1142# CONFIG_RTC_DRV_M48T35 is not set 1184# CONFIG_RTC_DRV_M48T35 is not set
1143# CONFIG_RTC_DRV_M48T59 is not set 1185# CONFIG_RTC_DRV_M48T59 is not set
1186# CONFIG_RTC_DRV_MSM6242 is not set
1144# CONFIG_RTC_DRV_BQ4802 is not set 1187# CONFIG_RTC_DRV_BQ4802 is not set
1188# CONFIG_RTC_DRV_RP5C01 is not set
1145# CONFIG_RTC_DRV_V3020 is not set 1189# CONFIG_RTC_DRV_V3020 is not set
1146 1190
1147# 1191#
@@ -1362,7 +1406,7 @@ CONFIG_FRAME_WARN=1024
1362# CONFIG_DEBUG_KERNEL is not set 1406# CONFIG_DEBUG_KERNEL is not set
1363# CONFIG_SLUB_DEBUG_ON is not set 1407# CONFIG_SLUB_DEBUG_ON is not set
1364# CONFIG_SLUB_STATS is not set 1408# CONFIG_SLUB_STATS is not set
1365# CONFIG_DEBUG_BUGVERBOSE is not set 1409CONFIG_DEBUG_BUGVERBOSE=y
1366# CONFIG_DEBUG_MEMORY_INIT is not set 1410# CONFIG_DEBUG_MEMORY_INIT is not set
1367# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1411# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1368# CONFIG_LATENCYTOP is not set 1412# CONFIG_LATENCYTOP is not set
@@ -1389,7 +1433,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1389# CONFIG_KEYS is not set 1433# CONFIG_KEYS is not set
1390# CONFIG_SECURITY is not set 1434# CONFIG_SECURITY is not set
1391# CONFIG_SECURITYFS is not set 1435# CONFIG_SECURITYFS is not set
1392# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1436# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1437# CONFIG_DEFAULT_SECURITY_SMACK is not set
1438# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1439CONFIG_DEFAULT_SECURITY_DAC=y
1440CONFIG_DEFAULT_SECURITY=""
1393CONFIG_CRYPTO=y 1441CONFIG_CRYPTO=y
1394 1442
1395# 1443#
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
index c4e92ba5c38b..6252ab5bf181 100644
--- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:27 2009 4# Wed Jan 6 09:24:21 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 176# IO Schedulers
174# 177#
175CONFIG_IOSCHED_NOOP=y 178CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 179CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 180CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 181# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 182CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 183# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 184CONFIG_DEFAULT_IOSCHED="cfq"
185# CONFIG_INLINE_SPIN_TRYLOCK is not set
186# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK is not set
188# CONFIG_INLINE_SPIN_LOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
191CONFIG_INLINE_SPIN_UNLOCK=y
192# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
193CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
194# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
195# CONFIG_INLINE_READ_TRYLOCK is not set
196# CONFIG_INLINE_READ_LOCK is not set
197# CONFIG_INLINE_READ_LOCK_BH is not set
198# CONFIG_INLINE_READ_LOCK_IRQ is not set
199# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
200CONFIG_INLINE_READ_UNLOCK=y
201# CONFIG_INLINE_READ_UNLOCK_BH is not set
202CONFIG_INLINE_READ_UNLOCK_IRQ=y
203# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_WRITE_TRYLOCK is not set
205# CONFIG_INLINE_WRITE_LOCK is not set
206# CONFIG_INLINE_WRITE_LOCK_BH is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
209CONFIG_INLINE_WRITE_UNLOCK=y
210# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
211CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
212# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
213# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184# CONFIG_FREEZER is not set 214# CONFIG_FREEZER is not set
185 215
186# 216#
@@ -259,6 +289,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 289CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 290# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
292CONFIG_SPARSE_IRQ=y
262CONFIG_MAX_ACTIVE_REGIONS=32 293CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 295CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -275,8 +306,6 @@ CONFIG_MIGRATION=y
275CONFIG_ZONE_DMA_FLAG=1 306CONFIG_ZONE_DMA_FLAG=1
276CONFIG_BOUNCE=y 307CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 308CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set 309# CONFIG_KSM is not set
281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 310CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
282CONFIG_PPC_4K_PAGES=y 311CONFIG_PPC_4K_PAGES=y
@@ -403,9 +432,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
403# CONFIG_AF_RXRPC is not set 432# CONFIG_AF_RXRPC is not set
404CONFIG_WIRELESS=y 433CONFIG_WIRELESS=y
405# CONFIG_CFG80211 is not set 434# CONFIG_CFG80211 is not set
406CONFIG_CFG80211_DEFAULT_PS_VALUE=0
407CONFIG_WIRELESS_OLD_REGULATORY=y
408# CONFIG_WIRELESS_EXT is not set
409# CONFIG_LIB80211 is not set 435# CONFIG_LIB80211 is not set
410 436
411# 437#
@@ -443,6 +469,10 @@ CONFIG_BLK_DEV=y
443# CONFIG_BLK_DEV_COW_COMMON is not set 469# CONFIG_BLK_DEV_COW_COMMON is not set
444CONFIG_BLK_DEV_LOOP=y 470CONFIG_BLK_DEV_LOOP=y
445# CONFIG_BLK_DEV_CRYPTOLOOP is not set 471# CONFIG_BLK_DEV_CRYPTOLOOP is not set
472
473#
474# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
475#
446# CONFIG_BLK_DEV_NBD is not set 476# CONFIG_BLK_DEV_NBD is not set
447# CONFIG_BLK_DEV_SX8 is not set 477# CONFIG_BLK_DEV_SX8 is not set
448CONFIG_BLK_DEV_RAM=y 478CONFIG_BLK_DEV_RAM=y
@@ -453,6 +483,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
453# CONFIG_ATA_OVER_ETH is not set 483# CONFIG_ATA_OVER_ETH is not set
454# CONFIG_BLK_DEV_HD is not set 484# CONFIG_BLK_DEV_HD is not set
455CONFIG_MISC_DEVICES=y 485CONFIG_MISC_DEVICES=y
486# CONFIG_AD525X_DPOT is not set
456# CONFIG_PHANTOM is not set 487# CONFIG_PHANTOM is not set
457# CONFIG_SGI_IOC4 is not set 488# CONFIG_SGI_IOC4 is not set
458# CONFIG_TIFM_CORE is not set 489# CONFIG_TIFM_CORE is not set
@@ -460,6 +491,7 @@ CONFIG_MISC_DEVICES=y
460# CONFIG_ENCLOSURE_SERVICES is not set 491# CONFIG_ENCLOSURE_SERVICES is not set
461# CONFIG_HP_ILO is not set 492# CONFIG_HP_ILO is not set
462# CONFIG_ISL29003 is not set 493# CONFIG_ISL29003 is not set
494# CONFIG_DS1682 is not set
463# CONFIG_C2PORT is not set 495# CONFIG_C2PORT is not set
464 496
465# 497#
@@ -493,7 +525,7 @@ CONFIG_HAVE_IDE=y
493# 525#
494 526
495# 527#
496# See the help texts for more information. 528# The newer stack is recommended.
497# 529#
498# CONFIG_FIREWIRE is not set 530# CONFIG_FIREWIRE is not set
499# CONFIG_IEEE1394 is not set 531# CONFIG_IEEE1394 is not set
@@ -616,8 +648,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
616# CONFIG_BE2NET is not set 648# CONFIG_BE2NET is not set
617# CONFIG_TR is not set 649# CONFIG_TR is not set
618CONFIG_WLAN=y 650CONFIG_WLAN=y
619# CONFIG_WLAN_PRE80211 is not set 651# CONFIG_AIRO is not set
620# CONFIG_WLAN_80211 is not set 652# CONFIG_ATMEL is not set
653# CONFIG_PRISM54 is not set
654# CONFIG_HOSTAP is not set
621 655
622# 656#
623# Enable WiMAX (Networking options) to see the WiMAX drivers 657# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -630,6 +664,7 @@ CONFIG_WLAN=y
630# CONFIG_NETCONSOLE is not set 664# CONFIG_NETCONSOLE is not set
631# CONFIG_NETPOLL is not set 665# CONFIG_NETPOLL is not set
632# CONFIG_NET_POLL_CONTROLLER is not set 666# CONFIG_NET_POLL_CONTROLLER is not set
667# CONFIG_VMXNET3 is not set
633# CONFIG_ISDN is not set 668# CONFIG_ISDN is not set
634# CONFIG_PHONE is not set 669# CONFIG_PHONE is not set
635 670
@@ -639,6 +674,7 @@ CONFIG_WLAN=y
639CONFIG_INPUT=y 674CONFIG_INPUT=y
640# CONFIG_INPUT_FF_MEMLESS is not set 675# CONFIG_INPUT_FF_MEMLESS is not set
641# CONFIG_INPUT_POLLDEV is not set 676# CONFIG_INPUT_POLLDEV is not set
677# CONFIG_INPUT_SPARSEKMAP is not set
642 678
643# 679#
644# Userland interfaces 680# Userland interfaces
@@ -690,6 +726,7 @@ CONFIG_SERIAL_CORE=y
690CONFIG_SERIAL_CORE_CONSOLE=y 726CONFIG_SERIAL_CORE_CONSOLE=y
691# CONFIG_SERIAL_JSM is not set 727# CONFIG_SERIAL_JSM is not set
692# CONFIG_SERIAL_OF_PLATFORM is not set 728# CONFIG_SERIAL_OF_PLATFORM is not set
729# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
693CONFIG_UNIX98_PTYS=y 730CONFIG_UNIX98_PTYS=y
694# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 731# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
695CONFIG_LEGACY_PTYS=y 732CONFIG_LEGACY_PTYS=y
@@ -745,11 +782,6 @@ CONFIG_I2C_MPC=y
745# CONFIG_I2C_TAOS_EVM is not set 782# CONFIG_I2C_TAOS_EVM is not set
746 783
747# 784#
748# Graphics adapter I2C/DDC channel drivers
749#
750# CONFIG_I2C_VOODOO3 is not set
751
752#
753# Other I2C/SMBus bus drivers 785# Other I2C/SMBus bus drivers
754# 786#
755# CONFIG_I2C_PCA_PLATFORM is not set 787# CONFIG_I2C_PCA_PLATFORM is not set
@@ -758,7 +790,6 @@ CONFIG_I2C_MPC=y
758# 790#
759# Miscellaneous I2C Chip support 791# Miscellaneous I2C Chip support
760# 792#
761# CONFIG_DS1682 is not set
762# CONFIG_SENSORS_TSL2550 is not set 793# CONFIG_SENSORS_TSL2550 is not set
763# CONFIG_I2C_DEBUG_CORE is not set 794# CONFIG_I2C_DEBUG_CORE is not set
764# CONFIG_I2C_DEBUG_ALGO is not set 795# CONFIG_I2C_DEBUG_ALGO is not set
@@ -804,6 +835,7 @@ CONFIG_HWMON=y
804# CONFIG_SENSORS_GL520SM is not set 835# CONFIG_SENSORS_GL520SM is not set
805# CONFIG_SENSORS_IT87 is not set 836# CONFIG_SENSORS_IT87 is not set
806# CONFIG_SENSORS_LM63 is not set 837# CONFIG_SENSORS_LM63 is not set
838# CONFIG_SENSORS_LM73 is not set
807# CONFIG_SENSORS_LM75 is not set 839# CONFIG_SENSORS_LM75 is not set
808# CONFIG_SENSORS_LM77 is not set 840# CONFIG_SENSORS_LM77 is not set
809# CONFIG_SENSORS_LM78 is not set 841# CONFIG_SENSORS_LM78 is not set
@@ -842,6 +874,7 @@ CONFIG_HWMON=y
842# CONFIG_SENSORS_W83L786NG is not set 874# CONFIG_SENSORS_W83L786NG is not set
843# CONFIG_SENSORS_W83627HF is not set 875# CONFIG_SENSORS_W83627HF is not set
844# CONFIG_SENSORS_W83627EHF is not set 876# CONFIG_SENSORS_W83627EHF is not set
877# CONFIG_SENSORS_LIS3_I2C is not set
845# CONFIG_THERMAL is not set 878# CONFIG_THERMAL is not set
846CONFIG_WATCHDOG=y 879CONFIG_WATCHDOG=y
847# CONFIG_WATCHDOG_NOWAYOUT is not set 880# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -874,11 +907,13 @@ CONFIG_SSB_POSSIBLE=y
874# CONFIG_TWL4030_CORE is not set 907# CONFIG_TWL4030_CORE is not set
875# CONFIG_MFD_TMIO is not set 908# CONFIG_MFD_TMIO is not set
876# CONFIG_PMIC_DA903X is not set 909# CONFIG_PMIC_DA903X is not set
910# CONFIG_PMIC_ADP5520 is not set
877# CONFIG_MFD_WM8400 is not set 911# CONFIG_MFD_WM8400 is not set
878# CONFIG_MFD_WM831X is not set 912# CONFIG_MFD_WM831X is not set
879# CONFIG_MFD_WM8350_I2C is not set 913# CONFIG_MFD_WM8350_I2C is not set
880# CONFIG_MFD_PCF50633 is not set 914# CONFIG_MFD_PCF50633 is not set
881# CONFIG_AB3100_CORE is not set 915# CONFIG_AB3100_CORE is not set
916# CONFIG_MFD_88PM8607 is not set
882# CONFIG_REGULATOR is not set 917# CONFIG_REGULATOR is not set
883# CONFIG_MEDIA_SUPPORT is not set 918# CONFIG_MEDIA_SUPPORT is not set
884 919
@@ -961,6 +996,7 @@ CONFIG_RTC_DRV_DS1374=y
961# CONFIG_RTC_DRV_PCF8563 is not set 996# CONFIG_RTC_DRV_PCF8563 is not set
962# CONFIG_RTC_DRV_PCF8583 is not set 997# CONFIG_RTC_DRV_PCF8583 is not set
963# CONFIG_RTC_DRV_M41T80 is not set 998# CONFIG_RTC_DRV_M41T80 is not set
999# CONFIG_RTC_DRV_BQ32K is not set
964# CONFIG_RTC_DRV_S35390A is not set 1000# CONFIG_RTC_DRV_S35390A is not set
965# CONFIG_RTC_DRV_FM3130 is not set 1001# CONFIG_RTC_DRV_FM3130 is not set
966# CONFIG_RTC_DRV_RX8581 is not set 1002# CONFIG_RTC_DRV_RX8581 is not set
@@ -982,7 +1018,9 @@ CONFIG_RTC_DRV_DS1374=y
982# CONFIG_RTC_DRV_M48T86 is not set 1018# CONFIG_RTC_DRV_M48T86 is not set
983# CONFIG_RTC_DRV_M48T35 is not set 1019# CONFIG_RTC_DRV_M48T35 is not set
984# CONFIG_RTC_DRV_M48T59 is not set 1020# CONFIG_RTC_DRV_M48T59 is not set
1021# CONFIG_RTC_DRV_MSM6242 is not set
985# CONFIG_RTC_DRV_BQ4802 is not set 1022# CONFIG_RTC_DRV_BQ4802 is not set
1023# CONFIG_RTC_DRV_RP5C01 is not set
986# CONFIG_RTC_DRV_V3020 is not set 1024# CONFIG_RTC_DRV_V3020 is not set
987 1025
988# 1026#
@@ -1156,7 +1194,7 @@ CONFIG_FRAME_WARN=1024
1156# CONFIG_DEBUG_KERNEL is not set 1194# CONFIG_DEBUG_KERNEL is not set
1157# CONFIG_SLUB_DEBUG_ON is not set 1195# CONFIG_SLUB_DEBUG_ON is not set
1158# CONFIG_SLUB_STATS is not set 1196# CONFIG_SLUB_STATS is not set
1159# CONFIG_DEBUG_BUGVERBOSE is not set 1197CONFIG_DEBUG_BUGVERBOSE=y
1160# CONFIG_DEBUG_MEMORY_INIT is not set 1198# CONFIG_DEBUG_MEMORY_INIT is not set
1161# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1199# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1162# CONFIG_LATENCYTOP is not set 1200# CONFIG_LATENCYTOP is not set
@@ -1183,7 +1221,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1183# CONFIG_KEYS is not set 1221# CONFIG_KEYS is not set
1184# CONFIG_SECURITY is not set 1222# CONFIG_SECURITY is not set
1185# CONFIG_SECURITYFS is not set 1223# CONFIG_SECURITYFS is not set
1186# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1224# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1225# CONFIG_DEFAULT_SECURITY_SMACK is not set
1226# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1227CONFIG_DEFAULT_SECURITY_DAC=y
1228CONFIG_DEFAULT_SECURITY=""
1187CONFIG_CRYPTO=y 1229CONFIG_CRYPTO=y
1188 1230
1189# 1231#
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
index 4f434b1492fa..78227378e678 100644
--- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:28 2009 4# Wed Jan 6 09:24:21 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 176# IO Schedulers
174# 177#
175CONFIG_IOSCHED_NOOP=y 178CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 179CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 180CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 181# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 182CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 183# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 184CONFIG_DEFAULT_IOSCHED="cfq"
185# CONFIG_INLINE_SPIN_TRYLOCK is not set
186# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK is not set
188# CONFIG_INLINE_SPIN_LOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
191CONFIG_INLINE_SPIN_UNLOCK=y
192# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
193CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
194# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
195# CONFIG_INLINE_READ_TRYLOCK is not set
196# CONFIG_INLINE_READ_LOCK is not set
197# CONFIG_INLINE_READ_LOCK_BH is not set
198# CONFIG_INLINE_READ_LOCK_IRQ is not set
199# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
200CONFIG_INLINE_READ_UNLOCK=y
201# CONFIG_INLINE_READ_UNLOCK_BH is not set
202CONFIG_INLINE_READ_UNLOCK_IRQ=y
203# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_WRITE_TRYLOCK is not set
205# CONFIG_INLINE_WRITE_LOCK is not set
206# CONFIG_INLINE_WRITE_LOCK_BH is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
209CONFIG_INLINE_WRITE_UNLOCK=y
210# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
211CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
212# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
213# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184# CONFIG_FREEZER is not set 214# CONFIG_FREEZER is not set
185 215
186# 216#
@@ -258,6 +288,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
258CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 288CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
259# CONFIG_KEXEC is not set 289# CONFIG_KEXEC is not set
260# CONFIG_CRASH_DUMP is not set 290# CONFIG_CRASH_DUMP is not set
291CONFIG_SPARSE_IRQ=y
261CONFIG_MAX_ACTIVE_REGIONS=32 292CONFIG_MAX_ACTIVE_REGIONS=32
262CONFIG_ARCH_FLATMEM_ENABLE=y 293CONFIG_ARCH_FLATMEM_ENABLE=y
263CONFIG_ARCH_POPULATES_NODE_MAP=y 294CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -274,8 +305,6 @@ CONFIG_MIGRATION=y
274CONFIG_ZONE_DMA_FLAG=1 305CONFIG_ZONE_DMA_FLAG=1
275CONFIG_BOUNCE=y 306CONFIG_BOUNCE=y
276CONFIG_VIRT_TO_BUS=y 307CONFIG_VIRT_TO_BUS=y
277CONFIG_HAVE_MLOCK=y
278CONFIG_HAVE_MLOCKED_PAGE_BIT=y
279# CONFIG_KSM is not set 308# CONFIG_KSM is not set
280CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 309CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
281CONFIG_PPC_4K_PAGES=y 310CONFIG_PPC_4K_PAGES=y
@@ -402,9 +431,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
402# CONFIG_AF_RXRPC is not set 431# CONFIG_AF_RXRPC is not set
403CONFIG_WIRELESS=y 432CONFIG_WIRELESS=y
404# CONFIG_CFG80211 is not set 433# CONFIG_CFG80211 is not set
405CONFIG_CFG80211_DEFAULT_PS_VALUE=0
406CONFIG_WIRELESS_OLD_REGULATORY=y
407# CONFIG_WIRELESS_EXT is not set
408# CONFIG_LIB80211 is not set 434# CONFIG_LIB80211 is not set
409 435
410# 436#
@@ -525,6 +551,10 @@ CONFIG_BLK_DEV=y
525# CONFIG_BLK_DEV_COW_COMMON is not set 551# CONFIG_BLK_DEV_COW_COMMON is not set
526CONFIG_BLK_DEV_LOOP=y 552CONFIG_BLK_DEV_LOOP=y
527# CONFIG_BLK_DEV_CRYPTOLOOP is not set 553# CONFIG_BLK_DEV_CRYPTOLOOP is not set
554
555#
556# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
557#
528# CONFIG_BLK_DEV_NBD is not set 558# CONFIG_BLK_DEV_NBD is not set
529# CONFIG_BLK_DEV_SX8 is not set 559# CONFIG_BLK_DEV_SX8 is not set
530CONFIG_BLK_DEV_RAM=y 560CONFIG_BLK_DEV_RAM=y
@@ -535,6 +565,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
535# CONFIG_ATA_OVER_ETH is not set 565# CONFIG_ATA_OVER_ETH is not set
536# CONFIG_BLK_DEV_HD is not set 566# CONFIG_BLK_DEV_HD is not set
537CONFIG_MISC_DEVICES=y 567CONFIG_MISC_DEVICES=y
568# CONFIG_AD525X_DPOT is not set
538# CONFIG_PHANTOM is not set 569# CONFIG_PHANTOM is not set
539# CONFIG_SGI_IOC4 is not set 570# CONFIG_SGI_IOC4 is not set
540# CONFIG_TIFM_CORE is not set 571# CONFIG_TIFM_CORE is not set
@@ -542,6 +573,7 @@ CONFIG_MISC_DEVICES=y
542# CONFIG_ENCLOSURE_SERVICES is not set 573# CONFIG_ENCLOSURE_SERVICES is not set
543# CONFIG_HP_ILO is not set 574# CONFIG_HP_ILO is not set
544# CONFIG_ISL29003 is not set 575# CONFIG_ISL29003 is not set
576# CONFIG_DS1682 is not set
545# CONFIG_C2PORT is not set 577# CONFIG_C2PORT is not set
546 578
547# 579#
@@ -594,7 +626,9 @@ CONFIG_SCSI_LOWLEVEL=y
594# CONFIG_SCSI_BNX2_ISCSI is not set 626# CONFIG_SCSI_BNX2_ISCSI is not set
595# CONFIG_BE2ISCSI is not set 627# CONFIG_BE2ISCSI is not set
596# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 628# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
629# CONFIG_SCSI_HPSA is not set
597# CONFIG_SCSI_3W_9XXX is not set 630# CONFIG_SCSI_3W_9XXX is not set
631# CONFIG_SCSI_3W_SAS is not set
598# CONFIG_SCSI_ACARD is not set 632# CONFIG_SCSI_ACARD is not set
599# CONFIG_SCSI_AACRAID is not set 633# CONFIG_SCSI_AACRAID is not set
600# CONFIG_SCSI_AIC7XXX is not set 634# CONFIG_SCSI_AIC7XXX is not set
@@ -632,6 +666,7 @@ CONFIG_SCSI_LOWLEVEL=y
632# CONFIG_SCSI_NSP32 is not set 666# CONFIG_SCSI_NSP32 is not set
633# CONFIG_SCSI_DEBUG is not set 667# CONFIG_SCSI_DEBUG is not set
634# CONFIG_SCSI_PMCRAID is not set 668# CONFIG_SCSI_PMCRAID is not set
669# CONFIG_SCSI_PM8001 is not set
635# CONFIG_SCSI_SRP is not set 670# CONFIG_SCSI_SRP is not set
636# CONFIG_SCSI_BFA_FC is not set 671# CONFIG_SCSI_BFA_FC is not set
637# CONFIG_SCSI_DH is not set 672# CONFIG_SCSI_DH is not set
@@ -649,7 +684,7 @@ CONFIG_SCSI_LOWLEVEL=y
649# 684#
650 685
651# 686#
652# See the help texts for more information. 687# The newer stack is recommended.
653# 688#
654# CONFIG_FIREWIRE is not set 689# CONFIG_FIREWIRE is not set
655# CONFIG_IEEE1394 is not set 690# CONFIG_IEEE1394 is not set
@@ -756,8 +791,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
756# CONFIG_BE2NET is not set 791# CONFIG_BE2NET is not set
757# CONFIG_TR is not set 792# CONFIG_TR is not set
758CONFIG_WLAN=y 793CONFIG_WLAN=y
759# CONFIG_WLAN_PRE80211 is not set 794# CONFIG_AIRO is not set
760# CONFIG_WLAN_80211 is not set 795# CONFIG_ATMEL is not set
796# CONFIG_PRISM54 is not set
797# CONFIG_HOSTAP is not set
761 798
762# 799#
763# Enable WiMAX (Networking options) to see the WiMAX drivers 800# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -771,6 +808,7 @@ CONFIG_WLAN=y
771# CONFIG_NETCONSOLE is not set 808# CONFIG_NETCONSOLE is not set
772# CONFIG_NETPOLL is not set 809# CONFIG_NETPOLL is not set
773# CONFIG_NET_POLL_CONTROLLER is not set 810# CONFIG_NET_POLL_CONTROLLER is not set
811# CONFIG_VMXNET3 is not set
774# CONFIG_ISDN is not set 812# CONFIG_ISDN is not set
775# CONFIG_PHONE is not set 813# CONFIG_PHONE is not set
776 814
@@ -780,6 +818,7 @@ CONFIG_WLAN=y
780CONFIG_INPUT=y 818CONFIG_INPUT=y
781# CONFIG_INPUT_FF_MEMLESS is not set 819# CONFIG_INPUT_FF_MEMLESS is not set
782# CONFIG_INPUT_POLLDEV is not set 820# CONFIG_INPUT_POLLDEV is not set
821# CONFIG_INPUT_SPARSEKMAP is not set
783 822
784# 823#
785# Userland interfaces 824# Userland interfaces
@@ -832,6 +871,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
832# CONFIG_SERIAL_JSM is not set 871# CONFIG_SERIAL_JSM is not set
833# CONFIG_SERIAL_OF_PLATFORM is not set 872# CONFIG_SERIAL_OF_PLATFORM is not set
834# CONFIG_SERIAL_QE is not set 873# CONFIG_SERIAL_QE is not set
874# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
835CONFIG_UNIX98_PTYS=y 875CONFIG_UNIX98_PTYS=y
836# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 876# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
837CONFIG_LEGACY_PTYS=y 877CONFIG_LEGACY_PTYS=y
@@ -888,11 +928,6 @@ CONFIG_I2C_MPC=y
888# CONFIG_I2C_TAOS_EVM is not set 928# CONFIG_I2C_TAOS_EVM is not set
889 929
890# 930#
891# Graphics adapter I2C/DDC channel drivers
892#
893# CONFIG_I2C_VOODOO3 is not set
894
895#
896# Other I2C/SMBus bus drivers 931# Other I2C/SMBus bus drivers
897# 932#
898# CONFIG_I2C_PCA_PLATFORM is not set 933# CONFIG_I2C_PCA_PLATFORM is not set
@@ -901,7 +936,6 @@ CONFIG_I2C_MPC=y
901# 936#
902# Miscellaneous I2C Chip support 937# Miscellaneous I2C Chip support
903# 938#
904# CONFIG_DS1682 is not set
905# CONFIG_SENSORS_TSL2550 is not set 939# CONFIG_SENSORS_TSL2550 is not set
906# CONFIG_I2C_DEBUG_CORE is not set 940# CONFIG_I2C_DEBUG_CORE is not set
907# CONFIG_I2C_DEBUG_ALGO is not set 941# CONFIG_I2C_DEBUG_ALGO is not set
@@ -947,6 +981,7 @@ CONFIG_HWMON=y
947# CONFIG_SENSORS_GL520SM is not set 981# CONFIG_SENSORS_GL520SM is not set
948# CONFIG_SENSORS_IT87 is not set 982# CONFIG_SENSORS_IT87 is not set
949# CONFIG_SENSORS_LM63 is not set 983# CONFIG_SENSORS_LM63 is not set
984# CONFIG_SENSORS_LM73 is not set
950# CONFIG_SENSORS_LM75 is not set 985# CONFIG_SENSORS_LM75 is not set
951# CONFIG_SENSORS_LM77 is not set 986# CONFIG_SENSORS_LM77 is not set
952# CONFIG_SENSORS_LM78 is not set 987# CONFIG_SENSORS_LM78 is not set
@@ -985,6 +1020,7 @@ CONFIG_HWMON=y
985# CONFIG_SENSORS_W83L786NG is not set 1020# CONFIG_SENSORS_W83L786NG is not set
986# CONFIG_SENSORS_W83627HF is not set 1021# CONFIG_SENSORS_W83627HF is not set
987# CONFIG_SENSORS_W83627EHF is not set 1022# CONFIG_SENSORS_W83627EHF is not set
1023# CONFIG_SENSORS_LIS3_I2C is not set
988# CONFIG_THERMAL is not set 1024# CONFIG_THERMAL is not set
989CONFIG_WATCHDOG=y 1025CONFIG_WATCHDOG=y
990# CONFIG_WATCHDOG_NOWAYOUT is not set 1026# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1017,11 +1053,13 @@ CONFIG_SSB_POSSIBLE=y
1017# CONFIG_TWL4030_CORE is not set 1053# CONFIG_TWL4030_CORE is not set
1018# CONFIG_MFD_TMIO is not set 1054# CONFIG_MFD_TMIO is not set
1019# CONFIG_PMIC_DA903X is not set 1055# CONFIG_PMIC_DA903X is not set
1056# CONFIG_PMIC_ADP5520 is not set
1020# CONFIG_MFD_WM8400 is not set 1057# CONFIG_MFD_WM8400 is not set
1021# CONFIG_MFD_WM831X is not set 1058# CONFIG_MFD_WM831X is not set
1022# CONFIG_MFD_WM8350_I2C is not set 1059# CONFIG_MFD_WM8350_I2C is not set
1023# CONFIG_MFD_PCF50633 is not set 1060# CONFIG_MFD_PCF50633 is not set
1024# CONFIG_AB3100_CORE is not set 1061# CONFIG_AB3100_CORE is not set
1062# CONFIG_MFD_88PM8607 is not set
1025# CONFIG_REGULATOR is not set 1063# CONFIG_REGULATOR is not set
1026# CONFIG_MEDIA_SUPPORT is not set 1064# CONFIG_MEDIA_SUPPORT is not set
1027 1065
@@ -1104,6 +1142,7 @@ CONFIG_RTC_DRV_DS1374=y
1104# CONFIG_RTC_DRV_PCF8563 is not set 1142# CONFIG_RTC_DRV_PCF8563 is not set
1105# CONFIG_RTC_DRV_PCF8583 is not set 1143# CONFIG_RTC_DRV_PCF8583 is not set
1106# CONFIG_RTC_DRV_M41T80 is not set 1144# CONFIG_RTC_DRV_M41T80 is not set
1145# CONFIG_RTC_DRV_BQ32K is not set
1107# CONFIG_RTC_DRV_S35390A is not set 1146# CONFIG_RTC_DRV_S35390A is not set
1108# CONFIG_RTC_DRV_FM3130 is not set 1147# CONFIG_RTC_DRV_FM3130 is not set
1109# CONFIG_RTC_DRV_RX8581 is not set 1148# CONFIG_RTC_DRV_RX8581 is not set
@@ -1125,7 +1164,9 @@ CONFIG_RTC_DRV_DS1374=y
1125# CONFIG_RTC_DRV_M48T86 is not set 1164# CONFIG_RTC_DRV_M48T86 is not set
1126# CONFIG_RTC_DRV_M48T35 is not set 1165# CONFIG_RTC_DRV_M48T35 is not set
1127# CONFIG_RTC_DRV_M48T59 is not set 1166# CONFIG_RTC_DRV_M48T59 is not set
1167# CONFIG_RTC_DRV_MSM6242 is not set
1128# CONFIG_RTC_DRV_BQ4802 is not set 1168# CONFIG_RTC_DRV_BQ4802 is not set
1169# CONFIG_RTC_DRV_RP5C01 is not set
1129# CONFIG_RTC_DRV_V3020 is not set 1170# CONFIG_RTC_DRV_V3020 is not set
1130 1171
1131# 1172#
@@ -1302,7 +1343,7 @@ CONFIG_FRAME_WARN=1024
1302# CONFIG_DEBUG_KERNEL is not set 1343# CONFIG_DEBUG_KERNEL is not set
1303# CONFIG_SLUB_DEBUG_ON is not set 1344# CONFIG_SLUB_DEBUG_ON is not set
1304# CONFIG_SLUB_STATS is not set 1345# CONFIG_SLUB_STATS is not set
1305# CONFIG_DEBUG_BUGVERBOSE is not set 1346CONFIG_DEBUG_BUGVERBOSE=y
1306# CONFIG_DEBUG_MEMORY_INIT is not set 1347# CONFIG_DEBUG_MEMORY_INIT is not set
1307# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1348# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1308# CONFIG_LATENCYTOP is not set 1349# CONFIG_LATENCYTOP is not set
@@ -1329,7 +1370,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1329# CONFIG_KEYS is not set 1370# CONFIG_KEYS is not set
1330# CONFIG_SECURITY is not set 1371# CONFIG_SECURITY is not set
1331# CONFIG_SECURITYFS is not set 1372# CONFIG_SECURITYFS is not set
1332# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1373# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1374# CONFIG_DEFAULT_SECURITY_SMACK is not set
1375# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1376CONFIG_DEFAULT_SECURITY_DAC=y
1377CONFIG_DEFAULT_SECURITY=""
1333CONFIG_CRYPTO=y 1378CONFIG_CRYPTO=y
1334 1379
1335# 1380#
diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
index b52ec0861679..9451d6e5c802 100644
--- a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:30 2009 4# Wed Jan 6 09:24:23 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -60,6 +61,7 @@ CONFIG_AUDIT_ARCH=y
60CONFIG_GENERIC_BUG=y 61CONFIG_GENERIC_BUG=y
61CONFIG_DTC=y 62CONFIG_DTC=y
62CONFIG_DEFAULT_UIMAGE=y 63CONFIG_DEFAULT_UIMAGE=y
64CONFIG_ARCH_HIBERNATION_POSSIBLE=y
63CONFIG_ARCH_SUSPEND_POSSIBLE=y 65CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 66# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 67# CONFIG_PPC_DCR_MMIO is not set
@@ -88,6 +90,7 @@ CONFIG_SYSVIPC_SYSCTL=y
88# 90#
89CONFIG_TREE_RCU=y 91CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 92# CONFIG_TREE_PREEMPT_RCU is not set
93# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 94# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 95CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 96# CONFIG_RCU_FANOUT_EXACT is not set
@@ -174,14 +177,41 @@ CONFIG_LBDAF=y
174# IO Schedulers 177# IO Schedulers
175# 178#
176CONFIG_IOSCHED_NOOP=y 179CONFIG_IOSCHED_NOOP=y
177CONFIG_IOSCHED_AS=y
178CONFIG_IOSCHED_DEADLINE=y 180CONFIG_IOSCHED_DEADLINE=y
179CONFIG_IOSCHED_CFQ=y 181CONFIG_IOSCHED_CFQ=y
180CONFIG_DEFAULT_AS=y
181# CONFIG_DEFAULT_DEADLINE is not set 182# CONFIG_DEFAULT_DEADLINE is not set
182# CONFIG_DEFAULT_CFQ is not set 183CONFIG_DEFAULT_CFQ=y
183# CONFIG_DEFAULT_NOOP is not set 184# CONFIG_DEFAULT_NOOP is not set
184CONFIG_DEFAULT_IOSCHED="anticipatory" 185CONFIG_DEFAULT_IOSCHED="cfq"
186# CONFIG_INLINE_SPIN_TRYLOCK is not set
187# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK is not set
189# CONFIG_INLINE_SPIN_LOCK_BH is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
191# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
192CONFIG_INLINE_SPIN_UNLOCK=y
193# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
194CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
195# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
196# CONFIG_INLINE_READ_TRYLOCK is not set
197# CONFIG_INLINE_READ_LOCK is not set
198# CONFIG_INLINE_READ_LOCK_BH is not set
199# CONFIG_INLINE_READ_LOCK_IRQ is not set
200# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
201CONFIG_INLINE_READ_UNLOCK=y
202# CONFIG_INLINE_READ_UNLOCK_BH is not set
203CONFIG_INLINE_READ_UNLOCK_IRQ=y
204# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
205# CONFIG_INLINE_WRITE_TRYLOCK is not set
206# CONFIG_INLINE_WRITE_LOCK is not set
207# CONFIG_INLINE_WRITE_LOCK_BH is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
209# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
210CONFIG_INLINE_WRITE_UNLOCK=y
211# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
212CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
213# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
214# CONFIG_MUTEX_SPIN_ON_OWNER is not set
185# CONFIG_FREEZER is not set 215# CONFIG_FREEZER is not set
186 216
187# 217#
@@ -258,6 +288,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
258CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 288CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
259# CONFIG_KEXEC is not set 289# CONFIG_KEXEC is not set
260# CONFIG_CRASH_DUMP is not set 290# CONFIG_CRASH_DUMP is not set
291CONFIG_SPARSE_IRQ=y
261CONFIG_MAX_ACTIVE_REGIONS=32 292CONFIG_MAX_ACTIVE_REGIONS=32
262CONFIG_ARCH_FLATMEM_ENABLE=y 293CONFIG_ARCH_FLATMEM_ENABLE=y
263CONFIG_ARCH_POPULATES_NODE_MAP=y 294CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -274,8 +305,6 @@ CONFIG_MIGRATION=y
274CONFIG_ZONE_DMA_FLAG=1 305CONFIG_ZONE_DMA_FLAG=1
275CONFIG_BOUNCE=y 306CONFIG_BOUNCE=y
276CONFIG_VIRT_TO_BUS=y 307CONFIG_VIRT_TO_BUS=y
277CONFIG_HAVE_MLOCK=y
278CONFIG_HAVE_MLOCKED_PAGE_BIT=y
279# CONFIG_KSM is not set 308# CONFIG_KSM is not set
280CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 309CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
281CONFIG_PPC_4K_PAGES=y 310CONFIG_PPC_4K_PAGES=y
@@ -404,9 +433,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
404# CONFIG_AF_RXRPC is not set 433# CONFIG_AF_RXRPC is not set
405CONFIG_WIRELESS=y 434CONFIG_WIRELESS=y
406# CONFIG_CFG80211 is not set 435# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
408CONFIG_WIRELESS_OLD_REGULATORY=y
409# CONFIG_WIRELESS_EXT is not set
410# CONFIG_LIB80211 is not set 436# CONFIG_LIB80211 is not set
411 437
412# 438#
@@ -539,6 +565,10 @@ CONFIG_BLK_DEV=y
539# CONFIG_BLK_DEV_COW_COMMON is not set 565# CONFIG_BLK_DEV_COW_COMMON is not set
540CONFIG_BLK_DEV_LOOP=y 566CONFIG_BLK_DEV_LOOP=y
541# CONFIG_BLK_DEV_CRYPTOLOOP is not set 567# CONFIG_BLK_DEV_CRYPTOLOOP is not set
568
569#
570# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
571#
542# CONFIG_BLK_DEV_NBD is not set 572# CONFIG_BLK_DEV_NBD is not set
543# CONFIG_BLK_DEV_SX8 is not set 573# CONFIG_BLK_DEV_SX8 is not set
544CONFIG_BLK_DEV_RAM=y 574CONFIG_BLK_DEV_RAM=y
@@ -549,6 +579,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
549# CONFIG_ATA_OVER_ETH is not set 579# CONFIG_ATA_OVER_ETH is not set
550# CONFIG_BLK_DEV_HD is not set 580# CONFIG_BLK_DEV_HD is not set
551CONFIG_MISC_DEVICES=y 581CONFIG_MISC_DEVICES=y
582# CONFIG_AD525X_DPOT is not set
552# CONFIG_PHANTOM is not set 583# CONFIG_PHANTOM is not set
553# CONFIG_SGI_IOC4 is not set 584# CONFIG_SGI_IOC4 is not set
554# CONFIG_TIFM_CORE is not set 585# CONFIG_TIFM_CORE is not set
@@ -556,6 +587,8 @@ CONFIG_MISC_DEVICES=y
556# CONFIG_ENCLOSURE_SERVICES is not set 587# CONFIG_ENCLOSURE_SERVICES is not set
557# CONFIG_HP_ILO is not set 588# CONFIG_HP_ILO is not set
558# CONFIG_ISL29003 is not set 589# CONFIG_ISL29003 is not set
590# CONFIG_DS1682 is not set
591# CONFIG_TI_DAC7512 is not set
559# CONFIG_C2PORT is not set 592# CONFIG_C2PORT is not set
560 593
561# 594#
@@ -590,7 +623,7 @@ CONFIG_HAVE_IDE=y
590# 623#
591 624
592# 625#
593# See the help texts for more information. 626# The newer stack is recommended.
594# 627#
595# CONFIG_FIREWIRE is not set 628# CONFIG_FIREWIRE is not set
596# CONFIG_IEEE1394 is not set 629# CONFIG_IEEE1394 is not set
@@ -657,8 +690,10 @@ CONFIG_UCC_GETH=y
657# CONFIG_NETDEV_10000 is not set 690# CONFIG_NETDEV_10000 is not set
658# CONFIG_TR is not set 691# CONFIG_TR is not set
659CONFIG_WLAN=y 692CONFIG_WLAN=y
660# CONFIG_WLAN_PRE80211 is not set 693# CONFIG_AIRO is not set
661# CONFIG_WLAN_80211 is not set 694# CONFIG_ATMEL is not set
695# CONFIG_PRISM54 is not set
696# CONFIG_HOSTAP is not set
662 697
663# 698#
664# Enable WiMAX (Networking options) to see the WiMAX drivers 699# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -671,6 +706,7 @@ CONFIG_WLAN=y
671# CONFIG_NETCONSOLE is not set 706# CONFIG_NETCONSOLE is not set
672# CONFIG_NETPOLL is not set 707# CONFIG_NETPOLL is not set
673# CONFIG_NET_POLL_CONTROLLER is not set 708# CONFIG_NET_POLL_CONTROLLER is not set
709# CONFIG_VMXNET3 is not set
674# CONFIG_ISDN is not set 710# CONFIG_ISDN is not set
675# CONFIG_PHONE is not set 711# CONFIG_PHONE is not set
676 712
@@ -680,6 +716,7 @@ CONFIG_WLAN=y
680CONFIG_INPUT=y 716CONFIG_INPUT=y
681# CONFIG_INPUT_FF_MEMLESS is not set 717# CONFIG_INPUT_FF_MEMLESS is not set
682# CONFIG_INPUT_POLLDEV is not set 718# CONFIG_INPUT_POLLDEV is not set
719# CONFIG_INPUT_SPARSEKMAP is not set
683 720
684# 721#
685# Userland interfaces 722# Userland interfaces
@@ -737,6 +774,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
737# CONFIG_SERIAL_JSM is not set 774# CONFIG_SERIAL_JSM is not set
738# CONFIG_SERIAL_OF_PLATFORM is not set 775# CONFIG_SERIAL_OF_PLATFORM is not set
739CONFIG_SERIAL_QE=y 776CONFIG_SERIAL_QE=y
777# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
740CONFIG_UNIX98_PTYS=y 778CONFIG_UNIX98_PTYS=y
741# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 779# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
742CONFIG_LEGACY_PTYS=y 780CONFIG_LEGACY_PTYS=y
@@ -795,11 +833,6 @@ CONFIG_I2C_MPC=y
795# CONFIG_I2C_TAOS_EVM is not set 833# CONFIG_I2C_TAOS_EVM is not set
796 834
797# 835#
798# Graphics adapter I2C/DDC channel drivers
799#
800# CONFIG_I2C_VOODOO3 is not set
801
802#
803# Other I2C/SMBus bus drivers 836# Other I2C/SMBus bus drivers
804# 837#
805# CONFIG_I2C_PCA_PLATFORM is not set 838# CONFIG_I2C_PCA_PLATFORM is not set
@@ -808,7 +841,6 @@ CONFIG_I2C_MPC=y
808# 841#
809# Miscellaneous I2C Chip support 842# Miscellaneous I2C Chip support
810# 843#
811# CONFIG_DS1682 is not set
812# CONFIG_SENSORS_TSL2550 is not set 844# CONFIG_SENSORS_TSL2550 is not set
813# CONFIG_I2C_DEBUG_CORE is not set 845# CONFIG_I2C_DEBUG_CORE is not set
814# CONFIG_I2C_DEBUG_ALGO is not set 846# CONFIG_I2C_DEBUG_ALGO is not set
@@ -823,6 +855,8 @@ CONFIG_SPI_MASTER=y
823CONFIG_SPI_BITBANG=y 855CONFIG_SPI_BITBANG=y
824# CONFIG_SPI_GPIO is not set 856# CONFIG_SPI_GPIO is not set
825# CONFIG_SPI_MPC8xxx is not set 857# CONFIG_SPI_MPC8xxx is not set
858# CONFIG_SPI_XILINX is not set
859# CONFIG_SPI_DESIGNWARE is not set
826 860
827# 861#
828# SPI Protocol Masters 862# SPI Protocol Masters
@@ -854,6 +888,7 @@ CONFIG_GPIOLIB=y
854# 888#
855# PCI GPIO expanders: 889# PCI GPIO expanders:
856# 890#
891# CONFIG_GPIO_CS5535 is not set
857# CONFIG_GPIO_BT8XX is not set 892# CONFIG_GPIO_BT8XX is not set
858# CONFIG_GPIO_LANGWELL is not set 893# CONFIG_GPIO_LANGWELL is not set
859 894
@@ -903,6 +938,7 @@ CONFIG_SSB_POSSIBLE=y
903# CONFIG_TWL4030_CORE is not set 938# CONFIG_TWL4030_CORE is not set
904# CONFIG_MFD_TMIO is not set 939# CONFIG_MFD_TMIO is not set
905# CONFIG_PMIC_DA903X is not set 940# CONFIG_PMIC_DA903X is not set
941# CONFIG_PMIC_ADP5520 is not set
906# CONFIG_MFD_WM8400 is not set 942# CONFIG_MFD_WM8400 is not set
907# CONFIG_MFD_WM831X is not set 943# CONFIG_MFD_WM831X is not set
908# CONFIG_MFD_WM8350_I2C is not set 944# CONFIG_MFD_WM8350_I2C is not set
@@ -910,6 +946,8 @@ CONFIG_SSB_POSSIBLE=y
910# CONFIG_MFD_MC13783 is not set 946# CONFIG_MFD_MC13783 is not set
911# CONFIG_AB3100_CORE is not set 947# CONFIG_AB3100_CORE is not set
912# CONFIG_EZX_PCAP is not set 948# CONFIG_EZX_PCAP is not set
949# CONFIG_MFD_88PM8607 is not set
950# CONFIG_AB4500_CORE is not set
913# CONFIG_REGULATOR is not set 951# CONFIG_REGULATOR is not set
914# CONFIG_MEDIA_SUPPORT is not set 952# CONFIG_MEDIA_SUPPORT is not set
915 953
@@ -1199,7 +1237,7 @@ CONFIG_FRAME_WARN=1024
1199# CONFIG_DEBUG_KERNEL is not set 1237# CONFIG_DEBUG_KERNEL is not set
1200# CONFIG_SLUB_DEBUG_ON is not set 1238# CONFIG_SLUB_DEBUG_ON is not set
1201# CONFIG_SLUB_STATS is not set 1239# CONFIG_SLUB_STATS is not set
1202# CONFIG_DEBUG_BUGVERBOSE is not set 1240CONFIG_DEBUG_BUGVERBOSE=y
1203# CONFIG_DEBUG_MEMORY_INIT is not set 1241# CONFIG_DEBUG_MEMORY_INIT is not set
1204# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1242# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1205# CONFIG_LATENCYTOP is not set 1243# CONFIG_LATENCYTOP is not set
@@ -1230,6 +1268,7 @@ CONFIG_PPC_EARLY_DEBUG=y
1230# CONFIG_PPC_EARLY_DEBUG_44x is not set 1268# CONFIG_PPC_EARLY_DEBUG_44x is not set
1231# CONFIG_PPC_EARLY_DEBUG_40x is not set 1269# CONFIG_PPC_EARLY_DEBUG_40x is not set
1232# CONFIG_PPC_EARLY_DEBUG_CPM is not set 1270# CONFIG_PPC_EARLY_DEBUG_CPM is not set
1271# CONFIG_PPC_EARLY_DEBUG_USBGECKO is not set
1233 1272
1234# 1273#
1235# Security options 1274# Security options
@@ -1237,7 +1276,11 @@ CONFIG_PPC_EARLY_DEBUG=y
1237# CONFIG_KEYS is not set 1276# CONFIG_KEYS is not set
1238# CONFIG_SECURITY is not set 1277# CONFIG_SECURITY is not set
1239# CONFIG_SECURITYFS is not set 1278# CONFIG_SECURITYFS is not set
1240# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1279# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1280# CONFIG_DEFAULT_SECURITY_SMACK is not set
1281# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1282CONFIG_DEFAULT_SECURITY_DAC=y
1283CONFIG_DEFAULT_SECURITY=""
1241CONFIG_CRYPTO=y 1284CONFIG_CRYPTO=y
1242 1285
1243# 1286#
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
index 730061574f96..f67b70d0b292 100644
--- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:29 2009 4# Wed Jan 6 09:24:22 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -174,14 +177,41 @@ CONFIG_LBDAF=y
174# IO Schedulers 177# IO Schedulers
175# 178#
176CONFIG_IOSCHED_NOOP=y 179CONFIG_IOSCHED_NOOP=y
177CONFIG_IOSCHED_AS=y
178CONFIG_IOSCHED_DEADLINE=y 180CONFIG_IOSCHED_DEADLINE=y
179CONFIG_IOSCHED_CFQ=y 181CONFIG_IOSCHED_CFQ=y
180CONFIG_DEFAULT_AS=y
181# CONFIG_DEFAULT_DEADLINE is not set 182# CONFIG_DEFAULT_DEADLINE is not set
182# CONFIG_DEFAULT_CFQ is not set 183CONFIG_DEFAULT_CFQ=y
183# CONFIG_DEFAULT_NOOP is not set 184# CONFIG_DEFAULT_NOOP is not set
184CONFIG_DEFAULT_IOSCHED="anticipatory" 185CONFIG_DEFAULT_IOSCHED="cfq"
186# CONFIG_INLINE_SPIN_TRYLOCK is not set
187# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK is not set
189# CONFIG_INLINE_SPIN_LOCK_BH is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
191# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
192CONFIG_INLINE_SPIN_UNLOCK=y
193# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
194CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
195# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
196# CONFIG_INLINE_READ_TRYLOCK is not set
197# CONFIG_INLINE_READ_LOCK is not set
198# CONFIG_INLINE_READ_LOCK_BH is not set
199# CONFIG_INLINE_READ_LOCK_IRQ is not set
200# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
201CONFIG_INLINE_READ_UNLOCK=y
202# CONFIG_INLINE_READ_UNLOCK_BH is not set
203CONFIG_INLINE_READ_UNLOCK_IRQ=y
204# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
205# CONFIG_INLINE_WRITE_TRYLOCK is not set
206# CONFIG_INLINE_WRITE_LOCK is not set
207# CONFIG_INLINE_WRITE_LOCK_BH is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
209# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
210CONFIG_INLINE_WRITE_UNLOCK=y
211# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
212CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
213# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
214# CONFIG_MUTEX_SPIN_ON_OWNER is not set
185# CONFIG_FREEZER is not set 215# CONFIG_FREEZER is not set
186 216
187# 217#
@@ -259,6 +289,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 289CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 290# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
292CONFIG_SPARSE_IRQ=y
262CONFIG_MAX_ACTIVE_REGIONS=32 293CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 295CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -275,8 +306,6 @@ CONFIG_MIGRATION=y
275CONFIG_ZONE_DMA_FLAG=1 306CONFIG_ZONE_DMA_FLAG=1
276CONFIG_BOUNCE=y 307CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 308CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set 309# CONFIG_KSM is not set
281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 310CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
282CONFIG_PPC_4K_PAGES=y 311CONFIG_PPC_4K_PAGES=y
@@ -403,9 +432,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
403# CONFIG_AF_RXRPC is not set 432# CONFIG_AF_RXRPC is not set
404CONFIG_WIRELESS=y 433CONFIG_WIRELESS=y
405# CONFIG_CFG80211 is not set 434# CONFIG_CFG80211 is not set
406CONFIG_CFG80211_DEFAULT_PS_VALUE=0
407CONFIG_WIRELESS_OLD_REGULATORY=y
408# CONFIG_WIRELESS_EXT is not set
409# CONFIG_LIB80211 is not set 435# CONFIG_LIB80211 is not set
410 436
411# 437#
@@ -443,6 +469,10 @@ CONFIG_BLK_DEV=y
443# CONFIG_BLK_DEV_COW_COMMON is not set 469# CONFIG_BLK_DEV_COW_COMMON is not set
444CONFIG_BLK_DEV_LOOP=y 470CONFIG_BLK_DEV_LOOP=y
445# CONFIG_BLK_DEV_CRYPTOLOOP is not set 471# CONFIG_BLK_DEV_CRYPTOLOOP is not set
472
473#
474# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
475#
446# CONFIG_BLK_DEV_NBD is not set 476# CONFIG_BLK_DEV_NBD is not set
447# CONFIG_BLK_DEV_SX8 is not set 477# CONFIG_BLK_DEV_SX8 is not set
448CONFIG_BLK_DEV_RAM=y 478CONFIG_BLK_DEV_RAM=y
@@ -453,6 +483,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
453# CONFIG_ATA_OVER_ETH is not set 483# CONFIG_ATA_OVER_ETH is not set
454# CONFIG_BLK_DEV_HD is not set 484# CONFIG_BLK_DEV_HD is not set
455CONFIG_MISC_DEVICES=y 485CONFIG_MISC_DEVICES=y
486# CONFIG_AD525X_DPOT is not set
456# CONFIG_PHANTOM is not set 487# CONFIG_PHANTOM is not set
457# CONFIG_SGI_IOC4 is not set 488# CONFIG_SGI_IOC4 is not set
458# CONFIG_TIFM_CORE is not set 489# CONFIG_TIFM_CORE is not set
@@ -460,6 +491,7 @@ CONFIG_MISC_DEVICES=y
460# CONFIG_ENCLOSURE_SERVICES is not set 491# CONFIG_ENCLOSURE_SERVICES is not set
461# CONFIG_HP_ILO is not set 492# CONFIG_HP_ILO is not set
462# CONFIG_ISL29003 is not set 493# CONFIG_ISL29003 is not set
494# CONFIG_DS1682 is not set
463# CONFIG_C2PORT is not set 495# CONFIG_C2PORT is not set
464 496
465# 497#
@@ -512,7 +544,9 @@ CONFIG_SCSI_LOWLEVEL=y
512# CONFIG_SCSI_BNX2_ISCSI is not set 544# CONFIG_SCSI_BNX2_ISCSI is not set
513# CONFIG_BE2ISCSI is not set 545# CONFIG_BE2ISCSI is not set
514# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 546# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
547# CONFIG_SCSI_HPSA is not set
515# CONFIG_SCSI_3W_9XXX is not set 548# CONFIG_SCSI_3W_9XXX is not set
549# CONFIG_SCSI_3W_SAS is not set
516# CONFIG_SCSI_ACARD is not set 550# CONFIG_SCSI_ACARD is not set
517# CONFIG_SCSI_AACRAID is not set 551# CONFIG_SCSI_AACRAID is not set
518# CONFIG_SCSI_AIC7XXX is not set 552# CONFIG_SCSI_AIC7XXX is not set
@@ -551,6 +585,7 @@ CONFIG_SCSI_LOWLEVEL=y
551# CONFIG_SCSI_NSP32 is not set 585# CONFIG_SCSI_NSP32 is not set
552# CONFIG_SCSI_DEBUG is not set 586# CONFIG_SCSI_DEBUG is not set
553# CONFIG_SCSI_PMCRAID is not set 587# CONFIG_SCSI_PMCRAID is not set
588# CONFIG_SCSI_PM8001 is not set
554# CONFIG_SCSI_SRP is not set 589# CONFIG_SCSI_SRP is not set
555# CONFIG_SCSI_BFA_FC is not set 590# CONFIG_SCSI_BFA_FC is not set
556# CONFIG_SCSI_DH is not set 591# CONFIG_SCSI_DH is not set
@@ -606,15 +641,16 @@ CONFIG_ATA_SFF=y
606# CONFIG_PATA_NS87415 is not set 641# CONFIG_PATA_NS87415 is not set
607# CONFIG_PATA_OPTI is not set 642# CONFIG_PATA_OPTI is not set
608# CONFIG_PATA_OPTIDMA is not set 643# CONFIG_PATA_OPTIDMA is not set
644# CONFIG_PATA_PDC2027X is not set
609# CONFIG_PATA_PDC_OLD is not set 645# CONFIG_PATA_PDC_OLD is not set
610# CONFIG_PATA_RADISYS is not set 646# CONFIG_PATA_RADISYS is not set
611# CONFIG_PATA_RDC is not set 647# CONFIG_PATA_RDC is not set
612# CONFIG_PATA_RZ1000 is not set 648# CONFIG_PATA_RZ1000 is not set
613# CONFIG_PATA_SC1200 is not set 649# CONFIG_PATA_SC1200 is not set
614# CONFIG_PATA_SERVERWORKS is not set 650# CONFIG_PATA_SERVERWORKS is not set
615# CONFIG_PATA_PDC2027X is not set
616# CONFIG_PATA_SIL680 is not set 651# CONFIG_PATA_SIL680 is not set
617# CONFIG_PATA_SIS is not set 652# CONFIG_PATA_SIS is not set
653# CONFIG_PATA_TOSHIBA is not set
618# CONFIG_PATA_VIA is not set 654# CONFIG_PATA_VIA is not set
619# CONFIG_PATA_WINBOND is not set 655# CONFIG_PATA_WINBOND is not set
620# CONFIG_PATA_PLATFORM is not set 656# CONFIG_PATA_PLATFORM is not set
@@ -631,7 +667,7 @@ CONFIG_ATA_SFF=y
631# 667#
632 668
633# 669#
634# See the help texts for more information. 670# The newer stack is recommended.
635# 671#
636# CONFIG_FIREWIRE is not set 672# CONFIG_FIREWIRE is not set
637# CONFIG_IEEE1394 is not set 673# CONFIG_IEEE1394 is not set
@@ -736,8 +772,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
736# CONFIG_BE2NET is not set 772# CONFIG_BE2NET is not set
737# CONFIG_TR is not set 773# CONFIG_TR is not set
738CONFIG_WLAN=y 774CONFIG_WLAN=y
739# CONFIG_WLAN_PRE80211 is not set 775# CONFIG_AIRO is not set
740# CONFIG_WLAN_80211 is not set 776# CONFIG_ATMEL is not set
777# CONFIG_PRISM54 is not set
778# CONFIG_HOSTAP is not set
741 779
742# 780#
743# Enable WiMAX (Networking options) to see the WiMAX drivers 781# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -751,6 +789,7 @@ CONFIG_WLAN=y
751# CONFIG_NETCONSOLE is not set 789# CONFIG_NETCONSOLE is not set
752# CONFIG_NETPOLL is not set 790# CONFIG_NETPOLL is not set
753# CONFIG_NET_POLL_CONTROLLER is not set 791# CONFIG_NET_POLL_CONTROLLER is not set
792# CONFIG_VMXNET3 is not set
754# CONFIG_ISDN is not set 793# CONFIG_ISDN is not set
755# CONFIG_PHONE is not set 794# CONFIG_PHONE is not set
756 795
@@ -760,6 +799,7 @@ CONFIG_WLAN=y
760CONFIG_INPUT=y 799CONFIG_INPUT=y
761# CONFIG_INPUT_FF_MEMLESS is not set 800# CONFIG_INPUT_FF_MEMLESS is not set
762# CONFIG_INPUT_POLLDEV is not set 801# CONFIG_INPUT_POLLDEV is not set
802# CONFIG_INPUT_SPARSEKMAP is not set
763 803
764# 804#
765# Userland interfaces 805# Userland interfaces
@@ -811,6 +851,7 @@ CONFIG_SERIAL_CORE=y
811CONFIG_SERIAL_CORE_CONSOLE=y 851CONFIG_SERIAL_CORE_CONSOLE=y
812# CONFIG_SERIAL_JSM is not set 852# CONFIG_SERIAL_JSM is not set
813# CONFIG_SERIAL_OF_PLATFORM is not set 853# CONFIG_SERIAL_OF_PLATFORM is not set
854# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
814CONFIG_UNIX98_PTYS=y 855CONFIG_UNIX98_PTYS=y
815# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 856# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
816CONFIG_LEGACY_PTYS=y 857CONFIG_LEGACY_PTYS=y
@@ -868,11 +909,6 @@ CONFIG_I2C_MPC=y
868# CONFIG_I2C_TAOS_EVM is not set 909# CONFIG_I2C_TAOS_EVM is not set
869 910
870# 911#
871# Graphics adapter I2C/DDC channel drivers
872#
873# CONFIG_I2C_VOODOO3 is not set
874
875#
876# Other I2C/SMBus bus drivers 912# Other I2C/SMBus bus drivers
877# 913#
878# CONFIG_I2C_PCA_PLATFORM is not set 914# CONFIG_I2C_PCA_PLATFORM is not set
@@ -881,7 +917,6 @@ CONFIG_I2C_MPC=y
881# 917#
882# Miscellaneous I2C Chip support 918# Miscellaneous I2C Chip support
883# 919#
884# CONFIG_DS1682 is not set
885# CONFIG_SENSORS_TSL2550 is not set 920# CONFIG_SENSORS_TSL2550 is not set
886# CONFIG_I2C_DEBUG_CORE is not set 921# CONFIG_I2C_DEBUG_CORE is not set
887# CONFIG_I2C_DEBUG_ALGO is not set 922# CONFIG_I2C_DEBUG_ALGO is not set
@@ -927,6 +962,7 @@ CONFIG_HWMON=y
927# CONFIG_SENSORS_GL520SM is not set 962# CONFIG_SENSORS_GL520SM is not set
928# CONFIG_SENSORS_IT87 is not set 963# CONFIG_SENSORS_IT87 is not set
929# CONFIG_SENSORS_LM63 is not set 964# CONFIG_SENSORS_LM63 is not set
965# CONFIG_SENSORS_LM73 is not set
930# CONFIG_SENSORS_LM75 is not set 966# CONFIG_SENSORS_LM75 is not set
931# CONFIG_SENSORS_LM77 is not set 967# CONFIG_SENSORS_LM77 is not set
932# CONFIG_SENSORS_LM78 is not set 968# CONFIG_SENSORS_LM78 is not set
@@ -965,6 +1001,7 @@ CONFIG_HWMON=y
965# CONFIG_SENSORS_W83L786NG is not set 1001# CONFIG_SENSORS_W83L786NG is not set
966# CONFIG_SENSORS_W83627HF is not set 1002# CONFIG_SENSORS_W83627HF is not set
967# CONFIG_SENSORS_W83627EHF is not set 1003# CONFIG_SENSORS_W83627EHF is not set
1004# CONFIG_SENSORS_LIS3_I2C is not set
968# CONFIG_THERMAL is not set 1005# CONFIG_THERMAL is not set
969CONFIG_WATCHDOG=y 1006CONFIG_WATCHDOG=y
970# CONFIG_WATCHDOG_NOWAYOUT is not set 1007# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -997,11 +1034,13 @@ CONFIG_SSB_POSSIBLE=y
997# CONFIG_TWL4030_CORE is not set 1034# CONFIG_TWL4030_CORE is not set
998# CONFIG_MFD_TMIO is not set 1035# CONFIG_MFD_TMIO is not set
999# CONFIG_PMIC_DA903X is not set 1036# CONFIG_PMIC_DA903X is not set
1037# CONFIG_PMIC_ADP5520 is not set
1000# CONFIG_MFD_WM8400 is not set 1038# CONFIG_MFD_WM8400 is not set
1001# CONFIG_MFD_WM831X is not set 1039# CONFIG_MFD_WM831X is not set
1002# CONFIG_MFD_WM8350_I2C is not set 1040# CONFIG_MFD_WM8350_I2C is not set
1003# CONFIG_MFD_PCF50633 is not set 1041# CONFIG_MFD_PCF50633 is not set
1004# CONFIG_AB3100_CORE is not set 1042# CONFIG_AB3100_CORE is not set
1043# CONFIG_MFD_88PM8607 is not set
1005# CONFIG_REGULATOR is not set 1044# CONFIG_REGULATOR is not set
1006# CONFIG_MEDIA_SUPPORT is not set 1045# CONFIG_MEDIA_SUPPORT is not set
1007 1046
@@ -1226,7 +1265,7 @@ CONFIG_FRAME_WARN=1024
1226# CONFIG_DEBUG_FS is not set 1265# CONFIG_DEBUG_FS is not set
1227# CONFIG_HEADERS_CHECK is not set 1266# CONFIG_HEADERS_CHECK is not set
1228# CONFIG_DEBUG_KERNEL is not set 1267# CONFIG_DEBUG_KERNEL is not set
1229# CONFIG_DEBUG_BUGVERBOSE is not set 1268CONFIG_DEBUG_BUGVERBOSE=y
1230# CONFIG_DEBUG_MEMORY_INIT is not set 1269# CONFIG_DEBUG_MEMORY_INIT is not set
1231# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1270# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1232# CONFIG_LATENCYTOP is not set 1271# CONFIG_LATENCYTOP is not set
@@ -1253,7 +1292,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1253# CONFIG_KEYS is not set 1292# CONFIG_KEYS is not set
1254# CONFIG_SECURITY is not set 1293# CONFIG_SECURITY is not set
1255# CONFIG_SECURITYFS is not set 1294# CONFIG_SECURITYFS is not set
1256# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1295# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1296# CONFIG_DEFAULT_SECURITY_SMACK is not set
1297# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1298CONFIG_DEFAULT_SECURITY_DAC=y
1299CONFIG_DEFAULT_SECURITY=""
1257CONFIG_CRYPTO=y 1300CONFIG_CRYPTO=y
1258 1301
1259# 1302#
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
index 9e9158a5b190..a84fd1194e2b 100644
--- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:30 2009 4# Wed Jan 6 09:24:24 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -174,14 +177,41 @@ CONFIG_LBDAF=y
174# IO Schedulers 177# IO Schedulers
175# 178#
176CONFIG_IOSCHED_NOOP=y 179CONFIG_IOSCHED_NOOP=y
177CONFIG_IOSCHED_AS=y
178CONFIG_IOSCHED_DEADLINE=y 180CONFIG_IOSCHED_DEADLINE=y
179CONFIG_IOSCHED_CFQ=y 181CONFIG_IOSCHED_CFQ=y
180CONFIG_DEFAULT_AS=y
181# CONFIG_DEFAULT_DEADLINE is not set 182# CONFIG_DEFAULT_DEADLINE is not set
182# CONFIG_DEFAULT_CFQ is not set 183CONFIG_DEFAULT_CFQ=y
183# CONFIG_DEFAULT_NOOP is not set 184# CONFIG_DEFAULT_NOOP is not set
184CONFIG_DEFAULT_IOSCHED="anticipatory" 185CONFIG_DEFAULT_IOSCHED="cfq"
186# CONFIG_INLINE_SPIN_TRYLOCK is not set
187# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK is not set
189# CONFIG_INLINE_SPIN_LOCK_BH is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
191# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
192CONFIG_INLINE_SPIN_UNLOCK=y
193# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
194CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
195# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
196# CONFIG_INLINE_READ_TRYLOCK is not set
197# CONFIG_INLINE_READ_LOCK is not set
198# CONFIG_INLINE_READ_LOCK_BH is not set
199# CONFIG_INLINE_READ_LOCK_IRQ is not set
200# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
201CONFIG_INLINE_READ_UNLOCK=y
202# CONFIG_INLINE_READ_UNLOCK_BH is not set
203CONFIG_INLINE_READ_UNLOCK_IRQ=y
204# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
205# CONFIG_INLINE_WRITE_TRYLOCK is not set
206# CONFIG_INLINE_WRITE_LOCK is not set
207# CONFIG_INLINE_WRITE_LOCK_BH is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
209# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
210CONFIG_INLINE_WRITE_UNLOCK=y
211# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
212CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
213# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
214# CONFIG_MUTEX_SPIN_ON_OWNER is not set
185# CONFIG_FREEZER is not set 215# CONFIG_FREEZER is not set
186 216
187# 217#
@@ -259,6 +289,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 289CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 290# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
292CONFIG_SPARSE_IRQ=y
262CONFIG_MAX_ACTIVE_REGIONS=32 293CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 295CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -275,8 +306,6 @@ CONFIG_MIGRATION=y
275CONFIG_ZONE_DMA_FLAG=1 306CONFIG_ZONE_DMA_FLAG=1
276CONFIG_BOUNCE=y 307CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 308CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set 309# CONFIG_KSM is not set
281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 310CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
282CONFIG_PPC_4K_PAGES=y 311CONFIG_PPC_4K_PAGES=y
@@ -398,9 +427,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
398# CONFIG_AF_RXRPC is not set 427# CONFIG_AF_RXRPC is not set
399CONFIG_WIRELESS=y 428CONFIG_WIRELESS=y
400# CONFIG_CFG80211 is not set 429# CONFIG_CFG80211 is not set
401CONFIG_CFG80211_DEFAULT_PS_VALUE=0
402CONFIG_WIRELESS_OLD_REGULATORY=y
403# CONFIG_WIRELESS_EXT is not set
404# CONFIG_LIB80211 is not set 430# CONFIG_LIB80211 is not set
405 431
406# 432#
@@ -438,6 +464,10 @@ CONFIG_BLK_DEV=y
438# CONFIG_BLK_DEV_COW_COMMON is not set 464# CONFIG_BLK_DEV_COW_COMMON is not set
439CONFIG_BLK_DEV_LOOP=y 465CONFIG_BLK_DEV_LOOP=y
440# CONFIG_BLK_DEV_CRYPTOLOOP is not set 466# CONFIG_BLK_DEV_CRYPTOLOOP is not set
467
468#
469# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
470#
441# CONFIG_BLK_DEV_NBD is not set 471# CONFIG_BLK_DEV_NBD is not set
442# CONFIG_BLK_DEV_SX8 is not set 472# CONFIG_BLK_DEV_SX8 is not set
443# CONFIG_BLK_DEV_UB is not set 473# CONFIG_BLK_DEV_UB is not set
@@ -449,6 +479,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
449# CONFIG_ATA_OVER_ETH is not set 479# CONFIG_ATA_OVER_ETH is not set
450# CONFIG_BLK_DEV_HD is not set 480# CONFIG_BLK_DEV_HD is not set
451CONFIG_MISC_DEVICES=y 481CONFIG_MISC_DEVICES=y
482# CONFIG_AD525X_DPOT is not set
452# CONFIG_PHANTOM is not set 483# CONFIG_PHANTOM is not set
453# CONFIG_SGI_IOC4 is not set 484# CONFIG_SGI_IOC4 is not set
454# CONFIG_TIFM_CORE is not set 485# CONFIG_TIFM_CORE is not set
@@ -456,6 +487,7 @@ CONFIG_MISC_DEVICES=y
456# CONFIG_ENCLOSURE_SERVICES is not set 487# CONFIG_ENCLOSURE_SERVICES is not set
457# CONFIG_HP_ILO is not set 488# CONFIG_HP_ILO is not set
458# CONFIG_ISL29003 is not set 489# CONFIG_ISL29003 is not set
490# CONFIG_DS1682 is not set
459# CONFIG_C2PORT is not set 491# CONFIG_C2PORT is not set
460 492
461# 493#
@@ -507,7 +539,9 @@ CONFIG_SCSI_LOWLEVEL=y
507# CONFIG_SCSI_BNX2_ISCSI is not set 539# CONFIG_SCSI_BNX2_ISCSI is not set
508# CONFIG_BE2ISCSI is not set 540# CONFIG_BE2ISCSI is not set
509# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 541# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
542# CONFIG_SCSI_HPSA is not set
510# CONFIG_SCSI_3W_9XXX is not set 543# CONFIG_SCSI_3W_9XXX is not set
544# CONFIG_SCSI_3W_SAS is not set
511# CONFIG_SCSI_ACARD is not set 545# CONFIG_SCSI_ACARD is not set
512# CONFIG_SCSI_AACRAID is not set 546# CONFIG_SCSI_AACRAID is not set
513# CONFIG_SCSI_AIC7XXX is not set 547# CONFIG_SCSI_AIC7XXX is not set
@@ -546,6 +580,7 @@ CONFIG_SCSI_LOWLEVEL=y
546# CONFIG_SCSI_NSP32 is not set 580# CONFIG_SCSI_NSP32 is not set
547# CONFIG_SCSI_DEBUG is not set 581# CONFIG_SCSI_DEBUG is not set
548# CONFIG_SCSI_PMCRAID is not set 582# CONFIG_SCSI_PMCRAID is not set
583# CONFIG_SCSI_PM8001 is not set
549# CONFIG_SCSI_SRP is not set 584# CONFIG_SCSI_SRP is not set
550# CONFIG_SCSI_BFA_FC is not set 585# CONFIG_SCSI_BFA_FC is not set
551# CONFIG_SCSI_DH is not set 586# CONFIG_SCSI_DH is not set
@@ -601,15 +636,16 @@ CONFIG_ATA_SFF=y
601# CONFIG_PATA_NS87415 is not set 636# CONFIG_PATA_NS87415 is not set
602# CONFIG_PATA_OPTI is not set 637# CONFIG_PATA_OPTI is not set
603# CONFIG_PATA_OPTIDMA is not set 638# CONFIG_PATA_OPTIDMA is not set
639# CONFIG_PATA_PDC2027X is not set
604# CONFIG_PATA_PDC_OLD is not set 640# CONFIG_PATA_PDC_OLD is not set
605# CONFIG_PATA_RADISYS is not set 641# CONFIG_PATA_RADISYS is not set
606# CONFIG_PATA_RDC is not set 642# CONFIG_PATA_RDC is not set
607# CONFIG_PATA_RZ1000 is not set 643# CONFIG_PATA_RZ1000 is not set
608# CONFIG_PATA_SC1200 is not set 644# CONFIG_PATA_SC1200 is not set
609# CONFIG_PATA_SERVERWORKS is not set 645# CONFIG_PATA_SERVERWORKS is not set
610# CONFIG_PATA_PDC2027X is not set
611# CONFIG_PATA_SIL680 is not set 646# CONFIG_PATA_SIL680 is not set
612# CONFIG_PATA_SIS is not set 647# CONFIG_PATA_SIS is not set
648# CONFIG_PATA_TOSHIBA is not set
613# CONFIG_PATA_VIA is not set 649# CONFIG_PATA_VIA is not set
614# CONFIG_PATA_WINBOND is not set 650# CONFIG_PATA_WINBOND is not set
615# CONFIG_PATA_PLATFORM is not set 651# CONFIG_PATA_PLATFORM is not set
@@ -638,7 +674,7 @@ CONFIG_MD_RAID6_PQ=y
638# 674#
639 675
640# 676#
641# See the help texts for more information. 677# The newer stack is recommended.
642# 678#
643# CONFIG_FIREWIRE is not set 679# CONFIG_FIREWIRE is not set
644# CONFIG_IEEE1394 is not set 680# CONFIG_IEEE1394 is not set
@@ -725,8 +761,11 @@ CONFIG_GIANFAR=y
725# CONFIG_NETDEV_10000 is not set 761# CONFIG_NETDEV_10000 is not set
726# CONFIG_TR is not set 762# CONFIG_TR is not set
727CONFIG_WLAN=y 763CONFIG_WLAN=y
728# CONFIG_WLAN_PRE80211 is not set 764# CONFIG_AIRO is not set
729# CONFIG_WLAN_80211 is not set 765# CONFIG_ATMEL is not set
766# CONFIG_PRISM54 is not set
767# CONFIG_USB_ZD1201 is not set
768# CONFIG_HOSTAP is not set
730 769
731# 770#
732# Enable WiMAX (Networking options) to see the WiMAX drivers 771# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -749,6 +788,7 @@ CONFIG_WLAN=y
749# CONFIG_NETCONSOLE is not set 788# CONFIG_NETCONSOLE is not set
750# CONFIG_NETPOLL is not set 789# CONFIG_NETPOLL is not set
751# CONFIG_NET_POLL_CONTROLLER is not set 790# CONFIG_NET_POLL_CONTROLLER is not set
791# CONFIG_VMXNET3 is not set
752# CONFIG_ISDN is not set 792# CONFIG_ISDN is not set
753# CONFIG_PHONE is not set 793# CONFIG_PHONE is not set
754 794
@@ -758,6 +798,7 @@ CONFIG_WLAN=y
758CONFIG_INPUT=y 798CONFIG_INPUT=y
759CONFIG_INPUT_FF_MEMLESS=m 799CONFIG_INPUT_FF_MEMLESS=m
760# CONFIG_INPUT_POLLDEV is not set 800# CONFIG_INPUT_POLLDEV is not set
801# CONFIG_INPUT_SPARSEKMAP is not set
761 802
762# 803#
763# Userland interfaces 804# Userland interfaces
@@ -809,6 +850,7 @@ CONFIG_SERIAL_CORE=y
809CONFIG_SERIAL_CORE_CONSOLE=y 850CONFIG_SERIAL_CORE_CONSOLE=y
810# CONFIG_SERIAL_JSM is not set 851# CONFIG_SERIAL_JSM is not set
811# CONFIG_SERIAL_OF_PLATFORM is not set 852# CONFIG_SERIAL_OF_PLATFORM is not set
853# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
812CONFIG_UNIX98_PTYS=y 854CONFIG_UNIX98_PTYS=y
813# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 855# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
814CONFIG_LEGACY_PTYS=y 856CONFIG_LEGACY_PTYS=y
@@ -867,11 +909,6 @@ CONFIG_I2C_MPC=y
867# CONFIG_I2C_TINY_USB is not set 909# CONFIG_I2C_TINY_USB is not set
868 910
869# 911#
870# Graphics adapter I2C/DDC channel drivers
871#
872# CONFIG_I2C_VOODOO3 is not set
873
874#
875# Other I2C/SMBus bus drivers 912# Other I2C/SMBus bus drivers
876# 913#
877# CONFIG_I2C_PCA_PLATFORM is not set 914# CONFIG_I2C_PCA_PLATFORM is not set
@@ -880,7 +917,6 @@ CONFIG_I2C_MPC=y
880# 917#
881# Miscellaneous I2C Chip support 918# Miscellaneous I2C Chip support
882# 919#
883# CONFIG_DS1682 is not set
884# CONFIG_SENSORS_TSL2550 is not set 920# CONFIG_SENSORS_TSL2550 is not set
885# CONFIG_I2C_DEBUG_CORE is not set 921# CONFIG_I2C_DEBUG_CORE is not set
886# CONFIG_I2C_DEBUG_ALGO is not set 922# CONFIG_I2C_DEBUG_ALGO is not set
@@ -926,6 +962,7 @@ CONFIG_HWMON=y
926# CONFIG_SENSORS_GL520SM is not set 962# CONFIG_SENSORS_GL520SM is not set
927# CONFIG_SENSORS_IT87 is not set 963# CONFIG_SENSORS_IT87 is not set
928# CONFIG_SENSORS_LM63 is not set 964# CONFIG_SENSORS_LM63 is not set
965# CONFIG_SENSORS_LM73 is not set
929# CONFIG_SENSORS_LM75 is not set 966# CONFIG_SENSORS_LM75 is not set
930# CONFIG_SENSORS_LM77 is not set 967# CONFIG_SENSORS_LM77 is not set
931# CONFIG_SENSORS_LM78 is not set 968# CONFIG_SENSORS_LM78 is not set
@@ -964,6 +1001,7 @@ CONFIG_HWMON=y
964# CONFIG_SENSORS_W83L786NG is not set 1001# CONFIG_SENSORS_W83L786NG is not set
965# CONFIG_SENSORS_W83627HF is not set 1002# CONFIG_SENSORS_W83627HF is not set
966# CONFIG_SENSORS_W83627EHF is not set 1003# CONFIG_SENSORS_W83627EHF is not set
1004# CONFIG_SENSORS_LIS3_I2C is not set
967# CONFIG_THERMAL is not set 1005# CONFIG_THERMAL is not set
968CONFIG_WATCHDOG=y 1006CONFIG_WATCHDOG=y
969# CONFIG_WATCHDOG_NOWAYOUT is not set 1007# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1001,11 +1039,13 @@ CONFIG_SSB_POSSIBLE=y
1001# CONFIG_TWL4030_CORE is not set 1039# CONFIG_TWL4030_CORE is not set
1002# CONFIG_MFD_TMIO is not set 1040# CONFIG_MFD_TMIO is not set
1003# CONFIG_PMIC_DA903X is not set 1041# CONFIG_PMIC_DA903X is not set
1042# CONFIG_PMIC_ADP5520 is not set
1004# CONFIG_MFD_WM8400 is not set 1043# CONFIG_MFD_WM8400 is not set
1005# CONFIG_MFD_WM831X is not set 1044# CONFIG_MFD_WM831X is not set
1006# CONFIG_MFD_WM8350_I2C is not set 1045# CONFIG_MFD_WM8350_I2C is not set
1007# CONFIG_MFD_PCF50633 is not set 1046# CONFIG_MFD_PCF50633 is not set
1008# CONFIG_AB3100_CORE is not set 1047# CONFIG_AB3100_CORE is not set
1048# CONFIG_MFD_88PM8607 is not set
1009# CONFIG_REGULATOR is not set 1049# CONFIG_REGULATOR is not set
1010# CONFIG_MEDIA_SUPPORT is not set 1050# CONFIG_MEDIA_SUPPORT is not set
1011 1051
@@ -1097,6 +1137,7 @@ CONFIG_USB_MON=y
1097CONFIG_USB_EHCI_HCD=y 1137CONFIG_USB_EHCI_HCD=y
1098CONFIG_USB_EHCI_ROOT_HUB_TT=y 1138CONFIG_USB_EHCI_ROOT_HUB_TT=y
1099# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1139# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1140# CONFIG_XPS_USB_HCD_XILINX is not set
1100CONFIG_USB_EHCI_FSL=y 1141CONFIG_USB_EHCI_FSL=y
1101CONFIG_USB_EHCI_HCD_PPC_OF=y 1142CONFIG_USB_EHCI_HCD_PPC_OF=y
1102# CONFIG_USB_OXU210HP_HCD is not set 1143# CONFIG_USB_OXU210HP_HCD is not set
@@ -1385,7 +1426,7 @@ CONFIG_FRAME_WARN=1024
1385# CONFIG_DEBUG_FS is not set 1426# CONFIG_DEBUG_FS is not set
1386# CONFIG_HEADERS_CHECK is not set 1427# CONFIG_HEADERS_CHECK is not set
1387# CONFIG_DEBUG_KERNEL is not set 1428# CONFIG_DEBUG_KERNEL is not set
1388# CONFIG_DEBUG_BUGVERBOSE is not set 1429CONFIG_DEBUG_BUGVERBOSE=y
1389# CONFIG_DEBUG_MEMORY_INIT is not set 1430# CONFIG_DEBUG_MEMORY_INIT is not set
1390# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1431# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1391# CONFIG_LATENCYTOP is not set 1432# CONFIG_LATENCYTOP is not set
@@ -1412,7 +1453,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1412# CONFIG_KEYS is not set 1453# CONFIG_KEYS is not set
1413# CONFIG_SECURITY is not set 1454# CONFIG_SECURITY is not set
1414# CONFIG_SECURITYFS is not set 1455# CONFIG_SECURITYFS is not set
1415# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1456# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1457# CONFIG_DEFAULT_SECURITY_SMACK is not set
1458# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1459CONFIG_DEFAULT_SECURITY_DAC=y
1460CONFIG_DEFAULT_SECURITY=""
1416CONFIG_XOR_BLOCKS=y 1461CONFIG_XOR_BLOCKS=y
1417CONFIG_ASYNC_CORE=y 1462CONFIG_ASYNC_CORE=y
1418CONFIG_ASYNC_MEMCPY=y 1463CONFIG_ASYNC_MEMCPY=y
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig
index 6b399154970f..72c2067137b9 100644
--- a/arch/powerpc/configs/83xx/sbc834x_defconfig
+++ b/arch/powerpc/configs/83xx/sbc834x_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:31 2009 4# Wed Jan 6 09:24:25 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -172,14 +175,41 @@ CONFIG_LBDAF=y
172# IO Schedulers 175# IO Schedulers
173# 176#
174CONFIG_IOSCHED_NOOP=y 177CONFIG_IOSCHED_NOOP=y
175CONFIG_IOSCHED_AS=y
176CONFIG_IOSCHED_DEADLINE=y 178CONFIG_IOSCHED_DEADLINE=y
177CONFIG_IOSCHED_CFQ=y 179CONFIG_IOSCHED_CFQ=y
178CONFIG_DEFAULT_AS=y
179# CONFIG_DEFAULT_DEADLINE is not set 180# CONFIG_DEFAULT_DEADLINE is not set
180# CONFIG_DEFAULT_CFQ is not set 181CONFIG_DEFAULT_CFQ=y
181# CONFIG_DEFAULT_NOOP is not set 182# CONFIG_DEFAULT_NOOP is not set
182CONFIG_DEFAULT_IOSCHED="anticipatory" 183CONFIG_DEFAULT_IOSCHED="cfq"
184# CONFIG_INLINE_SPIN_TRYLOCK is not set
185# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK is not set
187# CONFIG_INLINE_SPIN_LOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
190CONFIG_INLINE_SPIN_UNLOCK=y
191# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
192CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
193# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
194# CONFIG_INLINE_READ_TRYLOCK is not set
195# CONFIG_INLINE_READ_LOCK is not set
196# CONFIG_INLINE_READ_LOCK_BH is not set
197# CONFIG_INLINE_READ_LOCK_IRQ is not set
198# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
199CONFIG_INLINE_READ_UNLOCK=y
200# CONFIG_INLINE_READ_UNLOCK_BH is not set
201CONFIG_INLINE_READ_UNLOCK_IRQ=y
202# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
203# CONFIG_INLINE_WRITE_TRYLOCK is not set
204# CONFIG_INLINE_WRITE_LOCK is not set
205# CONFIG_INLINE_WRITE_LOCK_BH is not set
206# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
208CONFIG_INLINE_WRITE_UNLOCK=y
209# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
210CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
211# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
212# CONFIG_MUTEX_SPIN_ON_OWNER is not set
183# CONFIG_FREEZER is not set 213# CONFIG_FREEZER is not set
184 214
185# 215#
@@ -257,6 +287,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
257CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 287CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
258# CONFIG_KEXEC is not set 288# CONFIG_KEXEC is not set
259# CONFIG_CRASH_DUMP is not set 289# CONFIG_CRASH_DUMP is not set
290CONFIG_SPARSE_IRQ=y
260CONFIG_MAX_ACTIVE_REGIONS=32 291CONFIG_MAX_ACTIVE_REGIONS=32
261CONFIG_ARCH_FLATMEM_ENABLE=y 292CONFIG_ARCH_FLATMEM_ENABLE=y
262CONFIG_ARCH_POPULATES_NODE_MAP=y 293CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -273,8 +304,6 @@ CONFIG_MIGRATION=y
273CONFIG_ZONE_DMA_FLAG=1 304CONFIG_ZONE_DMA_FLAG=1
274CONFIG_BOUNCE=y 305CONFIG_BOUNCE=y
275CONFIG_VIRT_TO_BUS=y 306CONFIG_VIRT_TO_BUS=y
276CONFIG_HAVE_MLOCK=y
277CONFIG_HAVE_MLOCKED_PAGE_BIT=y
278# CONFIG_KSM is not set 307# CONFIG_KSM is not set
279CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 308CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
280CONFIG_PPC_4K_PAGES=y 309CONFIG_PPC_4K_PAGES=y
@@ -401,9 +430,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
401# CONFIG_AF_RXRPC is not set 430# CONFIG_AF_RXRPC is not set
402CONFIG_WIRELESS=y 431CONFIG_WIRELESS=y
403# CONFIG_CFG80211 is not set 432# CONFIG_CFG80211 is not set
404CONFIG_CFG80211_DEFAULT_PS_VALUE=0
405CONFIG_WIRELESS_OLD_REGULATORY=y
406# CONFIG_WIRELESS_EXT is not set
407# CONFIG_LIB80211 is not set 433# CONFIG_LIB80211 is not set
408 434
409# 435#
@@ -524,6 +550,10 @@ CONFIG_BLK_DEV=y
524# CONFIG_BLK_DEV_COW_COMMON is not set 550# CONFIG_BLK_DEV_COW_COMMON is not set
525CONFIG_BLK_DEV_LOOP=y 551CONFIG_BLK_DEV_LOOP=y
526# CONFIG_BLK_DEV_CRYPTOLOOP is not set 552# CONFIG_BLK_DEV_CRYPTOLOOP is not set
553
554#
555# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
556#
527# CONFIG_BLK_DEV_NBD is not set 557# CONFIG_BLK_DEV_NBD is not set
528# CONFIG_BLK_DEV_SX8 is not set 558# CONFIG_BLK_DEV_SX8 is not set
529# CONFIG_BLK_DEV_UB is not set 559# CONFIG_BLK_DEV_UB is not set
@@ -535,6 +565,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
535# CONFIG_ATA_OVER_ETH is not set 565# CONFIG_ATA_OVER_ETH is not set
536# CONFIG_BLK_DEV_HD is not set 566# CONFIG_BLK_DEV_HD is not set
537CONFIG_MISC_DEVICES=y 567CONFIG_MISC_DEVICES=y
568# CONFIG_AD525X_DPOT is not set
538# CONFIG_PHANTOM is not set 569# CONFIG_PHANTOM is not set
539# CONFIG_SGI_IOC4 is not set 570# CONFIG_SGI_IOC4 is not set
540# CONFIG_TIFM_CORE is not set 571# CONFIG_TIFM_CORE is not set
@@ -542,6 +573,7 @@ CONFIG_MISC_DEVICES=y
542# CONFIG_ENCLOSURE_SERVICES is not set 573# CONFIG_ENCLOSURE_SERVICES is not set
543# CONFIG_HP_ILO is not set 574# CONFIG_HP_ILO is not set
544# CONFIG_ISL29003 is not set 575# CONFIG_ISL29003 is not set
576# CONFIG_DS1682 is not set
545# CONFIG_C2PORT is not set 577# CONFIG_C2PORT is not set
546 578
547# 579#
@@ -604,7 +636,7 @@ CONFIG_SCSI_WAIT_SCAN=m
604# 636#
605 637
606# 638#
607# See the help texts for more information. 639# The newer stack is recommended.
608# 640#
609# CONFIG_FIREWIRE is not set 641# CONFIG_FIREWIRE is not set
610# CONFIG_IEEE1394 is not set 642# CONFIG_IEEE1394 is not set
@@ -691,8 +723,11 @@ CONFIG_GIANFAR=y
691# CONFIG_NETDEV_10000 is not set 723# CONFIG_NETDEV_10000 is not set
692# CONFIG_TR is not set 724# CONFIG_TR is not set
693CONFIG_WLAN=y 725CONFIG_WLAN=y
694# CONFIG_WLAN_PRE80211 is not set 726# CONFIG_AIRO is not set
695# CONFIG_WLAN_80211 is not set 727# CONFIG_ATMEL is not set
728# CONFIG_PRISM54 is not set
729# CONFIG_USB_ZD1201 is not set
730# CONFIG_HOSTAP is not set
696 731
697# 732#
698# Enable WiMAX (Networking options) to see the WiMAX drivers 733# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -715,6 +750,7 @@ CONFIG_WLAN=y
715# CONFIG_NETCONSOLE is not set 750# CONFIG_NETCONSOLE is not set
716# CONFIG_NETPOLL is not set 751# CONFIG_NETPOLL is not set
717# CONFIG_NET_POLL_CONTROLLER is not set 752# CONFIG_NET_POLL_CONTROLLER is not set
753# CONFIG_VMXNET3 is not set
718# CONFIG_ISDN is not set 754# CONFIG_ISDN is not set
719# CONFIG_PHONE is not set 755# CONFIG_PHONE is not set
720 756
@@ -724,6 +760,7 @@ CONFIG_WLAN=y
724CONFIG_INPUT=y 760CONFIG_INPUT=y
725# CONFIG_INPUT_FF_MEMLESS is not set 761# CONFIG_INPUT_FF_MEMLESS is not set
726# CONFIG_INPUT_POLLDEV is not set 762# CONFIG_INPUT_POLLDEV is not set
763# CONFIG_INPUT_SPARSEKMAP is not set
727 764
728# 765#
729# Userland interfaces 766# Userland interfaces
@@ -775,6 +812,7 @@ CONFIG_SERIAL_CORE=y
775CONFIG_SERIAL_CORE_CONSOLE=y 812CONFIG_SERIAL_CORE_CONSOLE=y
776# CONFIG_SERIAL_JSM is not set 813# CONFIG_SERIAL_JSM is not set
777# CONFIG_SERIAL_OF_PLATFORM is not set 814# CONFIG_SERIAL_OF_PLATFORM is not set
815# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
778CONFIG_UNIX98_PTYS=y 816CONFIG_UNIX98_PTYS=y
779# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 817# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
780CONFIG_LEGACY_PTYS=y 818CONFIG_LEGACY_PTYS=y
@@ -833,11 +871,6 @@ CONFIG_I2C_MPC=y
833# CONFIG_I2C_TINY_USB is not set 871# CONFIG_I2C_TINY_USB is not set
834 872
835# 873#
836# Graphics adapter I2C/DDC channel drivers
837#
838# CONFIG_I2C_VOODOO3 is not set
839
840#
841# Other I2C/SMBus bus drivers 874# Other I2C/SMBus bus drivers
842# 875#
843# CONFIG_I2C_PCA_PLATFORM is not set 876# CONFIG_I2C_PCA_PLATFORM is not set
@@ -846,7 +879,6 @@ CONFIG_I2C_MPC=y
846# 879#
847# Miscellaneous I2C Chip support 880# Miscellaneous I2C Chip support
848# 881#
849# CONFIG_DS1682 is not set
850# CONFIG_SENSORS_TSL2550 is not set 882# CONFIG_SENSORS_TSL2550 is not set
851# CONFIG_I2C_DEBUG_CORE is not set 883# CONFIG_I2C_DEBUG_CORE is not set
852# CONFIG_I2C_DEBUG_ALGO is not set 884# CONFIG_I2C_DEBUG_ALGO is not set
@@ -892,6 +924,7 @@ CONFIG_HWMON=y
892# CONFIG_SENSORS_GL520SM is not set 924# CONFIG_SENSORS_GL520SM is not set
893# CONFIG_SENSORS_IT87 is not set 925# CONFIG_SENSORS_IT87 is not set
894# CONFIG_SENSORS_LM63 is not set 926# CONFIG_SENSORS_LM63 is not set
927# CONFIG_SENSORS_LM73 is not set
895# CONFIG_SENSORS_LM75 is not set 928# CONFIG_SENSORS_LM75 is not set
896# CONFIG_SENSORS_LM77 is not set 929# CONFIG_SENSORS_LM77 is not set
897# CONFIG_SENSORS_LM78 is not set 930# CONFIG_SENSORS_LM78 is not set
@@ -930,6 +963,7 @@ CONFIG_HWMON=y
930# CONFIG_SENSORS_W83L786NG is not set 963# CONFIG_SENSORS_W83L786NG is not set
931# CONFIG_SENSORS_W83627HF is not set 964# CONFIG_SENSORS_W83627HF is not set
932# CONFIG_SENSORS_W83627EHF is not set 965# CONFIG_SENSORS_W83627EHF is not set
966# CONFIG_SENSORS_LIS3_I2C is not set
933# CONFIG_THERMAL is not set 967# CONFIG_THERMAL is not set
934CONFIG_WATCHDOG=y 968CONFIG_WATCHDOG=y
935# CONFIG_WATCHDOG_NOWAYOUT is not set 969# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -967,11 +1001,13 @@ CONFIG_SSB_POSSIBLE=y
967# CONFIG_TWL4030_CORE is not set 1001# CONFIG_TWL4030_CORE is not set
968# CONFIG_MFD_TMIO is not set 1002# CONFIG_MFD_TMIO is not set
969# CONFIG_PMIC_DA903X is not set 1003# CONFIG_PMIC_DA903X is not set
1004# CONFIG_PMIC_ADP5520 is not set
970# CONFIG_MFD_WM8400 is not set 1005# CONFIG_MFD_WM8400 is not set
971# CONFIG_MFD_WM831X is not set 1006# CONFIG_MFD_WM831X is not set
972# CONFIG_MFD_WM8350_I2C is not set 1007# CONFIG_MFD_WM8350_I2C is not set
973# CONFIG_MFD_PCF50633 is not set 1008# CONFIG_MFD_PCF50633 is not set
974# CONFIG_AB3100_CORE is not set 1009# CONFIG_AB3100_CORE is not set
1010# CONFIG_MFD_88PM8607 is not set
975# CONFIG_REGULATOR is not set 1011# CONFIG_REGULATOR is not set
976# CONFIG_MEDIA_SUPPORT is not set 1012# CONFIG_MEDIA_SUPPORT is not set
977 1013
@@ -1039,6 +1075,7 @@ CONFIG_USB_MON=y
1039CONFIG_USB_EHCI_HCD=y 1075CONFIG_USB_EHCI_HCD=y
1040CONFIG_USB_EHCI_ROOT_HUB_TT=y 1076CONFIG_USB_EHCI_ROOT_HUB_TT=y
1041# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1077# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1078# CONFIG_XPS_USB_HCD_XILINX is not set
1042CONFIG_USB_EHCI_FSL=y 1079CONFIG_USB_EHCI_FSL=y
1043CONFIG_USB_EHCI_HCD_PPC_OF=y 1080CONFIG_USB_EHCI_HCD_PPC_OF=y
1044# CONFIG_USB_OXU210HP_HCD is not set 1081# CONFIG_USB_OXU210HP_HCD is not set
@@ -1321,7 +1358,7 @@ CONFIG_FRAME_WARN=1024
1321# CONFIG_DEBUG_FS is not set 1358# CONFIG_DEBUG_FS is not set
1322# CONFIG_HEADERS_CHECK is not set 1359# CONFIG_HEADERS_CHECK is not set
1323# CONFIG_DEBUG_KERNEL is not set 1360# CONFIG_DEBUG_KERNEL is not set
1324# CONFIG_DEBUG_BUGVERBOSE is not set 1361CONFIG_DEBUG_BUGVERBOSE=y
1325# CONFIG_DEBUG_MEMORY_INIT is not set 1362# CONFIG_DEBUG_MEMORY_INIT is not set
1326# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1363# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1327# CONFIG_LATENCYTOP is not set 1364# CONFIG_LATENCYTOP is not set
@@ -1348,7 +1385,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1348# CONFIG_KEYS is not set 1385# CONFIG_KEYS is not set
1349# CONFIG_SECURITY is not set 1386# CONFIG_SECURITY is not set
1350# CONFIG_SECURITYFS is not set 1387# CONFIG_SECURITYFS is not set
1351# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1388# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1389# CONFIG_DEFAULT_SECURITY_SMACK is not set
1390# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1391CONFIG_DEFAULT_SECURITY_DAC=y
1392CONFIG_DEFAULT_SECURITY=""
1352CONFIG_CRYPTO=y 1393CONFIG_CRYPTO=y
1353 1394
1354# 1395#
diff --git a/arch/powerpc/configs/85xx/ksi8560_defconfig b/arch/powerpc/configs/85xx/ksi8560_defconfig
index a5bde8da462c..21dad38b156f 100644
--- a/arch/powerpc/configs/85xx/ksi8560_defconfig
+++ b/arch/powerpc/configs/85xx/ksi8560_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:32 2009 4# Wed Jan 6 09:24:26 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -89,6 +92,7 @@ CONFIG_SYSVIPC_SYSCTL=y
89# 92#
90CONFIG_TREE_RCU=y 93CONFIG_TREE_RCU=y
91# CONFIG_TREE_PREEMPT_RCU is not set 94# CONFIG_TREE_PREEMPT_RCU is not set
95# CONFIG_TINY_RCU is not set
92# CONFIG_RCU_TRACE is not set 96# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32 97CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set 98# CONFIG_RCU_FANOUT_EXACT is not set
@@ -169,14 +173,41 @@ CONFIG_LBDAF=y
169# IO Schedulers 173# IO Schedulers
170# 174#
171CONFIG_IOSCHED_NOOP=y 175CONFIG_IOSCHED_NOOP=y
172CONFIG_IOSCHED_AS=y
173CONFIG_IOSCHED_DEADLINE=y 176CONFIG_IOSCHED_DEADLINE=y
174CONFIG_IOSCHED_CFQ=y 177CONFIG_IOSCHED_CFQ=y
175CONFIG_DEFAULT_AS=y
176# CONFIG_DEFAULT_DEADLINE is not set 178# CONFIG_DEFAULT_DEADLINE is not set
177# CONFIG_DEFAULT_CFQ is not set 179CONFIG_DEFAULT_CFQ=y
178# CONFIG_DEFAULT_NOOP is not set 180# CONFIG_DEFAULT_NOOP is not set
179CONFIG_DEFAULT_IOSCHED="anticipatory" 181CONFIG_DEFAULT_IOSCHED="cfq"
182# CONFIG_INLINE_SPIN_TRYLOCK is not set
183# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
184# CONFIG_INLINE_SPIN_LOCK is not set
185# CONFIG_INLINE_SPIN_LOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
187# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
188CONFIG_INLINE_SPIN_UNLOCK=y
189# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
190CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
191# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
192# CONFIG_INLINE_READ_TRYLOCK is not set
193# CONFIG_INLINE_READ_LOCK is not set
194# CONFIG_INLINE_READ_LOCK_BH is not set
195# CONFIG_INLINE_READ_LOCK_IRQ is not set
196# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
197CONFIG_INLINE_READ_UNLOCK=y
198# CONFIG_INLINE_READ_UNLOCK_BH is not set
199CONFIG_INLINE_READ_UNLOCK_IRQ=y
200# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
201# CONFIG_INLINE_WRITE_TRYLOCK is not set
202# CONFIG_INLINE_WRITE_LOCK is not set
203# CONFIG_INLINE_WRITE_LOCK_BH is not set
204# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
205# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
206CONFIG_INLINE_WRITE_UNLOCK=y
207# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
208CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
209# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
210# CONFIG_MUTEX_SPIN_ON_OWNER is not set
180# CONFIG_FREEZER is not set 211# CONFIG_FREEZER is not set
181 212
182# 213#
@@ -185,7 +216,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
185# CONFIG_PPC_CELL is not set 216# CONFIG_PPC_CELL is not set
186# CONFIG_PPC_CELL_NATIVE is not set 217# CONFIG_PPC_CELL_NATIVE is not set
187# CONFIG_PQ2ADS is not set 218# CONFIG_PQ2ADS is not set
188CONFIG_MPC85xx=y 219CONFIG_FSL_SOC_BOOKE=y
189# CONFIG_MPC8540_ADS is not set 220# CONFIG_MPC8540_ADS is not set
190# CONFIG_MPC8560_ADS is not set 221# CONFIG_MPC8560_ADS is not set
191# CONFIG_MPC85xx_CDS is not set 222# CONFIG_MPC85xx_CDS is not set
@@ -204,6 +235,7 @@ CONFIG_KSI8560=y
204# CONFIG_TQM8560 is not set 235# CONFIG_TQM8560 is not set
205# CONFIG_SBC8548 is not set 236# CONFIG_SBC8548 is not set
206# CONFIG_SBC8560 is not set 237# CONFIG_SBC8560 is not set
238# CONFIG_P4080_DS is not set
207# CONFIG_IPIC is not set 239# CONFIG_IPIC is not set
208CONFIG_MPIC=y 240CONFIG_MPIC=y
209# CONFIG_MPIC_WEIRD is not set 241# CONFIG_MPIC_WEIRD is not set
@@ -248,6 +280,7 @@ CONFIG_MATH_EMULATION=y
248CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 280CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
249CONFIG_ARCH_HAS_WALK_MEMORY=y 281CONFIG_ARCH_HAS_WALK_MEMORY=y
250CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 282CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
283CONFIG_SPARSE_IRQ=y
251CONFIG_MAX_ACTIVE_REGIONS=32 284CONFIG_MAX_ACTIVE_REGIONS=32
252CONFIG_ARCH_FLATMEM_ENABLE=y 285CONFIG_ARCH_FLATMEM_ENABLE=y
253CONFIG_ARCH_POPULATES_NODE_MAP=y 286CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -264,8 +297,6 @@ CONFIG_MIGRATION=y
264CONFIG_ZONE_DMA_FLAG=1 297CONFIG_ZONE_DMA_FLAG=1
265CONFIG_BOUNCE=y 298CONFIG_BOUNCE=y
266CONFIG_VIRT_TO_BUS=y 299CONFIG_VIRT_TO_BUS=y
267CONFIG_HAVE_MLOCK=y
268CONFIG_HAVE_MLOCKED_PAGE_BIT=y
269# CONFIG_KSM is not set 300# CONFIG_KSM is not set
270CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 301CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
271CONFIG_PPC_4K_PAGES=y 302CONFIG_PPC_4K_PAGES=y
@@ -385,9 +416,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
385# CONFIG_AF_RXRPC is not set 416# CONFIG_AF_RXRPC is not set
386CONFIG_WIRELESS=y 417CONFIG_WIRELESS=y
387# CONFIG_CFG80211 is not set 418# CONFIG_CFG80211 is not set
388CONFIG_CFG80211_DEFAULT_PS_VALUE=0
389CONFIG_WIRELESS_OLD_REGULATORY=y
390# CONFIG_WIRELESS_EXT is not set
391# CONFIG_LIB80211 is not set 419# CONFIG_LIB80211 is not set
392 420
393# 421#
@@ -503,6 +531,10 @@ CONFIG_BLK_DEV=y
503# CONFIG_BLK_DEV_COW_COMMON is not set 531# CONFIG_BLK_DEV_COW_COMMON is not set
504CONFIG_BLK_DEV_LOOP=y 532CONFIG_BLK_DEV_LOOP=y
505# CONFIG_BLK_DEV_CRYPTOLOOP is not set 533# CONFIG_BLK_DEV_CRYPTOLOOP is not set
534
535#
536# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
537#
506# CONFIG_BLK_DEV_NBD is not set 538# CONFIG_BLK_DEV_NBD is not set
507CONFIG_BLK_DEV_RAM=y 539CONFIG_BLK_DEV_RAM=y
508CONFIG_BLK_DEV_RAM_COUNT=16 540CONFIG_BLK_DEV_RAM_COUNT=16
@@ -603,8 +635,7 @@ CONFIG_GIANFAR=y
603# CONFIG_MV643XX_ETH is not set 635# CONFIG_MV643XX_ETH is not set
604CONFIG_NETDEV_10000=y 636CONFIG_NETDEV_10000=y
605CONFIG_WLAN=y 637CONFIG_WLAN=y
606# CONFIG_WLAN_PRE80211 is not set 638# CONFIG_HOSTAP is not set
607# CONFIG_WLAN_80211 is not set
608 639
609# 640#
610# Enable WiMAX (Networking options) to see the WiMAX drivers 641# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -624,6 +655,7 @@ CONFIG_WLAN=y
624CONFIG_INPUT=y 655CONFIG_INPUT=y
625# CONFIG_INPUT_FF_MEMLESS is not set 656# CONFIG_INPUT_FF_MEMLESS is not set
626# CONFIG_INPUT_POLLDEV is not set 657# CONFIG_INPUT_POLLDEV is not set
658# CONFIG_INPUT_SPARSEKMAP is not set
627 659
628# 660#
629# Userland interfaces 661# Userland interfaces
@@ -669,6 +701,7 @@ CONFIG_SERIAL_CORE=y
669CONFIG_SERIAL_CORE_CONSOLE=y 701CONFIG_SERIAL_CORE_CONSOLE=y
670CONFIG_SERIAL_CPM=y 702CONFIG_SERIAL_CPM=y
671CONFIG_SERIAL_CPM_CONSOLE=y 703CONFIG_SERIAL_CPM_CONSOLE=y
704# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
672CONFIG_UNIX98_PTYS=y 705CONFIG_UNIX98_PTYS=y
673# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 706# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
674CONFIG_LEGACY_PTYS=y 707CONFIG_LEGACY_PTYS=y
@@ -1051,7 +1084,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1051# CONFIG_KEYS is not set 1084# CONFIG_KEYS is not set
1052# CONFIG_SECURITY is not set 1085# CONFIG_SECURITY is not set
1053# CONFIG_SECURITYFS is not set 1086# CONFIG_SECURITYFS is not set
1054# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1087# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1088# CONFIG_DEFAULT_SECURITY_SMACK is not set
1089# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1090CONFIG_DEFAULT_SECURITY_DAC=y
1091CONFIG_DEFAULT_SECURITY=""
1055CONFIG_CRYPTO=y 1092CONFIG_CRYPTO=y
1056 1093
1057# 1094#
diff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
index c10e26f8763f..5db54cd274c6 100644
--- a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
+++ b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:33 2009 4# Wed Jan 6 09:24:27 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,8 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63CONFIG_DEFAULT_UIMAGE=y 64CONFIG_DEFAULT_UIMAGE=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
66CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 69CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -88,6 +91,7 @@ CONFIG_SYSVIPC_SYSCTL=y
88# 91#
89CONFIG_TREE_RCU=y 92CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 95# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 96CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 97# CONFIG_RCU_FANOUT_EXACT is not set
@@ -170,14 +174,41 @@ CONFIG_LBDAF=y
170# IO Schedulers 174# IO Schedulers
171# 175#
172CONFIG_IOSCHED_NOOP=y 176CONFIG_IOSCHED_NOOP=y
173CONFIG_IOSCHED_AS=y
174CONFIG_IOSCHED_DEADLINE=y 177CONFIG_IOSCHED_DEADLINE=y
175CONFIG_IOSCHED_CFQ=y 178CONFIG_IOSCHED_CFQ=y
176CONFIG_DEFAULT_AS=y
177# CONFIG_DEFAULT_DEADLINE is not set 179# CONFIG_DEFAULT_DEADLINE is not set
178# CONFIG_DEFAULT_CFQ is not set 180CONFIG_DEFAULT_CFQ=y
179# CONFIG_DEFAULT_NOOP is not set 181# CONFIG_DEFAULT_NOOP is not set
180CONFIG_DEFAULT_IOSCHED="anticipatory" 182CONFIG_DEFAULT_IOSCHED="cfq"
183# CONFIG_INLINE_SPIN_TRYLOCK is not set
184# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
185# CONFIG_INLINE_SPIN_LOCK is not set
186# CONFIG_INLINE_SPIN_LOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
188# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
189CONFIG_INLINE_SPIN_UNLOCK=y
190# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
191CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
192# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
193# CONFIG_INLINE_READ_TRYLOCK is not set
194# CONFIG_INLINE_READ_LOCK is not set
195# CONFIG_INLINE_READ_LOCK_BH is not set
196# CONFIG_INLINE_READ_LOCK_IRQ is not set
197# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
198CONFIG_INLINE_READ_UNLOCK=y
199# CONFIG_INLINE_READ_UNLOCK_BH is not set
200CONFIG_INLINE_READ_UNLOCK_IRQ=y
201# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
202# CONFIG_INLINE_WRITE_TRYLOCK is not set
203# CONFIG_INLINE_WRITE_LOCK is not set
204# CONFIG_INLINE_WRITE_LOCK_BH is not set
205# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
206# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
207CONFIG_INLINE_WRITE_UNLOCK=y
208# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
209CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
210# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
211# CONFIG_MUTEX_SPIN_ON_OWNER is not set
181# CONFIG_FREEZER is not set 212# CONFIG_FREEZER is not set
182 213
183# 214#
@@ -186,7 +217,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
186# CONFIG_PPC_CELL is not set 217# CONFIG_PPC_CELL is not set
187# CONFIG_PPC_CELL_NATIVE is not set 218# CONFIG_PPC_CELL_NATIVE is not set
188# CONFIG_PQ2ADS is not set 219# CONFIG_PQ2ADS is not set
189CONFIG_MPC85xx=y 220CONFIG_FSL_SOC_BOOKE=y
190CONFIG_MPC8540_ADS=y 221CONFIG_MPC8540_ADS=y
191# CONFIG_MPC8560_ADS is not set 222# CONFIG_MPC8560_ADS is not set
192# CONFIG_MPC85xx_CDS is not set 223# CONFIG_MPC85xx_CDS is not set
@@ -205,6 +236,7 @@ CONFIG_MPC8540_ADS=y
205# CONFIG_TQM8560 is not set 236# CONFIG_TQM8560 is not set
206# CONFIG_SBC8548 is not set 237# CONFIG_SBC8548 is not set
207# CONFIG_SBC8560 is not set 238# CONFIG_SBC8560 is not set
239# CONFIG_P4080_DS is not set
208# CONFIG_IPIC is not set 240# CONFIG_IPIC is not set
209CONFIG_MPIC=y 241CONFIG_MPIC=y
210# CONFIG_MPIC_WEIRD is not set 242# CONFIG_MPIC_WEIRD is not set
@@ -249,6 +281,7 @@ CONFIG_MATH_EMULATION=y
249CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 281CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
250CONFIG_ARCH_HAS_WALK_MEMORY=y 282CONFIG_ARCH_HAS_WALK_MEMORY=y
251CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 283CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
284CONFIG_SPARSE_IRQ=y
252CONFIG_MAX_ACTIVE_REGIONS=32 285CONFIG_MAX_ACTIVE_REGIONS=32
253CONFIG_ARCH_FLATMEM_ENABLE=y 286CONFIG_ARCH_FLATMEM_ENABLE=y
254CONFIG_ARCH_POPULATES_NODE_MAP=y 287CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -265,8 +298,6 @@ CONFIG_MIGRATION=y
265CONFIG_ZONE_DMA_FLAG=1 298CONFIG_ZONE_DMA_FLAG=1
266CONFIG_BOUNCE=y 299CONFIG_BOUNCE=y
267CONFIG_VIRT_TO_BUS=y 300CONFIG_VIRT_TO_BUS=y
268CONFIG_HAVE_MLOCK=y
269CONFIG_HAVE_MLOCKED_PAGE_BIT=y
270# CONFIG_KSM is not set 301# CONFIG_KSM is not set
271CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 302CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
272CONFIG_PPC_4K_PAGES=y 303CONFIG_PPC_4K_PAGES=y
@@ -386,9 +417,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
386# CONFIG_AF_RXRPC is not set 417# CONFIG_AF_RXRPC is not set
387CONFIG_WIRELESS=y 418CONFIG_WIRELESS=y
388# CONFIG_CFG80211 is not set 419# CONFIG_CFG80211 is not set
389CONFIG_CFG80211_DEFAULT_PS_VALUE=0
390CONFIG_WIRELESS_OLD_REGULATORY=y
391# CONFIG_WIRELESS_EXT is not set
392# CONFIG_LIB80211 is not set 420# CONFIG_LIB80211 is not set
393 421
394# 422#
@@ -423,6 +451,10 @@ CONFIG_BLK_DEV=y
423# CONFIG_BLK_DEV_COW_COMMON is not set 451# CONFIG_BLK_DEV_COW_COMMON is not set
424CONFIG_BLK_DEV_LOOP=y 452CONFIG_BLK_DEV_LOOP=y
425# CONFIG_BLK_DEV_CRYPTOLOOP is not set 453# CONFIG_BLK_DEV_CRYPTOLOOP is not set
454
455#
456# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
457#
426# CONFIG_BLK_DEV_NBD is not set 458# CONFIG_BLK_DEV_NBD is not set
427CONFIG_BLK_DEV_RAM=y 459CONFIG_BLK_DEV_RAM=y
428CONFIG_BLK_DEV_RAM_COUNT=16 460CONFIG_BLK_DEV_RAM_COUNT=16
@@ -500,8 +532,7 @@ CONFIG_GIANFAR=y
500# CONFIG_MV643XX_ETH is not set 532# CONFIG_MV643XX_ETH is not set
501CONFIG_NETDEV_10000=y 533CONFIG_NETDEV_10000=y
502CONFIG_WLAN=y 534CONFIG_WLAN=y
503# CONFIG_WLAN_PRE80211 is not set 535# CONFIG_HOSTAP is not set
504# CONFIG_WLAN_80211 is not set
505 536
506# 537#
507# Enable WiMAX (Networking options) to see the WiMAX drivers 538# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -521,6 +552,7 @@ CONFIG_WLAN=y
521CONFIG_INPUT=y 552CONFIG_INPUT=y
522# CONFIG_INPUT_FF_MEMLESS is not set 553# CONFIG_INPUT_FF_MEMLESS is not set
523# CONFIG_INPUT_POLLDEV is not set 554# CONFIG_INPUT_POLLDEV is not set
555# CONFIG_INPUT_SPARSEKMAP is not set
524 556
525# 557#
526# Userland interfaces 558# Userland interfaces
@@ -570,6 +602,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
570CONFIG_SERIAL_CORE=y 602CONFIG_SERIAL_CORE=y
571CONFIG_SERIAL_CORE_CONSOLE=y 603CONFIG_SERIAL_CORE_CONSOLE=y
572# CONFIG_SERIAL_OF_PLATFORM is not set 604# CONFIG_SERIAL_OF_PLATFORM is not set
605# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
573CONFIG_UNIX98_PTYS=y 606CONFIG_UNIX98_PTYS=y
574# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 607# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
575CONFIG_LEGACY_PTYS=y 608CONFIG_LEGACY_PTYS=y
@@ -920,7 +953,11 @@ CONFIG_PRINT_STACK_DEPTH=64
920# CONFIG_KEYS is not set 953# CONFIG_KEYS is not set
921# CONFIG_SECURITY is not set 954# CONFIG_SECURITY is not set
922# CONFIG_SECURITYFS is not set 955# CONFIG_SECURITYFS is not set
923# CONFIG_SECURITY_FILE_CAPABILITIES is not set 956# CONFIG_DEFAULT_SECURITY_SELINUX is not set
957# CONFIG_DEFAULT_SECURITY_SMACK is not set
958# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
959CONFIG_DEFAULT_SECURITY_DAC=y
960CONFIG_DEFAULT_SECURITY=""
924CONFIG_CRYPTO=y 961CONFIG_CRYPTO=y
925 962
926# 963#
diff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
index 8d9f0a4b5205..76c7018c5cd2 100644
--- a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
+++ b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:34 2009 4# Wed Jan 6 09:24:28 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -89,6 +92,7 @@ CONFIG_SYSVIPC_SYSCTL=y
89# 92#
90CONFIG_TREE_RCU=y 93CONFIG_TREE_RCU=y
91# CONFIG_TREE_PREEMPT_RCU is not set 94# CONFIG_TREE_PREEMPT_RCU is not set
95# CONFIG_TINY_RCU is not set
92# CONFIG_RCU_TRACE is not set 96# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32 97CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set 98# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +177,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 177# IO Schedulers
174# 178#
175CONFIG_IOSCHED_NOOP=y 179CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 180CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 181CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 182# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 183CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 184# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 185CONFIG_DEFAULT_IOSCHED="cfq"
186# CONFIG_INLINE_SPIN_TRYLOCK is not set
187# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK is not set
189# CONFIG_INLINE_SPIN_LOCK_BH is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
191# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
192CONFIG_INLINE_SPIN_UNLOCK=y
193# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
194CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
195# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
196# CONFIG_INLINE_READ_TRYLOCK is not set
197# CONFIG_INLINE_READ_LOCK is not set
198# CONFIG_INLINE_READ_LOCK_BH is not set
199# CONFIG_INLINE_READ_LOCK_IRQ is not set
200# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
201CONFIG_INLINE_READ_UNLOCK=y
202# CONFIG_INLINE_READ_UNLOCK_BH is not set
203CONFIG_INLINE_READ_UNLOCK_IRQ=y
204# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
205# CONFIG_INLINE_WRITE_TRYLOCK is not set
206# CONFIG_INLINE_WRITE_LOCK is not set
207# CONFIG_INLINE_WRITE_LOCK_BH is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
209# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
210CONFIG_INLINE_WRITE_UNLOCK=y
211# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
212CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
213# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
214# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184# CONFIG_FREEZER is not set 215# CONFIG_FREEZER is not set
185 216
186# 217#
@@ -189,7 +220,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
189# CONFIG_PPC_CELL is not set 220# CONFIG_PPC_CELL is not set
190# CONFIG_PPC_CELL_NATIVE is not set 221# CONFIG_PPC_CELL_NATIVE is not set
191# CONFIG_PQ2ADS is not set 222# CONFIG_PQ2ADS is not set
192CONFIG_MPC85xx=y 223CONFIG_FSL_SOC_BOOKE=y
193# CONFIG_MPC8540_ADS is not set 224# CONFIG_MPC8540_ADS is not set
194CONFIG_MPC8560_ADS=y 225CONFIG_MPC8560_ADS=y
195# CONFIG_MPC85xx_CDS is not set 226# CONFIG_MPC85xx_CDS is not set
@@ -208,6 +239,7 @@ CONFIG_MPC8560_ADS=y
208# CONFIG_TQM8560 is not set 239# CONFIG_TQM8560 is not set
209# CONFIG_SBC8548 is not set 240# CONFIG_SBC8548 is not set
210# CONFIG_SBC8560 is not set 241# CONFIG_SBC8560 is not set
242# CONFIG_P4080_DS is not set
211# CONFIG_IPIC is not set 243# CONFIG_IPIC is not set
212CONFIG_MPIC=y 244CONFIG_MPIC=y
213# CONFIG_MPIC_WEIRD is not set 245# CONFIG_MPIC_WEIRD is not set
@@ -252,6 +284,7 @@ CONFIG_MATH_EMULATION=y
252CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 284CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
253CONFIG_ARCH_HAS_WALK_MEMORY=y 285CONFIG_ARCH_HAS_WALK_MEMORY=y
254CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 286CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
287CONFIG_SPARSE_IRQ=y
255CONFIG_MAX_ACTIVE_REGIONS=32 288CONFIG_MAX_ACTIVE_REGIONS=32
256CONFIG_ARCH_FLATMEM_ENABLE=y 289CONFIG_ARCH_FLATMEM_ENABLE=y
257CONFIG_ARCH_POPULATES_NODE_MAP=y 290CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -268,8 +301,6 @@ CONFIG_MIGRATION=y
268CONFIG_ZONE_DMA_FLAG=1 301CONFIG_ZONE_DMA_FLAG=1
269CONFIG_BOUNCE=y 302CONFIG_BOUNCE=y
270CONFIG_VIRT_TO_BUS=y 303CONFIG_VIRT_TO_BUS=y
271CONFIG_HAVE_MLOCK=y
272CONFIG_HAVE_MLOCKED_PAGE_BIT=y
273# CONFIG_KSM is not set 304# CONFIG_KSM is not set
274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 305CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
275CONFIG_PPC_4K_PAGES=y 306CONFIG_PPC_4K_PAGES=y
@@ -398,9 +429,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
398# CONFIG_AF_RXRPC is not set 429# CONFIG_AF_RXRPC is not set
399CONFIG_WIRELESS=y 430CONFIG_WIRELESS=y
400# CONFIG_CFG80211 is not set 431# CONFIG_CFG80211 is not set
401CONFIG_CFG80211_DEFAULT_PS_VALUE=0
402CONFIG_WIRELESS_OLD_REGULATORY=y
403# CONFIG_WIRELESS_EXT is not set
404# CONFIG_LIB80211 is not set 432# CONFIG_LIB80211 is not set
405 433
406# 434#
@@ -440,6 +468,10 @@ CONFIG_BLK_DEV=y
440# CONFIG_BLK_DEV_COW_COMMON is not set 468# CONFIG_BLK_DEV_COW_COMMON is not set
441CONFIG_BLK_DEV_LOOP=y 469CONFIG_BLK_DEV_LOOP=y
442# CONFIG_BLK_DEV_CRYPTOLOOP is not set 470# CONFIG_BLK_DEV_CRYPTOLOOP is not set
471
472#
473# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
474#
443# CONFIG_BLK_DEV_NBD is not set 475# CONFIG_BLK_DEV_NBD is not set
444# CONFIG_BLK_DEV_SX8 is not set 476# CONFIG_BLK_DEV_SX8 is not set
445CONFIG_BLK_DEV_RAM=y 477CONFIG_BLK_DEV_RAM=y
@@ -485,7 +517,7 @@ CONFIG_HAVE_IDE=y
485# 517#
486 518
487# 519#
488# See the help texts for more information. 520# The newer stack is recommended.
489# 521#
490# CONFIG_FIREWIRE is not set 522# CONFIG_FIREWIRE is not set
491# CONFIG_IEEE1394 is not set 523# CONFIG_IEEE1394 is not set
@@ -594,8 +626,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
594# CONFIG_BE2NET is not set 626# CONFIG_BE2NET is not set
595# CONFIG_TR is not set 627# CONFIG_TR is not set
596CONFIG_WLAN=y 628CONFIG_WLAN=y
597# CONFIG_WLAN_PRE80211 is not set 629# CONFIG_AIRO is not set
598# CONFIG_WLAN_80211 is not set 630# CONFIG_ATMEL is not set
631# CONFIG_PRISM54 is not set
632# CONFIG_HOSTAP is not set
599 633
600# 634#
601# Enable WiMAX (Networking options) to see the WiMAX drivers 635# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -608,6 +642,7 @@ CONFIG_WLAN=y
608# CONFIG_NETCONSOLE is not set 642# CONFIG_NETCONSOLE is not set
609# CONFIG_NETPOLL is not set 643# CONFIG_NETPOLL is not set
610# CONFIG_NET_POLL_CONTROLLER is not set 644# CONFIG_NET_POLL_CONTROLLER is not set
645# CONFIG_VMXNET3 is not set
611# CONFIG_ISDN is not set 646# CONFIG_ISDN is not set
612# CONFIG_PHONE is not set 647# CONFIG_PHONE is not set
613 648
@@ -617,6 +652,7 @@ CONFIG_WLAN=y
617CONFIG_INPUT=y 652CONFIG_INPUT=y
618# CONFIG_INPUT_FF_MEMLESS is not set 653# CONFIG_INPUT_FF_MEMLESS is not set
619# CONFIG_INPUT_POLLDEV is not set 654# CONFIG_INPUT_POLLDEV is not set
655# CONFIG_INPUT_SPARSEKMAP is not set
620 656
621# 657#
622# Userland interfaces 658# Userland interfaces
@@ -664,6 +700,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
664CONFIG_SERIAL_CPM=y 700CONFIG_SERIAL_CPM=y
665CONFIG_SERIAL_CPM_CONSOLE=y 701CONFIG_SERIAL_CPM_CONSOLE=y
666# CONFIG_SERIAL_JSM is not set 702# CONFIG_SERIAL_JSM is not set
703# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
667CONFIG_UNIX98_PTYS=y 704CONFIG_UNIX98_PTYS=y
668# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 705# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
669CONFIG_LEGACY_PTYS=y 706CONFIG_LEGACY_PTYS=y
@@ -705,6 +742,7 @@ CONFIG_GPIOLIB=y
705# 742#
706# PCI GPIO expanders: 743# PCI GPIO expanders:
707# 744#
745# CONFIG_GPIO_CS5535 is not set
708# CONFIG_GPIO_BT8XX is not set 746# CONFIG_GPIO_BT8XX is not set
709# CONFIG_GPIO_LANGWELL is not set 747# CONFIG_GPIO_LANGWELL is not set
710 748
@@ -1054,7 +1092,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1054# CONFIG_KEYS is not set 1092# CONFIG_KEYS is not set
1055# CONFIG_SECURITY is not set 1093# CONFIG_SECURITY is not set
1056# CONFIG_SECURITYFS is not set 1094# CONFIG_SECURITYFS is not set
1057# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1095# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1096# CONFIG_DEFAULT_SECURITY_SMACK is not set
1097# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1098CONFIG_DEFAULT_SECURITY_DAC=y
1099CONFIG_DEFAULT_SECURITY=""
1058CONFIG_CRYPTO=y 1100CONFIG_CRYPTO=y
1059 1101
1060# 1102#
diff --git a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
index 9b63e258dac6..fab8adacbf79 100644
--- a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
+++ b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:35 2009 4# Wed Jan 6 09:24:29 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,8 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63CONFIG_DEFAULT_UIMAGE=y 64CONFIG_DEFAULT_UIMAGE=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
66CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 69CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -88,6 +91,7 @@ CONFIG_SYSVIPC_SYSCTL=y
88# 91#
89CONFIG_TREE_RCU=y 92CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 95# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 96CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 97# CONFIG_RCU_FANOUT_EXACT is not set
@@ -171,14 +175,41 @@ CONFIG_LBDAF=y
171# IO Schedulers 175# IO Schedulers
172# 176#
173CONFIG_IOSCHED_NOOP=y 177CONFIG_IOSCHED_NOOP=y
174CONFIG_IOSCHED_AS=y
175CONFIG_IOSCHED_DEADLINE=y 178CONFIG_IOSCHED_DEADLINE=y
176CONFIG_IOSCHED_CFQ=y 179CONFIG_IOSCHED_CFQ=y
177CONFIG_DEFAULT_AS=y
178# CONFIG_DEFAULT_DEADLINE is not set 180# CONFIG_DEFAULT_DEADLINE is not set
179# CONFIG_DEFAULT_CFQ is not set 181CONFIG_DEFAULT_CFQ=y
180# CONFIG_DEFAULT_NOOP is not set 182# CONFIG_DEFAULT_NOOP is not set
181CONFIG_DEFAULT_IOSCHED="anticipatory" 183CONFIG_DEFAULT_IOSCHED="cfq"
184# CONFIG_INLINE_SPIN_TRYLOCK is not set
185# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK is not set
187# CONFIG_INLINE_SPIN_LOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
190CONFIG_INLINE_SPIN_UNLOCK=y
191# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
192CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
193# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
194# CONFIG_INLINE_READ_TRYLOCK is not set
195# CONFIG_INLINE_READ_LOCK is not set
196# CONFIG_INLINE_READ_LOCK_BH is not set
197# CONFIG_INLINE_READ_LOCK_IRQ is not set
198# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
199CONFIG_INLINE_READ_UNLOCK=y
200# CONFIG_INLINE_READ_UNLOCK_BH is not set
201CONFIG_INLINE_READ_UNLOCK_IRQ=y
202# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
203# CONFIG_INLINE_WRITE_TRYLOCK is not set
204# CONFIG_INLINE_WRITE_LOCK is not set
205# CONFIG_INLINE_WRITE_LOCK_BH is not set
206# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
208CONFIG_INLINE_WRITE_UNLOCK=y
209# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
210CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
211# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
212# CONFIG_MUTEX_SPIN_ON_OWNER is not set
182# CONFIG_FREEZER is not set 213# CONFIG_FREEZER is not set
183 214
184# 215#
@@ -187,7 +218,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
187# CONFIG_PPC_CELL is not set 218# CONFIG_PPC_CELL is not set
188# CONFIG_PPC_CELL_NATIVE is not set 219# CONFIG_PPC_CELL_NATIVE is not set
189# CONFIG_PQ2ADS is not set 220# CONFIG_PQ2ADS is not set
190CONFIG_MPC85xx=y 221CONFIG_FSL_SOC_BOOKE=y
191# CONFIG_MPC8540_ADS is not set 222# CONFIG_MPC8540_ADS is not set
192# CONFIG_MPC8560_ADS is not set 223# CONFIG_MPC8560_ADS is not set
193CONFIG_MPC85xx_CDS=y 224CONFIG_MPC85xx_CDS=y
@@ -206,6 +237,7 @@ CONFIG_MPC85xx_CDS=y
206# CONFIG_TQM8560 is not set 237# CONFIG_TQM8560 is not set
207# CONFIG_SBC8548 is not set 238# CONFIG_SBC8548 is not set
208# CONFIG_SBC8560 is not set 239# CONFIG_SBC8560 is not set
240# CONFIG_P4080_DS is not set
209# CONFIG_IPIC is not set 241# CONFIG_IPIC is not set
210CONFIG_MPIC=y 242CONFIG_MPIC=y
211# CONFIG_MPIC_WEIRD is not set 243# CONFIG_MPIC_WEIRD is not set
@@ -250,6 +282,7 @@ CONFIG_MATH_EMULATION=y
250CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 282CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
251CONFIG_ARCH_HAS_WALK_MEMORY=y 283CONFIG_ARCH_HAS_WALK_MEMORY=y
252CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 284CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
285CONFIG_SPARSE_IRQ=y
253CONFIG_MAX_ACTIVE_REGIONS=32 286CONFIG_MAX_ACTIVE_REGIONS=32
254CONFIG_ARCH_FLATMEM_ENABLE=y 287CONFIG_ARCH_FLATMEM_ENABLE=y
255CONFIG_ARCH_POPULATES_NODE_MAP=y 288CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -266,8 +299,6 @@ CONFIG_MIGRATION=y
266CONFIG_ZONE_DMA_FLAG=1 299CONFIG_ZONE_DMA_FLAG=1
267CONFIG_BOUNCE=y 300CONFIG_BOUNCE=y
268CONFIG_VIRT_TO_BUS=y 301CONFIG_VIRT_TO_BUS=y
269CONFIG_HAVE_MLOCK=y
270CONFIG_HAVE_MLOCKED_PAGE_BIT=y
271# CONFIG_KSM is not set 302# CONFIG_KSM is not set
272CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 303CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
273CONFIG_PPC_4K_PAGES=y 304CONFIG_PPC_4K_PAGES=y
@@ -396,9 +427,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
396# CONFIG_AF_RXRPC is not set 427# CONFIG_AF_RXRPC is not set
397CONFIG_WIRELESS=y 428CONFIG_WIRELESS=y
398# CONFIG_CFG80211 is not set 429# CONFIG_CFG80211 is not set
399CONFIG_CFG80211_DEFAULT_PS_VALUE=0
400CONFIG_WIRELESS_OLD_REGULATORY=y
401# CONFIG_WIRELESS_EXT is not set
402# CONFIG_LIB80211 is not set 430# CONFIG_LIB80211 is not set
403 431
404# 432#
@@ -437,6 +465,10 @@ CONFIG_BLK_DEV=y
437# CONFIG_BLK_DEV_COW_COMMON is not set 465# CONFIG_BLK_DEV_COW_COMMON is not set
438CONFIG_BLK_DEV_LOOP=y 466CONFIG_BLK_DEV_LOOP=y
439# CONFIG_BLK_DEV_CRYPTOLOOP is not set 467# CONFIG_BLK_DEV_CRYPTOLOOP is not set
468
469#
470# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
471#
440# CONFIG_BLK_DEV_NBD is not set 472# CONFIG_BLK_DEV_NBD is not set
441# CONFIG_BLK_DEV_SX8 is not set 473# CONFIG_BLK_DEV_SX8 is not set
442CONFIG_BLK_DEV_RAM=y 474CONFIG_BLK_DEV_RAM=y
@@ -537,7 +569,7 @@ CONFIG_BLK_DEV_IDEDMA=y
537# 569#
538 570
539# 571#
540# See the help texts for more information. 572# The newer stack is recommended.
541# 573#
542# CONFIG_FIREWIRE is not set 574# CONFIG_FIREWIRE is not set
543# CONFIG_IEEE1394 is not set 575# CONFIG_IEEE1394 is not set
@@ -642,8 +674,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
642# CONFIG_BE2NET is not set 674# CONFIG_BE2NET is not set
643# CONFIG_TR is not set 675# CONFIG_TR is not set
644CONFIG_WLAN=y 676CONFIG_WLAN=y
645# CONFIG_WLAN_PRE80211 is not set 677# CONFIG_AIRO is not set
646# CONFIG_WLAN_80211 is not set 678# CONFIG_ATMEL is not set
679# CONFIG_PRISM54 is not set
680# CONFIG_HOSTAP is not set
647 681
648# 682#
649# Enable WiMAX (Networking options) to see the WiMAX drivers 683# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -656,6 +690,7 @@ CONFIG_WLAN=y
656# CONFIG_NETCONSOLE is not set 690# CONFIG_NETCONSOLE is not set
657# CONFIG_NETPOLL is not set 691# CONFIG_NETPOLL is not set
658# CONFIG_NET_POLL_CONTROLLER is not set 692# CONFIG_NET_POLL_CONTROLLER is not set
693# CONFIG_VMXNET3 is not set
659# CONFIG_ISDN is not set 694# CONFIG_ISDN is not set
660# CONFIG_PHONE is not set 695# CONFIG_PHONE is not set
661 696
@@ -665,6 +700,7 @@ CONFIG_WLAN=y
665CONFIG_INPUT=y 700CONFIG_INPUT=y
666# CONFIG_INPUT_FF_MEMLESS is not set 701# CONFIG_INPUT_FF_MEMLESS is not set
667# CONFIG_INPUT_POLLDEV is not set 702# CONFIG_INPUT_POLLDEV is not set
703# CONFIG_INPUT_SPARSEKMAP is not set
668 704
669# 705#
670# Userland interfaces 706# Userland interfaces
@@ -717,6 +753,7 @@ CONFIG_SERIAL_CORE=y
717CONFIG_SERIAL_CORE_CONSOLE=y 753CONFIG_SERIAL_CORE_CONSOLE=y
718# CONFIG_SERIAL_JSM is not set 754# CONFIG_SERIAL_JSM is not set
719# CONFIG_SERIAL_OF_PLATFORM is not set 755# CONFIG_SERIAL_OF_PLATFORM is not set
756# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
720CONFIG_UNIX98_PTYS=y 757CONFIG_UNIX98_PTYS=y
721# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 758# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
722CONFIG_LEGACY_PTYS=y 759CONFIG_LEGACY_PTYS=y
@@ -1079,7 +1116,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1079# CONFIG_KEYS is not set 1116# CONFIG_KEYS is not set
1080# CONFIG_SECURITY is not set 1117# CONFIG_SECURITY is not set
1081# CONFIG_SECURITYFS is not set 1118# CONFIG_SECURITYFS is not set
1082# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1119# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1120# CONFIG_DEFAULT_SECURITY_SMACK is not set
1121# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1122CONFIG_DEFAULT_SECURITY_DAC=y
1123CONFIG_DEFAULT_SECURITY=""
1083CONFIG_CRYPTO=y 1124CONFIG_CRYPTO=y
1084 1125
1085# 1126#
diff --git a/arch/powerpc/configs/85xx/sbc8548_defconfig b/arch/powerpc/configs/85xx/sbc8548_defconfig
index 1b2356830173..8290385e9b94 100644
--- a/arch/powerpc/configs/85xx/sbc8548_defconfig
+++ b/arch/powerpc/configs/85xx/sbc8548_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:36 2009 4# Wed Jan 6 09:24:29 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,8 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63CONFIG_DEFAULT_UIMAGE=y 64CONFIG_DEFAULT_UIMAGE=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
66CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 69CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -88,6 +91,7 @@ CONFIG_SYSVIPC_SYSCTL=y
88# 91#
89CONFIG_TREE_RCU=y 92CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 95# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 96CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 97# CONFIG_RCU_FANOUT_EXACT is not set
@@ -169,14 +173,41 @@ CONFIG_LBDAF=y
169# IO Schedulers 173# IO Schedulers
170# 174#
171CONFIG_IOSCHED_NOOP=y 175CONFIG_IOSCHED_NOOP=y
172CONFIG_IOSCHED_AS=y
173CONFIG_IOSCHED_DEADLINE=y 176CONFIG_IOSCHED_DEADLINE=y
174CONFIG_IOSCHED_CFQ=y 177CONFIG_IOSCHED_CFQ=y
175CONFIG_DEFAULT_AS=y
176# CONFIG_DEFAULT_DEADLINE is not set 178# CONFIG_DEFAULT_DEADLINE is not set
177# CONFIG_DEFAULT_CFQ is not set 179CONFIG_DEFAULT_CFQ=y
178# CONFIG_DEFAULT_NOOP is not set 180# CONFIG_DEFAULT_NOOP is not set
179CONFIG_DEFAULT_IOSCHED="anticipatory" 181CONFIG_DEFAULT_IOSCHED="cfq"
182# CONFIG_INLINE_SPIN_TRYLOCK is not set
183# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
184# CONFIG_INLINE_SPIN_LOCK is not set
185# CONFIG_INLINE_SPIN_LOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
187# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
188CONFIG_INLINE_SPIN_UNLOCK=y
189# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
190CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
191# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
192# CONFIG_INLINE_READ_TRYLOCK is not set
193# CONFIG_INLINE_READ_LOCK is not set
194# CONFIG_INLINE_READ_LOCK_BH is not set
195# CONFIG_INLINE_READ_LOCK_IRQ is not set
196# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
197CONFIG_INLINE_READ_UNLOCK=y
198# CONFIG_INLINE_READ_UNLOCK_BH is not set
199CONFIG_INLINE_READ_UNLOCK_IRQ=y
200# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
201# CONFIG_INLINE_WRITE_TRYLOCK is not set
202# CONFIG_INLINE_WRITE_LOCK is not set
203# CONFIG_INLINE_WRITE_LOCK_BH is not set
204# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
205# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
206CONFIG_INLINE_WRITE_UNLOCK=y
207# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
208CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
209# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
210# CONFIG_MUTEX_SPIN_ON_OWNER is not set
180# CONFIG_FREEZER is not set 211# CONFIG_FREEZER is not set
181 212
182# 213#
@@ -185,7 +216,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
185# CONFIG_PPC_CELL is not set 216# CONFIG_PPC_CELL is not set
186# CONFIG_PPC_CELL_NATIVE is not set 217# CONFIG_PPC_CELL_NATIVE is not set
187# CONFIG_PQ2ADS is not set 218# CONFIG_PQ2ADS is not set
188CONFIG_MPC85xx=y 219CONFIG_FSL_SOC_BOOKE=y
189# CONFIG_MPC8540_ADS is not set 220# CONFIG_MPC8540_ADS is not set
190# CONFIG_MPC8560_ADS is not set 221# CONFIG_MPC8560_ADS is not set
191# CONFIG_MPC85xx_CDS is not set 222# CONFIG_MPC85xx_CDS is not set
@@ -204,6 +235,7 @@ CONFIG_MPC85xx=y
204# CONFIG_TQM8560 is not set 235# CONFIG_TQM8560 is not set
205CONFIG_SBC8548=y 236CONFIG_SBC8548=y
206# CONFIG_SBC8560 is not set 237# CONFIG_SBC8560 is not set
238# CONFIG_P4080_DS is not set
207# CONFIG_IPIC is not set 239# CONFIG_IPIC is not set
208CONFIG_MPIC=y 240CONFIG_MPIC=y
209# CONFIG_MPIC_WEIRD is not set 241# CONFIG_MPIC_WEIRD is not set
@@ -247,6 +279,7 @@ CONFIG_MATH_EMULATION=y
247CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 279CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
248CONFIG_ARCH_HAS_WALK_MEMORY=y 280CONFIG_ARCH_HAS_WALK_MEMORY=y
249CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 281CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
282CONFIG_SPARSE_IRQ=y
250CONFIG_MAX_ACTIVE_REGIONS=32 283CONFIG_MAX_ACTIVE_REGIONS=32
251CONFIG_ARCH_FLATMEM_ENABLE=y 284CONFIG_ARCH_FLATMEM_ENABLE=y
252CONFIG_ARCH_POPULATES_NODE_MAP=y 285CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -263,8 +296,6 @@ CONFIG_MIGRATION=y
263CONFIG_ZONE_DMA_FLAG=1 296CONFIG_ZONE_DMA_FLAG=1
264CONFIG_BOUNCE=y 297CONFIG_BOUNCE=y
265CONFIG_VIRT_TO_BUS=y 298CONFIG_VIRT_TO_BUS=y
266CONFIG_HAVE_MLOCK=y
267CONFIG_HAVE_MLOCKED_PAGE_BIT=y
268# CONFIG_KSM is not set 299# CONFIG_KSM is not set
269CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 300CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
270CONFIG_PPC_4K_PAGES=y 301CONFIG_PPC_4K_PAGES=y
@@ -392,9 +423,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
392# CONFIG_AF_RXRPC is not set 423# CONFIG_AF_RXRPC is not set
393CONFIG_WIRELESS=y 424CONFIG_WIRELESS=y
394# CONFIG_CFG80211 is not set 425# CONFIG_CFG80211 is not set
395CONFIG_CFG80211_DEFAULT_PS_VALUE=0
396CONFIG_WIRELESS_OLD_REGULATORY=y
397# CONFIG_WIRELESS_EXT is not set
398# CONFIG_LIB80211 is not set 426# CONFIG_LIB80211 is not set
399 427
400# 428#
@@ -431,6 +459,10 @@ CONFIG_BLK_DEV=y
431# CONFIG_BLK_DEV_COW_COMMON is not set 459# CONFIG_BLK_DEV_COW_COMMON is not set
432CONFIG_BLK_DEV_LOOP=y 460CONFIG_BLK_DEV_LOOP=y
433# CONFIG_BLK_DEV_CRYPTOLOOP is not set 461# CONFIG_BLK_DEV_CRYPTOLOOP is not set
462
463#
464# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
465#
434# CONFIG_BLK_DEV_NBD is not set 466# CONFIG_BLK_DEV_NBD is not set
435# CONFIG_BLK_DEV_SX8 is not set 467# CONFIG_BLK_DEV_SX8 is not set
436CONFIG_BLK_DEV_RAM=y 468CONFIG_BLK_DEV_RAM=y
@@ -476,7 +508,7 @@ CONFIG_HAVE_IDE=y
476# 508#
477 509
478# 510#
479# See the help texts for more information. 511# The newer stack is recommended.
480# 512#
481# CONFIG_FIREWIRE is not set 513# CONFIG_FIREWIRE is not set
482# CONFIG_IEEE1394 is not set 514# CONFIG_IEEE1394 is not set
@@ -581,8 +613,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
581# CONFIG_BE2NET is not set 613# CONFIG_BE2NET is not set
582# CONFIG_TR is not set 614# CONFIG_TR is not set
583CONFIG_WLAN=y 615CONFIG_WLAN=y
584# CONFIG_WLAN_PRE80211 is not set 616# CONFIG_AIRO is not set
585# CONFIG_WLAN_80211 is not set 617# CONFIG_ATMEL is not set
618# CONFIG_PRISM54 is not set
619# CONFIG_HOSTAP is not set
586 620
587# 621#
588# Enable WiMAX (Networking options) to see the WiMAX drivers 622# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -595,6 +629,7 @@ CONFIG_WLAN=y
595# CONFIG_NETCONSOLE is not set 629# CONFIG_NETCONSOLE is not set
596# CONFIG_NETPOLL is not set 630# CONFIG_NETPOLL is not set
597# CONFIG_NET_POLL_CONTROLLER is not set 631# CONFIG_NET_POLL_CONTROLLER is not set
632# CONFIG_VMXNET3 is not set
598# CONFIG_ISDN is not set 633# CONFIG_ISDN is not set
599# CONFIG_PHONE is not set 634# CONFIG_PHONE is not set
600 635
@@ -604,6 +639,7 @@ CONFIG_WLAN=y
604CONFIG_INPUT=y 639CONFIG_INPUT=y
605# CONFIG_INPUT_FF_MEMLESS is not set 640# CONFIG_INPUT_FF_MEMLESS is not set
606# CONFIG_INPUT_POLLDEV is not set 641# CONFIG_INPUT_POLLDEV is not set
642# CONFIG_INPUT_SPARSEKMAP is not set
607 643
608# 644#
609# Userland interfaces 645# Userland interfaces
@@ -656,6 +692,7 @@ CONFIG_SERIAL_CORE=y
656CONFIG_SERIAL_CORE_CONSOLE=y 692CONFIG_SERIAL_CORE_CONSOLE=y
657# CONFIG_SERIAL_JSM is not set 693# CONFIG_SERIAL_JSM is not set
658# CONFIG_SERIAL_OF_PLATFORM is not set 694# CONFIG_SERIAL_OF_PLATFORM is not set
695# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
659CONFIG_UNIX98_PTYS=y 696CONFIG_UNIX98_PTYS=y
660# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 697# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
661CONFIG_LEGACY_PTYS=y 698CONFIG_LEGACY_PTYS=y
@@ -889,7 +926,7 @@ CONFIG_FRAME_WARN=1024
889# CONFIG_DEBUG_FS is not set 926# CONFIG_DEBUG_FS is not set
890# CONFIG_HEADERS_CHECK is not set 927# CONFIG_HEADERS_CHECK is not set
891# CONFIG_DEBUG_KERNEL is not set 928# CONFIG_DEBUG_KERNEL is not set
892# CONFIG_DEBUG_BUGVERBOSE is not set 929CONFIG_DEBUG_BUGVERBOSE=y
893# CONFIG_DEBUG_MEMORY_INIT is not set 930# CONFIG_DEBUG_MEMORY_INIT is not set
894# CONFIG_RCU_CPU_STALL_DETECTOR is not set 931# CONFIG_RCU_CPU_STALL_DETECTOR is not set
895# CONFIG_LATENCYTOP is not set 932# CONFIG_LATENCYTOP is not set
@@ -915,7 +952,11 @@ CONFIG_PRINT_STACK_DEPTH=64
915# CONFIG_KEYS is not set 952# CONFIG_KEYS is not set
916# CONFIG_SECURITY is not set 953# CONFIG_SECURITY is not set
917# CONFIG_SECURITYFS is not set 954# CONFIG_SECURITYFS is not set
918# CONFIG_SECURITY_FILE_CAPABILITIES is not set 955# CONFIG_DEFAULT_SECURITY_SELINUX is not set
956# CONFIG_DEFAULT_SECURITY_SMACK is not set
957# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
958CONFIG_DEFAULT_SECURITY_DAC=y
959CONFIG_DEFAULT_SECURITY=""
919CONFIG_CRYPTO=y 960CONFIG_CRYPTO=y
920 961
921# 962#
diff --git a/arch/powerpc/configs/85xx/sbc8560_defconfig b/arch/powerpc/configs/85xx/sbc8560_defconfig
index 959d0281431b..2499b5ba7141 100644
--- a/arch/powerpc/configs/85xx/sbc8560_defconfig
+++ b/arch/powerpc/configs/85xx/sbc8560_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:37 2009 4# Wed Jan 6 09:24:30 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,8 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63CONFIG_DEFAULT_UIMAGE=y 64CONFIG_DEFAULT_UIMAGE=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
66CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 69CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -88,6 +91,7 @@ CONFIG_SYSVIPC_SYSCTL=y
88# 91#
89CONFIG_TREE_RCU=y 92CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 95# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 96CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 97# CONFIG_RCU_FANOUT_EXACT is not set
@@ -169,14 +173,41 @@ CONFIG_LBDAF=y
169# IO Schedulers 173# IO Schedulers
170# 174#
171CONFIG_IOSCHED_NOOP=y 175CONFIG_IOSCHED_NOOP=y
172CONFIG_IOSCHED_AS=y
173CONFIG_IOSCHED_DEADLINE=y 176CONFIG_IOSCHED_DEADLINE=y
174CONFIG_IOSCHED_CFQ=y 177CONFIG_IOSCHED_CFQ=y
175CONFIG_DEFAULT_AS=y
176# CONFIG_DEFAULT_DEADLINE is not set 178# CONFIG_DEFAULT_DEADLINE is not set
177# CONFIG_DEFAULT_CFQ is not set 179CONFIG_DEFAULT_CFQ=y
178# CONFIG_DEFAULT_NOOP is not set 180# CONFIG_DEFAULT_NOOP is not set
179CONFIG_DEFAULT_IOSCHED="anticipatory" 181CONFIG_DEFAULT_IOSCHED="cfq"
182# CONFIG_INLINE_SPIN_TRYLOCK is not set
183# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
184# CONFIG_INLINE_SPIN_LOCK is not set
185# CONFIG_INLINE_SPIN_LOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
187# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
188CONFIG_INLINE_SPIN_UNLOCK=y
189# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
190CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
191# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
192# CONFIG_INLINE_READ_TRYLOCK is not set
193# CONFIG_INLINE_READ_LOCK is not set
194# CONFIG_INLINE_READ_LOCK_BH is not set
195# CONFIG_INLINE_READ_LOCK_IRQ is not set
196# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
197CONFIG_INLINE_READ_UNLOCK=y
198# CONFIG_INLINE_READ_UNLOCK_BH is not set
199CONFIG_INLINE_READ_UNLOCK_IRQ=y
200# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
201# CONFIG_INLINE_WRITE_TRYLOCK is not set
202# CONFIG_INLINE_WRITE_LOCK is not set
203# CONFIG_INLINE_WRITE_LOCK_BH is not set
204# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
205# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
206CONFIG_INLINE_WRITE_UNLOCK=y
207# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
208CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
209# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
210# CONFIG_MUTEX_SPIN_ON_OWNER is not set
180# CONFIG_FREEZER is not set 211# CONFIG_FREEZER is not set
181 212
182# 213#
@@ -185,7 +216,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
185# CONFIG_PPC_CELL is not set 216# CONFIG_PPC_CELL is not set
186# CONFIG_PPC_CELL_NATIVE is not set 217# CONFIG_PPC_CELL_NATIVE is not set
187# CONFIG_PQ2ADS is not set 218# CONFIG_PQ2ADS is not set
188CONFIG_MPC85xx=y 219CONFIG_FSL_SOC_BOOKE=y
189# CONFIG_MPC8540_ADS is not set 220# CONFIG_MPC8540_ADS is not set
190# CONFIG_MPC8560_ADS is not set 221# CONFIG_MPC8560_ADS is not set
191# CONFIG_MPC85xx_CDS is not set 222# CONFIG_MPC85xx_CDS is not set
@@ -204,6 +235,7 @@ CONFIG_MPC85xx=y
204# CONFIG_TQM8560 is not set 235# CONFIG_TQM8560 is not set
205# CONFIG_SBC8548 is not set 236# CONFIG_SBC8548 is not set
206CONFIG_SBC8560=y 237CONFIG_SBC8560=y
238# CONFIG_P4080_DS is not set
207# CONFIG_IPIC is not set 239# CONFIG_IPIC is not set
208CONFIG_MPIC=y 240CONFIG_MPIC=y
209# CONFIG_MPIC_WEIRD is not set 241# CONFIG_MPIC_WEIRD is not set
@@ -247,6 +279,7 @@ CONFIG_BINFMT_MISC=y
247CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 279CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
248CONFIG_ARCH_HAS_WALK_MEMORY=y 280CONFIG_ARCH_HAS_WALK_MEMORY=y
249CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 281CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
282CONFIG_SPARSE_IRQ=y
250CONFIG_MAX_ACTIVE_REGIONS=32 283CONFIG_MAX_ACTIVE_REGIONS=32
251CONFIG_ARCH_FLATMEM_ENABLE=y 284CONFIG_ARCH_FLATMEM_ENABLE=y
252CONFIG_ARCH_POPULATES_NODE_MAP=y 285CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -263,8 +296,6 @@ CONFIG_MIGRATION=y
263CONFIG_ZONE_DMA_FLAG=1 296CONFIG_ZONE_DMA_FLAG=1
264CONFIG_BOUNCE=y 297CONFIG_BOUNCE=y
265CONFIG_VIRT_TO_BUS=y 298CONFIG_VIRT_TO_BUS=y
266CONFIG_HAVE_MLOCK=y
267CONFIG_HAVE_MLOCKED_PAGE_BIT=y
268# CONFIG_KSM is not set 299# CONFIG_KSM is not set
269CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 300CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
270CONFIG_PPC_4K_PAGES=y 301CONFIG_PPC_4K_PAGES=y
@@ -384,9 +415,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
384# CONFIG_AF_RXRPC is not set 415# CONFIG_AF_RXRPC is not set
385CONFIG_WIRELESS=y 416CONFIG_WIRELESS=y
386# CONFIG_CFG80211 is not set 417# CONFIG_CFG80211 is not set
387CONFIG_CFG80211_DEFAULT_PS_VALUE=0
388CONFIG_WIRELESS_OLD_REGULATORY=y
389# CONFIG_WIRELESS_EXT is not set
390# CONFIG_LIB80211 is not set 418# CONFIG_LIB80211 is not set
391 419
392# 420#
@@ -421,6 +449,10 @@ CONFIG_BLK_DEV=y
421# CONFIG_BLK_DEV_COW_COMMON is not set 449# CONFIG_BLK_DEV_COW_COMMON is not set
422CONFIG_BLK_DEV_LOOP=y 450CONFIG_BLK_DEV_LOOP=y
423# CONFIG_BLK_DEV_CRYPTOLOOP is not set 451# CONFIG_BLK_DEV_CRYPTOLOOP is not set
452
453#
454# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
455#
424# CONFIG_BLK_DEV_NBD is not set 456# CONFIG_BLK_DEV_NBD is not set
425CONFIG_BLK_DEV_RAM=y 457CONFIG_BLK_DEV_RAM=y
426CONFIG_BLK_DEV_RAM_COUNT=16 458CONFIG_BLK_DEV_RAM_COUNT=16
@@ -498,8 +530,7 @@ CONFIG_GIANFAR=y
498# CONFIG_MV643XX_ETH is not set 530# CONFIG_MV643XX_ETH is not set
499CONFIG_NETDEV_10000=y 531CONFIG_NETDEV_10000=y
500CONFIG_WLAN=y 532CONFIG_WLAN=y
501# CONFIG_WLAN_PRE80211 is not set 533# CONFIG_HOSTAP is not set
502# CONFIG_WLAN_80211 is not set
503 534
504# 535#
505# Enable WiMAX (Networking options) to see the WiMAX drivers 536# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -519,6 +550,7 @@ CONFIG_WLAN=y
519CONFIG_INPUT=y 550CONFIG_INPUT=y
520# CONFIG_INPUT_FF_MEMLESS is not set 551# CONFIG_INPUT_FF_MEMLESS is not set
521# CONFIG_INPUT_POLLDEV is not set 552# CONFIG_INPUT_POLLDEV is not set
553# CONFIG_INPUT_SPARSEKMAP is not set
522 554
523# 555#
524# Userland interfaces 556# Userland interfaces
@@ -568,6 +600,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
568CONFIG_SERIAL_CORE=y 600CONFIG_SERIAL_CORE=y
569CONFIG_SERIAL_CORE_CONSOLE=y 601CONFIG_SERIAL_CORE_CONSOLE=y
570# CONFIG_SERIAL_OF_PLATFORM is not set 602# CONFIG_SERIAL_OF_PLATFORM is not set
603# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
571CONFIG_UNIX98_PTYS=y 604CONFIG_UNIX98_PTYS=y
572# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 605# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
573CONFIG_LEGACY_PTYS=y 606CONFIG_LEGACY_PTYS=y
@@ -702,7 +735,9 @@ CONFIG_RTC_INTF_DEV=y
702# CONFIG_RTC_DRV_M48T86 is not set 735# CONFIG_RTC_DRV_M48T86 is not set
703# CONFIG_RTC_DRV_M48T35 is not set 736# CONFIG_RTC_DRV_M48T35 is not set
704CONFIG_RTC_DRV_M48T59=y 737CONFIG_RTC_DRV_M48T59=y
738# CONFIG_RTC_DRV_MSM6242 is not set
705# CONFIG_RTC_DRV_BQ4802 is not set 739# CONFIG_RTC_DRV_BQ4802 is not set
740# CONFIG_RTC_DRV_RP5C01 is not set
706# CONFIG_RTC_DRV_V3020 is not set 741# CONFIG_RTC_DRV_V3020 is not set
707 742
708# 743#
@@ -948,6 +983,7 @@ CONFIG_PPC_EARLY_DEBUG=y
948# CONFIG_PPC_EARLY_DEBUG_44x is not set 983# CONFIG_PPC_EARLY_DEBUG_44x is not set
949# CONFIG_PPC_EARLY_DEBUG_40x is not set 984# CONFIG_PPC_EARLY_DEBUG_40x is not set
950# CONFIG_PPC_EARLY_DEBUG_CPM is not set 985# CONFIG_PPC_EARLY_DEBUG_CPM is not set
986# CONFIG_PPC_EARLY_DEBUG_USBGECKO is not set
951 987
952# 988#
953# Security options 989# Security options
@@ -955,7 +991,11 @@ CONFIG_PPC_EARLY_DEBUG=y
955# CONFIG_KEYS is not set 991# CONFIG_KEYS is not set
956# CONFIG_SECURITY is not set 992# CONFIG_SECURITY is not set
957# CONFIG_SECURITYFS is not set 993# CONFIG_SECURITYFS is not set
958# CONFIG_SECURITY_FILE_CAPABILITIES is not set 994# CONFIG_DEFAULT_SECURITY_SELINUX is not set
995# CONFIG_DEFAULT_SECURITY_SMACK is not set
996# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
997CONFIG_DEFAULT_SECURITY_DAC=y
998CONFIG_DEFAULT_SECURITY=""
959CONFIG_CRYPTO=y 999CONFIG_CRYPTO=y
960 1000
961# 1001#
diff --git a/arch/powerpc/configs/85xx/socrates_defconfig b/arch/powerpc/configs/85xx/socrates_defconfig
index 7f5ec35bf199..e2edb79cfd1a 100644
--- a/arch/powerpc/configs/85xx/socrates_defconfig
+++ b/arch/powerpc/configs/85xx/socrates_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:37 2009 4# Wed Jan 6 09:24:31 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,8 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63CONFIG_DEFAULT_UIMAGE=y 64CONFIG_DEFAULT_UIMAGE=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
66CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 69CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -88,6 +91,7 @@ CONFIG_SYSVIPC_SYSCTL=y
88# 91#
89CONFIG_TREE_RCU=y 92CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 95# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 96CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 97# CONFIG_RCU_FANOUT_EXACT is not set
@@ -174,14 +178,41 @@ CONFIG_LBDAF=y
174# IO Schedulers 178# IO Schedulers
175# 179#
176CONFIG_IOSCHED_NOOP=y 180CONFIG_IOSCHED_NOOP=y
177CONFIG_IOSCHED_AS=y
178CONFIG_IOSCHED_DEADLINE=y 181CONFIG_IOSCHED_DEADLINE=y
179CONFIG_IOSCHED_CFQ=y 182CONFIG_IOSCHED_CFQ=y
180CONFIG_DEFAULT_AS=y
181# CONFIG_DEFAULT_DEADLINE is not set 183# CONFIG_DEFAULT_DEADLINE is not set
182# CONFIG_DEFAULT_CFQ is not set 184CONFIG_DEFAULT_CFQ=y
183# CONFIG_DEFAULT_NOOP is not set 185# CONFIG_DEFAULT_NOOP is not set
184CONFIG_DEFAULT_IOSCHED="anticipatory" 186CONFIG_DEFAULT_IOSCHED="cfq"
187# CONFIG_INLINE_SPIN_TRYLOCK is not set
188# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK is not set
190# CONFIG_INLINE_SPIN_LOCK_BH is not set
191# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
192# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
193CONFIG_INLINE_SPIN_UNLOCK=y
194# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
195CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
196# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
197# CONFIG_INLINE_READ_TRYLOCK is not set
198# CONFIG_INLINE_READ_LOCK is not set
199# CONFIG_INLINE_READ_LOCK_BH is not set
200# CONFIG_INLINE_READ_LOCK_IRQ is not set
201# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
202CONFIG_INLINE_READ_UNLOCK=y
203# CONFIG_INLINE_READ_UNLOCK_BH is not set
204CONFIG_INLINE_READ_UNLOCK_IRQ=y
205# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
206# CONFIG_INLINE_WRITE_TRYLOCK is not set
207# CONFIG_INLINE_WRITE_LOCK is not set
208# CONFIG_INLINE_WRITE_LOCK_BH is not set
209# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
210# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
211CONFIG_INLINE_WRITE_UNLOCK=y
212# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
213CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
214# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
215# CONFIG_MUTEX_SPIN_ON_OWNER is not set
185# CONFIG_FREEZER is not set 216# CONFIG_FREEZER is not set
186 217
187# 218#
@@ -190,7 +221,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
190# CONFIG_PPC_CELL is not set 221# CONFIG_PPC_CELL is not set
191# CONFIG_PPC_CELL_NATIVE is not set 222# CONFIG_PPC_CELL_NATIVE is not set
192# CONFIG_PQ2ADS is not set 223# CONFIG_PQ2ADS is not set
193CONFIG_MPC85xx=y 224CONFIG_FSL_SOC_BOOKE=y
194# CONFIG_MPC8540_ADS is not set 225# CONFIG_MPC8540_ADS is not set
195# CONFIG_MPC8560_ADS is not set 226# CONFIG_MPC8560_ADS is not set
196# CONFIG_MPC85xx_CDS is not set 227# CONFIG_MPC85xx_CDS is not set
@@ -209,6 +240,7 @@ CONFIG_SOCRATES=y
209# CONFIG_TQM8560 is not set 240# CONFIG_TQM8560 is not set
210# CONFIG_SBC8548 is not set 241# CONFIG_SBC8548 is not set
211# CONFIG_SBC8560 is not set 242# CONFIG_SBC8560 is not set
243# CONFIG_P4080_DS is not set
212# CONFIG_IPIC is not set 244# CONFIG_IPIC is not set
213CONFIG_MPIC=y 245CONFIG_MPIC=y
214# CONFIG_MPIC_WEIRD is not set 246# CONFIG_MPIC_WEIRD is not set
@@ -252,6 +284,7 @@ CONFIG_MATH_EMULATION=y
252CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 284CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
253CONFIG_ARCH_HAS_WALK_MEMORY=y 285CONFIG_ARCH_HAS_WALK_MEMORY=y
254CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 286CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
287CONFIG_SPARSE_IRQ=y
255CONFIG_MAX_ACTIVE_REGIONS=32 288CONFIG_MAX_ACTIVE_REGIONS=32
256CONFIG_ARCH_FLATMEM_ENABLE=y 289CONFIG_ARCH_FLATMEM_ENABLE=y
257CONFIG_ARCH_POPULATES_NODE_MAP=y 290CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -268,8 +301,6 @@ CONFIG_MIGRATION=y
268CONFIG_ZONE_DMA_FLAG=1 301CONFIG_ZONE_DMA_FLAG=1
269CONFIG_BOUNCE=y 302CONFIG_BOUNCE=y
270CONFIG_VIRT_TO_BUS=y 303CONFIG_VIRT_TO_BUS=y
271CONFIG_HAVE_MLOCK=y
272CONFIG_HAVE_MLOCKED_PAGE_BIT=y
273# CONFIG_KSM is not set 304# CONFIG_KSM is not set
274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 305CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
275CONFIG_PPC_4K_PAGES=y 306CONFIG_PPC_4K_PAGES=y
@@ -404,9 +435,6 @@ CONFIG_CAN_BCM=y
404# CONFIG_AF_RXRPC is not set 435# CONFIG_AF_RXRPC is not set
405CONFIG_WIRELESS=y 436CONFIG_WIRELESS=y
406# CONFIG_CFG80211 is not set 437# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
408# CONFIG_WIRELESS_OLD_REGULATORY is not set
409# CONFIG_WIRELESS_EXT is not set
410# CONFIG_LIB80211 is not set 438# CONFIG_LIB80211 is not set
411 439
412# 440#
@@ -540,6 +568,10 @@ CONFIG_BLK_DEV=y
540# CONFIG_BLK_DEV_COW_COMMON is not set 568# CONFIG_BLK_DEV_COW_COMMON is not set
541CONFIG_BLK_DEV_LOOP=y 569CONFIG_BLK_DEV_LOOP=y
542# CONFIG_BLK_DEV_CRYPTOLOOP is not set 570# CONFIG_BLK_DEV_CRYPTOLOOP is not set
571
572#
573# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
574#
543# CONFIG_BLK_DEV_NBD is not set 575# CONFIG_BLK_DEV_NBD is not set
544# CONFIG_BLK_DEV_SX8 is not set 576# CONFIG_BLK_DEV_SX8 is not set
545# CONFIG_BLK_DEV_UB is not set 577# CONFIG_BLK_DEV_UB is not set
@@ -551,6 +583,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
551# CONFIG_ATA_OVER_ETH is not set 583# CONFIG_ATA_OVER_ETH is not set
552# CONFIG_BLK_DEV_HD is not set 584# CONFIG_BLK_DEV_HD is not set
553CONFIG_MISC_DEVICES=y 585CONFIG_MISC_DEVICES=y
586# CONFIG_AD525X_DPOT is not set
554# CONFIG_PHANTOM is not set 587# CONFIG_PHANTOM is not set
555# CONFIG_SGI_IOC4 is not set 588# CONFIG_SGI_IOC4 is not set
556# CONFIG_TIFM_CORE is not set 589# CONFIG_TIFM_CORE is not set
@@ -558,6 +591,8 @@ CONFIG_MISC_DEVICES=y
558# CONFIG_ENCLOSURE_SERVICES is not set 591# CONFIG_ENCLOSURE_SERVICES is not set
559# CONFIG_HP_ILO is not set 592# CONFIG_HP_ILO is not set
560# CONFIG_ISL29003 is not set 593# CONFIG_ISL29003 is not set
594# CONFIG_DS1682 is not set
595# CONFIG_TI_DAC7512 is not set
561# CONFIG_C2PORT is not set 596# CONFIG_C2PORT is not set
562 597
563# 598#
@@ -621,7 +656,7 @@ CONFIG_SCSI_WAIT_SCAN=m
621# 656#
622 657
623# 658#
624# See the help texts for more information. 659# The newer stack is recommended.
625# 660#
626# CONFIG_FIREWIRE is not set 661# CONFIG_FIREWIRE is not set
627# CONFIG_IEEE1394 is not set 662# CONFIG_IEEE1394 is not set
@@ -710,8 +745,11 @@ CONFIG_GIANFAR=y
710# CONFIG_NETDEV_10000 is not set 745# CONFIG_NETDEV_10000 is not set
711# CONFIG_TR is not set 746# CONFIG_TR is not set
712CONFIG_WLAN=y 747CONFIG_WLAN=y
713# CONFIG_WLAN_PRE80211 is not set 748# CONFIG_AIRO is not set
714# CONFIG_WLAN_80211 is not set 749# CONFIG_ATMEL is not set
750# CONFIG_PRISM54 is not set
751# CONFIG_USB_ZD1201 is not set
752# CONFIG_HOSTAP is not set
715 753
716# 754#
717# Enable WiMAX (Networking options) to see the WiMAX drivers 755# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -734,6 +772,7 @@ CONFIG_WLAN=y
734# CONFIG_NETCONSOLE is not set 772# CONFIG_NETCONSOLE is not set
735# CONFIG_NETPOLL is not set 773# CONFIG_NETPOLL is not set
736# CONFIG_NET_POLL_CONTROLLER is not set 774# CONFIG_NET_POLL_CONTROLLER is not set
775# CONFIG_VMXNET3 is not set
737# CONFIG_ISDN is not set 776# CONFIG_ISDN is not set
738# CONFIG_PHONE is not set 777# CONFIG_PHONE is not set
739 778
@@ -743,6 +782,7 @@ CONFIG_WLAN=y
743CONFIG_INPUT=y 782CONFIG_INPUT=y
744# CONFIG_INPUT_FF_MEMLESS is not set 783# CONFIG_INPUT_FF_MEMLESS is not set
745# CONFIG_INPUT_POLLDEV is not set 784# CONFIG_INPUT_POLLDEV is not set
785# CONFIG_INPUT_SPARSEKMAP is not set
746 786
747# 787#
748# Userland interfaces 788# Userland interfaces
@@ -768,6 +808,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
768# CONFIG_TOUCHSCREEN_AD7879_I2C is not set 808# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
769# CONFIG_TOUCHSCREEN_AD7879_SPI is not set 809# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
770# CONFIG_TOUCHSCREEN_AD7879 is not set 810# CONFIG_TOUCHSCREEN_AD7879 is not set
811# CONFIG_TOUCHSCREEN_DYNAPRO is not set
771# CONFIG_TOUCHSCREEN_EETI is not set 812# CONFIG_TOUCHSCREEN_EETI is not set
772# CONFIG_TOUCHSCREEN_FUJITSU is not set 813# CONFIG_TOUCHSCREEN_FUJITSU is not set
773# CONFIG_TOUCHSCREEN_GUNZE is not set 814# CONFIG_TOUCHSCREEN_GUNZE is not set
@@ -826,6 +867,7 @@ CONFIG_SERIAL_CORE=y
826CONFIG_SERIAL_CORE_CONSOLE=y 867CONFIG_SERIAL_CORE_CONSOLE=y
827# CONFIG_SERIAL_JSM is not set 868# CONFIG_SERIAL_JSM is not set
828# CONFIG_SERIAL_OF_PLATFORM is not set 869# CONFIG_SERIAL_OF_PLATFORM is not set
870# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
829CONFIG_UNIX98_PTYS=y 871CONFIG_UNIX98_PTYS=y
830# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 872# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
831CONFIG_LEGACY_PTYS=y 873CONFIG_LEGACY_PTYS=y
@@ -883,11 +925,6 @@ CONFIG_I2C_MPC=y
883# CONFIG_I2C_TINY_USB is not set 925# CONFIG_I2C_TINY_USB is not set
884 926
885# 927#
886# Graphics adapter I2C/DDC channel drivers
887#
888# CONFIG_I2C_VOODOO3 is not set
889
890#
891# Other I2C/SMBus bus drivers 928# Other I2C/SMBus bus drivers
892# 929#
893# CONFIG_I2C_PCA_PLATFORM is not set 930# CONFIG_I2C_PCA_PLATFORM is not set
@@ -896,7 +933,6 @@ CONFIG_I2C_MPC=y
896# 933#
897# Miscellaneous I2C Chip support 934# Miscellaneous I2C Chip support
898# 935#
899# CONFIG_DS1682 is not set
900# CONFIG_SENSORS_TSL2550 is not set 936# CONFIG_SENSORS_TSL2550 is not set
901# CONFIG_I2C_DEBUG_CORE is not set 937# CONFIG_I2C_DEBUG_CORE is not set
902# CONFIG_I2C_DEBUG_ALGO is not set 938# CONFIG_I2C_DEBUG_ALGO is not set
@@ -910,6 +946,8 @@ CONFIG_SPI_MASTER=y
910# 946#
911# CONFIG_SPI_BITBANG is not set 947# CONFIG_SPI_BITBANG is not set
912# CONFIG_SPI_MPC8xxx is not set 948# CONFIG_SPI_MPC8xxx is not set
949# CONFIG_SPI_XILINX is not set
950# CONFIG_SPI_DESIGNWARE is not set
913 951
914# 952#
915# SPI Protocol Masters 953# SPI Protocol Masters
@@ -957,6 +995,7 @@ CONFIG_HWMON_DEBUG_CHIP=y
957# CONFIG_SENSORS_IT87 is not set 995# CONFIG_SENSORS_IT87 is not set
958# CONFIG_SENSORS_LM63 is not set 996# CONFIG_SENSORS_LM63 is not set
959# CONFIG_SENSORS_LM70 is not set 997# CONFIG_SENSORS_LM70 is not set
998# CONFIG_SENSORS_LM73 is not set
960CONFIG_SENSORS_LM75=y 999CONFIG_SENSORS_LM75=y
961# CONFIG_SENSORS_LM77 is not set 1000# CONFIG_SENSORS_LM77 is not set
962# CONFIG_SENSORS_LM78 is not set 1001# CONFIG_SENSORS_LM78 is not set
@@ -997,6 +1036,7 @@ CONFIG_SENSORS_W83781D=y
997# CONFIG_SENSORS_W83627HF is not set 1036# CONFIG_SENSORS_W83627HF is not set
998# CONFIG_SENSORS_W83627EHF is not set 1037# CONFIG_SENSORS_W83627EHF is not set
999# CONFIG_SENSORS_LIS3_SPI is not set 1038# CONFIG_SENSORS_LIS3_SPI is not set
1039# CONFIG_SENSORS_LIS3_I2C is not set
1000# CONFIG_THERMAL is not set 1040# CONFIG_THERMAL is not set
1001# CONFIG_WATCHDOG is not set 1041# CONFIG_WATCHDOG is not set
1002CONFIG_SSB_POSSIBLE=y 1042CONFIG_SSB_POSSIBLE=y
@@ -1015,6 +1055,7 @@ CONFIG_SSB_POSSIBLE=y
1015# CONFIG_TWL4030_CORE is not set 1055# CONFIG_TWL4030_CORE is not set
1016# CONFIG_MFD_TMIO is not set 1056# CONFIG_MFD_TMIO is not set
1017# CONFIG_PMIC_DA903X is not set 1057# CONFIG_PMIC_DA903X is not set
1058# CONFIG_PMIC_ADP5520 is not set
1018# CONFIG_MFD_WM8400 is not set 1059# CONFIG_MFD_WM8400 is not set
1019# CONFIG_MFD_WM831X is not set 1060# CONFIG_MFD_WM831X is not set
1020# CONFIG_MFD_WM8350_I2C is not set 1061# CONFIG_MFD_WM8350_I2C is not set
@@ -1022,6 +1063,8 @@ CONFIG_SSB_POSSIBLE=y
1022# CONFIG_MFD_MC13783 is not set 1063# CONFIG_MFD_MC13783 is not set
1023# CONFIG_AB3100_CORE is not set 1064# CONFIG_AB3100_CORE is not set
1024# CONFIG_EZX_PCAP is not set 1065# CONFIG_EZX_PCAP is not set
1066# CONFIG_MFD_88PM8607 is not set
1067# CONFIG_AB4500_CORE is not set
1025# CONFIG_REGULATOR is not set 1068# CONFIG_REGULATOR is not set
1026# CONFIG_MEDIA_SUPPORT is not set 1069# CONFIG_MEDIA_SUPPORT is not set
1027 1070
@@ -1192,6 +1235,7 @@ CONFIG_USB_MON=y
1192CONFIG_USB_EHCI_HCD=y 1235CONFIG_USB_EHCI_HCD=y
1193# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1236# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1194# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1237# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1238# CONFIG_XPS_USB_HCD_XILINX is not set
1195# CONFIG_USB_EHCI_FSL is not set 1239# CONFIG_USB_EHCI_FSL is not set
1196CONFIG_USB_EHCI_HCD_PPC_OF=y 1240CONFIG_USB_EHCI_HCD_PPC_OF=y
1197# CONFIG_USB_OXU210HP_HCD is not set 1241# CONFIG_USB_OXU210HP_HCD is not set
@@ -1318,6 +1362,7 @@ CONFIG_RTC_INTF_DEV=y
1318# CONFIG_RTC_DRV_PCF8563 is not set 1362# CONFIG_RTC_DRV_PCF8563 is not set
1319# CONFIG_RTC_DRV_PCF8583 is not set 1363# CONFIG_RTC_DRV_PCF8583 is not set
1320# CONFIG_RTC_DRV_M41T80 is not set 1364# CONFIG_RTC_DRV_M41T80 is not set
1365# CONFIG_RTC_DRV_BQ32K is not set
1321# CONFIG_RTC_DRV_S35390A is not set 1366# CONFIG_RTC_DRV_S35390A is not set
1322# CONFIG_RTC_DRV_FM3130 is not set 1367# CONFIG_RTC_DRV_FM3130 is not set
1323# CONFIG_RTC_DRV_RX8581 is not set 1368# CONFIG_RTC_DRV_RX8581 is not set
@@ -1347,7 +1392,9 @@ CONFIG_RTC_INTF_DEV=y
1347# CONFIG_RTC_DRV_M48T86 is not set 1392# CONFIG_RTC_DRV_M48T86 is not set
1348# CONFIG_RTC_DRV_M48T35 is not set 1393# CONFIG_RTC_DRV_M48T35 is not set
1349# CONFIG_RTC_DRV_M48T59 is not set 1394# CONFIG_RTC_DRV_M48T59 is not set
1395# CONFIG_RTC_DRV_MSM6242 is not set
1350# CONFIG_RTC_DRV_BQ4802 is not set 1396# CONFIG_RTC_DRV_BQ4802 is not set
1397# CONFIG_RTC_DRV_RP5C01 is not set
1351# CONFIG_RTC_DRV_V3020 is not set 1398# CONFIG_RTC_DRV_V3020 is not set
1352 1399
1353# 1400#
@@ -1574,7 +1621,7 @@ CONFIG_FRAME_WARN=1024
1574# CONFIG_DEBUG_KERNEL is not set 1621# CONFIG_DEBUG_KERNEL is not set
1575# CONFIG_SLUB_DEBUG_ON is not set 1622# CONFIG_SLUB_DEBUG_ON is not set
1576# CONFIG_SLUB_STATS is not set 1623# CONFIG_SLUB_STATS is not set
1577# CONFIG_DEBUG_BUGVERBOSE is not set 1624CONFIG_DEBUG_BUGVERBOSE=y
1578# CONFIG_DEBUG_MEMORY_INIT is not set 1625# CONFIG_DEBUG_MEMORY_INIT is not set
1579# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1626# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1580# CONFIG_LATENCYTOP is not set 1627# CONFIG_LATENCYTOP is not set
@@ -1600,7 +1647,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1600# CONFIG_KEYS is not set 1647# CONFIG_KEYS is not set
1601# CONFIG_SECURITY is not set 1648# CONFIG_SECURITY is not set
1602# CONFIG_SECURITYFS is not set 1649# CONFIG_SECURITYFS is not set
1603# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1650# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1651# CONFIG_DEFAULT_SECURITY_SMACK is not set
1652# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1653CONFIG_DEFAULT_SECURITY_DAC=y
1654CONFIG_DEFAULT_SECURITY=""
1604CONFIG_CRYPTO=y 1655CONFIG_CRYPTO=y
1605 1656
1606# 1657#
diff --git a/arch/powerpc/configs/85xx/stx_gp3_defconfig b/arch/powerpc/configs/85xx/stx_gp3_defconfig
index c8327e88a987..ce313259df14 100644
--- a/arch/powerpc/configs/85xx/stx_gp3_defconfig
+++ b/arch/powerpc/configs/85xx/stx_gp3_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:38 2009 4# Wed Jan 6 09:24:32 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -89,6 +92,7 @@ CONFIG_SYSVIPC_SYSCTL=y
89# 92#
90CONFIG_TREE_RCU=y 93CONFIG_TREE_RCU=y
91# CONFIG_TREE_PREEMPT_RCU is not set 94# CONFIG_TREE_PREEMPT_RCU is not set
95# CONFIG_TINY_RCU is not set
92# CONFIG_RCU_TRACE is not set 96# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32 97CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set 98# CONFIG_RCU_FANOUT_EXACT is not set
@@ -178,14 +182,41 @@ CONFIG_LBDAF=y
178# IO Schedulers 182# IO Schedulers
179# 183#
180CONFIG_IOSCHED_NOOP=y 184CONFIG_IOSCHED_NOOP=y
181CONFIG_IOSCHED_AS=y
182CONFIG_IOSCHED_DEADLINE=y 185CONFIG_IOSCHED_DEADLINE=y
183CONFIG_IOSCHED_CFQ=y 186CONFIG_IOSCHED_CFQ=y
184# CONFIG_DEFAULT_AS is not set
185# CONFIG_DEFAULT_DEADLINE is not set 187# CONFIG_DEFAULT_DEADLINE is not set
186CONFIG_DEFAULT_CFQ=y 188CONFIG_DEFAULT_CFQ=y
187# CONFIG_DEFAULT_NOOP is not set 189# CONFIG_DEFAULT_NOOP is not set
188CONFIG_DEFAULT_IOSCHED="cfq" 190CONFIG_DEFAULT_IOSCHED="cfq"
191# CONFIG_INLINE_SPIN_TRYLOCK is not set
192# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
193# CONFIG_INLINE_SPIN_LOCK is not set
194# CONFIG_INLINE_SPIN_LOCK_BH is not set
195# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
196# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
197CONFIG_INLINE_SPIN_UNLOCK=y
198# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
199CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
200# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
201# CONFIG_INLINE_READ_TRYLOCK is not set
202# CONFIG_INLINE_READ_LOCK is not set
203# CONFIG_INLINE_READ_LOCK_BH is not set
204# CONFIG_INLINE_READ_LOCK_IRQ is not set
205# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
206CONFIG_INLINE_READ_UNLOCK=y
207# CONFIG_INLINE_READ_UNLOCK_BH is not set
208CONFIG_INLINE_READ_UNLOCK_IRQ=y
209# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
210# CONFIG_INLINE_WRITE_TRYLOCK is not set
211# CONFIG_INLINE_WRITE_LOCK is not set
212# CONFIG_INLINE_WRITE_LOCK_BH is not set
213# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
214# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
215CONFIG_INLINE_WRITE_UNLOCK=y
216# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
217CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
218# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
219# CONFIG_MUTEX_SPIN_ON_OWNER is not set
189# CONFIG_FREEZER is not set 220# CONFIG_FREEZER is not set
190 221
191# 222#
@@ -194,7 +225,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
194# CONFIG_PPC_CELL is not set 225# CONFIG_PPC_CELL is not set
195# CONFIG_PPC_CELL_NATIVE is not set 226# CONFIG_PPC_CELL_NATIVE is not set
196# CONFIG_PQ2ADS is not set 227# CONFIG_PQ2ADS is not set
197CONFIG_MPC85xx=y 228CONFIG_FSL_SOC_BOOKE=y
198# CONFIG_MPC8540_ADS is not set 229# CONFIG_MPC8540_ADS is not set
199# CONFIG_MPC8560_ADS is not set 230# CONFIG_MPC8560_ADS is not set
200# CONFIG_MPC85xx_CDS is not set 231# CONFIG_MPC85xx_CDS is not set
@@ -213,6 +244,7 @@ CONFIG_STX_GP3=y
213# CONFIG_TQM8560 is not set 244# CONFIG_TQM8560 is not set
214# CONFIG_SBC8548 is not set 245# CONFIG_SBC8548 is not set
215# CONFIG_SBC8560 is not set 246# CONFIG_SBC8560 is not set
247# CONFIG_P4080_DS is not set
216# CONFIG_IPIC is not set 248# CONFIG_IPIC is not set
217CONFIG_MPIC=y 249CONFIG_MPIC=y
218# CONFIG_MPIC_WEIRD is not set 250# CONFIG_MPIC_WEIRD is not set
@@ -257,6 +289,7 @@ CONFIG_MATH_EMULATION=y
257CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 289CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
258CONFIG_ARCH_HAS_WALK_MEMORY=y 290CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 291CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
292CONFIG_SPARSE_IRQ=y
260CONFIG_MAX_ACTIVE_REGIONS=32 293CONFIG_MAX_ACTIVE_REGIONS=32
261CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
262CONFIG_ARCH_POPULATES_NODE_MAP=y 295CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -273,8 +306,6 @@ CONFIG_MIGRATION=y
273CONFIG_ZONE_DMA_FLAG=1 306CONFIG_ZONE_DMA_FLAG=1
274CONFIG_BOUNCE=y 307CONFIG_BOUNCE=y
275CONFIG_VIRT_TO_BUS=y 308CONFIG_VIRT_TO_BUS=y
276CONFIG_HAVE_MLOCK=y
277CONFIG_HAVE_MLOCKED_PAGE_BIT=y
278# CONFIG_KSM is not set 309# CONFIG_KSM is not set
279CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 310CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
280CONFIG_PPC_4K_PAGES=y 311CONFIG_PPC_4K_PAGES=y
@@ -463,9 +494,6 @@ CONFIG_NET_PKTGEN=y
463# CONFIG_AF_RXRPC is not set 494# CONFIG_AF_RXRPC is not set
464CONFIG_WIRELESS=y 495CONFIG_WIRELESS=y
465# CONFIG_CFG80211 is not set 496# CONFIG_CFG80211 is not set
466CONFIG_CFG80211_DEFAULT_PS_VALUE=0
467CONFIG_WIRELESS_OLD_REGULATORY=y
468# CONFIG_WIRELESS_EXT is not set
469# CONFIG_LIB80211 is not set 497# CONFIG_LIB80211 is not set
470 498
471# 499#
@@ -513,6 +541,10 @@ CONFIG_BLK_DEV=y
513# CONFIG_BLK_DEV_COW_COMMON is not set 541# CONFIG_BLK_DEV_COW_COMMON is not set
514CONFIG_BLK_DEV_LOOP=m 542CONFIG_BLK_DEV_LOOP=m
515# CONFIG_BLK_DEV_CRYPTOLOOP is not set 543# CONFIG_BLK_DEV_CRYPTOLOOP is not set
544
545#
546# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
547#
516CONFIG_BLK_DEV_NBD=m 548CONFIG_BLK_DEV_NBD=m
517# CONFIG_BLK_DEV_SX8 is not set 549# CONFIG_BLK_DEV_SX8 is not set
518CONFIG_BLK_DEV_RAM=y 550CONFIG_BLK_DEV_RAM=y
@@ -523,6 +555,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
523# CONFIG_ATA_OVER_ETH is not set 555# CONFIG_ATA_OVER_ETH is not set
524# CONFIG_BLK_DEV_HD is not set 556# CONFIG_BLK_DEV_HD is not set
525CONFIG_MISC_DEVICES=y 557CONFIG_MISC_DEVICES=y
558# CONFIG_AD525X_DPOT is not set
526# CONFIG_PHANTOM is not set 559# CONFIG_PHANTOM is not set
527# CONFIG_SGI_IOC4 is not set 560# CONFIG_SGI_IOC4 is not set
528# CONFIG_TIFM_CORE is not set 561# CONFIG_TIFM_CORE is not set
@@ -530,6 +563,7 @@ CONFIG_MISC_DEVICES=y
530# CONFIG_ENCLOSURE_SERVICES is not set 563# CONFIG_ENCLOSURE_SERVICES is not set
531# CONFIG_HP_ILO is not set 564# CONFIG_HP_ILO is not set
532# CONFIG_ISL29003 is not set 565# CONFIG_ISL29003 is not set
566# CONFIG_DS1682 is not set
533# CONFIG_C2PORT is not set 567# CONFIG_C2PORT is not set
534 568
535# 569#
@@ -633,7 +667,9 @@ CONFIG_SCSI_LOWLEVEL=y
633# CONFIG_SCSI_BNX2_ISCSI is not set 667# CONFIG_SCSI_BNX2_ISCSI is not set
634# CONFIG_BE2ISCSI is not set 668# CONFIG_BE2ISCSI is not set
635# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 669# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
670# CONFIG_SCSI_HPSA is not set
636# CONFIG_SCSI_3W_9XXX is not set 671# CONFIG_SCSI_3W_9XXX is not set
672# CONFIG_SCSI_3W_SAS is not set
637# CONFIG_SCSI_ACARD is not set 673# CONFIG_SCSI_ACARD is not set
638# CONFIG_SCSI_AACRAID is not set 674# CONFIG_SCSI_AACRAID is not set
639# CONFIG_SCSI_AIC7XXX is not set 675# CONFIG_SCSI_AIC7XXX is not set
@@ -673,6 +709,7 @@ CONFIG_SCSI_LOWLEVEL=y
673# CONFIG_SCSI_NSP32 is not set 709# CONFIG_SCSI_NSP32 is not set
674# CONFIG_SCSI_DEBUG is not set 710# CONFIG_SCSI_DEBUG is not set
675# CONFIG_SCSI_PMCRAID is not set 711# CONFIG_SCSI_PMCRAID is not set
712# CONFIG_SCSI_PM8001 is not set
676# CONFIG_SCSI_SRP is not set 713# CONFIG_SCSI_SRP is not set
677# CONFIG_SCSI_BFA_FC is not set 714# CONFIG_SCSI_BFA_FC is not set
678# CONFIG_SCSI_DH is not set 715# CONFIG_SCSI_DH is not set
@@ -690,7 +727,7 @@ CONFIG_SCSI_LOWLEVEL=y
690# 727#
691 728
692# 729#
693# See the help texts for more information. 730# The newer stack is recommended.
694# 731#
695# CONFIG_FIREWIRE is not set 732# CONFIG_FIREWIRE is not set
696# CONFIG_IEEE1394 is not set 733# CONFIG_IEEE1394 is not set
@@ -797,8 +834,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
797# CONFIG_BE2NET is not set 834# CONFIG_BE2NET is not set
798# CONFIG_TR is not set 835# CONFIG_TR is not set
799CONFIG_WLAN=y 836CONFIG_WLAN=y
800# CONFIG_WLAN_PRE80211 is not set 837# CONFIG_AIRO is not set
801# CONFIG_WLAN_80211 is not set 838# CONFIG_ATMEL is not set
839# CONFIG_PRISM54 is not set
840# CONFIG_HOSTAP is not set
802 841
803# 842#
804# Enable WiMAX (Networking options) to see the WiMAX drivers 843# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -813,6 +852,7 @@ CONFIG_WLAN=y
813# CONFIG_NETCONSOLE is not set 852# CONFIG_NETCONSOLE is not set
814# CONFIG_NETPOLL is not set 853# CONFIG_NETPOLL is not set
815# CONFIG_NET_POLL_CONTROLLER is not set 854# CONFIG_NET_POLL_CONTROLLER is not set
855# CONFIG_VMXNET3 is not set
816# CONFIG_ISDN is not set 856# CONFIG_ISDN is not set
817# CONFIG_PHONE is not set 857# CONFIG_PHONE is not set
818 858
@@ -822,6 +862,7 @@ CONFIG_WLAN=y
822CONFIG_INPUT=y 862CONFIG_INPUT=y
823# CONFIG_INPUT_FF_MEMLESS is not set 863# CONFIG_INPUT_FF_MEMLESS is not set
824# CONFIG_INPUT_POLLDEV is not set 864# CONFIG_INPUT_POLLDEV is not set
865# CONFIG_INPUT_SPARSEKMAP is not set
825 866
826# 867#
827# Userland interfaces 868# Userland interfaces
@@ -881,6 +922,7 @@ CONFIG_SERIO_SERPORT=y
881CONFIG_SERIO_LIBPS2=y 922CONFIG_SERIO_LIBPS2=y
882# CONFIG_SERIO_RAW is not set 923# CONFIG_SERIO_RAW is not set
883# CONFIG_SERIO_XILINX_XPS_PS2 is not set 924# CONFIG_SERIO_XILINX_XPS_PS2 is not set
925# CONFIG_SERIO_ALTERA_PS2 is not set
884# CONFIG_GAMEPORT is not set 926# CONFIG_GAMEPORT is not set
885 927
886# 928#
@@ -905,6 +947,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
905CONFIG_SERIAL_CPM=y 947CONFIG_SERIAL_CPM=y
906CONFIG_SERIAL_CPM_CONSOLE=y 948CONFIG_SERIAL_CPM_CONSOLE=y
907# CONFIG_SERIAL_JSM is not set 949# CONFIG_SERIAL_JSM is not set
950# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
908CONFIG_UNIX98_PTYS=y 951CONFIG_UNIX98_PTYS=y
909# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 952# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
910CONFIG_LEGACY_PTYS=y 953CONFIG_LEGACY_PTYS=y
@@ -970,11 +1013,6 @@ CONFIG_I2C_ALGOBIT=m
970# CONFIG_I2C_TAOS_EVM is not set 1013# CONFIG_I2C_TAOS_EVM is not set
971 1014
972# 1015#
973# Graphics adapter I2C/DDC channel drivers
974#
975# CONFIG_I2C_VOODOO3 is not set
976
977#
978# Other I2C/SMBus bus drivers 1016# Other I2C/SMBus bus drivers
979# 1017#
980# CONFIG_I2C_PCA_PLATFORM is not set 1018# CONFIG_I2C_PCA_PLATFORM is not set
@@ -983,7 +1021,6 @@ CONFIG_I2C_ALGOBIT=m
983# 1021#
984# Miscellaneous I2C Chip support 1022# Miscellaneous I2C Chip support
985# 1023#
986# CONFIG_DS1682 is not set
987# CONFIG_SENSORS_TSL2550 is not set 1024# CONFIG_SENSORS_TSL2550 is not set
988# CONFIG_I2C_DEBUG_CORE is not set 1025# CONFIG_I2C_DEBUG_CORE is not set
989# CONFIG_I2C_DEBUG_ALGO is not set 1026# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1016,6 +1053,7 @@ CONFIG_GPIOLIB=y
1016# 1053#
1017# PCI GPIO expanders: 1054# PCI GPIO expanders:
1018# 1055#
1056# CONFIG_GPIO_CS5535 is not set
1019# CONFIG_GPIO_BT8XX is not set 1057# CONFIG_GPIO_BT8XX is not set
1020# CONFIG_GPIO_LANGWELL is not set 1058# CONFIG_GPIO_LANGWELL is not set
1021 1059
@@ -1058,6 +1096,7 @@ CONFIG_HWMON=y
1058# CONFIG_SENSORS_GL520SM is not set 1096# CONFIG_SENSORS_GL520SM is not set
1059# CONFIG_SENSORS_IT87 is not set 1097# CONFIG_SENSORS_IT87 is not set
1060# CONFIG_SENSORS_LM63 is not set 1098# CONFIG_SENSORS_LM63 is not set
1099# CONFIG_SENSORS_LM73 is not set
1061# CONFIG_SENSORS_LM75 is not set 1100# CONFIG_SENSORS_LM75 is not set
1062# CONFIG_SENSORS_LM77 is not set 1101# CONFIG_SENSORS_LM77 is not set
1063# CONFIG_SENSORS_LM78 is not set 1102# CONFIG_SENSORS_LM78 is not set
@@ -1097,6 +1136,7 @@ CONFIG_HWMON=y
1097# CONFIG_SENSORS_W83L786NG is not set 1136# CONFIG_SENSORS_W83L786NG is not set
1098# CONFIG_SENSORS_W83627HF is not set 1137# CONFIG_SENSORS_W83627HF is not set
1099# CONFIG_SENSORS_W83627EHF is not set 1138# CONFIG_SENSORS_W83627EHF is not set
1139# CONFIG_SENSORS_LIS3_I2C is not set
1100# CONFIG_THERMAL is not set 1140# CONFIG_THERMAL is not set
1101# CONFIG_WATCHDOG is not set 1141# CONFIG_WATCHDOG is not set
1102CONFIG_SSB_POSSIBLE=y 1142CONFIG_SSB_POSSIBLE=y
@@ -1115,7 +1155,6 @@ CONFIG_SSB_POSSIBLE=y
1115# CONFIG_TPS65010 is not set 1155# CONFIG_TPS65010 is not set
1116# CONFIG_MFD_TMIO is not set 1156# CONFIG_MFD_TMIO is not set
1117# CONFIG_MFD_WM8400 is not set 1157# CONFIG_MFD_WM8400 is not set
1118# CONFIG_MFD_WM831X is not set
1119# CONFIG_MFD_WM8350_I2C is not set 1158# CONFIG_MFD_WM8350_I2C is not set
1120# CONFIG_MFD_PCF50633 is not set 1159# CONFIG_MFD_PCF50633 is not set
1121# CONFIG_AB3100_CORE is not set 1160# CONFIG_AB3100_CORE is not set
@@ -1465,7 +1504,11 @@ CONFIG_BDI_SWITCH=y
1465# CONFIG_KEYS is not set 1504# CONFIG_KEYS is not set
1466# CONFIG_SECURITY is not set 1505# CONFIG_SECURITY is not set
1467# CONFIG_SECURITYFS is not set 1506# CONFIG_SECURITYFS is not set
1468# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1507# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1508# CONFIG_DEFAULT_SECURITY_SMACK is not set
1509# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1510CONFIG_DEFAULT_SECURITY_DAC=y
1511CONFIG_DEFAULT_SECURITY=""
1469CONFIG_CRYPTO=y 1512CONFIG_CRYPTO=y
1470 1513
1471# 1514#
diff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig
index 82563703d5e3..0824b4667229 100644
--- a/arch/powerpc/configs/85xx/tqm8540_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8540_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:39 2009 4# Wed Jan 6 09:24:33 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,8 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63CONFIG_DEFAULT_UIMAGE=y 64CONFIG_DEFAULT_UIMAGE=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
66CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 69CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -88,6 +91,7 @@ CONFIG_SYSVIPC_SYSCTL=y
88# 91#
89CONFIG_TREE_RCU=y 92CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 95# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 96CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 97# CONFIG_RCU_FANOUT_EXACT is not set
@@ -169,14 +173,41 @@ CONFIG_LBDAF=y
169# IO Schedulers 173# IO Schedulers
170# 174#
171CONFIG_IOSCHED_NOOP=y 175CONFIG_IOSCHED_NOOP=y
172CONFIG_IOSCHED_AS=y
173CONFIG_IOSCHED_DEADLINE=y 176CONFIG_IOSCHED_DEADLINE=y
174CONFIG_IOSCHED_CFQ=y 177CONFIG_IOSCHED_CFQ=y
175CONFIG_DEFAULT_AS=y
176# CONFIG_DEFAULT_DEADLINE is not set 178# CONFIG_DEFAULT_DEADLINE is not set
177# CONFIG_DEFAULT_CFQ is not set 179CONFIG_DEFAULT_CFQ=y
178# CONFIG_DEFAULT_NOOP is not set 180# CONFIG_DEFAULT_NOOP is not set
179CONFIG_DEFAULT_IOSCHED="anticipatory" 181CONFIG_DEFAULT_IOSCHED="cfq"
182# CONFIG_INLINE_SPIN_TRYLOCK is not set
183# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
184# CONFIG_INLINE_SPIN_LOCK is not set
185# CONFIG_INLINE_SPIN_LOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
187# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
188CONFIG_INLINE_SPIN_UNLOCK=y
189# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
190CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
191# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
192# CONFIG_INLINE_READ_TRYLOCK is not set
193# CONFIG_INLINE_READ_LOCK is not set
194# CONFIG_INLINE_READ_LOCK_BH is not set
195# CONFIG_INLINE_READ_LOCK_IRQ is not set
196# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
197CONFIG_INLINE_READ_UNLOCK=y
198# CONFIG_INLINE_READ_UNLOCK_BH is not set
199CONFIG_INLINE_READ_UNLOCK_IRQ=y
200# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
201# CONFIG_INLINE_WRITE_TRYLOCK is not set
202# CONFIG_INLINE_WRITE_LOCK is not set
203# CONFIG_INLINE_WRITE_LOCK_BH is not set
204# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
205# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
206CONFIG_INLINE_WRITE_UNLOCK=y
207# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
208CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
209# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
210# CONFIG_MUTEX_SPIN_ON_OWNER is not set
180# CONFIG_FREEZER is not set 211# CONFIG_FREEZER is not set
181 212
182# 213#
@@ -185,7 +216,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
185# CONFIG_PPC_CELL is not set 216# CONFIG_PPC_CELL is not set
186# CONFIG_PPC_CELL_NATIVE is not set 217# CONFIG_PPC_CELL_NATIVE is not set
187# CONFIG_PQ2ADS is not set 218# CONFIG_PQ2ADS is not set
188CONFIG_MPC85xx=y 219CONFIG_FSL_SOC_BOOKE=y
189# CONFIG_MPC8540_ADS is not set 220# CONFIG_MPC8540_ADS is not set
190# CONFIG_MPC8560_ADS is not set 221# CONFIG_MPC8560_ADS is not set
191# CONFIG_MPC85xx_CDS is not set 222# CONFIG_MPC85xx_CDS is not set
@@ -204,6 +235,7 @@ CONFIG_TQM8540=y
204# CONFIG_TQM8560 is not set 235# CONFIG_TQM8560 is not set
205# CONFIG_SBC8548 is not set 236# CONFIG_SBC8548 is not set
206# CONFIG_SBC8560 is not set 237# CONFIG_SBC8560 is not set
238# CONFIG_P4080_DS is not set
207CONFIG_TQM85xx=y 239CONFIG_TQM85xx=y
208# CONFIG_IPIC is not set 240# CONFIG_IPIC is not set
209CONFIG_MPIC=y 241CONFIG_MPIC=y
@@ -248,6 +280,7 @@ CONFIG_MATH_EMULATION=y
248CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 280CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
249CONFIG_ARCH_HAS_WALK_MEMORY=y 281CONFIG_ARCH_HAS_WALK_MEMORY=y
250CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 282CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
283CONFIG_SPARSE_IRQ=y
251CONFIG_MAX_ACTIVE_REGIONS=32 284CONFIG_MAX_ACTIVE_REGIONS=32
252CONFIG_ARCH_FLATMEM_ENABLE=y 285CONFIG_ARCH_FLATMEM_ENABLE=y
253CONFIG_ARCH_POPULATES_NODE_MAP=y 286CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -264,8 +297,6 @@ CONFIG_MIGRATION=y
264CONFIG_ZONE_DMA_FLAG=1 297CONFIG_ZONE_DMA_FLAG=1
265CONFIG_BOUNCE=y 298CONFIG_BOUNCE=y
266CONFIG_VIRT_TO_BUS=y 299CONFIG_VIRT_TO_BUS=y
267CONFIG_HAVE_MLOCK=y
268CONFIG_HAVE_MLOCKED_PAGE_BIT=y
269# CONFIG_KSM is not set 300# CONFIG_KSM is not set
270CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 301CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
271CONFIG_PPC_4K_PAGES=y 302CONFIG_PPC_4K_PAGES=y
@@ -391,9 +422,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
391# CONFIG_AF_RXRPC is not set 422# CONFIG_AF_RXRPC is not set
392CONFIG_WIRELESS=y 423CONFIG_WIRELESS=y
393# CONFIG_CFG80211 is not set 424# CONFIG_CFG80211 is not set
394CONFIG_CFG80211_DEFAULT_PS_VALUE=0
395CONFIG_WIRELESS_OLD_REGULATORY=y
396# CONFIG_WIRELESS_EXT is not set
397# CONFIG_LIB80211 is not set 425# CONFIG_LIB80211 is not set
398 426
399# 427#
@@ -510,6 +538,10 @@ CONFIG_BLK_DEV=y
510# CONFIG_BLK_DEV_COW_COMMON is not set 538# CONFIG_BLK_DEV_COW_COMMON is not set
511CONFIG_BLK_DEV_LOOP=y 539CONFIG_BLK_DEV_LOOP=y
512# CONFIG_BLK_DEV_CRYPTOLOOP is not set 540# CONFIG_BLK_DEV_CRYPTOLOOP is not set
541
542#
543# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
544#
513# CONFIG_BLK_DEV_NBD is not set 545# CONFIG_BLK_DEV_NBD is not set
514# CONFIG_BLK_DEV_SX8 is not set 546# CONFIG_BLK_DEV_SX8 is not set
515CONFIG_BLK_DEV_RAM=y 547CONFIG_BLK_DEV_RAM=y
@@ -520,6 +552,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
520# CONFIG_ATA_OVER_ETH is not set 552# CONFIG_ATA_OVER_ETH is not set
521# CONFIG_BLK_DEV_HD is not set 553# CONFIG_BLK_DEV_HD is not set
522CONFIG_MISC_DEVICES=y 554CONFIG_MISC_DEVICES=y
555# CONFIG_AD525X_DPOT is not set
523# CONFIG_PHANTOM is not set 556# CONFIG_PHANTOM is not set
524# CONFIG_SGI_IOC4 is not set 557# CONFIG_SGI_IOC4 is not set
525# CONFIG_TIFM_CORE is not set 558# CONFIG_TIFM_CORE is not set
@@ -527,6 +560,7 @@ CONFIG_MISC_DEVICES=y
527# CONFIG_ENCLOSURE_SERVICES is not set 560# CONFIG_ENCLOSURE_SERVICES is not set
528# CONFIG_HP_ILO is not set 561# CONFIG_HP_ILO is not set
529# CONFIG_ISL29003 is not set 562# CONFIG_ISL29003 is not set
563# CONFIG_DS1682 is not set
530# CONFIG_C2PORT is not set 564# CONFIG_C2PORT is not set
531 565
532# 566#
@@ -615,7 +649,7 @@ CONFIG_BLK_DEV_IDEDMA=y
615# 649#
616 650
617# 651#
618# See the help texts for more information. 652# The newer stack is recommended.
619# 653#
620# CONFIG_FIREWIRE is not set 654# CONFIG_FIREWIRE is not set
621# CONFIG_IEEE1394 is not set 655# CONFIG_IEEE1394 is not set
@@ -738,8 +772,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
738# CONFIG_BE2NET is not set 772# CONFIG_BE2NET is not set
739# CONFIG_TR is not set 773# CONFIG_TR is not set
740CONFIG_WLAN=y 774CONFIG_WLAN=y
741# CONFIG_WLAN_PRE80211 is not set 775# CONFIG_AIRO is not set
742# CONFIG_WLAN_80211 is not set 776# CONFIG_ATMEL is not set
777# CONFIG_PRISM54 is not set
778# CONFIG_HOSTAP is not set
743 779
744# 780#
745# Enable WiMAX (Networking options) to see the WiMAX drivers 781# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -752,6 +788,7 @@ CONFIG_WLAN=y
752# CONFIG_NETCONSOLE is not set 788# CONFIG_NETCONSOLE is not set
753# CONFIG_NETPOLL is not set 789# CONFIG_NETPOLL is not set
754# CONFIG_NET_POLL_CONTROLLER is not set 790# CONFIG_NET_POLL_CONTROLLER is not set
791# CONFIG_VMXNET3 is not set
755# CONFIG_ISDN is not set 792# CONFIG_ISDN is not set
756# CONFIG_PHONE is not set 793# CONFIG_PHONE is not set
757 794
@@ -761,6 +798,7 @@ CONFIG_WLAN=y
761CONFIG_INPUT=y 798CONFIG_INPUT=y
762# CONFIG_INPUT_FF_MEMLESS is not set 799# CONFIG_INPUT_FF_MEMLESS is not set
763# CONFIG_INPUT_POLLDEV is not set 800# CONFIG_INPUT_POLLDEV is not set
801# CONFIG_INPUT_SPARSEKMAP is not set
764 802
765# 803#
766# Userland interfaces 804# Userland interfaces
@@ -813,6 +851,7 @@ CONFIG_SERIAL_CORE=y
813CONFIG_SERIAL_CORE_CONSOLE=y 851CONFIG_SERIAL_CORE_CONSOLE=y
814# CONFIG_SERIAL_JSM is not set 852# CONFIG_SERIAL_JSM is not set
815# CONFIG_SERIAL_OF_PLATFORM is not set 853# CONFIG_SERIAL_OF_PLATFORM is not set
854# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
816CONFIG_UNIX98_PTYS=y 855CONFIG_UNIX98_PTYS=y
817# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 856# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
818CONFIG_LEGACY_PTYS=y 857CONFIG_LEGACY_PTYS=y
@@ -871,11 +910,6 @@ CONFIG_I2C_MPC=y
871# CONFIG_I2C_TAOS_EVM is not set 910# CONFIG_I2C_TAOS_EVM is not set
872 911
873# 912#
874# Graphics adapter I2C/DDC channel drivers
875#
876# CONFIG_I2C_VOODOO3 is not set
877
878#
879# Other I2C/SMBus bus drivers 913# Other I2C/SMBus bus drivers
880# 914#
881# CONFIG_I2C_PCA_PLATFORM is not set 915# CONFIG_I2C_PCA_PLATFORM is not set
@@ -883,7 +917,6 @@ CONFIG_I2C_MPC=y
883# 917#
884# Miscellaneous I2C Chip support 918# Miscellaneous I2C Chip support
885# 919#
886# CONFIG_DS1682 is not set
887# CONFIG_SENSORS_TSL2550 is not set 920# CONFIG_SENSORS_TSL2550 is not set
888# CONFIG_I2C_DEBUG_CORE is not set 921# CONFIG_I2C_DEBUG_CORE is not set
889# CONFIG_I2C_DEBUG_ALGO is not set 922# CONFIG_I2C_DEBUG_ALGO is not set
@@ -929,6 +962,7 @@ CONFIG_HWMON_DEBUG_CHIP=y
929# CONFIG_SENSORS_GL520SM is not set 962# CONFIG_SENSORS_GL520SM is not set
930# CONFIG_SENSORS_IT87 is not set 963# CONFIG_SENSORS_IT87 is not set
931# CONFIG_SENSORS_LM63 is not set 964# CONFIG_SENSORS_LM63 is not set
965# CONFIG_SENSORS_LM73 is not set
932CONFIG_SENSORS_LM75=y 966CONFIG_SENSORS_LM75=y
933# CONFIG_SENSORS_LM77 is not set 967# CONFIG_SENSORS_LM77 is not set
934# CONFIG_SENSORS_LM78 is not set 968# CONFIG_SENSORS_LM78 is not set
@@ -967,6 +1001,7 @@ CONFIG_SENSORS_LM75=y
967# CONFIG_SENSORS_W83L786NG is not set 1001# CONFIG_SENSORS_W83L786NG is not set
968# CONFIG_SENSORS_W83627HF is not set 1002# CONFIG_SENSORS_W83627HF is not set
969# CONFIG_SENSORS_W83627EHF is not set 1003# CONFIG_SENSORS_W83627EHF is not set
1004# CONFIG_SENSORS_LIS3_I2C is not set
970# CONFIG_THERMAL is not set 1005# CONFIG_THERMAL is not set
971# CONFIG_WATCHDOG is not set 1006# CONFIG_WATCHDOG is not set
972CONFIG_SSB_POSSIBLE=y 1007CONFIG_SSB_POSSIBLE=y
@@ -985,11 +1020,13 @@ CONFIG_SSB_POSSIBLE=y
985# CONFIG_TWL4030_CORE is not set 1020# CONFIG_TWL4030_CORE is not set
986# CONFIG_MFD_TMIO is not set 1021# CONFIG_MFD_TMIO is not set
987# CONFIG_PMIC_DA903X is not set 1022# CONFIG_PMIC_DA903X is not set
1023# CONFIG_PMIC_ADP5520 is not set
988# CONFIG_MFD_WM8400 is not set 1024# CONFIG_MFD_WM8400 is not set
989# CONFIG_MFD_WM831X is not set 1025# CONFIG_MFD_WM831X is not set
990# CONFIG_MFD_WM8350_I2C is not set 1026# CONFIG_MFD_WM8350_I2C is not set
991# CONFIG_MFD_PCF50633 is not set 1027# CONFIG_MFD_PCF50633 is not set
992# CONFIG_AB3100_CORE is not set 1028# CONFIG_AB3100_CORE is not set
1029# CONFIG_MFD_88PM8607 is not set
993# CONFIG_REGULATOR is not set 1030# CONFIG_REGULATOR is not set
994# CONFIG_MEDIA_SUPPORT is not set 1031# CONFIG_MEDIA_SUPPORT is not set
995 1032
@@ -1220,7 +1257,7 @@ CONFIG_FRAME_WARN=1024
1220# CONFIG_DEBUG_KERNEL is not set 1257# CONFIG_DEBUG_KERNEL is not set
1221# CONFIG_SLUB_DEBUG_ON is not set 1258# CONFIG_SLUB_DEBUG_ON is not set
1222# CONFIG_SLUB_STATS is not set 1259# CONFIG_SLUB_STATS is not set
1223# CONFIG_DEBUG_BUGVERBOSE is not set 1260CONFIG_DEBUG_BUGVERBOSE=y
1224# CONFIG_DEBUG_MEMORY_INIT is not set 1261# CONFIG_DEBUG_MEMORY_INIT is not set
1225# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1262# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1226# CONFIG_LATENCYTOP is not set 1263# CONFIG_LATENCYTOP is not set
@@ -1246,7 +1283,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1246# CONFIG_KEYS is not set 1283# CONFIG_KEYS is not set
1247# CONFIG_SECURITY is not set 1284# CONFIG_SECURITY is not set
1248# CONFIG_SECURITYFS is not set 1285# CONFIG_SECURITYFS is not set
1249# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1286# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1287# CONFIG_DEFAULT_SECURITY_SMACK is not set
1288# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1289CONFIG_DEFAULT_SECURITY_DAC=y
1290CONFIG_DEFAULT_SECURITY=""
1250CONFIG_CRYPTO=y 1291CONFIG_CRYPTO=y
1251 1292
1252# 1293#
diff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig
index 91d85d733827..2137be4100ed 100644
--- a/arch/powerpc/configs/85xx/tqm8541_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8541_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:40 2009 4# Wed Jan 6 09:24:34 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -89,6 +92,7 @@ CONFIG_SYSVIPC_SYSCTL=y
89# 92#
90CONFIG_TREE_RCU=y 93CONFIG_TREE_RCU=y
91# CONFIG_TREE_PREEMPT_RCU is not set 94# CONFIG_TREE_PREEMPT_RCU is not set
95# CONFIG_TINY_RCU is not set
92# CONFIG_RCU_TRACE is not set 96# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32 97CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set 98# CONFIG_RCU_FANOUT_EXACT is not set
@@ -171,14 +175,41 @@ CONFIG_LBDAF=y
171# IO Schedulers 175# IO Schedulers
172# 176#
173CONFIG_IOSCHED_NOOP=y 177CONFIG_IOSCHED_NOOP=y
174CONFIG_IOSCHED_AS=y
175CONFIG_IOSCHED_DEADLINE=y 178CONFIG_IOSCHED_DEADLINE=y
176CONFIG_IOSCHED_CFQ=y 179CONFIG_IOSCHED_CFQ=y
177CONFIG_DEFAULT_AS=y
178# CONFIG_DEFAULT_DEADLINE is not set 180# CONFIG_DEFAULT_DEADLINE is not set
179# CONFIG_DEFAULT_CFQ is not set 181CONFIG_DEFAULT_CFQ=y
180# CONFIG_DEFAULT_NOOP is not set 182# CONFIG_DEFAULT_NOOP is not set
181CONFIG_DEFAULT_IOSCHED="anticipatory" 183CONFIG_DEFAULT_IOSCHED="cfq"
184# CONFIG_INLINE_SPIN_TRYLOCK is not set
185# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK is not set
187# CONFIG_INLINE_SPIN_LOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
190CONFIG_INLINE_SPIN_UNLOCK=y
191# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
192CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
193# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
194# CONFIG_INLINE_READ_TRYLOCK is not set
195# CONFIG_INLINE_READ_LOCK is not set
196# CONFIG_INLINE_READ_LOCK_BH is not set
197# CONFIG_INLINE_READ_LOCK_IRQ is not set
198# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
199CONFIG_INLINE_READ_UNLOCK=y
200# CONFIG_INLINE_READ_UNLOCK_BH is not set
201CONFIG_INLINE_READ_UNLOCK_IRQ=y
202# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
203# CONFIG_INLINE_WRITE_TRYLOCK is not set
204# CONFIG_INLINE_WRITE_LOCK is not set
205# CONFIG_INLINE_WRITE_LOCK_BH is not set
206# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
208CONFIG_INLINE_WRITE_UNLOCK=y
209# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
210CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
211# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
212# CONFIG_MUTEX_SPIN_ON_OWNER is not set
182# CONFIG_FREEZER is not set 213# CONFIG_FREEZER is not set
183 214
184# 215#
@@ -187,7 +218,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
187# CONFIG_PPC_CELL is not set 218# CONFIG_PPC_CELL is not set
188# CONFIG_PPC_CELL_NATIVE is not set 219# CONFIG_PPC_CELL_NATIVE is not set
189# CONFIG_PQ2ADS is not set 220# CONFIG_PQ2ADS is not set
190CONFIG_MPC85xx=y 221CONFIG_FSL_SOC_BOOKE=y
191# CONFIG_MPC8540_ADS is not set 222# CONFIG_MPC8540_ADS is not set
192# CONFIG_MPC8560_ADS is not set 223# CONFIG_MPC8560_ADS is not set
193# CONFIG_MPC85xx_CDS is not set 224# CONFIG_MPC85xx_CDS is not set
@@ -206,6 +237,7 @@ CONFIG_TQM8541=y
206# CONFIG_TQM8560 is not set 237# CONFIG_TQM8560 is not set
207# CONFIG_SBC8548 is not set 238# CONFIG_SBC8548 is not set
208# CONFIG_SBC8560 is not set 239# CONFIG_SBC8560 is not set
240# CONFIG_P4080_DS is not set
209CONFIG_TQM85xx=y 241CONFIG_TQM85xx=y
210# CONFIG_IPIC is not set 242# CONFIG_IPIC is not set
211CONFIG_MPIC=y 243CONFIG_MPIC=y
@@ -251,6 +283,7 @@ CONFIG_MATH_EMULATION=y
251CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 283CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
252CONFIG_ARCH_HAS_WALK_MEMORY=y 284CONFIG_ARCH_HAS_WALK_MEMORY=y
253CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 285CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
286CONFIG_SPARSE_IRQ=y
254CONFIG_MAX_ACTIVE_REGIONS=32 287CONFIG_MAX_ACTIVE_REGIONS=32
255CONFIG_ARCH_FLATMEM_ENABLE=y 288CONFIG_ARCH_FLATMEM_ENABLE=y
256CONFIG_ARCH_POPULATES_NODE_MAP=y 289CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -267,8 +300,6 @@ CONFIG_MIGRATION=y
267CONFIG_ZONE_DMA_FLAG=1 300CONFIG_ZONE_DMA_FLAG=1
268CONFIG_BOUNCE=y 301CONFIG_BOUNCE=y
269CONFIG_VIRT_TO_BUS=y 302CONFIG_VIRT_TO_BUS=y
270CONFIG_HAVE_MLOCK=y
271CONFIG_HAVE_MLOCKED_PAGE_BIT=y
272# CONFIG_KSM is not set 303# CONFIG_KSM is not set
273CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 304CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
274CONFIG_PPC_4K_PAGES=y 305CONFIG_PPC_4K_PAGES=y
@@ -394,9 +425,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
394# CONFIG_AF_RXRPC is not set 425# CONFIG_AF_RXRPC is not set
395CONFIG_WIRELESS=y 426CONFIG_WIRELESS=y
396# CONFIG_CFG80211 is not set 427# CONFIG_CFG80211 is not set
397CONFIG_CFG80211_DEFAULT_PS_VALUE=0
398CONFIG_WIRELESS_OLD_REGULATORY=y
399# CONFIG_WIRELESS_EXT is not set
400# CONFIG_LIB80211 is not set 428# CONFIG_LIB80211 is not set
401 429
402# 430#
@@ -514,6 +542,10 @@ CONFIG_BLK_DEV=y
514# CONFIG_BLK_DEV_COW_COMMON is not set 542# CONFIG_BLK_DEV_COW_COMMON is not set
515CONFIG_BLK_DEV_LOOP=y 543CONFIG_BLK_DEV_LOOP=y
516# CONFIG_BLK_DEV_CRYPTOLOOP is not set 544# CONFIG_BLK_DEV_CRYPTOLOOP is not set
545
546#
547# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
548#
517# CONFIG_BLK_DEV_NBD is not set 549# CONFIG_BLK_DEV_NBD is not set
518# CONFIG_BLK_DEV_SX8 is not set 550# CONFIG_BLK_DEV_SX8 is not set
519CONFIG_BLK_DEV_RAM=y 551CONFIG_BLK_DEV_RAM=y
@@ -524,6 +556,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
524# CONFIG_ATA_OVER_ETH is not set 556# CONFIG_ATA_OVER_ETH is not set
525# CONFIG_BLK_DEV_HD is not set 557# CONFIG_BLK_DEV_HD is not set
526CONFIG_MISC_DEVICES=y 558CONFIG_MISC_DEVICES=y
559# CONFIG_AD525X_DPOT is not set
527# CONFIG_PHANTOM is not set 560# CONFIG_PHANTOM is not set
528# CONFIG_SGI_IOC4 is not set 561# CONFIG_SGI_IOC4 is not set
529# CONFIG_TIFM_CORE is not set 562# CONFIG_TIFM_CORE is not set
@@ -531,6 +564,7 @@ CONFIG_MISC_DEVICES=y
531# CONFIG_ENCLOSURE_SERVICES is not set 564# CONFIG_ENCLOSURE_SERVICES is not set
532# CONFIG_HP_ILO is not set 565# CONFIG_HP_ILO is not set
533# CONFIG_ISL29003 is not set 566# CONFIG_ISL29003 is not set
567# CONFIG_DS1682 is not set
534# CONFIG_C2PORT is not set 568# CONFIG_C2PORT is not set
535 569
536# 570#
@@ -619,7 +653,7 @@ CONFIG_BLK_DEV_IDEDMA=y
619# 653#
620 654
621# 655#
622# See the help texts for more information. 656# The newer stack is recommended.
623# 657#
624# CONFIG_FIREWIRE is not set 658# CONFIG_FIREWIRE is not set
625# CONFIG_IEEE1394 is not set 659# CONFIG_IEEE1394 is not set
@@ -743,8 +777,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
743# CONFIG_BE2NET is not set 777# CONFIG_BE2NET is not set
744# CONFIG_TR is not set 778# CONFIG_TR is not set
745CONFIG_WLAN=y 779CONFIG_WLAN=y
746# CONFIG_WLAN_PRE80211 is not set 780# CONFIG_AIRO is not set
747# CONFIG_WLAN_80211 is not set 781# CONFIG_ATMEL is not set
782# CONFIG_PRISM54 is not set
783# CONFIG_HOSTAP is not set
748 784
749# 785#
750# Enable WiMAX (Networking options) to see the WiMAX drivers 786# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -757,6 +793,7 @@ CONFIG_WLAN=y
757# CONFIG_NETCONSOLE is not set 793# CONFIG_NETCONSOLE is not set
758# CONFIG_NETPOLL is not set 794# CONFIG_NETPOLL is not set
759# CONFIG_NET_POLL_CONTROLLER is not set 795# CONFIG_NET_POLL_CONTROLLER is not set
796# CONFIG_VMXNET3 is not set
760# CONFIG_ISDN is not set 797# CONFIG_ISDN is not set
761# CONFIG_PHONE is not set 798# CONFIG_PHONE is not set
762 799
@@ -766,6 +803,7 @@ CONFIG_WLAN=y
766CONFIG_INPUT=y 803CONFIG_INPUT=y
767# CONFIG_INPUT_FF_MEMLESS is not set 804# CONFIG_INPUT_FF_MEMLESS is not set
768# CONFIG_INPUT_POLLDEV is not set 805# CONFIG_INPUT_POLLDEV is not set
806# CONFIG_INPUT_SPARSEKMAP is not set
769 807
770# 808#
771# Userland interfaces 809# Userland interfaces
@@ -820,6 +858,7 @@ CONFIG_SERIAL_CPM=y
820CONFIG_SERIAL_CPM_CONSOLE=y 858CONFIG_SERIAL_CPM_CONSOLE=y
821# CONFIG_SERIAL_JSM is not set 859# CONFIG_SERIAL_JSM is not set
822# CONFIG_SERIAL_OF_PLATFORM is not set 860# CONFIG_SERIAL_OF_PLATFORM is not set
861# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
823CONFIG_UNIX98_PTYS=y 862CONFIG_UNIX98_PTYS=y
824# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 863# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
825CONFIG_LEGACY_PTYS=y 864CONFIG_LEGACY_PTYS=y
@@ -881,11 +920,6 @@ CONFIG_I2C_MPC=y
881# CONFIG_I2C_TAOS_EVM is not set 920# CONFIG_I2C_TAOS_EVM is not set
882 921
883# 922#
884# Graphics adapter I2C/DDC channel drivers
885#
886# CONFIG_I2C_VOODOO3 is not set
887
888#
889# Other I2C/SMBus bus drivers 923# Other I2C/SMBus bus drivers
890# 924#
891# CONFIG_I2C_PCA_PLATFORM is not set 925# CONFIG_I2C_PCA_PLATFORM is not set
@@ -893,7 +927,6 @@ CONFIG_I2C_MPC=y
893# 927#
894# Miscellaneous I2C Chip support 928# Miscellaneous I2C Chip support
895# 929#
896# CONFIG_DS1682 is not set
897# CONFIG_SENSORS_TSL2550 is not set 930# CONFIG_SENSORS_TSL2550 is not set
898# CONFIG_I2C_DEBUG_CORE is not set 931# CONFIG_I2C_DEBUG_CORE is not set
899# CONFIG_I2C_DEBUG_ALGO is not set 932# CONFIG_I2C_DEBUG_ALGO is not set
@@ -925,6 +958,7 @@ CONFIG_GPIOLIB=y
925# 958#
926# PCI GPIO expanders: 959# PCI GPIO expanders:
927# 960#
961# CONFIG_GPIO_CS5535 is not set
928# CONFIG_GPIO_BT8XX is not set 962# CONFIG_GPIO_BT8XX is not set
929# CONFIG_GPIO_LANGWELL is not set 963# CONFIG_GPIO_LANGWELL is not set
930 964
@@ -967,6 +1001,7 @@ CONFIG_HWMON_DEBUG_CHIP=y
967# CONFIG_SENSORS_GL520SM is not set 1001# CONFIG_SENSORS_GL520SM is not set
968# CONFIG_SENSORS_IT87 is not set 1002# CONFIG_SENSORS_IT87 is not set
969# CONFIG_SENSORS_LM63 is not set 1003# CONFIG_SENSORS_LM63 is not set
1004# CONFIG_SENSORS_LM73 is not set
970CONFIG_SENSORS_LM75=y 1005CONFIG_SENSORS_LM75=y
971# CONFIG_SENSORS_LM77 is not set 1006# CONFIG_SENSORS_LM77 is not set
972# CONFIG_SENSORS_LM78 is not set 1007# CONFIG_SENSORS_LM78 is not set
@@ -1006,6 +1041,7 @@ CONFIG_SENSORS_LM75=y
1006# CONFIG_SENSORS_W83L786NG is not set 1041# CONFIG_SENSORS_W83L786NG is not set
1007# CONFIG_SENSORS_W83627HF is not set 1042# CONFIG_SENSORS_W83627HF is not set
1008# CONFIG_SENSORS_W83627EHF is not set 1043# CONFIG_SENSORS_W83627EHF is not set
1044# CONFIG_SENSORS_LIS3_I2C is not set
1009# CONFIG_THERMAL is not set 1045# CONFIG_THERMAL is not set
1010# CONFIG_WATCHDOG is not set 1046# CONFIG_WATCHDOG is not set
1011CONFIG_SSB_POSSIBLE=y 1047CONFIG_SSB_POSSIBLE=y
@@ -1025,11 +1061,13 @@ CONFIG_SSB_POSSIBLE=y
1025# CONFIG_TWL4030_CORE is not set 1061# CONFIG_TWL4030_CORE is not set
1026# CONFIG_MFD_TMIO is not set 1062# CONFIG_MFD_TMIO is not set
1027# CONFIG_PMIC_DA903X is not set 1063# CONFIG_PMIC_DA903X is not set
1064# CONFIG_PMIC_ADP5520 is not set
1028# CONFIG_MFD_WM8400 is not set 1065# CONFIG_MFD_WM8400 is not set
1029# CONFIG_MFD_WM831X is not set 1066# CONFIG_MFD_WM831X is not set
1030# CONFIG_MFD_WM8350_I2C is not set 1067# CONFIG_MFD_WM8350_I2C is not set
1031# CONFIG_MFD_PCF50633 is not set 1068# CONFIG_MFD_PCF50633 is not set
1032# CONFIG_AB3100_CORE is not set 1069# CONFIG_AB3100_CORE is not set
1070# CONFIG_MFD_88PM8607 is not set
1033# CONFIG_REGULATOR is not set 1071# CONFIG_REGULATOR is not set
1034# CONFIG_MEDIA_SUPPORT is not set 1072# CONFIG_MEDIA_SUPPORT is not set
1035 1073
@@ -1260,7 +1298,7 @@ CONFIG_FRAME_WARN=1024
1260# CONFIG_DEBUG_KERNEL is not set 1298# CONFIG_DEBUG_KERNEL is not set
1261# CONFIG_SLUB_DEBUG_ON is not set 1299# CONFIG_SLUB_DEBUG_ON is not set
1262# CONFIG_SLUB_STATS is not set 1300# CONFIG_SLUB_STATS is not set
1263# CONFIG_DEBUG_BUGVERBOSE is not set 1301CONFIG_DEBUG_BUGVERBOSE=y
1264# CONFIG_DEBUG_MEMORY_INIT is not set 1302# CONFIG_DEBUG_MEMORY_INIT is not set
1265# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1303# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1266# CONFIG_LATENCYTOP is not set 1304# CONFIG_LATENCYTOP is not set
@@ -1286,7 +1324,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1286# CONFIG_KEYS is not set 1324# CONFIG_KEYS is not set
1287# CONFIG_SECURITY is not set 1325# CONFIG_SECURITY is not set
1288# CONFIG_SECURITYFS is not set 1326# CONFIG_SECURITYFS is not set
1289# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1327# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1328# CONFIG_DEFAULT_SECURITY_SMACK is not set
1329# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1330CONFIG_DEFAULT_SECURITY_DAC=y
1331CONFIG_DEFAULT_SECURITY=""
1290CONFIG_CRYPTO=y 1332CONFIG_CRYPTO=y
1291 1333
1292# 1334#
diff --git a/arch/powerpc/configs/85xx/tqm8548_defconfig b/arch/powerpc/configs/85xx/tqm8548_defconfig
index debe268f43d1..5cc89aac3fec 100644
--- a/arch/powerpc/configs/85xx/tqm8548_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8548_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:41 2009 4# Wed Jan 6 09:24:35 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,8 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63CONFIG_DEFAULT_UIMAGE=y 64CONFIG_DEFAULT_UIMAGE=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
66CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 69CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -88,6 +91,7 @@ CONFIG_SYSVIPC_SYSCTL=y
88# 91#
89CONFIG_TREE_RCU=y 92CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 95# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 96CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 97# CONFIG_RCU_FANOUT_EXACT is not set
@@ -177,14 +181,41 @@ CONFIG_LBDAF=y
177# IO Schedulers 181# IO Schedulers
178# 182#
179CONFIG_IOSCHED_NOOP=y 183CONFIG_IOSCHED_NOOP=y
180CONFIG_IOSCHED_AS=y
181CONFIG_IOSCHED_DEADLINE=y 184CONFIG_IOSCHED_DEADLINE=y
182CONFIG_IOSCHED_CFQ=y 185CONFIG_IOSCHED_CFQ=y
183CONFIG_DEFAULT_AS=y
184# CONFIG_DEFAULT_DEADLINE is not set 186# CONFIG_DEFAULT_DEADLINE is not set
185# CONFIG_DEFAULT_CFQ is not set 187CONFIG_DEFAULT_CFQ=y
186# CONFIG_DEFAULT_NOOP is not set 188# CONFIG_DEFAULT_NOOP is not set
187CONFIG_DEFAULT_IOSCHED="anticipatory" 189CONFIG_DEFAULT_IOSCHED="cfq"
190# CONFIG_INLINE_SPIN_TRYLOCK is not set
191# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
192# CONFIG_INLINE_SPIN_LOCK is not set
193# CONFIG_INLINE_SPIN_LOCK_BH is not set
194# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
195# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
196CONFIG_INLINE_SPIN_UNLOCK=y
197# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
198CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
199# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
200# CONFIG_INLINE_READ_TRYLOCK is not set
201# CONFIG_INLINE_READ_LOCK is not set
202# CONFIG_INLINE_READ_LOCK_BH is not set
203# CONFIG_INLINE_READ_LOCK_IRQ is not set
204# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
205CONFIG_INLINE_READ_UNLOCK=y
206# CONFIG_INLINE_READ_UNLOCK_BH is not set
207CONFIG_INLINE_READ_UNLOCK_IRQ=y
208# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
209# CONFIG_INLINE_WRITE_TRYLOCK is not set
210# CONFIG_INLINE_WRITE_LOCK is not set
211# CONFIG_INLINE_WRITE_LOCK_BH is not set
212# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
213# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
214CONFIG_INLINE_WRITE_UNLOCK=y
215# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
216CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
217# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
218# CONFIG_MUTEX_SPIN_ON_OWNER is not set
188# CONFIG_FREEZER is not set 219# CONFIG_FREEZER is not set
189 220
190# 221#
@@ -193,7 +224,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
193# CONFIG_PPC_CELL is not set 224# CONFIG_PPC_CELL is not set
194# CONFIG_PPC_CELL_NATIVE is not set 225# CONFIG_PPC_CELL_NATIVE is not set
195# CONFIG_PQ2ADS is not set 226# CONFIG_PQ2ADS is not set
196CONFIG_MPC85xx=y 227CONFIG_FSL_SOC_BOOKE=y
197# CONFIG_MPC8540_ADS is not set 228# CONFIG_MPC8540_ADS is not set
198# CONFIG_MPC8560_ADS is not set 229# CONFIG_MPC8560_ADS is not set
199# CONFIG_MPC85xx_CDS is not set 230# CONFIG_MPC85xx_CDS is not set
@@ -212,6 +243,7 @@ CONFIG_TQM8548=y
212# CONFIG_TQM8560 is not set 243# CONFIG_TQM8560 is not set
213# CONFIG_SBC8548 is not set 244# CONFIG_SBC8548 is not set
214# CONFIG_SBC8560 is not set 245# CONFIG_SBC8560 is not set
246# CONFIG_P4080_DS is not set
215CONFIG_TQM85xx=y 247CONFIG_TQM85xx=y
216# CONFIG_IPIC is not set 248# CONFIG_IPIC is not set
217CONFIG_MPIC=y 249CONFIG_MPIC=y
@@ -257,6 +289,7 @@ CONFIG_MATH_EMULATION=y
257CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 289CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
258CONFIG_ARCH_HAS_WALK_MEMORY=y 290CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 291CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
292CONFIG_SPARSE_IRQ=y
260CONFIG_MAX_ACTIVE_REGIONS=32 293CONFIG_MAX_ACTIVE_REGIONS=32
261CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
262CONFIG_ARCH_POPULATES_NODE_MAP=y 295CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -273,8 +306,6 @@ CONFIG_MIGRATION=y
273CONFIG_ZONE_DMA_FLAG=1 306CONFIG_ZONE_DMA_FLAG=1
274CONFIG_BOUNCE=y 307CONFIG_BOUNCE=y
275CONFIG_VIRT_TO_BUS=y 308CONFIG_VIRT_TO_BUS=y
276CONFIG_HAVE_MLOCK=y
277CONFIG_HAVE_MLOCKED_PAGE_BIT=y
278# CONFIG_KSM is not set 309# CONFIG_KSM is not set
279CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 310CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
280CONFIG_PPC_4K_PAGES=y 311CONFIG_PPC_4K_PAGES=y
@@ -406,7 +437,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
406# CONFIG_IRDA is not set 437# CONFIG_IRDA is not set
407# CONFIG_BT is not set 438# CONFIG_BT is not set
408# CONFIG_AF_RXRPC is not set 439# CONFIG_AF_RXRPC is not set
409# CONFIG_WIRELESS is not set 440CONFIG_WIRELESS=y
441# CONFIG_CFG80211 is not set
442# CONFIG_LIB80211 is not set
443
444#
445# CFG80211 needs to be enabled for MAC80211
446#
410# CONFIG_WIMAX is not set 447# CONFIG_WIMAX is not set
411# CONFIG_RFKILL is not set 448# CONFIG_RFKILL is not set
412# CONFIG_NET_9P is not set 449# CONFIG_NET_9P is not set
@@ -535,6 +572,10 @@ CONFIG_BLK_DEV=y
535# CONFIG_BLK_DEV_COW_COMMON is not set 572# CONFIG_BLK_DEV_COW_COMMON is not set
536CONFIG_BLK_DEV_LOOP=y 573CONFIG_BLK_DEV_LOOP=y
537# CONFIG_BLK_DEV_CRYPTOLOOP is not set 574# CONFIG_BLK_DEV_CRYPTOLOOP is not set
575
576#
577# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
578#
538# CONFIG_BLK_DEV_NBD is not set 579# CONFIG_BLK_DEV_NBD is not set
539# CONFIG_BLK_DEV_SX8 is not set 580# CONFIG_BLK_DEV_SX8 is not set
540CONFIG_BLK_DEV_RAM=y 581CONFIG_BLK_DEV_RAM=y
@@ -545,6 +586,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
545# CONFIG_ATA_OVER_ETH is not set 586# CONFIG_ATA_OVER_ETH is not set
546# CONFIG_BLK_DEV_HD is not set 587# CONFIG_BLK_DEV_HD is not set
547CONFIG_MISC_DEVICES=y 588CONFIG_MISC_DEVICES=y
589# CONFIG_AD525X_DPOT is not set
548# CONFIG_PHANTOM is not set 590# CONFIG_PHANTOM is not set
549# CONFIG_SGI_IOC4 is not set 591# CONFIG_SGI_IOC4 is not set
550# CONFIG_TIFM_CORE is not set 592# CONFIG_TIFM_CORE is not set
@@ -552,6 +594,7 @@ CONFIG_MISC_DEVICES=y
552# CONFIG_ENCLOSURE_SERVICES is not set 594# CONFIG_ENCLOSURE_SERVICES is not set
553# CONFIG_HP_ILO is not set 595# CONFIG_HP_ILO is not set
554# CONFIG_ISL29003 is not set 596# CONFIG_ISL29003 is not set
597# CONFIG_DS1682 is not set
555# CONFIG_C2PORT is not set 598# CONFIG_C2PORT is not set
556 599
557# 600#
@@ -585,7 +628,7 @@ CONFIG_HAVE_IDE=y
585# 628#
586 629
587# 630#
588# See the help texts for more information. 631# The newer stack is recommended.
589# 632#
590# CONFIG_FIREWIRE is not set 633# CONFIG_FIREWIRE is not set
591# CONFIG_IEEE1394 is not set 634# CONFIG_IEEE1394 is not set
@@ -690,8 +733,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
690# CONFIG_BE2NET is not set 733# CONFIG_BE2NET is not set
691# CONFIG_TR is not set 734# CONFIG_TR is not set
692CONFIG_WLAN=y 735CONFIG_WLAN=y
693# CONFIG_WLAN_PRE80211 is not set 736# CONFIG_AIRO is not set
694# CONFIG_WLAN_80211 is not set 737# CONFIG_ATMEL is not set
738# CONFIG_PRISM54 is not set
739# CONFIG_HOSTAP is not set
695 740
696# 741#
697# Enable WiMAX (Networking options) to see the WiMAX drivers 742# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -704,6 +749,7 @@ CONFIG_WLAN=y
704# CONFIG_NETCONSOLE is not set 749# CONFIG_NETCONSOLE is not set
705# CONFIG_NETPOLL is not set 750# CONFIG_NETPOLL is not set
706# CONFIG_NET_POLL_CONTROLLER is not set 751# CONFIG_NET_POLL_CONTROLLER is not set
752# CONFIG_VMXNET3 is not set
707# CONFIG_ISDN is not set 753# CONFIG_ISDN is not set
708# CONFIG_PHONE is not set 754# CONFIG_PHONE is not set
709 755
@@ -713,6 +759,7 @@ CONFIG_WLAN=y
713CONFIG_INPUT=y 759CONFIG_INPUT=y
714# CONFIG_INPUT_FF_MEMLESS is not set 760# CONFIG_INPUT_FF_MEMLESS is not set
715# CONFIG_INPUT_POLLDEV is not set 761# CONFIG_INPUT_POLLDEV is not set
762# CONFIG_INPUT_SPARSEKMAP is not set
716 763
717# 764#
718# Userland interfaces 765# Userland interfaces
@@ -765,6 +812,7 @@ CONFIG_SERIAL_CORE=y
765CONFIG_SERIAL_CORE_CONSOLE=y 812CONFIG_SERIAL_CORE_CONSOLE=y
766# CONFIG_SERIAL_JSM is not set 813# CONFIG_SERIAL_JSM is not set
767# CONFIG_SERIAL_OF_PLATFORM is not set 814# CONFIG_SERIAL_OF_PLATFORM is not set
815# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
768CONFIG_UNIX98_PTYS=y 816CONFIG_UNIX98_PTYS=y
769# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 817# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
770CONFIG_LEGACY_PTYS=y 818CONFIG_LEGACY_PTYS=y
@@ -820,11 +868,6 @@ CONFIG_I2C_MPC=y
820# CONFIG_I2C_TAOS_EVM is not set 868# CONFIG_I2C_TAOS_EVM is not set
821 869
822# 870#
823# Graphics adapter I2C/DDC channel drivers
824#
825# CONFIG_I2C_VOODOO3 is not set
826
827#
828# Other I2C/SMBus bus drivers 871# Other I2C/SMBus bus drivers
829# 872#
830# CONFIG_I2C_PCA_PLATFORM is not set 873# CONFIG_I2C_PCA_PLATFORM is not set
@@ -833,7 +876,6 @@ CONFIG_I2C_MPC=y
833# 876#
834# Miscellaneous I2C Chip support 877# Miscellaneous I2C Chip support
835# 878#
836# CONFIG_DS1682 is not set
837# CONFIG_SENSORS_TSL2550 is not set 879# CONFIG_SENSORS_TSL2550 is not set
838# CONFIG_I2C_DEBUG_CORE is not set 880# CONFIG_I2C_DEBUG_CORE is not set
839# CONFIG_I2C_DEBUG_ALGO is not set 881# CONFIG_I2C_DEBUG_ALGO is not set
@@ -879,6 +921,7 @@ CONFIG_HWMON=y
879# CONFIG_SENSORS_GL520SM is not set 921# CONFIG_SENSORS_GL520SM is not set
880# CONFIG_SENSORS_IT87 is not set 922# CONFIG_SENSORS_IT87 is not set
881# CONFIG_SENSORS_LM63 is not set 923# CONFIG_SENSORS_LM63 is not set
924# CONFIG_SENSORS_LM73 is not set
882CONFIG_SENSORS_LM75=y 925CONFIG_SENSORS_LM75=y
883# CONFIG_SENSORS_LM77 is not set 926# CONFIG_SENSORS_LM77 is not set
884# CONFIG_SENSORS_LM78 is not set 927# CONFIG_SENSORS_LM78 is not set
@@ -917,6 +960,7 @@ CONFIG_SENSORS_LM75=y
917# CONFIG_SENSORS_W83L786NG is not set 960# CONFIG_SENSORS_W83L786NG is not set
918# CONFIG_SENSORS_W83627HF is not set 961# CONFIG_SENSORS_W83627HF is not set
919# CONFIG_SENSORS_W83627EHF is not set 962# CONFIG_SENSORS_W83627EHF is not set
963# CONFIG_SENSORS_LIS3_I2C is not set
920# CONFIG_THERMAL is not set 964# CONFIG_THERMAL is not set
921# CONFIG_WATCHDOG is not set 965# CONFIG_WATCHDOG is not set
922CONFIG_SSB_POSSIBLE=y 966CONFIG_SSB_POSSIBLE=y
@@ -935,11 +979,13 @@ CONFIG_SSB_POSSIBLE=y
935# CONFIG_TWL4030_CORE is not set 979# CONFIG_TWL4030_CORE is not set
936# CONFIG_MFD_TMIO is not set 980# CONFIG_MFD_TMIO is not set
937# CONFIG_PMIC_DA903X is not set 981# CONFIG_PMIC_DA903X is not set
982# CONFIG_PMIC_ADP5520 is not set
938# CONFIG_MFD_WM8400 is not set 983# CONFIG_MFD_WM8400 is not set
939# CONFIG_MFD_WM831X is not set 984# CONFIG_MFD_WM831X is not set
940# CONFIG_MFD_WM8350_I2C is not set 985# CONFIG_MFD_WM8350_I2C is not set
941# CONFIG_MFD_PCF50633 is not set 986# CONFIG_MFD_PCF50633 is not set
942# CONFIG_AB3100_CORE is not set 987# CONFIG_AB3100_CORE is not set
988# CONFIG_MFD_88PM8607 is not set
943# CONFIG_REGULATOR is not set 989# CONFIG_REGULATOR is not set
944# CONFIG_MEDIA_SUPPORT is not set 990# CONFIG_MEDIA_SUPPORT is not set
945 991
@@ -1003,6 +1049,7 @@ CONFIG_RTC_DRV_DS1307=y
1003# CONFIG_RTC_DRV_PCF8563 is not set 1049# CONFIG_RTC_DRV_PCF8563 is not set
1004# CONFIG_RTC_DRV_PCF8583 is not set 1050# CONFIG_RTC_DRV_PCF8583 is not set
1005# CONFIG_RTC_DRV_M41T80 is not set 1051# CONFIG_RTC_DRV_M41T80 is not set
1052# CONFIG_RTC_DRV_BQ32K is not set
1006# CONFIG_RTC_DRV_S35390A is not set 1053# CONFIG_RTC_DRV_S35390A is not set
1007# CONFIG_RTC_DRV_FM3130 is not set 1054# CONFIG_RTC_DRV_FM3130 is not set
1008# CONFIG_RTC_DRV_RX8581 is not set 1055# CONFIG_RTC_DRV_RX8581 is not set
@@ -1024,7 +1071,9 @@ CONFIG_RTC_DRV_DS1307=y
1024# CONFIG_RTC_DRV_M48T86 is not set 1071# CONFIG_RTC_DRV_M48T86 is not set
1025# CONFIG_RTC_DRV_M48T35 is not set 1072# CONFIG_RTC_DRV_M48T35 is not set
1026# CONFIG_RTC_DRV_M48T59 is not set 1073# CONFIG_RTC_DRV_M48T59 is not set
1074# CONFIG_RTC_DRV_MSM6242 is not set
1027# CONFIG_RTC_DRV_BQ4802 is not set 1075# CONFIG_RTC_DRV_BQ4802 is not set
1076# CONFIG_RTC_DRV_RP5C01 is not set
1028# CONFIG_RTC_DRV_V3020 is not set 1077# CONFIG_RTC_DRV_V3020 is not set
1029 1078
1030# 1079#
@@ -1280,7 +1329,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1280# CONFIG_KEYS is not set 1329# CONFIG_KEYS is not set
1281# CONFIG_SECURITY is not set 1330# CONFIG_SECURITY is not set
1282# CONFIG_SECURITYFS is not set 1331# CONFIG_SECURITYFS is not set
1283# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1332# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1333# CONFIG_DEFAULT_SECURITY_SMACK is not set
1334# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1335CONFIG_DEFAULT_SECURITY_DAC=y
1336CONFIG_DEFAULT_SECURITY=""
1284CONFIG_CRYPTO=y 1337CONFIG_CRYPTO=y
1285 1338
1286# 1339#
diff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig
index 74515501f5b7..e7b9148e58cf 100644
--- a/arch/powerpc/configs/85xx/tqm8555_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8555_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:42 2009 4# Wed Jan 6 09:24:36 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -89,6 +92,7 @@ CONFIG_SYSVIPC_SYSCTL=y
89# 92#
90CONFIG_TREE_RCU=y 93CONFIG_TREE_RCU=y
91# CONFIG_TREE_PREEMPT_RCU is not set 94# CONFIG_TREE_PREEMPT_RCU is not set
95# CONFIG_TINY_RCU is not set
92# CONFIG_RCU_TRACE is not set 96# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32 97CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set 98# CONFIG_RCU_FANOUT_EXACT is not set
@@ -171,14 +175,41 @@ CONFIG_LBDAF=y
171# IO Schedulers 175# IO Schedulers
172# 176#
173CONFIG_IOSCHED_NOOP=y 177CONFIG_IOSCHED_NOOP=y
174CONFIG_IOSCHED_AS=y
175CONFIG_IOSCHED_DEADLINE=y 178CONFIG_IOSCHED_DEADLINE=y
176CONFIG_IOSCHED_CFQ=y 179CONFIG_IOSCHED_CFQ=y
177CONFIG_DEFAULT_AS=y
178# CONFIG_DEFAULT_DEADLINE is not set 180# CONFIG_DEFAULT_DEADLINE is not set
179# CONFIG_DEFAULT_CFQ is not set 181CONFIG_DEFAULT_CFQ=y
180# CONFIG_DEFAULT_NOOP is not set 182# CONFIG_DEFAULT_NOOP is not set
181CONFIG_DEFAULT_IOSCHED="anticipatory" 183CONFIG_DEFAULT_IOSCHED="cfq"
184# CONFIG_INLINE_SPIN_TRYLOCK is not set
185# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK is not set
187# CONFIG_INLINE_SPIN_LOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
190CONFIG_INLINE_SPIN_UNLOCK=y
191# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
192CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
193# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
194# CONFIG_INLINE_READ_TRYLOCK is not set
195# CONFIG_INLINE_READ_LOCK is not set
196# CONFIG_INLINE_READ_LOCK_BH is not set
197# CONFIG_INLINE_READ_LOCK_IRQ is not set
198# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
199CONFIG_INLINE_READ_UNLOCK=y
200# CONFIG_INLINE_READ_UNLOCK_BH is not set
201CONFIG_INLINE_READ_UNLOCK_IRQ=y
202# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
203# CONFIG_INLINE_WRITE_TRYLOCK is not set
204# CONFIG_INLINE_WRITE_LOCK is not set
205# CONFIG_INLINE_WRITE_LOCK_BH is not set
206# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
208CONFIG_INLINE_WRITE_UNLOCK=y
209# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
210CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
211# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
212# CONFIG_MUTEX_SPIN_ON_OWNER is not set
182# CONFIG_FREEZER is not set 213# CONFIG_FREEZER is not set
183 214
184# 215#
@@ -187,7 +218,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
187# CONFIG_PPC_CELL is not set 218# CONFIG_PPC_CELL is not set
188# CONFIG_PPC_CELL_NATIVE is not set 219# CONFIG_PPC_CELL_NATIVE is not set
189# CONFIG_PQ2ADS is not set 220# CONFIG_PQ2ADS is not set
190CONFIG_MPC85xx=y 221CONFIG_FSL_SOC_BOOKE=y
191# CONFIG_MPC8540_ADS is not set 222# CONFIG_MPC8540_ADS is not set
192# CONFIG_MPC8560_ADS is not set 223# CONFIG_MPC8560_ADS is not set
193# CONFIG_MPC85xx_CDS is not set 224# CONFIG_MPC85xx_CDS is not set
@@ -206,6 +237,7 @@ CONFIG_TQM8555=y
206# CONFIG_TQM8560 is not set 237# CONFIG_TQM8560 is not set
207# CONFIG_SBC8548 is not set 238# CONFIG_SBC8548 is not set
208# CONFIG_SBC8560 is not set 239# CONFIG_SBC8560 is not set
240# CONFIG_P4080_DS is not set
209CONFIG_TQM85xx=y 241CONFIG_TQM85xx=y
210# CONFIG_IPIC is not set 242# CONFIG_IPIC is not set
211CONFIG_MPIC=y 243CONFIG_MPIC=y
@@ -251,6 +283,7 @@ CONFIG_MATH_EMULATION=y
251CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 283CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
252CONFIG_ARCH_HAS_WALK_MEMORY=y 284CONFIG_ARCH_HAS_WALK_MEMORY=y
253CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 285CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
286CONFIG_SPARSE_IRQ=y
254CONFIG_MAX_ACTIVE_REGIONS=32 287CONFIG_MAX_ACTIVE_REGIONS=32
255CONFIG_ARCH_FLATMEM_ENABLE=y 288CONFIG_ARCH_FLATMEM_ENABLE=y
256CONFIG_ARCH_POPULATES_NODE_MAP=y 289CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -267,8 +300,6 @@ CONFIG_MIGRATION=y
267CONFIG_ZONE_DMA_FLAG=1 300CONFIG_ZONE_DMA_FLAG=1
268CONFIG_BOUNCE=y 301CONFIG_BOUNCE=y
269CONFIG_VIRT_TO_BUS=y 302CONFIG_VIRT_TO_BUS=y
270CONFIG_HAVE_MLOCK=y
271CONFIG_HAVE_MLOCKED_PAGE_BIT=y
272# CONFIG_KSM is not set 303# CONFIG_KSM is not set
273CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 304CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
274CONFIG_PPC_4K_PAGES=y 305CONFIG_PPC_4K_PAGES=y
@@ -394,9 +425,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
394# CONFIG_AF_RXRPC is not set 425# CONFIG_AF_RXRPC is not set
395CONFIG_WIRELESS=y 426CONFIG_WIRELESS=y
396# CONFIG_CFG80211 is not set 427# CONFIG_CFG80211 is not set
397CONFIG_CFG80211_DEFAULT_PS_VALUE=0
398CONFIG_WIRELESS_OLD_REGULATORY=y
399# CONFIG_WIRELESS_EXT is not set
400# CONFIG_LIB80211 is not set 428# CONFIG_LIB80211 is not set
401 429
402# 430#
@@ -514,6 +542,10 @@ CONFIG_BLK_DEV=y
514# CONFIG_BLK_DEV_COW_COMMON is not set 542# CONFIG_BLK_DEV_COW_COMMON is not set
515CONFIG_BLK_DEV_LOOP=y 543CONFIG_BLK_DEV_LOOP=y
516# CONFIG_BLK_DEV_CRYPTOLOOP is not set 544# CONFIG_BLK_DEV_CRYPTOLOOP is not set
545
546#
547# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
548#
517# CONFIG_BLK_DEV_NBD is not set 549# CONFIG_BLK_DEV_NBD is not set
518# CONFIG_BLK_DEV_SX8 is not set 550# CONFIG_BLK_DEV_SX8 is not set
519CONFIG_BLK_DEV_RAM=y 551CONFIG_BLK_DEV_RAM=y
@@ -524,6 +556,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
524# CONFIG_ATA_OVER_ETH is not set 556# CONFIG_ATA_OVER_ETH is not set
525# CONFIG_BLK_DEV_HD is not set 557# CONFIG_BLK_DEV_HD is not set
526CONFIG_MISC_DEVICES=y 558CONFIG_MISC_DEVICES=y
559# CONFIG_AD525X_DPOT is not set
527# CONFIG_PHANTOM is not set 560# CONFIG_PHANTOM is not set
528# CONFIG_SGI_IOC4 is not set 561# CONFIG_SGI_IOC4 is not set
529# CONFIG_TIFM_CORE is not set 562# CONFIG_TIFM_CORE is not set
@@ -531,6 +564,7 @@ CONFIG_MISC_DEVICES=y
531# CONFIG_ENCLOSURE_SERVICES is not set 564# CONFIG_ENCLOSURE_SERVICES is not set
532# CONFIG_HP_ILO is not set 565# CONFIG_HP_ILO is not set
533# CONFIG_ISL29003 is not set 566# CONFIG_ISL29003 is not set
567# CONFIG_DS1682 is not set
534# CONFIG_C2PORT is not set 568# CONFIG_C2PORT is not set
535 569
536# 570#
@@ -619,7 +653,7 @@ CONFIG_BLK_DEV_IDEDMA=y
619# 653#
620 654
621# 655#
622# See the help texts for more information. 656# The newer stack is recommended.
623# 657#
624# CONFIG_FIREWIRE is not set 658# CONFIG_FIREWIRE is not set
625# CONFIG_IEEE1394 is not set 659# CONFIG_IEEE1394 is not set
@@ -743,8 +777,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
743# CONFIG_BE2NET is not set 777# CONFIG_BE2NET is not set
744# CONFIG_TR is not set 778# CONFIG_TR is not set
745CONFIG_WLAN=y 779CONFIG_WLAN=y
746# CONFIG_WLAN_PRE80211 is not set 780# CONFIG_AIRO is not set
747# CONFIG_WLAN_80211 is not set 781# CONFIG_ATMEL is not set
782# CONFIG_PRISM54 is not set
783# CONFIG_HOSTAP is not set
748 784
749# 785#
750# Enable WiMAX (Networking options) to see the WiMAX drivers 786# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -757,6 +793,7 @@ CONFIG_WLAN=y
757# CONFIG_NETCONSOLE is not set 793# CONFIG_NETCONSOLE is not set
758# CONFIG_NETPOLL is not set 794# CONFIG_NETPOLL is not set
759# CONFIG_NET_POLL_CONTROLLER is not set 795# CONFIG_NET_POLL_CONTROLLER is not set
796# CONFIG_VMXNET3 is not set
760# CONFIG_ISDN is not set 797# CONFIG_ISDN is not set
761# CONFIG_PHONE is not set 798# CONFIG_PHONE is not set
762 799
@@ -766,6 +803,7 @@ CONFIG_WLAN=y
766CONFIG_INPUT=y 803CONFIG_INPUT=y
767# CONFIG_INPUT_FF_MEMLESS is not set 804# CONFIG_INPUT_FF_MEMLESS is not set
768# CONFIG_INPUT_POLLDEV is not set 805# CONFIG_INPUT_POLLDEV is not set
806# CONFIG_INPUT_SPARSEKMAP is not set
769 807
770# 808#
771# Userland interfaces 809# Userland interfaces
@@ -820,6 +858,7 @@ CONFIG_SERIAL_CPM=y
820CONFIG_SERIAL_CPM_CONSOLE=y 858CONFIG_SERIAL_CPM_CONSOLE=y
821# CONFIG_SERIAL_JSM is not set 859# CONFIG_SERIAL_JSM is not set
822# CONFIG_SERIAL_OF_PLATFORM is not set 860# CONFIG_SERIAL_OF_PLATFORM is not set
861# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
823CONFIG_UNIX98_PTYS=y 862CONFIG_UNIX98_PTYS=y
824# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 863# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
825CONFIG_LEGACY_PTYS=y 864CONFIG_LEGACY_PTYS=y
@@ -881,11 +920,6 @@ CONFIG_I2C_MPC=y
881# CONFIG_I2C_TAOS_EVM is not set 920# CONFIG_I2C_TAOS_EVM is not set
882 921
883# 922#
884# Graphics adapter I2C/DDC channel drivers
885#
886# CONFIG_I2C_VOODOO3 is not set
887
888#
889# Other I2C/SMBus bus drivers 923# Other I2C/SMBus bus drivers
890# 924#
891# CONFIG_I2C_PCA_PLATFORM is not set 925# CONFIG_I2C_PCA_PLATFORM is not set
@@ -893,7 +927,6 @@ CONFIG_I2C_MPC=y
893# 927#
894# Miscellaneous I2C Chip support 928# Miscellaneous I2C Chip support
895# 929#
896# CONFIG_DS1682 is not set
897# CONFIG_SENSORS_TSL2550 is not set 930# CONFIG_SENSORS_TSL2550 is not set
898# CONFIG_I2C_DEBUG_CORE is not set 931# CONFIG_I2C_DEBUG_CORE is not set
899# CONFIG_I2C_DEBUG_ALGO is not set 932# CONFIG_I2C_DEBUG_ALGO is not set
@@ -925,6 +958,7 @@ CONFIG_GPIOLIB=y
925# 958#
926# PCI GPIO expanders: 959# PCI GPIO expanders:
927# 960#
961# CONFIG_GPIO_CS5535 is not set
928# CONFIG_GPIO_BT8XX is not set 962# CONFIG_GPIO_BT8XX is not set
929# CONFIG_GPIO_LANGWELL is not set 963# CONFIG_GPIO_LANGWELL is not set
930 964
@@ -967,6 +1001,7 @@ CONFIG_HWMON_DEBUG_CHIP=y
967# CONFIG_SENSORS_GL520SM is not set 1001# CONFIG_SENSORS_GL520SM is not set
968# CONFIG_SENSORS_IT87 is not set 1002# CONFIG_SENSORS_IT87 is not set
969# CONFIG_SENSORS_LM63 is not set 1003# CONFIG_SENSORS_LM63 is not set
1004# CONFIG_SENSORS_LM73 is not set
970CONFIG_SENSORS_LM75=y 1005CONFIG_SENSORS_LM75=y
971# CONFIG_SENSORS_LM77 is not set 1006# CONFIG_SENSORS_LM77 is not set
972# CONFIG_SENSORS_LM78 is not set 1007# CONFIG_SENSORS_LM78 is not set
@@ -1006,6 +1041,7 @@ CONFIG_SENSORS_LM75=y
1006# CONFIG_SENSORS_W83L786NG is not set 1041# CONFIG_SENSORS_W83L786NG is not set
1007# CONFIG_SENSORS_W83627HF is not set 1042# CONFIG_SENSORS_W83627HF is not set
1008# CONFIG_SENSORS_W83627EHF is not set 1043# CONFIG_SENSORS_W83627EHF is not set
1044# CONFIG_SENSORS_LIS3_I2C is not set
1009# CONFIG_THERMAL is not set 1045# CONFIG_THERMAL is not set
1010# CONFIG_WATCHDOG is not set 1046# CONFIG_WATCHDOG is not set
1011CONFIG_SSB_POSSIBLE=y 1047CONFIG_SSB_POSSIBLE=y
@@ -1025,11 +1061,13 @@ CONFIG_SSB_POSSIBLE=y
1025# CONFIG_TWL4030_CORE is not set 1061# CONFIG_TWL4030_CORE is not set
1026# CONFIG_MFD_TMIO is not set 1062# CONFIG_MFD_TMIO is not set
1027# CONFIG_PMIC_DA903X is not set 1063# CONFIG_PMIC_DA903X is not set
1064# CONFIG_PMIC_ADP5520 is not set
1028# CONFIG_MFD_WM8400 is not set 1065# CONFIG_MFD_WM8400 is not set
1029# CONFIG_MFD_WM831X is not set 1066# CONFIG_MFD_WM831X is not set
1030# CONFIG_MFD_WM8350_I2C is not set 1067# CONFIG_MFD_WM8350_I2C is not set
1031# CONFIG_MFD_PCF50633 is not set 1068# CONFIG_MFD_PCF50633 is not set
1032# CONFIG_AB3100_CORE is not set 1069# CONFIG_AB3100_CORE is not set
1070# CONFIG_MFD_88PM8607 is not set
1033# CONFIG_REGULATOR is not set 1071# CONFIG_REGULATOR is not set
1034# CONFIG_MEDIA_SUPPORT is not set 1072# CONFIG_MEDIA_SUPPORT is not set
1035 1073
@@ -1260,7 +1298,7 @@ CONFIG_FRAME_WARN=1024
1260# CONFIG_DEBUG_KERNEL is not set 1298# CONFIG_DEBUG_KERNEL is not set
1261# CONFIG_SLUB_DEBUG_ON is not set 1299# CONFIG_SLUB_DEBUG_ON is not set
1262# CONFIG_SLUB_STATS is not set 1300# CONFIG_SLUB_STATS is not set
1263# CONFIG_DEBUG_BUGVERBOSE is not set 1301CONFIG_DEBUG_BUGVERBOSE=y
1264# CONFIG_DEBUG_MEMORY_INIT is not set 1302# CONFIG_DEBUG_MEMORY_INIT is not set
1265# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1303# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1266# CONFIG_LATENCYTOP is not set 1304# CONFIG_LATENCYTOP is not set
@@ -1286,7 +1324,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1286# CONFIG_KEYS is not set 1324# CONFIG_KEYS is not set
1287# CONFIG_SECURITY is not set 1325# CONFIG_SECURITY is not set
1288# CONFIG_SECURITYFS is not set 1326# CONFIG_SECURITYFS is not set
1289# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1327# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1328# CONFIG_DEFAULT_SECURITY_SMACK is not set
1329# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1330CONFIG_DEFAULT_SECURITY_DAC=y
1331CONFIG_DEFAULT_SECURITY=""
1290CONFIG_CRYPTO=y 1332CONFIG_CRYPTO=y
1291 1333
1292# 1334#
diff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig
index 631d92b4d4e6..a998e401bbfc 100644
--- a/arch/powerpc/configs/85xx/tqm8560_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8560_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:43 2009 4# Wed Jan 6 09:24:36 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -89,6 +92,7 @@ CONFIG_SYSVIPC_SYSCTL=y
89# 92#
90CONFIG_TREE_RCU=y 93CONFIG_TREE_RCU=y
91# CONFIG_TREE_PREEMPT_RCU is not set 94# CONFIG_TREE_PREEMPT_RCU is not set
95# CONFIG_TINY_RCU is not set
92# CONFIG_RCU_TRACE is not set 96# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32 97CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set 98# CONFIG_RCU_FANOUT_EXACT is not set
@@ -171,14 +175,41 @@ CONFIG_LBDAF=y
171# IO Schedulers 175# IO Schedulers
172# 176#
173CONFIG_IOSCHED_NOOP=y 177CONFIG_IOSCHED_NOOP=y
174CONFIG_IOSCHED_AS=y
175CONFIG_IOSCHED_DEADLINE=y 178CONFIG_IOSCHED_DEADLINE=y
176CONFIG_IOSCHED_CFQ=y 179CONFIG_IOSCHED_CFQ=y
177CONFIG_DEFAULT_AS=y
178# CONFIG_DEFAULT_DEADLINE is not set 180# CONFIG_DEFAULT_DEADLINE is not set
179# CONFIG_DEFAULT_CFQ is not set 181CONFIG_DEFAULT_CFQ=y
180# CONFIG_DEFAULT_NOOP is not set 182# CONFIG_DEFAULT_NOOP is not set
181CONFIG_DEFAULT_IOSCHED="anticipatory" 183CONFIG_DEFAULT_IOSCHED="cfq"
184# CONFIG_INLINE_SPIN_TRYLOCK is not set
185# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK is not set
187# CONFIG_INLINE_SPIN_LOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
190CONFIG_INLINE_SPIN_UNLOCK=y
191# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
192CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
193# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
194# CONFIG_INLINE_READ_TRYLOCK is not set
195# CONFIG_INLINE_READ_LOCK is not set
196# CONFIG_INLINE_READ_LOCK_BH is not set
197# CONFIG_INLINE_READ_LOCK_IRQ is not set
198# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
199CONFIG_INLINE_READ_UNLOCK=y
200# CONFIG_INLINE_READ_UNLOCK_BH is not set
201CONFIG_INLINE_READ_UNLOCK_IRQ=y
202# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
203# CONFIG_INLINE_WRITE_TRYLOCK is not set
204# CONFIG_INLINE_WRITE_LOCK is not set
205# CONFIG_INLINE_WRITE_LOCK_BH is not set
206# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
208CONFIG_INLINE_WRITE_UNLOCK=y
209# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
210CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
211# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
212# CONFIG_MUTEX_SPIN_ON_OWNER is not set
182# CONFIG_FREEZER is not set 213# CONFIG_FREEZER is not set
183 214
184# 215#
@@ -187,7 +218,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
187# CONFIG_PPC_CELL is not set 218# CONFIG_PPC_CELL is not set
188# CONFIG_PPC_CELL_NATIVE is not set 219# CONFIG_PPC_CELL_NATIVE is not set
189# CONFIG_PQ2ADS is not set 220# CONFIG_PQ2ADS is not set
190CONFIG_MPC85xx=y 221CONFIG_FSL_SOC_BOOKE=y
191# CONFIG_MPC8540_ADS is not set 222# CONFIG_MPC8540_ADS is not set
192# CONFIG_MPC8560_ADS is not set 223# CONFIG_MPC8560_ADS is not set
193# CONFIG_MPC85xx_CDS is not set 224# CONFIG_MPC85xx_CDS is not set
@@ -206,6 +237,7 @@ CONFIG_MPC85xx=y
206CONFIG_TQM8560=y 237CONFIG_TQM8560=y
207# CONFIG_SBC8548 is not set 238# CONFIG_SBC8548 is not set
208# CONFIG_SBC8560 is not set 239# CONFIG_SBC8560 is not set
240# CONFIG_P4080_DS is not set
209CONFIG_TQM85xx=y 241CONFIG_TQM85xx=y
210# CONFIG_IPIC is not set 242# CONFIG_IPIC is not set
211CONFIG_MPIC=y 243CONFIG_MPIC=y
@@ -251,6 +283,7 @@ CONFIG_MATH_EMULATION=y
251CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 283CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
252CONFIG_ARCH_HAS_WALK_MEMORY=y 284CONFIG_ARCH_HAS_WALK_MEMORY=y
253CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 285CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
286CONFIG_SPARSE_IRQ=y
254CONFIG_MAX_ACTIVE_REGIONS=32 287CONFIG_MAX_ACTIVE_REGIONS=32
255CONFIG_ARCH_FLATMEM_ENABLE=y 288CONFIG_ARCH_FLATMEM_ENABLE=y
256CONFIG_ARCH_POPULATES_NODE_MAP=y 289CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -267,8 +300,6 @@ CONFIG_MIGRATION=y
267CONFIG_ZONE_DMA_FLAG=1 300CONFIG_ZONE_DMA_FLAG=1
268CONFIG_BOUNCE=y 301CONFIG_BOUNCE=y
269CONFIG_VIRT_TO_BUS=y 302CONFIG_VIRT_TO_BUS=y
270CONFIG_HAVE_MLOCK=y
271CONFIG_HAVE_MLOCKED_PAGE_BIT=y
272# CONFIG_KSM is not set 303# CONFIG_KSM is not set
273CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 304CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
274CONFIG_PPC_4K_PAGES=y 305CONFIG_PPC_4K_PAGES=y
@@ -394,9 +425,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
394# CONFIG_AF_RXRPC is not set 425# CONFIG_AF_RXRPC is not set
395CONFIG_WIRELESS=y 426CONFIG_WIRELESS=y
396# CONFIG_CFG80211 is not set 427# CONFIG_CFG80211 is not set
397CONFIG_CFG80211_DEFAULT_PS_VALUE=0
398CONFIG_WIRELESS_OLD_REGULATORY=y
399# CONFIG_WIRELESS_EXT is not set
400# CONFIG_LIB80211 is not set 428# CONFIG_LIB80211 is not set
401 429
402# 430#
@@ -514,6 +542,10 @@ CONFIG_BLK_DEV=y
514# CONFIG_BLK_DEV_COW_COMMON is not set 542# CONFIG_BLK_DEV_COW_COMMON is not set
515CONFIG_BLK_DEV_LOOP=y 543CONFIG_BLK_DEV_LOOP=y
516# CONFIG_BLK_DEV_CRYPTOLOOP is not set 544# CONFIG_BLK_DEV_CRYPTOLOOP is not set
545
546#
547# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
548#
517# CONFIG_BLK_DEV_NBD is not set 549# CONFIG_BLK_DEV_NBD is not set
518# CONFIG_BLK_DEV_SX8 is not set 550# CONFIG_BLK_DEV_SX8 is not set
519CONFIG_BLK_DEV_RAM=y 551CONFIG_BLK_DEV_RAM=y
@@ -524,6 +556,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
524# CONFIG_ATA_OVER_ETH is not set 556# CONFIG_ATA_OVER_ETH is not set
525# CONFIG_BLK_DEV_HD is not set 557# CONFIG_BLK_DEV_HD is not set
526CONFIG_MISC_DEVICES=y 558CONFIG_MISC_DEVICES=y
559# CONFIG_AD525X_DPOT is not set
527# CONFIG_PHANTOM is not set 560# CONFIG_PHANTOM is not set
528# CONFIG_SGI_IOC4 is not set 561# CONFIG_SGI_IOC4 is not set
529# CONFIG_TIFM_CORE is not set 562# CONFIG_TIFM_CORE is not set
@@ -531,6 +564,7 @@ CONFIG_MISC_DEVICES=y
531# CONFIG_ENCLOSURE_SERVICES is not set 564# CONFIG_ENCLOSURE_SERVICES is not set
532# CONFIG_HP_ILO is not set 565# CONFIG_HP_ILO is not set
533# CONFIG_ISL29003 is not set 566# CONFIG_ISL29003 is not set
567# CONFIG_DS1682 is not set
534# CONFIG_C2PORT is not set 568# CONFIG_C2PORT is not set
535 569
536# 570#
@@ -619,7 +653,7 @@ CONFIG_BLK_DEV_IDEDMA=y
619# 653#
620 654
621# 655#
622# See the help texts for more information. 656# The newer stack is recommended.
623# 657#
624# CONFIG_FIREWIRE is not set 658# CONFIG_FIREWIRE is not set
625# CONFIG_IEEE1394 is not set 659# CONFIG_IEEE1394 is not set
@@ -743,8 +777,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
743# CONFIG_BE2NET is not set 777# CONFIG_BE2NET is not set
744# CONFIG_TR is not set 778# CONFIG_TR is not set
745CONFIG_WLAN=y 779CONFIG_WLAN=y
746# CONFIG_WLAN_PRE80211 is not set 780# CONFIG_AIRO is not set
747# CONFIG_WLAN_80211 is not set 781# CONFIG_ATMEL is not set
782# CONFIG_PRISM54 is not set
783# CONFIG_HOSTAP is not set
748 784
749# 785#
750# Enable WiMAX (Networking options) to see the WiMAX drivers 786# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -757,6 +793,7 @@ CONFIG_WLAN=y
757# CONFIG_NETCONSOLE is not set 793# CONFIG_NETCONSOLE is not set
758# CONFIG_NETPOLL is not set 794# CONFIG_NETPOLL is not set
759# CONFIG_NET_POLL_CONTROLLER is not set 795# CONFIG_NET_POLL_CONTROLLER is not set
796# CONFIG_VMXNET3 is not set
760# CONFIG_ISDN is not set 797# CONFIG_ISDN is not set
761# CONFIG_PHONE is not set 798# CONFIG_PHONE is not set
762 799
@@ -766,6 +803,7 @@ CONFIG_WLAN=y
766CONFIG_INPUT=y 803CONFIG_INPUT=y
767# CONFIG_INPUT_FF_MEMLESS is not set 804# CONFIG_INPUT_FF_MEMLESS is not set
768# CONFIG_INPUT_POLLDEV is not set 805# CONFIG_INPUT_POLLDEV is not set
806# CONFIG_INPUT_SPARSEKMAP is not set
769 807
770# 808#
771# Userland interfaces 809# Userland interfaces
@@ -820,6 +858,7 @@ CONFIG_SERIAL_CPM=y
820CONFIG_SERIAL_CPM_CONSOLE=y 858CONFIG_SERIAL_CPM_CONSOLE=y
821# CONFIG_SERIAL_JSM is not set 859# CONFIG_SERIAL_JSM is not set
822# CONFIG_SERIAL_OF_PLATFORM is not set 860# CONFIG_SERIAL_OF_PLATFORM is not set
861# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
823CONFIG_UNIX98_PTYS=y 862CONFIG_UNIX98_PTYS=y
824# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 863# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
825CONFIG_LEGACY_PTYS=y 864CONFIG_LEGACY_PTYS=y
@@ -881,11 +920,6 @@ CONFIG_I2C_MPC=y
881# CONFIG_I2C_TAOS_EVM is not set 920# CONFIG_I2C_TAOS_EVM is not set
882 921
883# 922#
884# Graphics adapter I2C/DDC channel drivers
885#
886# CONFIG_I2C_VOODOO3 is not set
887
888#
889# Other I2C/SMBus bus drivers 923# Other I2C/SMBus bus drivers
890# 924#
891# CONFIG_I2C_PCA_PLATFORM is not set 925# CONFIG_I2C_PCA_PLATFORM is not set
@@ -893,7 +927,6 @@ CONFIG_I2C_MPC=y
893# 927#
894# Miscellaneous I2C Chip support 928# Miscellaneous I2C Chip support
895# 929#
896# CONFIG_DS1682 is not set
897# CONFIG_SENSORS_TSL2550 is not set 930# CONFIG_SENSORS_TSL2550 is not set
898# CONFIG_I2C_DEBUG_CORE is not set 931# CONFIG_I2C_DEBUG_CORE is not set
899# CONFIG_I2C_DEBUG_ALGO is not set 932# CONFIG_I2C_DEBUG_ALGO is not set
@@ -925,6 +958,7 @@ CONFIG_GPIOLIB=y
925# 958#
926# PCI GPIO expanders: 959# PCI GPIO expanders:
927# 960#
961# CONFIG_GPIO_CS5535 is not set
928# CONFIG_GPIO_BT8XX is not set 962# CONFIG_GPIO_BT8XX is not set
929# CONFIG_GPIO_LANGWELL is not set 963# CONFIG_GPIO_LANGWELL is not set
930 964
@@ -967,6 +1001,7 @@ CONFIG_HWMON_DEBUG_CHIP=y
967# CONFIG_SENSORS_GL520SM is not set 1001# CONFIG_SENSORS_GL520SM is not set
968# CONFIG_SENSORS_IT87 is not set 1002# CONFIG_SENSORS_IT87 is not set
969# CONFIG_SENSORS_LM63 is not set 1003# CONFIG_SENSORS_LM63 is not set
1004# CONFIG_SENSORS_LM73 is not set
970CONFIG_SENSORS_LM75=y 1005CONFIG_SENSORS_LM75=y
971# CONFIG_SENSORS_LM77 is not set 1006# CONFIG_SENSORS_LM77 is not set
972# CONFIG_SENSORS_LM78 is not set 1007# CONFIG_SENSORS_LM78 is not set
@@ -1006,6 +1041,7 @@ CONFIG_SENSORS_LM75=y
1006# CONFIG_SENSORS_W83L786NG is not set 1041# CONFIG_SENSORS_W83L786NG is not set
1007# CONFIG_SENSORS_W83627HF is not set 1042# CONFIG_SENSORS_W83627HF is not set
1008# CONFIG_SENSORS_W83627EHF is not set 1043# CONFIG_SENSORS_W83627EHF is not set
1044# CONFIG_SENSORS_LIS3_I2C is not set
1009# CONFIG_THERMAL is not set 1045# CONFIG_THERMAL is not set
1010# CONFIG_WATCHDOG is not set 1046# CONFIG_WATCHDOG is not set
1011CONFIG_SSB_POSSIBLE=y 1047CONFIG_SSB_POSSIBLE=y
@@ -1025,11 +1061,13 @@ CONFIG_SSB_POSSIBLE=y
1025# CONFIG_TWL4030_CORE is not set 1061# CONFIG_TWL4030_CORE is not set
1026# CONFIG_MFD_TMIO is not set 1062# CONFIG_MFD_TMIO is not set
1027# CONFIG_PMIC_DA903X is not set 1063# CONFIG_PMIC_DA903X is not set
1064# CONFIG_PMIC_ADP5520 is not set
1028# CONFIG_MFD_WM8400 is not set 1065# CONFIG_MFD_WM8400 is not set
1029# CONFIG_MFD_WM831X is not set 1066# CONFIG_MFD_WM831X is not set
1030# CONFIG_MFD_WM8350_I2C is not set 1067# CONFIG_MFD_WM8350_I2C is not set
1031# CONFIG_MFD_PCF50633 is not set 1068# CONFIG_MFD_PCF50633 is not set
1032# CONFIG_AB3100_CORE is not set 1069# CONFIG_AB3100_CORE is not set
1070# CONFIG_MFD_88PM8607 is not set
1033# CONFIG_REGULATOR is not set 1071# CONFIG_REGULATOR is not set
1034# CONFIG_MEDIA_SUPPORT is not set 1072# CONFIG_MEDIA_SUPPORT is not set
1035 1073
@@ -1260,7 +1298,7 @@ CONFIG_FRAME_WARN=1024
1260# CONFIG_DEBUG_KERNEL is not set 1298# CONFIG_DEBUG_KERNEL is not set
1261# CONFIG_SLUB_DEBUG_ON is not set 1299# CONFIG_SLUB_DEBUG_ON is not set
1262# CONFIG_SLUB_STATS is not set 1300# CONFIG_SLUB_STATS is not set
1263# CONFIG_DEBUG_BUGVERBOSE is not set 1301CONFIG_DEBUG_BUGVERBOSE=y
1264# CONFIG_DEBUG_MEMORY_INIT is not set 1302# CONFIG_DEBUG_MEMORY_INIT is not set
1265# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1303# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1266# CONFIG_LATENCYTOP is not set 1304# CONFIG_LATENCYTOP is not set
@@ -1286,7 +1324,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1286# CONFIG_KEYS is not set 1324# CONFIG_KEYS is not set
1287# CONFIG_SECURITY is not set 1325# CONFIG_SECURITY is not set
1288# CONFIG_SECURITYFS is not set 1326# CONFIG_SECURITYFS is not set
1289# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1327# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1328# CONFIG_DEFAULT_SECURITY_SMACK is not set
1329# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1330CONFIG_DEFAULT_SECURITY_DAC=y
1331CONFIG_DEFAULT_SECURITY=""
1290CONFIG_CRYPTO=y 1332CONFIG_CRYPTO=y
1291 1333
1292# 1334#
diff --git a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
index 52acbac0c4fe..fc656af04ea1 100644
--- a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
+++ b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:44 2009 4# Wed Jan 6 09:24:37 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -40,6 +40,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
40# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 40# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
41# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 41# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
42CONFIG_IRQ_PER_CPU=y 42CONFIG_IRQ_PER_CPU=y
43CONFIG_NR_IRQS=512
43CONFIG_STACKTRACE_SUPPORT=y 44CONFIG_STACKTRACE_SUPPORT=y
44CONFIG_HAVE_LATENCYTOP_SUPPORT=y 45CONFIG_HAVE_LATENCYTOP_SUPPORT=y
45CONFIG_TRACE_IRQFLAGS_SUPPORT=y 46CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -63,6 +64,8 @@ CONFIG_AUDIT_ARCH=y
63CONFIG_GENERIC_BUG=y 64CONFIG_GENERIC_BUG=y
64CONFIG_DTC=y 65CONFIG_DTC=y
65CONFIG_DEFAULT_UIMAGE=y 66CONFIG_DEFAULT_UIMAGE=y
67CONFIG_ARCH_HIBERNATION_POSSIBLE=y
68CONFIG_ARCH_SUSPEND_POSSIBLE=y
66# CONFIG_PPC_DCR_NATIVE is not set 69# CONFIG_PPC_DCR_NATIVE is not set
67# CONFIG_PPC_DCR_MMIO is not set 70# CONFIG_PPC_DCR_MMIO is not set
68CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 71CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -93,6 +96,7 @@ CONFIG_AUDIT=y
93# 96#
94CONFIG_TREE_RCU=y 97CONFIG_TREE_RCU=y
95# CONFIG_TREE_PREEMPT_RCU is not set 98# CONFIG_TREE_PREEMPT_RCU is not set
99# CONFIG_TINY_RCU is not set
96# CONFIG_RCU_TRACE is not set 100# CONFIG_RCU_TRACE is not set
97CONFIG_RCU_FANOUT=32 101CONFIG_RCU_FANOUT=32
98# CONFIG_RCU_FANOUT_EXACT is not set 102# CONFIG_RCU_FANOUT_EXACT is not set
@@ -181,14 +185,41 @@ CONFIG_LBDAF=y
181# IO Schedulers 185# IO Schedulers
182# 186#
183CONFIG_IOSCHED_NOOP=y 187CONFIG_IOSCHED_NOOP=y
184CONFIG_IOSCHED_AS=y
185CONFIG_IOSCHED_DEADLINE=y 188CONFIG_IOSCHED_DEADLINE=y
186CONFIG_IOSCHED_CFQ=y 189CONFIG_IOSCHED_CFQ=y
187# CONFIG_DEFAULT_AS is not set
188# CONFIG_DEFAULT_DEADLINE is not set 190# CONFIG_DEFAULT_DEADLINE is not set
189CONFIG_DEFAULT_CFQ=y 191CONFIG_DEFAULT_CFQ=y
190# CONFIG_DEFAULT_NOOP is not set 192# CONFIG_DEFAULT_NOOP is not set
191CONFIG_DEFAULT_IOSCHED="cfq" 193CONFIG_DEFAULT_IOSCHED="cfq"
194# CONFIG_INLINE_SPIN_TRYLOCK is not set
195# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
196# CONFIG_INLINE_SPIN_LOCK is not set
197# CONFIG_INLINE_SPIN_LOCK_BH is not set
198# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
199# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
200CONFIG_INLINE_SPIN_UNLOCK=y
201# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
202CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
203# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_READ_TRYLOCK is not set
205# CONFIG_INLINE_READ_LOCK is not set
206# CONFIG_INLINE_READ_LOCK_BH is not set
207# CONFIG_INLINE_READ_LOCK_IRQ is not set
208# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
209CONFIG_INLINE_READ_UNLOCK=y
210# CONFIG_INLINE_READ_UNLOCK_BH is not set
211CONFIG_INLINE_READ_UNLOCK_IRQ=y
212# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
213# CONFIG_INLINE_WRITE_TRYLOCK is not set
214# CONFIG_INLINE_WRITE_LOCK is not set
215# CONFIG_INLINE_WRITE_LOCK_BH is not set
216# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
217# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
218CONFIG_INLINE_WRITE_UNLOCK=y
219# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
220CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
221# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
222CONFIG_MUTEX_SPIN_ON_OWNER=y
192# CONFIG_FREEZER is not set 223# CONFIG_FREEZER is not set
193CONFIG_PPC_MSI_BITMAP=y 224CONFIG_PPC_MSI_BITMAP=y
194 225
@@ -198,7 +229,7 @@ CONFIG_PPC_MSI_BITMAP=y
198# CONFIG_PPC_CELL is not set 229# CONFIG_PPC_CELL is not set
199# CONFIG_PPC_CELL_NATIVE is not set 230# CONFIG_PPC_CELL_NATIVE is not set
200# CONFIG_PQ2ADS is not set 231# CONFIG_PQ2ADS is not set
201CONFIG_MPC85xx=y 232CONFIG_FSL_SOC_BOOKE=y
202# CONFIG_MPC8540_ADS is not set 233# CONFIG_MPC8540_ADS is not set
203# CONFIG_MPC8560_ADS is not set 234# CONFIG_MPC8560_ADS is not set
204# CONFIG_MPC85xx_CDS is not set 235# CONFIG_MPC85xx_CDS is not set
@@ -217,6 +248,7 @@ CONFIG_XES_MPC85xx=y
217# CONFIG_TQM8560 is not set 248# CONFIG_TQM8560 is not set
218# CONFIG_SBC8548 is not set 249# CONFIG_SBC8548 is not set
219# CONFIG_SBC8560 is not set 250# CONFIG_SBC8560 is not set
251# CONFIG_P4080_DS is not set
220# CONFIG_IPIC is not set 252# CONFIG_IPIC is not set
221CONFIG_MPIC=y 253CONFIG_MPIC=y
222# CONFIG_MPIC_WEIRD is not set 254# CONFIG_MPIC_WEIRD is not set
@@ -261,6 +293,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
261CONFIG_ARCH_HAS_WALK_MEMORY=y 293CONFIG_ARCH_HAS_WALK_MEMORY=y
262CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 294CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
263# CONFIG_IRQ_ALL_CPUS is not set 295# CONFIG_IRQ_ALL_CPUS is not set
296CONFIG_SPARSE_IRQ=y
264CONFIG_MAX_ACTIVE_REGIONS=32 297CONFIG_MAX_ACTIVE_REGIONS=32
265CONFIG_ARCH_FLATMEM_ENABLE=y 298CONFIG_ARCH_FLATMEM_ENABLE=y
266CONFIG_ARCH_POPULATES_NODE_MAP=y 299CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -277,8 +310,6 @@ CONFIG_MIGRATION=y
277CONFIG_ZONE_DMA_FLAG=1 310CONFIG_ZONE_DMA_FLAG=1
278CONFIG_BOUNCE=y 311CONFIG_BOUNCE=y
279CONFIG_VIRT_TO_BUS=y 312CONFIG_VIRT_TO_BUS=y
280CONFIG_HAVE_MLOCK=y
281CONFIG_HAVE_MLOCKED_PAGE_BIT=y
282# CONFIG_KSM is not set 313# CONFIG_KSM is not set
283CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 314CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
284CONFIG_PPC_4K_PAGES=y 315CONFIG_PPC_4K_PAGES=y
@@ -404,6 +435,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y
404CONFIG_INET6_XFRM_MODE_BEET=y 435CONFIG_INET6_XFRM_MODE_BEET=y
405# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 436# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
406CONFIG_IPV6_SIT=y 437CONFIG_IPV6_SIT=y
438# CONFIG_IPV6_SIT_6RD is not set
407CONFIG_IPV6_NDISC_NODETYPE=y 439CONFIG_IPV6_NDISC_NODETYPE=y
408# CONFIG_IPV6_TUNNEL is not set 440# CONFIG_IPV6_TUNNEL is not set
409# CONFIG_IPV6_MULTIPLE_TABLES is not set 441# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -441,7 +473,13 @@ CONFIG_IPV6_NDISC_NODETYPE=y
441# CONFIG_BT is not set 473# CONFIG_BT is not set
442# CONFIG_AF_RXRPC is not set 474# CONFIG_AF_RXRPC is not set
443CONFIG_FIB_RULES=y 475CONFIG_FIB_RULES=y
444# CONFIG_WIRELESS is not set 476CONFIG_WIRELESS=y
477# CONFIG_CFG80211 is not set
478# CONFIG_LIB80211 is not set
479
480#
481# CFG80211 needs to be enabled for MAC80211
482#
445# CONFIG_WIMAX is not set 483# CONFIG_WIMAX is not set
446# CONFIG_RFKILL is not set 484# CONFIG_RFKILL is not set
447# CONFIG_NET_9P is not set 485# CONFIG_NET_9P is not set
@@ -576,6 +614,10 @@ CONFIG_BLK_DEV=y
576# CONFIG_BLK_DEV_COW_COMMON is not set 614# CONFIG_BLK_DEV_COW_COMMON is not set
577CONFIG_BLK_DEV_LOOP=y 615CONFIG_BLK_DEV_LOOP=y
578# CONFIG_BLK_DEV_CRYPTOLOOP is not set 616# CONFIG_BLK_DEV_CRYPTOLOOP is not set
617
618#
619# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
620#
579CONFIG_BLK_DEV_NBD=y 621CONFIG_BLK_DEV_NBD=y
580# CONFIG_BLK_DEV_SX8 is not set 622# CONFIG_BLK_DEV_SX8 is not set
581# CONFIG_BLK_DEV_UB is not set 623# CONFIG_BLK_DEV_UB is not set
@@ -587,6 +629,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
587# CONFIG_ATA_OVER_ETH is not set 629# CONFIG_ATA_OVER_ETH is not set
588# CONFIG_BLK_DEV_HD is not set 630# CONFIG_BLK_DEV_HD is not set
589CONFIG_MISC_DEVICES=y 631CONFIG_MISC_DEVICES=y
632# CONFIG_AD525X_DPOT is not set
590# CONFIG_PHANTOM is not set 633# CONFIG_PHANTOM is not set
591# CONFIG_SGI_IOC4 is not set 634# CONFIG_SGI_IOC4 is not set
592# CONFIG_TIFM_CORE is not set 635# CONFIG_TIFM_CORE is not set
@@ -594,6 +637,7 @@ CONFIG_MISC_DEVICES=y
594# CONFIG_ENCLOSURE_SERVICES is not set 637# CONFIG_ENCLOSURE_SERVICES is not set
595# CONFIG_HP_ILO is not set 638# CONFIG_HP_ILO is not set
596# CONFIG_ISL29003 is not set 639# CONFIG_ISL29003 is not set
640# CONFIG_DS1682 is not set
597# CONFIG_C2PORT is not set 641# CONFIG_C2PORT is not set
598 642
599# 643#
@@ -646,7 +690,9 @@ CONFIG_SCSI_LOWLEVEL=y
646# CONFIG_SCSI_BNX2_ISCSI is not set 690# CONFIG_SCSI_BNX2_ISCSI is not set
647# CONFIG_BE2ISCSI is not set 691# CONFIG_BE2ISCSI is not set
648# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 692# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
693# CONFIG_SCSI_HPSA is not set
649# CONFIG_SCSI_3W_9XXX is not set 694# CONFIG_SCSI_3W_9XXX is not set
695# CONFIG_SCSI_3W_SAS is not set
650# CONFIG_SCSI_ACARD is not set 696# CONFIG_SCSI_ACARD is not set
651# CONFIG_SCSI_AACRAID is not set 697# CONFIG_SCSI_AACRAID is not set
652# CONFIG_SCSI_AIC7XXX is not set 698# CONFIG_SCSI_AIC7XXX is not set
@@ -685,6 +731,7 @@ CONFIG_SCSI_LOWLEVEL=y
685# CONFIG_SCSI_NSP32 is not set 731# CONFIG_SCSI_NSP32 is not set
686# CONFIG_SCSI_DEBUG is not set 732# CONFIG_SCSI_DEBUG is not set
687# CONFIG_SCSI_PMCRAID is not set 733# CONFIG_SCSI_PMCRAID is not set
734# CONFIG_SCSI_PM8001 is not set
688# CONFIG_SCSI_SRP is not set 735# CONFIG_SCSI_SRP is not set
689# CONFIG_SCSI_BFA_FC is not set 736# CONFIG_SCSI_BFA_FC is not set
690# CONFIG_SCSI_DH is not set 737# CONFIG_SCSI_DH is not set
@@ -740,15 +787,16 @@ CONFIG_PATA_ALI=y
740# CONFIG_PATA_NS87415 is not set 787# CONFIG_PATA_NS87415 is not set
741# CONFIG_PATA_OPTI is not set 788# CONFIG_PATA_OPTI is not set
742# CONFIG_PATA_OPTIDMA is not set 789# CONFIG_PATA_OPTIDMA is not set
790# CONFIG_PATA_PDC2027X is not set
743# CONFIG_PATA_PDC_OLD is not set 791# CONFIG_PATA_PDC_OLD is not set
744# CONFIG_PATA_RADISYS is not set 792# CONFIG_PATA_RADISYS is not set
745# CONFIG_PATA_RDC is not set 793# CONFIG_PATA_RDC is not set
746# CONFIG_PATA_RZ1000 is not set 794# CONFIG_PATA_RZ1000 is not set
747# CONFIG_PATA_SC1200 is not set 795# CONFIG_PATA_SC1200 is not set
748# CONFIG_PATA_SERVERWORKS is not set 796# CONFIG_PATA_SERVERWORKS is not set
749# CONFIG_PATA_PDC2027X is not set
750# CONFIG_PATA_SIL680 is not set 797# CONFIG_PATA_SIL680 is not set
751# CONFIG_PATA_SIS is not set 798# CONFIG_PATA_SIS is not set
799# CONFIG_PATA_TOSHIBA is not set
752# CONFIG_PATA_VIA is not set 800# CONFIG_PATA_VIA is not set
753# CONFIG_PATA_WINBOND is not set 801# CONFIG_PATA_WINBOND is not set
754# CONFIG_PATA_PLATFORM is not set 802# CONFIG_PATA_PLATFORM is not set
@@ -765,7 +813,7 @@ CONFIG_PATA_ALI=y
765# 813#
766 814
767# 815#
768# See the help texts for more information. 816# The newer stack is recommended.
769# 817#
770# CONFIG_FIREWIRE is not set 818# CONFIG_FIREWIRE is not set
771# CONFIG_IEEE1394 is not set 819# CONFIG_IEEE1394 is not set
@@ -852,8 +900,11 @@ CONFIG_GIANFAR=y
852# CONFIG_NETDEV_10000 is not set 900# CONFIG_NETDEV_10000 is not set
853# CONFIG_TR is not set 901# CONFIG_TR is not set
854CONFIG_WLAN=y 902CONFIG_WLAN=y
855# CONFIG_WLAN_PRE80211 is not set 903# CONFIG_AIRO is not set
856# CONFIG_WLAN_80211 is not set 904# CONFIG_ATMEL is not set
905# CONFIG_PRISM54 is not set
906# CONFIG_USB_ZD1201 is not set
907# CONFIG_HOSTAP is not set
857 908
858# 909#
859# Enable WiMAX (Networking options) to see the WiMAX drivers 910# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -876,6 +927,7 @@ CONFIG_WLAN=y
876# CONFIG_NETCONSOLE is not set 927# CONFIG_NETCONSOLE is not set
877# CONFIG_NETPOLL is not set 928# CONFIG_NETPOLL is not set
878# CONFIG_NET_POLL_CONTROLLER is not set 929# CONFIG_NET_POLL_CONTROLLER is not set
930# CONFIG_VMXNET3 is not set
879# CONFIG_ISDN is not set 931# CONFIG_ISDN is not set
880# CONFIG_PHONE is not set 932# CONFIG_PHONE is not set
881 933
@@ -885,6 +937,7 @@ CONFIG_WLAN=y
885CONFIG_INPUT=y 937CONFIG_INPUT=y
886# CONFIG_INPUT_FF_MEMLESS is not set 938# CONFIG_INPUT_FF_MEMLESS is not set
887# CONFIG_INPUT_POLLDEV is not set 939# CONFIG_INPUT_POLLDEV is not set
940# CONFIG_INPUT_SPARSEKMAP is not set
888 941
889# 942#
890# Userland interfaces 943# Userland interfaces
@@ -914,6 +967,7 @@ CONFIG_SERIO_SERPORT=y
914CONFIG_SERIO_LIBPS2=y 967CONFIG_SERIO_LIBPS2=y
915# CONFIG_SERIO_RAW is not set 968# CONFIG_SERIO_RAW is not set
916# CONFIG_SERIO_XILINX_XPS_PS2 is not set 969# CONFIG_SERIO_XILINX_XPS_PS2 is not set
970# CONFIG_SERIO_ALTERA_PS2 is not set
917# CONFIG_GAMEPORT is not set 971# CONFIG_GAMEPORT is not set
918 972
919# 973#
@@ -950,6 +1004,7 @@ CONFIG_SERIAL_CORE=y
950CONFIG_SERIAL_CORE_CONSOLE=y 1004CONFIG_SERIAL_CORE_CONSOLE=y
951# CONFIG_SERIAL_JSM is not set 1005# CONFIG_SERIAL_JSM is not set
952# CONFIG_SERIAL_OF_PLATFORM is not set 1006# CONFIG_SERIAL_OF_PLATFORM is not set
1007# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
953CONFIG_UNIX98_PTYS=y 1008CONFIG_UNIX98_PTYS=y
954# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1009# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
955CONFIG_LEGACY_PTYS=y 1010CONFIG_LEGACY_PTYS=y
@@ -1007,11 +1062,6 @@ CONFIG_I2C_MPC=y
1007# CONFIG_I2C_TINY_USB is not set 1062# CONFIG_I2C_TINY_USB is not set
1008 1063
1009# 1064#
1010# Graphics adapter I2C/DDC channel drivers
1011#
1012# CONFIG_I2C_VOODOO3 is not set
1013
1014#
1015# Other I2C/SMBus bus drivers 1065# Other I2C/SMBus bus drivers
1016# 1066#
1017# CONFIG_I2C_PCA_PLATFORM is not set 1067# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1020,7 +1070,6 @@ CONFIG_I2C_MPC=y
1020# 1070#
1021# Miscellaneous I2C Chip support 1071# Miscellaneous I2C Chip support
1022# 1072#
1023# CONFIG_DS1682 is not set
1024# CONFIG_SENSORS_TSL2550 is not set 1073# CONFIG_SENSORS_TSL2550 is not set
1025# CONFIG_I2C_DEBUG_CORE is not set 1074# CONFIG_I2C_DEBUG_CORE is not set
1026# CONFIG_I2C_DEBUG_ALGO is not set 1075# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1053,6 +1102,7 @@ CONFIG_GPIO_PCA953X=y
1053# 1102#
1054# PCI GPIO expanders: 1103# PCI GPIO expanders:
1055# 1104#
1105# CONFIG_GPIO_CS5535 is not set
1056# CONFIG_GPIO_BT8XX is not set 1106# CONFIG_GPIO_BT8XX is not set
1057# CONFIG_GPIO_LANGWELL is not set 1107# CONFIG_GPIO_LANGWELL is not set
1058 1108
@@ -1095,6 +1145,7 @@ CONFIG_SENSORS_DS1621=y
1095# CONFIG_SENSORS_GL520SM is not set 1145# CONFIG_SENSORS_GL520SM is not set
1096# CONFIG_SENSORS_IT87 is not set 1146# CONFIG_SENSORS_IT87 is not set
1097# CONFIG_SENSORS_LM63 is not set 1147# CONFIG_SENSORS_LM63 is not set
1148# CONFIG_SENSORS_LM73 is not set
1098# CONFIG_SENSORS_LM75 is not set 1149# CONFIG_SENSORS_LM75 is not set
1099# CONFIG_SENSORS_LM77 is not set 1150# CONFIG_SENSORS_LM77 is not set
1100# CONFIG_SENSORS_LM78 is not set 1151# CONFIG_SENSORS_LM78 is not set
@@ -1134,6 +1185,7 @@ CONFIG_SENSORS_LM90=y
1134# CONFIG_SENSORS_W83L786NG is not set 1185# CONFIG_SENSORS_W83L786NG is not set
1135# CONFIG_SENSORS_W83627HF is not set 1186# CONFIG_SENSORS_W83627HF is not set
1136# CONFIG_SENSORS_W83627EHF is not set 1187# CONFIG_SENSORS_W83627EHF is not set
1188# CONFIG_SENSORS_LIS3_I2C is not set
1137# CONFIG_THERMAL is not set 1189# CONFIG_THERMAL is not set
1138CONFIG_WATCHDOG=y 1190CONFIG_WATCHDOG=y
1139# CONFIG_WATCHDOG_NOWAYOUT is not set 1191# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1172,11 +1224,13 @@ CONFIG_SSB_POSSIBLE=y
1172# CONFIG_TWL4030_CORE is not set 1224# CONFIG_TWL4030_CORE is not set
1173# CONFIG_MFD_TMIO is not set 1225# CONFIG_MFD_TMIO is not set
1174# CONFIG_PMIC_DA903X is not set 1226# CONFIG_PMIC_DA903X is not set
1227# CONFIG_PMIC_ADP5520 is not set
1175# CONFIG_MFD_WM8400 is not set 1228# CONFIG_MFD_WM8400 is not set
1176# CONFIG_MFD_WM831X is not set 1229# CONFIG_MFD_WM831X is not set
1177# CONFIG_MFD_WM8350_I2C is not set 1230# CONFIG_MFD_WM8350_I2C is not set
1178# CONFIG_MFD_PCF50633 is not set 1231# CONFIG_MFD_PCF50633 is not set
1179# CONFIG_AB3100_CORE is not set 1232# CONFIG_AB3100_CORE is not set
1233# CONFIG_MFD_88PM8607 is not set
1180# CONFIG_REGULATOR is not set 1234# CONFIG_REGULATOR is not set
1181# CONFIG_MEDIA_SUPPORT is not set 1235# CONFIG_MEDIA_SUPPORT is not set
1182 1236
@@ -1368,6 +1422,7 @@ CONFIG_LEDS_GPIO_OF=y
1368# CONFIG_LEDS_LP3944 is not set 1422# CONFIG_LEDS_LP3944 is not set
1369CONFIG_LEDS_PCA955X=y 1423CONFIG_LEDS_PCA955X=y
1370# CONFIG_LEDS_BD2802 is not set 1424# CONFIG_LEDS_BD2802 is not set
1425# CONFIG_LEDS_LT3593 is not set
1371 1426
1372# 1427#
1373# LED Triggers 1428# LED Triggers
@@ -1391,7 +1446,6 @@ CONFIG_EDAC=y
1391# 1446#
1392# CONFIG_EDAC_DEBUG is not set 1447# CONFIG_EDAC_DEBUG is not set
1393CONFIG_EDAC_MM_EDAC=y 1448CONFIG_EDAC_MM_EDAC=y
1394CONFIG_EDAC_MPC85XX=y
1395CONFIG_RTC_LIB=y 1449CONFIG_RTC_LIB=y
1396CONFIG_RTC_CLASS=y 1450CONFIG_RTC_CLASS=y
1397CONFIG_RTC_HCTOSYS=y 1451CONFIG_RTC_HCTOSYS=y
@@ -1420,6 +1474,7 @@ CONFIG_RTC_DRV_DS1307=y
1420# CONFIG_RTC_DRV_PCF8563 is not set 1474# CONFIG_RTC_DRV_PCF8563 is not set
1421# CONFIG_RTC_DRV_PCF8583 is not set 1475# CONFIG_RTC_DRV_PCF8583 is not set
1422# CONFIG_RTC_DRV_M41T80 is not set 1476# CONFIG_RTC_DRV_M41T80 is not set
1477# CONFIG_RTC_DRV_BQ32K is not set
1423# CONFIG_RTC_DRV_S35390A is not set 1478# CONFIG_RTC_DRV_S35390A is not set
1424# CONFIG_RTC_DRV_FM3130 is not set 1479# CONFIG_RTC_DRV_FM3130 is not set
1425# CONFIG_RTC_DRV_RX8581 is not set 1480# CONFIG_RTC_DRV_RX8581 is not set
@@ -1441,7 +1496,9 @@ CONFIG_RTC_DRV_CMOS=y
1441# CONFIG_RTC_DRV_M48T86 is not set 1496# CONFIG_RTC_DRV_M48T86 is not set
1442# CONFIG_RTC_DRV_M48T35 is not set 1497# CONFIG_RTC_DRV_M48T35 is not set
1443# CONFIG_RTC_DRV_M48T59 is not set 1498# CONFIG_RTC_DRV_M48T59 is not set
1499# CONFIG_RTC_DRV_MSM6242 is not set
1444# CONFIG_RTC_DRV_BQ4802 is not set 1500# CONFIG_RTC_DRV_BQ4802 is not set
1501# CONFIG_RTC_DRV_RP5C01 is not set
1445# CONFIG_RTC_DRV_V3020 is not set 1502# CONFIG_RTC_DRV_V3020 is not set
1446 1503
1447# 1504#
@@ -1772,7 +1829,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1772# CONFIG_KEYS is not set 1829# CONFIG_KEYS is not set
1773# CONFIG_SECURITY is not set 1830# CONFIG_SECURITY is not set
1774# CONFIG_SECURITYFS is not set 1831# CONFIG_SECURITYFS is not set
1775# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1832# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1833# CONFIG_DEFAULT_SECURITY_SMACK is not set
1834# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1835CONFIG_DEFAULT_SECURITY_DAC=y
1836CONFIG_DEFAULT_SECURITY=""
1776CONFIG_CRYPTO=y 1837CONFIG_CRYPTO=y
1777 1838
1778# 1839#
diff --git a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig b/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
index 6cd2cd65c2cd..a85f927bf225 100644
--- a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
+++ b/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:49 2009 4# Wed Jan 6 09:24:43 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -38,6 +38,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
40CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
41CONFIG_NR_IRQS=512
41CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
42CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
43CONFIG_TRACE_IRQFLAGS_SUPPORT=y 44CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -91,6 +94,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
91# 94#
92CONFIG_TREE_RCU=y 95CONFIG_TREE_RCU=y
93# CONFIG_TREE_PREEMPT_RCU is not set 96# CONFIG_TREE_PREEMPT_RCU is not set
97# CONFIG_TINY_RCU is not set
94# CONFIG_RCU_TRACE is not set 98# CONFIG_RCU_TRACE is not set
95CONFIG_RCU_FANOUT=32 99CONFIG_RCU_FANOUT=32
96# CONFIG_RCU_FANOUT_EXACT is not set 100# CONFIG_RCU_FANOUT_EXACT is not set
@@ -181,14 +185,41 @@ CONFIG_LBDAF=y
181# IO Schedulers 185# IO Schedulers
182# 186#
183CONFIG_IOSCHED_NOOP=y 187CONFIG_IOSCHED_NOOP=y
184CONFIG_IOSCHED_AS=y
185CONFIG_IOSCHED_DEADLINE=y 188CONFIG_IOSCHED_DEADLINE=y
186CONFIG_IOSCHED_CFQ=y 189CONFIG_IOSCHED_CFQ=y
187# CONFIG_DEFAULT_AS is not set
188# CONFIG_DEFAULT_DEADLINE is not set 190# CONFIG_DEFAULT_DEADLINE is not set
189CONFIG_DEFAULT_CFQ=y 191CONFIG_DEFAULT_CFQ=y
190# CONFIG_DEFAULT_NOOP is not set 192# CONFIG_DEFAULT_NOOP is not set
191CONFIG_DEFAULT_IOSCHED="cfq" 193CONFIG_DEFAULT_IOSCHED="cfq"
194# CONFIG_INLINE_SPIN_TRYLOCK is not set
195# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
196# CONFIG_INLINE_SPIN_LOCK is not set
197# CONFIG_INLINE_SPIN_LOCK_BH is not set
198# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
199# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
200# CONFIG_INLINE_SPIN_UNLOCK is not set
201# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
202# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
203# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_READ_TRYLOCK is not set
205# CONFIG_INLINE_READ_LOCK is not set
206# CONFIG_INLINE_READ_LOCK_BH is not set
207# CONFIG_INLINE_READ_LOCK_IRQ is not set
208# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
209# CONFIG_INLINE_READ_UNLOCK is not set
210# CONFIG_INLINE_READ_UNLOCK_BH is not set
211# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
212# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
213# CONFIG_INLINE_WRITE_TRYLOCK is not set
214# CONFIG_INLINE_WRITE_LOCK is not set
215# CONFIG_INLINE_WRITE_LOCK_BH is not set
216# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
217# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
218# CONFIG_INLINE_WRITE_UNLOCK is not set
219# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
220# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
221# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
222CONFIG_MUTEX_SPIN_ON_OWNER=y
192# CONFIG_FREEZER is not set 223# CONFIG_FREEZER is not set
193 224
194# 225#
@@ -259,6 +290,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
259# CONFIG_KEXEC is not set 290# CONFIG_KEXEC is not set
260# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
261CONFIG_IRQ_ALL_CPUS=y 292CONFIG_IRQ_ALL_CPUS=y
293CONFIG_SPARSE_IRQ=y
262CONFIG_MAX_ACTIVE_REGIONS=32 294CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 295CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 296CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -275,8 +307,6 @@ CONFIG_MIGRATION=y
275CONFIG_ZONE_DMA_FLAG=1 307CONFIG_ZONE_DMA_FLAG=1
276CONFIG_BOUNCE=y 308CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 309CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set 310# CONFIG_KSM is not set
281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 311CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
282CONFIG_PPC_4K_PAGES=y 312CONFIG_PPC_4K_PAGES=y
@@ -314,7 +344,6 @@ CONFIG_ARCH_SUPPORTS_MSI=y
314# CONFIG_PCI_STUB is not set 344# CONFIG_PCI_STUB is not set
315# CONFIG_PCI_IOV is not set 345# CONFIG_PCI_IOV is not set
316CONFIG_PCCARD=y 346CONFIG_PCCARD=y
317# CONFIG_PCMCIA_DEBUG is not set
318CONFIG_PCMCIA=y 347CONFIG_PCMCIA=y
319# CONFIG_PCMCIA_LOAD_CIS is not set 348# CONFIG_PCMCIA_LOAD_CIS is not set
320# CONFIG_PCMCIA_IOCTL is not set 349# CONFIG_PCMCIA_IOCTL is not set
@@ -414,6 +443,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
414CONFIG_INET6_XFRM_MODE_BEET=m 443CONFIG_INET6_XFRM_MODE_BEET=m
415# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 444# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
416CONFIG_IPV6_SIT=m 445CONFIG_IPV6_SIT=m
446# CONFIG_IPV6_SIT_6RD is not set
417CONFIG_IPV6_NDISC_NODETYPE=y 447CONFIG_IPV6_NDISC_NODETYPE=y
418CONFIG_IPV6_TUNNEL=m 448CONFIG_IPV6_TUNNEL=m
419# CONFIG_IPV6_MULTIPLE_TABLES is not set 449# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -451,7 +481,13 @@ CONFIG_NET_PKTGEN=m
451# CONFIG_BT is not set 481# CONFIG_BT is not set
452# CONFIG_AF_RXRPC is not set 482# CONFIG_AF_RXRPC is not set
453CONFIG_FIB_RULES=y 483CONFIG_FIB_RULES=y
454# CONFIG_WIRELESS is not set 484CONFIG_WIRELESS=y
485# CONFIG_CFG80211 is not set
486# CONFIG_LIB80211 is not set
487
488#
489# CFG80211 needs to be enabled for MAC80211
490#
455# CONFIG_WIMAX is not set 491# CONFIG_WIMAX is not set
456# CONFIG_RFKILL is not set 492# CONFIG_RFKILL is not set
457# CONFIG_NET_9P is not set 493# CONFIG_NET_9P is not set
@@ -570,6 +606,10 @@ CONFIG_BLK_DEV=y
570# CONFIG_BLK_DEV_COW_COMMON is not set 606# CONFIG_BLK_DEV_COW_COMMON is not set
571CONFIG_BLK_DEV_LOOP=m 607CONFIG_BLK_DEV_LOOP=m
572CONFIG_BLK_DEV_CRYPTOLOOP=m 608CONFIG_BLK_DEV_CRYPTOLOOP=m
609
610#
611# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
612#
573CONFIG_BLK_DEV_NBD=m 613CONFIG_BLK_DEV_NBD=m
574# CONFIG_BLK_DEV_SX8 is not set 614# CONFIG_BLK_DEV_SX8 is not set
575# CONFIG_BLK_DEV_UB is not set 615# CONFIG_BLK_DEV_UB is not set
@@ -581,6 +621,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
581# CONFIG_ATA_OVER_ETH is not set 621# CONFIG_ATA_OVER_ETH is not set
582# CONFIG_BLK_DEV_HD is not set 622# CONFIG_BLK_DEV_HD is not set
583CONFIG_MISC_DEVICES=y 623CONFIG_MISC_DEVICES=y
624# CONFIG_AD525X_DPOT is not set
584# CONFIG_PHANTOM is not set 625# CONFIG_PHANTOM is not set
585# CONFIG_SGI_IOC4 is not set 626# CONFIG_SGI_IOC4 is not set
586# CONFIG_TIFM_CORE is not set 627# CONFIG_TIFM_CORE is not set
@@ -588,6 +629,7 @@ CONFIG_MISC_DEVICES=y
588# CONFIG_ENCLOSURE_SERVICES is not set 629# CONFIG_ENCLOSURE_SERVICES is not set
589# CONFIG_HP_ILO is not set 630# CONFIG_HP_ILO is not set
590# CONFIG_ISL29003 is not set 631# CONFIG_ISL29003 is not set
632CONFIG_DS1682=y
591# CONFIG_C2PORT is not set 633# CONFIG_C2PORT is not set
592 634
593# 635#
@@ -689,7 +731,9 @@ CONFIG_SCSI_LOWLEVEL=y
689# CONFIG_SCSI_BNX2_ISCSI is not set 731# CONFIG_SCSI_BNX2_ISCSI is not set
690# CONFIG_BE2ISCSI is not set 732# CONFIG_BE2ISCSI is not set
691# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 733# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
734# CONFIG_SCSI_HPSA is not set
692# CONFIG_SCSI_3W_9XXX is not set 735# CONFIG_SCSI_3W_9XXX is not set
736# CONFIG_SCSI_3W_SAS is not set
693# CONFIG_SCSI_ACARD is not set 737# CONFIG_SCSI_ACARD is not set
694# CONFIG_SCSI_AACRAID is not set 738# CONFIG_SCSI_AACRAID is not set
695# CONFIG_SCSI_AIC7XXX is not set 739# CONFIG_SCSI_AIC7XXX is not set
@@ -728,6 +772,7 @@ CONFIG_SCSI_LOWLEVEL=y
728# CONFIG_SCSI_NSP32 is not set 772# CONFIG_SCSI_NSP32 is not set
729# CONFIG_SCSI_DEBUG is not set 773# CONFIG_SCSI_DEBUG is not set
730# CONFIG_SCSI_PMCRAID is not set 774# CONFIG_SCSI_PMCRAID is not set
775# CONFIG_SCSI_PM8001 is not set
731# CONFIG_SCSI_SRP is not set 776# CONFIG_SCSI_SRP is not set
732# CONFIG_SCSI_BFA_FC is not set 777# CONFIG_SCSI_BFA_FC is not set
733# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 778# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
@@ -785,15 +830,16 @@ CONFIG_SATA_SIL=y
785# CONFIG_PATA_OPTI is not set 830# CONFIG_PATA_OPTI is not set
786# CONFIG_PATA_OPTIDMA is not set 831# CONFIG_PATA_OPTIDMA is not set
787# CONFIG_PATA_PCMCIA is not set 832# CONFIG_PATA_PCMCIA is not set
833# CONFIG_PATA_PDC2027X is not set
788# CONFIG_PATA_PDC_OLD is not set 834# CONFIG_PATA_PDC_OLD is not set
789# CONFIG_PATA_RADISYS is not set 835# CONFIG_PATA_RADISYS is not set
790# CONFIG_PATA_RDC is not set 836# CONFIG_PATA_RDC is not set
791# CONFIG_PATA_RZ1000 is not set 837# CONFIG_PATA_RZ1000 is not set
792# CONFIG_PATA_SC1200 is not set 838# CONFIG_PATA_SC1200 is not set
793# CONFIG_PATA_SERVERWORKS is not set 839# CONFIG_PATA_SERVERWORKS is not set
794# CONFIG_PATA_PDC2027X is not set
795# CONFIG_PATA_SIL680 is not set 840# CONFIG_PATA_SIL680 is not set
796# CONFIG_PATA_SIS is not set 841# CONFIG_PATA_SIS is not set
842# CONFIG_PATA_TOSHIBA is not set
797# CONFIG_PATA_VIA is not set 843# CONFIG_PATA_VIA is not set
798# CONFIG_PATA_WINBOND is not set 844# CONFIG_PATA_WINBOND is not set
799# CONFIG_PATA_PLATFORM is not set 845# CONFIG_PATA_PLATFORM is not set
@@ -810,7 +856,7 @@ CONFIG_SATA_SIL=y
810# 856#
811 857
812# 858#
813# See the help texts for more information. 859# The newer stack is recommended.
814# 860#
815# CONFIG_FIREWIRE is not set 861# CONFIG_FIREWIRE is not set
816# CONFIG_IEEE1394 is not set 862# CONFIG_IEEE1394 is not set
@@ -897,8 +943,14 @@ CONFIG_GIANFAR=y
897# CONFIG_NETDEV_10000 is not set 943# CONFIG_NETDEV_10000 is not set
898# CONFIG_TR is not set 944# CONFIG_TR is not set
899CONFIG_WLAN=y 945CONFIG_WLAN=y
900# CONFIG_WLAN_PRE80211 is not set 946# CONFIG_PCMCIA_RAYCS is not set
901# CONFIG_WLAN_80211 is not set 947# CONFIG_AIRO is not set
948# CONFIG_ATMEL is not set
949# CONFIG_AIRO_CS is not set
950# CONFIG_PCMCIA_WL3501 is not set
951# CONFIG_PRISM54 is not set
952# CONFIG_USB_ZD1201 is not set
953# CONFIG_HOSTAP is not set
902 954
903# 955#
904# Enable WiMAX (Networking options) to see the WiMAX drivers 956# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -937,6 +989,7 @@ CONFIG_NETCONSOLE=y
937CONFIG_NETPOLL=y 989CONFIG_NETPOLL=y
938CONFIG_NETPOLL_TRAP=y 990CONFIG_NETPOLL_TRAP=y
939CONFIG_NET_POLL_CONTROLLER=y 991CONFIG_NET_POLL_CONTROLLER=y
992# CONFIG_VMXNET3 is not set
940# CONFIG_ISDN is not set 993# CONFIG_ISDN is not set
941# CONFIG_PHONE is not set 994# CONFIG_PHONE is not set
942 995
@@ -946,6 +999,7 @@ CONFIG_NET_POLL_CONTROLLER=y
946CONFIG_INPUT=y 999CONFIG_INPUT=y
947# CONFIG_INPUT_FF_MEMLESS is not set 1000# CONFIG_INPUT_FF_MEMLESS is not set
948# CONFIG_INPUT_POLLDEV is not set 1001# CONFIG_INPUT_POLLDEV is not set
1002# CONFIG_INPUT_SPARSEKMAP is not set
949 1003
950# 1004#
951# Userland interfaces 1005# Userland interfaces
@@ -1005,6 +1059,7 @@ CONFIG_SERIAL_CORE=y
1005CONFIG_SERIAL_CORE_CONSOLE=y 1059CONFIG_SERIAL_CORE_CONSOLE=y
1006# CONFIG_SERIAL_JSM is not set 1060# CONFIG_SERIAL_JSM is not set
1007# CONFIG_SERIAL_OF_PLATFORM is not set 1061# CONFIG_SERIAL_OF_PLATFORM is not set
1062# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
1008CONFIG_UNIX98_PTYS=y 1063CONFIG_UNIX98_PTYS=y
1009# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1064# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
1010# CONFIG_LEGACY_PTYS is not set 1065# CONFIG_LEGACY_PTYS is not set
@@ -1070,11 +1125,6 @@ CONFIG_I2C_MPC=y
1070# CONFIG_I2C_TINY_USB is not set 1125# CONFIG_I2C_TINY_USB is not set
1071 1126
1072# 1127#
1073# Graphics adapter I2C/DDC channel drivers
1074#
1075# CONFIG_I2C_VOODOO3 is not set
1076
1077#
1078# Other I2C/SMBus bus drivers 1128# Other I2C/SMBus bus drivers
1079# 1129#
1080# CONFIG_I2C_PCA_PLATFORM is not set 1130# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1083,7 +1133,6 @@ CONFIG_I2C_MPC=y
1083# 1133#
1084# Miscellaneous I2C Chip support 1134# Miscellaneous I2C Chip support
1085# 1135#
1086CONFIG_DS1682=y
1087# CONFIG_SENSORS_TSL2550 is not set 1136# CONFIG_SENSORS_TSL2550 is not set
1088# CONFIG_I2C_DEBUG_CORE is not set 1137# CONFIG_I2C_DEBUG_CORE is not set
1089# CONFIG_I2C_DEBUG_ALGO is not set 1138# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1115,6 +1164,7 @@ CONFIG_GPIO_SYSFS=y
1115# 1164#
1116# PCI GPIO expanders: 1165# PCI GPIO expanders:
1117# 1166#
1167# CONFIG_GPIO_CS5535 is not set
1118# CONFIG_GPIO_BT8XX is not set 1168# CONFIG_GPIO_BT8XX is not set
1119# CONFIG_GPIO_LANGWELL is not set 1169# CONFIG_GPIO_LANGWELL is not set
1120 1170
@@ -1157,6 +1207,7 @@ CONFIG_HWMON=y
1157# CONFIG_SENSORS_GL520SM is not set 1207# CONFIG_SENSORS_GL520SM is not set
1158# CONFIG_SENSORS_IT87 is not set 1208# CONFIG_SENSORS_IT87 is not set
1159# CONFIG_SENSORS_LM63 is not set 1209# CONFIG_SENSORS_LM63 is not set
1210# CONFIG_SENSORS_LM73 is not set
1160# CONFIG_SENSORS_LM75 is not set 1211# CONFIG_SENSORS_LM75 is not set
1161# CONFIG_SENSORS_LM77 is not set 1212# CONFIG_SENSORS_LM77 is not set
1162# CONFIG_SENSORS_LM78 is not set 1213# CONFIG_SENSORS_LM78 is not set
@@ -1196,6 +1247,7 @@ CONFIG_SENSORS_LM92=y
1196# CONFIG_SENSORS_W83L786NG is not set 1247# CONFIG_SENSORS_W83L786NG is not set
1197# CONFIG_SENSORS_W83627HF is not set 1248# CONFIG_SENSORS_W83627HF is not set
1198# CONFIG_SENSORS_W83627EHF is not set 1249# CONFIG_SENSORS_W83627EHF is not set
1250# CONFIG_SENSORS_LIS3_I2C is not set
1199# CONFIG_THERMAL is not set 1251# CONFIG_THERMAL is not set
1200CONFIG_WATCHDOG=y 1252CONFIG_WATCHDOG=y
1201# CONFIG_WATCHDOG_NOWAYOUT is not set 1253# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1235,11 +1287,13 @@ CONFIG_SSB_POSSIBLE=y
1235# CONFIG_TWL4030_CORE is not set 1287# CONFIG_TWL4030_CORE is not set
1236# CONFIG_MFD_TMIO is not set 1288# CONFIG_MFD_TMIO is not set
1237# CONFIG_PMIC_DA903X is not set 1289# CONFIG_PMIC_DA903X is not set
1290# CONFIG_PMIC_ADP5520 is not set
1238# CONFIG_MFD_WM8400 is not set 1291# CONFIG_MFD_WM8400 is not set
1239# CONFIG_MFD_WM831X is not set 1292# CONFIG_MFD_WM831X is not set
1240# CONFIG_MFD_WM8350_I2C is not set 1293# CONFIG_MFD_WM8350_I2C is not set
1241# CONFIG_MFD_PCF50633 is not set 1294# CONFIG_MFD_PCF50633 is not set
1242# CONFIG_AB3100_CORE is not set 1295# CONFIG_AB3100_CORE is not set
1296# CONFIG_MFD_88PM8607 is not set
1243# CONFIG_REGULATOR is not set 1297# CONFIG_REGULATOR is not set
1244# CONFIG_MEDIA_SUPPORT is not set 1298# CONFIG_MEDIA_SUPPORT is not set
1245 1299
@@ -1338,6 +1392,7 @@ CONFIG_USB=y
1338CONFIG_USB_EHCI_HCD=y 1392CONFIG_USB_EHCI_HCD=y
1339# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1393# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1340# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1394# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1395# CONFIG_XPS_USB_HCD_XILINX is not set
1341# CONFIG_USB_EHCI_FSL is not set 1396# CONFIG_USB_EHCI_FSL is not set
1342# CONFIG_USB_EHCI_HCD_PPC_OF is not set 1397# CONFIG_USB_EHCI_HCD_PPC_OF is not set
1343# CONFIG_USB_OXU210HP_HCD is not set 1398# CONFIG_USB_OXU210HP_HCD is not set
@@ -1464,6 +1519,7 @@ CONFIG_RTC_INTF_DEV=y
1464# CONFIG_RTC_DRV_PCF8563 is not set 1519# CONFIG_RTC_DRV_PCF8563 is not set
1465# CONFIG_RTC_DRV_PCF8583 is not set 1520# CONFIG_RTC_DRV_PCF8583 is not set
1466# CONFIG_RTC_DRV_M41T80 is not set 1521# CONFIG_RTC_DRV_M41T80 is not set
1522# CONFIG_RTC_DRV_BQ32K is not set
1467# CONFIG_RTC_DRV_S35390A is not set 1523# CONFIG_RTC_DRV_S35390A is not set
1468# CONFIG_RTC_DRV_FM3130 is not set 1524# CONFIG_RTC_DRV_FM3130 is not set
1469CONFIG_RTC_DRV_RX8581=y 1525CONFIG_RTC_DRV_RX8581=y
@@ -1485,7 +1541,9 @@ CONFIG_RTC_DRV_RX8581=y
1485# CONFIG_RTC_DRV_M48T86 is not set 1541# CONFIG_RTC_DRV_M48T86 is not set
1486# CONFIG_RTC_DRV_M48T35 is not set 1542# CONFIG_RTC_DRV_M48T35 is not set
1487# CONFIG_RTC_DRV_M48T59 is not set 1543# CONFIG_RTC_DRV_M48T59 is not set
1544# CONFIG_RTC_DRV_MSM6242 is not set
1488# CONFIG_RTC_DRV_BQ4802 is not set 1545# CONFIG_RTC_DRV_BQ4802 is not set
1546# CONFIG_RTC_DRV_RP5C01 is not set
1489# CONFIG_RTC_DRV_V3020 is not set 1547# CONFIG_RTC_DRV_V3020 is not set
1490 1548
1491# 1549#
@@ -1710,7 +1768,7 @@ CONFIG_MAGIC_SYSRQ=y
1710# CONFIG_DEBUG_FS is not set 1768# CONFIG_DEBUG_FS is not set
1711# CONFIG_HEADERS_CHECK is not set 1769# CONFIG_HEADERS_CHECK is not set
1712# CONFIG_DEBUG_KERNEL is not set 1770# CONFIG_DEBUG_KERNEL is not set
1713# CONFIG_DEBUG_BUGVERBOSE is not set 1771CONFIG_DEBUG_BUGVERBOSE=y
1714# CONFIG_DEBUG_MEMORY_INIT is not set 1772# CONFIG_DEBUG_MEMORY_INIT is not set
1715# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1773# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1716# CONFIG_LATENCYTOP is not set 1774# CONFIG_LATENCYTOP is not set
@@ -1737,7 +1795,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1737# CONFIG_KEYS is not set 1795# CONFIG_KEYS is not set
1738# CONFIG_SECURITY is not set 1796# CONFIG_SECURITY is not set
1739# CONFIG_SECURITYFS is not set 1797# CONFIG_SECURITYFS is not set
1740# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1798# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1799# CONFIG_DEFAULT_SECURITY_SMACK is not set
1800# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1801CONFIG_DEFAULT_SECURITY_DAC=y
1802CONFIG_DEFAULT_SECURITY=""
1741CONFIG_CRYPTO=y 1803CONFIG_CRYPTO=y
1742 1804
1743# 1805#
diff --git a/arch/powerpc/configs/86xx/gef_sbc310_defconfig b/arch/powerpc/configs/86xx/gef_sbc310_defconfig
index a6a3768f7304..eb58dec11a61 100644
--- a/arch/powerpc/configs/86xx/gef_sbc310_defconfig
+++ b/arch/powerpc/configs/86xx/gef_sbc310_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:47 2009 4# Wed Jan 6 09:24:41 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -38,6 +38,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
40CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
41CONFIG_NR_IRQS=512
41CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
42CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
43CONFIG_TRACE_IRQFLAGS_SUPPORT=y 44CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -91,6 +94,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
91# 94#
92CONFIG_TREE_RCU=y 95CONFIG_TREE_RCU=y
93# CONFIG_TREE_PREEMPT_RCU is not set 96# CONFIG_TREE_PREEMPT_RCU is not set
97# CONFIG_TINY_RCU is not set
94# CONFIG_RCU_TRACE is not set 98# CONFIG_RCU_TRACE is not set
95CONFIG_RCU_FANOUT=32 99CONFIG_RCU_FANOUT=32
96# CONFIG_RCU_FANOUT_EXACT is not set 100# CONFIG_RCU_FANOUT_EXACT is not set
@@ -181,14 +185,41 @@ CONFIG_LBDAF=y
181# IO Schedulers 185# IO Schedulers
182# 186#
183CONFIG_IOSCHED_NOOP=y 187CONFIG_IOSCHED_NOOP=y
184CONFIG_IOSCHED_AS=y
185CONFIG_IOSCHED_DEADLINE=y 188CONFIG_IOSCHED_DEADLINE=y
186CONFIG_IOSCHED_CFQ=y 189CONFIG_IOSCHED_CFQ=y
187# CONFIG_DEFAULT_AS is not set
188# CONFIG_DEFAULT_DEADLINE is not set 190# CONFIG_DEFAULT_DEADLINE is not set
189CONFIG_DEFAULT_CFQ=y 191CONFIG_DEFAULT_CFQ=y
190# CONFIG_DEFAULT_NOOP is not set 192# CONFIG_DEFAULT_NOOP is not set
191CONFIG_DEFAULT_IOSCHED="cfq" 193CONFIG_DEFAULT_IOSCHED="cfq"
194# CONFIG_INLINE_SPIN_TRYLOCK is not set
195# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
196# CONFIG_INLINE_SPIN_LOCK is not set
197# CONFIG_INLINE_SPIN_LOCK_BH is not set
198# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
199# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
200# CONFIG_INLINE_SPIN_UNLOCK is not set
201# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
202# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
203# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_READ_TRYLOCK is not set
205# CONFIG_INLINE_READ_LOCK is not set
206# CONFIG_INLINE_READ_LOCK_BH is not set
207# CONFIG_INLINE_READ_LOCK_IRQ is not set
208# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
209# CONFIG_INLINE_READ_UNLOCK is not set
210# CONFIG_INLINE_READ_UNLOCK_BH is not set
211# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
212# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
213# CONFIG_INLINE_WRITE_TRYLOCK is not set
214# CONFIG_INLINE_WRITE_LOCK is not set
215# CONFIG_INLINE_WRITE_LOCK_BH is not set
216# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
217# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
218# CONFIG_INLINE_WRITE_UNLOCK is not set
219# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
220# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
221# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
222CONFIG_MUTEX_SPIN_ON_OWNER=y
192# CONFIG_FREEZER is not set 223# CONFIG_FREEZER is not set
193 224
194# 225#
@@ -259,6 +290,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
259# CONFIG_KEXEC is not set 290# CONFIG_KEXEC is not set
260# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
261CONFIG_IRQ_ALL_CPUS=y 292CONFIG_IRQ_ALL_CPUS=y
293CONFIG_SPARSE_IRQ=y
262CONFIG_MAX_ACTIVE_REGIONS=32 294CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 295CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 296CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -275,8 +307,6 @@ CONFIG_MIGRATION=y
275CONFIG_ZONE_DMA_FLAG=1 307CONFIG_ZONE_DMA_FLAG=1
276CONFIG_BOUNCE=y 308CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 309CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set 310# CONFIG_KSM is not set
281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 311CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
282CONFIG_PPC_4K_PAGES=y 312CONFIG_PPC_4K_PAGES=y
@@ -314,7 +344,6 @@ CONFIG_ARCH_SUPPORTS_MSI=y
314# CONFIG_PCI_STUB is not set 344# CONFIG_PCI_STUB is not set
315# CONFIG_PCI_IOV is not set 345# CONFIG_PCI_IOV is not set
316CONFIG_PCCARD=y 346CONFIG_PCCARD=y
317# CONFIG_PCMCIA_DEBUG is not set
318CONFIG_PCMCIA=y 347CONFIG_PCMCIA=y
319# CONFIG_PCMCIA_LOAD_CIS is not set 348# CONFIG_PCMCIA_LOAD_CIS is not set
320# CONFIG_PCMCIA_IOCTL is not set 349# CONFIG_PCMCIA_IOCTL is not set
@@ -414,6 +443,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
414CONFIG_INET6_XFRM_MODE_BEET=m 443CONFIG_INET6_XFRM_MODE_BEET=m
415# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 444# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
416CONFIG_IPV6_SIT=m 445CONFIG_IPV6_SIT=m
446# CONFIG_IPV6_SIT_6RD is not set
417CONFIG_IPV6_NDISC_NODETYPE=y 447CONFIG_IPV6_NDISC_NODETYPE=y
418CONFIG_IPV6_TUNNEL=m 448CONFIG_IPV6_TUNNEL=m
419# CONFIG_IPV6_MULTIPLE_TABLES is not set 449# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -451,7 +481,13 @@ CONFIG_NET_PKTGEN=m
451# CONFIG_BT is not set 481# CONFIG_BT is not set
452# CONFIG_AF_RXRPC is not set 482# CONFIG_AF_RXRPC is not set
453CONFIG_FIB_RULES=y 483CONFIG_FIB_RULES=y
454# CONFIG_WIRELESS is not set 484CONFIG_WIRELESS=y
485# CONFIG_CFG80211 is not set
486# CONFIG_LIB80211 is not set
487
488#
489# CFG80211 needs to be enabled for MAC80211
490#
455# CONFIG_WIMAX is not set 491# CONFIG_WIMAX is not set
456# CONFIG_RFKILL is not set 492# CONFIG_RFKILL is not set
457# CONFIG_NET_9P is not set 493# CONFIG_NET_9P is not set
@@ -570,6 +606,10 @@ CONFIG_BLK_DEV=y
570# CONFIG_BLK_DEV_COW_COMMON is not set 606# CONFIG_BLK_DEV_COW_COMMON is not set
571CONFIG_BLK_DEV_LOOP=m 607CONFIG_BLK_DEV_LOOP=m
572CONFIG_BLK_DEV_CRYPTOLOOP=m 608CONFIG_BLK_DEV_CRYPTOLOOP=m
609
610#
611# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
612#
573CONFIG_BLK_DEV_NBD=m 613CONFIG_BLK_DEV_NBD=m
574# CONFIG_BLK_DEV_SX8 is not set 614# CONFIG_BLK_DEV_SX8 is not set
575# CONFIG_BLK_DEV_UB is not set 615# CONFIG_BLK_DEV_UB is not set
@@ -581,6 +621,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
581# CONFIG_ATA_OVER_ETH is not set 621# CONFIG_ATA_OVER_ETH is not set
582# CONFIG_BLK_DEV_HD is not set 622# CONFIG_BLK_DEV_HD is not set
583CONFIG_MISC_DEVICES=y 623CONFIG_MISC_DEVICES=y
624# CONFIG_AD525X_DPOT is not set
584# CONFIG_PHANTOM is not set 625# CONFIG_PHANTOM is not set
585# CONFIG_SGI_IOC4 is not set 626# CONFIG_SGI_IOC4 is not set
586# CONFIG_TIFM_CORE is not set 627# CONFIG_TIFM_CORE is not set
@@ -588,6 +629,7 @@ CONFIG_MISC_DEVICES=y
588# CONFIG_ENCLOSURE_SERVICES is not set 629# CONFIG_ENCLOSURE_SERVICES is not set
589# CONFIG_HP_ILO is not set 630# CONFIG_HP_ILO is not set
590# CONFIG_ISL29003 is not set 631# CONFIG_ISL29003 is not set
632CONFIG_DS1682=y
591# CONFIG_C2PORT is not set 633# CONFIG_C2PORT is not set
592 634
593# 635#
@@ -689,7 +731,9 @@ CONFIG_SCSI_LOWLEVEL=y
689# CONFIG_SCSI_BNX2_ISCSI is not set 731# CONFIG_SCSI_BNX2_ISCSI is not set
690# CONFIG_BE2ISCSI is not set 732# CONFIG_BE2ISCSI is not set
691# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 733# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
734# CONFIG_SCSI_HPSA is not set
692# CONFIG_SCSI_3W_9XXX is not set 735# CONFIG_SCSI_3W_9XXX is not set
736# CONFIG_SCSI_3W_SAS is not set
693# CONFIG_SCSI_ACARD is not set 737# CONFIG_SCSI_ACARD is not set
694# CONFIG_SCSI_AACRAID is not set 738# CONFIG_SCSI_AACRAID is not set
695# CONFIG_SCSI_AIC7XXX is not set 739# CONFIG_SCSI_AIC7XXX is not set
@@ -728,6 +772,7 @@ CONFIG_SCSI_LOWLEVEL=y
728# CONFIG_SCSI_NSP32 is not set 772# CONFIG_SCSI_NSP32 is not set
729# CONFIG_SCSI_DEBUG is not set 773# CONFIG_SCSI_DEBUG is not set
730# CONFIG_SCSI_PMCRAID is not set 774# CONFIG_SCSI_PMCRAID is not set
775# CONFIG_SCSI_PM8001 is not set
731# CONFIG_SCSI_SRP is not set 776# CONFIG_SCSI_SRP is not set
732# CONFIG_SCSI_BFA_FC is not set 777# CONFIG_SCSI_BFA_FC is not set
733# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 778# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
@@ -753,7 +798,7 @@ CONFIG_SATA_SIL24=y
753# 798#
754 799
755# 800#
756# See the help texts for more information. 801# The newer stack is recommended.
757# 802#
758# CONFIG_FIREWIRE is not set 803# CONFIG_FIREWIRE is not set
759# CONFIG_IEEE1394 is not set 804# CONFIG_IEEE1394 is not set
@@ -840,8 +885,14 @@ CONFIG_GIANFAR=y
840# CONFIG_NETDEV_10000 is not set 885# CONFIG_NETDEV_10000 is not set
841# CONFIG_TR is not set 886# CONFIG_TR is not set
842CONFIG_WLAN=y 887CONFIG_WLAN=y
843# CONFIG_WLAN_PRE80211 is not set 888# CONFIG_PCMCIA_RAYCS is not set
844# CONFIG_WLAN_80211 is not set 889# CONFIG_AIRO is not set
890# CONFIG_ATMEL is not set
891# CONFIG_AIRO_CS is not set
892# CONFIG_PCMCIA_WL3501 is not set
893# CONFIG_PRISM54 is not set
894# CONFIG_USB_ZD1201 is not set
895# CONFIG_HOSTAP is not set
845 896
846# 897#
847# Enable WiMAX (Networking options) to see the WiMAX drivers 898# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -880,6 +931,7 @@ CONFIG_NETCONSOLE=y
880CONFIG_NETPOLL=y 931CONFIG_NETPOLL=y
881CONFIG_NETPOLL_TRAP=y 932CONFIG_NETPOLL_TRAP=y
882CONFIG_NET_POLL_CONTROLLER=y 933CONFIG_NET_POLL_CONTROLLER=y
934# CONFIG_VMXNET3 is not set
883# CONFIG_ISDN is not set 935# CONFIG_ISDN is not set
884# CONFIG_PHONE is not set 936# CONFIG_PHONE is not set
885 937
@@ -889,6 +941,7 @@ CONFIG_NET_POLL_CONTROLLER=y
889CONFIG_INPUT=y 941CONFIG_INPUT=y
890# CONFIG_INPUT_FF_MEMLESS is not set 942# CONFIG_INPUT_FF_MEMLESS is not set
891# CONFIG_INPUT_POLLDEV is not set 943# CONFIG_INPUT_POLLDEV is not set
944# CONFIG_INPUT_SPARSEKMAP is not set
892 945
893# 946#
894# Userland interfaces 947# Userland interfaces
@@ -948,6 +1001,7 @@ CONFIG_SERIAL_CORE=y
948CONFIG_SERIAL_CORE_CONSOLE=y 1001CONFIG_SERIAL_CORE_CONSOLE=y
949# CONFIG_SERIAL_JSM is not set 1002# CONFIG_SERIAL_JSM is not set
950# CONFIG_SERIAL_OF_PLATFORM is not set 1003# CONFIG_SERIAL_OF_PLATFORM is not set
1004# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
951CONFIG_UNIX98_PTYS=y 1005CONFIG_UNIX98_PTYS=y
952# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1006# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
953# CONFIG_LEGACY_PTYS is not set 1007# CONFIG_LEGACY_PTYS is not set
@@ -1013,11 +1067,6 @@ CONFIG_I2C_MPC=y
1013# CONFIG_I2C_TINY_USB is not set 1067# CONFIG_I2C_TINY_USB is not set
1014 1068
1015# 1069#
1016# Graphics adapter I2C/DDC channel drivers
1017#
1018# CONFIG_I2C_VOODOO3 is not set
1019
1020#
1021# Other I2C/SMBus bus drivers 1070# Other I2C/SMBus bus drivers
1022# 1071#
1023# CONFIG_I2C_PCA_PLATFORM is not set 1072# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1026,7 +1075,6 @@ CONFIG_I2C_MPC=y
1026# 1075#
1027# Miscellaneous I2C Chip support 1076# Miscellaneous I2C Chip support
1028# 1077#
1029CONFIG_DS1682=y
1030# CONFIG_SENSORS_TSL2550 is not set 1078# CONFIG_SENSORS_TSL2550 is not set
1031# CONFIG_I2C_DEBUG_CORE is not set 1079# CONFIG_I2C_DEBUG_CORE is not set
1032# CONFIG_I2C_DEBUG_ALGO is not set 1080# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1058,6 +1106,7 @@ CONFIG_GPIO_SYSFS=y
1058# 1106#
1059# PCI GPIO expanders: 1107# PCI GPIO expanders:
1060# 1108#
1109# CONFIG_GPIO_CS5535 is not set
1061# CONFIG_GPIO_BT8XX is not set 1110# CONFIG_GPIO_BT8XX is not set
1062# CONFIG_GPIO_LANGWELL is not set 1111# CONFIG_GPIO_LANGWELL is not set
1063 1112
@@ -1100,6 +1149,7 @@ CONFIG_HWMON=y
1100# CONFIG_SENSORS_GL520SM is not set 1149# CONFIG_SENSORS_GL520SM is not set
1101# CONFIG_SENSORS_IT87 is not set 1150# CONFIG_SENSORS_IT87 is not set
1102# CONFIG_SENSORS_LM63 is not set 1151# CONFIG_SENSORS_LM63 is not set
1152# CONFIG_SENSORS_LM73 is not set
1103# CONFIG_SENSORS_LM75 is not set 1153# CONFIG_SENSORS_LM75 is not set
1104# CONFIG_SENSORS_LM77 is not set 1154# CONFIG_SENSORS_LM77 is not set
1105# CONFIG_SENSORS_LM78 is not set 1155# CONFIG_SENSORS_LM78 is not set
@@ -1139,6 +1189,7 @@ CONFIG_SENSORS_LM92=y
1139# CONFIG_SENSORS_W83L786NG is not set 1189# CONFIG_SENSORS_W83L786NG is not set
1140# CONFIG_SENSORS_W83627HF is not set 1190# CONFIG_SENSORS_W83627HF is not set
1141# CONFIG_SENSORS_W83627EHF is not set 1191# CONFIG_SENSORS_W83627EHF is not set
1192# CONFIG_SENSORS_LIS3_I2C is not set
1142# CONFIG_THERMAL is not set 1193# CONFIG_THERMAL is not set
1143CONFIG_WATCHDOG=y 1194CONFIG_WATCHDOG=y
1144# CONFIG_WATCHDOG_NOWAYOUT is not set 1195# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1178,11 +1229,13 @@ CONFIG_SSB_POSSIBLE=y
1178# CONFIG_TWL4030_CORE is not set 1229# CONFIG_TWL4030_CORE is not set
1179# CONFIG_MFD_TMIO is not set 1230# CONFIG_MFD_TMIO is not set
1180# CONFIG_PMIC_DA903X is not set 1231# CONFIG_PMIC_DA903X is not set
1232# CONFIG_PMIC_ADP5520 is not set
1181# CONFIG_MFD_WM8400 is not set 1233# CONFIG_MFD_WM8400 is not set
1182# CONFIG_MFD_WM831X is not set 1234# CONFIG_MFD_WM831X is not set
1183# CONFIG_MFD_WM8350_I2C is not set 1235# CONFIG_MFD_WM8350_I2C is not set
1184# CONFIG_MFD_PCF50633 is not set 1236# CONFIG_MFD_PCF50633 is not set
1185# CONFIG_AB3100_CORE is not set 1237# CONFIG_AB3100_CORE is not set
1238# CONFIG_MFD_88PM8607 is not set
1186# CONFIG_REGULATOR is not set 1239# CONFIG_REGULATOR is not set
1187# CONFIG_MEDIA_SUPPORT is not set 1240# CONFIG_MEDIA_SUPPORT is not set
1188 1241
@@ -1281,6 +1334,7 @@ CONFIG_USB=y
1281CONFIG_USB_EHCI_HCD=y 1334CONFIG_USB_EHCI_HCD=y
1282# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1335# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1283# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1336# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1337# CONFIG_XPS_USB_HCD_XILINX is not set
1284# CONFIG_USB_EHCI_FSL is not set 1338# CONFIG_USB_EHCI_FSL is not set
1285# CONFIG_USB_EHCI_HCD_PPC_OF is not set 1339# CONFIG_USB_EHCI_HCD_PPC_OF is not set
1286# CONFIG_USB_OXU210HP_HCD is not set 1340# CONFIG_USB_OXU210HP_HCD is not set
@@ -1407,6 +1461,7 @@ CONFIG_RTC_INTF_DEV=y
1407# CONFIG_RTC_DRV_PCF8563 is not set 1461# CONFIG_RTC_DRV_PCF8563 is not set
1408# CONFIG_RTC_DRV_PCF8583 is not set 1462# CONFIG_RTC_DRV_PCF8583 is not set
1409# CONFIG_RTC_DRV_M41T80 is not set 1463# CONFIG_RTC_DRV_M41T80 is not set
1464# CONFIG_RTC_DRV_BQ32K is not set
1410# CONFIG_RTC_DRV_S35390A is not set 1465# CONFIG_RTC_DRV_S35390A is not set
1411# CONFIG_RTC_DRV_FM3130 is not set 1466# CONFIG_RTC_DRV_FM3130 is not set
1412CONFIG_RTC_DRV_RX8581=y 1467CONFIG_RTC_DRV_RX8581=y
@@ -1428,7 +1483,9 @@ CONFIG_RTC_DRV_RX8581=y
1428# CONFIG_RTC_DRV_M48T86 is not set 1483# CONFIG_RTC_DRV_M48T86 is not set
1429# CONFIG_RTC_DRV_M48T35 is not set 1484# CONFIG_RTC_DRV_M48T35 is not set
1430# CONFIG_RTC_DRV_M48T59 is not set 1485# CONFIG_RTC_DRV_M48T59 is not set
1486# CONFIG_RTC_DRV_MSM6242 is not set
1431# CONFIG_RTC_DRV_BQ4802 is not set 1487# CONFIG_RTC_DRV_BQ4802 is not set
1488# CONFIG_RTC_DRV_RP5C01 is not set
1432# CONFIG_RTC_DRV_V3020 is not set 1489# CONFIG_RTC_DRV_V3020 is not set
1433 1490
1434# 1491#
@@ -1653,7 +1710,7 @@ CONFIG_MAGIC_SYSRQ=y
1653# CONFIG_DEBUG_FS is not set 1710# CONFIG_DEBUG_FS is not set
1654# CONFIG_HEADERS_CHECK is not set 1711# CONFIG_HEADERS_CHECK is not set
1655# CONFIG_DEBUG_KERNEL is not set 1712# CONFIG_DEBUG_KERNEL is not set
1656# CONFIG_DEBUG_BUGVERBOSE is not set 1713CONFIG_DEBUG_BUGVERBOSE=y
1657# CONFIG_DEBUG_MEMORY_INIT is not set 1714# CONFIG_DEBUG_MEMORY_INIT is not set
1658# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1715# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1659# CONFIG_LATENCYTOP is not set 1716# CONFIG_LATENCYTOP is not set
@@ -1680,7 +1737,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1680# CONFIG_KEYS is not set 1737# CONFIG_KEYS is not set
1681# CONFIG_SECURITY is not set 1738# CONFIG_SECURITY is not set
1682# CONFIG_SECURITYFS is not set 1739# CONFIG_SECURITYFS is not set
1683# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1740# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1741# CONFIG_DEFAULT_SECURITY_SMACK is not set
1742# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1743CONFIG_DEFAULT_SECURITY_DAC=y
1744CONFIG_DEFAULT_SECURITY=""
1684CONFIG_CRYPTO=y 1745CONFIG_CRYPTO=y
1685 1746
1686# 1747#
diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
index 1975d41e0763..4554d9bb03e5 100644
--- a/arch/powerpc/configs/86xx/gef_sbc610_defconfig
+++ b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:48 2009 4# Wed Jan 6 09:24:42 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -38,6 +38,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
40CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
41CONFIG_NR_IRQS=512
41CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
42CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
43CONFIG_TRACE_IRQFLAGS_SUPPORT=y 44CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -91,6 +94,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
91# 94#
92CONFIG_TREE_RCU=y 95CONFIG_TREE_RCU=y
93# CONFIG_TREE_PREEMPT_RCU is not set 96# CONFIG_TREE_PREEMPT_RCU is not set
97# CONFIG_TINY_RCU is not set
94# CONFIG_RCU_TRACE is not set 98# CONFIG_RCU_TRACE is not set
95CONFIG_RCU_FANOUT=32 99CONFIG_RCU_FANOUT=32
96# CONFIG_RCU_FANOUT_EXACT is not set 100# CONFIG_RCU_FANOUT_EXACT is not set
@@ -182,14 +186,41 @@ CONFIG_LBDAF=y
182# IO Schedulers 186# IO Schedulers
183# 187#
184CONFIG_IOSCHED_NOOP=y 188CONFIG_IOSCHED_NOOP=y
185CONFIG_IOSCHED_AS=y
186CONFIG_IOSCHED_DEADLINE=y 189CONFIG_IOSCHED_DEADLINE=y
187CONFIG_IOSCHED_CFQ=y 190CONFIG_IOSCHED_CFQ=y
188# CONFIG_DEFAULT_AS is not set
189# CONFIG_DEFAULT_DEADLINE is not set 191# CONFIG_DEFAULT_DEADLINE is not set
190CONFIG_DEFAULT_CFQ=y 192CONFIG_DEFAULT_CFQ=y
191# CONFIG_DEFAULT_NOOP is not set 193# CONFIG_DEFAULT_NOOP is not set
192CONFIG_DEFAULT_IOSCHED="cfq" 194CONFIG_DEFAULT_IOSCHED="cfq"
195# CONFIG_INLINE_SPIN_TRYLOCK is not set
196# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
197# CONFIG_INLINE_SPIN_LOCK is not set
198# CONFIG_INLINE_SPIN_LOCK_BH is not set
199# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
200# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
201# CONFIG_INLINE_SPIN_UNLOCK is not set
202# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
203# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
204# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
205# CONFIG_INLINE_READ_TRYLOCK is not set
206# CONFIG_INLINE_READ_LOCK is not set
207# CONFIG_INLINE_READ_LOCK_BH is not set
208# CONFIG_INLINE_READ_LOCK_IRQ is not set
209# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
210# CONFIG_INLINE_READ_UNLOCK is not set
211# CONFIG_INLINE_READ_UNLOCK_BH is not set
212# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
213# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
214# CONFIG_INLINE_WRITE_TRYLOCK is not set
215# CONFIG_INLINE_WRITE_LOCK is not set
216# CONFIG_INLINE_WRITE_LOCK_BH is not set
217# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
218# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
219# CONFIG_INLINE_WRITE_UNLOCK is not set
220# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
221# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
222# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
223CONFIG_MUTEX_SPIN_ON_OWNER=y
193# CONFIG_FREEZER is not set 224# CONFIG_FREEZER is not set
194 225
195# 226#
@@ -260,6 +291,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 291# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 292# CONFIG_CRASH_DUMP is not set
262CONFIG_IRQ_ALL_CPUS=y 293CONFIG_IRQ_ALL_CPUS=y
294CONFIG_SPARSE_IRQ=y
263CONFIG_MAX_ACTIVE_REGIONS=32 295CONFIG_MAX_ACTIVE_REGIONS=32
264CONFIG_ARCH_FLATMEM_ENABLE=y 296CONFIG_ARCH_FLATMEM_ENABLE=y
265CONFIG_ARCH_POPULATES_NODE_MAP=y 297CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -276,8 +308,6 @@ CONFIG_MIGRATION=y
276CONFIG_ZONE_DMA_FLAG=1 308CONFIG_ZONE_DMA_FLAG=1
277CONFIG_BOUNCE=y 309CONFIG_BOUNCE=y
278CONFIG_VIRT_TO_BUS=y 310CONFIG_VIRT_TO_BUS=y
279CONFIG_HAVE_MLOCK=y
280CONFIG_HAVE_MLOCKED_PAGE_BIT=y
281# CONFIG_KSM is not set 311# CONFIG_KSM is not set
282CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 312CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
283CONFIG_PPC_4K_PAGES=y 313CONFIG_PPC_4K_PAGES=y
@@ -400,6 +430,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
400CONFIG_INET6_XFRM_MODE_BEET=m 430CONFIG_INET6_XFRM_MODE_BEET=m
401# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 431# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
402CONFIG_IPV6_SIT=m 432CONFIG_IPV6_SIT=m
433# CONFIG_IPV6_SIT_6RD is not set
403CONFIG_IPV6_NDISC_NODETYPE=y 434CONFIG_IPV6_NDISC_NODETYPE=y
404CONFIG_IPV6_TUNNEL=m 435CONFIG_IPV6_TUNNEL=m
405# CONFIG_IPV6_MULTIPLE_TABLES is not set 436# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -588,9 +619,6 @@ CONFIG_NET_PKTGEN=m
588CONFIG_FIB_RULES=y 619CONFIG_FIB_RULES=y
589CONFIG_WIRELESS=y 620CONFIG_WIRELESS=y
590# CONFIG_CFG80211 is not set 621# CONFIG_CFG80211 is not set
591CONFIG_CFG80211_DEFAULT_PS_VALUE=0
592CONFIG_WIRELESS_OLD_REGULATORY=y
593# CONFIG_WIRELESS_EXT is not set
594# CONFIG_LIB80211 is not set 622# CONFIG_LIB80211 is not set
595 623
596# 624#
@@ -719,6 +747,10 @@ CONFIG_BLK_DEV=y
719# CONFIG_BLK_DEV_COW_COMMON is not set 747# CONFIG_BLK_DEV_COW_COMMON is not set
720CONFIG_BLK_DEV_LOOP=m 748CONFIG_BLK_DEV_LOOP=m
721CONFIG_BLK_DEV_CRYPTOLOOP=m 749CONFIG_BLK_DEV_CRYPTOLOOP=m
750
751#
752# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
753#
722CONFIG_BLK_DEV_NBD=m 754CONFIG_BLK_DEV_NBD=m
723# CONFIG_BLK_DEV_SX8 is not set 755# CONFIG_BLK_DEV_SX8 is not set
724# CONFIG_BLK_DEV_UB is not set 756# CONFIG_BLK_DEV_UB is not set
@@ -730,6 +762,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
730# CONFIG_ATA_OVER_ETH is not set 762# CONFIG_ATA_OVER_ETH is not set
731# CONFIG_BLK_DEV_HD is not set 763# CONFIG_BLK_DEV_HD is not set
732CONFIG_MISC_DEVICES=y 764CONFIG_MISC_DEVICES=y
765# CONFIG_AD525X_DPOT is not set
733# CONFIG_PHANTOM is not set 766# CONFIG_PHANTOM is not set
734# CONFIG_SGI_IOC4 is not set 767# CONFIG_SGI_IOC4 is not set
735# CONFIG_TIFM_CORE is not set 768# CONFIG_TIFM_CORE is not set
@@ -737,6 +770,7 @@ CONFIG_MISC_DEVICES=y
737# CONFIG_ENCLOSURE_SERVICES is not set 770# CONFIG_ENCLOSURE_SERVICES is not set
738# CONFIG_HP_ILO is not set 771# CONFIG_HP_ILO is not set
739# CONFIG_ISL29003 is not set 772# CONFIG_ISL29003 is not set
773CONFIG_DS1682=y
740# CONFIG_C2PORT is not set 774# CONFIG_C2PORT is not set
741 775
742# 776#
@@ -789,7 +823,9 @@ CONFIG_SCSI_LOWLEVEL=y
789# CONFIG_SCSI_BNX2_ISCSI is not set 823# CONFIG_SCSI_BNX2_ISCSI is not set
790# CONFIG_BE2ISCSI is not set 824# CONFIG_BE2ISCSI is not set
791# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 825# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
826# CONFIG_SCSI_HPSA is not set
792# CONFIG_SCSI_3W_9XXX is not set 827# CONFIG_SCSI_3W_9XXX is not set
828# CONFIG_SCSI_3W_SAS is not set
793# CONFIG_SCSI_ACARD is not set 829# CONFIG_SCSI_ACARD is not set
794# CONFIG_SCSI_AACRAID is not set 830# CONFIG_SCSI_AACRAID is not set
795# CONFIG_SCSI_AIC7XXX is not set 831# CONFIG_SCSI_AIC7XXX is not set
@@ -828,6 +864,7 @@ CONFIG_SCSI_LOWLEVEL=y
828# CONFIG_SCSI_NSP32 is not set 864# CONFIG_SCSI_NSP32 is not set
829# CONFIG_SCSI_DEBUG is not set 865# CONFIG_SCSI_DEBUG is not set
830# CONFIG_SCSI_PMCRAID is not set 866# CONFIG_SCSI_PMCRAID is not set
867# CONFIG_SCSI_PM8001 is not set
831# CONFIG_SCSI_SRP is not set 868# CONFIG_SCSI_SRP is not set
832# CONFIG_SCSI_BFA_FC is not set 869# CONFIG_SCSI_BFA_FC is not set
833# CONFIG_SCSI_DH is not set 870# CONFIG_SCSI_DH is not set
@@ -883,15 +920,16 @@ CONFIG_SATA_SIL=y
883# CONFIG_PATA_NS87415 is not set 920# CONFIG_PATA_NS87415 is not set
884# CONFIG_PATA_OPTI is not set 921# CONFIG_PATA_OPTI is not set
885# CONFIG_PATA_OPTIDMA is not set 922# CONFIG_PATA_OPTIDMA is not set
923# CONFIG_PATA_PDC2027X is not set
886# CONFIG_PATA_PDC_OLD is not set 924# CONFIG_PATA_PDC_OLD is not set
887# CONFIG_PATA_RADISYS is not set 925# CONFIG_PATA_RADISYS is not set
888# CONFIG_PATA_RDC is not set 926# CONFIG_PATA_RDC is not set
889# CONFIG_PATA_RZ1000 is not set 927# CONFIG_PATA_RZ1000 is not set
890# CONFIG_PATA_SC1200 is not set 928# CONFIG_PATA_SC1200 is not set
891# CONFIG_PATA_SERVERWORKS is not set 929# CONFIG_PATA_SERVERWORKS is not set
892# CONFIG_PATA_PDC2027X is not set
893# CONFIG_PATA_SIL680 is not set 930# CONFIG_PATA_SIL680 is not set
894# CONFIG_PATA_SIS is not set 931# CONFIG_PATA_SIS is not set
932# CONFIG_PATA_TOSHIBA is not set
895# CONFIG_PATA_VIA is not set 933# CONFIG_PATA_VIA is not set
896# CONFIG_PATA_WINBOND is not set 934# CONFIG_PATA_WINBOND is not set
897# CONFIG_PATA_PLATFORM is not set 935# CONFIG_PATA_PLATFORM is not set
@@ -908,7 +946,7 @@ CONFIG_SATA_SIL=y
908# 946#
909 947
910# 948#
911# See the help texts for more information. 949# The newer stack is recommended.
912# 950#
913# CONFIG_FIREWIRE is not set 951# CONFIG_FIREWIRE is not set
914# CONFIG_IEEE1394 is not set 952# CONFIG_IEEE1394 is not set
@@ -995,8 +1033,11 @@ CONFIG_GIANFAR=y
995# CONFIG_NETDEV_10000 is not set 1033# CONFIG_NETDEV_10000 is not set
996# CONFIG_TR is not set 1034# CONFIG_TR is not set
997CONFIG_WLAN=y 1035CONFIG_WLAN=y
998# CONFIG_WLAN_PRE80211 is not set 1036# CONFIG_AIRO is not set
999# CONFIG_WLAN_80211 is not set 1037# CONFIG_ATMEL is not set
1038# CONFIG_PRISM54 is not set
1039# CONFIG_USB_ZD1201 is not set
1040# CONFIG_HOSTAP is not set
1000 1041
1001# 1042#
1002# Enable WiMAX (Networking options) to see the WiMAX drivers 1043# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1050,6 +1091,7 @@ CONFIG_NETCONSOLE=y
1050CONFIG_NETPOLL=y 1091CONFIG_NETPOLL=y
1051CONFIG_NETPOLL_TRAP=y 1092CONFIG_NETPOLL_TRAP=y
1052CONFIG_NET_POLL_CONTROLLER=y 1093CONFIG_NET_POLL_CONTROLLER=y
1094# CONFIG_VMXNET3 is not set
1053# CONFIG_ISDN is not set 1095# CONFIG_ISDN is not set
1054# CONFIG_PHONE is not set 1096# CONFIG_PHONE is not set
1055 1097
@@ -1059,6 +1101,7 @@ CONFIG_NET_POLL_CONTROLLER=y
1059CONFIG_INPUT=y 1101CONFIG_INPUT=y
1060CONFIG_INPUT_FF_MEMLESS=m 1102CONFIG_INPUT_FF_MEMLESS=m
1061# CONFIG_INPUT_POLLDEV is not set 1103# CONFIG_INPUT_POLLDEV is not set
1104# CONFIG_INPUT_SPARSEKMAP is not set
1062 1105
1063# 1106#
1064# Userland interfaces 1107# Userland interfaces
@@ -1117,6 +1160,7 @@ CONFIG_SERIAL_CORE=y
1117CONFIG_SERIAL_CORE_CONSOLE=y 1160CONFIG_SERIAL_CORE_CONSOLE=y
1118# CONFIG_SERIAL_JSM is not set 1161# CONFIG_SERIAL_JSM is not set
1119# CONFIG_SERIAL_OF_PLATFORM is not set 1162# CONFIG_SERIAL_OF_PLATFORM is not set
1163# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
1120CONFIG_UNIX98_PTYS=y 1164CONFIG_UNIX98_PTYS=y
1121# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1165# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
1122# CONFIG_LEGACY_PTYS is not set 1166# CONFIG_LEGACY_PTYS is not set
@@ -1174,11 +1218,6 @@ CONFIG_I2C_MPC=y
1174# CONFIG_I2C_TINY_USB is not set 1218# CONFIG_I2C_TINY_USB is not set
1175 1219
1176# 1220#
1177# Graphics adapter I2C/DDC channel drivers
1178#
1179# CONFIG_I2C_VOODOO3 is not set
1180
1181#
1182# Other I2C/SMBus bus drivers 1221# Other I2C/SMBus bus drivers
1183# 1222#
1184# CONFIG_I2C_PCA_PLATFORM is not set 1223# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1187,7 +1226,6 @@ CONFIG_I2C_MPC=y
1187# 1226#
1188# Miscellaneous I2C Chip support 1227# Miscellaneous I2C Chip support
1189# 1228#
1190CONFIG_DS1682=y
1191# CONFIG_SENSORS_TSL2550 is not set 1229# CONFIG_SENSORS_TSL2550 is not set
1192# CONFIG_I2C_DEBUG_CORE is not set 1230# CONFIG_I2C_DEBUG_CORE is not set
1193# CONFIG_I2C_DEBUG_ALGO is not set 1231# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1220,6 +1258,7 @@ CONFIG_GPIOLIB=y
1220# 1258#
1221# PCI GPIO expanders: 1259# PCI GPIO expanders:
1222# 1260#
1261# CONFIG_GPIO_CS5535 is not set
1223# CONFIG_GPIO_BT8XX is not set 1262# CONFIG_GPIO_BT8XX is not set
1224# CONFIG_GPIO_LANGWELL is not set 1263# CONFIG_GPIO_LANGWELL is not set
1225 1264
@@ -1262,6 +1301,7 @@ CONFIG_HWMON=y
1262# CONFIG_SENSORS_GL520SM is not set 1301# CONFIG_SENSORS_GL520SM is not set
1263# CONFIG_SENSORS_IT87 is not set 1302# CONFIG_SENSORS_IT87 is not set
1264# CONFIG_SENSORS_LM63 is not set 1303# CONFIG_SENSORS_LM63 is not set
1304# CONFIG_SENSORS_LM73 is not set
1265# CONFIG_SENSORS_LM75 is not set 1305# CONFIG_SENSORS_LM75 is not set
1266# CONFIG_SENSORS_LM77 is not set 1306# CONFIG_SENSORS_LM77 is not set
1267# CONFIG_SENSORS_LM78 is not set 1307# CONFIG_SENSORS_LM78 is not set
@@ -1301,6 +1341,7 @@ CONFIG_SENSORS_LM92=y
1301# CONFIG_SENSORS_W83L786NG is not set 1341# CONFIG_SENSORS_W83L786NG is not set
1302# CONFIG_SENSORS_W83627HF is not set 1342# CONFIG_SENSORS_W83627HF is not set
1303# CONFIG_SENSORS_W83627EHF is not set 1343# CONFIG_SENSORS_W83627EHF is not set
1344# CONFIG_SENSORS_LIS3_I2C is not set
1304# CONFIG_THERMAL is not set 1345# CONFIG_THERMAL is not set
1305CONFIG_WATCHDOG=y 1346CONFIG_WATCHDOG=y
1306# CONFIG_WATCHDOG_NOWAYOUT is not set 1347# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1340,11 +1381,13 @@ CONFIG_SSB_POSSIBLE=y
1340# CONFIG_TWL4030_CORE is not set 1381# CONFIG_TWL4030_CORE is not set
1341# CONFIG_MFD_TMIO is not set 1382# CONFIG_MFD_TMIO is not set
1342# CONFIG_PMIC_DA903X is not set 1383# CONFIG_PMIC_DA903X is not set
1384# CONFIG_PMIC_ADP5520 is not set
1343# CONFIG_MFD_WM8400 is not set 1385# CONFIG_MFD_WM8400 is not set
1344# CONFIG_MFD_WM831X is not set 1386# CONFIG_MFD_WM831X is not set
1345# CONFIG_MFD_WM8350_I2C is not set 1387# CONFIG_MFD_WM8350_I2C is not set
1346# CONFIG_MFD_PCF50633 is not set 1388# CONFIG_MFD_PCF50633 is not set
1347# CONFIG_AB3100_CORE is not set 1389# CONFIG_AB3100_CORE is not set
1390# CONFIG_MFD_88PM8607 is not set
1348# CONFIG_REGULATOR is not set 1391# CONFIG_REGULATOR is not set
1349# CONFIG_MEDIA_SUPPORT is not set 1392# CONFIG_MEDIA_SUPPORT is not set
1350 1393
@@ -1443,6 +1486,7 @@ CONFIG_USB=y
1443CONFIG_USB_EHCI_HCD=y 1486CONFIG_USB_EHCI_HCD=y
1444# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1487# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1445# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1488# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1489# CONFIG_XPS_USB_HCD_XILINX is not set
1446# CONFIG_USB_EHCI_FSL is not set 1490# CONFIG_USB_EHCI_FSL is not set
1447# CONFIG_USB_EHCI_HCD_PPC_OF is not set 1491# CONFIG_USB_EHCI_HCD_PPC_OF is not set
1448# CONFIG_USB_OXU210HP_HCD is not set 1492# CONFIG_USB_OXU210HP_HCD is not set
@@ -1570,6 +1614,7 @@ CONFIG_RTC_INTF_DEV=y
1570# CONFIG_RTC_DRV_PCF8563 is not set 1614# CONFIG_RTC_DRV_PCF8563 is not set
1571# CONFIG_RTC_DRV_PCF8583 is not set 1615# CONFIG_RTC_DRV_PCF8583 is not set
1572# CONFIG_RTC_DRV_M41T80 is not set 1616# CONFIG_RTC_DRV_M41T80 is not set
1617# CONFIG_RTC_DRV_BQ32K is not set
1573# CONFIG_RTC_DRV_S35390A is not set 1618# CONFIG_RTC_DRV_S35390A is not set
1574# CONFIG_RTC_DRV_FM3130 is not set 1619# CONFIG_RTC_DRV_FM3130 is not set
1575CONFIG_RTC_DRV_RX8581=y 1620CONFIG_RTC_DRV_RX8581=y
@@ -1591,7 +1636,9 @@ CONFIG_RTC_DRV_RX8581=y
1591# CONFIG_RTC_DRV_M48T86 is not set 1636# CONFIG_RTC_DRV_M48T86 is not set
1592# CONFIG_RTC_DRV_M48T35 is not set 1637# CONFIG_RTC_DRV_M48T35 is not set
1593# CONFIG_RTC_DRV_M48T59 is not set 1638# CONFIG_RTC_DRV_M48T59 is not set
1639# CONFIG_RTC_DRV_MSM6242 is not set
1594# CONFIG_RTC_DRV_BQ4802 is not set 1640# CONFIG_RTC_DRV_BQ4802 is not set
1641# CONFIG_RTC_DRV_RP5C01 is not set
1595# CONFIG_RTC_DRV_V3020 is not set 1642# CONFIG_RTC_DRV_V3020 is not set
1596 1643
1597# 1644#
@@ -1891,9 +1938,12 @@ CONFIG_SECURITY=y
1891CONFIG_SECURITY_NETWORK=y 1938CONFIG_SECURITY_NETWORK=y
1892# CONFIG_SECURITY_NETWORK_XFRM is not set 1939# CONFIG_SECURITY_NETWORK_XFRM is not set
1893# CONFIG_SECURITY_PATH is not set 1940# CONFIG_SECURITY_PATH is not set
1894# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1895# CONFIG_SECURITY_ROOTPLUG is not set
1896# CONFIG_SECURITY_TOMOYO is not set 1941# CONFIG_SECURITY_TOMOYO is not set
1942# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1943# CONFIG_DEFAULT_SECURITY_SMACK is not set
1944# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1945CONFIG_DEFAULT_SECURITY_DAC=y
1946CONFIG_DEFAULT_SECURITY=""
1897CONFIG_CRYPTO=y 1947CONFIG_CRYPTO=y
1898 1948
1899# 1949#
diff --git a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
index de4d52504fe4..aab3baebab8c 100644
--- a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
+++ b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:45 2009 4# Wed Jan 6 09:24:39 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,8 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
64CONFIG_ARCH_SUSPEND_POSSIBLE=y
62# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
63# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
64CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -86,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
86# 89#
87CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
88# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
89# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
90CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
91# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -176,14 +180,41 @@ CONFIG_LBDAF=y
176# IO Schedulers 180# IO Schedulers
177# 181#
178CONFIG_IOSCHED_NOOP=y 182CONFIG_IOSCHED_NOOP=y
179# CONFIG_IOSCHED_AS is not set
180CONFIG_IOSCHED_DEADLINE=y 183CONFIG_IOSCHED_DEADLINE=y
181# CONFIG_IOSCHED_CFQ is not set 184# CONFIG_IOSCHED_CFQ is not set
182# CONFIG_DEFAULT_AS is not set
183CONFIG_DEFAULT_DEADLINE=y 185CONFIG_DEFAULT_DEADLINE=y
184# CONFIG_DEFAULT_CFQ is not set 186# CONFIG_DEFAULT_CFQ is not set
185# CONFIG_DEFAULT_NOOP is not set 187# CONFIG_DEFAULT_NOOP is not set
186CONFIG_DEFAULT_IOSCHED="deadline" 188CONFIG_DEFAULT_IOSCHED="deadline"
189# CONFIG_INLINE_SPIN_TRYLOCK is not set
190# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
191# CONFIG_INLINE_SPIN_LOCK is not set
192# CONFIG_INLINE_SPIN_LOCK_BH is not set
193# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
194# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
195CONFIG_INLINE_SPIN_UNLOCK=y
196# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
197CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
198# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
199# CONFIG_INLINE_READ_TRYLOCK is not set
200# CONFIG_INLINE_READ_LOCK is not set
201# CONFIG_INLINE_READ_LOCK_BH is not set
202# CONFIG_INLINE_READ_LOCK_IRQ is not set
203# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
204CONFIG_INLINE_READ_UNLOCK=y
205# CONFIG_INLINE_READ_UNLOCK_BH is not set
206CONFIG_INLINE_READ_UNLOCK_IRQ=y
207# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
208# CONFIG_INLINE_WRITE_TRYLOCK is not set
209# CONFIG_INLINE_WRITE_LOCK is not set
210# CONFIG_INLINE_WRITE_LOCK_BH is not set
211# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
212# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
213CONFIG_INLINE_WRITE_UNLOCK=y
214# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
215CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
216# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
217# CONFIG_MUTEX_SPIN_ON_OWNER is not set
187# CONFIG_FREEZER is not set 218# CONFIG_FREEZER is not set
188 219
189# 220#
@@ -254,6 +285,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
254CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 285CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
255# CONFIG_KEXEC is not set 286# CONFIG_KEXEC is not set
256# CONFIG_CRASH_DUMP is not set 287# CONFIG_CRASH_DUMP is not set
288CONFIG_SPARSE_IRQ=y
257CONFIG_MAX_ACTIVE_REGIONS=32 289CONFIG_MAX_ACTIVE_REGIONS=32
258CONFIG_ARCH_FLATMEM_ENABLE=y 290CONFIG_ARCH_FLATMEM_ENABLE=y
259CONFIG_ARCH_POPULATES_NODE_MAP=y 291CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -270,8 +302,6 @@ CONFIG_MIGRATION=y
270CONFIG_ZONE_DMA_FLAG=1 302CONFIG_ZONE_DMA_FLAG=1
271CONFIG_BOUNCE=y 303CONFIG_BOUNCE=y
272CONFIG_VIRT_TO_BUS=y 304CONFIG_VIRT_TO_BUS=y
273CONFIG_HAVE_MLOCK=y
274CONFIG_HAVE_MLOCKED_PAGE_BIT=y
275# CONFIG_KSM is not set 305# CONFIG_KSM is not set
276CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 306CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
277CONFIG_PPC_4K_PAGES=y 307CONFIG_PPC_4K_PAGES=y
@@ -382,6 +412,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y
382CONFIG_INET6_XFRM_MODE_BEET=y 412CONFIG_INET6_XFRM_MODE_BEET=y
383# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 413# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
384CONFIG_IPV6_SIT=y 414CONFIG_IPV6_SIT=y
415# CONFIG_IPV6_SIT_6RD is not set
385CONFIG_IPV6_NDISC_NODETYPE=y 416CONFIG_IPV6_NDISC_NODETYPE=y
386# CONFIG_IPV6_TUNNEL is not set 417# CONFIG_IPV6_TUNNEL is not set
387# CONFIG_IPV6_MULTIPLE_TABLES is not set 418# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -420,9 +451,6 @@ CONFIG_IPV6_NDISC_NODETYPE=y
420# CONFIG_AF_RXRPC is not set 451# CONFIG_AF_RXRPC is not set
421CONFIG_WIRELESS=y 452CONFIG_WIRELESS=y
422# CONFIG_CFG80211 is not set 453# CONFIG_CFG80211 is not set
423CONFIG_CFG80211_DEFAULT_PS_VALUE=0
424CONFIG_WIRELESS_OLD_REGULATORY=y
425# CONFIG_WIRELESS_EXT is not set
426# CONFIG_LIB80211 is not set 454# CONFIG_LIB80211 is not set
427 455
428# 456#
@@ -555,6 +583,10 @@ CONFIG_BLK_DEV=y
555# CONFIG_BLK_DEV_COW_COMMON is not set 583# CONFIG_BLK_DEV_COW_COMMON is not set
556CONFIG_BLK_DEV_LOOP=y 584CONFIG_BLK_DEV_LOOP=y
557# CONFIG_BLK_DEV_CRYPTOLOOP is not set 585# CONFIG_BLK_DEV_CRYPTOLOOP is not set
586
587#
588# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
589#
558# CONFIG_BLK_DEV_NBD is not set 590# CONFIG_BLK_DEV_NBD is not set
559# CONFIG_BLK_DEV_SX8 is not set 591# CONFIG_BLK_DEV_SX8 is not set
560CONFIG_BLK_DEV_RAM=y 592CONFIG_BLK_DEV_RAM=y
@@ -565,6 +597,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
565# CONFIG_ATA_OVER_ETH is not set 597# CONFIG_ATA_OVER_ETH is not set
566# CONFIG_BLK_DEV_HD is not set 598# CONFIG_BLK_DEV_HD is not set
567CONFIG_MISC_DEVICES=y 599CONFIG_MISC_DEVICES=y
600# CONFIG_AD525X_DPOT is not set
568# CONFIG_PHANTOM is not set 601# CONFIG_PHANTOM is not set
569# CONFIG_SGI_IOC4 is not set 602# CONFIG_SGI_IOC4 is not set
570# CONFIG_TIFM_CORE is not set 603# CONFIG_TIFM_CORE is not set
@@ -572,6 +605,7 @@ CONFIG_MISC_DEVICES=y
572# CONFIG_ENCLOSURE_SERVICES is not set 605# CONFIG_ENCLOSURE_SERVICES is not set
573# CONFIG_HP_ILO is not set 606# CONFIG_HP_ILO is not set
574# CONFIG_ISL29003 is not set 607# CONFIG_ISL29003 is not set
608# CONFIG_DS1682 is not set
575# CONFIG_C2PORT is not set 609# CONFIG_C2PORT is not set
576 610
577# 611#
@@ -671,7 +705,9 @@ CONFIG_SCSI_LOWLEVEL=y
671# CONFIG_SCSI_BNX2_ISCSI is not set 705# CONFIG_SCSI_BNX2_ISCSI is not set
672# CONFIG_BE2ISCSI is not set 706# CONFIG_BE2ISCSI is not set
673# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 707# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
708# CONFIG_SCSI_HPSA is not set
674# CONFIG_SCSI_3W_9XXX is not set 709# CONFIG_SCSI_3W_9XXX is not set
710# CONFIG_SCSI_3W_SAS is not set
675# CONFIG_SCSI_ACARD is not set 711# CONFIG_SCSI_ACARD is not set
676# CONFIG_SCSI_AACRAID is not set 712# CONFIG_SCSI_AACRAID is not set
677# CONFIG_SCSI_AIC7XXX is not set 713# CONFIG_SCSI_AIC7XXX is not set
@@ -710,6 +746,7 @@ CONFIG_SCSI_LOWLEVEL=y
710# CONFIG_SCSI_NSP32 is not set 746# CONFIG_SCSI_NSP32 is not set
711# CONFIG_SCSI_DEBUG is not set 747# CONFIG_SCSI_DEBUG is not set
712# CONFIG_SCSI_PMCRAID is not set 748# CONFIG_SCSI_PMCRAID is not set
749# CONFIG_SCSI_PM8001 is not set
713# CONFIG_SCSI_SRP is not set 750# CONFIG_SCSI_SRP is not set
714# CONFIG_SCSI_BFA_FC is not set 751# CONFIG_SCSI_BFA_FC is not set
715# CONFIG_SCSI_DH is not set 752# CONFIG_SCSI_DH is not set
@@ -765,15 +802,16 @@ CONFIG_PATA_ALI=y
765# CONFIG_PATA_NS87415 is not set 802# CONFIG_PATA_NS87415 is not set
766# CONFIG_PATA_OPTI is not set 803# CONFIG_PATA_OPTI is not set
767# CONFIG_PATA_OPTIDMA is not set 804# CONFIG_PATA_OPTIDMA is not set
805# CONFIG_PATA_PDC2027X is not set
768# CONFIG_PATA_PDC_OLD is not set 806# CONFIG_PATA_PDC_OLD is not set
769# CONFIG_PATA_RADISYS is not set 807# CONFIG_PATA_RADISYS is not set
770# CONFIG_PATA_RDC is not set 808# CONFIG_PATA_RDC is not set
771# CONFIG_PATA_RZ1000 is not set 809# CONFIG_PATA_RZ1000 is not set
772# CONFIG_PATA_SC1200 is not set 810# CONFIG_PATA_SC1200 is not set
773# CONFIG_PATA_SERVERWORKS is not set 811# CONFIG_PATA_SERVERWORKS is not set
774# CONFIG_PATA_PDC2027X is not set
775# CONFIG_PATA_SIL680 is not set 812# CONFIG_PATA_SIL680 is not set
776# CONFIG_PATA_SIS is not set 813# CONFIG_PATA_SIS is not set
814# CONFIG_PATA_TOSHIBA is not set
777# CONFIG_PATA_VIA is not set 815# CONFIG_PATA_VIA is not set
778# CONFIG_PATA_WINBOND is not set 816# CONFIG_PATA_WINBOND is not set
779# CONFIG_PATA_PLATFORM is not set 817# CONFIG_PATA_PLATFORM is not set
@@ -790,7 +828,7 @@ CONFIG_PATA_ALI=y
790# 828#
791 829
792# 830#
793# See the help texts for more information. 831# The newer stack is recommended.
794# 832#
795# CONFIG_FIREWIRE is not set 833# CONFIG_FIREWIRE is not set
796# CONFIG_IEEE1394 is not set 834# CONFIG_IEEE1394 is not set
@@ -838,8 +876,10 @@ CONFIG_ULI526X=y
838# CONFIG_NETDEV_10000 is not set 876# CONFIG_NETDEV_10000 is not set
839# CONFIG_TR is not set 877# CONFIG_TR is not set
840CONFIG_WLAN=y 878CONFIG_WLAN=y
841# CONFIG_WLAN_PRE80211 is not set 879# CONFIG_AIRO is not set
842# CONFIG_WLAN_80211 is not set 880# CONFIG_ATMEL is not set
881# CONFIG_PRISM54 is not set
882# CONFIG_HOSTAP is not set
843 883
844# 884#
845# Enable WiMAX (Networking options) to see the WiMAX drivers 885# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -853,6 +893,7 @@ CONFIG_WLAN=y
853# CONFIG_NETCONSOLE is not set 893# CONFIG_NETCONSOLE is not set
854# CONFIG_NETPOLL is not set 894# CONFIG_NETPOLL is not set
855# CONFIG_NET_POLL_CONTROLLER is not set 895# CONFIG_NET_POLL_CONTROLLER is not set
896# CONFIG_VMXNET3 is not set
856# CONFIG_ISDN is not set 897# CONFIG_ISDN is not set
857# CONFIG_PHONE is not set 898# CONFIG_PHONE is not set
858 899
@@ -862,6 +903,7 @@ CONFIG_WLAN=y
862CONFIG_INPUT=y 903CONFIG_INPUT=y
863# CONFIG_INPUT_FF_MEMLESS is not set 904# CONFIG_INPUT_FF_MEMLESS is not set
864# CONFIG_INPUT_POLLDEV is not set 905# CONFIG_INPUT_POLLDEV is not set
906# CONFIG_INPUT_SPARSEKMAP is not set
865 907
866# 908#
867# Userland interfaces 909# Userland interfaces
@@ -891,6 +933,7 @@ CONFIG_SERIO_SERPORT=y
891CONFIG_SERIO_LIBPS2=y 933CONFIG_SERIO_LIBPS2=y
892# CONFIG_SERIO_RAW is not set 934# CONFIG_SERIO_RAW is not set
893# CONFIG_SERIO_XILINX_XPS_PS2 is not set 935# CONFIG_SERIO_XILINX_XPS_PS2 is not set
936# CONFIG_SERIO_ALTERA_PS2 is not set
894# CONFIG_GAMEPORT is not set 937# CONFIG_GAMEPORT is not set
895 938
896# 939#
@@ -927,6 +970,7 @@ CONFIG_SERIAL_CORE=y
927CONFIG_SERIAL_CORE_CONSOLE=y 970CONFIG_SERIAL_CORE_CONSOLE=y
928# CONFIG_SERIAL_JSM is not set 971# CONFIG_SERIAL_JSM is not set
929# CONFIG_SERIAL_OF_PLATFORM is not set 972# CONFIG_SERIAL_OF_PLATFORM is not set
973# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
930CONFIG_UNIX98_PTYS=y 974CONFIG_UNIX98_PTYS=y
931# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 975# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
932# CONFIG_LEGACY_PTYS is not set 976# CONFIG_LEGACY_PTYS is not set
@@ -981,11 +1025,6 @@ CONFIG_I2C_MPC=y
981# CONFIG_I2C_TAOS_EVM is not set 1025# CONFIG_I2C_TAOS_EVM is not set
982 1026
983# 1027#
984# Graphics adapter I2C/DDC channel drivers
985#
986# CONFIG_I2C_VOODOO3 is not set
987
988#
989# Other I2C/SMBus bus drivers 1028# Other I2C/SMBus bus drivers
990# 1029#
991# CONFIG_I2C_PCA_PLATFORM is not set 1030# CONFIG_I2C_PCA_PLATFORM is not set
@@ -994,7 +1033,6 @@ CONFIG_I2C_MPC=y
994# 1033#
995# Miscellaneous I2C Chip support 1034# Miscellaneous I2C Chip support
996# 1035#
997# CONFIG_DS1682 is not set
998# CONFIG_SENSORS_TSL2550 is not set 1036# CONFIG_SENSORS_TSL2550 is not set
999# CONFIG_I2C_DEBUG_CORE is not set 1037# CONFIG_I2C_DEBUG_CORE is not set
1000# CONFIG_I2C_DEBUG_ALGO is not set 1038# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1029,11 +1067,13 @@ CONFIG_SSB_POSSIBLE=y
1029# CONFIG_TWL4030_CORE is not set 1067# CONFIG_TWL4030_CORE is not set
1030# CONFIG_MFD_TMIO is not set 1068# CONFIG_MFD_TMIO is not set
1031# CONFIG_PMIC_DA903X is not set 1069# CONFIG_PMIC_DA903X is not set
1070# CONFIG_PMIC_ADP5520 is not set
1032# CONFIG_MFD_WM8400 is not set 1071# CONFIG_MFD_WM8400 is not set
1033# CONFIG_MFD_WM831X is not set 1072# CONFIG_MFD_WM831X is not set
1034# CONFIG_MFD_WM8350_I2C is not set 1073# CONFIG_MFD_WM8350_I2C is not set
1035# CONFIG_MFD_PCF50633 is not set 1074# CONFIG_MFD_PCF50633 is not set
1036# CONFIG_AB3100_CORE is not set 1075# CONFIG_AB3100_CORE is not set
1076# CONFIG_MFD_88PM8607 is not set
1037# CONFIG_REGULATOR is not set 1077# CONFIG_REGULATOR is not set
1038# CONFIG_MEDIA_SUPPORT is not set 1078# CONFIG_MEDIA_SUPPORT is not set
1039 1079
@@ -1163,6 +1203,7 @@ CONFIG_SND_PCI=y
1163# CONFIG_SND_CS4281 is not set 1203# CONFIG_SND_CS4281 is not set
1164# CONFIG_SND_CS46XX is not set 1204# CONFIG_SND_CS46XX is not set
1165# CONFIG_SND_CS5530 is not set 1205# CONFIG_SND_CS5530 is not set
1206# CONFIG_SND_CS5535AUDIO is not set
1166# CONFIG_SND_CTXFI is not set 1207# CONFIG_SND_CTXFI is not set
1167# CONFIG_SND_DARLA20 is not set 1208# CONFIG_SND_DARLA20 is not set
1168# CONFIG_SND_GINA20 is not set 1209# CONFIG_SND_GINA20 is not set
@@ -1282,6 +1323,7 @@ CONFIG_RTC_INTF_DEV=y
1282# CONFIG_RTC_DRV_PCF8563 is not set 1323# CONFIG_RTC_DRV_PCF8563 is not set
1283# CONFIG_RTC_DRV_PCF8583 is not set 1324# CONFIG_RTC_DRV_PCF8583 is not set
1284# CONFIG_RTC_DRV_M41T80 is not set 1325# CONFIG_RTC_DRV_M41T80 is not set
1326# CONFIG_RTC_DRV_BQ32K is not set
1285# CONFIG_RTC_DRV_S35390A is not set 1327# CONFIG_RTC_DRV_S35390A is not set
1286# CONFIG_RTC_DRV_FM3130 is not set 1328# CONFIG_RTC_DRV_FM3130 is not set
1287# CONFIG_RTC_DRV_RX8581 is not set 1329# CONFIG_RTC_DRV_RX8581 is not set
@@ -1303,7 +1345,9 @@ CONFIG_RTC_DRV_CMOS=y
1303# CONFIG_RTC_DRV_M48T86 is not set 1345# CONFIG_RTC_DRV_M48T86 is not set
1304# CONFIG_RTC_DRV_M48T35 is not set 1346# CONFIG_RTC_DRV_M48T35 is not set
1305# CONFIG_RTC_DRV_M48T59 is not set 1347# CONFIG_RTC_DRV_M48T59 is not set
1348# CONFIG_RTC_DRV_MSM6242 is not set
1306# CONFIG_RTC_DRV_BQ4802 is not set 1349# CONFIG_RTC_DRV_BQ4802 is not set
1350# CONFIG_RTC_DRV_RP5C01 is not set
1307# CONFIG_RTC_DRV_V3020 is not set 1351# CONFIG_RTC_DRV_V3020 is not set
1308 1352
1309# 1353#
@@ -1606,7 +1650,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1606# CONFIG_KEYS is not set 1650# CONFIG_KEYS is not set
1607# CONFIG_SECURITY is not set 1651# CONFIG_SECURITY is not set
1608# CONFIG_SECURITYFS is not set 1652# CONFIG_SECURITYFS is not set
1609# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1653# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1654# CONFIG_DEFAULT_SECURITY_SMACK is not set
1655# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1656CONFIG_DEFAULT_SECURITY_DAC=y
1657CONFIG_DEFAULT_SECURITY=""
1610CONFIG_CRYPTO=y 1658CONFIG_CRYPTO=y
1611 1659
1612# 1660#
diff --git a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
index 754a79ba74a9..727a8c8d15b5 100644
--- a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
+++ b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:46 2009 4# Wed Jan 6 09:24:40 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -38,6 +38,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
40CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
41CONFIG_NR_IRQS=512
41CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
42CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
43CONFIG_TRACE_IRQFLAGS_SUPPORT=y 44CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -60,6 +61,8 @@ CONFIG_AUDIT_ARCH=y
60CONFIG_GENERIC_BUG=y 61CONFIG_GENERIC_BUG=y
61CONFIG_DTC=y 62CONFIG_DTC=y
62CONFIG_DEFAULT_UIMAGE=y 63CONFIG_DEFAULT_UIMAGE=y
64CONFIG_ARCH_HIBERNATION_POSSIBLE=y
65CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 66# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 67# CONFIG_PPC_DCR_MMIO is not set
65CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 68CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -90,6 +93,7 @@ CONFIG_AUDIT=y
90# 93#
91CONFIG_TREE_RCU=y 94CONFIG_TREE_RCU=y
92# CONFIG_TREE_PREEMPT_RCU is not set 95# CONFIG_TREE_PREEMPT_RCU is not set
96# CONFIG_TINY_RCU is not set
93# CONFIG_RCU_TRACE is not set 97# CONFIG_RCU_TRACE is not set
94CONFIG_RCU_FANOUT=32 98CONFIG_RCU_FANOUT=32
95# CONFIG_RCU_FANOUT_EXACT is not set 99# CONFIG_RCU_FANOUT_EXACT is not set
@@ -182,14 +186,41 @@ CONFIG_LBDAF=y
182# IO Schedulers 186# IO Schedulers
183# 187#
184CONFIG_IOSCHED_NOOP=y 188CONFIG_IOSCHED_NOOP=y
185CONFIG_IOSCHED_AS=y
186CONFIG_IOSCHED_DEADLINE=y 189CONFIG_IOSCHED_DEADLINE=y
187CONFIG_IOSCHED_CFQ=y 190CONFIG_IOSCHED_CFQ=y
188# CONFIG_DEFAULT_AS is not set
189# CONFIG_DEFAULT_DEADLINE is not set 191# CONFIG_DEFAULT_DEADLINE is not set
190CONFIG_DEFAULT_CFQ=y 192CONFIG_DEFAULT_CFQ=y
191# CONFIG_DEFAULT_NOOP is not set 193# CONFIG_DEFAULT_NOOP is not set
192CONFIG_DEFAULT_IOSCHED="cfq" 194CONFIG_DEFAULT_IOSCHED="cfq"
195# CONFIG_INLINE_SPIN_TRYLOCK is not set
196# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
197# CONFIG_INLINE_SPIN_LOCK is not set
198# CONFIG_INLINE_SPIN_LOCK_BH is not set
199# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
200# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
201CONFIG_INLINE_SPIN_UNLOCK=y
202# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
203CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
204# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
205# CONFIG_INLINE_READ_TRYLOCK is not set
206# CONFIG_INLINE_READ_LOCK is not set
207# CONFIG_INLINE_READ_LOCK_BH is not set
208# CONFIG_INLINE_READ_LOCK_IRQ is not set
209# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
210CONFIG_INLINE_READ_UNLOCK=y
211# CONFIG_INLINE_READ_UNLOCK_BH is not set
212CONFIG_INLINE_READ_UNLOCK_IRQ=y
213# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
214# CONFIG_INLINE_WRITE_TRYLOCK is not set
215# CONFIG_INLINE_WRITE_LOCK is not set
216# CONFIG_INLINE_WRITE_LOCK_BH is not set
217# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
218# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
219CONFIG_INLINE_WRITE_UNLOCK=y
220# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
221CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
222# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
223CONFIG_MUTEX_SPIN_ON_OWNER=y
193# CONFIG_FREEZER is not set 224# CONFIG_FREEZER is not set
194 225
195# 226#
@@ -260,6 +291,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 291# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 292# CONFIG_CRASH_DUMP is not set
262# CONFIG_IRQ_ALL_CPUS is not set 293# CONFIG_IRQ_ALL_CPUS is not set
294CONFIG_SPARSE_IRQ=y
263CONFIG_MAX_ACTIVE_REGIONS=32 295CONFIG_MAX_ACTIVE_REGIONS=32
264CONFIG_ARCH_FLATMEM_ENABLE=y 296CONFIG_ARCH_FLATMEM_ENABLE=y
265CONFIG_ARCH_POPULATES_NODE_MAP=y 297CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -276,8 +308,6 @@ CONFIG_MIGRATION=y
276CONFIG_ZONE_DMA_FLAG=1 308CONFIG_ZONE_DMA_FLAG=1
277CONFIG_BOUNCE=y 309CONFIG_BOUNCE=y
278CONFIG_VIRT_TO_BUS=y 310CONFIG_VIRT_TO_BUS=y
279CONFIG_HAVE_MLOCK=y
280CONFIG_HAVE_MLOCKED_PAGE_BIT=y
281# CONFIG_KSM is not set 311# CONFIG_KSM is not set
282CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 312CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
283CONFIG_PPC_4K_PAGES=y 313CONFIG_PPC_4K_PAGES=y
@@ -395,6 +425,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y
395CONFIG_INET6_XFRM_MODE_BEET=y 425CONFIG_INET6_XFRM_MODE_BEET=y
396# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 426# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
397CONFIG_IPV6_SIT=y 427CONFIG_IPV6_SIT=y
428# CONFIG_IPV6_SIT_6RD is not set
398CONFIG_IPV6_NDISC_NODETYPE=y 429CONFIG_IPV6_NDISC_NODETYPE=y
399# CONFIG_IPV6_TUNNEL is not set 430# CONFIG_IPV6_TUNNEL is not set
400# CONFIG_IPV6_MULTIPLE_TABLES is not set 431# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -439,9 +470,6 @@ CONFIG_SCTP_HMAC_MD5=y
439CONFIG_FIB_RULES=y 470CONFIG_FIB_RULES=y
440CONFIG_WIRELESS=y 471CONFIG_WIRELESS=y
441# CONFIG_CFG80211 is not set 472# CONFIG_CFG80211 is not set
442CONFIG_CFG80211_DEFAULT_PS_VALUE=0
443CONFIG_WIRELESS_OLD_REGULATORY=y
444# CONFIG_WIRELESS_EXT is not set
445# CONFIG_LIB80211 is not set 473# CONFIG_LIB80211 is not set
446 474
447# 475#
@@ -483,6 +511,10 @@ CONFIG_BLK_DEV=y
483# CONFIG_BLK_DEV_COW_COMMON is not set 511# CONFIG_BLK_DEV_COW_COMMON is not set
484CONFIG_BLK_DEV_LOOP=y 512CONFIG_BLK_DEV_LOOP=y
485# CONFIG_BLK_DEV_CRYPTOLOOP is not set 513# CONFIG_BLK_DEV_CRYPTOLOOP is not set
514
515#
516# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
517#
486CONFIG_BLK_DEV_NBD=y 518CONFIG_BLK_DEV_NBD=y
487# CONFIG_BLK_DEV_SX8 is not set 519# CONFIG_BLK_DEV_SX8 is not set
488# CONFIG_BLK_DEV_UB is not set 520# CONFIG_BLK_DEV_UB is not set
@@ -494,6 +526,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
494# CONFIG_ATA_OVER_ETH is not set 526# CONFIG_ATA_OVER_ETH is not set
495# CONFIG_BLK_DEV_HD is not set 527# CONFIG_BLK_DEV_HD is not set
496CONFIG_MISC_DEVICES=y 528CONFIG_MISC_DEVICES=y
529# CONFIG_AD525X_DPOT is not set
497# CONFIG_PHANTOM is not set 530# CONFIG_PHANTOM is not set
498# CONFIG_SGI_IOC4 is not set 531# CONFIG_SGI_IOC4 is not set
499# CONFIG_TIFM_CORE is not set 532# CONFIG_TIFM_CORE is not set
@@ -501,6 +534,7 @@ CONFIG_MISC_DEVICES=y
501# CONFIG_ENCLOSURE_SERVICES is not set 534# CONFIG_ENCLOSURE_SERVICES is not set
502# CONFIG_HP_ILO is not set 535# CONFIG_HP_ILO is not set
503# CONFIG_ISL29003 is not set 536# CONFIG_ISL29003 is not set
537# CONFIG_DS1682 is not set
504# CONFIG_C2PORT is not set 538# CONFIG_C2PORT is not set
505 539
506# 540#
@@ -554,7 +588,9 @@ CONFIG_SCSI_LOWLEVEL=y
554# CONFIG_SCSI_BNX2_ISCSI is not set 588# CONFIG_SCSI_BNX2_ISCSI is not set
555# CONFIG_BE2ISCSI is not set 589# CONFIG_BE2ISCSI is not set
556# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 590# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
591# CONFIG_SCSI_HPSA is not set
557# CONFIG_SCSI_3W_9XXX is not set 592# CONFIG_SCSI_3W_9XXX is not set
593# CONFIG_SCSI_3W_SAS is not set
558# CONFIG_SCSI_ACARD is not set 594# CONFIG_SCSI_ACARD is not set
559# CONFIG_SCSI_AACRAID is not set 595# CONFIG_SCSI_AACRAID is not set
560# CONFIG_SCSI_AIC7XXX is not set 596# CONFIG_SCSI_AIC7XXX is not set
@@ -593,6 +629,7 @@ CONFIG_SCSI_LOWLEVEL=y
593# CONFIG_SCSI_NSP32 is not set 629# CONFIG_SCSI_NSP32 is not set
594# CONFIG_SCSI_DEBUG is not set 630# CONFIG_SCSI_DEBUG is not set
595# CONFIG_SCSI_PMCRAID is not set 631# CONFIG_SCSI_PMCRAID is not set
632# CONFIG_SCSI_PM8001 is not set
596# CONFIG_SCSI_SRP is not set 633# CONFIG_SCSI_SRP is not set
597# CONFIG_SCSI_BFA_FC is not set 634# CONFIG_SCSI_BFA_FC is not set
598# CONFIG_SCSI_DH is not set 635# CONFIG_SCSI_DH is not set
@@ -648,15 +685,16 @@ CONFIG_PATA_ALI=y
648# CONFIG_PATA_NS87415 is not set 685# CONFIG_PATA_NS87415 is not set
649# CONFIG_PATA_OPTI is not set 686# CONFIG_PATA_OPTI is not set
650# CONFIG_PATA_OPTIDMA is not set 687# CONFIG_PATA_OPTIDMA is not set
688# CONFIG_PATA_PDC2027X is not set
651# CONFIG_PATA_PDC_OLD is not set 689# CONFIG_PATA_PDC_OLD is not set
652# CONFIG_PATA_RADISYS is not set 690# CONFIG_PATA_RADISYS is not set
653# CONFIG_PATA_RDC is not set 691# CONFIG_PATA_RDC is not set
654# CONFIG_PATA_RZ1000 is not set 692# CONFIG_PATA_RZ1000 is not set
655# CONFIG_PATA_SC1200 is not set 693# CONFIG_PATA_SC1200 is not set
656# CONFIG_PATA_SERVERWORKS is not set 694# CONFIG_PATA_SERVERWORKS is not set
657# CONFIG_PATA_PDC2027X is not set
658# CONFIG_PATA_SIL680 is not set 695# CONFIG_PATA_SIL680 is not set
659# CONFIG_PATA_SIS is not set 696# CONFIG_PATA_SIS is not set
697# CONFIG_PATA_TOSHIBA is not set
660# CONFIG_PATA_VIA is not set 698# CONFIG_PATA_VIA is not set
661# CONFIG_PATA_WINBOND is not set 699# CONFIG_PATA_WINBOND is not set
662# CONFIG_PATA_PLATFORM is not set 700# CONFIG_PATA_PLATFORM is not set
@@ -673,7 +711,7 @@ CONFIG_PATA_ALI=y
673# 711#
674 712
675# 713#
676# See the help texts for more information. 714# The newer stack is recommended.
677# 715#
678# CONFIG_FIREWIRE is not set 716# CONFIG_FIREWIRE is not set
679# CONFIG_IEEE1394 is not set 717# CONFIG_IEEE1394 is not set
@@ -778,8 +816,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
778# CONFIG_BE2NET is not set 816# CONFIG_BE2NET is not set
779# CONFIG_TR is not set 817# CONFIG_TR is not set
780CONFIG_WLAN=y 818CONFIG_WLAN=y
781# CONFIG_WLAN_PRE80211 is not set 819# CONFIG_AIRO is not set
782# CONFIG_WLAN_80211 is not set 820# CONFIG_ATMEL is not set
821# CONFIG_PRISM54 is not set
822# CONFIG_USB_ZD1201 is not set
823# CONFIG_HOSTAP is not set
783 824
784# 825#
785# Enable WiMAX (Networking options) to see the WiMAX drivers 826# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -802,6 +843,7 @@ CONFIG_WLAN=y
802# CONFIG_NETCONSOLE is not set 843# CONFIG_NETCONSOLE is not set
803# CONFIG_NETPOLL is not set 844# CONFIG_NETPOLL is not set
804# CONFIG_NET_POLL_CONTROLLER is not set 845# CONFIG_NET_POLL_CONTROLLER is not set
846# CONFIG_VMXNET3 is not set
805# CONFIG_ISDN is not set 847# CONFIG_ISDN is not set
806# CONFIG_PHONE is not set 848# CONFIG_PHONE is not set
807 849
@@ -811,6 +853,7 @@ CONFIG_WLAN=y
811CONFIG_INPUT=y 853CONFIG_INPUT=y
812CONFIG_INPUT_FF_MEMLESS=m 854CONFIG_INPUT_FF_MEMLESS=m
813# CONFIG_INPUT_POLLDEV is not set 855# CONFIG_INPUT_POLLDEV is not set
856# CONFIG_INPUT_SPARSEKMAP is not set
814 857
815# 858#
816# Userland interfaces 859# Userland interfaces
@@ -840,6 +883,7 @@ CONFIG_SERIO_SERPORT=y
840CONFIG_SERIO_LIBPS2=y 883CONFIG_SERIO_LIBPS2=y
841# CONFIG_SERIO_RAW is not set 884# CONFIG_SERIO_RAW is not set
842# CONFIG_SERIO_XILINX_XPS_PS2 is not set 885# CONFIG_SERIO_XILINX_XPS_PS2 is not set
886# CONFIG_SERIO_ALTERA_PS2 is not set
843# CONFIG_GAMEPORT is not set 887# CONFIG_GAMEPORT is not set
844 888
845# 889#
@@ -876,6 +920,7 @@ CONFIG_SERIAL_CORE=y
876CONFIG_SERIAL_CORE_CONSOLE=y 920CONFIG_SERIAL_CORE_CONSOLE=y
877# CONFIG_SERIAL_JSM is not set 921# CONFIG_SERIAL_JSM is not set
878# CONFIG_SERIAL_OF_PLATFORM is not set 922# CONFIG_SERIAL_OF_PLATFORM is not set
923# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
879CONFIG_UNIX98_PTYS=y 924CONFIG_UNIX98_PTYS=y
880# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 925# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
881CONFIG_LEGACY_PTYS=y 926CONFIG_LEGACY_PTYS=y
@@ -932,11 +977,6 @@ CONFIG_I2C_MPC=y
932# CONFIG_I2C_TINY_USB is not set 977# CONFIG_I2C_TINY_USB is not set
933 978
934# 979#
935# Graphics adapter I2C/DDC channel drivers
936#
937# CONFIG_I2C_VOODOO3 is not set
938
939#
940# Other I2C/SMBus bus drivers 980# Other I2C/SMBus bus drivers
941# 981#
942# CONFIG_I2C_PCA_PLATFORM is not set 982# CONFIG_I2C_PCA_PLATFORM is not set
@@ -945,7 +985,6 @@ CONFIG_I2C_MPC=y
945# 985#
946# Miscellaneous I2C Chip support 986# Miscellaneous I2C Chip support
947# 987#
948# CONFIG_DS1682 is not set
949# CONFIG_SENSORS_TSL2550 is not set 988# CONFIG_SENSORS_TSL2550 is not set
950# CONFIG_I2C_DEBUG_CORE is not set 989# CONFIG_I2C_DEBUG_CORE is not set
951# CONFIG_I2C_DEBUG_ALGO is not set 990# CONFIG_I2C_DEBUG_ALGO is not set
@@ -980,11 +1019,13 @@ CONFIG_SSB_POSSIBLE=y
980# CONFIG_TWL4030_CORE is not set 1019# CONFIG_TWL4030_CORE is not set
981# CONFIG_MFD_TMIO is not set 1020# CONFIG_MFD_TMIO is not set
982# CONFIG_PMIC_DA903X is not set 1021# CONFIG_PMIC_DA903X is not set
1022# CONFIG_PMIC_ADP5520 is not set
983# CONFIG_MFD_WM8400 is not set 1023# CONFIG_MFD_WM8400 is not set
984# CONFIG_MFD_WM831X is not set 1024# CONFIG_MFD_WM831X is not set
985# CONFIG_MFD_WM8350_I2C is not set 1025# CONFIG_MFD_WM8350_I2C is not set
986# CONFIG_MFD_PCF50633 is not set 1026# CONFIG_MFD_PCF50633 is not set
987# CONFIG_AB3100_CORE is not set 1027# CONFIG_AB3100_CORE is not set
1028# CONFIG_MFD_88PM8607 is not set
988# CONFIG_REGULATOR is not set 1029# CONFIG_REGULATOR is not set
989# CONFIG_MEDIA_SUPPORT is not set 1030# CONFIG_MEDIA_SUPPORT is not set
990 1031
@@ -1059,6 +1100,7 @@ CONFIG_SND_PCI=y
1059# CONFIG_SND_CS4281 is not set 1100# CONFIG_SND_CS4281 is not set
1060# CONFIG_SND_CS46XX is not set 1101# CONFIG_SND_CS46XX is not set
1061# CONFIG_SND_CS5530 is not set 1102# CONFIG_SND_CS5530 is not set
1103# CONFIG_SND_CS5535AUDIO is not set
1062# CONFIG_SND_CTXFI is not set 1104# CONFIG_SND_CTXFI is not set
1063# CONFIG_SND_DARLA20 is not set 1105# CONFIG_SND_DARLA20 is not set
1064# CONFIG_SND_GINA20 is not set 1106# CONFIG_SND_GINA20 is not set
@@ -1186,6 +1228,7 @@ CONFIG_USB_MON=y
1186CONFIG_USB_EHCI_HCD=y 1228CONFIG_USB_EHCI_HCD=y
1187# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1229# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1188# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1230# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1231# CONFIG_XPS_USB_HCD_XILINX is not set
1189# CONFIG_USB_EHCI_FSL is not set 1232# CONFIG_USB_EHCI_FSL is not set
1190CONFIG_USB_EHCI_HCD_PPC_OF=y 1233CONFIG_USB_EHCI_HCD_PPC_OF=y
1191# CONFIG_USB_OXU210HP_HCD is not set 1234# CONFIG_USB_OXU210HP_HCD is not set
@@ -1312,6 +1355,7 @@ CONFIG_RTC_INTF_DEV=y
1312# CONFIG_RTC_DRV_PCF8563 is not set 1355# CONFIG_RTC_DRV_PCF8563 is not set
1313# CONFIG_RTC_DRV_PCF8583 is not set 1356# CONFIG_RTC_DRV_PCF8583 is not set
1314# CONFIG_RTC_DRV_M41T80 is not set 1357# CONFIG_RTC_DRV_M41T80 is not set
1358# CONFIG_RTC_DRV_BQ32K is not set
1315# CONFIG_RTC_DRV_S35390A is not set 1359# CONFIG_RTC_DRV_S35390A is not set
1316# CONFIG_RTC_DRV_FM3130 is not set 1360# CONFIG_RTC_DRV_FM3130 is not set
1317# CONFIG_RTC_DRV_RX8581 is not set 1361# CONFIG_RTC_DRV_RX8581 is not set
@@ -1333,7 +1377,9 @@ CONFIG_RTC_DRV_CMOS=y
1333# CONFIG_RTC_DRV_M48T86 is not set 1377# CONFIG_RTC_DRV_M48T86 is not set
1334# CONFIG_RTC_DRV_M48T35 is not set 1378# CONFIG_RTC_DRV_M48T35 is not set
1335# CONFIG_RTC_DRV_M48T59 is not set 1379# CONFIG_RTC_DRV_M48T59 is not set
1380# CONFIG_RTC_DRV_MSM6242 is not set
1336# CONFIG_RTC_DRV_BQ4802 is not set 1381# CONFIG_RTC_DRV_BQ4802 is not set
1382# CONFIG_RTC_DRV_RP5C01 is not set
1337# CONFIG_RTC_DRV_V3020 is not set 1383# CONFIG_RTC_DRV_V3020 is not set
1338 1384
1339# 1385#
@@ -1648,7 +1694,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1648# CONFIG_KEYS is not set 1694# CONFIG_KEYS is not set
1649# CONFIG_SECURITY is not set 1695# CONFIG_SECURITY is not set
1650# CONFIG_SECURITYFS is not set 1696# CONFIG_SECURITYFS is not set
1651# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1697# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1698# CONFIG_DEFAULT_SECURITY_SMACK is not set
1699# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1700CONFIG_DEFAULT_SECURITY_DAC=y
1701CONFIG_DEFAULT_SECURITY=""
1652CONFIG_CRYPTO=y 1702CONFIG_CRYPTO=y
1653 1703
1654# 1704#
diff --git a/arch/powerpc/configs/86xx/sbc8641d_defconfig b/arch/powerpc/configs/86xx/sbc8641d_defconfig
index 89991f157ae8..4fb04dd2cde3 100644
--- a/arch/powerpc/configs/86xx/sbc8641d_defconfig
+++ b/arch/powerpc/configs/86xx/sbc8641d_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:45 2009 4# Wed Jan 6 09:24:38 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -38,6 +38,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
40CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
41CONFIG_NR_IRQS=512
41CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
42CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
43CONFIG_TRACE_IRQFLAGS_SUPPORT=y 44CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,8 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63CONFIG_DEFAULT_UIMAGE=y 64CONFIG_DEFAULT_UIMAGE=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
66CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 69CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -90,6 +93,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
90# 93#
91CONFIG_TREE_RCU=y 94CONFIG_TREE_RCU=y
92# CONFIG_TREE_PREEMPT_RCU is not set 95# CONFIG_TREE_PREEMPT_RCU is not set
96# CONFIG_TINY_RCU is not set
93# CONFIG_RCU_TRACE is not set 97# CONFIG_RCU_TRACE is not set
94CONFIG_RCU_FANOUT=32 98CONFIG_RCU_FANOUT=32
95# CONFIG_RCU_FANOUT_EXACT is not set 99# CONFIG_RCU_FANOUT_EXACT is not set
@@ -162,6 +166,7 @@ CONFIG_HAVE_DMA_API_DEBUG=y
162# 166#
163# CONFIG_GCOV_KERNEL is not set 167# CONFIG_GCOV_KERNEL is not set
164CONFIG_SLOW_WORK=y 168CONFIG_SLOW_WORK=y
169# CONFIG_SLOW_WORK_DEBUG is not set
165# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 170# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
166CONFIG_SLABINFO=y 171CONFIG_SLABINFO=y
167CONFIG_RT_MUTEXES=y 172CONFIG_RT_MUTEXES=y
@@ -182,14 +187,41 @@ CONFIG_LBDAF=y
182# IO Schedulers 187# IO Schedulers
183# 188#
184CONFIG_IOSCHED_NOOP=y 189CONFIG_IOSCHED_NOOP=y
185CONFIG_IOSCHED_AS=y
186CONFIG_IOSCHED_DEADLINE=y 190CONFIG_IOSCHED_DEADLINE=y
187CONFIG_IOSCHED_CFQ=y 191CONFIG_IOSCHED_CFQ=y
188# CONFIG_DEFAULT_AS is not set
189# CONFIG_DEFAULT_DEADLINE is not set 192# CONFIG_DEFAULT_DEADLINE is not set
190CONFIG_DEFAULT_CFQ=y 193CONFIG_DEFAULT_CFQ=y
191# CONFIG_DEFAULT_NOOP is not set 194# CONFIG_DEFAULT_NOOP is not set
192CONFIG_DEFAULT_IOSCHED="cfq" 195CONFIG_DEFAULT_IOSCHED="cfq"
196# CONFIG_INLINE_SPIN_TRYLOCK is not set
197# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
198# CONFIG_INLINE_SPIN_LOCK is not set
199# CONFIG_INLINE_SPIN_LOCK_BH is not set
200# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
201# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
202# CONFIG_INLINE_SPIN_UNLOCK is not set
203# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
204# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
205# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
206# CONFIG_INLINE_READ_TRYLOCK is not set
207# CONFIG_INLINE_READ_LOCK is not set
208# CONFIG_INLINE_READ_LOCK_BH is not set
209# CONFIG_INLINE_READ_LOCK_IRQ is not set
210# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
211# CONFIG_INLINE_READ_UNLOCK is not set
212# CONFIG_INLINE_READ_UNLOCK_BH is not set
213# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
214# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
215# CONFIG_INLINE_WRITE_TRYLOCK is not set
216# CONFIG_INLINE_WRITE_LOCK is not set
217# CONFIG_INLINE_WRITE_LOCK_BH is not set
218# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
219# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
220# CONFIG_INLINE_WRITE_UNLOCK is not set
221# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
222# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
223# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
224CONFIG_MUTEX_SPIN_ON_OWNER=y
193# CONFIG_FREEZER is not set 225# CONFIG_FREEZER is not set
194 226
195# 227#
@@ -260,6 +292,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 292# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 293# CONFIG_CRASH_DUMP is not set
262CONFIG_IRQ_ALL_CPUS=y 294CONFIG_IRQ_ALL_CPUS=y
295CONFIG_SPARSE_IRQ=y
263CONFIG_MAX_ACTIVE_REGIONS=32 296CONFIG_MAX_ACTIVE_REGIONS=32
264CONFIG_ARCH_FLATMEM_ENABLE=y 297CONFIG_ARCH_FLATMEM_ENABLE=y
265CONFIG_ARCH_POPULATES_NODE_MAP=y 298CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -276,8 +309,6 @@ CONFIG_MIGRATION=y
276CONFIG_ZONE_DMA_FLAG=1 309CONFIG_ZONE_DMA_FLAG=1
277CONFIG_BOUNCE=y 310CONFIG_BOUNCE=y
278CONFIG_VIRT_TO_BUS=y 311CONFIG_VIRT_TO_BUS=y
279CONFIG_HAVE_MLOCK=y
280CONFIG_HAVE_MLOCKED_PAGE_BIT=y
281# CONFIG_KSM is not set 312# CONFIG_KSM is not set
282CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 313CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
283CONFIG_PPC_4K_PAGES=y 314CONFIG_PPC_4K_PAGES=y
@@ -399,6 +430,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
399CONFIG_INET6_XFRM_MODE_BEET=m 430CONFIG_INET6_XFRM_MODE_BEET=m
400# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 431# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
401CONFIG_IPV6_SIT=m 432CONFIG_IPV6_SIT=m
433# CONFIG_IPV6_SIT_6RD is not set
402CONFIG_IPV6_NDISC_NODETYPE=y 434CONFIG_IPV6_NDISC_NODETYPE=y
403CONFIG_IPV6_TUNNEL=m 435CONFIG_IPV6_TUNNEL=m
404# CONFIG_IPV6_MULTIPLE_TABLES is not set 436# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -587,9 +619,6 @@ CONFIG_NET_PKTGEN=m
587CONFIG_FIB_RULES=y 619CONFIG_FIB_RULES=y
588CONFIG_WIRELESS=y 620CONFIG_WIRELESS=y
589# CONFIG_CFG80211 is not set 621# CONFIG_CFG80211 is not set
590CONFIG_CFG80211_DEFAULT_PS_VALUE=0
591CONFIG_WIRELESS_OLD_REGULATORY=y
592# CONFIG_WIRELESS_EXT is not set
593# CONFIG_LIB80211 is not set 622# CONFIG_LIB80211 is not set
594 623
595# 624#
@@ -717,6 +746,10 @@ CONFIG_BLK_DEV=y
717# CONFIG_BLK_DEV_COW_COMMON is not set 746# CONFIG_BLK_DEV_COW_COMMON is not set
718CONFIG_BLK_DEV_LOOP=m 747CONFIG_BLK_DEV_LOOP=m
719CONFIG_BLK_DEV_CRYPTOLOOP=m 748CONFIG_BLK_DEV_CRYPTOLOOP=m
749
750#
751# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
752#
720CONFIG_BLK_DEV_NBD=m 753CONFIG_BLK_DEV_NBD=m
721# CONFIG_BLK_DEV_SX8 is not set 754# CONFIG_BLK_DEV_SX8 is not set
722CONFIG_BLK_DEV_RAM=y 755CONFIG_BLK_DEV_RAM=y
@@ -727,6 +760,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
727# CONFIG_ATA_OVER_ETH is not set 760# CONFIG_ATA_OVER_ETH is not set
728# CONFIG_BLK_DEV_HD is not set 761# CONFIG_BLK_DEV_HD is not set
729CONFIG_MISC_DEVICES=y 762CONFIG_MISC_DEVICES=y
763# CONFIG_AD525X_DPOT is not set
730# CONFIG_PHANTOM is not set 764# CONFIG_PHANTOM is not set
731# CONFIG_SGI_IOC4 is not set 765# CONFIG_SGI_IOC4 is not set
732# CONFIG_TIFM_CORE is not set 766# CONFIG_TIFM_CORE is not set
@@ -734,6 +768,7 @@ CONFIG_MISC_DEVICES=y
734# CONFIG_ENCLOSURE_SERVICES is not set 768# CONFIG_ENCLOSURE_SERVICES is not set
735# CONFIG_HP_ILO is not set 769# CONFIG_HP_ILO is not set
736# CONFIG_ISL29003 is not set 770# CONFIG_ISL29003 is not set
771# CONFIG_DS1682 is not set
737# CONFIG_C2PORT is not set 772# CONFIG_C2PORT is not set
738 773
739# 774#
@@ -786,7 +821,7 @@ CONFIG_DM_ZERO=y
786# 821#
787 822
788# 823#
789# See the help texts for more information. 824# The newer stack is recommended.
790# 825#
791# CONFIG_FIREWIRE is not set 826# CONFIG_FIREWIRE is not set
792# CONFIG_IEEE1394 is not set 827# CONFIG_IEEE1394 is not set
@@ -873,8 +908,10 @@ CONFIG_GIANFAR=y
873# CONFIG_NETDEV_10000 is not set 908# CONFIG_NETDEV_10000 is not set
874# CONFIG_TR is not set 909# CONFIG_TR is not set
875CONFIG_WLAN=y 910CONFIG_WLAN=y
876# CONFIG_WLAN_PRE80211 is not set 911# CONFIG_AIRO is not set
877# CONFIG_WLAN_80211 is not set 912# CONFIG_ATMEL is not set
913# CONFIG_PRISM54 is not set
914# CONFIG_HOSTAP is not set
878 915
879# 916#
880# Enable WiMAX (Networking options) to see the WiMAX drivers 917# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -918,6 +955,7 @@ CONFIG_NETCONSOLE=y
918CONFIG_NETPOLL=y 955CONFIG_NETPOLL=y
919CONFIG_NETPOLL_TRAP=y 956CONFIG_NETPOLL_TRAP=y
920CONFIG_NET_POLL_CONTROLLER=y 957CONFIG_NET_POLL_CONTROLLER=y
958# CONFIG_VMXNET3 is not set
921# CONFIG_ISDN is not set 959# CONFIG_ISDN is not set
922# CONFIG_PHONE is not set 960# CONFIG_PHONE is not set
923 961
@@ -927,6 +965,7 @@ CONFIG_NET_POLL_CONTROLLER=y
927CONFIG_INPUT=y 965CONFIG_INPUT=y
928# CONFIG_INPUT_FF_MEMLESS is not set 966# CONFIG_INPUT_FF_MEMLESS is not set
929# CONFIG_INPUT_POLLDEV is not set 967# CONFIG_INPUT_POLLDEV is not set
968# CONFIG_INPUT_SPARSEKMAP is not set
930 969
931# 970#
932# Userland interfaces 971# Userland interfaces
@@ -985,6 +1024,7 @@ CONFIG_SERIAL_CORE=y
985CONFIG_SERIAL_CORE_CONSOLE=y 1024CONFIG_SERIAL_CORE_CONSOLE=y
986# CONFIG_SERIAL_JSM is not set 1025# CONFIG_SERIAL_JSM is not set
987# CONFIG_SERIAL_OF_PLATFORM is not set 1026# CONFIG_SERIAL_OF_PLATFORM is not set
1027# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
988CONFIG_UNIX98_PTYS=y 1028CONFIG_UNIX98_PTYS=y
989# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1029# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
990CONFIG_LEGACY_PTYS=y 1030CONFIG_LEGACY_PTYS=y
@@ -1042,11 +1082,6 @@ CONFIG_I2C_MPC=y
1042# CONFIG_I2C_TAOS_EVM is not set 1082# CONFIG_I2C_TAOS_EVM is not set
1043 1083
1044# 1084#
1045# Graphics adapter I2C/DDC channel drivers
1046#
1047# CONFIG_I2C_VOODOO3 is not set
1048
1049#
1050# Other I2C/SMBus bus drivers 1085# Other I2C/SMBus bus drivers
1051# 1086#
1052# CONFIG_I2C_PCA_PLATFORM is not set 1087# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1055,7 +1090,6 @@ CONFIG_I2C_MPC=y
1055# 1090#
1056# Miscellaneous I2C Chip support 1091# Miscellaneous I2C Chip support
1057# 1092#
1058# CONFIG_DS1682 is not set
1059# CONFIG_SENSORS_TSL2550 is not set 1093# CONFIG_SENSORS_TSL2550 is not set
1060# CONFIG_I2C_DEBUG_CORE is not set 1094# CONFIG_I2C_DEBUG_CORE is not set
1061# CONFIG_I2C_DEBUG_ALGO is not set 1095# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1101,6 +1135,7 @@ CONFIG_HWMON=y
1101# CONFIG_SENSORS_GL520SM is not set 1135# CONFIG_SENSORS_GL520SM is not set
1102# CONFIG_SENSORS_IT87 is not set 1136# CONFIG_SENSORS_IT87 is not set
1103# CONFIG_SENSORS_LM63 is not set 1137# CONFIG_SENSORS_LM63 is not set
1138# CONFIG_SENSORS_LM73 is not set
1104# CONFIG_SENSORS_LM75 is not set 1139# CONFIG_SENSORS_LM75 is not set
1105# CONFIG_SENSORS_LM77 is not set 1140# CONFIG_SENSORS_LM77 is not set
1106# CONFIG_SENSORS_LM78 is not set 1141# CONFIG_SENSORS_LM78 is not set
@@ -1139,6 +1174,7 @@ CONFIG_HWMON=y
1139# CONFIG_SENSORS_W83L786NG is not set 1174# CONFIG_SENSORS_W83L786NG is not set
1140# CONFIG_SENSORS_W83627HF is not set 1175# CONFIG_SENSORS_W83627HF is not set
1141# CONFIG_SENSORS_W83627EHF is not set 1176# CONFIG_SENSORS_W83627EHF is not set
1177# CONFIG_SENSORS_LIS3_I2C is not set
1142# CONFIG_THERMAL is not set 1178# CONFIG_THERMAL is not set
1143CONFIG_WATCHDOG=y 1179CONFIG_WATCHDOG=y
1144# CONFIG_WATCHDOG_NOWAYOUT is not set 1180# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1171,11 +1207,13 @@ CONFIG_SSB_POSSIBLE=y
1171# CONFIG_TWL4030_CORE is not set 1207# CONFIG_TWL4030_CORE is not set
1172# CONFIG_MFD_TMIO is not set 1208# CONFIG_MFD_TMIO is not set
1173# CONFIG_PMIC_DA903X is not set 1209# CONFIG_PMIC_DA903X is not set
1210# CONFIG_PMIC_ADP5520 is not set
1174# CONFIG_MFD_WM8400 is not set 1211# CONFIG_MFD_WM8400 is not set
1175# CONFIG_MFD_WM831X is not set 1212# CONFIG_MFD_WM831X is not set
1176# CONFIG_MFD_WM8350_I2C is not set 1213# CONFIG_MFD_WM8350_I2C is not set
1177# CONFIG_MFD_PCF50633 is not set 1214# CONFIG_MFD_PCF50633 is not set
1178# CONFIG_AB3100_CORE is not set 1215# CONFIG_AB3100_CORE is not set
1216# CONFIG_MFD_88PM8607 is not set
1179# CONFIG_REGULATOR is not set 1217# CONFIG_REGULATOR is not set
1180# CONFIG_MEDIA_SUPPORT is not set 1218# CONFIG_MEDIA_SUPPORT is not set
1181 1219
@@ -1281,7 +1319,6 @@ CONFIG_OCFS2_FS_O2CB=m
1281CONFIG_OCFS2_FS_STATS=y 1319CONFIG_OCFS2_FS_STATS=y
1282CONFIG_OCFS2_DEBUG_MASKLOG=y 1320CONFIG_OCFS2_DEBUG_MASKLOG=y
1283# CONFIG_OCFS2_DEBUG_FS is not set 1321# CONFIG_OCFS2_DEBUG_FS is not set
1284# CONFIG_OCFS2_FS_POSIX_ACL is not set
1285# CONFIG_BTRFS_FS is not set 1322# CONFIG_BTRFS_FS is not set
1286# CONFIG_NILFS2_FS is not set 1323# CONFIG_NILFS2_FS is not set
1287CONFIG_FILE_LOCKING=y 1324CONFIG_FILE_LOCKING=y
@@ -1556,8 +1593,12 @@ CONFIG_SECURITY=y
1556CONFIG_SECURITY_NETWORK=y 1593CONFIG_SECURITY_NETWORK=y
1557# CONFIG_SECURITY_NETWORK_XFRM is not set 1594# CONFIG_SECURITY_NETWORK_XFRM is not set
1558# CONFIG_SECURITY_PATH is not set 1595# CONFIG_SECURITY_PATH is not set
1559# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1560# CONFIG_SECURITY_TOMOYO is not set 1596# CONFIG_SECURITY_TOMOYO is not set
1597# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1598# CONFIG_DEFAULT_SECURITY_SMACK is not set
1599# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1600CONFIG_DEFAULT_SECURITY_DAC=y
1601CONFIG_DEFAULT_SECURITY=""
1561CONFIG_CRYPTO=y 1602CONFIG_CRYPTO=y
1562 1603
1563# 1604#
diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig
index 052cf134e018..5c1dc768bbd8 100644
--- a/arch/powerpc/configs/adder875_defconfig
+++ b/arch/powerpc/configs/adder875_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:04 2009 4# Wed Jan 6 09:23:58 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
34CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
35CONFIG_NR_IRQS=512
35CONFIG_STACKTRACE_SUPPORT=y 36CONFIG_STACKTRACE_SUPPORT=y
36CONFIG_HAVE_LATENCYTOP_SUPPORT=y 37CONFIG_HAVE_LATENCYTOP_SUPPORT=y
37CONFIG_TRACE_IRQFLAGS_SUPPORT=y 38CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -55,6 +56,7 @@ CONFIG_GENERIC_BUG=y
55CONFIG_DTC=y 56CONFIG_DTC=y
56# CONFIG_DEFAULT_UIMAGE is not set 57# CONFIG_DEFAULT_UIMAGE is not set
57CONFIG_REDBOOT=y 58CONFIG_REDBOOT=y
59CONFIG_ARCH_HIBERNATION_POSSIBLE=y
58# CONFIG_PPC_DCR_NATIVE is not set 60# CONFIG_PPC_DCR_NATIVE is not set
59# CONFIG_PPC_DCR_MMIO is not set 61# CONFIG_PPC_DCR_MMIO is not set
60CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 62CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -82,6 +84,7 @@ CONFIG_SYSVIPC_SYSCTL=y
82# 84#
83CONFIG_TREE_RCU=y 85CONFIG_TREE_RCU=y
84# CONFIG_TREE_PREEMPT_RCU is not set 86# CONFIG_TREE_PREEMPT_RCU is not set
87# CONFIG_TINY_RCU is not set
85# CONFIG_RCU_TRACE is not set 88# CONFIG_RCU_TRACE is not set
86CONFIG_RCU_FANOUT=32 89CONFIG_RCU_FANOUT=32
87# CONFIG_RCU_FANOUT_EXACT is not set 90# CONFIG_RCU_FANOUT_EXACT is not set
@@ -161,14 +164,41 @@ CONFIG_LBDAF=y
161# IO Schedulers 164# IO Schedulers
162# 165#
163CONFIG_IOSCHED_NOOP=y 166CONFIG_IOSCHED_NOOP=y
164# CONFIG_IOSCHED_AS is not set
165CONFIG_IOSCHED_DEADLINE=y 167CONFIG_IOSCHED_DEADLINE=y
166# CONFIG_IOSCHED_CFQ is not set 168# CONFIG_IOSCHED_CFQ is not set
167# CONFIG_DEFAULT_AS is not set
168CONFIG_DEFAULT_DEADLINE=y 169CONFIG_DEFAULT_DEADLINE=y
169# CONFIG_DEFAULT_CFQ is not set 170# CONFIG_DEFAULT_CFQ is not set
170# CONFIG_DEFAULT_NOOP is not set 171# CONFIG_DEFAULT_NOOP is not set
171CONFIG_DEFAULT_IOSCHED="deadline" 172CONFIG_DEFAULT_IOSCHED="deadline"
173# CONFIG_INLINE_SPIN_TRYLOCK is not set
174# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
175# CONFIG_INLINE_SPIN_LOCK is not set
176# CONFIG_INLINE_SPIN_LOCK_BH is not set
177# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
178# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
179CONFIG_INLINE_SPIN_UNLOCK=y
180# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
181CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
182# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
183# CONFIG_INLINE_READ_TRYLOCK is not set
184# CONFIG_INLINE_READ_LOCK is not set
185# CONFIG_INLINE_READ_LOCK_BH is not set
186# CONFIG_INLINE_READ_LOCK_IRQ is not set
187# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
188CONFIG_INLINE_READ_UNLOCK=y
189# CONFIG_INLINE_READ_UNLOCK_BH is not set
190CONFIG_INLINE_READ_UNLOCK_IRQ=y
191# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
192# CONFIG_INLINE_WRITE_TRYLOCK is not set
193# CONFIG_INLINE_WRITE_LOCK is not set
194# CONFIG_INLINE_WRITE_LOCK_BH is not set
195# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
196# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
197CONFIG_INLINE_WRITE_UNLOCK=y
198# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
199CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
200# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
201# CONFIG_MUTEX_SPIN_ON_OWNER is not set
172# CONFIG_FREEZER is not set 202# CONFIG_FREEZER is not set
173 203
174# 204#
@@ -242,6 +272,7 @@ CONFIG_BINFMT_ELF=y
242CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 272CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
243CONFIG_ARCH_HAS_WALK_MEMORY=y 273CONFIG_ARCH_HAS_WALK_MEMORY=y
244CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 274CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
275CONFIG_SPARSE_IRQ=y
245CONFIG_MAX_ACTIVE_REGIONS=32 276CONFIG_MAX_ACTIVE_REGIONS=32
246CONFIG_ARCH_FLATMEM_ENABLE=y 277CONFIG_ARCH_FLATMEM_ENABLE=y
247CONFIG_ARCH_POPULATES_NODE_MAP=y 278CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -258,8 +289,6 @@ CONFIG_MIGRATION=y
258CONFIG_ZONE_DMA_FLAG=1 289CONFIG_ZONE_DMA_FLAG=1
259CONFIG_BOUNCE=y 290CONFIG_BOUNCE=y
260CONFIG_VIRT_TO_BUS=y 291CONFIG_VIRT_TO_BUS=y
261CONFIG_HAVE_MLOCK=y
262CONFIG_HAVE_MLOCKED_PAGE_BIT=y
263# CONFIG_KSM is not set 292# CONFIG_KSM is not set
264CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 293CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
265CONFIG_PPC_4K_PAGES=y 294CONFIG_PPC_4K_PAGES=y
@@ -373,9 +402,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
373# CONFIG_AF_RXRPC is not set 402# CONFIG_AF_RXRPC is not set
374CONFIG_WIRELESS=y 403CONFIG_WIRELESS=y
375# CONFIG_CFG80211 is not set 404# CONFIG_CFG80211 is not set
376CONFIG_CFG80211_DEFAULT_PS_VALUE=0
377CONFIG_WIRELESS_OLD_REGULATORY=y
378# CONFIG_WIRELESS_EXT is not set
379# CONFIG_LIB80211 is not set 405# CONFIG_LIB80211 is not set
380 406
381# 407#
@@ -546,8 +572,7 @@ CONFIG_FS_ENET_MDIO_FEC=y
546# CONFIG_NETDEV_1000 is not set 572# CONFIG_NETDEV_1000 is not set
547# CONFIG_NETDEV_10000 is not set 573# CONFIG_NETDEV_10000 is not set
548CONFIG_WLAN=y 574CONFIG_WLAN=y
549# CONFIG_WLAN_PRE80211 is not set 575# CONFIG_HOSTAP is not set
550# CONFIG_WLAN_80211 is not set
551 576
552# 577#
553# Enable WiMAX (Networking options) to see the WiMAX drivers 578# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -567,6 +592,7 @@ CONFIG_WLAN=y
567CONFIG_INPUT=y 592CONFIG_INPUT=y
568# CONFIG_INPUT_FF_MEMLESS is not set 593# CONFIG_INPUT_FF_MEMLESS is not set
569# CONFIG_INPUT_POLLDEV is not set 594# CONFIG_INPUT_POLLDEV is not set
595# CONFIG_INPUT_SPARSEKMAP is not set
570 596
571# 597#
572# Userland interfaces 598# Userland interfaces
@@ -615,6 +641,7 @@ CONFIG_SERIO_SERPORT=y
615CONFIG_SERIO_LIBPS2=y 641CONFIG_SERIO_LIBPS2=y
616# CONFIG_SERIO_RAW is not set 642# CONFIG_SERIO_RAW is not set
617# CONFIG_SERIO_XILINX_XPS_PS2 is not set 643# CONFIG_SERIO_XILINX_XPS_PS2 is not set
644# CONFIG_SERIO_ALTERA_PS2 is not set
618# CONFIG_GAMEPORT is not set 645# CONFIG_GAMEPORT is not set
619 646
620# 647#
@@ -637,6 +664,7 @@ CONFIG_SERIAL_CORE=y
637CONFIG_SERIAL_CORE_CONSOLE=y 664CONFIG_SERIAL_CORE_CONSOLE=y
638CONFIG_SERIAL_CPM=y 665CONFIG_SERIAL_CPM=y
639CONFIG_SERIAL_CPM_CONSOLE=y 666CONFIG_SERIAL_CPM_CONSOLE=y
667# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
640CONFIG_UNIX98_PTYS=y 668CONFIG_UNIX98_PTYS=y
641# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 669# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
642# CONFIG_LEGACY_PTYS is not set 670# CONFIG_LEGACY_PTYS is not set
@@ -898,6 +926,7 @@ CONFIG_DEBUG_INFO=y
898# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 926# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
899# CONFIG_FAULT_INJECTION is not set 927# CONFIG_FAULT_INJECTION is not set
900# CONFIG_LATENCYTOP is not set 928# CONFIG_LATENCYTOP is not set
929# CONFIG_SYSCTL_SYSCALL_CHECK is not set
901# CONFIG_DEBUG_PAGEALLOC is not set 930# CONFIG_DEBUG_PAGEALLOC is not set
902CONFIG_HAVE_FUNCTION_TRACER=y 931CONFIG_HAVE_FUNCTION_TRACER=y
903CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 932CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -943,7 +972,11 @@ CONFIG_PRINT_STACK_DEPTH=64
943# CONFIG_KEYS is not set 972# CONFIG_KEYS is not set
944# CONFIG_SECURITY is not set 973# CONFIG_SECURITY is not set
945# CONFIG_SECURITYFS is not set 974# CONFIG_SECURITYFS is not set
946# CONFIG_SECURITY_FILE_CAPABILITIES is not set 975# CONFIG_DEFAULT_SECURITY_SELINUX is not set
976# CONFIG_DEFAULT_SECURITY_SMACK is not set
977# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
978CONFIG_DEFAULT_SECURITY_DAC=y
979CONFIG_DEFAULT_SECURITY=""
947# CONFIG_CRYPTO is not set 980# CONFIG_CRYPTO is not set
948CONFIG_PPC_CLOCK=y 981CONFIG_PPC_CLOCK=y
949CONFIG_PPC_LIB_RHEAP=y 982CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig
index 0fb65a85dfdf..72137cd881da 100644
--- a/arch/powerpc/configs/c2k_defconfig
+++ b/arch/powerpc/configs/c2k_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:05 2009 4# Wed Jan 6 09:23:59 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,7 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63# CONFIG_DEFAULT_UIMAGE is not set 64# CONFIG_DEFAULT_UIMAGE is not set
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 66# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 67# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 68CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -92,6 +94,7 @@ CONFIG_AUDIT_TREE=y
92# 94#
93CONFIG_TREE_RCU=y 95CONFIG_TREE_RCU=y
94# CONFIG_TREE_PREEMPT_RCU is not set 96# CONFIG_TREE_PREEMPT_RCU is not set
97# CONFIG_TINY_RCU is not set
95# CONFIG_RCU_TRACE is not set 98# CONFIG_RCU_TRACE is not set
96CONFIG_RCU_FANOUT=32 99CONFIG_RCU_FANOUT=32
97# CONFIG_RCU_FANOUT_EXACT is not set 100# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,6 +176,7 @@ CONFIG_HAVE_DMA_API_DEBUG=y
173# 176#
174# CONFIG_GCOV_KERNEL is not set 177# CONFIG_GCOV_KERNEL is not set
175CONFIG_SLOW_WORK=y 178CONFIG_SLOW_WORK=y
179# CONFIG_SLOW_WORK_DEBUG is not set
176# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 180# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
177CONFIG_SLABINFO=y 181CONFIG_SLABINFO=y
178CONFIG_RT_MUTEXES=y 182CONFIG_RT_MUTEXES=y
@@ -192,14 +196,41 @@ CONFIG_LBDAF=y
192# IO Schedulers 196# IO Schedulers
193# 197#
194CONFIG_IOSCHED_NOOP=y 198CONFIG_IOSCHED_NOOP=y
195CONFIG_IOSCHED_AS=y
196CONFIG_IOSCHED_DEADLINE=y 199CONFIG_IOSCHED_DEADLINE=y
197CONFIG_IOSCHED_CFQ=y 200CONFIG_IOSCHED_CFQ=y
198# CONFIG_DEFAULT_AS is not set
199# CONFIG_DEFAULT_DEADLINE is not set 201# CONFIG_DEFAULT_DEADLINE is not set
200CONFIG_DEFAULT_CFQ=y 202CONFIG_DEFAULT_CFQ=y
201# CONFIG_DEFAULT_NOOP is not set 203# CONFIG_DEFAULT_NOOP is not set
202CONFIG_DEFAULT_IOSCHED="cfq" 204CONFIG_DEFAULT_IOSCHED="cfq"
205# CONFIG_INLINE_SPIN_TRYLOCK is not set
206# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
207# CONFIG_INLINE_SPIN_LOCK is not set
208# CONFIG_INLINE_SPIN_LOCK_BH is not set
209# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
210# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
211# CONFIG_INLINE_SPIN_UNLOCK is not set
212# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
213# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
214# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
215# CONFIG_INLINE_READ_TRYLOCK is not set
216# CONFIG_INLINE_READ_LOCK is not set
217# CONFIG_INLINE_READ_LOCK_BH is not set
218# CONFIG_INLINE_READ_LOCK_IRQ is not set
219# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
220# CONFIG_INLINE_READ_UNLOCK is not set
221# CONFIG_INLINE_READ_UNLOCK_BH is not set
222# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
223# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
224# CONFIG_INLINE_WRITE_TRYLOCK is not set
225# CONFIG_INLINE_WRITE_LOCK is not set
226# CONFIG_INLINE_WRITE_LOCK_BH is not set
227# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
228# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
229# CONFIG_INLINE_WRITE_UNLOCK is not set
230# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
231# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
232# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
233# CONFIG_MUTEX_SPIN_ON_OWNER is not set
203# CONFIG_FREEZER is not set 234# CONFIG_FREEZER is not set
204 235
205# 236#
@@ -224,6 +255,8 @@ CONFIG_EMBEDDED6xx=y
224# CONFIG_PPC_PRPMC2800 is not set 255# CONFIG_PPC_PRPMC2800 is not set
225CONFIG_PPC_C2K=y 256CONFIG_PPC_C2K=y
226CONFIG_MV64X60=y 257CONFIG_MV64X60=y
258# CONFIG_GAMECUBE is not set
259# CONFIG_WII is not set
227# CONFIG_AMIGAONE is not set 260# CONFIG_AMIGAONE is not set
228CONFIG_PPC_OF_BOOT_TRAMPOLINE=y 261CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
229# CONFIG_IPIC is not set 262# CONFIG_IPIC is not set
@@ -286,6 +319,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
286CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 319CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
287# CONFIG_KEXEC is not set 320# CONFIG_KEXEC is not set
288# CONFIG_CRASH_DUMP is not set 321# CONFIG_CRASH_DUMP is not set
322CONFIG_SPARSE_IRQ=y
289CONFIG_MAX_ACTIVE_REGIONS=32 323CONFIG_MAX_ACTIVE_REGIONS=32
290CONFIG_ARCH_FLATMEM_ENABLE=y 324CONFIG_ARCH_FLATMEM_ENABLE=y
291CONFIG_ARCH_POPULATES_NODE_MAP=y 325CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -296,14 +330,12 @@ CONFIG_FLATMEM_MANUAL=y
296CONFIG_FLATMEM=y 330CONFIG_FLATMEM=y
297CONFIG_FLAT_NODE_MEM_MAP=y 331CONFIG_FLAT_NODE_MEM_MAP=y
298CONFIG_PAGEFLAGS_EXTENDED=y 332CONFIG_PAGEFLAGS_EXTENDED=y
299CONFIG_SPLIT_PTLOCK_CPUS=4 333CONFIG_SPLIT_PTLOCK_CPUS=999999
300CONFIG_MIGRATION=y 334CONFIG_MIGRATION=y
301# CONFIG_PHYS_ADDR_T_64BIT is not set 335# CONFIG_PHYS_ADDR_T_64BIT is not set
302CONFIG_ZONE_DMA_FLAG=1 336CONFIG_ZONE_DMA_FLAG=1
303CONFIG_BOUNCE=y 337CONFIG_BOUNCE=y
304CONFIG_VIRT_TO_BUS=y 338CONFIG_VIRT_TO_BUS=y
305CONFIG_HAVE_MLOCK=y
306CONFIG_HAVE_MLOCKED_PAGE_BIT=y
307# CONFIG_KSM is not set 339# CONFIG_KSM is not set
308CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 340CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
309CONFIG_PPC_4K_PAGES=y 341CONFIG_PPC_4K_PAGES=y
@@ -316,6 +348,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
316CONFIG_EXTRA_TARGETS="" 348CONFIG_EXTRA_TARGETS=""
317CONFIG_PM=y 349CONFIG_PM=y
318# CONFIG_PM_DEBUG is not set 350# CONFIG_PM_DEBUG is not set
351# CONFIG_HIBERNATION is not set
319# CONFIG_PM_RUNTIME is not set 352# CONFIG_PM_RUNTIME is not set
320CONFIG_SECCOMP=y 353CONFIG_SECCOMP=y
321CONFIG_ISA_DMA_API=y 354CONFIG_ISA_DMA_API=y
@@ -424,6 +457,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
424CONFIG_INET6_XFRM_MODE_BEET=m 457CONFIG_INET6_XFRM_MODE_BEET=m
425# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 458# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
426CONFIG_IPV6_SIT=m 459CONFIG_IPV6_SIT=m
460# CONFIG_IPV6_SIT_6RD is not set
427CONFIG_IPV6_NDISC_NODETYPE=y 461CONFIG_IPV6_NDISC_NODETYPE=y
428CONFIG_IPV6_TUNNEL=m 462CONFIG_IPV6_TUNNEL=m
429# CONFIG_IPV6_MULTIPLE_TABLES is not set 463# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -687,10 +721,6 @@ CONFIG_BT_HCIVHCI=m
687CONFIG_FIB_RULES=y 721CONFIG_FIB_RULES=y
688CONFIG_WIRELESS=y 722CONFIG_WIRELESS=y
689# CONFIG_CFG80211 is not set 723# CONFIG_CFG80211 is not set
690CONFIG_CFG80211_DEFAULT_PS_VALUE=0
691CONFIG_WIRELESS_OLD_REGULATORY=y
692CONFIG_WIRELESS_EXT=y
693CONFIG_WIRELESS_EXT_SYSFS=y
694# CONFIG_LIB80211 is not set 724# CONFIG_LIB80211 is not set
695 725
696# 726#
@@ -773,7 +803,6 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
773# CONFIG_MTD_PHYSMAP is not set 803# CONFIG_MTD_PHYSMAP is not set
774CONFIG_MTD_PHYSMAP_OF=y 804CONFIG_MTD_PHYSMAP_OF=y
775# CONFIG_MTD_PCI is not set 805# CONFIG_MTD_PCI is not set
776# CONFIG_MTD_GPIO_ADDR is not set
777# CONFIG_MTD_INTEL_VR_NOR is not set 806# CONFIG_MTD_INTEL_VR_NOR is not set
778# CONFIG_MTD_PLATRAM is not set 807# CONFIG_MTD_PLATRAM is not set
779 808
@@ -817,6 +846,10 @@ CONFIG_BLK_DEV=y
817# CONFIG_BLK_DEV_COW_COMMON is not set 846# CONFIG_BLK_DEV_COW_COMMON is not set
818CONFIG_BLK_DEV_LOOP=m 847CONFIG_BLK_DEV_LOOP=m
819CONFIG_BLK_DEV_CRYPTOLOOP=m 848CONFIG_BLK_DEV_CRYPTOLOOP=m
849
850#
851# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
852#
820CONFIG_BLK_DEV_NBD=m 853CONFIG_BLK_DEV_NBD=m
821# CONFIG_BLK_DEV_SX8 is not set 854# CONFIG_BLK_DEV_SX8 is not set
822# CONFIG_BLK_DEV_UB is not set 855# CONFIG_BLK_DEV_UB is not set
@@ -870,7 +903,9 @@ CONFIG_SCSI_LOWLEVEL=y
870# CONFIG_SCSI_BNX2_ISCSI is not set 903# CONFIG_SCSI_BNX2_ISCSI is not set
871# CONFIG_BE2ISCSI is not set 904# CONFIG_BE2ISCSI is not set
872CONFIG_BLK_DEV_3W_XXXX_RAID=m 905CONFIG_BLK_DEV_3W_XXXX_RAID=m
906# CONFIG_SCSI_HPSA is not set
873CONFIG_SCSI_3W_9XXX=m 907CONFIG_SCSI_3W_9XXX=m
908# CONFIG_SCSI_3W_SAS is not set
874CONFIG_SCSI_ACARD=m 909CONFIG_SCSI_ACARD=m
875CONFIG_SCSI_AACRAID=m 910CONFIG_SCSI_AACRAID=m
876CONFIG_SCSI_AIC7XXX=m 911CONFIG_SCSI_AIC7XXX=m
@@ -925,6 +960,7 @@ CONFIG_SCSI_LPFC=m
925# CONFIG_SCSI_NSP32 is not set 960# CONFIG_SCSI_NSP32 is not set
926# CONFIG_SCSI_DEBUG is not set 961# CONFIG_SCSI_DEBUG is not set
927# CONFIG_SCSI_PMCRAID is not set 962# CONFIG_SCSI_PMCRAID is not set
963# CONFIG_SCSI_PM8001 is not set
928# CONFIG_SCSI_SRP is not set 964# CONFIG_SCSI_SRP is not set
929# CONFIG_SCSI_BFA_FC is not set 965# CONFIG_SCSI_BFA_FC is not set
930# CONFIG_SCSI_DH is not set 966# CONFIG_SCSI_DH is not set
@@ -942,7 +978,7 @@ CONFIG_SCSI_LPFC=m
942# 978#
943 979
944# 980#
945# See the help texts for more information. 981# The newer stack is recommended.
946# 982#
947# CONFIG_FIREWIRE is not set 983# CONFIG_FIREWIRE is not set
948# CONFIG_IEEE1394 is not set 984# CONFIG_IEEE1394 is not set
@@ -1027,8 +1063,11 @@ CONFIG_MV643XX_ETH=y
1027# CONFIG_NETDEV_10000 is not set 1063# CONFIG_NETDEV_10000 is not set
1028# CONFIG_TR is not set 1064# CONFIG_TR is not set
1029CONFIG_WLAN=y 1065CONFIG_WLAN=y
1030# CONFIG_WLAN_PRE80211 is not set 1066# CONFIG_AIRO is not set
1031# CONFIG_WLAN_80211 is not set 1067# CONFIG_ATMEL is not set
1068# CONFIG_PRISM54 is not set
1069# CONFIG_USB_ZD1201 is not set
1070# CONFIG_HOSTAP is not set
1032 1071
1033# 1072#
1034# Enable WiMAX (Networking options) to see the WiMAX drivers 1073# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1054,6 +1093,7 @@ CONFIG_NETCONSOLE=m
1054CONFIG_NETPOLL=y 1093CONFIG_NETPOLL=y
1055CONFIG_NETPOLL_TRAP=y 1094CONFIG_NETPOLL_TRAP=y
1056CONFIG_NET_POLL_CONTROLLER=y 1095CONFIG_NET_POLL_CONTROLLER=y
1096# CONFIG_VMXNET3 is not set
1057# CONFIG_ISDN is not set 1097# CONFIG_ISDN is not set
1058# CONFIG_PHONE is not set 1098# CONFIG_PHONE is not set
1059 1099
@@ -1063,6 +1103,7 @@ CONFIG_NET_POLL_CONTROLLER=y
1063CONFIG_INPUT=y 1103CONFIG_INPUT=y
1064# CONFIG_INPUT_FF_MEMLESS is not set 1104# CONFIG_INPUT_FF_MEMLESS is not set
1065# CONFIG_INPUT_POLLDEV is not set 1105# CONFIG_INPUT_POLLDEV is not set
1106# CONFIG_INPUT_SPARSEKMAP is not set
1066 1107
1067# 1108#
1068# Userland interfaces 1109# Userland interfaces
@@ -1121,8 +1162,6 @@ CONFIG_SERIAL_NONSTANDARD=y
1121# CONFIG_N_HDLC is not set 1162# CONFIG_N_HDLC is not set
1122# CONFIG_RISCOM8 is not set 1163# CONFIG_RISCOM8 is not set
1123# CONFIG_SPECIALIX is not set 1164# CONFIG_SPECIALIX is not set
1124# CONFIG_SX is not set
1125# CONFIG_RIO is not set
1126# CONFIG_STALDRV is not set 1165# CONFIG_STALDRV is not set
1127# CONFIG_NOZOMI is not set 1166# CONFIG_NOZOMI is not set
1128 1167
@@ -1140,6 +1179,7 @@ CONFIG_SERIAL_MPSC_CONSOLE=y
1140CONFIG_SERIAL_CORE=y 1179CONFIG_SERIAL_CORE=y
1141CONFIG_SERIAL_CORE_CONSOLE=y 1180CONFIG_SERIAL_CORE_CONSOLE=y
1142# CONFIG_SERIAL_JSM is not set 1181# CONFIG_SERIAL_JSM is not set
1182# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
1143CONFIG_UNIX98_PTYS=y 1183CONFIG_UNIX98_PTYS=y
1144# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1184# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
1145# CONFIG_LEGACY_PTYS is not set 1185# CONFIG_LEGACY_PTYS is not set
@@ -1200,11 +1240,6 @@ CONFIG_I2C_MV64XXX=m
1200# CONFIG_I2C_TINY_USB is not set 1240# CONFIG_I2C_TINY_USB is not set
1201 1241
1202# 1242#
1203# Graphics adapter I2C/DDC channel drivers
1204#
1205# CONFIG_I2C_VOODOO3 is not set
1206
1207#
1208# Other I2C/SMBus bus drivers 1243# Other I2C/SMBus bus drivers
1209# 1244#
1210# CONFIG_I2C_PCA_PLATFORM is not set 1245# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1213,7 +1248,6 @@ CONFIG_I2C_MV64XXX=m
1213# 1248#
1214# Miscellaneous I2C Chip support 1249# Miscellaneous I2C Chip support
1215# 1250#
1216# CONFIG_DS1682 is not set
1217# CONFIG_SENSORS_TSL2550 is not set 1251# CONFIG_SENSORS_TSL2550 is not set
1218# CONFIG_I2C_DEBUG_CORE is not set 1252# CONFIG_I2C_DEBUG_CORE is not set
1219# CONFIG_I2C_DEBUG_ALGO is not set 1253# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1259,6 +1293,7 @@ CONFIG_SENSORS_GL518SM=m
1259# CONFIG_SENSORS_GL520SM is not set 1293# CONFIG_SENSORS_GL520SM is not set
1260CONFIG_SENSORS_IT87=m 1294CONFIG_SENSORS_IT87=m
1261# CONFIG_SENSORS_LM63 is not set 1295# CONFIG_SENSORS_LM63 is not set
1296# CONFIG_SENSORS_LM73 is not set
1262CONFIG_SENSORS_LM75=m 1297CONFIG_SENSORS_LM75=m
1263CONFIG_SENSORS_LM77=m 1298CONFIG_SENSORS_LM77=m
1264CONFIG_SENSORS_LM78=m 1299CONFIG_SENSORS_LM78=m
@@ -1297,6 +1332,7 @@ CONFIG_SENSORS_W83L785TS=m
1297# CONFIG_SENSORS_W83L786NG is not set 1332# CONFIG_SENSORS_W83L786NG is not set
1298CONFIG_SENSORS_W83627HF=m 1333CONFIG_SENSORS_W83627HF=m
1299# CONFIG_SENSORS_W83627EHF is not set 1334# CONFIG_SENSORS_W83627EHF is not set
1335# CONFIG_SENSORS_LIS3_I2C is not set
1300# CONFIG_THERMAL is not set 1336# CONFIG_THERMAL is not set
1301CONFIG_WATCHDOG=y 1337CONFIG_WATCHDOG=y
1302# CONFIG_WATCHDOG_NOWAYOUT is not set 1338# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1333,7 +1369,6 @@ CONFIG_SSB_POSSIBLE=y
1333# CONFIG_HTC_PASIC3 is not set 1369# CONFIG_HTC_PASIC3 is not set
1334# CONFIG_MFD_TMIO is not set 1370# CONFIG_MFD_TMIO is not set
1335# CONFIG_MFD_WM8400 is not set 1371# CONFIG_MFD_WM8400 is not set
1336# CONFIG_MFD_WM831X is not set
1337# CONFIG_MFD_WM8350_I2C is not set 1372# CONFIG_MFD_WM8350_I2C is not set
1338# CONFIG_MFD_PCF50633 is not set 1373# CONFIG_MFD_PCF50633 is not set
1339# CONFIG_AB3100_CORE is not set 1374# CONFIG_AB3100_CORE is not set
@@ -1392,6 +1427,7 @@ CONFIG_USB_MON=m
1392CONFIG_USB_EHCI_HCD=m 1427CONFIG_USB_EHCI_HCD=m
1393CONFIG_USB_EHCI_ROOT_HUB_TT=y 1428CONFIG_USB_EHCI_ROOT_HUB_TT=y
1394# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1429# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1430# CONFIG_XPS_USB_HCD_XILINX is not set
1395CONFIG_USB_EHCI_HCD_PPC_OF=y 1431CONFIG_USB_EHCI_HCD_PPC_OF=y
1396# CONFIG_USB_OXU210HP_HCD is not set 1432# CONFIG_USB_OXU210HP_HCD is not set
1397# CONFIG_USB_ISP116X_HCD is not set 1433# CONFIG_USB_ISP116X_HCD is not set
@@ -1923,7 +1959,6 @@ CONFIG_SECURITY=y
1923CONFIG_SECURITY_NETWORK=y 1959CONFIG_SECURITY_NETWORK=y
1924# CONFIG_SECURITY_NETWORK_XFRM is not set 1960# CONFIG_SECURITY_NETWORK_XFRM is not set
1925# CONFIG_SECURITY_PATH is not set 1961# CONFIG_SECURITY_PATH is not set
1926# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1927CONFIG_LSM_MMAP_MIN_ADDR=65536 1962CONFIG_LSM_MMAP_MIN_ADDR=65536
1928CONFIG_SECURITY_SELINUX=y 1963CONFIG_SECURITY_SELINUX=y
1929CONFIG_SECURITY_SELINUX_BOOTPARAM=y 1964CONFIG_SECURITY_SELINUX_BOOTPARAM=y
@@ -1934,6 +1969,11 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y
1934CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 1969CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
1935# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set 1970# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
1936# CONFIG_SECURITY_TOMOYO is not set 1971# CONFIG_SECURITY_TOMOYO is not set
1972CONFIG_DEFAULT_SECURITY_SELINUX=y
1973# CONFIG_DEFAULT_SECURITY_SMACK is not set
1974# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1975# CONFIG_DEFAULT_SECURITY_DAC is not set
1976CONFIG_DEFAULT_SECURITY="selinux"
1937CONFIG_CRYPTO=y 1977CONFIG_CRYPTO=y
1938 1978
1939# 1979#
diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig
index ef5edc7203f5..79105413884e 100644
--- a/arch/powerpc/configs/ep8248e_defconfig
+++ b/arch/powerpc/configs/ep8248e_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:06 2009 4# Wed Jan 6 09:23:59 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61# CONFIG_DEFAULT_UIMAGE is not set 62# CONFIG_DEFAULT_UIMAGE is not set
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62# CONFIG_PPC_DCR_NATIVE is not set 64# CONFIG_PPC_DCR_NATIVE is not set
63# CONFIG_PPC_DCR_MMIO is not set 65# CONFIG_PPC_DCR_MMIO is not set
64CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -85,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86CONFIG_TREE_RCU=y 88CONFIG_TREE_RCU=y
87# CONFIG_TREE_PREEMPT_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_TINY_RCU is not set
88# CONFIG_RCU_TRACE is not set 91# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32 92CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set 93# CONFIG_RCU_FANOUT_EXACT is not set
@@ -160,14 +163,41 @@ CONFIG_BLK_DEV_BSG=y
160# IO Schedulers 163# IO Schedulers
161# 164#
162CONFIG_IOSCHED_NOOP=y 165CONFIG_IOSCHED_NOOP=y
163# CONFIG_IOSCHED_AS is not set
164CONFIG_IOSCHED_DEADLINE=y 166CONFIG_IOSCHED_DEADLINE=y
165# CONFIG_IOSCHED_CFQ is not set 167# CONFIG_IOSCHED_CFQ is not set
166# CONFIG_DEFAULT_AS is not set
167CONFIG_DEFAULT_DEADLINE=y 168CONFIG_DEFAULT_DEADLINE=y
168# CONFIG_DEFAULT_CFQ is not set 169# CONFIG_DEFAULT_CFQ is not set
169# CONFIG_DEFAULT_NOOP is not set 170# CONFIG_DEFAULT_NOOP is not set
170CONFIG_DEFAULT_IOSCHED="deadline" 171CONFIG_DEFAULT_IOSCHED="deadline"
172# CONFIG_INLINE_SPIN_TRYLOCK is not set
173# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
174# CONFIG_INLINE_SPIN_LOCK is not set
175# CONFIG_INLINE_SPIN_LOCK_BH is not set
176# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
177# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
178CONFIG_INLINE_SPIN_UNLOCK=y
179# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
180CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
181# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
182# CONFIG_INLINE_READ_TRYLOCK is not set
183# CONFIG_INLINE_READ_LOCK is not set
184# CONFIG_INLINE_READ_LOCK_BH is not set
185# CONFIG_INLINE_READ_LOCK_IRQ is not set
186# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
187CONFIG_INLINE_READ_UNLOCK=y
188# CONFIG_INLINE_READ_UNLOCK_BH is not set
189CONFIG_INLINE_READ_UNLOCK_IRQ=y
190# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
191# CONFIG_INLINE_WRITE_TRYLOCK is not set
192# CONFIG_INLINE_WRITE_LOCK is not set
193# CONFIG_INLINE_WRITE_LOCK_BH is not set
194# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
195# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
196CONFIG_INLINE_WRITE_UNLOCK=y
197# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
198CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
199# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
200# CONFIG_MUTEX_SPIN_ON_OWNER is not set
171# CONFIG_FREEZER is not set 201# CONFIG_FREEZER is not set
172 202
173# 203#
@@ -237,6 +267,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
237CONFIG_ARCH_HAS_WALK_MEMORY=y 267CONFIG_ARCH_HAS_WALK_MEMORY=y
238CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 268CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
239# CONFIG_CRASH_DUMP is not set 269# CONFIG_CRASH_DUMP is not set
270CONFIG_SPARSE_IRQ=y
240CONFIG_MAX_ACTIVE_REGIONS=32 271CONFIG_MAX_ACTIVE_REGIONS=32
241CONFIG_ARCH_FLATMEM_ENABLE=y 272CONFIG_ARCH_FLATMEM_ENABLE=y
242CONFIG_ARCH_POPULATES_NODE_MAP=y 273CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -249,8 +280,6 @@ CONFIG_MIGRATION=y
249CONFIG_ZONE_DMA_FLAG=1 280CONFIG_ZONE_DMA_FLAG=1
250CONFIG_BOUNCE=y 281CONFIG_BOUNCE=y
251CONFIG_VIRT_TO_BUS=y 282CONFIG_VIRT_TO_BUS=y
252CONFIG_HAVE_MLOCK=y
253CONFIG_HAVE_MLOCKED_PAGE_BIT=y
254# CONFIG_KSM is not set 283# CONFIG_KSM is not set
255CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 284CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
256CONFIG_PPC_4K_PAGES=y 285CONFIG_PPC_4K_PAGES=y
@@ -400,9 +429,6 @@ CONFIG_NETFILTER_ADVANCED=y
400# CONFIG_BT is not set 429# CONFIG_BT is not set
401CONFIG_WIRELESS=y 430CONFIG_WIRELESS=y
402# CONFIG_CFG80211 is not set 431# CONFIG_CFG80211 is not set
403CONFIG_CFG80211_DEFAULT_PS_VALUE=0
404CONFIG_WIRELESS_OLD_REGULATORY=y
405# CONFIG_WIRELESS_EXT is not set
406# CONFIG_LIB80211 is not set 432# CONFIG_LIB80211 is not set
407 433
408# 434#
@@ -523,6 +549,10 @@ CONFIG_BLK_DEV=y
523# CONFIG_BLK_DEV_COW_COMMON is not set 549# CONFIG_BLK_DEV_COW_COMMON is not set
524CONFIG_BLK_DEV_LOOP=y 550CONFIG_BLK_DEV_LOOP=y
525# CONFIG_BLK_DEV_CRYPTOLOOP is not set 551# CONFIG_BLK_DEV_CRYPTOLOOP is not set
552
553#
554# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
555#
526# CONFIG_BLK_DEV_NBD is not set 556# CONFIG_BLK_DEV_NBD is not set
527# CONFIG_BLK_DEV_SX8 is not set 557# CONFIG_BLK_DEV_SX8 is not set
528# CONFIG_BLK_DEV_RAM is not set 558# CONFIG_BLK_DEV_RAM is not set
@@ -553,7 +583,7 @@ CONFIG_HAVE_IDE=y
553# 583#
554 584
555# 585#
556# See the help texts for more information. 586# The newer stack is recommended.
557# 587#
558# CONFIG_FIREWIRE is not set 588# CONFIG_FIREWIRE is not set
559# CONFIG_IEEE1394 is not set 589# CONFIG_IEEE1394 is not set
@@ -658,8 +688,9 @@ CONFIG_CHELSIO_T3_DEPENDS=y
658# CONFIG_BE2NET is not set 688# CONFIG_BE2NET is not set
659# CONFIG_TR is not set 689# CONFIG_TR is not set
660CONFIG_WLAN=y 690CONFIG_WLAN=y
661# CONFIG_WLAN_PRE80211 is not set 691# CONFIG_AIRO is not set
662# CONFIG_WLAN_80211 is not set 692# CONFIG_ATMEL is not set
693# CONFIG_HOSTAP is not set
663 694
664# 695#
665# Enable WiMAX (Networking options) to see the WiMAX drivers 696# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -670,6 +701,7 @@ CONFIG_WLAN=y
670# CONFIG_SLIP is not set 701# CONFIG_SLIP is not set
671# CONFIG_NETPOLL is not set 702# CONFIG_NETPOLL is not set
672# CONFIG_NET_POLL_CONTROLLER is not set 703# CONFIG_NET_POLL_CONTROLLER is not set
704# CONFIG_VMXNET3 is not set
673# CONFIG_ISDN is not set 705# CONFIG_ISDN is not set
674# CONFIG_PHONE is not set 706# CONFIG_PHONE is not set
675 707
@@ -705,6 +737,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
705CONFIG_SERIAL_CPM=y 737CONFIG_SERIAL_CPM=y
706CONFIG_SERIAL_CPM_CONSOLE=y 738CONFIG_SERIAL_CPM_CONSOLE=y
707# CONFIG_SERIAL_JSM is not set 739# CONFIG_SERIAL_JSM is not set
740# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
708CONFIG_UNIX98_PTYS=y 741CONFIG_UNIX98_PTYS=y
709# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 742# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
710CONFIG_LEGACY_PTYS=y 743CONFIG_LEGACY_PTYS=y
@@ -741,6 +774,7 @@ CONFIG_GPIOLIB=y
741# 774#
742# PCI GPIO expanders: 775# PCI GPIO expanders:
743# 776#
777# CONFIG_GPIO_CS5535 is not set
744# CONFIG_GPIO_BT8XX is not set 778# CONFIG_GPIO_BT8XX is not set
745# CONFIG_GPIO_LANGWELL is not set 779# CONFIG_GPIO_LANGWELL is not set
746 780
@@ -1061,7 +1095,11 @@ CONFIG_BDI_SWITCH=y
1061# CONFIG_KEYS is not set 1095# CONFIG_KEYS is not set
1062# CONFIG_SECURITY is not set 1096# CONFIG_SECURITY is not set
1063# CONFIG_SECURITYFS is not set 1097# CONFIG_SECURITYFS is not set
1064# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1098# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1099# CONFIG_DEFAULT_SECURITY_SMACK is not set
1100# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1101CONFIG_DEFAULT_SECURITY_DAC=y
1102CONFIG_DEFAULT_SECURITY=""
1065CONFIG_CRYPTO=y 1103CONFIG_CRYPTO=y
1066 1104
1067# 1105#
diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig
index 73ef9be41280..58f7ca71a59d 100644
--- a/arch/powerpc/configs/ep88xc_defconfig
+++ b/arch/powerpc/configs/ep88xc_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:07 2009 4# Wed Jan 6 09:24:00 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
34CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
35CONFIG_NR_IRQS=512
35CONFIG_STACKTRACE_SUPPORT=y 36CONFIG_STACKTRACE_SUPPORT=y
36CONFIG_HAVE_LATENCYTOP_SUPPORT=y 37CONFIG_HAVE_LATENCYTOP_SUPPORT=y
37CONFIG_TRACE_IRQFLAGS_SUPPORT=y 38CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -54,6 +55,7 @@ CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 55CONFIG_GENERIC_BUG=y
55CONFIG_DTC=y 56CONFIG_DTC=y
56# CONFIG_DEFAULT_UIMAGE is not set 57# CONFIG_DEFAULT_UIMAGE is not set
58CONFIG_ARCH_HIBERNATION_POSSIBLE=y
57# CONFIG_PPC_DCR_NATIVE is not set 59# CONFIG_PPC_DCR_NATIVE is not set
58# CONFIG_PPC_DCR_MMIO is not set 60# CONFIG_PPC_DCR_MMIO is not set
59CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 61CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -81,6 +83,7 @@ CONFIG_SYSVIPC_SYSCTL=y
81# 83#
82CONFIG_TREE_RCU=y 84CONFIG_TREE_RCU=y
83# CONFIG_TREE_PREEMPT_RCU is not set 85# CONFIG_TREE_PREEMPT_RCU is not set
86# CONFIG_TINY_RCU is not set
84# CONFIG_RCU_TRACE is not set 87# CONFIG_RCU_TRACE is not set
85CONFIG_RCU_FANOUT=32 88CONFIG_RCU_FANOUT=32
86# CONFIG_RCU_FANOUT_EXACT is not set 89# CONFIG_RCU_FANOUT_EXACT is not set
@@ -159,14 +162,41 @@ CONFIG_LBDAF=y
159# IO Schedulers 162# IO Schedulers
160# 163#
161CONFIG_IOSCHED_NOOP=y 164CONFIG_IOSCHED_NOOP=y
162# CONFIG_IOSCHED_AS is not set
163CONFIG_IOSCHED_DEADLINE=y 165CONFIG_IOSCHED_DEADLINE=y
164# CONFIG_IOSCHED_CFQ is not set 166# CONFIG_IOSCHED_CFQ is not set
165# CONFIG_DEFAULT_AS is not set
166CONFIG_DEFAULT_DEADLINE=y 167CONFIG_DEFAULT_DEADLINE=y
167# CONFIG_DEFAULT_CFQ is not set 168# CONFIG_DEFAULT_CFQ is not set
168# CONFIG_DEFAULT_NOOP is not set 169# CONFIG_DEFAULT_NOOP is not set
169CONFIG_DEFAULT_IOSCHED="deadline" 170CONFIG_DEFAULT_IOSCHED="deadline"
171# CONFIG_INLINE_SPIN_TRYLOCK is not set
172# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
173# CONFIG_INLINE_SPIN_LOCK is not set
174# CONFIG_INLINE_SPIN_LOCK_BH is not set
175# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
176# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
177CONFIG_INLINE_SPIN_UNLOCK=y
178# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
179CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
180# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
181# CONFIG_INLINE_READ_TRYLOCK is not set
182# CONFIG_INLINE_READ_LOCK is not set
183# CONFIG_INLINE_READ_LOCK_BH is not set
184# CONFIG_INLINE_READ_LOCK_IRQ is not set
185# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
186CONFIG_INLINE_READ_UNLOCK=y
187# CONFIG_INLINE_READ_UNLOCK_BH is not set
188CONFIG_INLINE_READ_UNLOCK_IRQ=y
189# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
190# CONFIG_INLINE_WRITE_TRYLOCK is not set
191# CONFIG_INLINE_WRITE_LOCK is not set
192# CONFIG_INLINE_WRITE_LOCK_BH is not set
193# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
194# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
195CONFIG_INLINE_WRITE_UNLOCK=y
196# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
197CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
198# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
199# CONFIG_MUTEX_SPIN_ON_OWNER is not set
170# CONFIG_FREEZER is not set 200# CONFIG_FREEZER is not set
171 201
172# 202#
@@ -241,6 +271,7 @@ CONFIG_8XX_MINIMAL_FPEMU=y
241CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 271CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
242CONFIG_ARCH_HAS_WALK_MEMORY=y 272CONFIG_ARCH_HAS_WALK_MEMORY=y
243CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 273CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
274CONFIG_SPARSE_IRQ=y
244CONFIG_MAX_ACTIVE_REGIONS=32 275CONFIG_MAX_ACTIVE_REGIONS=32
245CONFIG_ARCH_FLATMEM_ENABLE=y 276CONFIG_ARCH_FLATMEM_ENABLE=y
246CONFIG_ARCH_POPULATES_NODE_MAP=y 277CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -257,8 +288,6 @@ CONFIG_MIGRATION=y
257CONFIG_ZONE_DMA_FLAG=1 288CONFIG_ZONE_DMA_FLAG=1
258CONFIG_BOUNCE=y 289CONFIG_BOUNCE=y
259CONFIG_VIRT_TO_BUS=y 290CONFIG_VIRT_TO_BUS=y
260CONFIG_HAVE_MLOCK=y
261CONFIG_HAVE_MLOCKED_PAGE_BIT=y
262# CONFIG_KSM is not set 291# CONFIG_KSM is not set
263CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 292CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
264CONFIG_PPC_4K_PAGES=y 293CONFIG_PPC_4K_PAGES=y
@@ -372,9 +401,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
372# CONFIG_AF_RXRPC is not set 401# CONFIG_AF_RXRPC is not set
373CONFIG_WIRELESS=y 402CONFIG_WIRELESS=y
374# CONFIG_CFG80211 is not set 403# CONFIG_CFG80211 is not set
375CONFIG_CFG80211_DEFAULT_PS_VALUE=0
376CONFIG_WIRELESS_OLD_REGULATORY=y
377# CONFIG_WIRELESS_EXT is not set
378# CONFIG_LIB80211 is not set 404# CONFIG_LIB80211 is not set
379 405
380# 406#
@@ -545,8 +571,7 @@ CONFIG_FS_ENET_MDIO_FEC=y
545# CONFIG_NETDEV_1000 is not set 571# CONFIG_NETDEV_1000 is not set
546# CONFIG_NETDEV_10000 is not set 572# CONFIG_NETDEV_10000 is not set
547CONFIG_WLAN=y 573CONFIG_WLAN=y
548# CONFIG_WLAN_PRE80211 is not set 574# CONFIG_HOSTAP is not set
549# CONFIG_WLAN_80211 is not set
550 575
551# 576#
552# Enable WiMAX (Networking options) to see the WiMAX drivers 577# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -591,6 +616,7 @@ CONFIG_SERIAL_CORE=y
591CONFIG_SERIAL_CORE_CONSOLE=y 616CONFIG_SERIAL_CORE_CONSOLE=y
592CONFIG_SERIAL_CPM=y 617CONFIG_SERIAL_CPM=y
593CONFIG_SERIAL_CPM_CONSOLE=y 618CONFIG_SERIAL_CPM_CONSOLE=y
619# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
594CONFIG_UNIX98_PTYS=y 620CONFIG_UNIX98_PTYS=y
595# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 621# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
596# CONFIG_LEGACY_PTYS is not set 622# CONFIG_LEGACY_PTYS is not set
@@ -851,6 +877,7 @@ CONFIG_DEBUG_INFO=y
851# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 877# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
852# CONFIG_FAULT_INJECTION is not set 878# CONFIG_FAULT_INJECTION is not set
853# CONFIG_LATENCYTOP is not set 879# CONFIG_LATENCYTOP is not set
880# CONFIG_SYSCTL_SYSCALL_CHECK is not set
854# CONFIG_DEBUG_PAGEALLOC is not set 881# CONFIG_DEBUG_PAGEALLOC is not set
855CONFIG_HAVE_FUNCTION_TRACER=y 882CONFIG_HAVE_FUNCTION_TRACER=y
856CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 883CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -893,7 +920,11 @@ CONFIG_PRINT_STACK_DEPTH=64
893# CONFIG_KEYS is not set 920# CONFIG_KEYS is not set
894# CONFIG_SECURITY is not set 921# CONFIG_SECURITY is not set
895# CONFIG_SECURITYFS is not set 922# CONFIG_SECURITYFS is not set
896# CONFIG_SECURITY_FILE_CAPABILITIES is not set 923# CONFIG_DEFAULT_SECURITY_SELINUX is not set
924# CONFIG_DEFAULT_SECURITY_SMACK is not set
925# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
926CONFIG_DEFAULT_SECURITY_DAC=y
927CONFIG_DEFAULT_SECURITY=""
897# CONFIG_CRYPTO is not set 928# CONFIG_CRYPTO is not set
898CONFIG_PPC_CLOCK=y 929CONFIG_PPC_CLOCK=y
899CONFIG_PPC_LIB_RHEAP=y 930CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig
index 63c3e8de8f16..9a0c981277eb 100644
--- a/arch/powerpc/configs/linkstation_defconfig
+++ b/arch/powerpc/configs/linkstation_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:08 2009 4# Wed Jan 6 09:24:01 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
58CONFIG_GENERIC_BUG=y 59CONFIG_GENERIC_BUG=y
59CONFIG_DTC=y 60CONFIG_DTC=y
60CONFIG_DEFAULT_UIMAGE=y 61CONFIG_DEFAULT_UIMAGE=y
62CONFIG_ARCH_HIBERNATION_POSSIBLE=y
61# CONFIG_PPC_DCR_NATIVE is not set 63# CONFIG_PPC_DCR_NATIVE is not set
62# CONFIG_PPC_DCR_MMIO is not set 64# CONFIG_PPC_DCR_MMIO is not set
63CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 65CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -86,6 +88,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
86# 88#
87CONFIG_TREE_RCU=y 89CONFIG_TREE_RCU=y
88# CONFIG_TREE_PREEMPT_RCU is not set 90# CONFIG_TREE_PREEMPT_RCU is not set
91# CONFIG_TINY_RCU is not set
89# CONFIG_RCU_TRACE is not set 92# CONFIG_RCU_TRACE is not set
90CONFIG_RCU_FANOUT=32 93CONFIG_RCU_FANOUT=32
91# CONFIG_RCU_FANOUT_EXACT is not set 94# CONFIG_RCU_FANOUT_EXACT is not set
@@ -181,14 +184,41 @@ CONFIG_LBDAF=y
181# IO Schedulers 184# IO Schedulers
182# 185#
183CONFIG_IOSCHED_NOOP=y 186CONFIG_IOSCHED_NOOP=y
184CONFIG_IOSCHED_AS=y
185CONFIG_IOSCHED_DEADLINE=y 187CONFIG_IOSCHED_DEADLINE=y
186CONFIG_IOSCHED_CFQ=y 188CONFIG_IOSCHED_CFQ=y
187CONFIG_DEFAULT_AS=y
188# CONFIG_DEFAULT_DEADLINE is not set 189# CONFIG_DEFAULT_DEADLINE is not set
189# CONFIG_DEFAULT_CFQ is not set 190CONFIG_DEFAULT_CFQ=y
190# CONFIG_DEFAULT_NOOP is not set 191# CONFIG_DEFAULT_NOOP is not set
191CONFIG_DEFAULT_IOSCHED="anticipatory" 192CONFIG_DEFAULT_IOSCHED="cfq"
193# CONFIG_INLINE_SPIN_TRYLOCK is not set
194# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
195# CONFIG_INLINE_SPIN_LOCK is not set
196# CONFIG_INLINE_SPIN_LOCK_BH is not set
197# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
198# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
199CONFIG_INLINE_SPIN_UNLOCK=y
200# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
201CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
202# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
203# CONFIG_INLINE_READ_TRYLOCK is not set
204# CONFIG_INLINE_READ_LOCK is not set
205# CONFIG_INLINE_READ_LOCK_BH is not set
206# CONFIG_INLINE_READ_LOCK_IRQ is not set
207# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
208CONFIG_INLINE_READ_UNLOCK=y
209# CONFIG_INLINE_READ_UNLOCK_BH is not set
210CONFIG_INLINE_READ_UNLOCK_IRQ=y
211# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
212# CONFIG_INLINE_WRITE_TRYLOCK is not set
213# CONFIG_INLINE_WRITE_LOCK is not set
214# CONFIG_INLINE_WRITE_LOCK_BH is not set
215# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
216# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
217CONFIG_INLINE_WRITE_UNLOCK=y
218# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
219CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
220# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
221# CONFIG_MUTEX_SPIN_ON_OWNER is not set
192# CONFIG_FREEZER is not set 222# CONFIG_FREEZER is not set
193 223
194# 224#
@@ -215,6 +245,8 @@ CONFIG_LINKSTATION=y
215CONFIG_MPC10X_BRIDGE=y 245CONFIG_MPC10X_BRIDGE=y
216CONFIG_MPC10X_OPENPIC=y 246CONFIG_MPC10X_OPENPIC=y
217# CONFIG_MPC10X_STORE_GATHERING is not set 247# CONFIG_MPC10X_STORE_GATHERING is not set
248# CONFIG_GAMECUBE is not set
249# CONFIG_WII is not set
218# CONFIG_AMIGAONE is not set 250# CONFIG_AMIGAONE is not set
219CONFIG_PPC_OF_BOOT_TRAMPOLINE=y 251CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
220# CONFIG_IPIC is not set 252# CONFIG_IPIC is not set
@@ -261,6 +293,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
261CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 293CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
262# CONFIG_KEXEC is not set 294# CONFIG_KEXEC is not set
263# CONFIG_CRASH_DUMP is not set 295# CONFIG_CRASH_DUMP is not set
296CONFIG_SPARSE_IRQ=y
264CONFIG_MAX_ACTIVE_REGIONS=32 297CONFIG_MAX_ACTIVE_REGIONS=32
265CONFIG_ARCH_FLATMEM_ENABLE=y 298CONFIG_ARCH_FLATMEM_ENABLE=y
266CONFIG_ARCH_POPULATES_NODE_MAP=y 299CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -277,8 +310,6 @@ CONFIG_MIGRATION=y
277CONFIG_ZONE_DMA_FLAG=1 310CONFIG_ZONE_DMA_FLAG=1
278CONFIG_BOUNCE=y 311CONFIG_BOUNCE=y
279CONFIG_VIRT_TO_BUS=y 312CONFIG_VIRT_TO_BUS=y
280CONFIG_HAVE_MLOCK=y
281CONFIG_HAVE_MLOCKED_PAGE_BIT=y
282# CONFIG_KSM is not set 313# CONFIG_KSM is not set
283CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 314CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
284CONFIG_PPC_4K_PAGES=y 315CONFIG_PPC_4K_PAGES=y
@@ -517,10 +548,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
517# CONFIG_AF_RXRPC is not set 548# CONFIG_AF_RXRPC is not set
518CONFIG_WIRELESS=y 549CONFIG_WIRELESS=y
519# CONFIG_CFG80211 is not set 550# CONFIG_CFG80211 is not set
520CONFIG_CFG80211_DEFAULT_PS_VALUE=0
521CONFIG_WIRELESS_OLD_REGULATORY=y
522CONFIG_WIRELESS_EXT=y
523CONFIG_WIRELESS_EXT_SYSFS=y
524# CONFIG_LIB80211 is not set 551# CONFIG_LIB80211 is not set
525 552
526# 553#
@@ -650,6 +677,10 @@ CONFIG_BLK_DEV=y
650# CONFIG_BLK_DEV_COW_COMMON is not set 677# CONFIG_BLK_DEV_COW_COMMON is not set
651CONFIG_BLK_DEV_LOOP=y 678CONFIG_BLK_DEV_LOOP=y
652# CONFIG_BLK_DEV_CRYPTOLOOP is not set 679# CONFIG_BLK_DEV_CRYPTOLOOP is not set
680
681#
682# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
683#
653# CONFIG_BLK_DEV_NBD is not set 684# CONFIG_BLK_DEV_NBD is not set
654# CONFIG_BLK_DEV_SX8 is not set 685# CONFIG_BLK_DEV_SX8 is not set
655# CONFIG_BLK_DEV_UB is not set 686# CONFIG_BLK_DEV_UB is not set
@@ -661,6 +692,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
661# CONFIG_ATA_OVER_ETH is not set 692# CONFIG_ATA_OVER_ETH is not set
662# CONFIG_BLK_DEV_HD is not set 693# CONFIG_BLK_DEV_HD is not set
663CONFIG_MISC_DEVICES=y 694CONFIG_MISC_DEVICES=y
695# CONFIG_AD525X_DPOT is not set
664# CONFIG_PHANTOM is not set 696# CONFIG_PHANTOM is not set
665# CONFIG_SGI_IOC4 is not set 697# CONFIG_SGI_IOC4 is not set
666# CONFIG_TIFM_CORE is not set 698# CONFIG_TIFM_CORE is not set
@@ -668,6 +700,7 @@ CONFIG_MISC_DEVICES=y
668# CONFIG_ENCLOSURE_SERVICES is not set 700# CONFIG_ENCLOSURE_SERVICES is not set
669# CONFIG_HP_ILO is not set 701# CONFIG_HP_ILO is not set
670# CONFIG_ISL29003 is not set 702# CONFIG_ISL29003 is not set
703# CONFIG_DS1682 is not set
671# CONFIG_C2PORT is not set 704# CONFIG_C2PORT is not set
672 705
673# 706#
@@ -720,7 +753,9 @@ CONFIG_SCSI_LOWLEVEL=y
720# CONFIG_SCSI_BNX2_ISCSI is not set 753# CONFIG_SCSI_BNX2_ISCSI is not set
721# CONFIG_BE2ISCSI is not set 754# CONFIG_BE2ISCSI is not set
722# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 755# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
756# CONFIG_SCSI_HPSA is not set
723# CONFIG_SCSI_3W_9XXX is not set 757# CONFIG_SCSI_3W_9XXX is not set
758# CONFIG_SCSI_3W_SAS is not set
724# CONFIG_SCSI_ACARD is not set 759# CONFIG_SCSI_ACARD is not set
725# CONFIG_SCSI_AACRAID is not set 760# CONFIG_SCSI_AACRAID is not set
726# CONFIG_SCSI_AIC7XXX is not set 761# CONFIG_SCSI_AIC7XXX is not set
@@ -759,6 +794,7 @@ CONFIG_SCSI_LOWLEVEL=y
759# CONFIG_SCSI_NSP32 is not set 794# CONFIG_SCSI_NSP32 is not set
760# CONFIG_SCSI_DEBUG is not set 795# CONFIG_SCSI_DEBUG is not set
761# CONFIG_SCSI_PMCRAID is not set 796# CONFIG_SCSI_PMCRAID is not set
797# CONFIG_SCSI_PM8001 is not set
762# CONFIG_SCSI_SRP is not set 798# CONFIG_SCSI_SRP is not set
763# CONFIG_SCSI_BFA_FC is not set 799# CONFIG_SCSI_BFA_FC is not set
764# CONFIG_SCSI_DH is not set 800# CONFIG_SCSI_DH is not set
@@ -814,15 +850,16 @@ CONFIG_PATA_IT821X=y
814# CONFIG_PATA_NS87415 is not set 850# CONFIG_PATA_NS87415 is not set
815# CONFIG_PATA_OPTI is not set 851# CONFIG_PATA_OPTI is not set
816# CONFIG_PATA_OPTIDMA is not set 852# CONFIG_PATA_OPTIDMA is not set
853# CONFIG_PATA_PDC2027X is not set
817# CONFIG_PATA_PDC_OLD is not set 854# CONFIG_PATA_PDC_OLD is not set
818# CONFIG_PATA_RADISYS is not set 855# CONFIG_PATA_RADISYS is not set
819# CONFIG_PATA_RDC is not set 856# CONFIG_PATA_RDC is not set
820# CONFIG_PATA_RZ1000 is not set 857# CONFIG_PATA_RZ1000 is not set
821# CONFIG_PATA_SC1200 is not set 858# CONFIG_PATA_SC1200 is not set
822# CONFIG_PATA_SERVERWORKS is not set 859# CONFIG_PATA_SERVERWORKS is not set
823# CONFIG_PATA_PDC2027X is not set
824CONFIG_PATA_SIL680=y 860CONFIG_PATA_SIL680=y
825# CONFIG_PATA_SIS is not set 861# CONFIG_PATA_SIS is not set
862# CONFIG_PATA_TOSHIBA is not set
826# CONFIG_PATA_VIA is not set 863# CONFIG_PATA_VIA is not set
827# CONFIG_PATA_WINBOND is not set 864# CONFIG_PATA_WINBOND is not set
828# CONFIG_PATA_PLATFORM is not set 865# CONFIG_PATA_PLATFORM is not set
@@ -839,7 +876,7 @@ CONFIG_PATA_SIL680=y
839# 876#
840 877
841# 878#
842# See the help texts for more information. 879# The newer stack is recommended.
843# 880#
844# CONFIG_FIREWIRE is not set 881# CONFIG_FIREWIRE is not set
845# CONFIG_IEEE1394 is not set 882# CONFIG_IEEE1394 is not set
@@ -934,8 +971,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
934# CONFIG_BE2NET is not set 971# CONFIG_BE2NET is not set
935# CONFIG_TR is not set 972# CONFIG_TR is not set
936CONFIG_WLAN=y 973CONFIG_WLAN=y
937# CONFIG_WLAN_PRE80211 is not set 974# CONFIG_AIRO is not set
938# CONFIG_WLAN_80211 is not set 975# CONFIG_ATMEL is not set
976# CONFIG_PRISM54 is not set
977# CONFIG_USB_ZD1201 is not set
978# CONFIG_HOSTAP is not set
939 979
940# 980#
941# Enable WiMAX (Networking options) to see the WiMAX drivers 981# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -960,6 +1000,7 @@ CONFIG_NETCONSOLE=y
960CONFIG_NETPOLL=y 1000CONFIG_NETPOLL=y
961# CONFIG_NETPOLL_TRAP is not set 1001# CONFIG_NETPOLL_TRAP is not set
962CONFIG_NET_POLL_CONTROLLER=y 1002CONFIG_NET_POLL_CONTROLLER=y
1003# CONFIG_VMXNET3 is not set
963# CONFIG_ISDN is not set 1004# CONFIG_ISDN is not set
964# CONFIG_PHONE is not set 1005# CONFIG_PHONE is not set
965 1006
@@ -969,6 +1010,7 @@ CONFIG_NET_POLL_CONTROLLER=y
969CONFIG_INPUT=y 1010CONFIG_INPUT=y
970# CONFIG_INPUT_FF_MEMLESS is not set 1011# CONFIG_INPUT_FF_MEMLESS is not set
971# CONFIG_INPUT_POLLDEV is not set 1012# CONFIG_INPUT_POLLDEV is not set
1013# CONFIG_INPUT_SPARSEKMAP is not set
972 1014
973# 1015#
974# Userland interfaces 1016# Userland interfaces
@@ -1007,6 +1049,7 @@ CONFIG_SERIO_SERPORT=y
1007# CONFIG_SERIO_PCIPS2 is not set 1049# CONFIG_SERIO_PCIPS2 is not set
1008# CONFIG_SERIO_RAW is not set 1050# CONFIG_SERIO_RAW is not set
1009# CONFIG_SERIO_XILINX_XPS_PS2 is not set 1051# CONFIG_SERIO_XILINX_XPS_PS2 is not set
1052# CONFIG_SERIO_ALTERA_PS2 is not set
1010# CONFIG_GAMEPORT is not set 1053# CONFIG_GAMEPORT is not set
1011 1054
1012# 1055#
@@ -1039,6 +1082,7 @@ CONFIG_SERIAL_CORE=y
1039CONFIG_SERIAL_CORE_CONSOLE=y 1082CONFIG_SERIAL_CORE_CONSOLE=y
1040# CONFIG_SERIAL_JSM is not set 1083# CONFIG_SERIAL_JSM is not set
1041# CONFIG_SERIAL_OF_PLATFORM is not set 1084# CONFIG_SERIAL_OF_PLATFORM is not set
1085# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
1042CONFIG_UNIX98_PTYS=y 1086CONFIG_UNIX98_PTYS=y
1043# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1087# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
1044CONFIG_LEGACY_PTYS=y 1088CONFIG_LEGACY_PTYS=y
@@ -1096,11 +1140,6 @@ CONFIG_I2C_MPC=y
1096# CONFIG_I2C_TINY_USB is not set 1140# CONFIG_I2C_TINY_USB is not set
1097 1141
1098# 1142#
1099# Graphics adapter I2C/DDC channel drivers
1100#
1101# CONFIG_I2C_VOODOO3 is not set
1102
1103#
1104# Other I2C/SMBus bus drivers 1143# Other I2C/SMBus bus drivers
1105# 1144#
1106# CONFIG_I2C_PCA_PLATFORM is not set 1145# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1109,7 +1148,6 @@ CONFIG_I2C_MPC=y
1109# 1148#
1110# Miscellaneous I2C Chip support 1149# Miscellaneous I2C Chip support
1111# 1150#
1112# CONFIG_DS1682 is not set
1113# CONFIG_SENSORS_TSL2550 is not set 1151# CONFIG_SENSORS_TSL2550 is not set
1114# CONFIG_I2C_DEBUG_CORE is not set 1152# CONFIG_I2C_DEBUG_CORE is not set
1115# CONFIG_I2C_DEBUG_ALGO is not set 1153# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1155,6 +1193,7 @@ CONFIG_HWMON=y
1155# CONFIG_SENSORS_GL520SM is not set 1193# CONFIG_SENSORS_GL520SM is not set
1156# CONFIG_SENSORS_IT87 is not set 1194# CONFIG_SENSORS_IT87 is not set
1157# CONFIG_SENSORS_LM63 is not set 1195# CONFIG_SENSORS_LM63 is not set
1196# CONFIG_SENSORS_LM73 is not set
1158# CONFIG_SENSORS_LM75 is not set 1197# CONFIG_SENSORS_LM75 is not set
1159# CONFIG_SENSORS_LM77 is not set 1198# CONFIG_SENSORS_LM77 is not set
1160# CONFIG_SENSORS_LM78 is not set 1199# CONFIG_SENSORS_LM78 is not set
@@ -1193,6 +1232,7 @@ CONFIG_HWMON=y
1193# CONFIG_SENSORS_W83L786NG is not set 1232# CONFIG_SENSORS_W83L786NG is not set
1194# CONFIG_SENSORS_W83627HF is not set 1233# CONFIG_SENSORS_W83627HF is not set
1195# CONFIG_SENSORS_W83627EHF is not set 1234# CONFIG_SENSORS_W83627EHF is not set
1235# CONFIG_SENSORS_LIS3_I2C is not set
1196# CONFIG_THERMAL is not set 1236# CONFIG_THERMAL is not set
1197# CONFIG_WATCHDOG is not set 1237# CONFIG_WATCHDOG is not set
1198CONFIG_SSB_POSSIBLE=y 1238CONFIG_SSB_POSSIBLE=y
@@ -1211,11 +1251,13 @@ CONFIG_SSB_POSSIBLE=y
1211# CONFIG_TWL4030_CORE is not set 1251# CONFIG_TWL4030_CORE is not set
1212# CONFIG_MFD_TMIO is not set 1252# CONFIG_MFD_TMIO is not set
1213# CONFIG_PMIC_DA903X is not set 1253# CONFIG_PMIC_DA903X is not set
1254# CONFIG_PMIC_ADP5520 is not set
1214# CONFIG_MFD_WM8400 is not set 1255# CONFIG_MFD_WM8400 is not set
1215# CONFIG_MFD_WM831X is not set 1256# CONFIG_MFD_WM831X is not set
1216# CONFIG_MFD_WM8350_I2C is not set 1257# CONFIG_MFD_WM8350_I2C is not set
1217# CONFIG_MFD_PCF50633 is not set 1258# CONFIG_MFD_PCF50633 is not set
1218# CONFIG_AB3100_CORE is not set 1259# CONFIG_AB3100_CORE is not set
1260# CONFIG_MFD_88PM8607 is not set
1219# CONFIG_REGULATOR is not set 1261# CONFIG_REGULATOR is not set
1220# CONFIG_MEDIA_SUPPORT is not set 1262# CONFIG_MEDIA_SUPPORT is not set
1221 1263
@@ -1281,6 +1323,7 @@ CONFIG_USB_MON=y
1281CONFIG_USB_EHCI_HCD=y 1323CONFIG_USB_EHCI_HCD=y
1282# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1324# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1283# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1325# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1326# CONFIG_XPS_USB_HCD_XILINX is not set
1284# CONFIG_USB_EHCI_FSL is not set 1327# CONFIG_USB_EHCI_FSL is not set
1285CONFIG_USB_EHCI_HCD_PPC_OF=y 1328CONFIG_USB_EHCI_HCD_PPC_OF=y
1286# CONFIG_USB_OXU210HP_HCD is not set 1329# CONFIG_USB_OXU210HP_HCD is not set
@@ -1454,6 +1497,7 @@ CONFIG_RTC_DRV_RS5C372=y
1454# CONFIG_RTC_DRV_PCF8563 is not set 1497# CONFIG_RTC_DRV_PCF8563 is not set
1455# CONFIG_RTC_DRV_PCF8583 is not set 1498# CONFIG_RTC_DRV_PCF8583 is not set
1456# CONFIG_RTC_DRV_M41T80 is not set 1499# CONFIG_RTC_DRV_M41T80 is not set
1500# CONFIG_RTC_DRV_BQ32K is not set
1457# CONFIG_RTC_DRV_S35390A is not set 1501# CONFIG_RTC_DRV_S35390A is not set
1458# CONFIG_RTC_DRV_FM3130 is not set 1502# CONFIG_RTC_DRV_FM3130 is not set
1459# CONFIG_RTC_DRV_RX8581 is not set 1503# CONFIG_RTC_DRV_RX8581 is not set
@@ -1475,7 +1519,9 @@ CONFIG_RTC_DRV_RS5C372=y
1475# CONFIG_RTC_DRV_M48T86 is not set 1519# CONFIG_RTC_DRV_M48T86 is not set
1476# CONFIG_RTC_DRV_M48T35 is not set 1520# CONFIG_RTC_DRV_M48T35 is not set
1477# CONFIG_RTC_DRV_M48T59 is not set 1521# CONFIG_RTC_DRV_M48T59 is not set
1522# CONFIG_RTC_DRV_MSM6242 is not set
1478# CONFIG_RTC_DRV_BQ4802 is not set 1523# CONFIG_RTC_DRV_BQ4802 is not set
1524# CONFIG_RTC_DRV_RP5C01 is not set
1479# CONFIG_RTC_DRV_V3020 is not set 1525# CONFIG_RTC_DRV_V3020 is not set
1480 1526
1481# 1527#
@@ -1786,7 +1832,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1786# CONFIG_KEYS is not set 1832# CONFIG_KEYS is not set
1787# CONFIG_SECURITY is not set 1833# CONFIG_SECURITY is not set
1788# CONFIG_SECURITYFS is not set 1834# CONFIG_SECURITYFS is not set
1789# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1835# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1836# CONFIG_DEFAULT_SECURITY_SMACK is not set
1837# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1838CONFIG_DEFAULT_SECURITY_DAC=y
1839CONFIG_DEFAULT_SECURITY=""
1790CONFIG_CRYPTO=y 1840CONFIG_CRYPTO=y
1791 1841
1792# 1842#
diff --git a/arch/powerpc/configs/mgcoge_defconfig b/arch/powerpc/configs/mgcoge_defconfig
index 520b04a0def9..4c2c877f9363 100644
--- a/arch/powerpc/configs/mgcoge_defconfig
+++ b/arch/powerpc/configs/mgcoge_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:09 2009 4# Wed Jan 6 09:24:02 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,7 +60,6 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61# CONFIG_DEFAULT_UIMAGE is not set 62# CONFIG_DEFAULT_UIMAGE is not set
62CONFIG_HIBERNATE_32=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y 63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 64# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 65# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 87#
88CONFIG_TREE_RCU=y 88CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 91# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 92CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 93# CONFIG_RCU_FANOUT_EXACT is not set
@@ -168,14 +169,41 @@ CONFIG_BLK_DEV_BSG=y
168# IO Schedulers 169# IO Schedulers
169# 170#
170CONFIG_IOSCHED_NOOP=y 171CONFIG_IOSCHED_NOOP=y
171# CONFIG_IOSCHED_AS is not set
172CONFIG_IOSCHED_DEADLINE=y 172CONFIG_IOSCHED_DEADLINE=y
173# CONFIG_IOSCHED_CFQ is not set 173# CONFIG_IOSCHED_CFQ is not set
174# CONFIG_DEFAULT_AS is not set
175CONFIG_DEFAULT_DEADLINE=y 174CONFIG_DEFAULT_DEADLINE=y
176# CONFIG_DEFAULT_CFQ is not set 175# CONFIG_DEFAULT_CFQ is not set
177# CONFIG_DEFAULT_NOOP is not set 176# CONFIG_DEFAULT_NOOP is not set
178CONFIG_DEFAULT_IOSCHED="deadline" 177CONFIG_DEFAULT_IOSCHED="deadline"
178# CONFIG_INLINE_SPIN_TRYLOCK is not set
179# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
180# CONFIG_INLINE_SPIN_LOCK is not set
181# CONFIG_INLINE_SPIN_LOCK_BH is not set
182# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
183# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
184CONFIG_INLINE_SPIN_UNLOCK=y
185# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
186CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
187# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
188# CONFIG_INLINE_READ_TRYLOCK is not set
189# CONFIG_INLINE_READ_LOCK is not set
190# CONFIG_INLINE_READ_LOCK_BH is not set
191# CONFIG_INLINE_READ_LOCK_IRQ is not set
192# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
193CONFIG_INLINE_READ_UNLOCK=y
194# CONFIG_INLINE_READ_UNLOCK_BH is not set
195CONFIG_INLINE_READ_UNLOCK_IRQ=y
196# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
197# CONFIG_INLINE_WRITE_TRYLOCK is not set
198# CONFIG_INLINE_WRITE_LOCK is not set
199# CONFIG_INLINE_WRITE_LOCK_BH is not set
200# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
201# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
202CONFIG_INLINE_WRITE_UNLOCK=y
203# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
204CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
205# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
206# CONFIG_MUTEX_SPIN_ON_OWNER is not set
179# CONFIG_FREEZER is not set 207# CONFIG_FREEZER is not set
180 208
181# 209#
@@ -208,7 +236,8 @@ CONFIG_MPIC=y
208# CONFIG_MPIC_WEIRD is not set 236# CONFIG_MPIC_WEIRD is not set
209CONFIG_PPC_I8259=y 237CONFIG_PPC_I8259=y
210CONFIG_PPC_RTAS=y 238CONFIG_PPC_RTAS=y
211# CONFIG_RTAS_ERROR_LOGGING is not set 239CONFIG_RTAS_ERROR_LOGGING=y
240CONFIG_PPC_RTAS_DAEMON=y
212CONFIG_RTAS_PROC=y 241CONFIG_RTAS_PROC=y
213# CONFIG_MMIO_NVRAM is not set 242# CONFIG_MMIO_NVRAM is not set
214CONFIG_PPC_MPC106=y 243CONFIG_PPC_MPC106=y
@@ -250,6 +279,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
250CONFIG_ARCH_HAS_WALK_MEMORY=y 279CONFIG_ARCH_HAS_WALK_MEMORY=y
251CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 280CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
252# CONFIG_CRASH_DUMP is not set 281# CONFIG_CRASH_DUMP is not set
282CONFIG_SPARSE_IRQ=y
253CONFIG_MAX_ACTIVE_REGIONS=32 283CONFIG_MAX_ACTIVE_REGIONS=32
254CONFIG_ARCH_FLATMEM_ENABLE=y 284CONFIG_ARCH_FLATMEM_ENABLE=y
255CONFIG_ARCH_POPULATES_NODE_MAP=y 285CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -262,8 +292,6 @@ CONFIG_MIGRATION=y
262CONFIG_ZONE_DMA_FLAG=1 292CONFIG_ZONE_DMA_FLAG=1
263CONFIG_BOUNCE=y 293CONFIG_BOUNCE=y
264CONFIG_VIRT_TO_BUS=y 294CONFIG_VIRT_TO_BUS=y
265CONFIG_HAVE_MLOCK=y
266CONFIG_HAVE_MLOCKED_PAGE_BIT=y
267# CONFIG_KSM is not set 295# CONFIG_KSM is not set
268CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 296CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
269CONFIG_PPC_4K_PAGES=y 297CONFIG_PPC_4K_PAGES=y
@@ -395,9 +423,6 @@ CONFIG_NETFILTER_ADVANCED=y
395# CONFIG_BT is not set 423# CONFIG_BT is not set
396CONFIG_WIRELESS=y 424CONFIG_WIRELESS=y
397# CONFIG_CFG80211 is not set 425# CONFIG_CFG80211 is not set
398CONFIG_CFG80211_DEFAULT_PS_VALUE=0
399CONFIG_WIRELESS_OLD_REGULATORY=y
400# CONFIG_WIRELESS_EXT is not set
401# CONFIG_LIB80211 is not set 426# CONFIG_LIB80211 is not set
402 427
403# 428#
@@ -525,6 +550,10 @@ CONFIG_BLK_DEV=y
525# CONFIG_BLK_DEV_COW_COMMON is not set 550# CONFIG_BLK_DEV_COW_COMMON is not set
526CONFIG_BLK_DEV_LOOP=y 551CONFIG_BLK_DEV_LOOP=y
527# CONFIG_BLK_DEV_CRYPTOLOOP is not set 552# CONFIG_BLK_DEV_CRYPTOLOOP is not set
553
554#
555# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
556#
528# CONFIG_BLK_DEV_NBD is not set 557# CONFIG_BLK_DEV_NBD is not set
529# CONFIG_BLK_DEV_SX8 is not set 558# CONFIG_BLK_DEV_SX8 is not set
530CONFIG_BLK_DEV_RAM=y 559CONFIG_BLK_DEV_RAM=y
@@ -558,7 +587,7 @@ CONFIG_HAVE_IDE=y
558# 587#
559 588
560# 589#
561# See the help texts for more information. 590# The newer stack is recommended.
562# 591#
563# CONFIG_FIREWIRE is not set 592# CONFIG_FIREWIRE is not set
564# CONFIG_IEEE1394 is not set 593# CONFIG_IEEE1394 is not set
@@ -625,8 +654,9 @@ CONFIG_FS_ENET_MDIO_FCC=y
625# CONFIG_NETDEV_10000 is not set 654# CONFIG_NETDEV_10000 is not set
626# CONFIG_TR is not set 655# CONFIG_TR is not set
627CONFIG_WLAN=y 656CONFIG_WLAN=y
628# CONFIG_WLAN_PRE80211 is not set 657# CONFIG_AIRO is not set
629# CONFIG_WLAN_80211 is not set 658# CONFIG_ATMEL is not set
659# CONFIG_HOSTAP is not set
630 660
631# 661#
632# Enable WiMAX (Networking options) to see the WiMAX drivers 662# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -637,6 +667,7 @@ CONFIG_WLAN=y
637# CONFIG_SLIP is not set 667# CONFIG_SLIP is not set
638# CONFIG_NETPOLL is not set 668# CONFIG_NETPOLL is not set
639# CONFIG_NET_POLL_CONTROLLER is not set 669# CONFIG_NET_POLL_CONTROLLER is not set
670# CONFIG_VMXNET3 is not set
640# CONFIG_ISDN is not set 671# CONFIG_ISDN is not set
641# CONFIG_PHONE is not set 672# CONFIG_PHONE is not set
642 673
@@ -673,6 +704,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
673CONFIG_SERIAL_CPM=y 704CONFIG_SERIAL_CPM=y
674CONFIG_SERIAL_CPM_CONSOLE=y 705CONFIG_SERIAL_CPM_CONSOLE=y
675# CONFIG_SERIAL_JSM is not set 706# CONFIG_SERIAL_JSM is not set
707# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
676CONFIG_UNIX98_PTYS=y 708CONFIG_UNIX98_PTYS=y
677# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 709# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
678CONFIG_LEGACY_PTYS=y 710CONFIG_LEGACY_PTYS=y
@@ -734,11 +766,6 @@ CONFIG_I2C_CPM=y
734# CONFIG_I2C_PARPORT_LIGHT is not set 766# CONFIG_I2C_PARPORT_LIGHT is not set
735 767
736# 768#
737# Graphics adapter I2C/DDC channel drivers
738#
739# CONFIG_I2C_VOODOO3 is not set
740
741#
742# Other I2C/SMBus bus drivers 769# Other I2C/SMBus bus drivers
743# 770#
744# CONFIG_I2C_PCA_PLATFORM is not set 771# CONFIG_I2C_PCA_PLATFORM is not set
@@ -775,6 +802,7 @@ CONFIG_GPIOLIB=y
775# 802#
776# PCI GPIO expanders: 803# PCI GPIO expanders:
777# 804#
805# CONFIG_GPIO_CS5535 is not set
778# CONFIG_GPIO_BT8XX is not set 806# CONFIG_GPIO_BT8XX is not set
779# CONFIG_GPIO_LANGWELL is not set 807# CONFIG_GPIO_LANGWELL is not set
780 808
@@ -807,11 +835,13 @@ CONFIG_SSB_POSSIBLE=y
807# CONFIG_TWL4030_CORE is not set 835# CONFIG_TWL4030_CORE is not set
808# CONFIG_MFD_TMIO is not set 836# CONFIG_MFD_TMIO is not set
809# CONFIG_PMIC_DA903X is not set 837# CONFIG_PMIC_DA903X is not set
838# CONFIG_PMIC_ADP5520 is not set
810# CONFIG_MFD_WM8400 is not set 839# CONFIG_MFD_WM8400 is not set
811# CONFIG_MFD_WM831X is not set 840# CONFIG_MFD_WM831X is not set
812# CONFIG_MFD_WM8350_I2C is not set 841# CONFIG_MFD_WM8350_I2C is not set
813# CONFIG_MFD_PCF50633 is not set 842# CONFIG_MFD_PCF50633 is not set
814# CONFIG_AB3100_CORE is not set 843# CONFIG_AB3100_CORE is not set
844# CONFIG_MFD_88PM8607 is not set
815# CONFIG_REGULATOR is not set 845# CONFIG_REGULATOR is not set
816# CONFIG_MEDIA_SUPPORT is not set 846# CONFIG_MEDIA_SUPPORT is not set
817 847
@@ -1118,7 +1148,11 @@ CONFIG_BDI_SWITCH=y
1118# CONFIG_KEYS is not set 1148# CONFIG_KEYS is not set
1119# CONFIG_SECURITY is not set 1149# CONFIG_SECURITY is not set
1120# CONFIG_SECURITYFS is not set 1150# CONFIG_SECURITYFS is not set
1121# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1151# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1152# CONFIG_DEFAULT_SECURITY_SMACK is not set
1153# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1154CONFIG_DEFAULT_SECURITY_DAC=y
1155CONFIG_DEFAULT_SECURITY=""
1122CONFIG_CRYPTO=y 1156CONFIG_CRYPTO=y
1123 1157
1124# 1158#
diff --git a/arch/powerpc/configs/mgsuvd_defconfig b/arch/powerpc/configs/mgsuvd_defconfig
index 43c3c4fcdce3..9e090f2c7e36 100644
--- a/arch/powerpc/configs/mgsuvd_defconfig
+++ b/arch/powerpc/configs/mgsuvd_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:10 2009 4# Wed Jan 6 09:24:03 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
34CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
35CONFIG_NR_IRQS=512
35CONFIG_STACKTRACE_SUPPORT=y 36CONFIG_STACKTRACE_SUPPORT=y
36CONFIG_HAVE_LATENCYTOP_SUPPORT=y 37CONFIG_HAVE_LATENCYTOP_SUPPORT=y
37CONFIG_TRACE_IRQFLAGS_SUPPORT=y 38CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -53,6 +54,7 @@ CONFIG_OF=y
53CONFIG_AUDIT_ARCH=y 54CONFIG_AUDIT_ARCH=y
54CONFIG_DTC=y 55CONFIG_DTC=y
55# CONFIG_DEFAULT_UIMAGE is not set 56# CONFIG_DEFAULT_UIMAGE is not set
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
56# CONFIG_PPC_DCR_NATIVE is not set 58# CONFIG_PPC_DCR_NATIVE is not set
57# CONFIG_PPC_DCR_MMIO is not set 59# CONFIG_PPC_DCR_MMIO is not set
58CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 60CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -80,6 +82,7 @@ CONFIG_SYSVIPC_SYSCTL=y
80# 82#
81CONFIG_TREE_RCU=y 83CONFIG_TREE_RCU=y
82# CONFIG_TREE_PREEMPT_RCU is not set 84# CONFIG_TREE_PREEMPT_RCU is not set
85# CONFIG_TINY_RCU is not set
83# CONFIG_RCU_TRACE is not set 86# CONFIG_RCU_TRACE is not set
84CONFIG_RCU_FANOUT=32 87CONFIG_RCU_FANOUT=32
85# CONFIG_RCU_FANOUT_EXACT is not set 88# CONFIG_RCU_FANOUT_EXACT is not set
@@ -162,14 +165,41 @@ CONFIG_LBDAF=y
162# IO Schedulers 165# IO Schedulers
163# 166#
164CONFIG_IOSCHED_NOOP=y 167CONFIG_IOSCHED_NOOP=y
165CONFIG_IOSCHED_AS=y
166CONFIG_IOSCHED_DEADLINE=y 168CONFIG_IOSCHED_DEADLINE=y
167CONFIG_IOSCHED_CFQ=y 169CONFIG_IOSCHED_CFQ=y
168CONFIG_DEFAULT_AS=y
169# CONFIG_DEFAULT_DEADLINE is not set 170# CONFIG_DEFAULT_DEADLINE is not set
170# CONFIG_DEFAULT_CFQ is not set 171CONFIG_DEFAULT_CFQ=y
171# CONFIG_DEFAULT_NOOP is not set 172# CONFIG_DEFAULT_NOOP is not set
172CONFIG_DEFAULT_IOSCHED="anticipatory" 173CONFIG_DEFAULT_IOSCHED="cfq"
174# CONFIG_INLINE_SPIN_TRYLOCK is not set
175# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
176# CONFIG_INLINE_SPIN_LOCK is not set
177# CONFIG_INLINE_SPIN_LOCK_BH is not set
178# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
179# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
180CONFIG_INLINE_SPIN_UNLOCK=y
181# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
182CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
183# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
184# CONFIG_INLINE_READ_TRYLOCK is not set
185# CONFIG_INLINE_READ_LOCK is not set
186# CONFIG_INLINE_READ_LOCK_BH is not set
187# CONFIG_INLINE_READ_LOCK_IRQ is not set
188# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
189CONFIG_INLINE_READ_UNLOCK=y
190# CONFIG_INLINE_READ_UNLOCK_BH is not set
191CONFIG_INLINE_READ_UNLOCK_IRQ=y
192# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
193# CONFIG_INLINE_WRITE_TRYLOCK is not set
194# CONFIG_INLINE_WRITE_LOCK is not set
195# CONFIG_INLINE_WRITE_LOCK_BH is not set
196# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
197# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
198CONFIG_INLINE_WRITE_UNLOCK=y
199# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
200CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
201# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
202# CONFIG_MUTEX_SPIN_ON_OWNER is not set
173# CONFIG_FREEZER is not set 203# CONFIG_FREEZER is not set
174 204
175# 205#
@@ -244,6 +274,7 @@ CONFIG_MATH_EMULATION=y
244CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 274CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
245CONFIG_ARCH_HAS_WALK_MEMORY=y 275CONFIG_ARCH_HAS_WALK_MEMORY=y
246CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 276CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
277CONFIG_SPARSE_IRQ=y
247CONFIG_MAX_ACTIVE_REGIONS=32 278CONFIG_MAX_ACTIVE_REGIONS=32
248CONFIG_ARCH_FLATMEM_ENABLE=y 279CONFIG_ARCH_FLATMEM_ENABLE=y
249CONFIG_ARCH_POPULATES_NODE_MAP=y 280CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -260,8 +291,6 @@ CONFIG_MIGRATION=y
260CONFIG_ZONE_DMA_FLAG=1 291CONFIG_ZONE_DMA_FLAG=1
261CONFIG_BOUNCE=y 292CONFIG_BOUNCE=y
262CONFIG_VIRT_TO_BUS=y 293CONFIG_VIRT_TO_BUS=y
263CONFIG_HAVE_MLOCK=y
264CONFIG_HAVE_MLOCKED_PAGE_BIT=y
265# CONFIG_KSM is not set 294# CONFIG_KSM is not set
266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 295CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
267CONFIG_PPC_4K_PAGES=y 296CONFIG_PPC_4K_PAGES=y
@@ -379,9 +408,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
379# CONFIG_AF_RXRPC is not set 408# CONFIG_AF_RXRPC is not set
380CONFIG_WIRELESS=y 409CONFIG_WIRELESS=y
381# CONFIG_CFG80211 is not set 410# CONFIG_CFG80211 is not set
382CONFIG_CFG80211_DEFAULT_PS_VALUE=0
383CONFIG_WIRELESS_OLD_REGULATORY=y
384# CONFIG_WIRELESS_EXT is not set
385# CONFIG_LIB80211 is not set 411# CONFIG_LIB80211 is not set
386 412
387# 413#
@@ -497,6 +523,10 @@ CONFIG_BLK_DEV=y
497# CONFIG_BLK_DEV_COW_COMMON is not set 523# CONFIG_BLK_DEV_COW_COMMON is not set
498CONFIG_BLK_DEV_LOOP=y 524CONFIG_BLK_DEV_LOOP=y
499# CONFIG_BLK_DEV_CRYPTOLOOP is not set 525# CONFIG_BLK_DEV_CRYPTOLOOP is not set
526
527#
528# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
529#
500# CONFIG_BLK_DEV_NBD is not set 530# CONFIG_BLK_DEV_NBD is not set
501CONFIG_BLK_DEV_RAM=y 531CONFIG_BLK_DEV_RAM=y
502CONFIG_BLK_DEV_RAM_COUNT=16 532CONFIG_BLK_DEV_RAM_COUNT=16
@@ -568,8 +598,7 @@ CONFIG_FS_ENET_HAS_SCC=y
568# CONFIG_NETDEV_1000 is not set 598# CONFIG_NETDEV_1000 is not set
569# CONFIG_NETDEV_10000 is not set 599# CONFIG_NETDEV_10000 is not set
570CONFIG_WLAN=y 600CONFIG_WLAN=y
571# CONFIG_WLAN_PRE80211 is not set 601# CONFIG_HOSTAP is not set
572# CONFIG_WLAN_80211 is not set
573 602
574# 603#
575# Enable WiMAX (Networking options) to see the WiMAX drivers 604# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -614,6 +643,7 @@ CONFIG_SERIAL_CORE=y
614CONFIG_SERIAL_CORE_CONSOLE=y 643CONFIG_SERIAL_CORE_CONSOLE=y
615CONFIG_SERIAL_CPM=y 644CONFIG_SERIAL_CPM=y
616CONFIG_SERIAL_CPM_CONSOLE=y 645CONFIG_SERIAL_CPM_CONSOLE=y
646# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
617CONFIG_UNIX98_PTYS=y 647CONFIG_UNIX98_PTYS=y
618# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 648# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
619# CONFIG_LEGACY_PTYS is not set 649# CONFIG_LEGACY_PTYS is not set
@@ -863,6 +893,7 @@ CONFIG_DEBUG_FS=y
863# CONFIG_DEBUG_MEMORY_INIT is not set 893# CONFIG_DEBUG_MEMORY_INIT is not set
864# CONFIG_RCU_CPU_STALL_DETECTOR is not set 894# CONFIG_RCU_CPU_STALL_DETECTOR is not set
865# CONFIG_LATENCYTOP is not set 895# CONFIG_LATENCYTOP is not set
896# CONFIG_SYSCTL_SYSCALL_CHECK is not set
866CONFIG_HAVE_FUNCTION_TRACER=y 897CONFIG_HAVE_FUNCTION_TRACER=y
867CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 898CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
868CONFIG_HAVE_DYNAMIC_FTRACE=y 899CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -887,7 +918,11 @@ CONFIG_PRINT_STACK_DEPTH=64
887# CONFIG_KEYS is not set 918# CONFIG_KEYS is not set
888# CONFIG_SECURITY is not set 919# CONFIG_SECURITY is not set
889# CONFIG_SECURITYFS is not set 920# CONFIG_SECURITYFS is not set
890# CONFIG_SECURITY_FILE_CAPABILITIES is not set 921# CONFIG_DEFAULT_SECURITY_SELINUX is not set
922# CONFIG_DEFAULT_SECURITY_SMACK is not set
923# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
924CONFIG_DEFAULT_SECURITY_DAC=y
925CONFIG_DEFAULT_SECURITY=""
891CONFIG_CRYPTO=y 926CONFIG_CRYPTO=y
892 927
893# 928#
diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig
index 523d5fe18c0e..61cf73d0000f 100644
--- a/arch/powerpc/configs/mpc5200_defconfig
+++ b/arch/powerpc/configs/mpc5200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc4 3# Linux kernel version: 2.6.33-rc2
4# Thu Oct 15 10:33:21 2009 4# Wed Dec 30 15:08:52 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -170,14 +173,41 @@ CONFIG_LBDAF=y
170# IO Schedulers 173# IO Schedulers
171# 174#
172CONFIG_IOSCHED_NOOP=y 175CONFIG_IOSCHED_NOOP=y
173CONFIG_IOSCHED_AS=y
174CONFIG_IOSCHED_DEADLINE=y 176CONFIG_IOSCHED_DEADLINE=y
175CONFIG_IOSCHED_CFQ=y 177CONFIG_IOSCHED_CFQ=y
176CONFIG_DEFAULT_AS=y
177# CONFIG_DEFAULT_DEADLINE is not set 178# CONFIG_DEFAULT_DEADLINE is not set
178# CONFIG_DEFAULT_CFQ is not set 179CONFIG_DEFAULT_CFQ=y
179# CONFIG_DEFAULT_NOOP is not set 180# CONFIG_DEFAULT_NOOP is not set
180CONFIG_DEFAULT_IOSCHED="anticipatory" 181CONFIG_DEFAULT_IOSCHED="cfq"
182# CONFIG_INLINE_SPIN_TRYLOCK is not set
183# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
184# CONFIG_INLINE_SPIN_LOCK is not set
185# CONFIG_INLINE_SPIN_LOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
187# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
188CONFIG_INLINE_SPIN_UNLOCK=y
189# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
190CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
191# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
192# CONFIG_INLINE_READ_TRYLOCK is not set
193# CONFIG_INLINE_READ_LOCK is not set
194# CONFIG_INLINE_READ_LOCK_BH is not set
195# CONFIG_INLINE_READ_LOCK_IRQ is not set
196# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
197CONFIG_INLINE_READ_UNLOCK=y
198# CONFIG_INLINE_READ_UNLOCK_BH is not set
199CONFIG_INLINE_READ_UNLOCK_IRQ=y
200# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
201# CONFIG_INLINE_WRITE_TRYLOCK is not set
202# CONFIG_INLINE_WRITE_LOCK is not set
203# CONFIG_INLINE_WRITE_LOCK_BH is not set
204# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
205# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
206CONFIG_INLINE_WRITE_UNLOCK=y
207# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
208CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
209# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
210# CONFIG_MUTEX_SPIN_ON_OWNER is not set
181CONFIG_FREEZER=y 211CONFIG_FREEZER=y
182 212
183# 213#
@@ -193,6 +223,7 @@ CONFIG_PPC_LITE5200=y
193CONFIG_PPC_MEDIA5200=y 223CONFIG_PPC_MEDIA5200=y
194CONFIG_PPC_MPC5200_BUGFIX=y 224CONFIG_PPC_MPC5200_BUGFIX=y
195CONFIG_PPC_MPC5200_GPIO=y 225CONFIG_PPC_MPC5200_GPIO=y
226CONFIG_PPC_MPC5200_LPBFIFO=m
196# CONFIG_PPC_PMAC is not set 227# CONFIG_PPC_PMAC is not set
197# CONFIG_PPC_CELL is not set 228# CONFIG_PPC_CELL is not set
198# CONFIG_PPC_CELL_NATIVE is not set 229# CONFIG_PPC_CELL_NATIVE is not set
@@ -211,6 +242,7 @@ CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
211# CONFIG_PPC_I8259 is not set 242# CONFIG_PPC_I8259 is not set
212CONFIG_PPC_RTAS=y 243CONFIG_PPC_RTAS=y
213# CONFIG_RTAS_ERROR_LOGGING is not set 244# CONFIG_RTAS_ERROR_LOGGING is not set
245# CONFIG_PPC_RTAS_DAEMON is not set
214CONFIG_RTAS_PROC=y 246CONFIG_RTAS_PROC=y
215# CONFIG_MMIO_NVRAM is not set 247# CONFIG_MMIO_NVRAM is not set
216# CONFIG_PPC_MPC106 is not set 248# CONFIG_PPC_MPC106 is not set
@@ -223,6 +255,7 @@ CONFIG_RTAS_PROC=y
223CONFIG_PPC_BESTCOMM=y 255CONFIG_PPC_BESTCOMM=y
224CONFIG_PPC_BESTCOMM_ATA=y 256CONFIG_PPC_BESTCOMM_ATA=y
225CONFIG_PPC_BESTCOMM_FEC=y 257CONFIG_PPC_BESTCOMM_FEC=y
258CONFIG_PPC_BESTCOMM_GEN_BD=m
226CONFIG_SIMPLE_GPIO=y 259CONFIG_SIMPLE_GPIO=y
227 260
228# 261#
@@ -253,6 +286,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
253CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 286CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
254# CONFIG_KEXEC is not set 287# CONFIG_KEXEC is not set
255# CONFIG_CRASH_DUMP is not set 288# CONFIG_CRASH_DUMP is not set
289CONFIG_SPARSE_IRQ=y
256CONFIG_MAX_ACTIVE_REGIONS=32 290CONFIG_MAX_ACTIVE_REGIONS=32
257CONFIG_ARCH_FLATMEM_ENABLE=y 291CONFIG_ARCH_FLATMEM_ENABLE=y
258CONFIG_ARCH_POPULATES_NODE_MAP=y 292CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -269,8 +303,6 @@ CONFIG_MIGRATION=y
269CONFIG_ZONE_DMA_FLAG=1 303CONFIG_ZONE_DMA_FLAG=1
270CONFIG_BOUNCE=y 304CONFIG_BOUNCE=y
271CONFIG_VIRT_TO_BUS=y 305CONFIG_VIRT_TO_BUS=y
272CONFIG_HAVE_MLOCK=y
273CONFIG_HAVE_MLOCKED_PAGE_BIT=y
274# CONFIG_KSM is not set 306# CONFIG_KSM is not set
275CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 307CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
276CONFIG_PPC_4K_PAGES=y 308CONFIG_PPC_4K_PAGES=y
@@ -286,6 +318,7 @@ CONFIG_PM=y
286CONFIG_PM_SLEEP=y 318CONFIG_PM_SLEEP=y
287CONFIG_SUSPEND=y 319CONFIG_SUSPEND=y
288CONFIG_SUSPEND_FREEZER=y 320CONFIG_SUSPEND_FREEZER=y
321# CONFIG_HIBERNATION is not set
289# CONFIG_PM_RUNTIME is not set 322# CONFIG_PM_RUNTIME is not set
290CONFIG_SECCOMP=y 323CONFIG_SECCOMP=y
291CONFIG_ISA_DMA_API=y 324CONFIG_ISA_DMA_API=y
@@ -399,7 +432,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
399# CONFIG_IRDA is not set 432# CONFIG_IRDA is not set
400# CONFIG_BT is not set 433# CONFIG_BT is not set
401# CONFIG_AF_RXRPC is not set 434# CONFIG_AF_RXRPC is not set
402# CONFIG_WIRELESS is not set 435CONFIG_WIRELESS=y
436# CONFIG_CFG80211 is not set
437# CONFIG_LIB80211 is not set
438
439#
440# CFG80211 needs to be enabled for MAC80211
441#
403# CONFIG_WIMAX is not set 442# CONFIG_WIMAX is not set
404# CONFIG_RFKILL is not set 443# CONFIG_RFKILL is not set
405# CONFIG_NET_9P is not set 444# CONFIG_NET_9P is not set
@@ -530,6 +569,10 @@ CONFIG_BLK_DEV=y
530# CONFIG_BLK_DEV_COW_COMMON is not set 569# CONFIG_BLK_DEV_COW_COMMON is not set
531CONFIG_BLK_DEV_LOOP=y 570CONFIG_BLK_DEV_LOOP=y
532# CONFIG_BLK_DEV_CRYPTOLOOP is not set 571# CONFIG_BLK_DEV_CRYPTOLOOP is not set
572
573#
574# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
575#
533# CONFIG_BLK_DEV_NBD is not set 576# CONFIG_BLK_DEV_NBD is not set
534# CONFIG_BLK_DEV_SX8 is not set 577# CONFIG_BLK_DEV_SX8 is not set
535# CONFIG_BLK_DEV_UB is not set 578# CONFIG_BLK_DEV_UB is not set
@@ -541,6 +584,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
541# CONFIG_ATA_OVER_ETH is not set 584# CONFIG_ATA_OVER_ETH is not set
542# CONFIG_BLK_DEV_HD is not set 585# CONFIG_BLK_DEV_HD is not set
543CONFIG_MISC_DEVICES=y 586CONFIG_MISC_DEVICES=y
587# CONFIG_AD525X_DPOT is not set
544# CONFIG_PHANTOM is not set 588# CONFIG_PHANTOM is not set
545# CONFIG_SGI_IOC4 is not set 589# CONFIG_SGI_IOC4 is not set
546# CONFIG_TIFM_CORE is not set 590# CONFIG_TIFM_CORE is not set
@@ -548,6 +592,8 @@ CONFIG_MISC_DEVICES=y
548# CONFIG_ENCLOSURE_SERVICES is not set 592# CONFIG_ENCLOSURE_SERVICES is not set
549# CONFIG_HP_ILO is not set 593# CONFIG_HP_ILO is not set
550# CONFIG_ISL29003 is not set 594# CONFIG_ISL29003 is not set
595# CONFIG_DS1682 is not set
596# CONFIG_TI_DAC7512 is not set
551# CONFIG_C2PORT is not set 597# CONFIG_C2PORT is not set
552 598
553# 599#
@@ -600,7 +646,9 @@ CONFIG_SCSI_LOWLEVEL=y
600# CONFIG_SCSI_BNX2_ISCSI is not set 646# CONFIG_SCSI_BNX2_ISCSI is not set
601# CONFIG_BE2ISCSI is not set 647# CONFIG_BE2ISCSI is not set
602# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 648# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
649# CONFIG_SCSI_HPSA is not set
603# CONFIG_SCSI_3W_9XXX is not set 650# CONFIG_SCSI_3W_9XXX is not set
651# CONFIG_SCSI_3W_SAS is not set
604# CONFIG_SCSI_ACARD is not set 652# CONFIG_SCSI_ACARD is not set
605# CONFIG_SCSI_AACRAID is not set 653# CONFIG_SCSI_AACRAID is not set
606# CONFIG_SCSI_AIC7XXX is not set 654# CONFIG_SCSI_AIC7XXX is not set
@@ -639,6 +687,7 @@ CONFIG_SCSI_LOWLEVEL=y
639# CONFIG_SCSI_NSP32 is not set 687# CONFIG_SCSI_NSP32 is not set
640# CONFIG_SCSI_DEBUG is not set 688# CONFIG_SCSI_DEBUG is not set
641# CONFIG_SCSI_PMCRAID is not set 689# CONFIG_SCSI_PMCRAID is not set
690# CONFIG_SCSI_PM8001 is not set
642# CONFIG_SCSI_SRP is not set 691# CONFIG_SCSI_SRP is not set
643# CONFIG_SCSI_BFA_FC is not set 692# CONFIG_SCSI_BFA_FC is not set
644# CONFIG_SCSI_DH is not set 693# CONFIG_SCSI_DH is not set
@@ -694,15 +743,16 @@ CONFIG_PATA_MPC52xx=y
694# CONFIG_PATA_NS87415 is not set 743# CONFIG_PATA_NS87415 is not set
695# CONFIG_PATA_OPTI is not set 744# CONFIG_PATA_OPTI is not set
696# CONFIG_PATA_OPTIDMA is not set 745# CONFIG_PATA_OPTIDMA is not set
746# CONFIG_PATA_PDC2027X is not set
697# CONFIG_PATA_PDC_OLD is not set 747# CONFIG_PATA_PDC_OLD is not set
698# CONFIG_PATA_RADISYS is not set 748# CONFIG_PATA_RADISYS is not set
699# CONFIG_PATA_RDC is not set 749# CONFIG_PATA_RDC is not set
700# CONFIG_PATA_RZ1000 is not set 750# CONFIG_PATA_RZ1000 is not set
701# CONFIG_PATA_SC1200 is not set 751# CONFIG_PATA_SC1200 is not set
702# CONFIG_PATA_SERVERWORKS is not set 752# CONFIG_PATA_SERVERWORKS is not set
703# CONFIG_PATA_PDC2027X is not set
704# CONFIG_PATA_SIL680 is not set 753# CONFIG_PATA_SIL680 is not set
705# CONFIG_PATA_SIS is not set 754# CONFIG_PATA_SIS is not set
755# CONFIG_PATA_TOSHIBA is not set
706# CONFIG_PATA_VIA is not set 756# CONFIG_PATA_VIA is not set
707# CONFIG_PATA_WINBOND is not set 757# CONFIG_PATA_WINBOND is not set
708CONFIG_PATA_PLATFORM=y 758CONFIG_PATA_PLATFORM=y
@@ -785,8 +835,11 @@ CONFIG_FEC_MPC52xx_MDIO=y
785# CONFIG_NETDEV_10000 is not set 835# CONFIG_NETDEV_10000 is not set
786# CONFIG_TR is not set 836# CONFIG_TR is not set
787CONFIG_WLAN=y 837CONFIG_WLAN=y
788# CONFIG_WLAN_PRE80211 is not set 838# CONFIG_AIRO is not set
789# CONFIG_WLAN_80211 is not set 839# CONFIG_ATMEL is not set
840# CONFIG_PRISM54 is not set
841# CONFIG_USB_ZD1201 is not set
842# CONFIG_HOSTAP is not set
790 843
791# 844#
792# Enable WiMAX (Networking options) to see the WiMAX drivers 845# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -809,6 +862,7 @@ CONFIG_WLAN=y
809# CONFIG_NETCONSOLE is not set 862# CONFIG_NETCONSOLE is not set
810# CONFIG_NETPOLL is not set 863# CONFIG_NETPOLL is not set
811# CONFIG_NET_POLL_CONTROLLER is not set 864# CONFIG_NET_POLL_CONTROLLER is not set
865# CONFIG_VMXNET3 is not set
812# CONFIG_ISDN is not set 866# CONFIG_ISDN is not set
813# CONFIG_PHONE is not set 867# CONFIG_PHONE is not set
814 868
@@ -818,6 +872,7 @@ CONFIG_WLAN=y
818CONFIG_INPUT=y 872CONFIG_INPUT=y
819# CONFIG_INPUT_FF_MEMLESS is not set 873# CONFIG_INPUT_FF_MEMLESS is not set
820# CONFIG_INPUT_POLLDEV is not set 874# CONFIG_INPUT_POLLDEV is not set
875# CONFIG_INPUT_SPARSEKMAP is not set
821 876
822# 877#
823# Userland interfaces 878# Userland interfaces
@@ -874,6 +929,7 @@ CONFIG_SERIAL_MPC52xx=y
874CONFIG_SERIAL_MPC52xx_CONSOLE=y 929CONFIG_SERIAL_MPC52xx_CONSOLE=y
875CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 930CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
876# CONFIG_SERIAL_JSM is not set 931# CONFIG_SERIAL_JSM is not set
932# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
877CONFIG_UNIX98_PTYS=y 933CONFIG_UNIX98_PTYS=y
878# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 934# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
879CONFIG_LEGACY_PTYS=y 935CONFIG_LEGACY_PTYS=y
@@ -934,11 +990,6 @@ CONFIG_I2C_MPC=y
934# CONFIG_I2C_TINY_USB is not set 990# CONFIG_I2C_TINY_USB is not set
935 991
936# 992#
937# Graphics adapter I2C/DDC channel drivers
938#
939# CONFIG_I2C_VOODOO3 is not set
940
941#
942# Other I2C/SMBus bus drivers 993# Other I2C/SMBus bus drivers
943# 994#
944# CONFIG_I2C_PCA_PLATFORM is not set 995# CONFIG_I2C_PCA_PLATFORM is not set
@@ -947,7 +998,6 @@ CONFIG_I2C_MPC=y
947# 998#
948# Miscellaneous I2C Chip support 999# Miscellaneous I2C Chip support
949# 1000#
950# CONFIG_DS1682 is not set
951# CONFIG_SENSORS_TSL2550 is not set 1001# CONFIG_SENSORS_TSL2550 is not set
952# CONFIG_I2C_DEBUG_CORE is not set 1002# CONFIG_I2C_DEBUG_CORE is not set
953# CONFIG_I2C_DEBUG_ALGO is not set 1003# CONFIG_I2C_DEBUG_ALGO is not set
@@ -962,7 +1012,10 @@ CONFIG_SPI_MASTER=y
962# 1012#
963# CONFIG_SPI_BITBANG is not set 1013# CONFIG_SPI_BITBANG is not set
964# CONFIG_SPI_GPIO is not set 1014# CONFIG_SPI_GPIO is not set
1015# CONFIG_SPI_MPC52xx is not set
965CONFIG_SPI_MPC52xx_PSC=m 1016CONFIG_SPI_MPC52xx_PSC=m
1017# CONFIG_SPI_XILINX is not set
1018# CONFIG_SPI_DESIGNWARE is not set
966 1019
967# 1020#
968# SPI Protocol Masters 1021# SPI Protocol Masters
@@ -995,6 +1048,7 @@ CONFIG_GPIOLIB=y
995# 1048#
996# PCI GPIO expanders: 1049# PCI GPIO expanders:
997# 1050#
1051# CONFIG_GPIO_CS5535 is not set
998# CONFIG_GPIO_BT8XX is not set 1052# CONFIG_GPIO_BT8XX is not set
999# CONFIG_GPIO_LANGWELL is not set 1053# CONFIG_GPIO_LANGWELL is not set
1000 1054
@@ -1042,6 +1096,7 @@ CONFIG_HWMON=y
1042# CONFIG_SENSORS_IT87 is not set 1096# CONFIG_SENSORS_IT87 is not set
1043# CONFIG_SENSORS_LM63 is not set 1097# CONFIG_SENSORS_LM63 is not set
1044# CONFIG_SENSORS_LM70 is not set 1098# CONFIG_SENSORS_LM70 is not set
1099# CONFIG_SENSORS_LM73 is not set
1045# CONFIG_SENSORS_LM75 is not set 1100# CONFIG_SENSORS_LM75 is not set
1046# CONFIG_SENSORS_LM77 is not set 1101# CONFIG_SENSORS_LM77 is not set
1047# CONFIG_SENSORS_LM78 is not set 1102# CONFIG_SENSORS_LM78 is not set
@@ -1083,6 +1138,7 @@ CONFIG_HWMON=y
1083# CONFIG_SENSORS_W83627HF is not set 1138# CONFIG_SENSORS_W83627HF is not set
1084# CONFIG_SENSORS_W83627EHF is not set 1139# CONFIG_SENSORS_W83627EHF is not set
1085# CONFIG_SENSORS_LIS3_SPI is not set 1140# CONFIG_SENSORS_LIS3_SPI is not set
1141# CONFIG_SENSORS_LIS3_I2C is not set
1086# CONFIG_THERMAL is not set 1142# CONFIG_THERMAL is not set
1087CONFIG_WATCHDOG=y 1143CONFIG_WATCHDOG=y
1088# CONFIG_WATCHDOG_NOWAYOUT is not set 1144# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1122,6 +1178,7 @@ CONFIG_SSB_POSSIBLE=y
1122# CONFIG_TWL4030_CORE is not set 1178# CONFIG_TWL4030_CORE is not set
1123# CONFIG_MFD_TMIO is not set 1179# CONFIG_MFD_TMIO is not set
1124# CONFIG_PMIC_DA903X is not set 1180# CONFIG_PMIC_DA903X is not set
1181# CONFIG_PMIC_ADP5520 is not set
1125# CONFIG_MFD_WM8400 is not set 1182# CONFIG_MFD_WM8400 is not set
1126# CONFIG_MFD_WM831X is not set 1183# CONFIG_MFD_WM831X is not set
1127# CONFIG_MFD_WM8350_I2C is not set 1184# CONFIG_MFD_WM8350_I2C is not set
@@ -1129,6 +1186,8 @@ CONFIG_SSB_POSSIBLE=y
1129# CONFIG_MFD_MC13783 is not set 1186# CONFIG_MFD_MC13783 is not set
1130# CONFIG_AB3100_CORE is not set 1187# CONFIG_AB3100_CORE is not set
1131# CONFIG_EZX_PCAP is not set 1188# CONFIG_EZX_PCAP is not set
1189# CONFIG_MFD_88PM8607 is not set
1190# CONFIG_AB4500_CORE is not set
1132# CONFIG_REGULATOR is not set 1191# CONFIG_REGULATOR is not set
1133# CONFIG_MEDIA_SUPPORT is not set 1192# CONFIG_MEDIA_SUPPORT is not set
1134 1193
@@ -1322,7 +1381,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1322# CONFIG_USB_R8A66597_HCD is not set 1381# CONFIG_USB_R8A66597_HCD is not set
1323# CONFIG_USB_WHCI_HCD is not set 1382# CONFIG_USB_WHCI_HCD is not set
1324# CONFIG_USB_HWA_HCD is not set 1383# CONFIG_USB_HWA_HCD is not set
1325# CONFIG_USB_MUSB_HDRC is not set
1326 1384
1327# 1385#
1328# USB Device Class drivers 1386# USB Device Class drivers
@@ -1440,6 +1498,7 @@ CONFIG_RTC_DRV_DS1307=y
1440# CONFIG_RTC_DRV_PCF8563 is not set 1498# CONFIG_RTC_DRV_PCF8563 is not set
1441# CONFIG_RTC_DRV_PCF8583 is not set 1499# CONFIG_RTC_DRV_PCF8583 is not set
1442# CONFIG_RTC_DRV_M41T80 is not set 1500# CONFIG_RTC_DRV_M41T80 is not set
1501# CONFIG_RTC_DRV_BQ32K is not set
1443# CONFIG_RTC_DRV_S35390A is not set 1502# CONFIG_RTC_DRV_S35390A is not set
1444# CONFIG_RTC_DRV_FM3130 is not set 1503# CONFIG_RTC_DRV_FM3130 is not set
1445# CONFIG_RTC_DRV_RX8581 is not set 1504# CONFIG_RTC_DRV_RX8581 is not set
@@ -1469,7 +1528,9 @@ CONFIG_RTC_DRV_DS1307=y
1469# CONFIG_RTC_DRV_M48T86 is not set 1528# CONFIG_RTC_DRV_M48T86 is not set
1470# CONFIG_RTC_DRV_M48T35 is not set 1529# CONFIG_RTC_DRV_M48T35 is not set
1471# CONFIG_RTC_DRV_M48T59 is not set 1530# CONFIG_RTC_DRV_M48T59 is not set
1531# CONFIG_RTC_DRV_MSM6242 is not set
1472# CONFIG_RTC_DRV_BQ4802 is not set 1532# CONFIG_RTC_DRV_BQ4802 is not set
1533# CONFIG_RTC_DRV_RP5C01 is not set
1473# CONFIG_RTC_DRV_V3020 is not set 1534# CONFIG_RTC_DRV_V3020 is not set
1474 1535
1475# 1536#
@@ -1731,6 +1792,7 @@ CONFIG_DEBUG_INFO=y
1731# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1792# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1732# CONFIG_FAULT_INJECTION is not set 1793# CONFIG_FAULT_INJECTION is not set
1733# CONFIG_LATENCYTOP is not set 1794# CONFIG_LATENCYTOP is not set
1795# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1734# CONFIG_DEBUG_PAGEALLOC is not set 1796# CONFIG_DEBUG_PAGEALLOC is not set
1735CONFIG_HAVE_FUNCTION_TRACER=y 1797CONFIG_HAVE_FUNCTION_TRACER=y
1736CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1798CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -1774,7 +1836,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1774# CONFIG_KEYS is not set 1836# CONFIG_KEYS is not set
1775# CONFIG_SECURITY is not set 1837# CONFIG_SECURITY is not set
1776# CONFIG_SECURITYFS is not set 1838# CONFIG_SECURITYFS is not set
1777# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1839# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1840# CONFIG_DEFAULT_SECURITY_SMACK is not set
1841# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1842CONFIG_DEFAULT_SECURITY_DAC=y
1843CONFIG_DEFAULT_SECURITY=""
1778CONFIG_CRYPTO=y 1844CONFIG_CRYPTO=y
1779 1845
1780# 1846#
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig
index d8b364a45944..1315b775a6d2 100644
--- a/arch/powerpc/configs/mpc7448_hpc2_defconfig
+++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:10 2009 4# Wed Jan 6 09:24:04 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
58CONFIG_GENERIC_BUG=y 59CONFIG_GENERIC_BUG=y
59CONFIG_DTC=y 60CONFIG_DTC=y
60CONFIG_DEFAULT_UIMAGE=y 61CONFIG_DEFAULT_UIMAGE=y
62CONFIG_ARCH_HIBERNATION_POSSIBLE=y
61# CONFIG_PPC_DCR_NATIVE is not set 63# CONFIG_PPC_DCR_NATIVE is not set
62# CONFIG_PPC_DCR_MMIO is not set 64# CONFIG_PPC_DCR_MMIO is not set
63CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 65CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -85,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86CONFIG_TREE_RCU=y 88CONFIG_TREE_RCU=y
87# CONFIG_TREE_PREEMPT_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_TINY_RCU is not set
88# CONFIG_RCU_TRACE is not set 91# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32 92CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set 93# CONFIG_RCU_FANOUT_EXACT is not set
@@ -167,14 +170,41 @@ CONFIG_LBDAF=y
167# IO Schedulers 170# IO Schedulers
168# 171#
169CONFIG_IOSCHED_NOOP=y 172CONFIG_IOSCHED_NOOP=y
170CONFIG_IOSCHED_AS=y
171CONFIG_IOSCHED_DEADLINE=y 173CONFIG_IOSCHED_DEADLINE=y
172CONFIG_IOSCHED_CFQ=y 174CONFIG_IOSCHED_CFQ=y
173CONFIG_DEFAULT_AS=y
174# CONFIG_DEFAULT_DEADLINE is not set 175# CONFIG_DEFAULT_DEADLINE is not set
175# CONFIG_DEFAULT_CFQ is not set 176CONFIG_DEFAULT_CFQ=y
176# CONFIG_DEFAULT_NOOP is not set 177# CONFIG_DEFAULT_NOOP is not set
177CONFIG_DEFAULT_IOSCHED="anticipatory" 178CONFIG_DEFAULT_IOSCHED="cfq"
179# CONFIG_INLINE_SPIN_TRYLOCK is not set
180# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
181# CONFIG_INLINE_SPIN_LOCK is not set
182# CONFIG_INLINE_SPIN_LOCK_BH is not set
183# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
184# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
185CONFIG_INLINE_SPIN_UNLOCK=y
186# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
187CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
188# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
189# CONFIG_INLINE_READ_TRYLOCK is not set
190# CONFIG_INLINE_READ_LOCK is not set
191# CONFIG_INLINE_READ_LOCK_BH is not set
192# CONFIG_INLINE_READ_LOCK_IRQ is not set
193# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
194CONFIG_INLINE_READ_UNLOCK=y
195# CONFIG_INLINE_READ_UNLOCK_BH is not set
196CONFIG_INLINE_READ_UNLOCK_IRQ=y
197# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
198# CONFIG_INLINE_WRITE_TRYLOCK is not set
199# CONFIG_INLINE_WRITE_LOCK is not set
200# CONFIG_INLINE_WRITE_LOCK_BH is not set
201# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
202# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
203CONFIG_INLINE_WRITE_UNLOCK=y
204# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
205CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
206# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
207# CONFIG_MUTEX_SPIN_ON_OWNER is not set
178# CONFIG_FREEZER is not set 208# CONFIG_FREEZER is not set
179 209
180# 210#
@@ -199,6 +229,8 @@ CONFIG_MPC7448HPC2=y
199# CONFIG_PPC_PRPMC2800 is not set 229# CONFIG_PPC_PRPMC2800 is not set
200# CONFIG_PPC_C2K is not set 230# CONFIG_PPC_C2K is not set
201CONFIG_TSI108_BRIDGE=y 231CONFIG_TSI108_BRIDGE=y
232# CONFIG_GAMECUBE is not set
233# CONFIG_WII is not set
202# CONFIG_AMIGAONE is not set 234# CONFIG_AMIGAONE is not set
203CONFIG_PPC_OF_BOOT_TRAMPOLINE=y 235CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
204# CONFIG_IPIC is not set 236# CONFIG_IPIC is not set
@@ -244,6 +276,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
244CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 276CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
245# CONFIG_KEXEC is not set 277# CONFIG_KEXEC is not set
246# CONFIG_CRASH_DUMP is not set 278# CONFIG_CRASH_DUMP is not set
279CONFIG_SPARSE_IRQ=y
247CONFIG_MAX_ACTIVE_REGIONS=32 280CONFIG_MAX_ACTIVE_REGIONS=32
248CONFIG_ARCH_FLATMEM_ENABLE=y 281CONFIG_ARCH_FLATMEM_ENABLE=y
249CONFIG_ARCH_POPULATES_NODE_MAP=y 282CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -260,8 +293,6 @@ CONFIG_MIGRATION=y
260CONFIG_ZONE_DMA_FLAG=1 293CONFIG_ZONE_DMA_FLAG=1
261CONFIG_BOUNCE=y 294CONFIG_BOUNCE=y
262CONFIG_VIRT_TO_BUS=y 295CONFIG_VIRT_TO_BUS=y
263CONFIG_HAVE_MLOCK=y
264CONFIG_HAVE_MLOCKED_PAGE_BIT=y
265# CONFIG_KSM is not set 296# CONFIG_KSM is not set
266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 297CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
267CONFIG_PPC_4K_PAGES=y 298CONFIG_PPC_4K_PAGES=y
@@ -385,9 +416,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
385# CONFIG_AF_RXRPC is not set 416# CONFIG_AF_RXRPC is not set
386CONFIG_WIRELESS=y 417CONFIG_WIRELESS=y
387# CONFIG_CFG80211 is not set 418# CONFIG_CFG80211 is not set
388CONFIG_CFG80211_DEFAULT_PS_VALUE=0
389CONFIG_WIRELESS_OLD_REGULATORY=y
390# CONFIG_WIRELESS_EXT is not set
391# CONFIG_LIB80211 is not set 419# CONFIG_LIB80211 is not set
392 420
393# 421#
@@ -424,6 +452,10 @@ CONFIG_BLK_DEV=y
424# CONFIG_BLK_DEV_COW_COMMON is not set 452# CONFIG_BLK_DEV_COW_COMMON is not set
425CONFIG_BLK_DEV_LOOP=y 453CONFIG_BLK_DEV_LOOP=y
426# CONFIG_BLK_DEV_CRYPTOLOOP is not set 454# CONFIG_BLK_DEV_CRYPTOLOOP is not set
455
456#
457# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
458#
427# CONFIG_BLK_DEV_NBD is not set 459# CONFIG_BLK_DEV_NBD is not set
428# CONFIG_BLK_DEV_SX8 is not set 460# CONFIG_BLK_DEV_SX8 is not set
429CONFIG_BLK_DEV_RAM=y 461CONFIG_BLK_DEV_RAM=y
@@ -487,7 +519,9 @@ CONFIG_SCSI_LOWLEVEL=y
487# CONFIG_SCSI_BNX2_ISCSI is not set 519# CONFIG_SCSI_BNX2_ISCSI is not set
488# CONFIG_BE2ISCSI is not set 520# CONFIG_BE2ISCSI is not set
489# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 521# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
522# CONFIG_SCSI_HPSA is not set
490# CONFIG_SCSI_3W_9XXX is not set 523# CONFIG_SCSI_3W_9XXX is not set
524# CONFIG_SCSI_3W_SAS is not set
491# CONFIG_SCSI_ACARD is not set 525# CONFIG_SCSI_ACARD is not set
492# CONFIG_SCSI_AACRAID is not set 526# CONFIG_SCSI_AACRAID is not set
493# CONFIG_SCSI_AIC7XXX is not set 527# CONFIG_SCSI_AIC7XXX is not set
@@ -526,6 +560,7 @@ CONFIG_SCSI_LOWLEVEL=y
526# CONFIG_SCSI_NSP32 is not set 560# CONFIG_SCSI_NSP32 is not set
527# CONFIG_SCSI_DEBUG is not set 561# CONFIG_SCSI_DEBUG is not set
528# CONFIG_SCSI_PMCRAID is not set 562# CONFIG_SCSI_PMCRAID is not set
563# CONFIG_SCSI_PM8001 is not set
529# CONFIG_SCSI_SRP is not set 564# CONFIG_SCSI_SRP is not set
530# CONFIG_SCSI_BFA_FC is not set 565# CONFIG_SCSI_BFA_FC is not set
531# CONFIG_SCSI_DH is not set 566# CONFIG_SCSI_DH is not set
@@ -580,15 +615,16 @@ CONFIG_SATA_MV=y
580# CONFIG_PATA_NS87415 is not set 615# CONFIG_PATA_NS87415 is not set
581# CONFIG_PATA_OPTI is not set 616# CONFIG_PATA_OPTI is not set
582# CONFIG_PATA_OPTIDMA is not set 617# CONFIG_PATA_OPTIDMA is not set
618# CONFIG_PATA_PDC2027X is not set
583# CONFIG_PATA_PDC_OLD is not set 619# CONFIG_PATA_PDC_OLD is not set
584# CONFIG_PATA_RADISYS is not set 620# CONFIG_PATA_RADISYS is not set
585# CONFIG_PATA_RDC is not set 621# CONFIG_PATA_RDC is not set
586# CONFIG_PATA_RZ1000 is not set 622# CONFIG_PATA_RZ1000 is not set
587# CONFIG_PATA_SC1200 is not set 623# CONFIG_PATA_SC1200 is not set
588# CONFIG_PATA_SERVERWORKS is not set 624# CONFIG_PATA_SERVERWORKS is not set
589# CONFIG_PATA_PDC2027X is not set
590# CONFIG_PATA_SIL680 is not set 625# CONFIG_PATA_SIL680 is not set
591# CONFIG_PATA_SIS is not set 626# CONFIG_PATA_SIS is not set
627# CONFIG_PATA_TOSHIBA is not set
592# CONFIG_PATA_VIA is not set 628# CONFIG_PATA_VIA is not set
593# CONFIG_PATA_WINBOND is not set 629# CONFIG_PATA_WINBOND is not set
594# CONFIG_PATA_PLATFORM is not set 630# CONFIG_PATA_PLATFORM is not set
@@ -605,7 +641,7 @@ CONFIG_SATA_MV=y
605# 641#
606 642
607# 643#
608# See the help texts for more information. 644# The newer stack is recommended.
609# 645#
610# CONFIG_FIREWIRE is not set 646# CONFIG_FIREWIRE is not set
611# CONFIG_IEEE1394 is not set 647# CONFIG_IEEE1394 is not set
@@ -731,8 +767,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
731# CONFIG_BE2NET is not set 767# CONFIG_BE2NET is not set
732# CONFIG_TR is not set 768# CONFIG_TR is not set
733CONFIG_WLAN=y 769CONFIG_WLAN=y
734# CONFIG_WLAN_PRE80211 is not set 770# CONFIG_AIRO is not set
735# CONFIG_WLAN_80211 is not set 771# CONFIG_ATMEL is not set
772# CONFIG_PRISM54 is not set
773# CONFIG_HOSTAP is not set
736 774
737# 775#
738# Enable WiMAX (Networking options) to see the WiMAX drivers 776# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -746,6 +784,7 @@ CONFIG_WLAN=y
746# CONFIG_NETCONSOLE is not set 784# CONFIG_NETCONSOLE is not set
747# CONFIG_NETPOLL is not set 785# CONFIG_NETPOLL is not set
748# CONFIG_NET_POLL_CONTROLLER is not set 786# CONFIG_NET_POLL_CONTROLLER is not set
787# CONFIG_VMXNET3 is not set
749# CONFIG_ISDN is not set 788# CONFIG_ISDN is not set
750# CONFIG_PHONE is not set 789# CONFIG_PHONE is not set
751 790
@@ -755,6 +794,7 @@ CONFIG_WLAN=y
755CONFIG_INPUT=y 794CONFIG_INPUT=y
756# CONFIG_INPUT_FF_MEMLESS is not set 795# CONFIG_INPUT_FF_MEMLESS is not set
757# CONFIG_INPUT_POLLDEV is not set 796# CONFIG_INPUT_POLLDEV is not set
797# CONFIG_INPUT_SPARSEKMAP is not set
758 798
759# 799#
760# Userland interfaces 800# Userland interfaces
@@ -806,6 +846,7 @@ CONFIG_SERIAL_CORE=y
806CONFIG_SERIAL_CORE_CONSOLE=y 846CONFIG_SERIAL_CORE_CONSOLE=y
807# CONFIG_SERIAL_JSM is not set 847# CONFIG_SERIAL_JSM is not set
808# CONFIG_SERIAL_OF_PLATFORM is not set 848# CONFIG_SERIAL_OF_PLATFORM is not set
849# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
809CONFIG_UNIX98_PTYS=y 850CONFIG_UNIX98_PTYS=y
810# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 851# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
811CONFIG_LEGACY_PTYS=y 852CONFIG_LEGACY_PTYS=y
@@ -1091,7 +1132,7 @@ CONFIG_FRAME_WARN=1024
1091# CONFIG_DEBUG_KERNEL is not set 1132# CONFIG_DEBUG_KERNEL is not set
1092# CONFIG_SLUB_DEBUG_ON is not set 1133# CONFIG_SLUB_DEBUG_ON is not set
1093# CONFIG_SLUB_STATS is not set 1134# CONFIG_SLUB_STATS is not set
1094# CONFIG_DEBUG_BUGVERBOSE is not set 1135CONFIG_DEBUG_BUGVERBOSE=y
1095# CONFIG_DEBUG_MEMORY_INIT is not set 1136# CONFIG_DEBUG_MEMORY_INIT is not set
1096# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1137# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1097# CONFIG_LATENCYTOP is not set 1138# CONFIG_LATENCYTOP is not set
@@ -1118,7 +1159,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1118# CONFIG_KEYS is not set 1159# CONFIG_KEYS is not set
1119# CONFIG_SECURITY is not set 1160# CONFIG_SECURITY is not set
1120# CONFIG_SECURITYFS is not set 1161# CONFIG_SECURITYFS is not set
1121# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1162# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1163# CONFIG_DEFAULT_SECURITY_SMACK is not set
1164# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1165CONFIG_DEFAULT_SECURITY_DAC=y
1166CONFIG_DEFAULT_SECURITY=""
1122CONFIG_CRYPTO=y 1167CONFIG_CRYPTO=y
1123 1168
1124# 1169#
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig
index 00fad81b6fce..9073778d3575 100644
--- a/arch/powerpc/configs/mpc8272_ads_defconfig
+++ b/arch/powerpc/configs/mpc8272_ads_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:11 2009 4# Wed Jan 6 09:24:05 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62# CONFIG_PPC_DCR_NATIVE is not set 64# CONFIG_PPC_DCR_NATIVE is not set
63# CONFIG_PPC_DCR_MMIO is not set 65# CONFIG_PPC_DCR_MMIO is not set
64CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -85,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86CONFIG_TREE_RCU=y 88CONFIG_TREE_RCU=y
87# CONFIG_TREE_PREEMPT_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_TINY_RCU is not set
88# CONFIG_RCU_TRACE is not set 91# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32 92CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set 93# CONFIG_RCU_FANOUT_EXACT is not set
@@ -161,14 +164,41 @@ CONFIG_BLK_DEV_BSG=y
161# IO Schedulers 164# IO Schedulers
162# 165#
163CONFIG_IOSCHED_NOOP=y 166CONFIG_IOSCHED_NOOP=y
164CONFIG_IOSCHED_AS=y
165CONFIG_IOSCHED_DEADLINE=y 167CONFIG_IOSCHED_DEADLINE=y
166CONFIG_IOSCHED_CFQ=y 168CONFIG_IOSCHED_CFQ=y
167CONFIG_DEFAULT_AS=y
168# CONFIG_DEFAULT_DEADLINE is not set 169# CONFIG_DEFAULT_DEADLINE is not set
169# CONFIG_DEFAULT_CFQ is not set 170CONFIG_DEFAULT_CFQ=y
170# CONFIG_DEFAULT_NOOP is not set 171# CONFIG_DEFAULT_NOOP is not set
171CONFIG_DEFAULT_IOSCHED="anticipatory" 172CONFIG_DEFAULT_IOSCHED="cfq"
173# CONFIG_INLINE_SPIN_TRYLOCK is not set
174# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
175# CONFIG_INLINE_SPIN_LOCK is not set
176# CONFIG_INLINE_SPIN_LOCK_BH is not set
177# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
178# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
179CONFIG_INLINE_SPIN_UNLOCK=y
180# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
181CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
182# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
183# CONFIG_INLINE_READ_TRYLOCK is not set
184# CONFIG_INLINE_READ_LOCK is not set
185# CONFIG_INLINE_READ_LOCK_BH is not set
186# CONFIG_INLINE_READ_LOCK_IRQ is not set
187# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
188CONFIG_INLINE_READ_UNLOCK=y
189# CONFIG_INLINE_READ_UNLOCK_BH is not set
190CONFIG_INLINE_READ_UNLOCK_IRQ=y
191# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
192# CONFIG_INLINE_WRITE_TRYLOCK is not set
193# CONFIG_INLINE_WRITE_LOCK is not set
194# CONFIG_INLINE_WRITE_LOCK_BH is not set
195# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
196# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
197CONFIG_INLINE_WRITE_UNLOCK=y
198# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
199CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
200# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
201# CONFIG_MUTEX_SPIN_ON_OWNER is not set
172# CONFIG_FREEZER is not set 202# CONFIG_FREEZER is not set
173 203
174# 204#
@@ -240,6 +270,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
240CONFIG_ARCH_HAS_WALK_MEMORY=y 270CONFIG_ARCH_HAS_WALK_MEMORY=y
241CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 271CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
242# CONFIG_CRASH_DUMP is not set 272# CONFIG_CRASH_DUMP is not set
273CONFIG_SPARSE_IRQ=y
243CONFIG_MAX_ACTIVE_REGIONS=32 274CONFIG_MAX_ACTIVE_REGIONS=32
244CONFIG_ARCH_FLATMEM_ENABLE=y 275CONFIG_ARCH_FLATMEM_ENABLE=y
245CONFIG_ARCH_POPULATES_NODE_MAP=y 276CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -252,8 +283,6 @@ CONFIG_MIGRATION=y
252CONFIG_ZONE_DMA_FLAG=1 283CONFIG_ZONE_DMA_FLAG=1
253CONFIG_BOUNCE=y 284CONFIG_BOUNCE=y
254CONFIG_VIRT_TO_BUS=y 285CONFIG_VIRT_TO_BUS=y
255CONFIG_HAVE_MLOCK=y
256CONFIG_HAVE_MLOCKED_PAGE_BIT=y
257# CONFIG_KSM is not set 286# CONFIG_KSM is not set
258CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 287CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
259CONFIG_PPC_4K_PAGES=y 288CONFIG_PPC_4K_PAGES=y
@@ -403,9 +432,6 @@ CONFIG_NETFILTER_ADVANCED=y
403# CONFIG_BT is not set 432# CONFIG_BT is not set
404CONFIG_WIRELESS=y 433CONFIG_WIRELESS=y
405# CONFIG_CFG80211 is not set 434# CONFIG_CFG80211 is not set
406CONFIG_CFG80211_DEFAULT_PS_VALUE=0
407CONFIG_WIRELESS_OLD_REGULATORY=y
408# CONFIG_WIRELESS_EXT is not set
409# CONFIG_LIB80211 is not set 435# CONFIG_LIB80211 is not set
410 436
411# 437#
@@ -526,6 +552,10 @@ CONFIG_BLK_DEV=y
526# CONFIG_BLK_DEV_COW_COMMON is not set 552# CONFIG_BLK_DEV_COW_COMMON is not set
527CONFIG_BLK_DEV_LOOP=y 553CONFIG_BLK_DEV_LOOP=y
528# CONFIG_BLK_DEV_CRYPTOLOOP is not set 554# CONFIG_BLK_DEV_CRYPTOLOOP is not set
555
556#
557# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
558#
529# CONFIG_BLK_DEV_NBD is not set 559# CONFIG_BLK_DEV_NBD is not set
530# CONFIG_BLK_DEV_SX8 is not set 560# CONFIG_BLK_DEV_SX8 is not set
531# CONFIG_BLK_DEV_RAM is not set 561# CONFIG_BLK_DEV_RAM is not set
@@ -556,7 +586,7 @@ CONFIG_HAVE_IDE=y
556# 586#
557 587
558# 588#
559# See the help texts for more information. 589# The newer stack is recommended.
560# 590#
561# CONFIG_FIREWIRE is not set 591# CONFIG_FIREWIRE is not set
562# CONFIG_IEEE1394 is not set 592# CONFIG_IEEE1394 is not set
@@ -661,8 +691,9 @@ CONFIG_CHELSIO_T3_DEPENDS=y
661# CONFIG_BE2NET is not set 691# CONFIG_BE2NET is not set
662# CONFIG_TR is not set 692# CONFIG_TR is not set
663CONFIG_WLAN=y 693CONFIG_WLAN=y
664# CONFIG_WLAN_PRE80211 is not set 694# CONFIG_AIRO is not set
665# CONFIG_WLAN_80211 is not set 695# CONFIG_ATMEL is not set
696# CONFIG_HOSTAP is not set
666 697
667# 698#
668# Enable WiMAX (Networking options) to see the WiMAX drivers 699# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -679,6 +710,7 @@ CONFIG_PPP_DEFLATE=y
679CONFIG_SLHC=y 710CONFIG_SLHC=y
680# CONFIG_NETPOLL is not set 711# CONFIG_NETPOLL is not set
681# CONFIG_NET_POLL_CONTROLLER is not set 712# CONFIG_NET_POLL_CONTROLLER is not set
713# CONFIG_VMXNET3 is not set
682# CONFIG_ISDN is not set 714# CONFIG_ISDN is not set
683# CONFIG_PHONE is not set 715# CONFIG_PHONE is not set
684 716
@@ -688,6 +720,7 @@ CONFIG_SLHC=y
688CONFIG_INPUT=y 720CONFIG_INPUT=y
689# CONFIG_INPUT_FF_MEMLESS is not set 721# CONFIG_INPUT_FF_MEMLESS is not set
690# CONFIG_INPUT_POLLDEV is not set 722# CONFIG_INPUT_POLLDEV is not set
723# CONFIG_INPUT_SPARSEKMAP is not set
691 724
692# 725#
693# Userland interfaces 726# Userland interfaces
@@ -740,6 +773,7 @@ CONFIG_SERIO_SERPORT=y
740CONFIG_SERIO_LIBPS2=y 773CONFIG_SERIO_LIBPS2=y
741# CONFIG_SERIO_RAW is not set 774# CONFIG_SERIO_RAW is not set
742# CONFIG_SERIO_XILINX_XPS_PS2 is not set 775# CONFIG_SERIO_XILINX_XPS_PS2 is not set
776# CONFIG_SERIO_ALTERA_PS2 is not set
743# CONFIG_GAMEPORT is not set 777# CONFIG_GAMEPORT is not set
744 778
745# 779#
@@ -763,6 +797,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
763CONFIG_SERIAL_CPM=y 797CONFIG_SERIAL_CPM=y
764CONFIG_SERIAL_CPM_CONSOLE=y 798CONFIG_SERIAL_CPM_CONSOLE=y
765# CONFIG_SERIAL_JSM is not set 799# CONFIG_SERIAL_JSM is not set
800# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
766CONFIG_UNIX98_PTYS=y 801CONFIG_UNIX98_PTYS=y
767# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 802# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
768CONFIG_LEGACY_PTYS=y 803CONFIG_LEGACY_PTYS=y
@@ -799,6 +834,7 @@ CONFIG_GPIOLIB=y
799# 834#
800# PCI GPIO expanders: 835# PCI GPIO expanders:
801# 836#
837# CONFIG_GPIO_CS5535 is not set
802# CONFIG_GPIO_BT8XX is not set 838# CONFIG_GPIO_BT8XX is not set
803# CONFIG_GPIO_LANGWELL is not set 839# CONFIG_GPIO_LANGWELL is not set
804 840
@@ -1131,7 +1167,11 @@ CONFIG_BDI_SWITCH=y
1131# CONFIG_KEYS is not set 1167# CONFIG_KEYS is not set
1132# CONFIG_SECURITY is not set 1168# CONFIG_SECURITY is not set
1133# CONFIG_SECURITYFS is not set 1169# CONFIG_SECURITYFS is not set
1134# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1170# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1171# CONFIG_DEFAULT_SECURITY_SMACK is not set
1172# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1173CONFIG_DEFAULT_SECURITY_DAC=y
1174CONFIG_DEFAULT_SECURITY=""
1135CONFIG_CRYPTO=y 1175CONFIG_CRYPTO=y
1136 1176
1137# 1177#
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
index 64dff21516cb..05bec4835687 100644
--- a/arch/powerpc/configs/mpc83xx_defconfig
+++ b/arch/powerpc/configs/mpc83xx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:12 2009 4# Wed Jan 6 09:24:06 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,7 @@ CONFIG_GENERIC_BUG=y
61CONFIG_DTC=y 62CONFIG_DTC=y
62CONFIG_DEFAULT_UIMAGE=y 63CONFIG_DEFAULT_UIMAGE=y
63CONFIG_REDBOOT=y 64CONFIG_REDBOOT=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
64CONFIG_ARCH_SUSPEND_POSSIBLE=y 66CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
@@ -89,6 +91,7 @@ CONFIG_SYSVIPC_SYSCTL=y
89# 91#
90CONFIG_TREE_RCU=y 92CONFIG_TREE_RCU=y
91# CONFIG_TREE_PREEMPT_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_TINY_RCU is not set
92# CONFIG_RCU_TRACE is not set 95# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32 96CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set 97# CONFIG_RCU_FANOUT_EXACT is not set
@@ -176,14 +179,41 @@ CONFIG_LBDAF=y
176# IO Schedulers 179# IO Schedulers
177# 180#
178CONFIG_IOSCHED_NOOP=y 181CONFIG_IOSCHED_NOOP=y
179CONFIG_IOSCHED_AS=y
180CONFIG_IOSCHED_DEADLINE=y 182CONFIG_IOSCHED_DEADLINE=y
181CONFIG_IOSCHED_CFQ=y 183CONFIG_IOSCHED_CFQ=y
182CONFIG_DEFAULT_AS=y
183# CONFIG_DEFAULT_DEADLINE is not set 184# CONFIG_DEFAULT_DEADLINE is not set
184# CONFIG_DEFAULT_CFQ is not set 185CONFIG_DEFAULT_CFQ=y
185# CONFIG_DEFAULT_NOOP is not set 186# CONFIG_DEFAULT_NOOP is not set
186CONFIG_DEFAULT_IOSCHED="anticipatory" 187CONFIG_DEFAULT_IOSCHED="cfq"
188# CONFIG_INLINE_SPIN_TRYLOCK is not set
189# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
190# CONFIG_INLINE_SPIN_LOCK is not set
191# CONFIG_INLINE_SPIN_LOCK_BH is not set
192# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
193# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
194CONFIG_INLINE_SPIN_UNLOCK=y
195# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
196CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
197# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
198# CONFIG_INLINE_READ_TRYLOCK is not set
199# CONFIG_INLINE_READ_LOCK is not set
200# CONFIG_INLINE_READ_LOCK_BH is not set
201# CONFIG_INLINE_READ_LOCK_IRQ is not set
202# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
203CONFIG_INLINE_READ_UNLOCK=y
204# CONFIG_INLINE_READ_UNLOCK_BH is not set
205CONFIG_INLINE_READ_UNLOCK_IRQ=y
206# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
207# CONFIG_INLINE_WRITE_TRYLOCK is not set
208# CONFIG_INLINE_WRITE_LOCK is not set
209# CONFIG_INLINE_WRITE_LOCK_BH is not set
210# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
211# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
212CONFIG_INLINE_WRITE_UNLOCK=y
213# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
214CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
215# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
216# CONFIG_MUTEX_SPIN_ON_OWNER is not set
187# CONFIG_FREEZER is not set 217# CONFIG_FREEZER is not set
188 218
189# 219#
@@ -266,6 +296,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
266CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 296CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
267# CONFIG_KEXEC is not set 297# CONFIG_KEXEC is not set
268# CONFIG_CRASH_DUMP is not set 298# CONFIG_CRASH_DUMP is not set
299CONFIG_SPARSE_IRQ=y
269CONFIG_MAX_ACTIVE_REGIONS=32 300CONFIG_MAX_ACTIVE_REGIONS=32
270CONFIG_ARCH_FLATMEM_ENABLE=y 301CONFIG_ARCH_FLATMEM_ENABLE=y
271CONFIG_ARCH_POPULATES_NODE_MAP=y 302CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -282,8 +313,6 @@ CONFIG_MIGRATION=y
282CONFIG_ZONE_DMA_FLAG=1 313CONFIG_ZONE_DMA_FLAG=1
283CONFIG_BOUNCE=y 314CONFIG_BOUNCE=y
284CONFIG_VIRT_TO_BUS=y 315CONFIG_VIRT_TO_BUS=y
285CONFIG_HAVE_MLOCK=y
286CONFIG_HAVE_MLOCKED_PAGE_BIT=y
287# CONFIG_KSM is not set 316# CONFIG_KSM is not set
288CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 317CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
289CONFIG_PPC_4K_PAGES=y 318CONFIG_PPC_4K_PAGES=y
@@ -413,9 +442,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
413# CONFIG_AF_RXRPC is not set 442# CONFIG_AF_RXRPC is not set
414CONFIG_WIRELESS=y 443CONFIG_WIRELESS=y
415# CONFIG_CFG80211 is not set 444# CONFIG_CFG80211 is not set
416CONFIG_CFG80211_DEFAULT_PS_VALUE=0
417CONFIG_WIRELESS_OLD_REGULATORY=y
418# CONFIG_WIRELESS_EXT is not set
419# CONFIG_LIB80211 is not set 445# CONFIG_LIB80211 is not set
420 446
421# 447#
@@ -548,6 +574,10 @@ CONFIG_BLK_DEV=y
548# CONFIG_BLK_DEV_COW_COMMON is not set 574# CONFIG_BLK_DEV_COW_COMMON is not set
549CONFIG_BLK_DEV_LOOP=y 575CONFIG_BLK_DEV_LOOP=y
550# CONFIG_BLK_DEV_CRYPTOLOOP is not set 576# CONFIG_BLK_DEV_CRYPTOLOOP is not set
577
578#
579# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
580#
551# CONFIG_BLK_DEV_NBD is not set 581# CONFIG_BLK_DEV_NBD is not set
552# CONFIG_BLK_DEV_SX8 is not set 582# CONFIG_BLK_DEV_SX8 is not set
553# CONFIG_BLK_DEV_UB is not set 583# CONFIG_BLK_DEV_UB is not set
@@ -559,6 +589,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
559# CONFIG_ATA_OVER_ETH is not set 589# CONFIG_ATA_OVER_ETH is not set
560# CONFIG_BLK_DEV_HD is not set 590# CONFIG_BLK_DEV_HD is not set
561CONFIG_MISC_DEVICES=y 591CONFIG_MISC_DEVICES=y
592# CONFIG_AD525X_DPOT is not set
562# CONFIG_PHANTOM is not set 593# CONFIG_PHANTOM is not set
563# CONFIG_SGI_IOC4 is not set 594# CONFIG_SGI_IOC4 is not set
564# CONFIG_TIFM_CORE is not set 595# CONFIG_TIFM_CORE is not set
@@ -566,6 +597,7 @@ CONFIG_MISC_DEVICES=y
566# CONFIG_ENCLOSURE_SERVICES is not set 597# CONFIG_ENCLOSURE_SERVICES is not set
567# CONFIG_HP_ILO is not set 598# CONFIG_HP_ILO is not set
568# CONFIG_ISL29003 is not set 599# CONFIG_ISL29003 is not set
600# CONFIG_DS1682 is not set
569# CONFIG_C2PORT is not set 601# CONFIG_C2PORT is not set
570 602
571# 603#
@@ -618,7 +650,9 @@ CONFIG_SCSI_LOWLEVEL=y
618# CONFIG_SCSI_BNX2_ISCSI is not set 650# CONFIG_SCSI_BNX2_ISCSI is not set
619# CONFIG_BE2ISCSI is not set 651# CONFIG_BE2ISCSI is not set
620# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 652# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
653# CONFIG_SCSI_HPSA is not set
621# CONFIG_SCSI_3W_9XXX is not set 654# CONFIG_SCSI_3W_9XXX is not set
655# CONFIG_SCSI_3W_SAS is not set
622# CONFIG_SCSI_ACARD is not set 656# CONFIG_SCSI_ACARD is not set
623# CONFIG_SCSI_AACRAID is not set 657# CONFIG_SCSI_AACRAID is not set
624# CONFIG_SCSI_AIC7XXX is not set 658# CONFIG_SCSI_AIC7XXX is not set
@@ -657,6 +691,7 @@ CONFIG_SCSI_LOWLEVEL=y
657# CONFIG_SCSI_NSP32 is not set 691# CONFIG_SCSI_NSP32 is not set
658# CONFIG_SCSI_DEBUG is not set 692# CONFIG_SCSI_DEBUG is not set
659# CONFIG_SCSI_PMCRAID is not set 693# CONFIG_SCSI_PMCRAID is not set
694# CONFIG_SCSI_PM8001 is not set
660# CONFIG_SCSI_SRP is not set 695# CONFIG_SCSI_SRP is not set
661# CONFIG_SCSI_BFA_FC is not set 696# CONFIG_SCSI_BFA_FC is not set
662# CONFIG_SCSI_DH is not set 697# CONFIG_SCSI_DH is not set
@@ -712,15 +747,16 @@ CONFIG_ATA_SFF=y
712# CONFIG_PATA_NS87415 is not set 747# CONFIG_PATA_NS87415 is not set
713# CONFIG_PATA_OPTI is not set 748# CONFIG_PATA_OPTI is not set
714# CONFIG_PATA_OPTIDMA is not set 749# CONFIG_PATA_OPTIDMA is not set
750# CONFIG_PATA_PDC2027X is not set
715# CONFIG_PATA_PDC_OLD is not set 751# CONFIG_PATA_PDC_OLD is not set
716# CONFIG_PATA_RADISYS is not set 752# CONFIG_PATA_RADISYS is not set
717# CONFIG_PATA_RDC is not set 753# CONFIG_PATA_RDC is not set
718# CONFIG_PATA_RZ1000 is not set 754# CONFIG_PATA_RZ1000 is not set
719# CONFIG_PATA_SC1200 is not set 755# CONFIG_PATA_SC1200 is not set
720# CONFIG_PATA_SERVERWORKS is not set 756# CONFIG_PATA_SERVERWORKS is not set
721# CONFIG_PATA_PDC2027X is not set
722# CONFIG_PATA_SIL680 is not set 757# CONFIG_PATA_SIL680 is not set
723# CONFIG_PATA_SIS is not set 758# CONFIG_PATA_SIS is not set
759# CONFIG_PATA_TOSHIBA is not set
724# CONFIG_PATA_VIA is not set 760# CONFIG_PATA_VIA is not set
725# CONFIG_PATA_WINBOND is not set 761# CONFIG_PATA_WINBOND is not set
726# CONFIG_PATA_PLATFORM is not set 762# CONFIG_PATA_PLATFORM is not set
@@ -737,7 +773,7 @@ CONFIG_ATA_SFF=y
737# 773#
738 774
739# 775#
740# See the help texts for more information. 776# The newer stack is recommended.
741# 777#
742# CONFIG_FIREWIRE is not set 778# CONFIG_FIREWIRE is not set
743# CONFIG_IEEE1394 is not set 779# CONFIG_IEEE1394 is not set
@@ -844,8 +880,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
844# CONFIG_BE2NET is not set 880# CONFIG_BE2NET is not set
845# CONFIG_TR is not set 881# CONFIG_TR is not set
846CONFIG_WLAN=y 882CONFIG_WLAN=y
847# CONFIG_WLAN_PRE80211 is not set 883# CONFIG_AIRO is not set
848# CONFIG_WLAN_80211 is not set 884# CONFIG_ATMEL is not set
885# CONFIG_PRISM54 is not set
886# CONFIG_USB_ZD1201 is not set
887# CONFIG_HOSTAP is not set
849 888
850# 889#
851# Enable WiMAX (Networking options) to see the WiMAX drivers 890# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -868,6 +907,7 @@ CONFIG_WLAN=y
868# CONFIG_NETCONSOLE is not set 907# CONFIG_NETCONSOLE is not set
869# CONFIG_NETPOLL is not set 908# CONFIG_NETPOLL is not set
870# CONFIG_NET_POLL_CONTROLLER is not set 909# CONFIG_NET_POLL_CONTROLLER is not set
910# CONFIG_VMXNET3 is not set
871# CONFIG_ISDN is not set 911# CONFIG_ISDN is not set
872# CONFIG_PHONE is not set 912# CONFIG_PHONE is not set
873 913
@@ -877,6 +917,7 @@ CONFIG_WLAN=y
877CONFIG_INPUT=y 917CONFIG_INPUT=y
878CONFIG_INPUT_FF_MEMLESS=m 918CONFIG_INPUT_FF_MEMLESS=m
879# CONFIG_INPUT_POLLDEV is not set 919# CONFIG_INPUT_POLLDEV is not set
920# CONFIG_INPUT_SPARSEKMAP is not set
880 921
881# 922#
882# Userland interfaces 923# Userland interfaces
@@ -929,6 +970,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
929# CONFIG_SERIAL_JSM is not set 970# CONFIG_SERIAL_JSM is not set
930# CONFIG_SERIAL_OF_PLATFORM is not set 971# CONFIG_SERIAL_OF_PLATFORM is not set
931# CONFIG_SERIAL_QE is not set 972# CONFIG_SERIAL_QE is not set
973# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
932CONFIG_UNIX98_PTYS=y 974CONFIG_UNIX98_PTYS=y
933# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 975# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
934CONFIG_LEGACY_PTYS=y 976CONFIG_LEGACY_PTYS=y
@@ -989,11 +1031,6 @@ CONFIG_I2C_MPC=y
989# CONFIG_I2C_TINY_USB is not set 1031# CONFIG_I2C_TINY_USB is not set
990 1032
991# 1033#
992# Graphics adapter I2C/DDC channel drivers
993#
994# CONFIG_I2C_VOODOO3 is not set
995
996#
997# Other I2C/SMBus bus drivers 1034# Other I2C/SMBus bus drivers
998# 1035#
999# CONFIG_I2C_PCA_PLATFORM is not set 1036# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1002,7 +1039,6 @@ CONFIG_I2C_MPC=y
1002# 1039#
1003# Miscellaneous I2C Chip support 1040# Miscellaneous I2C Chip support
1004# 1041#
1005# CONFIG_DS1682 is not set
1006# CONFIG_SENSORS_TSL2550 is not set 1042# CONFIG_SENSORS_TSL2550 is not set
1007# CONFIG_I2C_DEBUG_CORE is not set 1043# CONFIG_I2C_DEBUG_CORE is not set
1008# CONFIG_I2C_DEBUG_ALGO is not set 1044# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1034,6 +1070,7 @@ CONFIG_GPIOLIB=y
1034# 1070#
1035# PCI GPIO expanders: 1071# PCI GPIO expanders:
1036# 1072#
1073# CONFIG_GPIO_CS5535 is not set
1037# CONFIG_GPIO_BT8XX is not set 1074# CONFIG_GPIO_BT8XX is not set
1038# CONFIG_GPIO_LANGWELL is not set 1075# CONFIG_GPIO_LANGWELL is not set
1039 1076
@@ -1076,6 +1113,7 @@ CONFIG_HWMON=y
1076# CONFIG_SENSORS_GL520SM is not set 1113# CONFIG_SENSORS_GL520SM is not set
1077# CONFIG_SENSORS_IT87 is not set 1114# CONFIG_SENSORS_IT87 is not set
1078# CONFIG_SENSORS_LM63 is not set 1115# CONFIG_SENSORS_LM63 is not set
1116# CONFIG_SENSORS_LM73 is not set
1079# CONFIG_SENSORS_LM75 is not set 1117# CONFIG_SENSORS_LM75 is not set
1080# CONFIG_SENSORS_LM77 is not set 1118# CONFIG_SENSORS_LM77 is not set
1081# CONFIG_SENSORS_LM78 is not set 1119# CONFIG_SENSORS_LM78 is not set
@@ -1115,6 +1153,7 @@ CONFIG_HWMON=y
1115# CONFIG_SENSORS_W83L786NG is not set 1153# CONFIG_SENSORS_W83L786NG is not set
1116# CONFIG_SENSORS_W83627HF is not set 1154# CONFIG_SENSORS_W83627HF is not set
1117# CONFIG_SENSORS_W83627EHF is not set 1155# CONFIG_SENSORS_W83627EHF is not set
1156# CONFIG_SENSORS_LIS3_I2C is not set
1118# CONFIG_THERMAL is not set 1157# CONFIG_THERMAL is not set
1119CONFIG_WATCHDOG=y 1158CONFIG_WATCHDOG=y
1120# CONFIG_WATCHDOG_NOWAYOUT is not set 1159# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1153,11 +1192,13 @@ CONFIG_SSB_POSSIBLE=y
1153# CONFIG_TWL4030_CORE is not set 1192# CONFIG_TWL4030_CORE is not set
1154# CONFIG_MFD_TMIO is not set 1193# CONFIG_MFD_TMIO is not set
1155# CONFIG_PMIC_DA903X is not set 1194# CONFIG_PMIC_DA903X is not set
1195# CONFIG_PMIC_ADP5520 is not set
1156# CONFIG_MFD_WM8400 is not set 1196# CONFIG_MFD_WM8400 is not set
1157# CONFIG_MFD_WM831X is not set 1197# CONFIG_MFD_WM831X is not set
1158# CONFIG_MFD_WM8350_I2C is not set 1198# CONFIG_MFD_WM8350_I2C is not set
1159# CONFIG_MFD_PCF50633 is not set 1199# CONFIG_MFD_PCF50633 is not set
1160# CONFIG_AB3100_CORE is not set 1200# CONFIG_AB3100_CORE is not set
1201# CONFIG_MFD_88PM8607 is not set
1161# CONFIG_REGULATOR is not set 1202# CONFIG_REGULATOR is not set
1162# CONFIG_MEDIA_SUPPORT is not set 1203# CONFIG_MEDIA_SUPPORT is not set
1163 1204
@@ -1249,6 +1290,7 @@ CONFIG_USB_MON=y
1249CONFIG_USB_EHCI_HCD=y 1290CONFIG_USB_EHCI_HCD=y
1250CONFIG_USB_EHCI_ROOT_HUB_TT=y 1291CONFIG_USB_EHCI_ROOT_HUB_TT=y
1251# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1292# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1293# CONFIG_XPS_USB_HCD_XILINX is not set
1252CONFIG_USB_EHCI_FSL=y 1294CONFIG_USB_EHCI_FSL=y
1253CONFIG_USB_EHCI_HCD_PPC_OF=y 1295CONFIG_USB_EHCI_HCD_PPC_OF=y
1254# CONFIG_USB_OXU210HP_HCD is not set 1296# CONFIG_USB_OXU210HP_HCD is not set
@@ -1542,7 +1584,7 @@ CONFIG_FRAME_WARN=1024
1542# CONFIG_DEBUG_FS is not set 1584# CONFIG_DEBUG_FS is not set
1543# CONFIG_HEADERS_CHECK is not set 1585# CONFIG_HEADERS_CHECK is not set
1544# CONFIG_DEBUG_KERNEL is not set 1586# CONFIG_DEBUG_KERNEL is not set
1545# CONFIG_DEBUG_BUGVERBOSE is not set 1587CONFIG_DEBUG_BUGVERBOSE=y
1546# CONFIG_DEBUG_MEMORY_INIT is not set 1588# CONFIG_DEBUG_MEMORY_INIT is not set
1547# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1589# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1548# CONFIG_LATENCYTOP is not set 1590# CONFIG_LATENCYTOP is not set
@@ -1569,7 +1611,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1569# CONFIG_KEYS is not set 1611# CONFIG_KEYS is not set
1570# CONFIG_SECURITY is not set 1612# CONFIG_SECURITY is not set
1571# CONFIG_SECURITYFS is not set 1613# CONFIG_SECURITYFS is not set
1572# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1614# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1615# CONFIG_DEFAULT_SECURITY_SMACK is not set
1616# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1617CONFIG_DEFAULT_SECURITY_DAC=y
1618CONFIG_DEFAULT_SECURITY=""
1573CONFIG_CRYPTO=y 1619CONFIG_CRYPTO=y
1574 1620
1575# 1621#
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index a12e7ba87a43..8f35f8049c92 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:25:20 2009 4# Wed Jan 6 09:24:06 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -92,6 +95,7 @@ CONFIG_AUDIT=y
92# 95#
93CONFIG_TREE_RCU=y 96CONFIG_TREE_RCU=y
94# CONFIG_TREE_PREEMPT_RCU is not set 97# CONFIG_TREE_PREEMPT_RCU is not set
98# CONFIG_TINY_RCU is not set
95# CONFIG_RCU_TRACE is not set 99# CONFIG_RCU_TRACE is not set
96CONFIG_RCU_FANOUT=32 100CONFIG_RCU_FANOUT=32
97# CONFIG_RCU_FANOUT_EXACT is not set 101# CONFIG_RCU_FANOUT_EXACT is not set
@@ -184,14 +188,41 @@ CONFIG_LBDAF=y
184# IO Schedulers 188# IO Schedulers
185# 189#
186CONFIG_IOSCHED_NOOP=y 190CONFIG_IOSCHED_NOOP=y
187CONFIG_IOSCHED_AS=y
188CONFIG_IOSCHED_DEADLINE=y 191CONFIG_IOSCHED_DEADLINE=y
189CONFIG_IOSCHED_CFQ=y 192CONFIG_IOSCHED_CFQ=y
190# CONFIG_DEFAULT_AS is not set
191# CONFIG_DEFAULT_DEADLINE is not set 193# CONFIG_DEFAULT_DEADLINE is not set
192CONFIG_DEFAULT_CFQ=y 194CONFIG_DEFAULT_CFQ=y
193# CONFIG_DEFAULT_NOOP is not set 195# CONFIG_DEFAULT_NOOP is not set
194CONFIG_DEFAULT_IOSCHED="cfq" 196CONFIG_DEFAULT_IOSCHED="cfq"
197# CONFIG_INLINE_SPIN_TRYLOCK is not set
198# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
199# CONFIG_INLINE_SPIN_LOCK is not set
200# CONFIG_INLINE_SPIN_LOCK_BH is not set
201# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
202# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
203CONFIG_INLINE_SPIN_UNLOCK=y
204# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
205CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
206# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
207# CONFIG_INLINE_READ_TRYLOCK is not set
208# CONFIG_INLINE_READ_LOCK is not set
209# CONFIG_INLINE_READ_LOCK_BH is not set
210# CONFIG_INLINE_READ_LOCK_IRQ is not set
211# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
212CONFIG_INLINE_READ_UNLOCK=y
213# CONFIG_INLINE_READ_UNLOCK_BH is not set
214CONFIG_INLINE_READ_UNLOCK_IRQ=y
215# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
216# CONFIG_INLINE_WRITE_TRYLOCK is not set
217# CONFIG_INLINE_WRITE_LOCK is not set
218# CONFIG_INLINE_WRITE_LOCK_BH is not set
219# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
220# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
221CONFIG_INLINE_WRITE_UNLOCK=y
222# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
223CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
224# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
225# CONFIG_MUTEX_SPIN_ON_OWNER is not set
195# CONFIG_FREEZER is not set 226# CONFIG_FREEZER is not set
196CONFIG_PPC_MSI_BITMAP=y 227CONFIG_PPC_MSI_BITMAP=y
197 228
@@ -201,7 +232,7 @@ CONFIG_PPC_MSI_BITMAP=y
201# CONFIG_PPC_CELL is not set 232# CONFIG_PPC_CELL is not set
202# CONFIG_PPC_CELL_NATIVE is not set 233# CONFIG_PPC_CELL_NATIVE is not set
203# CONFIG_PQ2ADS is not set 234# CONFIG_PQ2ADS is not set
204CONFIG_MPC85xx=y 235CONFIG_FSL_SOC_BOOKE=y
205CONFIG_MPC8540_ADS=y 236CONFIG_MPC8540_ADS=y
206CONFIG_MPC8560_ADS=y 237CONFIG_MPC8560_ADS=y
207CONFIG_MPC85xx_CDS=y 238CONFIG_MPC85xx_CDS=y
@@ -220,6 +251,7 @@ CONFIG_TQM8555=y
220CONFIG_TQM8560=y 251CONFIG_TQM8560=y
221CONFIG_SBC8548=y 252CONFIG_SBC8548=y
222# CONFIG_SBC8560 is not set 253# CONFIG_SBC8560 is not set
254# CONFIG_P4080_DS is not set
223CONFIG_TQM85xx=y 255CONFIG_TQM85xx=y
224# CONFIG_IPIC is not set 256# CONFIG_IPIC is not set
225CONFIG_MPIC=y 257CONFIG_MPIC=y
@@ -267,6 +299,7 @@ CONFIG_SWIOTLB=y
267CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 299CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
268CONFIG_ARCH_HAS_WALK_MEMORY=y 300CONFIG_ARCH_HAS_WALK_MEMORY=y
269CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 301CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
302CONFIG_SPARSE_IRQ=y
270CONFIG_MAX_ACTIVE_REGIONS=32 303CONFIG_MAX_ACTIVE_REGIONS=32
271CONFIG_ARCH_FLATMEM_ENABLE=y 304CONFIG_ARCH_FLATMEM_ENABLE=y
272CONFIG_ARCH_POPULATES_NODE_MAP=y 305CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -283,8 +316,6 @@ CONFIG_MIGRATION=y
283CONFIG_ZONE_DMA_FLAG=1 316CONFIG_ZONE_DMA_FLAG=1
284CONFIG_BOUNCE=y 317CONFIG_BOUNCE=y
285CONFIG_VIRT_TO_BUS=y 318CONFIG_VIRT_TO_BUS=y
286CONFIG_HAVE_MLOCK=y
287CONFIG_HAVE_MLOCKED_PAGE_BIT=y
288# CONFIG_KSM is not set 319# CONFIG_KSM is not set
289CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 320CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
290CONFIG_PPC_4K_PAGES=y 321CONFIG_PPC_4K_PAGES=y
@@ -405,6 +436,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y
405CONFIG_INET6_XFRM_MODE_BEET=y 436CONFIG_INET6_XFRM_MODE_BEET=y
406# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 437# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
407CONFIG_IPV6_SIT=y 438CONFIG_IPV6_SIT=y
439# CONFIG_IPV6_SIT_6RD is not set
408CONFIG_IPV6_NDISC_NODETYPE=y 440CONFIG_IPV6_NDISC_NODETYPE=y
409# CONFIG_IPV6_TUNNEL is not set 441# CONFIG_IPV6_TUNNEL is not set
410# CONFIG_IPV6_MULTIPLE_TABLES is not set 442# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -449,9 +481,6 @@ CONFIG_SCTP_HMAC_MD5=y
449CONFIG_FIB_RULES=y 481CONFIG_FIB_RULES=y
450CONFIG_WIRELESS=y 482CONFIG_WIRELESS=y
451# CONFIG_CFG80211 is not set 483# CONFIG_CFG80211 is not set
452CONFIG_CFG80211_DEFAULT_PS_VALUE=0
453CONFIG_WIRELESS_OLD_REGULATORY=y
454# CONFIG_WIRELESS_EXT is not set
455# CONFIG_LIB80211 is not set 484# CONFIG_LIB80211 is not set
456 485
457# 486#
@@ -494,6 +523,10 @@ CONFIG_BLK_DEV=y
494# CONFIG_BLK_DEV_COW_COMMON is not set 523# CONFIG_BLK_DEV_COW_COMMON is not set
495CONFIG_BLK_DEV_LOOP=y 524CONFIG_BLK_DEV_LOOP=y
496# CONFIG_BLK_DEV_CRYPTOLOOP is not set 525# CONFIG_BLK_DEV_CRYPTOLOOP is not set
526
527#
528# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
529#
497CONFIG_BLK_DEV_NBD=y 530CONFIG_BLK_DEV_NBD=y
498# CONFIG_BLK_DEV_SX8 is not set 531# CONFIG_BLK_DEV_SX8 is not set
499# CONFIG_BLK_DEV_UB is not set 532# CONFIG_BLK_DEV_UB is not set
@@ -505,6 +538,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
505# CONFIG_ATA_OVER_ETH is not set 538# CONFIG_ATA_OVER_ETH is not set
506# CONFIG_BLK_DEV_HD is not set 539# CONFIG_BLK_DEV_HD is not set
507CONFIG_MISC_DEVICES=y 540CONFIG_MISC_DEVICES=y
541# CONFIG_AD525X_DPOT is not set
508# CONFIG_PHANTOM is not set 542# CONFIG_PHANTOM is not set
509# CONFIG_SGI_IOC4 is not set 543# CONFIG_SGI_IOC4 is not set
510# CONFIG_TIFM_CORE is not set 544# CONFIG_TIFM_CORE is not set
@@ -512,6 +546,7 @@ CONFIG_MISC_DEVICES=y
512# CONFIG_ENCLOSURE_SERVICES is not set 546# CONFIG_ENCLOSURE_SERVICES is not set
513# CONFIG_HP_ILO is not set 547# CONFIG_HP_ILO is not set
514# CONFIG_ISL29003 is not set 548# CONFIG_ISL29003 is not set
549# CONFIG_DS1682 is not set
515# CONFIG_C2PORT is not set 550# CONFIG_C2PORT is not set
516 551
517# 552#
@@ -565,7 +600,9 @@ CONFIG_SCSI_LOWLEVEL=y
565# CONFIG_SCSI_BNX2_ISCSI is not set 600# CONFIG_SCSI_BNX2_ISCSI is not set
566# CONFIG_BE2ISCSI is not set 601# CONFIG_BE2ISCSI is not set
567# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 602# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
603# CONFIG_SCSI_HPSA is not set
568# CONFIG_SCSI_3W_9XXX is not set 604# CONFIG_SCSI_3W_9XXX is not set
605# CONFIG_SCSI_3W_SAS is not set
569# CONFIG_SCSI_ACARD is not set 606# CONFIG_SCSI_ACARD is not set
570# CONFIG_SCSI_AACRAID is not set 607# CONFIG_SCSI_AACRAID is not set
571# CONFIG_SCSI_AIC7XXX is not set 608# CONFIG_SCSI_AIC7XXX is not set
@@ -604,6 +641,7 @@ CONFIG_SCSI_LOWLEVEL=y
604# CONFIG_SCSI_NSP32 is not set 641# CONFIG_SCSI_NSP32 is not set
605# CONFIG_SCSI_DEBUG is not set 642# CONFIG_SCSI_DEBUG is not set
606# CONFIG_SCSI_PMCRAID is not set 643# CONFIG_SCSI_PMCRAID is not set
644# CONFIG_SCSI_PM8001 is not set
607# CONFIG_SCSI_SRP is not set 645# CONFIG_SCSI_SRP is not set
608# CONFIG_SCSI_BFA_FC is not set 646# CONFIG_SCSI_BFA_FC is not set
609# CONFIG_SCSI_DH is not set 647# CONFIG_SCSI_DH is not set
@@ -659,15 +697,16 @@ CONFIG_PATA_ALI=y
659# CONFIG_PATA_NS87415 is not set 697# CONFIG_PATA_NS87415 is not set
660# CONFIG_PATA_OPTI is not set 698# CONFIG_PATA_OPTI is not set
661# CONFIG_PATA_OPTIDMA is not set 699# CONFIG_PATA_OPTIDMA is not set
700# CONFIG_PATA_PDC2027X is not set
662# CONFIG_PATA_PDC_OLD is not set 701# CONFIG_PATA_PDC_OLD is not set
663# CONFIG_PATA_RADISYS is not set 702# CONFIG_PATA_RADISYS is not set
664# CONFIG_PATA_RDC is not set 703# CONFIG_PATA_RDC is not set
665# CONFIG_PATA_RZ1000 is not set 704# CONFIG_PATA_RZ1000 is not set
666# CONFIG_PATA_SC1200 is not set 705# CONFIG_PATA_SC1200 is not set
667# CONFIG_PATA_SERVERWORKS is not set 706# CONFIG_PATA_SERVERWORKS is not set
668# CONFIG_PATA_PDC2027X is not set
669# CONFIG_PATA_SIL680 is not set 707# CONFIG_PATA_SIL680 is not set
670# CONFIG_PATA_SIS is not set 708# CONFIG_PATA_SIS is not set
709# CONFIG_PATA_TOSHIBA is not set
671# CONFIG_PATA_VIA is not set 710# CONFIG_PATA_VIA is not set
672# CONFIG_PATA_WINBOND is not set 711# CONFIG_PATA_WINBOND is not set
673# CONFIG_PATA_PLATFORM is not set 712# CONFIG_PATA_PLATFORM is not set
@@ -684,7 +723,7 @@ CONFIG_PATA_ALI=y
684# 723#
685 724
686# 725#
687# See the help texts for more information. 726# The newer stack is recommended.
688# 727#
689# CONFIG_FIREWIRE is not set 728# CONFIG_FIREWIRE is not set
690# CONFIG_IEEE1394 is not set 729# CONFIG_IEEE1394 is not set
@@ -795,8 +834,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
795# CONFIG_BE2NET is not set 834# CONFIG_BE2NET is not set
796# CONFIG_TR is not set 835# CONFIG_TR is not set
797CONFIG_WLAN=y 836CONFIG_WLAN=y
798# CONFIG_WLAN_PRE80211 is not set 837# CONFIG_AIRO is not set
799# CONFIG_WLAN_80211 is not set 838# CONFIG_ATMEL is not set
839# CONFIG_PRISM54 is not set
840# CONFIG_USB_ZD1201 is not set
841# CONFIG_HOSTAP is not set
800 842
801# 843#
802# Enable WiMAX (Networking options) to see the WiMAX drivers 844# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -820,6 +862,7 @@ CONFIG_WLAN=y
820# CONFIG_NETCONSOLE is not set 862# CONFIG_NETCONSOLE is not set
821# CONFIG_NETPOLL is not set 863# CONFIG_NETPOLL is not set
822# CONFIG_NET_POLL_CONTROLLER is not set 864# CONFIG_NET_POLL_CONTROLLER is not set
865# CONFIG_VMXNET3 is not set
823# CONFIG_ISDN is not set 866# CONFIG_ISDN is not set
824# CONFIG_PHONE is not set 867# CONFIG_PHONE is not set
825 868
@@ -829,6 +872,7 @@ CONFIG_WLAN=y
829CONFIG_INPUT=y 872CONFIG_INPUT=y
830CONFIG_INPUT_FF_MEMLESS=m 873CONFIG_INPUT_FF_MEMLESS=m
831# CONFIG_INPUT_POLLDEV is not set 874# CONFIG_INPUT_POLLDEV is not set
875# CONFIG_INPUT_SPARSEKMAP is not set
832 876
833# 877#
834# Userland interfaces 878# Userland interfaces
@@ -858,6 +902,7 @@ CONFIG_SERIO_SERPORT=y
858CONFIG_SERIO_LIBPS2=y 902CONFIG_SERIO_LIBPS2=y
859# CONFIG_SERIO_RAW is not set 903# CONFIG_SERIO_RAW is not set
860# CONFIG_SERIO_XILINX_XPS_PS2 is not set 904# CONFIG_SERIO_XILINX_XPS_PS2 is not set
905# CONFIG_SERIO_ALTERA_PS2 is not set
861# CONFIG_GAMEPORT is not set 906# CONFIG_GAMEPORT is not set
862 907
863# 908#
@@ -896,6 +941,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
896# CONFIG_SERIAL_JSM is not set 941# CONFIG_SERIAL_JSM is not set
897# CONFIG_SERIAL_OF_PLATFORM is not set 942# CONFIG_SERIAL_OF_PLATFORM is not set
898CONFIG_SERIAL_QE=m 943CONFIG_SERIAL_QE=m
944# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
899CONFIG_UNIX98_PTYS=y 945CONFIG_UNIX98_PTYS=y
900# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 946# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
901CONFIG_LEGACY_PTYS=y 947CONFIG_LEGACY_PTYS=y
@@ -956,11 +1002,6 @@ CONFIG_I2C_MPC=y
956# CONFIG_I2C_TINY_USB is not set 1002# CONFIG_I2C_TINY_USB is not set
957 1003
958# 1004#
959# Graphics adapter I2C/DDC channel drivers
960#
961# CONFIG_I2C_VOODOO3 is not set
962
963#
964# Other I2C/SMBus bus drivers 1005# Other I2C/SMBus bus drivers
965# 1006#
966# CONFIG_I2C_PCA_PLATFORM is not set 1007# CONFIG_I2C_PCA_PLATFORM is not set
@@ -969,7 +1010,6 @@ CONFIG_I2C_MPC=y
969# 1010#
970# Miscellaneous I2C Chip support 1011# Miscellaneous I2C Chip support
971# 1012#
972# CONFIG_DS1682 is not set
973# CONFIG_SENSORS_TSL2550 is not set 1013# CONFIG_SENSORS_TSL2550 is not set
974# CONFIG_I2C_DEBUG_CORE is not set 1014# CONFIG_I2C_DEBUG_CORE is not set
975# CONFIG_I2C_DEBUG_ALGO is not set 1015# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1002,6 +1042,7 @@ CONFIG_GPIOLIB=y
1002# 1042#
1003# PCI GPIO expanders: 1043# PCI GPIO expanders:
1004# 1044#
1045# CONFIG_GPIO_CS5535 is not set
1005# CONFIG_GPIO_BT8XX is not set 1046# CONFIG_GPIO_BT8XX is not set
1006# CONFIG_GPIO_LANGWELL is not set 1047# CONFIG_GPIO_LANGWELL is not set
1007 1048
@@ -1035,11 +1076,13 @@ CONFIG_SSB_POSSIBLE=y
1035# CONFIG_TWL4030_CORE is not set 1076# CONFIG_TWL4030_CORE is not set
1036# CONFIG_MFD_TMIO is not set 1077# CONFIG_MFD_TMIO is not set
1037# CONFIG_PMIC_DA903X is not set 1078# CONFIG_PMIC_DA903X is not set
1079# CONFIG_PMIC_ADP5520 is not set
1038# CONFIG_MFD_WM8400 is not set 1080# CONFIG_MFD_WM8400 is not set
1039# CONFIG_MFD_WM831X is not set 1081# CONFIG_MFD_WM831X is not set
1040# CONFIG_MFD_WM8350_I2C is not set 1082# CONFIG_MFD_WM8350_I2C is not set
1041# CONFIG_MFD_PCF50633 is not set 1083# CONFIG_MFD_PCF50633 is not set
1042# CONFIG_AB3100_CORE is not set 1084# CONFIG_AB3100_CORE is not set
1085# CONFIG_MFD_88PM8607 is not set
1043# CONFIG_REGULATOR is not set 1086# CONFIG_REGULATOR is not set
1044# CONFIG_MEDIA_SUPPORT is not set 1087# CONFIG_MEDIA_SUPPORT is not set
1045 1088
@@ -1114,6 +1157,7 @@ CONFIG_SND_PCI=y
1114# CONFIG_SND_CS4281 is not set 1157# CONFIG_SND_CS4281 is not set
1115# CONFIG_SND_CS46XX is not set 1158# CONFIG_SND_CS46XX is not set
1116# CONFIG_SND_CS5530 is not set 1159# CONFIG_SND_CS5530 is not set
1160# CONFIG_SND_CS5535AUDIO is not set
1117# CONFIG_SND_CTXFI is not set 1161# CONFIG_SND_CTXFI is not set
1118# CONFIG_SND_DARLA20 is not set 1162# CONFIG_SND_DARLA20 is not set
1119# CONFIG_SND_GINA20 is not set 1163# CONFIG_SND_GINA20 is not set
@@ -1241,6 +1285,7 @@ CONFIG_USB_MON=y
1241CONFIG_USB_EHCI_HCD=y 1285CONFIG_USB_EHCI_HCD=y
1242CONFIG_USB_EHCI_ROOT_HUB_TT=y 1286CONFIG_USB_EHCI_ROOT_HUB_TT=y
1243# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1287# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1288# CONFIG_XPS_USB_HCD_XILINX is not set
1244CONFIG_USB_EHCI_FSL=y 1289CONFIG_USB_EHCI_FSL=y
1245CONFIG_USB_EHCI_HCD_PPC_OF=y 1290CONFIG_USB_EHCI_HCD_PPC_OF=y
1246# CONFIG_USB_OXU210HP_HCD is not set 1291# CONFIG_USB_OXU210HP_HCD is not set
@@ -1347,7 +1392,6 @@ CONFIG_EDAC=y
1347# 1392#
1348# CONFIG_EDAC_DEBUG is not set 1393# CONFIG_EDAC_DEBUG is not set
1349CONFIG_EDAC_MM_EDAC=y 1394CONFIG_EDAC_MM_EDAC=y
1350CONFIG_EDAC_MPC85XX=y
1351CONFIG_RTC_LIB=y 1395CONFIG_RTC_LIB=y
1352CONFIG_RTC_CLASS=y 1396CONFIG_RTC_CLASS=y
1353CONFIG_RTC_HCTOSYS=y 1397CONFIG_RTC_HCTOSYS=y
@@ -1376,6 +1420,7 @@ CONFIG_RTC_INTF_DEV=y
1376# CONFIG_RTC_DRV_PCF8563 is not set 1420# CONFIG_RTC_DRV_PCF8563 is not set
1377# CONFIG_RTC_DRV_PCF8583 is not set 1421# CONFIG_RTC_DRV_PCF8583 is not set
1378# CONFIG_RTC_DRV_M41T80 is not set 1422# CONFIG_RTC_DRV_M41T80 is not set
1423# CONFIG_RTC_DRV_BQ32K is not set
1379# CONFIG_RTC_DRV_S35390A is not set 1424# CONFIG_RTC_DRV_S35390A is not set
1380# CONFIG_RTC_DRV_FM3130 is not set 1425# CONFIG_RTC_DRV_FM3130 is not set
1381# CONFIG_RTC_DRV_RX8581 is not set 1426# CONFIG_RTC_DRV_RX8581 is not set
@@ -1397,7 +1442,9 @@ CONFIG_RTC_DRV_CMOS=y
1397# CONFIG_RTC_DRV_M48T86 is not set 1442# CONFIG_RTC_DRV_M48T86 is not set
1398# CONFIG_RTC_DRV_M48T35 is not set 1443# CONFIG_RTC_DRV_M48T35 is not set
1399# CONFIG_RTC_DRV_M48T59 is not set 1444# CONFIG_RTC_DRV_M48T59 is not set
1445# CONFIG_RTC_DRV_MSM6242 is not set
1400# CONFIG_RTC_DRV_BQ4802 is not set 1446# CONFIG_RTC_DRV_BQ4802 is not set
1447# CONFIG_RTC_DRV_RP5C01 is not set
1401# CONFIG_RTC_DRV_V3020 is not set 1448# CONFIG_RTC_DRV_V3020 is not set
1402 1449
1403# 1450#
@@ -1731,7 +1778,11 @@ CONFIG_VIRQ_DEBUG=y
1731# CONFIG_KEYS is not set 1778# CONFIG_KEYS is not set
1732# CONFIG_SECURITY is not set 1779# CONFIG_SECURITY is not set
1733# CONFIG_SECURITYFS is not set 1780# CONFIG_SECURITYFS is not set
1734# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1781# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1782# CONFIG_DEFAULT_SECURITY_SMACK is not set
1783# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1784CONFIG_DEFAULT_SECURITY_DAC=y
1785CONFIG_DEFAULT_SECURITY=""
1735CONFIG_CRYPTO=y 1786CONFIG_CRYPTO=y
1736 1787
1737# 1788#
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
index cd70b4a4ce01..8755ea3c7f5f 100644
--- a/arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/arch/powerpc/configs/mpc85xx_smp_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:26:01 2009 4# Wed Jan 6 09:24:07 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -40,6 +40,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
40# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 40# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
41# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 41# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
42CONFIG_IRQ_PER_CPU=y 42CONFIG_IRQ_PER_CPU=y
43CONFIG_NR_IRQS=512
43CONFIG_STACKTRACE_SUPPORT=y 44CONFIG_STACKTRACE_SUPPORT=y
44CONFIG_HAVE_LATENCYTOP_SUPPORT=y 45CONFIG_HAVE_LATENCYTOP_SUPPORT=y
45CONFIG_TRACE_IRQFLAGS_SUPPORT=y 46CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -63,6 +64,8 @@ CONFIG_AUDIT_ARCH=y
63CONFIG_GENERIC_BUG=y 64CONFIG_GENERIC_BUG=y
64CONFIG_DTC=y 65CONFIG_DTC=y
65CONFIG_DEFAULT_UIMAGE=y 66CONFIG_DEFAULT_UIMAGE=y
67CONFIG_ARCH_HIBERNATION_POSSIBLE=y
68CONFIG_ARCH_SUSPEND_POSSIBLE=y
66# CONFIG_PPC_DCR_NATIVE is not set 69# CONFIG_PPC_DCR_NATIVE is not set
67# CONFIG_PPC_DCR_MMIO is not set 70# CONFIG_PPC_DCR_MMIO is not set
68CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 71CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -93,6 +96,7 @@ CONFIG_AUDIT=y
93# 96#
94CONFIG_TREE_RCU=y 97CONFIG_TREE_RCU=y
95# CONFIG_TREE_PREEMPT_RCU is not set 98# CONFIG_TREE_PREEMPT_RCU is not set
99# CONFIG_TINY_RCU is not set
96# CONFIG_RCU_TRACE is not set 100# CONFIG_RCU_TRACE is not set
97CONFIG_RCU_FANOUT=32 101CONFIG_RCU_FANOUT=32
98# CONFIG_RCU_FANOUT_EXACT is not set 102# CONFIG_RCU_FANOUT_EXACT is not set
@@ -187,14 +191,41 @@ CONFIG_LBDAF=y
187# IO Schedulers 191# IO Schedulers
188# 192#
189CONFIG_IOSCHED_NOOP=y 193CONFIG_IOSCHED_NOOP=y
190CONFIG_IOSCHED_AS=y
191CONFIG_IOSCHED_DEADLINE=y 194CONFIG_IOSCHED_DEADLINE=y
192CONFIG_IOSCHED_CFQ=y 195CONFIG_IOSCHED_CFQ=y
193# CONFIG_DEFAULT_AS is not set
194# CONFIG_DEFAULT_DEADLINE is not set 196# CONFIG_DEFAULT_DEADLINE is not set
195CONFIG_DEFAULT_CFQ=y 197CONFIG_DEFAULT_CFQ=y
196# CONFIG_DEFAULT_NOOP is not set 198# CONFIG_DEFAULT_NOOP is not set
197CONFIG_DEFAULT_IOSCHED="cfq" 199CONFIG_DEFAULT_IOSCHED="cfq"
200# CONFIG_INLINE_SPIN_TRYLOCK is not set
201# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
202# CONFIG_INLINE_SPIN_LOCK is not set
203# CONFIG_INLINE_SPIN_LOCK_BH is not set
204# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
205# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
206CONFIG_INLINE_SPIN_UNLOCK=y
207# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
208CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
209# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
210# CONFIG_INLINE_READ_TRYLOCK is not set
211# CONFIG_INLINE_READ_LOCK is not set
212# CONFIG_INLINE_READ_LOCK_BH is not set
213# CONFIG_INLINE_READ_LOCK_IRQ is not set
214# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
215CONFIG_INLINE_READ_UNLOCK=y
216# CONFIG_INLINE_READ_UNLOCK_BH is not set
217CONFIG_INLINE_READ_UNLOCK_IRQ=y
218# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
219# CONFIG_INLINE_WRITE_TRYLOCK is not set
220# CONFIG_INLINE_WRITE_LOCK is not set
221# CONFIG_INLINE_WRITE_LOCK_BH is not set
222# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
223# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
224CONFIG_INLINE_WRITE_UNLOCK=y
225# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
226CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
227# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
228CONFIG_MUTEX_SPIN_ON_OWNER=y
198# CONFIG_FREEZER is not set 229# CONFIG_FREEZER is not set
199CONFIG_PPC_MSI_BITMAP=y 230CONFIG_PPC_MSI_BITMAP=y
200 231
@@ -204,7 +235,7 @@ CONFIG_PPC_MSI_BITMAP=y
204# CONFIG_PPC_CELL is not set 235# CONFIG_PPC_CELL is not set
205# CONFIG_PPC_CELL_NATIVE is not set 236# CONFIG_PPC_CELL_NATIVE is not set
206# CONFIG_PQ2ADS is not set 237# CONFIG_PQ2ADS is not set
207CONFIG_MPC85xx=y 238CONFIG_FSL_SOC_BOOKE=y
208CONFIG_MPC8540_ADS=y 239CONFIG_MPC8540_ADS=y
209CONFIG_MPC8560_ADS=y 240CONFIG_MPC8560_ADS=y
210CONFIG_MPC85xx_CDS=y 241CONFIG_MPC85xx_CDS=y
@@ -223,6 +254,7 @@ CONFIG_TQM8555=y
223CONFIG_TQM8560=y 254CONFIG_TQM8560=y
224CONFIG_SBC8548=y 255CONFIG_SBC8548=y
225# CONFIG_SBC8560 is not set 256# CONFIG_SBC8560 is not set
257# CONFIG_P4080_DS is not set
226CONFIG_TQM85xx=y 258CONFIG_TQM85xx=y
227# CONFIG_IPIC is not set 259# CONFIG_IPIC is not set
228CONFIG_MPIC=y 260CONFIG_MPIC=y
@@ -271,6 +303,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
271CONFIG_ARCH_HAS_WALK_MEMORY=y 303CONFIG_ARCH_HAS_WALK_MEMORY=y
272CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 304CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
273# CONFIG_IRQ_ALL_CPUS is not set 305# CONFIG_IRQ_ALL_CPUS is not set
306CONFIG_SPARSE_IRQ=y
274CONFIG_MAX_ACTIVE_REGIONS=32 307CONFIG_MAX_ACTIVE_REGIONS=32
275CONFIG_ARCH_FLATMEM_ENABLE=y 308CONFIG_ARCH_FLATMEM_ENABLE=y
276CONFIG_ARCH_POPULATES_NODE_MAP=y 309CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -287,8 +320,6 @@ CONFIG_MIGRATION=y
287CONFIG_ZONE_DMA_FLAG=1 320CONFIG_ZONE_DMA_FLAG=1
288CONFIG_BOUNCE=y 321CONFIG_BOUNCE=y
289CONFIG_VIRT_TO_BUS=y 322CONFIG_VIRT_TO_BUS=y
290CONFIG_HAVE_MLOCK=y
291CONFIG_HAVE_MLOCKED_PAGE_BIT=y
292# CONFIG_KSM is not set 323# CONFIG_KSM is not set
293CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 324CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
294CONFIG_PPC_4K_PAGES=y 325CONFIG_PPC_4K_PAGES=y
@@ -409,6 +440,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y
409CONFIG_INET6_XFRM_MODE_BEET=y 440CONFIG_INET6_XFRM_MODE_BEET=y
410# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 441# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
411CONFIG_IPV6_SIT=y 442CONFIG_IPV6_SIT=y
443# CONFIG_IPV6_SIT_6RD is not set
412CONFIG_IPV6_NDISC_NODETYPE=y 444CONFIG_IPV6_NDISC_NODETYPE=y
413# CONFIG_IPV6_TUNNEL is not set 445# CONFIG_IPV6_TUNNEL is not set
414# CONFIG_IPV6_MULTIPLE_TABLES is not set 446# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -453,9 +485,6 @@ CONFIG_SCTP_HMAC_MD5=y
453CONFIG_FIB_RULES=y 485CONFIG_FIB_RULES=y
454CONFIG_WIRELESS=y 486CONFIG_WIRELESS=y
455# CONFIG_CFG80211 is not set 487# CONFIG_CFG80211 is not set
456CONFIG_CFG80211_DEFAULT_PS_VALUE=0
457CONFIG_WIRELESS_OLD_REGULATORY=y
458# CONFIG_WIRELESS_EXT is not set
459# CONFIG_LIB80211 is not set 488# CONFIG_LIB80211 is not set
460 489
461# 490#
@@ -498,6 +527,10 @@ CONFIG_BLK_DEV=y
498# CONFIG_BLK_DEV_COW_COMMON is not set 527# CONFIG_BLK_DEV_COW_COMMON is not set
499CONFIG_BLK_DEV_LOOP=y 528CONFIG_BLK_DEV_LOOP=y
500# CONFIG_BLK_DEV_CRYPTOLOOP is not set 529# CONFIG_BLK_DEV_CRYPTOLOOP is not set
530
531#
532# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
533#
501CONFIG_BLK_DEV_NBD=y 534CONFIG_BLK_DEV_NBD=y
502# CONFIG_BLK_DEV_SX8 is not set 535# CONFIG_BLK_DEV_SX8 is not set
503# CONFIG_BLK_DEV_UB is not set 536# CONFIG_BLK_DEV_UB is not set
@@ -509,6 +542,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
509# CONFIG_ATA_OVER_ETH is not set 542# CONFIG_ATA_OVER_ETH is not set
510# CONFIG_BLK_DEV_HD is not set 543# CONFIG_BLK_DEV_HD is not set
511CONFIG_MISC_DEVICES=y 544CONFIG_MISC_DEVICES=y
545# CONFIG_AD525X_DPOT is not set
512# CONFIG_PHANTOM is not set 546# CONFIG_PHANTOM is not set
513# CONFIG_SGI_IOC4 is not set 547# CONFIG_SGI_IOC4 is not set
514# CONFIG_TIFM_CORE is not set 548# CONFIG_TIFM_CORE is not set
@@ -516,6 +550,7 @@ CONFIG_MISC_DEVICES=y
516# CONFIG_ENCLOSURE_SERVICES is not set 550# CONFIG_ENCLOSURE_SERVICES is not set
517# CONFIG_HP_ILO is not set 551# CONFIG_HP_ILO is not set
518# CONFIG_ISL29003 is not set 552# CONFIG_ISL29003 is not set
553# CONFIG_DS1682 is not set
519# CONFIG_C2PORT is not set 554# CONFIG_C2PORT is not set
520 555
521# 556#
@@ -569,7 +604,9 @@ CONFIG_SCSI_LOWLEVEL=y
569# CONFIG_SCSI_BNX2_ISCSI is not set 604# CONFIG_SCSI_BNX2_ISCSI is not set
570# CONFIG_BE2ISCSI is not set 605# CONFIG_BE2ISCSI is not set
571# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 606# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
607# CONFIG_SCSI_HPSA is not set
572# CONFIG_SCSI_3W_9XXX is not set 608# CONFIG_SCSI_3W_9XXX is not set
609# CONFIG_SCSI_3W_SAS is not set
573# CONFIG_SCSI_ACARD is not set 610# CONFIG_SCSI_ACARD is not set
574# CONFIG_SCSI_AACRAID is not set 611# CONFIG_SCSI_AACRAID is not set
575# CONFIG_SCSI_AIC7XXX is not set 612# CONFIG_SCSI_AIC7XXX is not set
@@ -608,6 +645,7 @@ CONFIG_SCSI_LOWLEVEL=y
608# CONFIG_SCSI_NSP32 is not set 645# CONFIG_SCSI_NSP32 is not set
609# CONFIG_SCSI_DEBUG is not set 646# CONFIG_SCSI_DEBUG is not set
610# CONFIG_SCSI_PMCRAID is not set 647# CONFIG_SCSI_PMCRAID is not set
648# CONFIG_SCSI_PM8001 is not set
611# CONFIG_SCSI_SRP is not set 649# CONFIG_SCSI_SRP is not set
612# CONFIG_SCSI_BFA_FC is not set 650# CONFIG_SCSI_BFA_FC is not set
613# CONFIG_SCSI_DH is not set 651# CONFIG_SCSI_DH is not set
@@ -663,15 +701,16 @@ CONFIG_PATA_ALI=y
663# CONFIG_PATA_NS87415 is not set 701# CONFIG_PATA_NS87415 is not set
664# CONFIG_PATA_OPTI is not set 702# CONFIG_PATA_OPTI is not set
665# CONFIG_PATA_OPTIDMA is not set 703# CONFIG_PATA_OPTIDMA is not set
704# CONFIG_PATA_PDC2027X is not set
666# CONFIG_PATA_PDC_OLD is not set 705# CONFIG_PATA_PDC_OLD is not set
667# CONFIG_PATA_RADISYS is not set 706# CONFIG_PATA_RADISYS is not set
668# CONFIG_PATA_RDC is not set 707# CONFIG_PATA_RDC is not set
669# CONFIG_PATA_RZ1000 is not set 708# CONFIG_PATA_RZ1000 is not set
670# CONFIG_PATA_SC1200 is not set 709# CONFIG_PATA_SC1200 is not set
671# CONFIG_PATA_SERVERWORKS is not set 710# CONFIG_PATA_SERVERWORKS is not set
672# CONFIG_PATA_PDC2027X is not set
673# CONFIG_PATA_SIL680 is not set 711# CONFIG_PATA_SIL680 is not set
674# CONFIG_PATA_SIS is not set 712# CONFIG_PATA_SIS is not set
713# CONFIG_PATA_TOSHIBA is not set
675# CONFIG_PATA_VIA is not set 714# CONFIG_PATA_VIA is not set
676# CONFIG_PATA_WINBOND is not set 715# CONFIG_PATA_WINBOND is not set
677# CONFIG_PATA_PLATFORM is not set 716# CONFIG_PATA_PLATFORM is not set
@@ -688,7 +727,7 @@ CONFIG_PATA_ALI=y
688# 727#
689 728
690# 729#
691# See the help texts for more information. 730# The newer stack is recommended.
692# 731#
693# CONFIG_FIREWIRE is not set 732# CONFIG_FIREWIRE is not set
694# CONFIG_IEEE1394 is not set 733# CONFIG_IEEE1394 is not set
@@ -799,8 +838,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
799# CONFIG_BE2NET is not set 838# CONFIG_BE2NET is not set
800# CONFIG_TR is not set 839# CONFIG_TR is not set
801CONFIG_WLAN=y 840CONFIG_WLAN=y
802# CONFIG_WLAN_PRE80211 is not set 841# CONFIG_AIRO is not set
803# CONFIG_WLAN_80211 is not set 842# CONFIG_ATMEL is not set
843# CONFIG_PRISM54 is not set
844# CONFIG_USB_ZD1201 is not set
845# CONFIG_HOSTAP is not set
804 846
805# 847#
806# Enable WiMAX (Networking options) to see the WiMAX drivers 848# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -824,6 +866,7 @@ CONFIG_WLAN=y
824# CONFIG_NETCONSOLE is not set 866# CONFIG_NETCONSOLE is not set
825# CONFIG_NETPOLL is not set 867# CONFIG_NETPOLL is not set
826# CONFIG_NET_POLL_CONTROLLER is not set 868# CONFIG_NET_POLL_CONTROLLER is not set
869# CONFIG_VMXNET3 is not set
827# CONFIG_ISDN is not set 870# CONFIG_ISDN is not set
828# CONFIG_PHONE is not set 871# CONFIG_PHONE is not set
829 872
@@ -833,6 +876,7 @@ CONFIG_WLAN=y
833CONFIG_INPUT=y 876CONFIG_INPUT=y
834CONFIG_INPUT_FF_MEMLESS=m 877CONFIG_INPUT_FF_MEMLESS=m
835# CONFIG_INPUT_POLLDEV is not set 878# CONFIG_INPUT_POLLDEV is not set
879# CONFIG_INPUT_SPARSEKMAP is not set
836 880
837# 881#
838# Userland interfaces 882# Userland interfaces
@@ -862,6 +906,7 @@ CONFIG_SERIO_SERPORT=y
862CONFIG_SERIO_LIBPS2=y 906CONFIG_SERIO_LIBPS2=y
863# CONFIG_SERIO_RAW is not set 907# CONFIG_SERIO_RAW is not set
864# CONFIG_SERIO_XILINX_XPS_PS2 is not set 908# CONFIG_SERIO_XILINX_XPS_PS2 is not set
909# CONFIG_SERIO_ALTERA_PS2 is not set
865# CONFIG_GAMEPORT is not set 910# CONFIG_GAMEPORT is not set
866 911
867# 912#
@@ -900,6 +945,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
900# CONFIG_SERIAL_JSM is not set 945# CONFIG_SERIAL_JSM is not set
901# CONFIG_SERIAL_OF_PLATFORM is not set 946# CONFIG_SERIAL_OF_PLATFORM is not set
902CONFIG_SERIAL_QE=m 947CONFIG_SERIAL_QE=m
948# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
903CONFIG_UNIX98_PTYS=y 949CONFIG_UNIX98_PTYS=y
904# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 950# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
905CONFIG_LEGACY_PTYS=y 951CONFIG_LEGACY_PTYS=y
@@ -960,11 +1006,6 @@ CONFIG_I2C_MPC=y
960# CONFIG_I2C_TINY_USB is not set 1006# CONFIG_I2C_TINY_USB is not set
961 1007
962# 1008#
963# Graphics adapter I2C/DDC channel drivers
964#
965# CONFIG_I2C_VOODOO3 is not set
966
967#
968# Other I2C/SMBus bus drivers 1009# Other I2C/SMBus bus drivers
969# 1010#
970# CONFIG_I2C_PCA_PLATFORM is not set 1011# CONFIG_I2C_PCA_PLATFORM is not set
@@ -973,7 +1014,6 @@ CONFIG_I2C_MPC=y
973# 1014#
974# Miscellaneous I2C Chip support 1015# Miscellaneous I2C Chip support
975# 1016#
976# CONFIG_DS1682 is not set
977# CONFIG_SENSORS_TSL2550 is not set 1017# CONFIG_SENSORS_TSL2550 is not set
978# CONFIG_I2C_DEBUG_CORE is not set 1018# CONFIG_I2C_DEBUG_CORE is not set
979# CONFIG_I2C_DEBUG_ALGO is not set 1019# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1006,6 +1046,7 @@ CONFIG_GPIOLIB=y
1006# 1046#
1007# PCI GPIO expanders: 1047# PCI GPIO expanders:
1008# 1048#
1049# CONFIG_GPIO_CS5535 is not set
1009# CONFIG_GPIO_BT8XX is not set 1050# CONFIG_GPIO_BT8XX is not set
1010# CONFIG_GPIO_LANGWELL is not set 1051# CONFIG_GPIO_LANGWELL is not set
1011 1052
@@ -1039,11 +1080,13 @@ CONFIG_SSB_POSSIBLE=y
1039# CONFIG_TWL4030_CORE is not set 1080# CONFIG_TWL4030_CORE is not set
1040# CONFIG_MFD_TMIO is not set 1081# CONFIG_MFD_TMIO is not set
1041# CONFIG_PMIC_DA903X is not set 1082# CONFIG_PMIC_DA903X is not set
1083# CONFIG_PMIC_ADP5520 is not set
1042# CONFIG_MFD_WM8400 is not set 1084# CONFIG_MFD_WM8400 is not set
1043# CONFIG_MFD_WM831X is not set 1085# CONFIG_MFD_WM831X is not set
1044# CONFIG_MFD_WM8350_I2C is not set 1086# CONFIG_MFD_WM8350_I2C is not set
1045# CONFIG_MFD_PCF50633 is not set 1087# CONFIG_MFD_PCF50633 is not set
1046# CONFIG_AB3100_CORE is not set 1088# CONFIG_AB3100_CORE is not set
1089# CONFIG_MFD_88PM8607 is not set
1047# CONFIG_REGULATOR is not set 1090# CONFIG_REGULATOR is not set
1048# CONFIG_MEDIA_SUPPORT is not set 1091# CONFIG_MEDIA_SUPPORT is not set
1049 1092
@@ -1118,6 +1161,7 @@ CONFIG_SND_PCI=y
1118# CONFIG_SND_CS4281 is not set 1161# CONFIG_SND_CS4281 is not set
1119# CONFIG_SND_CS46XX is not set 1162# CONFIG_SND_CS46XX is not set
1120# CONFIG_SND_CS5530 is not set 1163# CONFIG_SND_CS5530 is not set
1164# CONFIG_SND_CS5535AUDIO is not set
1121# CONFIG_SND_CTXFI is not set 1165# CONFIG_SND_CTXFI is not set
1122# CONFIG_SND_DARLA20 is not set 1166# CONFIG_SND_DARLA20 is not set
1123# CONFIG_SND_GINA20 is not set 1167# CONFIG_SND_GINA20 is not set
@@ -1245,6 +1289,7 @@ CONFIG_USB_MON=y
1245CONFIG_USB_EHCI_HCD=y 1289CONFIG_USB_EHCI_HCD=y
1246CONFIG_USB_EHCI_ROOT_HUB_TT=y 1290CONFIG_USB_EHCI_ROOT_HUB_TT=y
1247# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1291# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1292# CONFIG_XPS_USB_HCD_XILINX is not set
1248CONFIG_USB_EHCI_FSL=y 1293CONFIG_USB_EHCI_FSL=y
1249CONFIG_USB_EHCI_HCD_PPC_OF=y 1294CONFIG_USB_EHCI_HCD_PPC_OF=y
1250# CONFIG_USB_OXU210HP_HCD is not set 1295# CONFIG_USB_OXU210HP_HCD is not set
@@ -1351,7 +1396,6 @@ CONFIG_EDAC=y
1351# 1396#
1352# CONFIG_EDAC_DEBUG is not set 1397# CONFIG_EDAC_DEBUG is not set
1353CONFIG_EDAC_MM_EDAC=y 1398CONFIG_EDAC_MM_EDAC=y
1354CONFIG_EDAC_MPC85XX=y
1355CONFIG_RTC_LIB=y 1399CONFIG_RTC_LIB=y
1356CONFIG_RTC_CLASS=y 1400CONFIG_RTC_CLASS=y
1357CONFIG_RTC_HCTOSYS=y 1401CONFIG_RTC_HCTOSYS=y
@@ -1380,6 +1424,7 @@ CONFIG_RTC_INTF_DEV=y
1380# CONFIG_RTC_DRV_PCF8563 is not set 1424# CONFIG_RTC_DRV_PCF8563 is not set
1381# CONFIG_RTC_DRV_PCF8583 is not set 1425# CONFIG_RTC_DRV_PCF8583 is not set
1382# CONFIG_RTC_DRV_M41T80 is not set 1426# CONFIG_RTC_DRV_M41T80 is not set
1427# CONFIG_RTC_DRV_BQ32K is not set
1383# CONFIG_RTC_DRV_S35390A is not set 1428# CONFIG_RTC_DRV_S35390A is not set
1384# CONFIG_RTC_DRV_FM3130 is not set 1429# CONFIG_RTC_DRV_FM3130 is not set
1385# CONFIG_RTC_DRV_RX8581 is not set 1430# CONFIG_RTC_DRV_RX8581 is not set
@@ -1401,7 +1446,9 @@ CONFIG_RTC_DRV_CMOS=y
1401# CONFIG_RTC_DRV_M48T86 is not set 1446# CONFIG_RTC_DRV_M48T86 is not set
1402# CONFIG_RTC_DRV_M48T35 is not set 1447# CONFIG_RTC_DRV_M48T35 is not set
1403# CONFIG_RTC_DRV_M48T59 is not set 1448# CONFIG_RTC_DRV_M48T59 is not set
1449# CONFIG_RTC_DRV_MSM6242 is not set
1404# CONFIG_RTC_DRV_BQ4802 is not set 1450# CONFIG_RTC_DRV_BQ4802 is not set
1451# CONFIG_RTC_DRV_RP5C01 is not set
1405# CONFIG_RTC_DRV_V3020 is not set 1452# CONFIG_RTC_DRV_V3020 is not set
1406 1453
1407# 1454#
@@ -1735,7 +1782,11 @@ CONFIG_VIRQ_DEBUG=y
1735# CONFIG_KEYS is not set 1782# CONFIG_KEYS is not set
1736# CONFIG_SECURITY is not set 1783# CONFIG_SECURITY is not set
1737# CONFIG_SECURITYFS is not set 1784# CONFIG_SECURITYFS is not set
1738# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1785# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1786# CONFIG_DEFAULT_SECURITY_SMACK is not set
1787# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1788CONFIG_DEFAULT_SECURITY_DAC=y
1789CONFIG_DEFAULT_SECURITY=""
1739CONFIG_CRYPTO=y 1790CONFIG_CRYPTO=y
1740 1791
1741# 1792#
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig
index 40d6f0568ca5..3f6b11b6f4f3 100644
--- a/arch/powerpc/configs/mpc866_ads_defconfig
+++ b/arch/powerpc/configs/mpc866_ads_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:15 2009 4# Wed Jan 6 09:24:08 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
34CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
35CONFIG_NR_IRQS=512
35CONFIG_STACKTRACE_SUPPORT=y 36CONFIG_STACKTRACE_SUPPORT=y
36CONFIG_HAVE_LATENCYTOP_SUPPORT=y 37CONFIG_HAVE_LATENCYTOP_SUPPORT=y
37CONFIG_TRACE_IRQFLAGS_SUPPORT=y 38CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -53,6 +54,7 @@ CONFIG_OF=y
53CONFIG_AUDIT_ARCH=y 54CONFIG_AUDIT_ARCH=y
54CONFIG_DTC=y 55CONFIG_DTC=y
55# CONFIG_DEFAULT_UIMAGE is not set 56# CONFIG_DEFAULT_UIMAGE is not set
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
56# CONFIG_PPC_DCR_NATIVE is not set 58# CONFIG_PPC_DCR_NATIVE is not set
57# CONFIG_PPC_DCR_MMIO is not set 59# CONFIG_PPC_DCR_MMIO is not set
58CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 60CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -80,6 +82,7 @@ CONFIG_SYSVIPC_SYSCTL=y
80# 82#
81CONFIG_TREE_RCU=y 83CONFIG_TREE_RCU=y
82# CONFIG_TREE_PREEMPT_RCU is not set 84# CONFIG_TREE_PREEMPT_RCU is not set
85# CONFIG_TINY_RCU is not set
83# CONFIG_RCU_TRACE is not set 86# CONFIG_RCU_TRACE is not set
84CONFIG_RCU_FANOUT=32 87CONFIG_RCU_FANOUT=32
85# CONFIG_RCU_FANOUT_EXACT is not set 88# CONFIG_RCU_FANOUT_EXACT is not set
@@ -158,14 +161,41 @@ CONFIG_LBDAF=y
158# IO Schedulers 161# IO Schedulers
159# 162#
160CONFIG_IOSCHED_NOOP=y 163CONFIG_IOSCHED_NOOP=y
161CONFIG_IOSCHED_AS=y
162CONFIG_IOSCHED_DEADLINE=y 164CONFIG_IOSCHED_DEADLINE=y
163CONFIG_IOSCHED_CFQ=y 165CONFIG_IOSCHED_CFQ=y
164CONFIG_DEFAULT_AS=y
165# CONFIG_DEFAULT_DEADLINE is not set 166# CONFIG_DEFAULT_DEADLINE is not set
166# CONFIG_DEFAULT_CFQ is not set 167CONFIG_DEFAULT_CFQ=y
167# CONFIG_DEFAULT_NOOP is not set 168# CONFIG_DEFAULT_NOOP is not set
168CONFIG_DEFAULT_IOSCHED="anticipatory" 169CONFIG_DEFAULT_IOSCHED="cfq"
170# CONFIG_INLINE_SPIN_TRYLOCK is not set
171# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
172# CONFIG_INLINE_SPIN_LOCK is not set
173# CONFIG_INLINE_SPIN_LOCK_BH is not set
174# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
175# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
176CONFIG_INLINE_SPIN_UNLOCK=y
177# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
178CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
179# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
180# CONFIG_INLINE_READ_TRYLOCK is not set
181# CONFIG_INLINE_READ_LOCK is not set
182# CONFIG_INLINE_READ_LOCK_BH is not set
183# CONFIG_INLINE_READ_LOCK_IRQ is not set
184# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
185CONFIG_INLINE_READ_UNLOCK=y
186# CONFIG_INLINE_READ_UNLOCK_BH is not set
187CONFIG_INLINE_READ_UNLOCK_IRQ=y
188# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
189# CONFIG_INLINE_WRITE_TRYLOCK is not set
190# CONFIG_INLINE_WRITE_LOCK is not set
191# CONFIG_INLINE_WRITE_LOCK_BH is not set
192# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
193# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
194CONFIG_INLINE_WRITE_UNLOCK=y
195# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
196CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
197# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
198# CONFIG_MUTEX_SPIN_ON_OWNER is not set
169# CONFIG_FREEZER is not set 199# CONFIG_FREEZER is not set
170 200
171# 201#
@@ -240,6 +270,7 @@ CONFIG_MATH_EMULATION=y
240CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 270CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
241CONFIG_ARCH_HAS_WALK_MEMORY=y 271CONFIG_ARCH_HAS_WALK_MEMORY=y
242CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 272CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
273CONFIG_SPARSE_IRQ=y
243CONFIG_MAX_ACTIVE_REGIONS=32 274CONFIG_MAX_ACTIVE_REGIONS=32
244CONFIG_ARCH_FLATMEM_ENABLE=y 275CONFIG_ARCH_FLATMEM_ENABLE=y
245CONFIG_ARCH_POPULATES_NODE_MAP=y 276CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -256,8 +287,6 @@ CONFIG_MIGRATION=y
256CONFIG_ZONE_DMA_FLAG=1 287CONFIG_ZONE_DMA_FLAG=1
257CONFIG_BOUNCE=y 288CONFIG_BOUNCE=y
258CONFIG_VIRT_TO_BUS=y 289CONFIG_VIRT_TO_BUS=y
259CONFIG_HAVE_MLOCK=y
260CONFIG_HAVE_MLOCKED_PAGE_BIT=y
261# CONFIG_KSM is not set 290# CONFIG_KSM is not set
262CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 291CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
263CONFIG_PPC_4K_PAGES=y 292CONFIG_PPC_4K_PAGES=y
@@ -375,9 +404,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
375# CONFIG_AF_RXRPC is not set 404# CONFIG_AF_RXRPC is not set
376CONFIG_WIRELESS=y 405CONFIG_WIRELESS=y
377# CONFIG_CFG80211 is not set 406# CONFIG_CFG80211 is not set
378CONFIG_CFG80211_DEFAULT_PS_VALUE=0
379CONFIG_WIRELESS_OLD_REGULATORY=y
380# CONFIG_WIRELESS_EXT is not set
381# CONFIG_LIB80211 is not set 407# CONFIG_LIB80211 is not set
382 408
383# 409#
@@ -407,6 +433,10 @@ CONFIG_BLK_DEV=y
407# CONFIG_BLK_DEV_COW_COMMON is not set 433# CONFIG_BLK_DEV_COW_COMMON is not set
408CONFIG_BLK_DEV_LOOP=y 434CONFIG_BLK_DEV_LOOP=y
409# CONFIG_BLK_DEV_CRYPTOLOOP is not set 435# CONFIG_BLK_DEV_CRYPTOLOOP is not set
436
437#
438# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
439#
410# CONFIG_BLK_DEV_NBD is not set 440# CONFIG_BLK_DEV_NBD is not set
411# CONFIG_BLK_DEV_RAM is not set 441# CONFIG_BLK_DEV_RAM is not set
412# CONFIG_CDROM_PKTCDVD is not set 442# CONFIG_CDROM_PKTCDVD is not set
@@ -485,8 +515,7 @@ CONFIG_NETDEV_1000=y
485# CONFIG_MV643XX_ETH is not set 515# CONFIG_MV643XX_ETH is not set
486CONFIG_NETDEV_10000=y 516CONFIG_NETDEV_10000=y
487CONFIG_WLAN=y 517CONFIG_WLAN=y
488# CONFIG_WLAN_PRE80211 is not set 518# CONFIG_HOSTAP is not set
489# CONFIG_WLAN_80211 is not set
490 519
491# 520#
492# Enable WiMAX (Networking options) to see the WiMAX drivers 521# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -506,6 +535,7 @@ CONFIG_WLAN=y
506CONFIG_INPUT=y 535CONFIG_INPUT=y
507# CONFIG_INPUT_FF_MEMLESS is not set 536# CONFIG_INPUT_FF_MEMLESS is not set
508# CONFIG_INPUT_POLLDEV is not set 537# CONFIG_INPUT_POLLDEV is not set
538# CONFIG_INPUT_SPARSEKMAP is not set
509 539
510# 540#
511# Userland interfaces 541# Userland interfaces
@@ -554,6 +584,7 @@ CONFIG_SERIO_SERPORT=y
554CONFIG_SERIO_LIBPS2=y 584CONFIG_SERIO_LIBPS2=y
555# CONFIG_SERIO_RAW is not set 585# CONFIG_SERIO_RAW is not set
556# CONFIG_SERIO_XILINX_XPS_PS2 is not set 586# CONFIG_SERIO_XILINX_XPS_PS2 is not set
587# CONFIG_SERIO_ALTERA_PS2 is not set
557# CONFIG_GAMEPORT is not set 588# CONFIG_GAMEPORT is not set
558 589
559# 590#
@@ -576,6 +607,7 @@ CONFIG_SERIAL_CORE=y
576CONFIG_SERIAL_CORE_CONSOLE=y 607CONFIG_SERIAL_CORE_CONSOLE=y
577CONFIG_SERIAL_CPM=y 608CONFIG_SERIAL_CPM=y
578CONFIG_SERIAL_CPM_CONSOLE=y 609CONFIG_SERIAL_CPM_CONSOLE=y
610# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
579CONFIG_UNIX98_PTYS=y 611CONFIG_UNIX98_PTYS=y
580# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 612# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
581# CONFIG_LEGACY_PTYS is not set 613# CONFIG_LEGACY_PTYS is not set
@@ -855,6 +887,7 @@ CONFIG_FRAME_WARN=1024
855# CONFIG_DEBUG_MEMORY_INIT is not set 887# CONFIG_DEBUG_MEMORY_INIT is not set
856# CONFIG_RCU_CPU_STALL_DETECTOR is not set 888# CONFIG_RCU_CPU_STALL_DETECTOR is not set
857# CONFIG_LATENCYTOP is not set 889# CONFIG_LATENCYTOP is not set
890# CONFIG_SYSCTL_SYSCALL_CHECK is not set
858CONFIG_HAVE_FUNCTION_TRACER=y 891CONFIG_HAVE_FUNCTION_TRACER=y
859CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 892CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
860CONFIG_HAVE_DYNAMIC_FTRACE=y 893CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -876,7 +909,11 @@ CONFIG_PRINT_STACK_DEPTH=64
876# CONFIG_KEYS is not set 909# CONFIG_KEYS is not set
877# CONFIG_SECURITY is not set 910# CONFIG_SECURITY is not set
878# CONFIG_SECURITYFS is not set 911# CONFIG_SECURITYFS is not set
879# CONFIG_SECURITY_FILE_CAPABILITIES is not set 912# CONFIG_DEFAULT_SECURITY_SELINUX is not set
913# CONFIG_DEFAULT_SECURITY_SMACK is not set
914# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
915CONFIG_DEFAULT_SECURITY_DAC=y
916CONFIG_DEFAULT_SECURITY=""
880CONFIG_CRYPTO=y 917CONFIG_CRYPTO=y
881 918
882# 919#
diff --git a/arch/powerpc/configs/mpc86xx_defconfig b/arch/powerpc/configs/mpc86xx_defconfig
index 5b3abb42ae30..41884c97a4f3 100644
--- a/arch/powerpc/configs/mpc86xx_defconfig
+++ b/arch/powerpc/configs/mpc86xx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:16 2009 4# Wed Jan 6 09:24:09 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -38,6 +38,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
40CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
41CONFIG_NR_IRQS=512
41CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
42CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
43CONFIG_TRACE_IRQFLAGS_SUPPORT=y 44CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,8 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63CONFIG_DEFAULT_UIMAGE=y 64CONFIG_DEFAULT_UIMAGE=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
66CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 69CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -91,6 +94,7 @@ CONFIG_AUDIT=y
91# 94#
92CONFIG_TREE_RCU=y 95CONFIG_TREE_RCU=y
93# CONFIG_TREE_PREEMPT_RCU is not set 96# CONFIG_TREE_PREEMPT_RCU is not set
97# CONFIG_TINY_RCU is not set
94# CONFIG_RCU_TRACE is not set 98# CONFIG_RCU_TRACE is not set
95CONFIG_RCU_FANOUT=32 99CONFIG_RCU_FANOUT=32
96# CONFIG_RCU_FANOUT_EXACT is not set 100# CONFIG_RCU_FANOUT_EXACT is not set
@@ -183,14 +187,41 @@ CONFIG_LBDAF=y
183# IO Schedulers 187# IO Schedulers
184# 188#
185CONFIG_IOSCHED_NOOP=y 189CONFIG_IOSCHED_NOOP=y
186CONFIG_IOSCHED_AS=y
187CONFIG_IOSCHED_DEADLINE=y 190CONFIG_IOSCHED_DEADLINE=y
188CONFIG_IOSCHED_CFQ=y 191CONFIG_IOSCHED_CFQ=y
189# CONFIG_DEFAULT_AS is not set
190# CONFIG_DEFAULT_DEADLINE is not set 192# CONFIG_DEFAULT_DEADLINE is not set
191CONFIG_DEFAULT_CFQ=y 193CONFIG_DEFAULT_CFQ=y
192# CONFIG_DEFAULT_NOOP is not set 194# CONFIG_DEFAULT_NOOP is not set
193CONFIG_DEFAULT_IOSCHED="cfq" 195CONFIG_DEFAULT_IOSCHED="cfq"
196# CONFIG_INLINE_SPIN_TRYLOCK is not set
197# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
198# CONFIG_INLINE_SPIN_LOCK is not set
199# CONFIG_INLINE_SPIN_LOCK_BH is not set
200# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
201# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
202CONFIG_INLINE_SPIN_UNLOCK=y
203# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
204CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
205# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
206# CONFIG_INLINE_READ_TRYLOCK is not set
207# CONFIG_INLINE_READ_LOCK is not set
208# CONFIG_INLINE_READ_LOCK_BH is not set
209# CONFIG_INLINE_READ_LOCK_IRQ is not set
210# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
211CONFIG_INLINE_READ_UNLOCK=y
212# CONFIG_INLINE_READ_UNLOCK_BH is not set
213CONFIG_INLINE_READ_UNLOCK_IRQ=y
214# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
215# CONFIG_INLINE_WRITE_TRYLOCK is not set
216# CONFIG_INLINE_WRITE_LOCK is not set
217# CONFIG_INLINE_WRITE_LOCK_BH is not set
218# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
219# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
220CONFIG_INLINE_WRITE_UNLOCK=y
221# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
222CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
223# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
224CONFIG_MUTEX_SPIN_ON_OWNER=y
194# CONFIG_FREEZER is not set 225# CONFIG_FREEZER is not set
195 226
196# 227#
@@ -221,7 +252,7 @@ CONFIG_MPIC=y
221# CONFIG_MPIC_WEIRD is not set 252# CONFIG_MPIC_WEIRD is not set
222CONFIG_PPC_I8259=y 253CONFIG_PPC_I8259=y
223# CONFIG_PPC_RTAS is not set 254# CONFIG_PPC_RTAS is not set
224# CONFIG_MMIO_NVRAM is not set 255CONFIG_MMIO_NVRAM=y
225# CONFIG_PPC_MPC106 is not set 256# CONFIG_PPC_MPC106 is not set
226# CONFIG_PPC_970_NAP is not set 257# CONFIG_PPC_970_NAP is not set
227# CONFIG_PPC_INDIRECT_IO is not set 258# CONFIG_PPC_INDIRECT_IO is not set
@@ -262,6 +293,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
262# CONFIG_KEXEC is not set 293# CONFIG_KEXEC is not set
263# CONFIG_CRASH_DUMP is not set 294# CONFIG_CRASH_DUMP is not set
264# CONFIG_IRQ_ALL_CPUS is not set 295# CONFIG_IRQ_ALL_CPUS is not set
296CONFIG_SPARSE_IRQ=y
265CONFIG_MAX_ACTIVE_REGIONS=32 297CONFIG_MAX_ACTIVE_REGIONS=32
266CONFIG_ARCH_FLATMEM_ENABLE=y 298CONFIG_ARCH_FLATMEM_ENABLE=y
267CONFIG_ARCH_POPULATES_NODE_MAP=y 299CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -278,8 +310,6 @@ CONFIG_MIGRATION=y
278CONFIG_ZONE_DMA_FLAG=1 310CONFIG_ZONE_DMA_FLAG=1
279CONFIG_BOUNCE=y 311CONFIG_BOUNCE=y
280CONFIG_VIRT_TO_BUS=y 312CONFIG_VIRT_TO_BUS=y
281CONFIG_HAVE_MLOCK=y
282CONFIG_HAVE_MLOCKED_PAGE_BIT=y
283# CONFIG_KSM is not set 313# CONFIG_KSM is not set
284CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 314CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
285CONFIG_PPC_4K_PAGES=y 315CONFIG_PPC_4K_PAGES=y
@@ -397,6 +427,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y
397CONFIG_INET6_XFRM_MODE_BEET=y 427CONFIG_INET6_XFRM_MODE_BEET=y
398# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 428# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
399CONFIG_IPV6_SIT=y 429CONFIG_IPV6_SIT=y
430# CONFIG_IPV6_SIT_6RD is not set
400CONFIG_IPV6_NDISC_NODETYPE=y 431CONFIG_IPV6_NDISC_NODETYPE=y
401# CONFIG_IPV6_TUNNEL is not set 432# CONFIG_IPV6_TUNNEL is not set
402# CONFIG_IPV6_MULTIPLE_TABLES is not set 433# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -441,9 +472,6 @@ CONFIG_SCTP_HMAC_MD5=y
441CONFIG_FIB_RULES=y 472CONFIG_FIB_RULES=y
442CONFIG_WIRELESS=y 473CONFIG_WIRELESS=y
443# CONFIG_CFG80211 is not set 474# CONFIG_CFG80211 is not set
444CONFIG_CFG80211_DEFAULT_PS_VALUE=0
445CONFIG_WIRELESS_OLD_REGULATORY=y
446# CONFIG_WIRELESS_EXT is not set
447# CONFIG_LIB80211 is not set 475# CONFIG_LIB80211 is not set
448 476
449# 477#
@@ -486,6 +514,10 @@ CONFIG_BLK_DEV=y
486# CONFIG_BLK_DEV_COW_COMMON is not set 514# CONFIG_BLK_DEV_COW_COMMON is not set
487CONFIG_BLK_DEV_LOOP=y 515CONFIG_BLK_DEV_LOOP=y
488# CONFIG_BLK_DEV_CRYPTOLOOP is not set 516# CONFIG_BLK_DEV_CRYPTOLOOP is not set
517
518#
519# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
520#
489CONFIG_BLK_DEV_NBD=y 521CONFIG_BLK_DEV_NBD=y
490# CONFIG_BLK_DEV_SX8 is not set 522# CONFIG_BLK_DEV_SX8 is not set
491# CONFIG_BLK_DEV_UB is not set 523# CONFIG_BLK_DEV_UB is not set
@@ -497,6 +529,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
497# CONFIG_ATA_OVER_ETH is not set 529# CONFIG_ATA_OVER_ETH is not set
498# CONFIG_BLK_DEV_HD is not set 530# CONFIG_BLK_DEV_HD is not set
499CONFIG_MISC_DEVICES=y 531CONFIG_MISC_DEVICES=y
532# CONFIG_AD525X_DPOT is not set
500# CONFIG_PHANTOM is not set 533# CONFIG_PHANTOM is not set
501# CONFIG_SGI_IOC4 is not set 534# CONFIG_SGI_IOC4 is not set
502# CONFIG_TIFM_CORE is not set 535# CONFIG_TIFM_CORE is not set
@@ -504,6 +537,7 @@ CONFIG_MISC_DEVICES=y
504# CONFIG_ENCLOSURE_SERVICES is not set 537# CONFIG_ENCLOSURE_SERVICES is not set
505# CONFIG_HP_ILO is not set 538# CONFIG_HP_ILO is not set
506# CONFIG_ISL29003 is not set 539# CONFIG_ISL29003 is not set
540# CONFIG_DS1682 is not set
507# CONFIG_C2PORT is not set 541# CONFIG_C2PORT is not set
508 542
509# 543#
@@ -557,7 +591,9 @@ CONFIG_SCSI_LOWLEVEL=y
557# CONFIG_SCSI_BNX2_ISCSI is not set 591# CONFIG_SCSI_BNX2_ISCSI is not set
558# CONFIG_BE2ISCSI is not set 592# CONFIG_BE2ISCSI is not set
559# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 593# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
594# CONFIG_SCSI_HPSA is not set
560# CONFIG_SCSI_3W_9XXX is not set 595# CONFIG_SCSI_3W_9XXX is not set
596# CONFIG_SCSI_3W_SAS is not set
561# CONFIG_SCSI_ACARD is not set 597# CONFIG_SCSI_ACARD is not set
562# CONFIG_SCSI_AACRAID is not set 598# CONFIG_SCSI_AACRAID is not set
563# CONFIG_SCSI_AIC7XXX is not set 599# CONFIG_SCSI_AIC7XXX is not set
@@ -596,6 +632,7 @@ CONFIG_SCSI_LOWLEVEL=y
596# CONFIG_SCSI_NSP32 is not set 632# CONFIG_SCSI_NSP32 is not set
597# CONFIG_SCSI_DEBUG is not set 633# CONFIG_SCSI_DEBUG is not set
598# CONFIG_SCSI_PMCRAID is not set 634# CONFIG_SCSI_PMCRAID is not set
635# CONFIG_SCSI_PM8001 is not set
599# CONFIG_SCSI_SRP is not set 636# CONFIG_SCSI_SRP is not set
600# CONFIG_SCSI_BFA_FC is not set 637# CONFIG_SCSI_BFA_FC is not set
601# CONFIG_SCSI_DH is not set 638# CONFIG_SCSI_DH is not set
@@ -651,15 +688,16 @@ CONFIG_PATA_ALI=y
651# CONFIG_PATA_NS87415 is not set 688# CONFIG_PATA_NS87415 is not set
652# CONFIG_PATA_OPTI is not set 689# CONFIG_PATA_OPTI is not set
653# CONFIG_PATA_OPTIDMA is not set 690# CONFIG_PATA_OPTIDMA is not set
691# CONFIG_PATA_PDC2027X is not set
654# CONFIG_PATA_PDC_OLD is not set 692# CONFIG_PATA_PDC_OLD is not set
655# CONFIG_PATA_RADISYS is not set 693# CONFIG_PATA_RADISYS is not set
656# CONFIG_PATA_RDC is not set 694# CONFIG_PATA_RDC is not set
657# CONFIG_PATA_RZ1000 is not set 695# CONFIG_PATA_RZ1000 is not set
658# CONFIG_PATA_SC1200 is not set 696# CONFIG_PATA_SC1200 is not set
659# CONFIG_PATA_SERVERWORKS is not set 697# CONFIG_PATA_SERVERWORKS is not set
660# CONFIG_PATA_PDC2027X is not set
661# CONFIG_PATA_SIL680 is not set 698# CONFIG_PATA_SIL680 is not set
662# CONFIG_PATA_SIS is not set 699# CONFIG_PATA_SIS is not set
700# CONFIG_PATA_TOSHIBA is not set
663# CONFIG_PATA_VIA is not set 701# CONFIG_PATA_VIA is not set
664# CONFIG_PATA_WINBOND is not set 702# CONFIG_PATA_WINBOND is not set
665# CONFIG_PATA_PLATFORM is not set 703# CONFIG_PATA_PLATFORM is not set
@@ -676,7 +714,7 @@ CONFIG_PATA_ALI=y
676# 714#
677 715
678# 716#
679# See the help texts for more information. 717# The newer stack is recommended.
680# 718#
681# CONFIG_FIREWIRE is not set 719# CONFIG_FIREWIRE is not set
682# CONFIG_IEEE1394 is not set 720# CONFIG_IEEE1394 is not set
@@ -781,8 +819,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
781# CONFIG_BE2NET is not set 819# CONFIG_BE2NET is not set
782# CONFIG_TR is not set 820# CONFIG_TR is not set
783CONFIG_WLAN=y 821CONFIG_WLAN=y
784# CONFIG_WLAN_PRE80211 is not set 822# CONFIG_AIRO is not set
785# CONFIG_WLAN_80211 is not set 823# CONFIG_ATMEL is not set
824# CONFIG_PRISM54 is not set
825# CONFIG_USB_ZD1201 is not set
826# CONFIG_HOSTAP is not set
786 827
787# 828#
788# Enable WiMAX (Networking options) to see the WiMAX drivers 829# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -805,6 +846,7 @@ CONFIG_WLAN=y
805# CONFIG_NETCONSOLE is not set 846# CONFIG_NETCONSOLE is not set
806# CONFIG_NETPOLL is not set 847# CONFIG_NETPOLL is not set
807# CONFIG_NET_POLL_CONTROLLER is not set 848# CONFIG_NET_POLL_CONTROLLER is not set
849# CONFIG_VMXNET3 is not set
808# CONFIG_ISDN is not set 850# CONFIG_ISDN is not set
809# CONFIG_PHONE is not set 851# CONFIG_PHONE is not set
810 852
@@ -814,6 +856,7 @@ CONFIG_WLAN=y
814CONFIG_INPUT=y 856CONFIG_INPUT=y
815CONFIG_INPUT_FF_MEMLESS=m 857CONFIG_INPUT_FF_MEMLESS=m
816# CONFIG_INPUT_POLLDEV is not set 858# CONFIG_INPUT_POLLDEV is not set
859# CONFIG_INPUT_SPARSEKMAP is not set
817 860
818# 861#
819# Userland interfaces 862# Userland interfaces
@@ -843,6 +886,7 @@ CONFIG_SERIO_SERPORT=y
843CONFIG_SERIO_LIBPS2=y 886CONFIG_SERIO_LIBPS2=y
844# CONFIG_SERIO_RAW is not set 887# CONFIG_SERIO_RAW is not set
845# CONFIG_SERIO_XILINX_XPS_PS2 is not set 888# CONFIG_SERIO_XILINX_XPS_PS2 is not set
889# CONFIG_SERIO_ALTERA_PS2 is not set
846# CONFIG_GAMEPORT is not set 890# CONFIG_GAMEPORT is not set
847 891
848# 892#
@@ -879,6 +923,7 @@ CONFIG_SERIAL_CORE=y
879CONFIG_SERIAL_CORE_CONSOLE=y 923CONFIG_SERIAL_CORE_CONSOLE=y
880# CONFIG_SERIAL_JSM is not set 924# CONFIG_SERIAL_JSM is not set
881# CONFIG_SERIAL_OF_PLATFORM is not set 925# CONFIG_SERIAL_OF_PLATFORM is not set
926# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
882CONFIG_UNIX98_PTYS=y 927CONFIG_UNIX98_PTYS=y
883# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 928# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
884CONFIG_LEGACY_PTYS=y 929CONFIG_LEGACY_PTYS=y
@@ -936,11 +981,6 @@ CONFIG_I2C_MPC=y
936# CONFIG_I2C_TINY_USB is not set 981# CONFIG_I2C_TINY_USB is not set
937 982
938# 983#
939# Graphics adapter I2C/DDC channel drivers
940#
941# CONFIG_I2C_VOODOO3 is not set
942
943#
944# Other I2C/SMBus bus drivers 984# Other I2C/SMBus bus drivers
945# 985#
946# CONFIG_I2C_PCA_PLATFORM is not set 986# CONFIG_I2C_PCA_PLATFORM is not set
@@ -949,7 +989,6 @@ CONFIG_I2C_MPC=y
949# 989#
950# Miscellaneous I2C Chip support 990# Miscellaneous I2C Chip support
951# 991#
952# CONFIG_DS1682 is not set
953# CONFIG_SENSORS_TSL2550 is not set 992# CONFIG_SENSORS_TSL2550 is not set
954# CONFIG_I2C_DEBUG_CORE is not set 993# CONFIG_I2C_DEBUG_CORE is not set
955# CONFIG_I2C_DEBUG_ALGO is not set 994# CONFIG_I2C_DEBUG_ALGO is not set
@@ -982,6 +1021,7 @@ CONFIG_GPIOLIB=y
982# 1021#
983# PCI GPIO expanders: 1022# PCI GPIO expanders:
984# 1023#
1024# CONFIG_GPIO_CS5535 is not set
985# CONFIG_GPIO_BT8XX is not set 1025# CONFIG_GPIO_BT8XX is not set
986# CONFIG_GPIO_LANGWELL is not set 1026# CONFIG_GPIO_LANGWELL is not set
987 1027
@@ -1015,11 +1055,13 @@ CONFIG_SSB_POSSIBLE=y
1015# CONFIG_TWL4030_CORE is not set 1055# CONFIG_TWL4030_CORE is not set
1016# CONFIG_MFD_TMIO is not set 1056# CONFIG_MFD_TMIO is not set
1017# CONFIG_PMIC_DA903X is not set 1057# CONFIG_PMIC_DA903X is not set
1058# CONFIG_PMIC_ADP5520 is not set
1018# CONFIG_MFD_WM8400 is not set 1059# CONFIG_MFD_WM8400 is not set
1019# CONFIG_MFD_WM831X is not set 1060# CONFIG_MFD_WM831X is not set
1020# CONFIG_MFD_WM8350_I2C is not set 1061# CONFIG_MFD_WM8350_I2C is not set
1021# CONFIG_MFD_PCF50633 is not set 1062# CONFIG_MFD_PCF50633 is not set
1022# CONFIG_AB3100_CORE is not set 1063# CONFIG_AB3100_CORE is not set
1064# CONFIG_MFD_88PM8607 is not set
1023# CONFIG_REGULATOR is not set 1065# CONFIG_REGULATOR is not set
1024# CONFIG_MEDIA_SUPPORT is not set 1066# CONFIG_MEDIA_SUPPORT is not set
1025 1067
@@ -1094,6 +1136,7 @@ CONFIG_SND_PCI=y
1094# CONFIG_SND_CS4281 is not set 1136# CONFIG_SND_CS4281 is not set
1095# CONFIG_SND_CS46XX is not set 1137# CONFIG_SND_CS46XX is not set
1096# CONFIG_SND_CS5530 is not set 1138# CONFIG_SND_CS5530 is not set
1139# CONFIG_SND_CS5535AUDIO is not set
1097# CONFIG_SND_CTXFI is not set 1140# CONFIG_SND_CTXFI is not set
1098# CONFIG_SND_DARLA20 is not set 1141# CONFIG_SND_DARLA20 is not set
1099# CONFIG_SND_GINA20 is not set 1142# CONFIG_SND_GINA20 is not set
@@ -1221,6 +1264,7 @@ CONFIG_USB_MON=y
1221CONFIG_USB_EHCI_HCD=y 1264CONFIG_USB_EHCI_HCD=y
1222# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1265# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1223# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1266# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1267# CONFIG_XPS_USB_HCD_XILINX is not set
1224# CONFIG_USB_EHCI_FSL is not set 1268# CONFIG_USB_EHCI_FSL is not set
1225CONFIG_USB_EHCI_HCD_PPC_OF=y 1269CONFIG_USB_EHCI_HCD_PPC_OF=y
1226# CONFIG_USB_OXU210HP_HCD is not set 1270# CONFIG_USB_OXU210HP_HCD is not set
@@ -1348,6 +1392,7 @@ CONFIG_RTC_INTF_DEV=y
1348# CONFIG_RTC_DRV_PCF8563 is not set 1392# CONFIG_RTC_DRV_PCF8563 is not set
1349# CONFIG_RTC_DRV_PCF8583 is not set 1393# CONFIG_RTC_DRV_PCF8583 is not set
1350# CONFIG_RTC_DRV_M41T80 is not set 1394# CONFIG_RTC_DRV_M41T80 is not set
1395# CONFIG_RTC_DRV_BQ32K is not set
1351# CONFIG_RTC_DRV_S35390A is not set 1396# CONFIG_RTC_DRV_S35390A is not set
1352# CONFIG_RTC_DRV_FM3130 is not set 1397# CONFIG_RTC_DRV_FM3130 is not set
1353# CONFIG_RTC_DRV_RX8581 is not set 1398# CONFIG_RTC_DRV_RX8581 is not set
@@ -1369,7 +1414,9 @@ CONFIG_RTC_DRV_CMOS=y
1369# CONFIG_RTC_DRV_M48T86 is not set 1414# CONFIG_RTC_DRV_M48T86 is not set
1370# CONFIG_RTC_DRV_M48T35 is not set 1415# CONFIG_RTC_DRV_M48T35 is not set
1371# CONFIG_RTC_DRV_M48T59 is not set 1416# CONFIG_RTC_DRV_M48T59 is not set
1417# CONFIG_RTC_DRV_MSM6242 is not set
1372# CONFIG_RTC_DRV_BQ4802 is not set 1418# CONFIG_RTC_DRV_BQ4802 is not set
1419# CONFIG_RTC_DRV_RP5C01 is not set
1373# CONFIG_RTC_DRV_V3020 is not set 1420# CONFIG_RTC_DRV_V3020 is not set
1374 1421
1375# 1422#
@@ -1684,7 +1731,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1684# CONFIG_KEYS is not set 1731# CONFIG_KEYS is not set
1685# CONFIG_SECURITY is not set 1732# CONFIG_SECURITY is not set
1686# CONFIG_SECURITYFS is not set 1733# CONFIG_SECURITYFS is not set
1687# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1734# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1735# CONFIG_DEFAULT_SECURITY_SMACK is not set
1736# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1737CONFIG_DEFAULT_SECURITY_DAC=y
1738CONFIG_DEFAULT_SECURITY=""
1688CONFIG_CRYPTO=y 1739CONFIG_CRYPTO=y
1689 1740
1690# 1741#
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
index 1da3488a603d..6b9e6bd2c98d 100644
--- a/arch/powerpc/configs/mpc885_ads_defconfig
+++ b/arch/powerpc/configs/mpc885_ads_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:17 2009 4# Wed Jan 6 09:24:10 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
34CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
35CONFIG_NR_IRQS=512
35CONFIG_STACKTRACE_SUPPORT=y 36CONFIG_STACKTRACE_SUPPORT=y
36CONFIG_HAVE_LATENCYTOP_SUPPORT=y 37CONFIG_HAVE_LATENCYTOP_SUPPORT=y
37CONFIG_TRACE_IRQFLAGS_SUPPORT=y 38CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -54,6 +55,7 @@ CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 55CONFIG_GENERIC_BUG=y
55CONFIG_DTC=y 56CONFIG_DTC=y
56# CONFIG_DEFAULT_UIMAGE is not set 57# CONFIG_DEFAULT_UIMAGE is not set
58CONFIG_ARCH_HIBERNATION_POSSIBLE=y
57# CONFIG_PPC_DCR_NATIVE is not set 59# CONFIG_PPC_DCR_NATIVE is not set
58# CONFIG_PPC_DCR_MMIO is not set 60# CONFIG_PPC_DCR_MMIO is not set
59CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 61CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -81,6 +83,7 @@ CONFIG_SYSVIPC_SYSCTL=y
81# 83#
82CONFIG_TREE_RCU=y 84CONFIG_TREE_RCU=y
83# CONFIG_TREE_PREEMPT_RCU is not set 85# CONFIG_TREE_PREEMPT_RCU is not set
86# CONFIG_TINY_RCU is not set
84# CONFIG_RCU_TRACE is not set 87# CONFIG_RCU_TRACE is not set
85CONFIG_RCU_FANOUT=32 88CONFIG_RCU_FANOUT=32
86# CONFIG_RCU_FANOUT_EXACT is not set 89# CONFIG_RCU_FANOUT_EXACT is not set
@@ -159,14 +162,41 @@ CONFIG_LBDAF=y
159# IO Schedulers 162# IO Schedulers
160# 163#
161CONFIG_IOSCHED_NOOP=y 164CONFIG_IOSCHED_NOOP=y
162# CONFIG_IOSCHED_AS is not set
163CONFIG_IOSCHED_DEADLINE=y 165CONFIG_IOSCHED_DEADLINE=y
164# CONFIG_IOSCHED_CFQ is not set 166# CONFIG_IOSCHED_CFQ is not set
165# CONFIG_DEFAULT_AS is not set
166CONFIG_DEFAULT_DEADLINE=y 167CONFIG_DEFAULT_DEADLINE=y
167# CONFIG_DEFAULT_CFQ is not set 168# CONFIG_DEFAULT_CFQ is not set
168# CONFIG_DEFAULT_NOOP is not set 169# CONFIG_DEFAULT_NOOP is not set
169CONFIG_DEFAULT_IOSCHED="deadline" 170CONFIG_DEFAULT_IOSCHED="deadline"
171# CONFIG_INLINE_SPIN_TRYLOCK is not set
172# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
173# CONFIG_INLINE_SPIN_LOCK is not set
174# CONFIG_INLINE_SPIN_LOCK_BH is not set
175# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
176# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
177CONFIG_INLINE_SPIN_UNLOCK=y
178# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
179CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
180# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
181# CONFIG_INLINE_READ_TRYLOCK is not set
182# CONFIG_INLINE_READ_LOCK is not set
183# CONFIG_INLINE_READ_LOCK_BH is not set
184# CONFIG_INLINE_READ_LOCK_IRQ is not set
185# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
186CONFIG_INLINE_READ_UNLOCK=y
187# CONFIG_INLINE_READ_UNLOCK_BH is not set
188CONFIG_INLINE_READ_UNLOCK_IRQ=y
189# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
190# CONFIG_INLINE_WRITE_TRYLOCK is not set
191# CONFIG_INLINE_WRITE_LOCK is not set
192# CONFIG_INLINE_WRITE_LOCK_BH is not set
193# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
194# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
195CONFIG_INLINE_WRITE_UNLOCK=y
196# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
197CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
198# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
199# CONFIG_MUTEX_SPIN_ON_OWNER is not set
170# CONFIG_FREEZER is not set 200# CONFIG_FREEZER is not set
171 201
172# 202#
@@ -248,6 +278,7 @@ CONFIG_8XX_MINIMAL_FPEMU=y
248CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 278CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
249CONFIG_ARCH_HAS_WALK_MEMORY=y 279CONFIG_ARCH_HAS_WALK_MEMORY=y
250CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 280CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
281CONFIG_SPARSE_IRQ=y
251CONFIG_MAX_ACTIVE_REGIONS=32 282CONFIG_MAX_ACTIVE_REGIONS=32
252CONFIG_ARCH_FLATMEM_ENABLE=y 283CONFIG_ARCH_FLATMEM_ENABLE=y
253CONFIG_ARCH_POPULATES_NODE_MAP=y 284CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -264,8 +295,6 @@ CONFIG_MIGRATION=y
264CONFIG_ZONE_DMA_FLAG=1 295CONFIG_ZONE_DMA_FLAG=1
265CONFIG_BOUNCE=y 296CONFIG_BOUNCE=y
266CONFIG_VIRT_TO_BUS=y 297CONFIG_VIRT_TO_BUS=y
267CONFIG_HAVE_MLOCK=y
268CONFIG_HAVE_MLOCKED_PAGE_BIT=y
269# CONFIG_KSM is not set 298# CONFIG_KSM is not set
270CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 299CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
271CONFIG_PPC_4K_PAGES=y 300CONFIG_PPC_4K_PAGES=y
@@ -379,9 +408,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
379# CONFIG_AF_RXRPC is not set 408# CONFIG_AF_RXRPC is not set
380CONFIG_WIRELESS=y 409CONFIG_WIRELESS=y
381# CONFIG_CFG80211 is not set 410# CONFIG_CFG80211 is not set
382CONFIG_CFG80211_DEFAULT_PS_VALUE=0
383CONFIG_WIRELESS_OLD_REGULATORY=y
384# CONFIG_WIRELESS_EXT is not set
385# CONFIG_LIB80211 is not set 411# CONFIG_LIB80211 is not set
386 412
387# 413#
@@ -556,8 +582,7 @@ CONFIG_FS_ENET_MDIO_FEC=y
556# CONFIG_NETDEV_1000 is not set 582# CONFIG_NETDEV_1000 is not set
557# CONFIG_NETDEV_10000 is not set 583# CONFIG_NETDEV_10000 is not set
558CONFIG_WLAN=y 584CONFIG_WLAN=y
559# CONFIG_WLAN_PRE80211 is not set 585# CONFIG_HOSTAP is not set
560# CONFIG_WLAN_80211 is not set
561 586
562# 587#
563# Enable WiMAX (Networking options) to see the WiMAX drivers 588# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -602,6 +627,7 @@ CONFIG_SERIAL_CORE=y
602CONFIG_SERIAL_CORE_CONSOLE=y 627CONFIG_SERIAL_CORE_CONSOLE=y
603CONFIG_SERIAL_CPM=y 628CONFIG_SERIAL_CPM=y
604CONFIG_SERIAL_CPM_CONSOLE=y 629CONFIG_SERIAL_CPM_CONSOLE=y
630# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
605CONFIG_UNIX98_PTYS=y 631CONFIG_UNIX98_PTYS=y
606# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 632# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
607# CONFIG_LEGACY_PTYS is not set 633# CONFIG_LEGACY_PTYS is not set
@@ -862,6 +888,7 @@ CONFIG_DEBUG_INFO=y
862# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 888# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
863# CONFIG_FAULT_INJECTION is not set 889# CONFIG_FAULT_INJECTION is not set
864# CONFIG_LATENCYTOP is not set 890# CONFIG_LATENCYTOP is not set
891# CONFIG_SYSCTL_SYSCALL_CHECK is not set
865# CONFIG_DEBUG_PAGEALLOC is not set 892# CONFIG_DEBUG_PAGEALLOC is not set
866CONFIG_HAVE_FUNCTION_TRACER=y 893CONFIG_HAVE_FUNCTION_TRACER=y
867CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 894CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -904,7 +931,11 @@ CONFIG_PRINT_STACK_DEPTH=64
904# CONFIG_KEYS is not set 931# CONFIG_KEYS is not set
905# CONFIG_SECURITY is not set 932# CONFIG_SECURITY is not set
906# CONFIG_SECURITYFS is not set 933# CONFIG_SECURITYFS is not set
907# CONFIG_SECURITY_FILE_CAPABILITIES is not set 934# CONFIG_DEFAULT_SECURITY_SELINUX is not set
935# CONFIG_DEFAULT_SECURITY_SMACK is not set
936# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
937CONFIG_DEFAULT_SECURITY_DAC=y
938CONFIG_DEFAULT_SECURITY=""
908# CONFIG_CRYPTO is not set 939# CONFIG_CRYPTO is not set
909CONFIG_PPC_CLOCK=y 940CONFIG_PPC_CLOCK=y
910CONFIG_PPC_LIB_RHEAP=y 941CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig
index b7911216af78..5d06f2cb8e5e 100644
--- a/arch/powerpc/configs/pq2fads_defconfig
+++ b/arch/powerpc/configs/pq2fads_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:17 2009 4# Wed Jan 6 09:24:11 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62# CONFIG_PPC_DCR_NATIVE is not set 64# CONFIG_PPC_DCR_NATIVE is not set
63# CONFIG_PPC_DCR_MMIO is not set 65# CONFIG_PPC_DCR_MMIO is not set
64CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -85,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86CONFIG_TREE_RCU=y 88CONFIG_TREE_RCU=y
87# CONFIG_TREE_PREEMPT_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_TINY_RCU is not set
88# CONFIG_RCU_TRACE is not set 91# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32 92CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set 93# CONFIG_RCU_FANOUT_EXACT is not set
@@ -165,14 +168,41 @@ CONFIG_BLK_DEV_BSG=y
165# IO Schedulers 168# IO Schedulers
166# 169#
167CONFIG_IOSCHED_NOOP=y 170CONFIG_IOSCHED_NOOP=y
168CONFIG_IOSCHED_AS=y
169CONFIG_IOSCHED_DEADLINE=y 171CONFIG_IOSCHED_DEADLINE=y
170CONFIG_IOSCHED_CFQ=y 172CONFIG_IOSCHED_CFQ=y
171CONFIG_DEFAULT_AS=y
172# CONFIG_DEFAULT_DEADLINE is not set 173# CONFIG_DEFAULT_DEADLINE is not set
173# CONFIG_DEFAULT_CFQ is not set 174CONFIG_DEFAULT_CFQ=y
174# CONFIG_DEFAULT_NOOP is not set 175# CONFIG_DEFAULT_NOOP is not set
175CONFIG_DEFAULT_IOSCHED="anticipatory" 176CONFIG_DEFAULT_IOSCHED="cfq"
177# CONFIG_INLINE_SPIN_TRYLOCK is not set
178# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
179# CONFIG_INLINE_SPIN_LOCK is not set
180# CONFIG_INLINE_SPIN_LOCK_BH is not set
181# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
182# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
183CONFIG_INLINE_SPIN_UNLOCK=y
184# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
185CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
186# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
187# CONFIG_INLINE_READ_TRYLOCK is not set
188# CONFIG_INLINE_READ_LOCK is not set
189# CONFIG_INLINE_READ_LOCK_BH is not set
190# CONFIG_INLINE_READ_LOCK_IRQ is not set
191# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
192CONFIG_INLINE_READ_UNLOCK=y
193# CONFIG_INLINE_READ_UNLOCK_BH is not set
194CONFIG_INLINE_READ_UNLOCK_IRQ=y
195# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
196# CONFIG_INLINE_WRITE_TRYLOCK is not set
197# CONFIG_INLINE_WRITE_LOCK is not set
198# CONFIG_INLINE_WRITE_LOCK_BH is not set
199# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
200# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
201CONFIG_INLINE_WRITE_UNLOCK=y
202# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
203CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
204# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
205# CONFIG_MUTEX_SPIN_ON_OWNER is not set
176# CONFIG_FREEZER is not set 206# CONFIG_FREEZER is not set
177 207
178# 208#
@@ -243,6 +273,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
243CONFIG_ARCH_HAS_WALK_MEMORY=y 273CONFIG_ARCH_HAS_WALK_MEMORY=y
244CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 274CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
245# CONFIG_CRASH_DUMP is not set 275# CONFIG_CRASH_DUMP is not set
276CONFIG_SPARSE_IRQ=y
246CONFIG_MAX_ACTIVE_REGIONS=32 277CONFIG_MAX_ACTIVE_REGIONS=32
247CONFIG_ARCH_FLATMEM_ENABLE=y 278CONFIG_ARCH_FLATMEM_ENABLE=y
248CONFIG_ARCH_POPULATES_NODE_MAP=y 279CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -255,8 +286,6 @@ CONFIG_MIGRATION=y
255CONFIG_ZONE_DMA_FLAG=1 286CONFIG_ZONE_DMA_FLAG=1
256CONFIG_BOUNCE=y 287CONFIG_BOUNCE=y
257CONFIG_VIRT_TO_BUS=y 288CONFIG_VIRT_TO_BUS=y
258CONFIG_HAVE_MLOCK=y
259CONFIG_HAVE_MLOCKED_PAGE_BIT=y
260# CONFIG_KSM is not set 289# CONFIG_KSM is not set
261CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 290CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
262CONFIG_PPC_4K_PAGES=y 291CONFIG_PPC_4K_PAGES=y
@@ -407,9 +436,6 @@ CONFIG_NETFILTER_ADVANCED=y
407# CONFIG_BT is not set 436# CONFIG_BT is not set
408CONFIG_WIRELESS=y 437CONFIG_WIRELESS=y
409# CONFIG_CFG80211 is not set 438# CONFIG_CFG80211 is not set
410CONFIG_CFG80211_DEFAULT_PS_VALUE=0
411CONFIG_WIRELESS_OLD_REGULATORY=y
412# CONFIG_WIRELESS_EXT is not set
413# CONFIG_LIB80211 is not set 439# CONFIG_LIB80211 is not set
414 440
415# 441#
@@ -530,6 +556,10 @@ CONFIG_BLK_DEV=y
530# CONFIG_BLK_DEV_COW_COMMON is not set 556# CONFIG_BLK_DEV_COW_COMMON is not set
531CONFIG_BLK_DEV_LOOP=y 557CONFIG_BLK_DEV_LOOP=y
532# CONFIG_BLK_DEV_CRYPTOLOOP is not set 558# CONFIG_BLK_DEV_CRYPTOLOOP is not set
559
560#
561# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
562#
533# CONFIG_BLK_DEV_NBD is not set 563# CONFIG_BLK_DEV_NBD is not set
534# CONFIG_BLK_DEV_SX8 is not set 564# CONFIG_BLK_DEV_SX8 is not set
535# CONFIG_BLK_DEV_RAM is not set 565# CONFIG_BLK_DEV_RAM is not set
@@ -616,7 +646,7 @@ CONFIG_IDE_PROC_FS=y
616# 646#
617 647
618# 648#
619# See the help texts for more information. 649# The newer stack is recommended.
620# 650#
621# CONFIG_FIREWIRE is not set 651# CONFIG_FIREWIRE is not set
622# CONFIG_IEEE1394 is not set 652# CONFIG_IEEE1394 is not set
@@ -721,8 +751,9 @@ CONFIG_CHELSIO_T3_DEPENDS=y
721# CONFIG_BE2NET is not set 751# CONFIG_BE2NET is not set
722# CONFIG_TR is not set 752# CONFIG_TR is not set
723CONFIG_WLAN=y 753CONFIG_WLAN=y
724# CONFIG_WLAN_PRE80211 is not set 754# CONFIG_AIRO is not set
725# CONFIG_WLAN_80211 is not set 755# CONFIG_ATMEL is not set
756# CONFIG_HOSTAP is not set
726 757
727# 758#
728# Enable WiMAX (Networking options) to see the WiMAX drivers 759# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -739,6 +770,7 @@ CONFIG_PPP_DEFLATE=y
739CONFIG_SLHC=y 770CONFIG_SLHC=y
740# CONFIG_NETPOLL is not set 771# CONFIG_NETPOLL is not set
741# CONFIG_NET_POLL_CONTROLLER is not set 772# CONFIG_NET_POLL_CONTROLLER is not set
773# CONFIG_VMXNET3 is not set
742# CONFIG_ISDN is not set 774# CONFIG_ISDN is not set
743# CONFIG_PHONE is not set 775# CONFIG_PHONE is not set
744 776
@@ -748,6 +780,7 @@ CONFIG_SLHC=y
748CONFIG_INPUT=y 780CONFIG_INPUT=y
749# CONFIG_INPUT_FF_MEMLESS is not set 781# CONFIG_INPUT_FF_MEMLESS is not set
750# CONFIG_INPUT_POLLDEV is not set 782# CONFIG_INPUT_POLLDEV is not set
783# CONFIG_INPUT_SPARSEKMAP is not set
751 784
752# 785#
753# Userland interfaces 786# Userland interfaces
@@ -802,6 +835,7 @@ CONFIG_SERIO_SERPORT=y
802CONFIG_SERIO_LIBPS2=y 835CONFIG_SERIO_LIBPS2=y
803# CONFIG_SERIO_RAW is not set 836# CONFIG_SERIO_RAW is not set
804# CONFIG_SERIO_XILINX_XPS_PS2 is not set 837# CONFIG_SERIO_XILINX_XPS_PS2 is not set
838# CONFIG_SERIO_ALTERA_PS2 is not set
805# CONFIG_GAMEPORT is not set 839# CONFIG_GAMEPORT is not set
806 840
807# 841#
@@ -825,6 +859,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
825CONFIG_SERIAL_CPM=y 859CONFIG_SERIAL_CPM=y
826CONFIG_SERIAL_CPM_CONSOLE=y 860CONFIG_SERIAL_CPM_CONSOLE=y
827# CONFIG_SERIAL_JSM is not set 861# CONFIG_SERIAL_JSM is not set
862# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
828CONFIG_UNIX98_PTYS=y 863CONFIG_UNIX98_PTYS=y
829# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 864# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
830CONFIG_LEGACY_PTYS=y 865CONFIG_LEGACY_PTYS=y
@@ -861,6 +896,7 @@ CONFIG_GPIOLIB=y
861# 896#
862# PCI GPIO expanders: 897# PCI GPIO expanders:
863# 898#
899# CONFIG_GPIO_CS5535 is not set
864# CONFIG_GPIO_BT8XX is not set 900# CONFIG_GPIO_BT8XX is not set
865# CONFIG_GPIO_LANGWELL is not set 901# CONFIG_GPIO_LANGWELL is not set
866 902
@@ -955,10 +991,12 @@ CONFIG_USB_ETH_RNDIS=y
955# CONFIG_USB_ETH_EEM is not set 991# CONFIG_USB_ETH_EEM is not set
956# CONFIG_USB_GADGETFS is not set 992# CONFIG_USB_GADGETFS is not set
957# CONFIG_USB_FILE_STORAGE is not set 993# CONFIG_USB_FILE_STORAGE is not set
994# CONFIG_USB_MASS_STORAGE is not set
958# CONFIG_USB_G_SERIAL is not set 995# CONFIG_USB_G_SERIAL is not set
959# CONFIG_USB_MIDI_GADGET is not set 996# CONFIG_USB_MIDI_GADGET is not set
960# CONFIG_USB_G_PRINTER is not set 997# CONFIG_USB_G_PRINTER is not set
961# CONFIG_USB_CDC_COMPOSITE is not set 998# CONFIG_USB_CDC_COMPOSITE is not set
999# CONFIG_USB_G_MULTI is not set
962 1000
963# 1001#
964# OTG and related infrastructure 1002# OTG and related infrastructure
@@ -1248,7 +1286,11 @@ CONFIG_BDI_SWITCH=y
1248# CONFIG_KEYS is not set 1286# CONFIG_KEYS is not set
1249# CONFIG_SECURITY is not set 1287# CONFIG_SECURITY is not set
1250# CONFIG_SECURITYFS is not set 1288# CONFIG_SECURITYFS is not set
1251# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1289# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1290# CONFIG_DEFAULT_SECURITY_SMACK is not set
1291# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1292CONFIG_DEFAULT_SECURITY_DAC=y
1293CONFIG_DEFAULT_SECURITY=""
1252CONFIG_CRYPTO=y 1294CONFIG_CRYPTO=y
1253 1295
1254# 1296#
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig
index ef50ce45d50b..57ab5748a34d 100644
--- a/arch/powerpc/configs/prpmc2800_defconfig
+++ b/arch/powerpc/configs/prpmc2800_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:18 2009 4# Wed Jan 6 09:24:12 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -38,6 +38,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
40CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
41CONFIG_NR_IRQS=512
41CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
42CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
43CONFIG_TRACE_IRQFLAGS_SUPPORT=y 44CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -60,6 +61,7 @@ CONFIG_AUDIT_ARCH=y
60CONFIG_GENERIC_BUG=y 61CONFIG_GENERIC_BUG=y
61CONFIG_DTC=y 62CONFIG_DTC=y
62# CONFIG_DEFAULT_UIMAGE is not set 63# CONFIG_DEFAULT_UIMAGE is not set
64CONFIG_ARCH_HIBERNATION_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
65CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -88,6 +90,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
88# 90#
89CONFIG_TREE_RCU=y 91CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 92# CONFIG_TREE_PREEMPT_RCU is not set
93# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 94# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 95CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 96# CONFIG_RCU_FANOUT_EXACT is not set
@@ -175,14 +178,41 @@ CONFIG_LBDAF=y
175# IO Schedulers 178# IO Schedulers
176# 179#
177CONFIG_IOSCHED_NOOP=y 180CONFIG_IOSCHED_NOOP=y
178CONFIG_IOSCHED_AS=y
179# CONFIG_IOSCHED_DEADLINE is not set 181# CONFIG_IOSCHED_DEADLINE is not set
180# CONFIG_IOSCHED_CFQ is not set 182# CONFIG_IOSCHED_CFQ is not set
181CONFIG_DEFAULT_AS=y
182# CONFIG_DEFAULT_DEADLINE is not set 183# CONFIG_DEFAULT_DEADLINE is not set
183# CONFIG_DEFAULT_CFQ is not set 184# CONFIG_DEFAULT_CFQ is not set
184# CONFIG_DEFAULT_NOOP is not set 185CONFIG_DEFAULT_NOOP=y
185CONFIG_DEFAULT_IOSCHED="anticipatory" 186CONFIG_DEFAULT_IOSCHED="noop"
187# CONFIG_INLINE_SPIN_TRYLOCK is not set
188# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK is not set
190# CONFIG_INLINE_SPIN_LOCK_BH is not set
191# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
192# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
193CONFIG_INLINE_SPIN_UNLOCK=y
194# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
195CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
196# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
197# CONFIG_INLINE_READ_TRYLOCK is not set
198# CONFIG_INLINE_READ_LOCK is not set
199# CONFIG_INLINE_READ_LOCK_BH is not set
200# CONFIG_INLINE_READ_LOCK_IRQ is not set
201# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
202CONFIG_INLINE_READ_UNLOCK=y
203# CONFIG_INLINE_READ_UNLOCK_BH is not set
204CONFIG_INLINE_READ_UNLOCK_IRQ=y
205# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
206# CONFIG_INLINE_WRITE_TRYLOCK is not set
207# CONFIG_INLINE_WRITE_LOCK is not set
208# CONFIG_INLINE_WRITE_LOCK_BH is not set
209# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
210# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
211CONFIG_INLINE_WRITE_UNLOCK=y
212# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
213CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
214# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
215# CONFIG_MUTEX_SPIN_ON_OWNER is not set
186# CONFIG_FREEZER is not set 216# CONFIG_FREEZER is not set
187 217
188# 218#
@@ -207,6 +237,8 @@ CONFIG_EMBEDDED6xx=y
207CONFIG_PPC_PRPMC2800=y 237CONFIG_PPC_PRPMC2800=y
208# CONFIG_PPC_C2K is not set 238# CONFIG_PPC_C2K is not set
209CONFIG_MV64X60=y 239CONFIG_MV64X60=y
240# CONFIG_GAMECUBE is not set
241# CONFIG_WII is not set
210# CONFIG_AMIGAONE is not set 242# CONFIG_AMIGAONE is not set
211CONFIG_PPC_OF_BOOT_TRAMPOLINE=y 243CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
212# CONFIG_IPIC is not set 244# CONFIG_IPIC is not set
@@ -252,6 +284,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
252CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 284CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
253# CONFIG_KEXEC is not set 285# CONFIG_KEXEC is not set
254# CONFIG_CRASH_DUMP is not set 286# CONFIG_CRASH_DUMP is not set
287CONFIG_SPARSE_IRQ=y
255CONFIG_MAX_ACTIVE_REGIONS=32 288CONFIG_MAX_ACTIVE_REGIONS=32
256CONFIG_ARCH_FLATMEM_ENABLE=y 289CONFIG_ARCH_FLATMEM_ENABLE=y
257CONFIG_ARCH_POPULATES_NODE_MAP=y 290CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -268,8 +301,6 @@ CONFIG_MIGRATION=y
268CONFIG_ZONE_DMA_FLAG=1 301CONFIG_ZONE_DMA_FLAG=1
269CONFIG_BOUNCE=y 302CONFIG_BOUNCE=y
270CONFIG_VIRT_TO_BUS=y 303CONFIG_VIRT_TO_BUS=y
271CONFIG_HAVE_MLOCK=y
272CONFIG_HAVE_MLOCKED_PAGE_BIT=y
273# CONFIG_KSM is not set 304# CONFIG_KSM is not set
274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 305CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
275CONFIG_PPC_4K_PAGES=y 306CONFIG_PPC_4K_PAGES=y
@@ -394,9 +425,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
394# CONFIG_AF_RXRPC is not set 425# CONFIG_AF_RXRPC is not set
395CONFIG_WIRELESS=y 426CONFIG_WIRELESS=y
396# CONFIG_CFG80211 is not set 427# CONFIG_CFG80211 is not set
397CONFIG_CFG80211_DEFAULT_PS_VALUE=0
398CONFIG_WIRELESS_OLD_REGULATORY=y
399# CONFIG_WIRELESS_EXT is not set
400# CONFIG_LIB80211 is not set 428# CONFIG_LIB80211 is not set
401 429
402# 430#
@@ -518,6 +546,10 @@ CONFIG_BLK_DEV=y
518# CONFIG_BLK_DEV_COW_COMMON is not set 546# CONFIG_BLK_DEV_COW_COMMON is not set
519CONFIG_BLK_DEV_LOOP=y 547CONFIG_BLK_DEV_LOOP=y
520# CONFIG_BLK_DEV_CRYPTOLOOP is not set 548# CONFIG_BLK_DEV_CRYPTOLOOP is not set
549
550#
551# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
552#
521# CONFIG_BLK_DEV_NBD is not set 553# CONFIG_BLK_DEV_NBD is not set
522# CONFIG_BLK_DEV_SX8 is not set 554# CONFIG_BLK_DEV_SX8 is not set
523# CONFIG_BLK_DEV_UB is not set 555# CONFIG_BLK_DEV_UB is not set
@@ -529,6 +561,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
529# CONFIG_ATA_OVER_ETH is not set 561# CONFIG_ATA_OVER_ETH is not set
530# CONFIG_BLK_DEV_HD is not set 562# CONFIG_BLK_DEV_HD is not set
531CONFIG_MISC_DEVICES=y 563CONFIG_MISC_DEVICES=y
564# CONFIG_AD525X_DPOT is not set
532# CONFIG_PHANTOM is not set 565# CONFIG_PHANTOM is not set
533# CONFIG_SGI_IOC4 is not set 566# CONFIG_SGI_IOC4 is not set
534# CONFIG_TIFM_CORE is not set 567# CONFIG_TIFM_CORE is not set
@@ -536,6 +569,7 @@ CONFIG_MISC_DEVICES=y
536# CONFIG_ENCLOSURE_SERVICES is not set 569# CONFIG_ENCLOSURE_SERVICES is not set
537# CONFIG_HP_ILO is not set 570# CONFIG_HP_ILO is not set
538# CONFIG_ISL29003 is not set 571# CONFIG_ISL29003 is not set
572# CONFIG_DS1682 is not set
539# CONFIG_C2PORT is not set 573# CONFIG_C2PORT is not set
540 574
541# 575#
@@ -641,7 +675,9 @@ CONFIG_SCSI_LOWLEVEL=y
641# CONFIG_SCSI_BNX2_ISCSI is not set 675# CONFIG_SCSI_BNX2_ISCSI is not set
642# CONFIG_BE2ISCSI is not set 676# CONFIG_BE2ISCSI is not set
643# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 677# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
678# CONFIG_SCSI_HPSA is not set
644# CONFIG_SCSI_3W_9XXX is not set 679# CONFIG_SCSI_3W_9XXX is not set
680# CONFIG_SCSI_3W_SAS is not set
645# CONFIG_SCSI_ACARD is not set 681# CONFIG_SCSI_ACARD is not set
646# CONFIG_SCSI_AACRAID is not set 682# CONFIG_SCSI_AACRAID is not set
647# CONFIG_SCSI_AIC7XXX is not set 683# CONFIG_SCSI_AIC7XXX is not set
@@ -680,6 +716,7 @@ CONFIG_SCSI_LOWLEVEL=y
680# CONFIG_SCSI_NSP32 is not set 716# CONFIG_SCSI_NSP32 is not set
681# CONFIG_SCSI_DEBUG is not set 717# CONFIG_SCSI_DEBUG is not set
682# CONFIG_SCSI_PMCRAID is not set 718# CONFIG_SCSI_PMCRAID is not set
719# CONFIG_SCSI_PM8001 is not set
683# CONFIG_SCSI_SRP is not set 720# CONFIG_SCSI_SRP is not set
684# CONFIG_SCSI_BFA_FC is not set 721# CONFIG_SCSI_BFA_FC is not set
685# CONFIG_SCSI_DH is not set 722# CONFIG_SCSI_DH is not set
@@ -734,15 +771,16 @@ CONFIG_SATA_MV=y
734# CONFIG_PATA_NS87415 is not set 771# CONFIG_PATA_NS87415 is not set
735# CONFIG_PATA_OPTI is not set 772# CONFIG_PATA_OPTI is not set
736# CONFIG_PATA_OPTIDMA is not set 773# CONFIG_PATA_OPTIDMA is not set
774# CONFIG_PATA_PDC2027X is not set
737# CONFIG_PATA_PDC_OLD is not set 775# CONFIG_PATA_PDC_OLD is not set
738# CONFIG_PATA_RADISYS is not set 776# CONFIG_PATA_RADISYS is not set
739# CONFIG_PATA_RDC is not set 777# CONFIG_PATA_RDC is not set
740# CONFIG_PATA_RZ1000 is not set 778# CONFIG_PATA_RZ1000 is not set
741# CONFIG_PATA_SC1200 is not set 779# CONFIG_PATA_SC1200 is not set
742# CONFIG_PATA_SERVERWORKS is not set 780# CONFIG_PATA_SERVERWORKS is not set
743# CONFIG_PATA_PDC2027X is not set
744# CONFIG_PATA_SIL680 is not set 781# CONFIG_PATA_SIL680 is not set
745# CONFIG_PATA_SIS is not set 782# CONFIG_PATA_SIS is not set
783# CONFIG_PATA_TOSHIBA is not set
746# CONFIG_PATA_VIA is not set 784# CONFIG_PATA_VIA is not set
747# CONFIG_PATA_WINBOND is not set 785# CONFIG_PATA_WINBOND is not set
748# CONFIG_PATA_PLATFORM is not set 786# CONFIG_PATA_PLATFORM is not set
@@ -759,7 +797,7 @@ CONFIG_SATA_MV=y
759# 797#
760 798
761# 799#
762# See the help texts for more information. 800# The newer stack is recommended.
763# 801#
764# CONFIG_FIREWIRE is not set 802# CONFIG_FIREWIRE is not set
765# CONFIG_IEEE1394 is not set 803# CONFIG_IEEE1394 is not set
@@ -886,8 +924,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
886# CONFIG_BE2NET is not set 924# CONFIG_BE2NET is not set
887# CONFIG_TR is not set 925# CONFIG_TR is not set
888CONFIG_WLAN=y 926CONFIG_WLAN=y
889# CONFIG_WLAN_PRE80211 is not set 927# CONFIG_AIRO is not set
890# CONFIG_WLAN_80211 is not set 928# CONFIG_ATMEL is not set
929# CONFIG_PRISM54 is not set
930# CONFIG_USB_ZD1201 is not set
931# CONFIG_HOSTAP is not set
891 932
892# 933#
893# Enable WiMAX (Networking options) to see the WiMAX drivers 934# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -910,6 +951,7 @@ CONFIG_WLAN=y
910# CONFIG_NETCONSOLE is not set 951# CONFIG_NETCONSOLE is not set
911# CONFIG_NETPOLL is not set 952# CONFIG_NETPOLL is not set
912# CONFIG_NET_POLL_CONTROLLER is not set 953# CONFIG_NET_POLL_CONTROLLER is not set
954# CONFIG_VMXNET3 is not set
913# CONFIG_ISDN is not set 955# CONFIG_ISDN is not set
914# CONFIG_PHONE is not set 956# CONFIG_PHONE is not set
915 957
@@ -919,6 +961,7 @@ CONFIG_WLAN=y
919CONFIG_INPUT=y 961CONFIG_INPUT=y
920CONFIG_INPUT_FF_MEMLESS=y 962CONFIG_INPUT_FF_MEMLESS=y
921# CONFIG_INPUT_POLLDEV is not set 963# CONFIG_INPUT_POLLDEV is not set
964# CONFIG_INPUT_SPARSEKMAP is not set
922 965
923# 966#
924# Userland interfaces 967# Userland interfaces
@@ -973,6 +1016,7 @@ CONFIG_SERIAL_MPSC_CONSOLE=y
973CONFIG_SERIAL_CORE=y 1016CONFIG_SERIAL_CORE=y
974CONFIG_SERIAL_CORE_CONSOLE=y 1017CONFIG_SERIAL_CORE_CONSOLE=y
975# CONFIG_SERIAL_JSM is not set 1018# CONFIG_SERIAL_JSM is not set
1019# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
976CONFIG_UNIX98_PTYS=y 1020CONFIG_UNIX98_PTYS=y
977# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1021# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
978CONFIG_LEGACY_PTYS=y 1022CONFIG_LEGACY_PTYS=y
@@ -1030,11 +1074,6 @@ CONFIG_I2C_MV64XXX=y
1030# CONFIG_I2C_TINY_USB is not set 1074# CONFIG_I2C_TINY_USB is not set
1031 1075
1032# 1076#
1033# Graphics adapter I2C/DDC channel drivers
1034#
1035# CONFIG_I2C_VOODOO3 is not set
1036
1037#
1038# Other I2C/SMBus bus drivers 1077# Other I2C/SMBus bus drivers
1039# 1078#
1040# CONFIG_I2C_PCA_PLATFORM is not set 1079# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1042,7 +1081,6 @@ CONFIG_I2C_MV64XXX=y
1042# 1081#
1043# Miscellaneous I2C Chip support 1082# Miscellaneous I2C Chip support
1044# 1083#
1045# CONFIG_DS1682 is not set
1046# CONFIG_SENSORS_TSL2550 is not set 1084# CONFIG_SENSORS_TSL2550 is not set
1047# CONFIG_I2C_DEBUG_CORE is not set 1085# CONFIG_I2C_DEBUG_CORE is not set
1048# CONFIG_I2C_DEBUG_ALGO is not set 1086# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1088,6 +1126,7 @@ CONFIG_HWMON=y
1088# CONFIG_SENSORS_GL520SM is not set 1126# CONFIG_SENSORS_GL520SM is not set
1089# CONFIG_SENSORS_IT87 is not set 1127# CONFIG_SENSORS_IT87 is not set
1090# CONFIG_SENSORS_LM63 is not set 1128# CONFIG_SENSORS_LM63 is not set
1129# CONFIG_SENSORS_LM73 is not set
1091# CONFIG_SENSORS_LM75 is not set 1130# CONFIG_SENSORS_LM75 is not set
1092# CONFIG_SENSORS_LM77 is not set 1131# CONFIG_SENSORS_LM77 is not set
1093# CONFIG_SENSORS_LM78 is not set 1132# CONFIG_SENSORS_LM78 is not set
@@ -1126,6 +1165,7 @@ CONFIG_HWMON=y
1126# CONFIG_SENSORS_W83L786NG is not set 1165# CONFIG_SENSORS_W83L786NG is not set
1127# CONFIG_SENSORS_W83627HF is not set 1166# CONFIG_SENSORS_W83627HF is not set
1128# CONFIG_SENSORS_W83627EHF is not set 1167# CONFIG_SENSORS_W83627EHF is not set
1168# CONFIG_SENSORS_LIS3_I2C is not set
1129# CONFIG_THERMAL is not set 1169# CONFIG_THERMAL is not set
1130# CONFIG_WATCHDOG is not set 1170# CONFIG_WATCHDOG is not set
1131CONFIG_SSB_POSSIBLE=y 1171CONFIG_SSB_POSSIBLE=y
@@ -1144,11 +1184,13 @@ CONFIG_SSB_POSSIBLE=y
1144# CONFIG_TWL4030_CORE is not set 1184# CONFIG_TWL4030_CORE is not set
1145# CONFIG_MFD_TMIO is not set 1185# CONFIG_MFD_TMIO is not set
1146# CONFIG_PMIC_DA903X is not set 1186# CONFIG_PMIC_DA903X is not set
1187# CONFIG_PMIC_ADP5520 is not set
1147# CONFIG_MFD_WM8400 is not set 1188# CONFIG_MFD_WM8400 is not set
1148# CONFIG_MFD_WM831X is not set 1189# CONFIG_MFD_WM831X is not set
1149# CONFIG_MFD_WM8350_I2C is not set 1190# CONFIG_MFD_WM8350_I2C is not set
1150# CONFIG_MFD_PCF50633 is not set 1191# CONFIG_MFD_PCF50633 is not set
1151# CONFIG_AB3100_CORE is not set 1192# CONFIG_AB3100_CORE is not set
1193# CONFIG_MFD_88PM8607 is not set
1152# CONFIG_REGULATOR is not set 1194# CONFIG_REGULATOR is not set
1153# CONFIG_MEDIA_SUPPORT is not set 1195# CONFIG_MEDIA_SUPPORT is not set
1154 1196
@@ -1250,6 +1292,7 @@ CONFIG_USB_MON=y
1250CONFIG_USB_EHCI_HCD=y 1292CONFIG_USB_EHCI_HCD=y
1251# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1293# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1252# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1294# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1295# CONFIG_XPS_USB_HCD_XILINX is not set
1253CONFIG_USB_EHCI_HCD_PPC_OF=y 1296CONFIG_USB_EHCI_HCD_PPC_OF=y
1254# CONFIG_USB_OXU210HP_HCD is not set 1297# CONFIG_USB_OXU210HP_HCD is not set
1255# CONFIG_USB_ISP116X_HCD is not set 1298# CONFIG_USB_ISP116X_HCD is not set
@@ -1362,6 +1405,7 @@ CONFIG_RTC_DRV_MAX6900=y
1362# CONFIG_RTC_DRV_PCF8563 is not set 1405# CONFIG_RTC_DRV_PCF8563 is not set
1363# CONFIG_RTC_DRV_PCF8583 is not set 1406# CONFIG_RTC_DRV_PCF8583 is not set
1364# CONFIG_RTC_DRV_M41T80 is not set 1407# CONFIG_RTC_DRV_M41T80 is not set
1408# CONFIG_RTC_DRV_BQ32K is not set
1365# CONFIG_RTC_DRV_S35390A is not set 1409# CONFIG_RTC_DRV_S35390A is not set
1366# CONFIG_RTC_DRV_FM3130 is not set 1410# CONFIG_RTC_DRV_FM3130 is not set
1367# CONFIG_RTC_DRV_RX8581 is not set 1411# CONFIG_RTC_DRV_RX8581 is not set
@@ -1383,7 +1427,9 @@ CONFIG_RTC_DRV_MAX6900=y
1383# CONFIG_RTC_DRV_M48T86 is not set 1427# CONFIG_RTC_DRV_M48T86 is not set
1384# CONFIG_RTC_DRV_M48T35 is not set 1428# CONFIG_RTC_DRV_M48T35 is not set
1385# CONFIG_RTC_DRV_M48T59 is not set 1429# CONFIG_RTC_DRV_M48T59 is not set
1430# CONFIG_RTC_DRV_MSM6242 is not set
1386# CONFIG_RTC_DRV_BQ4802 is not set 1431# CONFIG_RTC_DRV_BQ4802 is not set
1432# CONFIG_RTC_DRV_RP5C01 is not set
1387# CONFIG_RTC_DRV_V3020 is not set 1433# CONFIG_RTC_DRV_V3020 is not set
1388 1434
1389# 1435#
@@ -1626,7 +1672,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1626# CONFIG_KEYS is not set 1672# CONFIG_KEYS is not set
1627# CONFIG_SECURITY is not set 1673# CONFIG_SECURITY is not set
1628# CONFIG_SECURITYFS is not set 1674# CONFIG_SECURITYFS is not set
1629# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1675# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1676# CONFIG_DEFAULT_SECURITY_SMACK is not set
1677# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1678CONFIG_DEFAULT_SECURITY_DAC=y
1679CONFIG_DEFAULT_SECURITY=""
1630CONFIG_CRYPTO=y 1680CONFIG_CRYPTO=y
1631 1681
1632# 1682#
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig
index 524263158fc0..f2f832161463 100644
--- a/arch/powerpc/configs/storcenter_defconfig
+++ b/arch/powerpc/configs/storcenter_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:19 2009 4# Wed Jan 6 09:24:13 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
58CONFIG_GENERIC_BUG=y 59CONFIG_GENERIC_BUG=y
59CONFIG_DTC=y 60CONFIG_DTC=y
60# CONFIG_DEFAULT_UIMAGE is not set 61# CONFIG_DEFAULT_UIMAGE is not set
62CONFIG_ARCH_HIBERNATION_POSSIBLE=y
61# CONFIG_PPC_DCR_NATIVE is not set 63# CONFIG_PPC_DCR_NATIVE is not set
62# CONFIG_PPC_DCR_MMIO is not set 64# CONFIG_PPC_DCR_MMIO is not set
63CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 65CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -85,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86CONFIG_TREE_RCU=y 88CONFIG_TREE_RCU=y
87# CONFIG_TREE_PREEMPT_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_TINY_RCU is not set
88# CONFIG_RCU_TRACE is not set 91# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32 92CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set 93# CONFIG_RCU_FANOUT_EXACT is not set
@@ -167,14 +170,41 @@ CONFIG_LBDAF=y
167# IO Schedulers 170# IO Schedulers
168# 171#
169CONFIG_IOSCHED_NOOP=y 172CONFIG_IOSCHED_NOOP=y
170CONFIG_IOSCHED_AS=y
171CONFIG_IOSCHED_DEADLINE=y 173CONFIG_IOSCHED_DEADLINE=y
172CONFIG_IOSCHED_CFQ=y 174CONFIG_IOSCHED_CFQ=y
173# CONFIG_DEFAULT_AS is not set
174# CONFIG_DEFAULT_DEADLINE is not set 175# CONFIG_DEFAULT_DEADLINE is not set
175CONFIG_DEFAULT_CFQ=y 176CONFIG_DEFAULT_CFQ=y
176# CONFIG_DEFAULT_NOOP is not set 177# CONFIG_DEFAULT_NOOP is not set
177CONFIG_DEFAULT_IOSCHED="cfq" 178CONFIG_DEFAULT_IOSCHED="cfq"
179# CONFIG_INLINE_SPIN_TRYLOCK is not set
180# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
181# CONFIG_INLINE_SPIN_LOCK is not set
182# CONFIG_INLINE_SPIN_LOCK_BH is not set
183# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
184# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
185CONFIG_INLINE_SPIN_UNLOCK=y
186# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
187CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
188# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
189# CONFIG_INLINE_READ_TRYLOCK is not set
190# CONFIG_INLINE_READ_LOCK is not set
191# CONFIG_INLINE_READ_LOCK_BH is not set
192# CONFIG_INLINE_READ_LOCK_IRQ is not set
193# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
194CONFIG_INLINE_READ_UNLOCK=y
195# CONFIG_INLINE_READ_UNLOCK_BH is not set
196CONFIG_INLINE_READ_UNLOCK_IRQ=y
197# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
198# CONFIG_INLINE_WRITE_TRYLOCK is not set
199# CONFIG_INLINE_WRITE_LOCK is not set
200# CONFIG_INLINE_WRITE_LOCK_BH is not set
201# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
202# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
203CONFIG_INLINE_WRITE_UNLOCK=y
204# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
205CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
206# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
207# CONFIG_MUTEX_SPIN_ON_OWNER is not set
178# CONFIG_FREEZER is not set 208# CONFIG_FREEZER is not set
179 209
180# 210#
@@ -201,6 +231,8 @@ CONFIG_STORCENTER=y
201CONFIG_MPC10X_BRIDGE=y 231CONFIG_MPC10X_BRIDGE=y
202CONFIG_MPC10X_OPENPIC=y 232CONFIG_MPC10X_OPENPIC=y
203# CONFIG_MPC10X_STORE_GATHERING is not set 233# CONFIG_MPC10X_STORE_GATHERING is not set
234# CONFIG_GAMECUBE is not set
235# CONFIG_WII is not set
204# CONFIG_AMIGAONE is not set 236# CONFIG_AMIGAONE is not set
205CONFIG_PPC_OF_BOOT_TRAMPOLINE=y 237CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
206# CONFIG_IPIC is not set 238# CONFIG_IPIC is not set
@@ -246,6 +278,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
246CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 278CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
247# CONFIG_KEXEC is not set 279# CONFIG_KEXEC is not set
248# CONFIG_CRASH_DUMP is not set 280# CONFIG_CRASH_DUMP is not set
281CONFIG_SPARSE_IRQ=y
249CONFIG_MAX_ACTIVE_REGIONS=32 282CONFIG_MAX_ACTIVE_REGIONS=32
250CONFIG_ARCH_FLATMEM_ENABLE=y 283CONFIG_ARCH_FLATMEM_ENABLE=y
251CONFIG_ARCH_POPULATES_NODE_MAP=y 284CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -262,8 +295,6 @@ CONFIG_MIGRATION=y
262CONFIG_ZONE_DMA_FLAG=1 295CONFIG_ZONE_DMA_FLAG=1
263CONFIG_BOUNCE=y 296CONFIG_BOUNCE=y
264CONFIG_VIRT_TO_BUS=y 297CONFIG_VIRT_TO_BUS=y
265CONFIG_HAVE_MLOCK=y
266CONFIG_HAVE_MLOCKED_PAGE_BIT=y
267# CONFIG_KSM is not set 298# CONFIG_KSM is not set
268CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 299CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
269CONFIG_PPC_4K_PAGES=y 300CONFIG_PPC_4K_PAGES=y
@@ -384,9 +415,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
384# CONFIG_AF_RXRPC is not set 415# CONFIG_AF_RXRPC is not set
385CONFIG_WIRELESS=y 416CONFIG_WIRELESS=y
386# CONFIG_CFG80211 is not set 417# CONFIG_CFG80211 is not set
387CONFIG_CFG80211_DEFAULT_PS_VALUE=0
388CONFIG_WIRELESS_OLD_REGULATORY=y
389# CONFIG_WIRELESS_EXT is not set
390# CONFIG_LIB80211 is not set 418# CONFIG_LIB80211 is not set
391 419
392# 420#
@@ -507,6 +535,10 @@ CONFIG_BLK_DEV=y
507# CONFIG_BLK_DEV_UMEM is not set 535# CONFIG_BLK_DEV_UMEM is not set
508# CONFIG_BLK_DEV_COW_COMMON is not set 536# CONFIG_BLK_DEV_COW_COMMON is not set
509# CONFIG_BLK_DEV_LOOP is not set 537# CONFIG_BLK_DEV_LOOP is not set
538
539#
540# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
541#
510# CONFIG_BLK_DEV_NBD is not set 542# CONFIG_BLK_DEV_NBD is not set
511# CONFIG_BLK_DEV_SX8 is not set 543# CONFIG_BLK_DEV_SX8 is not set
512# CONFIG_BLK_DEV_UB is not set 544# CONFIG_BLK_DEV_UB is not set
@@ -515,6 +547,7 @@ CONFIG_BLK_DEV=y
515# CONFIG_ATA_OVER_ETH is not set 547# CONFIG_ATA_OVER_ETH is not set
516# CONFIG_BLK_DEV_HD is not set 548# CONFIG_BLK_DEV_HD is not set
517CONFIG_MISC_DEVICES=y 549CONFIG_MISC_DEVICES=y
550# CONFIG_AD525X_DPOT is not set
518# CONFIG_PHANTOM is not set 551# CONFIG_PHANTOM is not set
519# CONFIG_SGI_IOC4 is not set 552# CONFIG_SGI_IOC4 is not set
520# CONFIG_TIFM_CORE is not set 553# CONFIG_TIFM_CORE is not set
@@ -522,6 +555,7 @@ CONFIG_MISC_DEVICES=y
522# CONFIG_ENCLOSURE_SERVICES is not set 555# CONFIG_ENCLOSURE_SERVICES is not set
523# CONFIG_HP_ILO is not set 556# CONFIG_HP_ILO is not set
524# CONFIG_ISL29003 is not set 557# CONFIG_ISL29003 is not set
558# CONFIG_DS1682 is not set
525# CONFIG_C2PORT is not set 559# CONFIG_C2PORT is not set
526 560
527# 561#
@@ -628,7 +662,9 @@ CONFIG_SCSI_LOWLEVEL=y
628# CONFIG_SCSI_BNX2_ISCSI is not set 662# CONFIG_SCSI_BNX2_ISCSI is not set
629# CONFIG_BE2ISCSI is not set 663# CONFIG_BE2ISCSI is not set
630# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 664# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
665# CONFIG_SCSI_HPSA is not set
631# CONFIG_SCSI_3W_9XXX is not set 666# CONFIG_SCSI_3W_9XXX is not set
667# CONFIG_SCSI_3W_SAS is not set
632# CONFIG_SCSI_ACARD is not set 668# CONFIG_SCSI_ACARD is not set
633# CONFIG_SCSI_AACRAID is not set 669# CONFIG_SCSI_AACRAID is not set
634# CONFIG_SCSI_AIC7XXX is not set 670# CONFIG_SCSI_AIC7XXX is not set
@@ -666,6 +702,7 @@ CONFIG_SCSI_LOWLEVEL=y
666# CONFIG_SCSI_NSP32 is not set 702# CONFIG_SCSI_NSP32 is not set
667# CONFIG_SCSI_DEBUG is not set 703# CONFIG_SCSI_DEBUG is not set
668# CONFIG_SCSI_PMCRAID is not set 704# CONFIG_SCSI_PMCRAID is not set
705# CONFIG_SCSI_PM8001 is not set
669# CONFIG_SCSI_SRP is not set 706# CONFIG_SCSI_SRP is not set
670# CONFIG_SCSI_BFA_FC is not set 707# CONFIG_SCSI_BFA_FC is not set
671# CONFIG_SCSI_DH is not set 708# CONFIG_SCSI_DH is not set
@@ -695,7 +732,7 @@ CONFIG_MD_RAID6_PQ=y
695# 732#
696 733
697# 734#
698# See the help texts for more information. 735# The newer stack is recommended.
699# 736#
700# CONFIG_FIREWIRE is not set 737# CONFIG_FIREWIRE is not set
701# CONFIG_IEEE1394 is not set 738# CONFIG_IEEE1394 is not set
@@ -741,8 +778,11 @@ CONFIG_R8169=y
741# CONFIG_NETDEV_10000 is not set 778# CONFIG_NETDEV_10000 is not set
742# CONFIG_TR is not set 779# CONFIG_TR is not set
743CONFIG_WLAN=y 780CONFIG_WLAN=y
744# CONFIG_WLAN_PRE80211 is not set 781# CONFIG_AIRO is not set
745# CONFIG_WLAN_80211 is not set 782# CONFIG_ATMEL is not set
783# CONFIG_PRISM54 is not set
784# CONFIG_USB_ZD1201 is not set
785# CONFIG_HOSTAP is not set
746 786
747# 787#
748# Enable WiMAX (Networking options) to see the WiMAX drivers 788# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -765,6 +805,7 @@ CONFIG_WLAN=y
765# CONFIG_NETCONSOLE is not set 805# CONFIG_NETCONSOLE is not set
766# CONFIG_NETPOLL is not set 806# CONFIG_NETPOLL is not set
767# CONFIG_NET_POLL_CONTROLLER is not set 807# CONFIG_NET_POLL_CONTROLLER is not set
808# CONFIG_VMXNET3 is not set
768# CONFIG_ISDN is not set 809# CONFIG_ISDN is not set
769# CONFIG_PHONE is not set 810# CONFIG_PHONE is not set
770 811
@@ -805,6 +846,7 @@ CONFIG_SERIAL_CORE=y
805CONFIG_SERIAL_CORE_CONSOLE=y 846CONFIG_SERIAL_CORE_CONSOLE=y
806# CONFIG_SERIAL_JSM is not set 847# CONFIG_SERIAL_JSM is not set
807# CONFIG_SERIAL_OF_PLATFORM is not set 848# CONFIG_SERIAL_OF_PLATFORM is not set
849# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
808CONFIG_UNIX98_PTYS=y 850CONFIG_UNIX98_PTYS=y
809# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 851# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
810CONFIG_LEGACY_PTYS=y 852CONFIG_LEGACY_PTYS=y
@@ -862,11 +904,6 @@ CONFIG_I2C_MPC=y
862# CONFIG_I2C_TINY_USB is not set 904# CONFIG_I2C_TINY_USB is not set
863 905
864# 906#
865# Graphics adapter I2C/DDC channel drivers
866#
867# CONFIG_I2C_VOODOO3 is not set
868
869#
870# Other I2C/SMBus bus drivers 907# Other I2C/SMBus bus drivers
871# 908#
872# CONFIG_I2C_PCA_PLATFORM is not set 909# CONFIG_I2C_PCA_PLATFORM is not set
@@ -875,7 +912,6 @@ CONFIG_I2C_MPC=y
875# 912#
876# Miscellaneous I2C Chip support 913# Miscellaneous I2C Chip support
877# 914#
878# CONFIG_DS1682 is not set
879# CONFIG_SENSORS_TSL2550 is not set 915# CONFIG_SENSORS_TSL2550 is not set
880# CONFIG_I2C_DEBUG_CORE is not set 916# CONFIG_I2C_DEBUG_CORE is not set
881# CONFIG_I2C_DEBUG_ALGO is not set 917# CONFIG_I2C_DEBUG_ALGO is not set
@@ -910,11 +946,13 @@ CONFIG_SSB_POSSIBLE=y
910# CONFIG_TWL4030_CORE is not set 946# CONFIG_TWL4030_CORE is not set
911# CONFIG_MFD_TMIO is not set 947# CONFIG_MFD_TMIO is not set
912# CONFIG_PMIC_DA903X is not set 948# CONFIG_PMIC_DA903X is not set
949# CONFIG_PMIC_ADP5520 is not set
913# CONFIG_MFD_WM8400 is not set 950# CONFIG_MFD_WM8400 is not set
914# CONFIG_MFD_WM831X is not set 951# CONFIG_MFD_WM831X is not set
915# CONFIG_MFD_WM8350_I2C is not set 952# CONFIG_MFD_WM8350_I2C is not set
916# CONFIG_MFD_PCF50633 is not set 953# CONFIG_MFD_PCF50633 is not set
917# CONFIG_AB3100_CORE is not set 954# CONFIG_AB3100_CORE is not set
955# CONFIG_MFD_88PM8607 is not set
918# CONFIG_REGULATOR is not set 956# CONFIG_REGULATOR is not set
919# CONFIG_MEDIA_SUPPORT is not set 957# CONFIG_MEDIA_SUPPORT is not set
920 958
@@ -963,6 +1001,7 @@ CONFIG_USB_DEVICE_CLASS=y
963CONFIG_USB_EHCI_HCD=y 1001CONFIG_USB_EHCI_HCD=y
964# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1002# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
965# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1003# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1004# CONFIG_XPS_USB_HCD_XILINX is not set
966# CONFIG_USB_EHCI_FSL is not set 1005# CONFIG_USB_EHCI_FSL is not set
967CONFIG_USB_EHCI_HCD_PPC_OF=y 1006CONFIG_USB_EHCI_HCD_PPC_OF=y
968# CONFIG_USB_OXU210HP_HCD is not set 1007# CONFIG_USB_OXU210HP_HCD is not set
@@ -1087,6 +1126,7 @@ CONFIG_RTC_DRV_DS1307=y
1087# CONFIG_RTC_DRV_PCF8563 is not set 1126# CONFIG_RTC_DRV_PCF8563 is not set
1088# CONFIG_RTC_DRV_PCF8583 is not set 1127# CONFIG_RTC_DRV_PCF8583 is not set
1089# CONFIG_RTC_DRV_M41T80 is not set 1128# CONFIG_RTC_DRV_M41T80 is not set
1129# CONFIG_RTC_DRV_BQ32K is not set
1090# CONFIG_RTC_DRV_S35390A is not set 1130# CONFIG_RTC_DRV_S35390A is not set
1091# CONFIG_RTC_DRV_FM3130 is not set 1131# CONFIG_RTC_DRV_FM3130 is not set
1092# CONFIG_RTC_DRV_RX8581 is not set 1132# CONFIG_RTC_DRV_RX8581 is not set
@@ -1108,7 +1148,9 @@ CONFIG_RTC_DRV_DS1307=y
1108# CONFIG_RTC_DRV_M48T86 is not set 1148# CONFIG_RTC_DRV_M48T86 is not set
1109# CONFIG_RTC_DRV_M48T35 is not set 1149# CONFIG_RTC_DRV_M48T35 is not set
1110# CONFIG_RTC_DRV_M48T59 is not set 1150# CONFIG_RTC_DRV_M48T59 is not set
1151# CONFIG_RTC_DRV_MSM6242 is not set
1111# CONFIG_RTC_DRV_BQ4802 is not set 1152# CONFIG_RTC_DRV_BQ4802 is not set
1153# CONFIG_RTC_DRV_RP5C01 is not set
1112# CONFIG_RTC_DRV_V3020 is not set 1154# CONFIG_RTC_DRV_V3020 is not set
1113 1155
1114# 1156#
@@ -1322,7 +1364,7 @@ CONFIG_FRAME_WARN=1024
1322# CONFIG_DEBUG_KERNEL is not set 1364# CONFIG_DEBUG_KERNEL is not set
1323# CONFIG_SLUB_DEBUG_ON is not set 1365# CONFIG_SLUB_DEBUG_ON is not set
1324# CONFIG_SLUB_STATS is not set 1366# CONFIG_SLUB_STATS is not set
1325# CONFIG_DEBUG_BUGVERBOSE is not set 1367CONFIG_DEBUG_BUGVERBOSE=y
1326# CONFIG_DEBUG_MEMORY_INIT is not set 1368# CONFIG_DEBUG_MEMORY_INIT is not set
1327# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1369# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1328# CONFIG_LATENCYTOP is not set 1370# CONFIG_LATENCYTOP is not set
@@ -1349,7 +1391,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1349# CONFIG_KEYS is not set 1391# CONFIG_KEYS is not set
1350# CONFIG_SECURITY is not set 1392# CONFIG_SECURITY is not set
1351# CONFIG_SECURITYFS is not set 1393# CONFIG_SECURITYFS is not set
1352# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1394# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1395# CONFIG_DEFAULT_SECURITY_SMACK is not set
1396# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1397CONFIG_DEFAULT_SECURITY_DAC=y
1398CONFIG_DEFAULT_SECURITY=""
1353CONFIG_XOR_BLOCKS=y 1399CONFIG_XOR_BLOCKS=y
1354CONFIG_ASYNC_CORE=y 1400CONFIG_ASYNC_CORE=y
1355CONFIG_ASYNC_MEMCPY=y 1401CONFIG_ASYNC_MEMCPY=y
diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h
index 22f738d12ad9..bbf89701d7a4 100644
--- a/arch/powerpc/include/asm/topology.h
+++ b/arch/powerpc/include/asm/topology.h
@@ -17,7 +17,9 @@ static inline int cpu_to_node(int cpu)
17 17
18#define parent_node(node) (node) 18#define parent_node(node) (node)
19 19
20#define cpumask_of_node(node) (&numa_cpumask_lookup_table[node]) 20#define cpumask_of_node(node) ((node) == -1 ? \
21 cpu_all_mask : \
22 &numa_cpumask_lookup_table[node])
21 23
22int of_node_to_nid(struct device_node *device); 24int of_node_to_nid(struct device_node *device);
23 25
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index 678f98cd5e64..3ef743fa5d7c 100644
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -542,11 +542,11 @@ DARFixed:/* Return from dcbx instruction bug workaround, r10 holds value of DAR
542FixupDAR:/* Entry point for dcbx workaround. */ 542FixupDAR:/* Entry point for dcbx workaround. */
543 /* fetch instruction from memory. */ 543 /* fetch instruction from memory. */
544 mfspr r10, SPRN_SRR0 544 mfspr r10, SPRN_SRR0
545 andis. r11, r10, 0x8000 /* Address >= 0x80000000 */
545 DO_8xx_CPU6(0x3780, r3) 546 DO_8xx_CPU6(0x3780, r3)
546 mtspr SPRN_MD_EPN, r10 547 mtspr SPRN_MD_EPN, r10
547 mfspr r11, SPRN_M_TWB /* Get level 1 table entry address */ 548 mfspr r11, SPRN_M_TWB /* Get level 1 table entry address */
548 cmplwi cr0, r11, 0x0800 549 beq- 3f /* Branch if user space */
549 blt- 3f /* Branch if user space */
550 lis r11, (swapper_pg_dir-PAGE_OFFSET)@h 550 lis r11, (swapper_pg_dir-PAGE_OFFSET)@h
551 ori r11, r11, (swapper_pg_dir-PAGE_OFFSET)@l 551 ori r11, r11, (swapper_pg_dir-PAGE_OFFSET)@l
552 rlwimi r11, r10, 32-20, 0xffc /* r11 = r11&~0xffc|(r10>>20)&0xffc */ 552 rlwimi r11, r10, 32-20, 0xffc /* r11 = r11&~0xffc|(r10>>20)&0xffc */
@@ -768,12 +768,12 @@ start_here:
768 */ 768 */
769initial_mmu: 769initial_mmu:
770 tlbia /* Invalidate all TLB entries */ 770 tlbia /* Invalidate all TLB entries */
771#ifdef CONFIG_PIN_TLB 771/* Always pin the first 8 MB ITLB to prevent ITLB
772 misses while mucking around with SRR0/SRR1 in asm
773*/
772 lis r8, MI_RSV4I@h 774 lis r8, MI_RSV4I@h
773 ori r8, r8, 0x1c00 775 ori r8, r8, 0x1c00
774#else 776
775 li r8, 0
776#endif
777 mtspr SPRN_MI_CTR, r8 /* Set instruction MMU control */ 777 mtspr SPRN_MI_CTR, r8 /* Set instruction MMU control */
778 778
779#ifdef CONFIG_PIN_TLB 779#ifdef CONFIG_PIN_TLB
diff --git a/arch/powerpc/kernel/rtas-proc.c b/arch/powerpc/kernel/rtas-proc.c
index 1be9fe38bcb5..8777fb02349f 100644
--- a/arch/powerpc/kernel/rtas-proc.c
+++ b/arch/powerpc/kernel/rtas-proc.c
@@ -262,19 +262,19 @@ static int __init proc_rtas_init(void)
262 if (rtas_node == NULL) 262 if (rtas_node == NULL)
263 return -ENODEV; 263 return -ENODEV;
264 264
265 proc_create("ppc64/rtas/progress", S_IRUGO|S_IWUSR, NULL, 265 proc_create("powerpc/rtas/progress", S_IRUGO|S_IWUSR, NULL,
266 &ppc_rtas_progress_operations); 266 &ppc_rtas_progress_operations);
267 proc_create("ppc64/rtas/clock", S_IRUGO|S_IWUSR, NULL, 267 proc_create("powerpc/rtas/clock", S_IRUGO|S_IWUSR, NULL,
268 &ppc_rtas_clock_operations); 268 &ppc_rtas_clock_operations);
269 proc_create("ppc64/rtas/poweron", S_IWUSR|S_IRUGO, NULL, 269 proc_create("powerpc/rtas/poweron", S_IWUSR|S_IRUGO, NULL,
270 &ppc_rtas_poweron_operations); 270 &ppc_rtas_poweron_operations);
271 proc_create("ppc64/rtas/sensors", S_IRUGO, NULL, 271 proc_create("powerpc/rtas/sensors", S_IRUGO, NULL,
272 &ppc_rtas_sensors_operations); 272 &ppc_rtas_sensors_operations);
273 proc_create("ppc64/rtas/frequency", S_IWUSR|S_IRUGO, NULL, 273 proc_create("powerpc/rtas/frequency", S_IWUSR|S_IRUGO, NULL,
274 &ppc_rtas_tone_freq_operations); 274 &ppc_rtas_tone_freq_operations);
275 proc_create("ppc64/rtas/volume", S_IWUSR|S_IRUGO, NULL, 275 proc_create("powerpc/rtas/volume", S_IWUSR|S_IRUGO, NULL,
276 &ppc_rtas_tone_volume_operations); 276 &ppc_rtas_tone_volume_operations);
277 proc_create("ppc64/rtas/rmo_buffer", S_IRUSR, NULL, 277 proc_create("powerpc/rtas/rmo_buffer", S_IRUSR, NULL,
278 &ppc_rtas_rmo_buf_ops); 278 &ppc_rtas_rmo_buf_ops);
279 return 0; 279 return 0;
280} 280}
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index a521fb8a40ee..c2ee14498077 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -619,4 +619,16 @@ void __cpu_die(unsigned int cpu)
619 if (smp_ops->cpu_die) 619 if (smp_ops->cpu_die)
620 smp_ops->cpu_die(cpu); 620 smp_ops->cpu_die(cpu);
621} 621}
622
623static DEFINE_MUTEX(powerpc_cpu_hotplug_driver_mutex);
624
625void cpu_hotplug_driver_lock()
626{
627 mutex_lock(&powerpc_cpu_hotplug_driver_mutex);
628}
629
630void cpu_hotplug_driver_unlock()
631{
632 mutex_unlock(&powerpc_cpu_hotplug_driver_mutex);
633}
622#endif 634#endif
diff --git a/arch/powerpc/kernel/swsusp_32.S b/arch/powerpc/kernel/swsusp_32.S
index b47d8ceffb52..b0754e237438 100644
--- a/arch/powerpc/kernel/swsusp_32.S
+++ b/arch/powerpc/kernel/swsusp_32.S
@@ -303,7 +303,7 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_HIGH_BATS)
303 lis r4,0x1000 303 lis r4,0x1000
3041: addic. r4,r4,-0x1000 3041: addic. r4,r4,-0x1000
305 tlbie r4 305 tlbie r4
306 blt 1b 306 bgt 1b
307 sync 307 sync
308 308
309 /* restore the MSR and turn on the MMU */ 309 /* restore the MSR and turn on the MMU */
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 9ba2cc88591d..6c6093d67f30 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -903,12 +903,21 @@ static void decrementer_set_mode(enum clock_event_mode mode,
903 decrementer_set_next_event(DECREMENTER_MAX, dev); 903 decrementer_set_next_event(DECREMENTER_MAX, dev);
904} 904}
905 905
906static inline uint64_t div_sc64(unsigned long ticks, unsigned long nsec,
907 int shift)
908{
909 uint64_t tmp = ((uint64_t)ticks) << shift;
910
911 do_div(tmp, nsec);
912 return tmp;
913}
914
906static void __init setup_clockevent_multiplier(unsigned long hz) 915static void __init setup_clockevent_multiplier(unsigned long hz)
907{ 916{
908 u64 mult, shift = 32; 917 u64 mult, shift = 32;
909 918
910 while (1) { 919 while (1) {
911 mult = div_sc(hz, NSEC_PER_SEC, shift); 920 mult = div_sc64(hz, NSEC_PER_SEC, shift);
912 if (mult && (mult >> 32UL) == 0UL) 921 if (mult && (mult >> 32UL) == 0UL)
913 break; 922 break;
914 923
diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
index 07703f72330e..6fb6e8aa3890 100644
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
@@ -53,7 +53,7 @@ config KVM_440
53 53
54config KVM_EXIT_TIMING 54config KVM_EXIT_TIMING
55 bool "Detailed exit timing" 55 bool "Detailed exit timing"
56 depends on KVM 56 depends on KVM_440 || KVM_E500
57 ---help--- 57 ---help---
58 Calculate elapsed time for every exit/enter cycle. A per-vcpu 58 Calculate elapsed time for every exit/enter cycle. A per-vcpu
59 report is available in debugfs kvm/vm#_vcpu#_timing. 59 report is available in debugfs kvm/vm#_vcpu#_timing.
diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c
index 0d957a4c70fe..5a783d8e8e8e 100644
--- a/arch/powerpc/mm/mmap_64.c
+++ b/arch/powerpc/mm/mmap_64.c
@@ -47,7 +47,7 @@ static inline int mmap_is_legacy(void)
47 if (current->personality & ADDR_COMPAT_LAYOUT) 47 if (current->personality & ADDR_COMPAT_LAYOUT)
48 return 1; 48 return 1;
49 49
50 if (current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY) 50 if (rlimit(RLIMIT_STACK) == RLIM_INFINITY)
51 return 1; 51 return 1;
52 52
53 return sysctl_legacy_va_layout; 53 return sysctl_legacy_va_layout;
@@ -77,7 +77,7 @@ static unsigned long mmap_rnd(void)
77 77
78static inline unsigned long mmap_base(void) 78static inline unsigned long mmap_base(void)
79{ 79{
80 unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur; 80 unsigned long gap = rlimit(RLIMIT_STACK);
81 81
82 if (gap < MIN_GAP) 82 if (gap < MIN_GAP)
83 gap = MIN_GAP; 83 gap = MIN_GAP;
diff --git a/arch/powerpc/platforms/cell/spufs/coredump.c b/arch/powerpc/platforms/cell/spufs/coredump.c
index c4d4a19235e0..eea120229cdb 100644
--- a/arch/powerpc/platforms/cell/spufs/coredump.c
+++ b/arch/powerpc/platforms/cell/spufs/coredump.c
@@ -54,7 +54,7 @@ static ssize_t do_coredump_read(int num, struct spu_context *ctx, void *buffer,
54 */ 54 */
55static int spufs_dump_write(struct file *file, const void *addr, int nr, loff_t *foffset) 55static int spufs_dump_write(struct file *file, const void *addr, int nr, loff_t *foffset)
56{ 56{
57 unsigned long limit = current->signal->rlim[RLIMIT_CORE].rlim_cur; 57 unsigned long limit = rlimit(RLIMIT_CORE);
58 ssize_t written; 58 ssize_t written;
59 59
60 if (*foffset + nr > limit) 60 if (*foffset + nr > limit)
diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c
index 657b72f68493..2aa8b5631beb 100644
--- a/arch/powerpc/platforms/iseries/vio.c
+++ b/arch/powerpc/platforms/iseries/vio.c
@@ -474,6 +474,8 @@ static void __init get_viotape_info(struct device_node *vio_root)
474 struct vio_waitevent we; 474 struct vio_waitevent we;
475 int ret; 475 int ret;
476 476
477 init_completion(&we.com);
478
477 ret = viopath_open(viopath_hostLp, viomajorsubtype_tape, 2); 479 ret = viopath_open(viopath_hostLp, viomajorsubtype_tape, 2);
478 if (ret) { 480 if (ret) {
479 printk(KERN_WARNING "get_viotape_info: " 481 printk(KERN_WARNING "get_viotape_info: "
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index 67b7a10f9fce..37bce52526da 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -236,7 +236,9 @@ static struct device_node *derive_parent(const char *path)
236 236
237int dlpar_attach_node(struct device_node *dn) 237int dlpar_attach_node(struct device_node *dn)
238{ 238{
239#ifdef CONFIG_PROC_DEVICETREE
239 struct proc_dir_entry *ent; 240 struct proc_dir_entry *ent;
241#endif
240 int rc; 242 int rc;
241 243
242 of_node_set_flag(dn, OF_DYNAMIC); 244 of_node_set_flag(dn, OF_DYNAMIC);
@@ -267,10 +269,10 @@ int dlpar_attach_node(struct device_node *dn)
267 269
268int dlpar_detach_node(struct device_node *dn) 270int dlpar_detach_node(struct device_node *dn)
269{ 271{
272#ifdef CONFIG_PROC_DEVICETREE
270 struct device_node *parent = dn->parent; 273 struct device_node *parent = dn->parent;
271 struct property *prop = dn->properties; 274 struct property *prop = dn->properties;
272 275
273#ifdef CONFIG_PROC_DEVICETREE
274 while (prop) { 276 while (prop) {
275 remove_proc_entry(prop->name, dn->pde); 277 remove_proc_entry(prop->name, dn->pde);
276 prop = prop->next; 278 prop = prop->next;
@@ -344,20 +346,6 @@ int dlpar_release_drc(u32 drc_index)
344 346
345#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE 347#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE
346 348
347static DEFINE_MUTEX(pseries_cpu_hotplug_mutex);
348
349void cpu_hotplug_driver_lock(void)
350__acquires(pseries_cpu_hotplug_mutex)
351{
352 mutex_lock(&pseries_cpu_hotplug_mutex);
353}
354
355void cpu_hotplug_driver_unlock(void)
356__releases(pseries_cpu_hotplug_mutex)
357{
358 mutex_unlock(&pseries_cpu_hotplug_mutex);
359}
360
361static int dlpar_online_cpu(struct device_node *dn) 349static int dlpar_online_cpu(struct device_node *dn)
362{ 350{
363 int rc = 0; 351 int rc = 0;
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index b9b9e11609ec..d80f193cd871 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -163,14 +163,13 @@ static inline void lpar_qirr_info(int n_cpu , u8 value)
163/* Interface to generic irq subsystem */ 163/* Interface to generic irq subsystem */
164 164
165#ifdef CONFIG_SMP 165#ifdef CONFIG_SMP
166static int get_irq_server(unsigned int virq, unsigned int strict_check) 166static int get_irq_server(unsigned int virq, cpumask_t cpumask,
167 unsigned int strict_check)
167{ 168{
168 int server; 169 int server;
169 /* For the moment only implement delivery to all cpus or one cpu */ 170 /* For the moment only implement delivery to all cpus or one cpu */
170 cpumask_t cpumask;
171 cpumask_t tmp = CPU_MASK_NONE; 171 cpumask_t tmp = CPU_MASK_NONE;
172 172
173 cpumask_copy(&cpumask, irq_to_desc(virq)->affinity);
174 if (!distribute_irqs) 173 if (!distribute_irqs)
175 return default_server; 174 return default_server;
176 175
@@ -192,7 +191,8 @@ static int get_irq_server(unsigned int virq, unsigned int strict_check)
192 return default_server; 191 return default_server;
193} 192}
194#else 193#else
195static int get_irq_server(unsigned int virq, unsigned int strict_check) 194static int get_irq_server(unsigned int virq, cpumask_t cpumask,
195 unsigned int strict_check)
196{ 196{
197 return default_server; 197 return default_server;
198} 198}
@@ -211,7 +211,7 @@ static void xics_unmask_irq(unsigned int virq)
211 if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS) 211 if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS)
212 return; 212 return;
213 213
214 server = get_irq_server(virq, 0); 214 server = get_irq_server(virq, *(irq_to_desc(virq)->affinity), 0);
215 215
216 call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server, 216 call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server,
217 DEFAULT_PRIORITY); 217 DEFAULT_PRIORITY);
@@ -405,7 +405,7 @@ static int xics_set_affinity(unsigned int virq, const struct cpumask *cpumask)
405 * For the moment only implement delivery to all cpus or one cpu. 405 * For the moment only implement delivery to all cpus or one cpu.
406 * Get current irq_server for the given irq 406 * Get current irq_server for the given irq
407 */ 407 */
408 irq_server = get_irq_server(virq, 1); 408 irq_server = get_irq_server(virq, *cpumask, 1);
409 if (irq_server == -1) { 409 if (irq_server == -1) {
410 char cpulist[128]; 410 char cpulist[128];
411 cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask); 411 cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);
diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h
index efb74fd5156e..b1066b9fb5f8 100644
--- a/arch/s390/include/asm/bug.h
+++ b/arch/s390/include/asm/bug.h
@@ -52,6 +52,10 @@
52 unreachable(); \ 52 unreachable(); \
53} while (0) 53} while (0)
54 54
55#define __WARN() do { \
56 __EMIT_BUG(BUGFLAG_WARNING); \
57} while (0)
58
55#define WARN_ON(x) ({ \ 59#define WARN_ON(x) ({ \
56 int __ret_warn_on = !!(x); \ 60 int __ret_warn_on = !!(x); \
57 if (__builtin_constant_p(__ret_warn_on)) { \ 61 if (__builtin_constant_p(__ret_warn_on)) { \
diff --git a/arch/s390/include/asm/irqflags.h b/arch/s390/include/asm/irqflags.h
index 3f26131120b7..c2fb432f576a 100644
--- a/arch/s390/include/asm/irqflags.h
+++ b/arch/s390/include/asm/irqflags.h
@@ -1,14 +1,12 @@
1/* 1/*
2 * include/asm-s390/irqflags.h 2 * Copyright IBM Corp. 2006,2010
3 * 3 * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
4 * Copyright (C) IBM Corp. 2006
5 * Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
6 */ 4 */
7 5
8#ifndef __ASM_IRQFLAGS_H 6#ifndef __ASM_IRQFLAGS_H
9#define __ASM_IRQFLAGS_H 7#define __ASM_IRQFLAGS_H
10 8
11#ifdef __KERNEL__ 9#include <linux/types.h>
12 10
13#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2) 11#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
14 12
@@ -102,5 +100,4 @@ static inline int raw_irqs_disabled_flags(unsigned long flags)
102/* For spinlocks etc */ 100/* For spinlocks etc */
103#define raw_local_irq_save(x) ((x) = raw_local_irq_disable()) 101#define raw_local_irq_save(x) ((x) = raw_local_irq_disable())
104 102
105#endif /* __KERNEL__ */
106#endif /* __ASM_IRQFLAGS_H */ 103#endif /* __ASM_IRQFLAGS_H */
diff --git a/arch/s390/include/asm/sigp.h b/arch/s390/include/asm/sigp.h
index ec403d4304f8..f72d611f7e13 100644
--- a/arch/s390/include/asm/sigp.h
+++ b/arch/s390/include/asm/sigp.h
@@ -15,11 +15,19 @@
15#ifndef __SIGP__ 15#ifndef __SIGP__
16#define __SIGP__ 16#define __SIGP__
17 17
18#include <asm/ptrace.h> 18#include <asm/system.h>
19#include <asm/atomic.h>
20 19
21/* get real cpu address from logical cpu number */ 20/* get real cpu address from logical cpu number */
22extern volatile int __cpu_logical_map[]; 21extern int __cpu_logical_map[];
22
23static inline int cpu_logical_map(int cpu)
24{
25#ifdef CONFIG_SMP
26 return __cpu_logical_map[cpu];
27#else
28 return stap();
29#endif
30}
23 31
24typedef enum 32typedef enum
25{ 33{
@@ -79,7 +87,7 @@ signal_processor(__u16 cpu_addr, sigp_order_code order_code)
79 " ipm %0\n" 87 " ipm %0\n"
80 " srl %0,28\n" 88 " srl %0,28\n"
81 : "=d" (ccode) 89 : "=d" (ccode)
82 : "d" (reg1), "d" (__cpu_logical_map[cpu_addr]), 90 : "d" (reg1), "d" (cpu_logical_map(cpu_addr)),
83 "a" (order_code) : "cc" , "memory"); 91 "a" (order_code) : "cc" , "memory");
84 return ccode; 92 return ccode;
85} 93}
@@ -98,7 +106,7 @@ signal_processor_p(__u32 parameter, __u16 cpu_addr, sigp_order_code order_code)
98 " ipm %0\n" 106 " ipm %0\n"
99 " srl %0,28\n" 107 " srl %0,28\n"
100 : "=d" (ccode) 108 : "=d" (ccode)
101 : "d" (reg1), "d" (__cpu_logical_map[cpu_addr]), 109 : "d" (reg1), "d" (cpu_logical_map(cpu_addr)),
102 "a" (order_code) : "cc" , "memory"); 110 "a" (order_code) : "cc" , "memory");
103 return ccode; 111 return ccode;
104} 112}
@@ -118,7 +126,7 @@ signal_processor_ps(__u32 *statusptr, __u32 parameter, __u16 cpu_addr,
118 " ipm %0\n" 126 " ipm %0\n"
119 " srl %0,28\n" 127 " srl %0,28\n"
120 : "=d" (ccode), "+d" (reg1) 128 : "=d" (ccode), "+d" (reg1)
121 : "d" (__cpu_logical_map[cpu_addr]), "a" (order_code) 129 : "d" (cpu_logical_map(cpu_addr)), "a" (order_code)
122 : "cc" , "memory"); 130 : "cc" , "memory");
123 *statusptr = reg1; 131 *statusptr = reg1;
124 return ccode; 132 return ccode;
diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h
index 07eb61b2fb3a..66069e736842 100644
--- a/arch/s390/include/asm/thread_info.h
+++ b/arch/s390/include/asm/thread_info.h
@@ -93,13 +93,12 @@ static inline struct thread_info *current_thread_info(void)
93#define TIF_SYSCALL_AUDIT 9 /* syscall auditing active */ 93#define TIF_SYSCALL_AUDIT 9 /* syscall auditing active */
94#define TIF_SECCOMP 10 /* secure computing */ 94#define TIF_SECCOMP 10 /* secure computing */
95#define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */ 95#define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
96#define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */ 96#define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling
97#define TIF_POLLING_NRFLAG 17 /* true if poll_idle() is polling
98 TIF_NEED_RESCHED */ 97 TIF_NEED_RESCHED */
99#define TIF_31BIT 18 /* 32bit process */ 98#define TIF_31BIT 17 /* 32bit process */
100#define TIF_MEMDIE 19 99#define TIF_MEMDIE 18
101#define TIF_RESTORE_SIGMASK 20 /* restore signal mask in do_signal() */ 100#define TIF_RESTORE_SIGMASK 19 /* restore signal mask in do_signal() */
102#define TIF_FREEZE 21 /* thread is freezing for suspend */ 101#define TIF_FREEZE 20 /* thread is freezing for suspend */
103 102
104#define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) 103#define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME)
105#define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK) 104#define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK)
@@ -112,7 +111,6 @@ static inline struct thread_info *current_thread_info(void)
112#define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT) 111#define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
113#define _TIF_SECCOMP (1<<TIF_SECCOMP) 112#define _TIF_SECCOMP (1<<TIF_SECCOMP)
114#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT) 113#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
115#define _TIF_USEDFPU (1<<TIF_USEDFPU)
116#define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) 114#define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
117#define _TIF_31BIT (1<<TIF_31BIT) 115#define _TIF_31BIT (1<<TIF_31BIT)
118#define _TIF_FREEZE (1<<TIF_FREEZE) 116#define _TIF_FREEZE (1<<TIF_FREEZE)
diff --git a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h
index 192a7203a14f..6e9f049fa823 100644
--- a/arch/s390/include/asm/unistd.h
+++ b/arch/s390/include/asm/unistd.h
@@ -269,8 +269,7 @@
269#define __NR_pwritev 329 269#define __NR_pwritev 329
270#define __NR_rt_tgsigqueueinfo 330 270#define __NR_rt_tgsigqueueinfo 330
271#define __NR_perf_event_open 331 271#define __NR_perf_event_open 331
272#define __NR_recvmmsg 332 272#define NR_syscalls 332
273#define NR_syscalls 333
274 273
275/* 274/*
276 * There are some system calls that are not present on 64 bit, some 275 * There are some system calls that are not present on 64 bit, some
@@ -377,6 +376,9 @@
377#define __IGNORE_migrate_pages 376#define __IGNORE_migrate_pages
378#define __IGNORE_move_pages 377#define __IGNORE_move_pages
379 378
379/* Ignore system calls that are also reachable via sys_socket */
380#define __IGNORE_recvmmsg
381
380#define __ARCH_WANT_IPC_PARSE_VERSION 382#define __ARCH_WANT_IPC_PARSE_VERSION
381#define __ARCH_WANT_OLD_READDIR 383#define __ARCH_WANT_OLD_READDIR
382#define __ARCH_WANT_SYS_ALARM 384#define __ARCH_WANT_SYS_ALARM
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 22c9e557bb22..11c3aba664ea 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -616,44 +616,35 @@ asmlinkage long sys32_fstatat64(unsigned int dfd, char __user *filename,
616 */ 616 */
617 617
618struct mmap_arg_struct_emu31 { 618struct mmap_arg_struct_emu31 {
619 u32 addr; 619 compat_ulong_t addr;
620 u32 len; 620 compat_ulong_t len;
621 u32 prot; 621 compat_ulong_t prot;
622 u32 flags; 622 compat_ulong_t flags;
623 u32 fd; 623 compat_ulong_t fd;
624 u32 offset; 624 compat_ulong_t offset;
625}; 625};
626 626
627asmlinkage unsigned long 627asmlinkage unsigned long old32_mmap(struct mmap_arg_struct_emu31 __user *arg)
628old32_mmap(struct mmap_arg_struct_emu31 __user *arg)
629{ 628{
630 struct mmap_arg_struct_emu31 a; 629 struct mmap_arg_struct_emu31 a;
631 int error = -EFAULT;
632 630
633 if (copy_from_user(&a, arg, sizeof(a))) 631 if (copy_from_user(&a, arg, sizeof(a)))
634 goto out; 632 return -EFAULT;
635
636 error = -EINVAL;
637 if (a.offset & ~PAGE_MASK) 633 if (a.offset & ~PAGE_MASK)
638 goto out; 634 return -EINVAL;
639 635 a.addr = (unsigned long) compat_ptr(a.addr);
640 error = sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd, 636 return sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd,
641 a.offset >> PAGE_SHIFT); 637 a.offset >> PAGE_SHIFT);
642out:
643 return error;
644} 638}
645 639
646asmlinkage long 640asmlinkage long sys32_mmap2(struct mmap_arg_struct_emu31 __user *arg)
647sys32_mmap2(struct mmap_arg_struct_emu31 __user *arg)
648{ 641{
649 struct mmap_arg_struct_emu31 a; 642 struct mmap_arg_struct_emu31 a;
650 int error = -EFAULT;
651 643
652 if (copy_from_user(&a, arg, sizeof(a))) 644 if (copy_from_user(&a, arg, sizeof(a)))
653 goto out; 645 return -EFAULT;
654 error = sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd, a.offset); 646 a.addr = (unsigned long) compat_ptr(a.addr);
655out: 647 return sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd, a.offset);
656 return error;
657} 648}
658 649
659asmlinkage long sys32_read(unsigned int fd, char __user * buf, size_t count) 650asmlinkage long sys32_read(unsigned int fd, char __user * buf, size_t count)
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index faeaccc7d7d9..30de2d0e52bb 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -1853,12 +1853,3 @@ sys32_execve_wrapper:
1853 llgtr %r3,%r3 # compat_uptr_t * 1853 llgtr %r3,%r3 # compat_uptr_t *
1854 llgtr %r4,%r4 # compat_uptr_t * 1854 llgtr %r4,%r4 # compat_uptr_t *
1855 jg sys32_execve # branch to system call 1855 jg sys32_execve # branch to system call
1856
1857 .globl compat_sys_recvmmsg_wrapper
1858compat_sys_recvmmsg_wrapper:
1859 lgfr %r2,%r2 # int
1860 llgtr %r3,%r3 # struct compat_mmsghdr *
1861 llgfr %r4,%r4 # unsigned int
1862 llgfr %r5,%r5 # unsigned int
1863 llgtr %r6,%r6 # struct compat_timespec *
1864 jg compat_sys_recvmmsg
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index 48215d15762b..e8ef21c51bbe 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -571,6 +571,7 @@ pgm_svcper:
571 mvc __THREAD_per+__PER_access_id(1,%r8),__LC_PER_ACCESS_ID 571 mvc __THREAD_per+__PER_access_id(1,%r8),__LC_PER_ACCESS_ID
572 oi __TI_flags+3(%r9),_TIF_SINGLE_STEP # set TIF_SINGLE_STEP 572 oi __TI_flags+3(%r9),_TIF_SINGLE_STEP # set TIF_SINGLE_STEP
573 TRACE_IRQS_ON 573 TRACE_IRQS_ON
574 lm %r2,%r6,SP_R2(%r15) # load svc arguments
574 stosm __SF_EMPTY(%r15),0x03 # reenable interrupts 575 stosm __SF_EMPTY(%r15),0x03 # reenable interrupts
575 b BASED(sysc_do_svc) 576 b BASED(sysc_do_svc)
576 577
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 9aff1d449b6e..f33658f09dd7 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -549,6 +549,7 @@ pgm_svcper:
549 mvc __THREAD_per+__PER_access_id(1,%r8),__LC_PER_ACCESS_ID 549 mvc __THREAD_per+__PER_access_id(1,%r8),__LC_PER_ACCESS_ID
550 oi __TI_flags+7(%r9),_TIF_SINGLE_STEP # set TIF_SINGLE_STEP 550 oi __TI_flags+7(%r9),_TIF_SINGLE_STEP # set TIF_SINGLE_STEP
551 TRACE_IRQS_ON 551 TRACE_IRQS_ON
552 lmg %r2,%r6,SP_R2(%r15) # load svc arguments
552 stosm __SF_EMPTY(%r15),0x03 # reenable interrupts 553 stosm __SF_EMPTY(%r15),0x03 # reenable interrupts
553 j sysc_do_svc 554 j sysc_do_svc
554 555
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index 5417eb57271a..00b6d1d292f2 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -153,8 +153,6 @@ void exit_thread(void)
153 153
154void flush_thread(void) 154void flush_thread(void)
155{ 155{
156 clear_used_math();
157 clear_tsk_thread_flag(current, TIF_USEDFPU);
158} 156}
159 157
160void release_thread(struct task_struct *dead_task) 158void release_thread(struct task_struct *dead_task)
@@ -217,6 +215,7 @@ int copy_thread(unsigned long clone_flags, unsigned long new_stackp,
217 p->thread.mm_segment = get_fs(); 215 p->thread.mm_segment = get_fs();
218 /* Don't copy debug registers */ 216 /* Don't copy debug registers */
219 memset(&p->thread.per_info, 0, sizeof(p->thread.per_info)); 217 memset(&p->thread.per_info, 0, sizeof(p->thread.per_info));
218 clear_tsk_thread_flag(p, TIF_SINGLE_STEP);
220 /* Initialize per thread user and system timer values */ 219 /* Initialize per thread user and system timer values */
221 ti = task_thread_info(p); 220 ti = task_thread_info(p);
222 ti->user_timer = 0; 221 ti->user_timer = 0;
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 13815d39f7dd..7cf464234419 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -65,6 +65,7 @@ FixPerRegisters(struct task_struct *task)
65{ 65{
66 struct pt_regs *regs; 66 struct pt_regs *regs;
67 per_struct *per_info; 67 per_struct *per_info;
68 per_cr_words cr_words;
68 69
69 regs = task_pt_regs(task); 70 regs = task_pt_regs(task);
70 per_info = (per_struct *) &task->thread.per_info; 71 per_info = (per_struct *) &task->thread.per_info;
@@ -98,6 +99,13 @@ FixPerRegisters(struct task_struct *task)
98 per_info->control_regs.bits.storage_alt_space_ctl = 1; 99 per_info->control_regs.bits.storage_alt_space_ctl = 1;
99 else 100 else
100 per_info->control_regs.bits.storage_alt_space_ctl = 0; 101 per_info->control_regs.bits.storage_alt_space_ctl = 0;
102
103 if (task == current) {
104 __ctl_store(cr_words, 9, 11);
105 if (memcmp(&cr_words, &per_info->control_regs.words,
106 sizeof(cr_words)) != 0)
107 __ctl_load(per_info->control_regs.words, 9, 11);
108 }
101} 109}
102 110
103void user_enable_single_step(struct task_struct *task) 111void user_enable_single_step(struct task_struct *task)
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 0663287fa1b3..8d8957b38ab3 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -87,7 +87,6 @@ unsigned long elf_hwcap = 0;
87char elf_platform[ELF_PLATFORM_SIZE]; 87char elf_platform[ELF_PLATFORM_SIZE];
88 88
89struct mem_chunk __initdata memory_chunk[MEMORY_CHUNKS]; 89struct mem_chunk __initdata memory_chunk[MEMORY_CHUNKS];
90volatile int __cpu_logical_map[NR_CPUS]; /* logical cpu to cpu address */
91 90
92int __initdata memory_end_set; 91int __initdata memory_end_set;
93unsigned long __initdata memory_end; 92unsigned long __initdata memory_end;
@@ -124,12 +123,6 @@ void __cpuinit cpu_init(void)
124 */ 123 */
125 get_cpu_id(&S390_lowcore.cpu_id); 124 get_cpu_id(&S390_lowcore.cpu_id);
126 125
127 /*
128 * Force FPU initialization:
129 */
130 clear_thread_flag(TIF_USEDFPU);
131 clear_used_math();
132
133 atomic_inc(&init_mm.mm_count); 126 atomic_inc(&init_mm.mm_count);
134 current->active_mm = &init_mm; 127 current->active_mm = &init_mm;
135 BUG_ON(current->mm); 128 BUG_ON(current->mm);
@@ -855,7 +848,6 @@ setup_arch(char **cmdline_p)
855 setup_lowcore(); 848 setup_lowcore();
856 849
857 cpu_init(); 850 cpu_init();
858 __cpu_logical_map[0] = stap();
859 s390_init_cpu_topology(); 851 s390_init_cpu_topology();
860 852
861 /* 853 /*
diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c
index 6b4fef877f9d..6289945562b0 100644
--- a/arch/s390/kernel/signal.c
+++ b/arch/s390/kernel/signal.c
@@ -64,7 +64,7 @@ SYSCALL_DEFINE3(sigsuspend, int, history0, int, history1, old_sigset_t, mask)
64 recalc_sigpending(); 64 recalc_sigpending();
65 spin_unlock_irq(&current->sighand->siglock); 65 spin_unlock_irq(&current->sighand->siglock);
66 66
67 current->state = TASK_INTERRUPTIBLE; 67 set_current_state(TASK_INTERRUPTIBLE);
68 schedule(); 68 schedule();
69 set_thread_flag(TIF_RESTORE_SIGMASK); 69 set_thread_flag(TIF_RESTORE_SIGMASK);
70 70
@@ -500,18 +500,10 @@ void do_signal(struct pt_regs *regs)
500 clear_thread_flag(TIF_RESTORE_SIGMASK); 500 clear_thread_flag(TIF_RESTORE_SIGMASK);
501 501
502 /* 502 /*
503 * If we would have taken a single-step trap
504 * for a normal instruction, act like we took
505 * one for the handler setup.
506 */
507 if (current->thread.per_info.single_step)
508 set_thread_flag(TIF_SINGLE_STEP);
509
510 /*
511 * Let tracing know that we've done the handler setup. 503 * Let tracing know that we've done the handler setup.
512 */ 504 */
513 tracehook_signal_handler(signr, &info, &ka, regs, 505 tracehook_signal_handler(signr, &info, &ka, regs,
514 test_thread_flag(TIF_SINGLE_STEP)); 506 current->thread.per_info.single_step);
515 } 507 }
516 return; 508 return;
517 } 509 }
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 93e52039321b..76a6fdd46c45 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -52,6 +52,9 @@
52#include <asm/cpu.h> 52#include <asm/cpu.h>
53#include "entry.h" 53#include "entry.h"
54 54
55/* logical cpu to cpu address */
56int __cpu_logical_map[NR_CPUS];
57
55static struct task_struct *current_set[NR_CPUS]; 58static struct task_struct *current_set[NR_CPUS];
56 59
57static u8 smp_cpu_type; 60static u8 smp_cpu_type;
@@ -717,6 +720,12 @@ void __init smp_cpus_done(unsigned int max_cpus)
717{ 720{
718} 721}
719 722
723void __init smp_setup_processor_id(void)
724{
725 S390_lowcore.cpu_nr = 0;
726 __cpu_logical_map[0] = stap();
727}
728
720/* 729/*
721 * the frequency of the profiling timer can be changed 730 * the frequency of the profiling timer can be changed
722 * by writing a multiplier value into /proc/profile. 731 * by writing a multiplier value into /proc/profile.
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S
index 4f292c936872..30eca070d426 100644
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
@@ -340,4 +340,3 @@ SYSCALL(sys_preadv,sys_preadv,compat_sys_preadv_wrapper)
340SYSCALL(sys_pwritev,sys_pwritev,compat_sys_pwritev_wrapper) 340SYSCALL(sys_pwritev,sys_pwritev,compat_sys_pwritev_wrapper)
341SYSCALL(sys_rt_tgsigqueueinfo,sys_rt_tgsigqueueinfo,compat_sys_rt_tgsigqueueinfo_wrapper) /* 330 */ 341SYSCALL(sys_rt_tgsigqueueinfo,sys_rt_tgsigqueueinfo,compat_sys_rt_tgsigqueueinfo_wrapper) /* 330 */
342SYSCALL(sys_perf_event_open,sys_perf_event_open,sys_perf_event_open_wrapper) 342SYSCALL(sys_perf_event_open,sys_perf_event_open,sys_perf_event_open_wrapper)
343SYSCALL(sys_recvmmsg,sys_recvmmsg,compat_sys_recvmmsg_wrapper)
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 3c72c9cf22b6..14ef6f05e432 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -114,7 +114,7 @@ static void add_cpus_to_core(struct tl_cpu *tl_cpu, struct core_info *core)
114 114
115 rcpu = CPU_BITS - 1 - cpu + tl_cpu->origin; 115 rcpu = CPU_BITS - 1 - cpu + tl_cpu->origin;
116 for_each_present_cpu(lcpu) { 116 for_each_present_cpu(lcpu) {
117 if (__cpu_logical_map[lcpu] == rcpu) { 117 if (cpu_logical_map(lcpu) == rcpu) {
118 cpu_set(lcpu, core->mask); 118 cpu_set(lcpu, core->mask);
119 smp_cpu_polarization[lcpu] = tl_cpu->pp; 119 smp_cpu_polarization[lcpu] = tl_cpu->pp;
120 } 120 }
diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
index ba9d8a7bc1ac..b40096494e46 100644
--- a/arch/s390/kvm/intercept.c
+++ b/arch/s390/kvm/intercept.c
@@ -213,7 +213,7 @@ static int handle_instruction_and_prog(struct kvm_vcpu *vcpu)
213 return rc2; 213 return rc2;
214} 214}
215 215
216static const intercept_handler_t intercept_funcs[0x48 >> 2] = { 216static const intercept_handler_t intercept_funcs[] = {
217 [0x00 >> 2] = handle_noop, 217 [0x00 >> 2] = handle_noop,
218 [0x04 >> 2] = handle_instruction, 218 [0x04 >> 2] = handle_instruction,
219 [0x08 >> 2] = handle_prog, 219 [0x08 >> 2] = handle_prog,
@@ -230,7 +230,7 @@ int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu)
230 intercept_handler_t func; 230 intercept_handler_t func;
231 u8 code = vcpu->arch.sie_block->icptcode; 231 u8 code = vcpu->arch.sie_block->icptcode;
232 232
233 if (code & 3 || code > 0x48) 233 if (code & 3 || (code >> 2) >= ARRAY_SIZE(intercept_funcs))
234 return -ENOTSUPP; 234 return -ENOTSUPP;
235 func = intercept_funcs[code >> 2]; 235 func = intercept_funcs[code >> 2];
236 if (func) 236 if (func)
diff --git a/arch/s390/lib/spinlock.c b/arch/s390/lib/spinlock.c
index 10754a375668..cff327f109a8 100644
--- a/arch/s390/lib/spinlock.c
+++ b/arch/s390/lib/spinlock.c
@@ -34,7 +34,7 @@ static inline void _raw_yield_cpu(int cpu)
34{ 34{
35 if (MACHINE_HAS_DIAG9C) 35 if (MACHINE_HAS_DIAG9C)
36 asm volatile("diag %0,0,0x9c" 36 asm volatile("diag %0,0,0x9c"
37 : : "d" (__cpu_logical_map[cpu])); 37 : : "d" (cpu_logical_map(cpu)));
38 else 38 else
39 _raw_yield(); 39 _raw_yield();
40} 40}
diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
index f4558ccf02b9..869efbaed3ea 100644
--- a/arch/s390/mm/mmap.c
+++ b/arch/s390/mm/mmap.c
@@ -40,7 +40,7 @@
40 40
41static inline unsigned long mmap_base(void) 41static inline unsigned long mmap_base(void)
42{ 42{
43 unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur; 43 unsigned long gap = rlimit(RLIMIT_STACK);
44 44
45 if (gap < MIN_GAP) 45 if (gap < MIN_GAP)
46 gap = MIN_GAP; 46 gap = MIN_GAP;
@@ -61,7 +61,7 @@ static inline int mmap_is_legacy(void)
61#endif 61#endif
62 return sysctl_legacy_va_layout || 62 return sysctl_legacy_va_layout ||
63 (current->personality & ADDR_COMPAT_LAYOUT) || 63 (current->personality & ADDR_COMPAT_LAYOUT) ||
64 current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY; 64 rlimit(RLIMIT_STACK) == RLIM_INFINITY;
65} 65}
66 66
67#ifndef CONFIG_64BIT 67#ifndef CONFIG_64BIT
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 6a8861b39f05..5c246289b4f0 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -353,6 +353,10 @@ static struct i2c_board_info i2c1_devices[] = {
353 { 353 {
354 I2C_BOARD_INFO("r2025sd", 0x32), 354 I2C_BOARD_INFO("r2025sd", 0x32),
355 }, 355 },
356 {
357 I2C_BOARD_INFO("lis3lv02d", 0x1c),
358 .irq = 33,
359 }
356}; 360};
357 361
358/* KEYSC */ 362/* KEYSC */
@@ -1115,6 +1119,10 @@ static int __init arch_setup(void)
1115 gpio_direction_output(GPIO_PTU0, 0); 1119 gpio_direction_output(GPIO_PTU0, 0);
1116 mdelay(20); 1120 mdelay(20);
1117 1121
1122 /* enable motion sensor */
1123 gpio_request(GPIO_FN_INTC_IRQ1, NULL);
1124 gpio_direction_input(GPIO_FN_INTC_IRQ1);
1125
1118 /* enable I2C device */ 1126 /* enable I2C device */
1119 i2c_register_board_info(0, i2c0_devices, 1127 i2c_register_board_info(0, i2c0_devices,
1120 ARRAY_SIZE(i2c0_devices)); 1128 ARRAY_SIZE(i2c0_devices));
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 5d0f70b46c97..858ecb25d469 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -533,7 +533,7 @@ static int __init sh_eth_is_eeprom_ready(void)
533 while (t--) { 533 while (t--) {
534 if (!ctrl_inw(EEPROM_STAT)) 534 if (!ctrl_inw(EEPROM_STAT))
535 return 1; 535 return 1;
536 cpu_relax(); 536 udelay(1);
537 } 537 }
538 538
539 printk(KERN_ERR "ms7724se can not access to eeprom\n"); 539 printk(KERN_ERR "ms7724se can not access to eeprom\n");
diff --git a/arch/sh/include/asm/unistd_32.h b/arch/sh/include/asm/unistd_32.h
index f18c4f9baf27..365744b05269 100644
--- a/arch/sh/include/asm/unistd_32.h
+++ b/arch/sh/include/asm/unistd_32.h
@@ -345,12 +345,13 @@
345#define __NR_pwritev 334 345#define __NR_pwritev 334
346#define __NR_rt_tgsigqueueinfo 335 346#define __NR_rt_tgsigqueueinfo 335
347#define __NR_perf_event_open 336 347#define __NR_perf_event_open 336
348#define __NR_recvmmsg 337
349 348
350#define NR_syscalls 338 349#define NR_syscalls 337
351 350
352#ifdef __KERNEL__ 351#ifdef __KERNEL__
353 352
353#define __IGNORE_recvmmsg
354
354#define __ARCH_WANT_IPC_PARSE_VERSION 355#define __ARCH_WANT_IPC_PARSE_VERSION
355#define __ARCH_WANT_OLD_READDIR 356#define __ARCH_WANT_OLD_READDIR
356#define __ARCH_WANT_OLD_STAT 357#define __ARCH_WANT_OLD_STAT
diff --git a/arch/sh/include/asm/unistd_64.h b/arch/sh/include/asm/unistd_64.h
index 3e7645d11130..25de158aac3a 100644
--- a/arch/sh/include/asm/unistd_64.h
+++ b/arch/sh/include/asm/unistd_64.h
@@ -386,10 +386,11 @@
386#define __NR_rt_tgsigqueueinfo 363 386#define __NR_rt_tgsigqueueinfo 363
387#define __NR_perf_event_open 364 387#define __NR_perf_event_open 364
388#define __NR_recvmmsg 365 388#define __NR_recvmmsg 365
389#define __NR_accept4 366
389 390
390#ifdef __KERNEL__ 391#ifdef __KERNEL__
391 392
392#define NR_syscalls 366 393#define NR_syscalls 367
393 394
394#define __ARCH_WANT_IPC_PARSE_VERSION 395#define __ARCH_WANT_IPC_PARSE_VERSION
395#define __ARCH_WANT_OLD_READDIR 396#define __ARCH_WANT_OLD_READDIR
diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c
index 31f80c61b031..ec79faf6f021 100644
--- a/arch/sh/kernel/process_64.c
+++ b/arch/sh/kernel/process_64.c
@@ -368,7 +368,7 @@ void exit_thread(void)
368void flush_thread(void) 368void flush_thread(void)
369{ 369{
370 370
371 /* Called by fs/exec.c (flush_old_exec) to remove traces of a 371 /* Called by fs/exec.c (setup_new_exec) to remove traces of a
372 * previously running executable. */ 372 * previously running executable. */
373#ifdef CONFIG_SH_FPU 373#ifdef CONFIG_SH_FPU
374 if (last_task_used_math == current) { 374 if (last_task_used_math == current) {
diff --git a/arch/sh/kernel/syscalls_32.S b/arch/sh/kernel/syscalls_32.S
index 4bd5a1146956..19fd11dd9871 100644
--- a/arch/sh/kernel/syscalls_32.S
+++ b/arch/sh/kernel/syscalls_32.S
@@ -353,4 +353,3 @@ ENTRY(sys_call_table)
353 .long sys_pwritev 353 .long sys_pwritev
354 .long sys_rt_tgsigqueueinfo /* 335 */ 354 .long sys_rt_tgsigqueueinfo /* 335 */
355 .long sys_perf_event_open 355 .long sys_perf_event_open
356 .long sys_recvmmsg
diff --git a/arch/sh/kernel/syscalls_64.S b/arch/sh/kernel/syscalls_64.S
index 07d2aaea9ae8..2048a20d7c80 100644
--- a/arch/sh/kernel/syscalls_64.S
+++ b/arch/sh/kernel/syscalls_64.S
@@ -392,3 +392,4 @@ sys_call_table:
392 .long sys_rt_tgsigqueueinfo 392 .long sys_rt_tgsigqueueinfo
393 .long sys_perf_event_open 393 .long sys_perf_event_open
394 .long sys_recvmmsg /* 365 */ 394 .long sys_recvmmsg /* 365 */
395 .long sys_accept4
diff --git a/arch/sh/tools/Makefile b/arch/sh/tools/Makefile
index 558a56bcc7cf..2082af1f3fef 100644
--- a/arch/sh/tools/Makefile
+++ b/arch/sh/tools/Makefile
@@ -13,4 +13,4 @@
13include/generated/machtypes.h: $(src)/gen-mach-types $(src)/mach-types 13include/generated/machtypes.h: $(src)/gen-mach-types $(src)/mach-types
14 @echo ' Generating $@' 14 @echo ' Generating $@'
15 $(Q)mkdir -p $(dir $@) 15 $(Q)mkdir -p $(dir $@)
16 $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; } 16 $(Q)LC_ALL=C $(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 108197ac0d56..4097f6a10860 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -64,8 +64,11 @@ config BITS
64 default 64 if SPARC64 64 default 64 if SPARC64
65 65
66config GENERIC_TIME 66config GENERIC_TIME
67 def_bool y
68
69config ARCH_USES_GETTIMEOFFSET
67 bool 70 bool
68 default y if SPARC64 71 default y if SPARC32
69 72
70config GENERIC_CMOS_UPDATE 73config GENERIC_CMOS_UPDATE
71 bool 74 bool
diff --git a/arch/sparc/configs/sparc32_defconfig b/arch/sparc/configs/sparc32_defconfig
index 983d59824a28..99a1f191497b 100644
--- a/arch/sparc/configs/sparc32_defconfig
+++ b/arch/sparc/configs/sparc32_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.31 3# Linux kernel version: 2.6.33-rc2
4# Wed Sep 16 00:03:43 2009 4# Mon Jan 11 23:20:31 2010
5# 5#
6# CONFIG_64BIT is not set 6# CONFIG_64BIT is not set
7CONFIG_SPARC=y 7CONFIG_SPARC=y
@@ -41,6 +41,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
41# 41#
42CONFIG_TREE_RCU=y 42CONFIG_TREE_RCU=y
43# CONFIG_TREE_PREEMPT_RCU is not set 43# CONFIG_TREE_PREEMPT_RCU is not set
44# CONFIG_TINY_RCU is not set
44# CONFIG_RCU_TRACE is not set 45# CONFIG_RCU_TRACE is not set
45CONFIG_RCU_FANOUT=32 46CONFIG_RCU_FANOUT=32
46# CONFIG_RCU_FANOUT_EXACT is not set 47# CONFIG_RCU_FANOUT_EXACT is not set
@@ -88,21 +89,21 @@ CONFIG_TIMERFD=y
88CONFIG_EVENTFD=y 89CONFIG_EVENTFD=y
89CONFIG_SHMEM=y 90CONFIG_SHMEM=y
90CONFIG_AIO=y 91CONFIG_AIO=y
91CONFIG_HAVE_PERF_COUNTERS=y 92CONFIG_HAVE_PERF_EVENTS=y
93CONFIG_PERF_USE_VMALLOC=y
92 94
93# 95#
94# Performance Counters 96# Kernel Performance Events And Counters
95# 97#
98# CONFIG_PERF_EVENTS is not set
96# CONFIG_PERF_COUNTERS is not set 99# CONFIG_PERF_COUNTERS is not set
97CONFIG_VM_EVENT_COUNTERS=y 100CONFIG_VM_EVENT_COUNTERS=y
98CONFIG_PCI_QUIRKS=y 101CONFIG_PCI_QUIRKS=y
99# CONFIG_STRIP_ASM_SYMS is not set
100CONFIG_COMPAT_BRK=y 102CONFIG_COMPAT_BRK=y
101CONFIG_SLAB=y 103CONFIG_SLAB=y
102# CONFIG_SLUB is not set 104# CONFIG_SLUB is not set
103# CONFIG_SLOB is not set 105# CONFIG_SLOB is not set
104# CONFIG_PROFILING is not set 106# CONFIG_PROFILING is not set
105# CONFIG_MARKERS is not set
106CONFIG_HAVE_OPROFILE=y 107CONFIG_HAVE_OPROFILE=y
107CONFIG_HAVE_ARCH_TRACEHOOK=y 108CONFIG_HAVE_ARCH_TRACEHOOK=y
108CONFIG_HAVE_DMA_ATTRS=y 109CONFIG_HAVE_DMA_ATTRS=y
@@ -131,14 +132,41 @@ CONFIG_LBDAF=y
131# IO Schedulers 132# IO Schedulers
132# 133#
133CONFIG_IOSCHED_NOOP=y 134CONFIG_IOSCHED_NOOP=y
134CONFIG_IOSCHED_AS=y
135CONFIG_IOSCHED_DEADLINE=y 135CONFIG_IOSCHED_DEADLINE=y
136CONFIG_IOSCHED_CFQ=y 136CONFIG_IOSCHED_CFQ=y
137# CONFIG_DEFAULT_AS is not set
138# CONFIG_DEFAULT_DEADLINE is not set 137# CONFIG_DEFAULT_DEADLINE is not set
139CONFIG_DEFAULT_CFQ=y 138CONFIG_DEFAULT_CFQ=y
140# CONFIG_DEFAULT_NOOP is not set 139# CONFIG_DEFAULT_NOOP is not set
141CONFIG_DEFAULT_IOSCHED="cfq" 140CONFIG_DEFAULT_IOSCHED="cfq"
141# CONFIG_INLINE_SPIN_TRYLOCK is not set
142# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
143# CONFIG_INLINE_SPIN_LOCK is not set
144# CONFIG_INLINE_SPIN_LOCK_BH is not set
145# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
146# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
147CONFIG_INLINE_SPIN_UNLOCK=y
148# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
149CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
150# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
151# CONFIG_INLINE_READ_TRYLOCK is not set
152# CONFIG_INLINE_READ_LOCK is not set
153# CONFIG_INLINE_READ_LOCK_BH is not set
154# CONFIG_INLINE_READ_LOCK_IRQ is not set
155# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
156CONFIG_INLINE_READ_UNLOCK=y
157# CONFIG_INLINE_READ_UNLOCK_BH is not set
158CONFIG_INLINE_READ_UNLOCK_IRQ=y
159# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
160# CONFIG_INLINE_WRITE_TRYLOCK is not set
161# CONFIG_INLINE_WRITE_LOCK is not set
162# CONFIG_INLINE_WRITE_LOCK_BH is not set
163# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
164# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
165CONFIG_INLINE_WRITE_UNLOCK=y
166# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
167CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
168# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
169# CONFIG_MUTEX_SPIN_ON_OWNER is not set
142# CONFIG_FREEZER is not set 170# CONFIG_FREEZER is not set
143 171
144# 172#
@@ -168,8 +196,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
168# CONFIG_PHYS_ADDR_T_64BIT is not set 196# CONFIG_PHYS_ADDR_T_64BIT is not set
169CONFIG_ZONE_DMA_FLAG=1 197CONFIG_ZONE_DMA_FLAG=1
170CONFIG_BOUNCE=y 198CONFIG_BOUNCE=y
171CONFIG_HAVE_MLOCK=y 199# CONFIG_KSM is not set
172CONFIG_HAVE_MLOCKED_PAGE_BIT=y
173CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 200CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
174CONFIG_SUN_PM=y 201CONFIG_SUN_PM=y
175# CONFIG_SPARC_LED is not set 202# CONFIG_SPARC_LED is not set
@@ -257,6 +284,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
257CONFIG_INET6_XFRM_MODE_BEET=m 284CONFIG_INET6_XFRM_MODE_BEET=m
258# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 285# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
259CONFIG_IPV6_SIT=m 286CONFIG_IPV6_SIT=m
287# CONFIG_IPV6_SIT_6RD is not set
260CONFIG_IPV6_NDISC_NODETYPE=y 288CONFIG_IPV6_NDISC_NODETYPE=y
261CONFIG_IPV6_TUNNEL=m 289CONFIG_IPV6_TUNNEL=m
262# CONFIG_IPV6_MULTIPLE_TABLES is not set 290# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -295,9 +323,6 @@ CONFIG_NET_PKTGEN=m
295# CONFIG_AF_RXRPC is not set 323# CONFIG_AF_RXRPC is not set
296CONFIG_WIRELESS=y 324CONFIG_WIRELESS=y
297# CONFIG_CFG80211 is not set 325# CONFIG_CFG80211 is not set
298CONFIG_CFG80211_DEFAULT_PS_VALUE=0
299CONFIG_WIRELESS_OLD_REGULATORY=y
300# CONFIG_WIRELESS_EXT is not set
301# CONFIG_LIB80211 is not set 326# CONFIG_LIB80211 is not set
302 327
303# 328#
@@ -335,6 +360,10 @@ CONFIG_BLK_DEV=y
335# CONFIG_BLK_DEV_COW_COMMON is not set 360# CONFIG_BLK_DEV_COW_COMMON is not set
336CONFIG_BLK_DEV_LOOP=m 361CONFIG_BLK_DEV_LOOP=m
337CONFIG_BLK_DEV_CRYPTOLOOP=m 362CONFIG_BLK_DEV_CRYPTOLOOP=m
363
364#
365# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
366#
338# CONFIG_BLK_DEV_NBD is not set 367# CONFIG_BLK_DEV_NBD is not set
339# CONFIG_BLK_DEV_SX8 is not set 368# CONFIG_BLK_DEV_SX8 is not set
340CONFIG_BLK_DEV_RAM=y 369CONFIG_BLK_DEV_RAM=y
@@ -398,8 +427,11 @@ CONFIG_SCSI_LOWLEVEL=y
398# CONFIG_ISCSI_TCP is not set 427# CONFIG_ISCSI_TCP is not set
399# CONFIG_SCSI_CXGB3_ISCSI is not set 428# CONFIG_SCSI_CXGB3_ISCSI is not set
400# CONFIG_SCSI_BNX2_ISCSI is not set 429# CONFIG_SCSI_BNX2_ISCSI is not set
430# CONFIG_BE2ISCSI is not set
401# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 431# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
432# CONFIG_SCSI_HPSA is not set
402# CONFIG_SCSI_3W_9XXX is not set 433# CONFIG_SCSI_3W_9XXX is not set
434# CONFIG_SCSI_3W_SAS is not set
403# CONFIG_SCSI_ACARD is not set 435# CONFIG_SCSI_ACARD is not set
404# CONFIG_SCSI_AACRAID is not set 436# CONFIG_SCSI_AACRAID is not set
405# CONFIG_SCSI_AIC7XXX is not set 437# CONFIG_SCSI_AIC7XXX is not set
@@ -434,7 +466,9 @@ CONFIG_SCSI_QLOGICPTI=m
434# CONFIG_SCSI_DEBUG is not set 466# CONFIG_SCSI_DEBUG is not set
435CONFIG_SCSI_SUNESP=y 467CONFIG_SCSI_SUNESP=y
436# CONFIG_SCSI_PMCRAID is not set 468# CONFIG_SCSI_PMCRAID is not set
469# CONFIG_SCSI_PM8001 is not set
437# CONFIG_SCSI_SRP is not set 470# CONFIG_SCSI_SRP is not set
471# CONFIG_SCSI_BFA_FC is not set
438# CONFIG_SCSI_DH is not set 472# CONFIG_SCSI_DH is not set
439# CONFIG_SCSI_OSD_INITIATOR is not set 473# CONFIG_SCSI_OSD_INITIATOR is not set
440# CONFIG_ATA is not set 474# CONFIG_ATA is not set
@@ -450,7 +484,7 @@ CONFIG_SCSI_SUNESP=y
450# 484#
451 485
452# 486#
453# See the help texts for more information. 487# The newer stack is recommended.
454# 488#
455# CONFIG_FIREWIRE is not set 489# CONFIG_FIREWIRE is not set
456# CONFIG_IEEE1394 is not set 490# CONFIG_IEEE1394 is not set
@@ -487,6 +521,7 @@ CONFIG_SUNQE=m
487# CONFIG_NET_PCI is not set 521# CONFIG_NET_PCI is not set
488# CONFIG_B44 is not set 522# CONFIG_B44 is not set
489# CONFIG_KS8842 is not set 523# CONFIG_KS8842 is not set
524# CONFIG_KS8851_MLL is not set
490# CONFIG_ATL2 is not set 525# CONFIG_ATL2 is not set
491CONFIG_NETDEV_1000=y 526CONFIG_NETDEV_1000=y
492# CONFIG_ACENIC is not set 527# CONFIG_ACENIC is not set
@@ -546,6 +581,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
546# CONFIG_NETCONSOLE is not set 581# CONFIG_NETCONSOLE is not set
547# CONFIG_NETPOLL is not set 582# CONFIG_NETPOLL is not set
548# CONFIG_NET_POLL_CONTROLLER is not set 583# CONFIG_NET_POLL_CONTROLLER is not set
584# CONFIG_VMXNET3 is not set
549# CONFIG_ISDN is not set 585# CONFIG_ISDN is not set
550# CONFIG_PHONE is not set 586# CONFIG_PHONE is not set
551 587
@@ -555,6 +591,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
555CONFIG_INPUT=y 591CONFIG_INPUT=y
556# CONFIG_INPUT_FF_MEMLESS is not set 592# CONFIG_INPUT_FF_MEMLESS is not set
557# CONFIG_INPUT_POLLDEV is not set 593# CONFIG_INPUT_POLLDEV is not set
594# CONFIG_INPUT_SPARSEKMAP is not set
558 595
559# 596#
560# Userland interfaces 597# Userland interfaces
@@ -574,6 +611,7 @@ CONFIG_INPUT_KEYBOARD=y
574CONFIG_KEYBOARD_ATKBD=m 611CONFIG_KEYBOARD_ATKBD=m
575# CONFIG_KEYBOARD_LKKBD is not set 612# CONFIG_KEYBOARD_LKKBD is not set
576# CONFIG_KEYBOARD_NEWTON is not set 613# CONFIG_KEYBOARD_NEWTON is not set
614# CONFIG_KEYBOARD_OPENCORES is not set
577# CONFIG_KEYBOARD_STOWAWAY is not set 615# CONFIG_KEYBOARD_STOWAWAY is not set
578CONFIG_KEYBOARD_SUNKBD=m 616CONFIG_KEYBOARD_SUNKBD=m
579# CONFIG_KEYBOARD_XTKBD is not set 617# CONFIG_KEYBOARD_XTKBD is not set
@@ -604,6 +642,7 @@ CONFIG_SERIO_SERPORT=m
604# CONFIG_SERIO_PCIPS2 is not set 642# CONFIG_SERIO_PCIPS2 is not set
605CONFIG_SERIO_LIBPS2=m 643CONFIG_SERIO_LIBPS2=m
606# CONFIG_SERIO_RAW is not set 644# CONFIG_SERIO_RAW is not set
645# CONFIG_SERIO_ALTERA_PS2 is not set
607# CONFIG_GAMEPORT is not set 646# CONFIG_GAMEPORT is not set
608 647
609# 648#
@@ -636,6 +675,7 @@ CONFIG_SERIAL_CORE=y
636CONFIG_SERIAL_CORE_CONSOLE=y 675CONFIG_SERIAL_CORE_CONSOLE=y
637CONFIG_CONSOLE_POLL=y 676CONFIG_CONSOLE_POLL=y
638# CONFIG_SERIAL_JSM is not set 677# CONFIG_SERIAL_JSM is not set
678# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
639CONFIG_UNIX98_PTYS=y 679CONFIG_UNIX98_PTYS=y
640# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 680# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
641CONFIG_LEGACY_PTYS=y 681CONFIG_LEGACY_PTYS=y
@@ -661,6 +701,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
661# CONFIG_POWER_SUPPLY is not set 701# CONFIG_POWER_SUPPLY is not set
662CONFIG_HWMON=y 702CONFIG_HWMON=y
663# CONFIG_HWMON_VID is not set 703# CONFIG_HWMON_VID is not set
704# CONFIG_HWMON_DEBUG_CHIP is not set
705
706#
707# Native drivers
708#
664# CONFIG_SENSORS_I5K_AMB is not set 709# CONFIG_SENSORS_I5K_AMB is not set
665# CONFIG_SENSORS_F71805F is not set 710# CONFIG_SENSORS_F71805F is not set
666# CONFIG_SENSORS_F71882FG is not set 711# CONFIG_SENSORS_F71882FG is not set
@@ -675,9 +720,7 @@ CONFIG_HWMON=y
675# CONFIG_SENSORS_VT8231 is not set 720# CONFIG_SENSORS_VT8231 is not set
676# CONFIG_SENSORS_W83627HF is not set 721# CONFIG_SENSORS_W83627HF is not set
677# CONFIG_SENSORS_W83627EHF is not set 722# CONFIG_SENSORS_W83627EHF is not set
678# CONFIG_HWMON_DEBUG_CHIP is not set
679# CONFIG_THERMAL is not set 723# CONFIG_THERMAL is not set
680# CONFIG_THERMAL_HWMON is not set
681# CONFIG_WATCHDOG is not set 724# CONFIG_WATCHDOG is not set
682CONFIG_SSB_POSSIBLE=y 725CONFIG_SSB_POSSIBLE=y
683 726
@@ -699,6 +742,7 @@ CONFIG_SSB_POSSIBLE=y
699# 742#
700# Graphics support 743# Graphics support
701# 744#
745CONFIG_VGA_ARB=y
702# CONFIG_VGASTATE is not set 746# CONFIG_VGASTATE is not set
703# CONFIG_VIDEO_OUTPUT_CONTROL is not set 747# CONFIG_VIDEO_OUTPUT_CONTROL is not set
704# CONFIG_FB is not set 748# CONFIG_FB is not set
@@ -776,7 +820,9 @@ CONFIG_RTC_INTF_DEV=y
776# CONFIG_RTC_DRV_M48T86 is not set 820# CONFIG_RTC_DRV_M48T86 is not set
777# CONFIG_RTC_DRV_M48T35 is not set 821# CONFIG_RTC_DRV_M48T35 is not set
778CONFIG_RTC_DRV_M48T59=y 822CONFIG_RTC_DRV_M48T59=y
823# CONFIG_RTC_DRV_MSM6242 is not set
779# CONFIG_RTC_DRV_BQ4802 is not set 824# CONFIG_RTC_DRV_BQ4802 is not set
825# CONFIG_RTC_DRV_RP5C01 is not set
780# CONFIG_RTC_DRV_V3020 is not set 826# CONFIG_RTC_DRV_V3020 is not set
781 827
782# 828#
@@ -955,6 +1001,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
955CONFIG_ENABLE_MUST_CHECK=y 1001CONFIG_ENABLE_MUST_CHECK=y
956CONFIG_FRAME_WARN=1024 1002CONFIG_FRAME_WARN=1024
957CONFIG_MAGIC_SYSRQ=y 1003CONFIG_MAGIC_SYSRQ=y
1004# CONFIG_STRIP_ASM_SYMS is not set
958# CONFIG_UNUSED_SYMBOLS is not set 1005# CONFIG_UNUSED_SYMBOLS is not set
959# CONFIG_DEBUG_FS is not set 1006# CONFIG_DEBUG_FS is not set
960# CONFIG_HEADERS_CHECK is not set 1007# CONFIG_HEADERS_CHECK is not set
@@ -1003,9 +1050,9 @@ CONFIG_KGDB=y
1003CONFIG_KGDB_SERIAL_CONSOLE=y 1050CONFIG_KGDB_SERIAL_CONSOLE=y
1004CONFIG_KGDB_TESTS=y 1051CONFIG_KGDB_TESTS=y
1005# CONFIG_KGDB_TESTS_ON_BOOT is not set 1052# CONFIG_KGDB_TESTS_ON_BOOT is not set
1006# CONFIG_KMEMCHECK is not set
1007# CONFIG_DEBUG_STACK_USAGE is not set 1053# CONFIG_DEBUG_STACK_USAGE is not set
1008# CONFIG_STACK_DEBUG is not set 1054# CONFIG_STACK_DEBUG is not set
1055# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
1009 1056
1010# 1057#
1011# Security options 1058# Security options
@@ -1013,7 +1060,11 @@ CONFIG_KGDB_TESTS=y
1013# CONFIG_KEYS is not set 1060# CONFIG_KEYS is not set
1014# CONFIG_SECURITY is not set 1061# CONFIG_SECURITY is not set
1015# CONFIG_SECURITYFS is not set 1062# CONFIG_SECURITYFS is not set
1016# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1063# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1064# CONFIG_DEFAULT_SECURITY_SMACK is not set
1065# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1066CONFIG_DEFAULT_SECURITY_DAC=y
1067CONFIG_DEFAULT_SECURITY=""
1017CONFIG_CRYPTO=y 1068CONFIG_CRYPTO=y
1018 1069
1019# 1070#
diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/sparc64_defconfig
index f80b881dfea7..41c5a56aa6f2 100644
--- a/arch/sparc/configs/sparc64_defconfig
+++ b/arch/sparc/configs/sparc64_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.31 3# Linux kernel version: 2.6.33-rc2
4# Tue Sep 15 17:06:03 2009 4# Wed Jan 20 16:31:47 2010
5# 5#
6CONFIG_64BIT=y 6CONFIG_64BIT=y
7CONFIG_SPARC=y 7CONFIG_SPARC=y
@@ -20,6 +20,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
20CONFIG_AUDIT_ARCH=y 20CONFIG_AUDIT_ARCH=y
21CONFIG_HAVE_SETUP_PER_CPU_AREA=y 21CONFIG_HAVE_SETUP_PER_CPU_AREA=y
22CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y 22CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
23CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
23CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 24CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
24CONFIG_MMU=y 25CONFIG_MMU=y
25CONFIG_ARCH_NO_VIRT_TO_BUS=y 26CONFIG_ARCH_NO_VIRT_TO_BUS=y
@@ -50,6 +51,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
50# 51#
51CONFIG_TREE_RCU=y 52CONFIG_TREE_RCU=y
52# CONFIG_TREE_PREEMPT_RCU is not set 53# CONFIG_TREE_PREEMPT_RCU is not set
54# CONFIG_TINY_RCU is not set
53# CONFIG_RCU_TRACE is not set 55# CONFIG_RCU_TRACE is not set
54CONFIG_RCU_FANOUT=64 56CONFIG_RCU_FANOUT=64
55# CONFIG_RCU_FANOUT_EXACT is not set 57# CONFIG_RCU_FANOUT_EXACT is not set
@@ -62,8 +64,7 @@ CONFIG_RT_GROUP_SCHED=y
62CONFIG_USER_SCHED=y 64CONFIG_USER_SCHED=y
63# CONFIG_CGROUP_SCHED is not set 65# CONFIG_CGROUP_SCHED is not set
64# CONFIG_CGROUPS is not set 66# CONFIG_CGROUPS is not set
65CONFIG_SYSFS_DEPRECATED=y 67# CONFIG_SYSFS_DEPRECATED_V2 is not set
66CONFIG_SYSFS_DEPRECATED_V2=y
67CONFIG_RELAY=y 68CONFIG_RELAY=y
68CONFIG_NAMESPACES=y 69CONFIG_NAMESPACES=y
69# CONFIG_UTS_NS is not set 70# CONFIG_UTS_NS is not set
@@ -97,24 +98,25 @@ CONFIG_TIMERFD=y
97CONFIG_EVENTFD=y 98CONFIG_EVENTFD=y
98CONFIG_SHMEM=y 99CONFIG_SHMEM=y
99CONFIG_AIO=y 100CONFIG_AIO=y
100CONFIG_HAVE_PERF_COUNTERS=y 101CONFIG_HAVE_PERF_EVENTS=y
102CONFIG_PERF_USE_VMALLOC=y
101 103
102# 104#
103# Performance Counters 105# Kernel Performance Events And Counters
104# 106#
105CONFIG_PERF_COUNTERS=y 107CONFIG_PERF_EVENTS=y
106CONFIG_EVENT_PROFILE=y 108CONFIG_EVENT_PROFILE=y
109CONFIG_PERF_COUNTERS=y
110# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
107CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_PCI_QUIRKS=y 112CONFIG_PCI_QUIRKS=y
109CONFIG_SLUB_DEBUG=y 113CONFIG_SLUB_DEBUG=y
110# CONFIG_STRIP_ASM_SYMS is not set
111# CONFIG_COMPAT_BRK is not set 114# CONFIG_COMPAT_BRK is not set
112# CONFIG_SLAB is not set 115# CONFIG_SLAB is not set
113CONFIG_SLUB=y 116CONFIG_SLUB=y
114# CONFIG_SLOB is not set 117# CONFIG_SLOB is not set
115CONFIG_PROFILING=y 118CONFIG_PROFILING=y
116CONFIG_TRACEPOINTS=y 119CONFIG_TRACEPOINTS=y
117CONFIG_MARKERS=y
118CONFIG_OPROFILE=m 120CONFIG_OPROFILE=m
119CONFIG_HAVE_OPROFILE=y 121CONFIG_HAVE_OPROFILE=y
120CONFIG_KPROBES=y 122CONFIG_KPROBES=y
@@ -152,14 +154,41 @@ CONFIG_BLOCK_COMPAT=y
152# IO Schedulers 154# IO Schedulers
153# 155#
154CONFIG_IOSCHED_NOOP=y 156CONFIG_IOSCHED_NOOP=y
155CONFIG_IOSCHED_AS=y
156CONFIG_IOSCHED_DEADLINE=y 157CONFIG_IOSCHED_DEADLINE=y
157CONFIG_IOSCHED_CFQ=y 158CONFIG_IOSCHED_CFQ=y
158CONFIG_DEFAULT_AS=y
159# CONFIG_DEFAULT_DEADLINE is not set 159# CONFIG_DEFAULT_DEADLINE is not set
160# CONFIG_DEFAULT_CFQ is not set 160CONFIG_DEFAULT_CFQ=y
161# CONFIG_DEFAULT_NOOP is not set 161# CONFIG_DEFAULT_NOOP is not set
162CONFIG_DEFAULT_IOSCHED="anticipatory" 162CONFIG_DEFAULT_IOSCHED="cfq"
163# CONFIG_INLINE_SPIN_TRYLOCK is not set
164# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
165# CONFIG_INLINE_SPIN_LOCK is not set
166# CONFIG_INLINE_SPIN_LOCK_BH is not set
167# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
168# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
169CONFIG_INLINE_SPIN_UNLOCK=y
170# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
171CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
172# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
173# CONFIG_INLINE_READ_TRYLOCK is not set
174# CONFIG_INLINE_READ_LOCK is not set
175# CONFIG_INLINE_READ_LOCK_BH is not set
176# CONFIG_INLINE_READ_LOCK_IRQ is not set
177# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
178CONFIG_INLINE_READ_UNLOCK=y
179# CONFIG_INLINE_READ_UNLOCK_BH is not set
180CONFIG_INLINE_READ_UNLOCK_IRQ=y
181# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
182# CONFIG_INLINE_WRITE_TRYLOCK is not set
183# CONFIG_INLINE_WRITE_LOCK is not set
184# CONFIG_INLINE_WRITE_LOCK_BH is not set
185# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
186# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
187CONFIG_INLINE_WRITE_UNLOCK=y
188# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
189CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
190# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
191CONFIG_MUTEX_SPIN_ON_OWNER=y
163# CONFIG_FREEZER is not set 192# CONFIG_FREEZER is not set
164 193
165# 194#
@@ -179,6 +208,7 @@ CONFIG_GENERIC_HWEIGHT=y
179CONFIG_GENERIC_CALIBRATE_DELAY=y 208CONFIG_GENERIC_CALIBRATE_DELAY=y
180CONFIG_ARCH_MAY_HAVE_PC_FDC=y 209CONFIG_ARCH_MAY_HAVE_PC_FDC=y
181CONFIG_SPARC64_SMP=y 210CONFIG_SPARC64_SMP=y
211CONFIG_EARLYFB=y
182CONFIG_SPARC64_PAGE_SIZE_8KB=y 212CONFIG_SPARC64_PAGE_SIZE_8KB=y
183# CONFIG_SPARC64_PAGE_SIZE_64KB is not set 213# CONFIG_SPARC64_PAGE_SIZE_64KB is not set
184CONFIG_SECCOMP=y 214CONFIG_SECCOMP=y
@@ -216,8 +246,7 @@ CONFIG_MIGRATION=y
216CONFIG_PHYS_ADDR_T_64BIT=y 246CONFIG_PHYS_ADDR_T_64BIT=y
217CONFIG_ZONE_DMA_FLAG=0 247CONFIG_ZONE_DMA_FLAG=0
218CONFIG_NR_QUICK=1 248CONFIG_NR_QUICK=1
219CONFIG_HAVE_MLOCK=y 249# CONFIG_KSM is not set
220CONFIG_HAVE_MLOCKED_PAGE_BIT=y
221CONFIG_DEFAULT_MMAP_MIN_ADDR=8192 250CONFIG_DEFAULT_MMAP_MIN_ADDR=8192
222CONFIG_SCHED_SMT=y 251CONFIG_SCHED_SMT=y
223CONFIG_SCHED_MC=y 252CONFIG_SCHED_MC=y
@@ -315,6 +344,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
315CONFIG_INET6_XFRM_MODE_BEET=m 344CONFIG_INET6_XFRM_MODE_BEET=m
316# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 345# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
317CONFIG_IPV6_SIT=m 346CONFIG_IPV6_SIT=m
347# CONFIG_IPV6_SIT_6RD is not set
318CONFIG_IPV6_NDISC_NODETYPE=y 348CONFIG_IPV6_NDISC_NODETYPE=y
319CONFIG_IPV6_TUNNEL=m 349CONFIG_IPV6_TUNNEL=m
320# CONFIG_IPV6_MULTIPLE_TABLES is not set 350# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -356,9 +386,6 @@ CONFIG_NET_TCPPROBE=m
356# CONFIG_AF_RXRPC is not set 386# CONFIG_AF_RXRPC is not set
357CONFIG_WIRELESS=y 387CONFIG_WIRELESS=y
358# CONFIG_CFG80211 is not set 388# CONFIG_CFG80211 is not set
359CONFIG_CFG80211_DEFAULT_PS_VALUE=0
360CONFIG_WIRELESS_OLD_REGULATORY=y
361# CONFIG_WIRELESS_EXT is not set
362# CONFIG_LIB80211 is not set 389# CONFIG_LIB80211 is not set
363 390
364# 391#
@@ -376,6 +403,7 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
376# Generic Driver Options 403# Generic Driver Options
377# 404#
378CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 405CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
406# CONFIG_DEVTMPFS is not set
379CONFIG_STANDALONE=y 407CONFIG_STANDALONE=y
380# CONFIG_PREVENT_FIRMWARE_BUILD is not set 408# CONFIG_PREVENT_FIRMWARE_BUILD is not set
381CONFIG_FW_LOADER=y 409CONFIG_FW_LOADER=y
@@ -397,6 +425,11 @@ CONFIG_BLK_DEV=y
397# CONFIG_BLK_DEV_COW_COMMON is not set 425# CONFIG_BLK_DEV_COW_COMMON is not set
398CONFIG_BLK_DEV_LOOP=m 426CONFIG_BLK_DEV_LOOP=m
399CONFIG_BLK_DEV_CRYPTOLOOP=m 427CONFIG_BLK_DEV_CRYPTOLOOP=m
428
429#
430# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
431#
432# CONFIG_BLK_DEV_DRBD is not set
400CONFIG_BLK_DEV_NBD=m 433CONFIG_BLK_DEV_NBD=m
401# CONFIG_BLK_DEV_SX8 is not set 434# CONFIG_BLK_DEV_SX8 is not set
402# CONFIG_BLK_DEV_UB is not set 435# CONFIG_BLK_DEV_UB is not set
@@ -408,6 +441,7 @@ CONFIG_ATA_OVER_ETH=m
408CONFIG_SUNVDC=m 441CONFIG_SUNVDC=m
409# CONFIG_BLK_DEV_HD is not set 442# CONFIG_BLK_DEV_HD is not set
410CONFIG_MISC_DEVICES=y 443CONFIG_MISC_DEVICES=y
444# CONFIG_AD525X_DPOT is not set
411# CONFIG_PHANTOM is not set 445# CONFIG_PHANTOM is not set
412# CONFIG_SGI_IOC4 is not set 446# CONFIG_SGI_IOC4 is not set
413# CONFIG_TIFM_CORE is not set 447# CONFIG_TIFM_CORE is not set
@@ -415,6 +449,7 @@ CONFIG_MISC_DEVICES=y
415# CONFIG_ENCLOSURE_SERVICES is not set 449# CONFIG_ENCLOSURE_SERVICES is not set
416# CONFIG_HP_ILO is not set 450# CONFIG_HP_ILO is not set
417# CONFIG_ISL29003 is not set 451# CONFIG_ISL29003 is not set
452# CONFIG_DS1682 is not set
418# CONFIG_C2PORT is not set 453# CONFIG_C2PORT is not set
419 454
420# 455#
@@ -522,8 +557,11 @@ CONFIG_SCSI_LOWLEVEL=y
522# CONFIG_ISCSI_TCP is not set 557# CONFIG_ISCSI_TCP is not set
523# CONFIG_SCSI_CXGB3_ISCSI is not set 558# CONFIG_SCSI_CXGB3_ISCSI is not set
524# CONFIG_SCSI_BNX2_ISCSI is not set 559# CONFIG_SCSI_BNX2_ISCSI is not set
560# CONFIG_BE2ISCSI is not set
525# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 561# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
562# CONFIG_SCSI_HPSA is not set
526# CONFIG_SCSI_3W_9XXX is not set 563# CONFIG_SCSI_3W_9XXX is not set
564# CONFIG_SCSI_3W_SAS is not set
527# CONFIG_SCSI_ACARD is not set 565# CONFIG_SCSI_ACARD is not set
528# CONFIG_SCSI_AACRAID is not set 566# CONFIG_SCSI_AACRAID is not set
529# CONFIG_SCSI_AIC7XXX is not set 567# CONFIG_SCSI_AIC7XXX is not set
@@ -557,7 +595,9 @@ CONFIG_SCSI_LOWLEVEL=y
557# CONFIG_SCSI_DEBUG is not set 595# CONFIG_SCSI_DEBUG is not set
558# CONFIG_SCSI_SUNESP is not set 596# CONFIG_SCSI_SUNESP is not set
559# CONFIG_SCSI_PMCRAID is not set 597# CONFIG_SCSI_PMCRAID is not set
598# CONFIG_SCSI_PM8001 is not set
560# CONFIG_SCSI_SRP is not set 599# CONFIG_SCSI_SRP is not set
600# CONFIG_SCSI_BFA_FC is not set
561# CONFIG_SCSI_DH is not set 601# CONFIG_SCSI_DH is not set
562# CONFIG_SCSI_OSD_INITIATOR is not set 602# CONFIG_SCSI_OSD_INITIATOR is not set
563# CONFIG_ATA is not set 603# CONFIG_ATA is not set
@@ -568,7 +608,9 @@ CONFIG_MD_RAID0=m
568CONFIG_MD_RAID1=m 608CONFIG_MD_RAID1=m
569CONFIG_MD_RAID10=m 609CONFIG_MD_RAID10=m
570CONFIG_MD_RAID456=m 610CONFIG_MD_RAID456=m
611# CONFIG_MULTICORE_RAID456 is not set
571CONFIG_MD_RAID6_PQ=m 612CONFIG_MD_RAID6_PQ=m
613# CONFIG_ASYNC_RAID6_TEST is not set
572CONFIG_MD_MULTIPATH=m 614CONFIG_MD_MULTIPATH=m
573# CONFIG_MD_FAULTY is not set 615# CONFIG_MD_FAULTY is not set
574CONFIG_BLK_DEV_DM=m 616CONFIG_BLK_DEV_DM=m
@@ -592,7 +634,7 @@ CONFIG_DM_ZERO=m
592# 634#
593 635
594# 636#
595# See the help texts for more information. 637# The newer stack is recommended.
596# 638#
597# CONFIG_FIREWIRE is not set 639# CONFIG_FIREWIRE is not set
598# CONFIG_IEEE1394 is not set 640# CONFIG_IEEE1394 is not set
@@ -664,6 +706,7 @@ CONFIG_NET_PCI=y
664# CONFIG_SUNDANCE is not set 706# CONFIG_SUNDANCE is not set
665# CONFIG_TLAN is not set 707# CONFIG_TLAN is not set
666# CONFIG_KS8842 is not set 708# CONFIG_KS8842 is not set
709# CONFIG_KS8851_MLL is not set
667# CONFIG_VIA_RHINE is not set 710# CONFIG_VIA_RHINE is not set
668# CONFIG_SC92031 is not set 711# CONFIG_SC92031 is not set
669# CONFIG_ATL2 is not set 712# CONFIG_ATL2 is not set
@@ -745,6 +788,7 @@ CONFIG_SLHC=m
745# CONFIG_NETCONSOLE is not set 788# CONFIG_NETCONSOLE is not set
746# CONFIG_NETPOLL is not set 789# CONFIG_NETPOLL is not set
747# CONFIG_NET_POLL_CONTROLLER is not set 790# CONFIG_NET_POLL_CONTROLLER is not set
791# CONFIG_VMXNET3 is not set
748# CONFIG_ISDN is not set 792# CONFIG_ISDN is not set
749# CONFIG_PHONE is not set 793# CONFIG_PHONE is not set
750 794
@@ -754,6 +798,7 @@ CONFIG_SLHC=m
754CONFIG_INPUT=y 798CONFIG_INPUT=y
755# CONFIG_INPUT_FF_MEMLESS is not set 799# CONFIG_INPUT_FF_MEMLESS is not set
756# CONFIG_INPUT_POLLDEV is not set 800# CONFIG_INPUT_POLLDEV is not set
801# CONFIG_INPUT_SPARSEKMAP is not set
757 802
758# 803#
759# Userland interfaces 804# Userland interfaces
@@ -770,9 +815,13 @@ CONFIG_INPUT_EVDEV=y
770# Input Device Drivers 815# Input Device Drivers
771# 816#
772CONFIG_INPUT_KEYBOARD=y 817CONFIG_INPUT_KEYBOARD=y
818# CONFIG_KEYBOARD_ADP5588 is not set
773CONFIG_KEYBOARD_ATKBD=y 819CONFIG_KEYBOARD_ATKBD=y
820# CONFIG_QT2160 is not set
774CONFIG_KEYBOARD_LKKBD=m 821CONFIG_KEYBOARD_LKKBD=m
822# CONFIG_KEYBOARD_MAX7359 is not set
775# CONFIG_KEYBOARD_NEWTON is not set 823# CONFIG_KEYBOARD_NEWTON is not set
824# CONFIG_KEYBOARD_OPENCORES is not set
776# CONFIG_KEYBOARD_STOWAWAY is not set 825# CONFIG_KEYBOARD_STOWAWAY is not set
777CONFIG_KEYBOARD_SUNKBD=y 826CONFIG_KEYBOARD_SUNKBD=y
778# CONFIG_KEYBOARD_XTKBD is not set 827# CONFIG_KEYBOARD_XTKBD is not set
@@ -812,6 +861,7 @@ CONFIG_SERIO_I8042=y
812CONFIG_SERIO_PCIPS2=m 861CONFIG_SERIO_PCIPS2=m
813CONFIG_SERIO_LIBPS2=y 862CONFIG_SERIO_LIBPS2=y
814CONFIG_SERIO_RAW=m 863CONFIG_SERIO_RAW=m
864# CONFIG_SERIO_ALTERA_PS2 is not set
815# CONFIG_GAMEPORT is not set 865# CONFIG_GAMEPORT is not set
816 866
817# 867#
@@ -844,6 +894,7 @@ CONFIG_SERIAL_SUNHV=y
844CONFIG_SERIAL_CORE=y 894CONFIG_SERIAL_CORE=y
845CONFIG_SERIAL_CORE_CONSOLE=y 895CONFIG_SERIAL_CORE_CONSOLE=y
846# CONFIG_SERIAL_JSM is not set 896# CONFIG_SERIAL_JSM is not set
897# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
847CONFIG_UNIX98_PTYS=y 898CONFIG_UNIX98_PTYS=y
848# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 899# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
849# CONFIG_LEGACY_PTYS is not set 900# CONFIG_LEGACY_PTYS is not set
@@ -858,6 +909,7 @@ CONFIG_HW_RANDOM_N2RNG=m
858CONFIG_DEVPORT=y 909CONFIG_DEVPORT=y
859CONFIG_I2C=y 910CONFIG_I2C=y
860CONFIG_I2C_BOARDINFO=y 911CONFIG_I2C_BOARDINFO=y
912CONFIG_I2C_COMPAT=y
861# CONFIG_I2C_CHARDEV is not set 913# CONFIG_I2C_CHARDEV is not set
862CONFIG_I2C_HELPER_AUTO=y 914CONFIG_I2C_HELPER_AUTO=y
863CONFIG_I2C_ALGOBIT=y 915CONFIG_I2C_ALGOBIT=y
@@ -898,11 +950,6 @@ CONFIG_I2C_ALGOBIT=y
898# CONFIG_I2C_TINY_USB is not set 950# CONFIG_I2C_TINY_USB is not set
899 951
900# 952#
901# Graphics adapter I2C/DDC channel drivers
902#
903# CONFIG_I2C_VOODOO3 is not set
904
905#
906# Other I2C/SMBus bus drivers 953# Other I2C/SMBus bus drivers
907# 954#
908# CONFIG_I2C_PCA_PLATFORM is not set 955# CONFIG_I2C_PCA_PLATFORM is not set
@@ -911,10 +958,6 @@ CONFIG_I2C_ALGOBIT=y
911# 958#
912# Miscellaneous I2C Chip support 959# Miscellaneous I2C Chip support
913# 960#
914# CONFIG_DS1682 is not set
915# CONFIG_SENSORS_PCF8574 is not set
916# CONFIG_PCF8575 is not set
917# CONFIG_SENSORS_PCA9539 is not set
918# CONFIG_SENSORS_TSL2550 is not set 961# CONFIG_SENSORS_TSL2550 is not set
919# CONFIG_I2C_DEBUG_CORE is not set 962# CONFIG_I2C_DEBUG_CORE is not set
920# CONFIG_I2C_DEBUG_ALGO is not set 963# CONFIG_I2C_DEBUG_ALGO is not set
@@ -932,6 +975,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
932# CONFIG_POWER_SUPPLY is not set 975# CONFIG_POWER_SUPPLY is not set
933CONFIG_HWMON=y 976CONFIG_HWMON=y
934# CONFIG_HWMON_VID is not set 977# CONFIG_HWMON_VID is not set
978# CONFIG_HWMON_DEBUG_CHIP is not set
979
980#
981# Native drivers
982#
935# CONFIG_SENSORS_AD7414 is not set 983# CONFIG_SENSORS_AD7414 is not set
936# CONFIG_SENSORS_AD7418 is not set 984# CONFIG_SENSORS_AD7418 is not set
937# CONFIG_SENSORS_ADM1021 is not set 985# CONFIG_SENSORS_ADM1021 is not set
@@ -955,6 +1003,7 @@ CONFIG_HWMON=y
955# CONFIG_SENSORS_GL520SM is not set 1003# CONFIG_SENSORS_GL520SM is not set
956# CONFIG_SENSORS_IT87 is not set 1004# CONFIG_SENSORS_IT87 is not set
957# CONFIG_SENSORS_LM63 is not set 1005# CONFIG_SENSORS_LM63 is not set
1006# CONFIG_SENSORS_LM73 is not set
958# CONFIG_SENSORS_LM75 is not set 1007# CONFIG_SENSORS_LM75 is not set
959# CONFIG_SENSORS_LM77 is not set 1008# CONFIG_SENSORS_LM77 is not set
960# CONFIG_SENSORS_LM78 is not set 1009# CONFIG_SENSORS_LM78 is not set
@@ -981,6 +1030,7 @@ CONFIG_HWMON=y
981# CONFIG_SENSORS_ADS7828 is not set 1030# CONFIG_SENSORS_ADS7828 is not set
982# CONFIG_SENSORS_THMC50 is not set 1031# CONFIG_SENSORS_THMC50 is not set
983# CONFIG_SENSORS_TMP401 is not set 1032# CONFIG_SENSORS_TMP401 is not set
1033# CONFIG_SENSORS_TMP421 is not set
984# CONFIG_SENSORS_VIA686A is not set 1034# CONFIG_SENSORS_VIA686A is not set
985# CONFIG_SENSORS_VT1211 is not set 1035# CONFIG_SENSORS_VT1211 is not set
986# CONFIG_SENSORS_VT8231 is not set 1036# CONFIG_SENSORS_VT8231 is not set
@@ -993,9 +1043,8 @@ CONFIG_HWMON=y
993# CONFIG_SENSORS_W83627HF is not set 1043# CONFIG_SENSORS_W83627HF is not set
994# CONFIG_SENSORS_W83627EHF is not set 1044# CONFIG_SENSORS_W83627EHF is not set
995# CONFIG_SENSORS_ULTRA45 is not set 1045# CONFIG_SENSORS_ULTRA45 is not set
996# CONFIG_HWMON_DEBUG_CHIP is not set 1046# CONFIG_SENSORS_LIS3_I2C is not set
997# CONFIG_THERMAL is not set 1047# CONFIG_THERMAL is not set
998# CONFIG_THERMAL_HWMON is not set
999# CONFIG_WATCHDOG is not set 1048# CONFIG_WATCHDOG is not set
1000CONFIG_SSB_POSSIBLE=y 1049CONFIG_SSB_POSSIBLE=y
1001 1050
@@ -1013,16 +1062,20 @@ CONFIG_SSB_POSSIBLE=y
1013# CONFIG_TWL4030_CORE is not set 1062# CONFIG_TWL4030_CORE is not set
1014# CONFIG_MFD_TMIO is not set 1063# CONFIG_MFD_TMIO is not set
1015# CONFIG_PMIC_DA903X is not set 1064# CONFIG_PMIC_DA903X is not set
1065# CONFIG_PMIC_ADP5520 is not set
1016# CONFIG_MFD_WM8400 is not set 1066# CONFIG_MFD_WM8400 is not set
1067# CONFIG_MFD_WM831X is not set
1017# CONFIG_MFD_WM8350_I2C is not set 1068# CONFIG_MFD_WM8350_I2C is not set
1018# CONFIG_MFD_PCF50633 is not set 1069# CONFIG_MFD_PCF50633 is not set
1019# CONFIG_AB3100_CORE is not set 1070# CONFIG_AB3100_CORE is not set
1071# CONFIG_MFD_88PM8607 is not set
1020# CONFIG_REGULATOR is not set 1072# CONFIG_REGULATOR is not set
1021# CONFIG_MEDIA_SUPPORT is not set 1073# CONFIG_MEDIA_SUPPORT is not set
1022 1074
1023# 1075#
1024# Graphics support 1076# Graphics support
1025# 1077#
1078CONFIG_VGA_ARB=y
1026# CONFIG_DRM is not set 1079# CONFIG_DRM is not set
1027# CONFIG_VGASTATE is not set 1080# CONFIG_VGASTATE is not set
1028# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1081# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1176,6 +1229,7 @@ CONFIG_SND_ALI5451=m
1176# CONFIG_SND_OXYGEN is not set 1229# CONFIG_SND_OXYGEN is not set
1177# CONFIG_SND_CS4281 is not set 1230# CONFIG_SND_CS4281 is not set
1178# CONFIG_SND_CS46XX is not set 1231# CONFIG_SND_CS46XX is not set
1232# CONFIG_SND_CS5535AUDIO is not set
1179# CONFIG_SND_CTXFI is not set 1233# CONFIG_SND_CTXFI is not set
1180# CONFIG_SND_DARLA20 is not set 1234# CONFIG_SND_DARLA20 is not set
1181# CONFIG_SND_GINA20 is not set 1235# CONFIG_SND_GINA20 is not set
@@ -1311,6 +1365,7 @@ CONFIG_USB_EHCI_HCD=m
1311# CONFIG_USB_OXU210HP_HCD is not set 1365# CONFIG_USB_OXU210HP_HCD is not set
1312# CONFIG_USB_ISP116X_HCD is not set 1366# CONFIG_USB_ISP116X_HCD is not set
1313# CONFIG_USB_ISP1760_HCD is not set 1367# CONFIG_USB_ISP1760_HCD is not set
1368# CONFIG_USB_ISP1362_HCD is not set
1314CONFIG_USB_OHCI_HCD=y 1369CONFIG_USB_OHCI_HCD=y
1315# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 1370# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1316# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 1371# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -1426,6 +1481,7 @@ CONFIG_RTC_INTF_DEV=y
1426# CONFIG_RTC_DRV_PCF8563 is not set 1481# CONFIG_RTC_DRV_PCF8563 is not set
1427# CONFIG_RTC_DRV_PCF8583 is not set 1482# CONFIG_RTC_DRV_PCF8583 is not set
1428# CONFIG_RTC_DRV_M41T80 is not set 1483# CONFIG_RTC_DRV_M41T80 is not set
1484# CONFIG_RTC_DRV_BQ32K is not set
1429# CONFIG_RTC_DRV_S35390A is not set 1485# CONFIG_RTC_DRV_S35390A is not set
1430# CONFIG_RTC_DRV_FM3130 is not set 1486# CONFIG_RTC_DRV_FM3130 is not set
1431# CONFIG_RTC_DRV_RX8581 is not set 1487# CONFIG_RTC_DRV_RX8581 is not set
@@ -1447,7 +1503,9 @@ CONFIG_RTC_DRV_CMOS=y
1447# CONFIG_RTC_DRV_M48T86 is not set 1503# CONFIG_RTC_DRV_M48T86 is not set
1448# CONFIG_RTC_DRV_M48T35 is not set 1504# CONFIG_RTC_DRV_M48T35 is not set
1449CONFIG_RTC_DRV_M48T59=y 1505CONFIG_RTC_DRV_M48T59=y
1506# CONFIG_RTC_DRV_MSM6242 is not set
1450CONFIG_RTC_DRV_BQ4802=y 1507CONFIG_RTC_DRV_BQ4802=y
1508# CONFIG_RTC_DRV_RP5C01 is not set
1451# CONFIG_RTC_DRV_V3020 is not set 1509# CONFIG_RTC_DRV_V3020 is not set
1452 1510
1453# 1511#
@@ -1625,6 +1683,7 @@ CONFIG_PRINTK_TIME=y
1625CONFIG_ENABLE_MUST_CHECK=y 1683CONFIG_ENABLE_MUST_CHECK=y
1626CONFIG_FRAME_WARN=2048 1684CONFIG_FRAME_WARN=2048
1627CONFIG_MAGIC_SYSRQ=y 1685CONFIG_MAGIC_SYSRQ=y
1686# CONFIG_STRIP_ASM_SYMS is not set
1628# CONFIG_UNUSED_SYMBOLS is not set 1687# CONFIG_UNUSED_SYMBOLS is not set
1629CONFIG_DEBUG_FS=y 1688CONFIG_DEBUG_FS=y
1630# CONFIG_HEADERS_CHECK is not set 1689# CONFIG_HEADERS_CHECK is not set
@@ -1678,9 +1737,11 @@ CONFIG_NOP_TRACER=y
1678CONFIG_HAVE_FUNCTION_TRACER=y 1737CONFIG_HAVE_FUNCTION_TRACER=y
1679CONFIG_HAVE_DYNAMIC_FTRACE=y 1738CONFIG_HAVE_DYNAMIC_FTRACE=y
1680CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1739CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1740CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1681CONFIG_RING_BUFFER=y 1741CONFIG_RING_BUFFER=y
1682CONFIG_EVENT_TRACING=y 1742CONFIG_EVENT_TRACING=y
1683CONFIG_CONTEXT_SWITCH_TRACER=y 1743CONFIG_CONTEXT_SWITCH_TRACER=y
1744CONFIG_RING_BUFFER_ALLOW_SWAP=y
1684CONFIG_TRACING=y 1745CONFIG_TRACING=y
1685CONFIG_GENERIC_TRACER=y 1746CONFIG_GENERIC_TRACER=y
1686CONFIG_TRACING_SUPPORT=y 1747CONFIG_TRACING_SUPPORT=y
@@ -1688,6 +1749,7 @@ CONFIG_FTRACE=y
1688# CONFIG_FUNCTION_TRACER is not set 1749# CONFIG_FUNCTION_TRACER is not set
1689# CONFIG_IRQSOFF_TRACER is not set 1750# CONFIG_IRQSOFF_TRACER is not set
1690# CONFIG_SCHED_TRACER is not set 1751# CONFIG_SCHED_TRACER is not set
1752# CONFIG_FTRACE_SYSCALLS is not set
1691# CONFIG_BOOT_TRACER is not set 1753# CONFIG_BOOT_TRACER is not set
1692CONFIG_BRANCH_PROFILE_NONE=y 1754CONFIG_BRANCH_PROFILE_NONE=y
1693# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1755# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
@@ -1706,6 +1768,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1706# CONFIG_DEBUG_STACK_USAGE is not set 1768# CONFIG_DEBUG_STACK_USAGE is not set
1707# CONFIG_DEBUG_DCFLUSH is not set 1769# CONFIG_DEBUG_DCFLUSH is not set
1708# CONFIG_STACK_DEBUG is not set 1770# CONFIG_STACK_DEBUG is not set
1771# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
1709 1772
1710# 1773#
1711# Security options 1774# Security options
@@ -1714,11 +1777,17 @@ CONFIG_KEYS=y
1714# CONFIG_KEYS_DEBUG_PROC_KEYS is not set 1777# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
1715# CONFIG_SECURITY is not set 1778# CONFIG_SECURITY is not set
1716# CONFIG_SECURITYFS is not set 1779# CONFIG_SECURITYFS is not set
1717# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1780# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1781# CONFIG_DEFAULT_SECURITY_SMACK is not set
1782# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1783CONFIG_DEFAULT_SECURITY_DAC=y
1784CONFIG_DEFAULT_SECURITY=""
1718CONFIG_XOR_BLOCKS=m 1785CONFIG_XOR_BLOCKS=m
1719CONFIG_ASYNC_CORE=m 1786CONFIG_ASYNC_CORE=m
1720CONFIG_ASYNC_MEMCPY=m 1787CONFIG_ASYNC_MEMCPY=m
1721CONFIG_ASYNC_XOR=m 1788CONFIG_ASYNC_XOR=m
1789CONFIG_ASYNC_PQ=m
1790CONFIG_ASYNC_RAID6_RECOV=m
1722CONFIG_CRYPTO=y 1791CONFIG_CRYPTO=y
1723 1792
1724# 1793#
diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
index ff66bb88537b..e67880381b84 100644
--- a/arch/sparc/include/asm/elf_64.h
+++ b/arch/sparc/include/asm/elf_64.h
@@ -195,17 +195,10 @@ static inline unsigned int sparc64_elf_hwcap(void)
195#define ELF_PLATFORM (NULL) 195#define ELF_PLATFORM (NULL)
196 196
197#define SET_PERSONALITY(ex) \ 197#define SET_PERSONALITY(ex) \
198do { unsigned long new_flags = current_thread_info()->flags; \ 198do { if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \
199 new_flags &= _TIF_32BIT; \ 199 set_thread_flag(TIF_32BIT); \
200 if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \
201 new_flags |= _TIF_32BIT; \
202 else \ 200 else \
203 new_flags &= ~_TIF_32BIT; \ 201 clear_thread_flag(TIF_32BIT); \
204 if ((current_thread_info()->flags & _TIF_32BIT) \
205 != new_flags) \
206 set_thread_flag(TIF_ABI_PENDING); \
207 else \
208 clear_thread_flag(TIF_ABI_PENDING); \
209 /* flush_thread will update pgd cache */ \ 202 /* flush_thread will update pgd cache */ \
210 if (personality(current->personality) != PER_LINUX32) \ 203 if (personality(current->personality) != PER_LINUX32) \
211 set_personality(PER_LINUX | \ 204 set_personality(PER_LINUX | \
diff --git a/arch/sparc/include/asm/io_32.h b/arch/sparc/include/asm/io_32.h
index 93fe21e02c86..679c7504625a 100644
--- a/arch/sparc/include/asm/io_32.h
+++ b/arch/sparc/include/asm/io_32.h
@@ -8,7 +8,7 @@
8#include <asm/page.h> /* IO address mapping routines need this */ 8#include <asm/page.h> /* IO address mapping routines need this */
9#include <asm/system.h> 9#include <asm/system.h>
10 10
11#define page_to_phys(page) (((page) - mem_map) << PAGE_SHIFT) 11#define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT)
12 12
13static inline u32 flip_dword (u32 l) 13static inline u32 flip_dword (u32 l)
14{ 14{
diff --git a/arch/sparc/include/asm/page_32.h b/arch/sparc/include/asm/page_32.h
index f72080bdda94..156707b0f18d 100644
--- a/arch/sparc/include/asm/page_32.h
+++ b/arch/sparc/include/asm/page_32.h
@@ -143,7 +143,7 @@ extern unsigned long pfn_base;
143#define phys_to_virt __va 143#define phys_to_virt __va
144 144
145#define ARCH_PFN_OFFSET (pfn_base) 145#define ARCH_PFN_OFFSET (pfn_base)
146#define virt_to_page(kaddr) (mem_map + ((((unsigned long)(kaddr)-PAGE_OFFSET)>>PAGE_SHIFT))) 146#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
147 147
148#define pfn_valid(pfn) (((pfn) >= (pfn_base)) && (((pfn)-(pfn_base)) < max_mapnr)) 148#define pfn_valid(pfn) (((pfn) >= (pfn_base)) && (((pfn)-(pfn_base)) < max_mapnr))
149#define virt_addr_valid(kaddr) ((((unsigned long)(kaddr)-PAGE_OFFSET)>>PAGE_SHIFT) < max_mapnr) 149#define virt_addr_valid(kaddr) ((((unsigned long)(kaddr)-PAGE_OFFSET)>>PAGE_SHIFT) < max_mapnr)
diff --git a/arch/sparc/include/asm/param.h b/arch/sparc/include/asm/param.h
index 9836d9a3cb9a..0bc356bf8c50 100644
--- a/arch/sparc/include/asm/param.h
+++ b/arch/sparc/include/asm/param.h
@@ -1,22 +1,7 @@
1#ifndef _ASMSPARC_PARAM_H 1#ifndef _ASMSPARC_PARAM_H
2#define _ASMSPARC_PARAM_H 2#define _ASMSPARC_PARAM_H
3 3
4#ifdef __KERNEL__
5# define HZ CONFIG_HZ /* Internal kernel timer frequency */
6# define USER_HZ 100 /* .. some user interfaces are in "ticks" */
7# define CLOCKS_PER_SEC (USER_HZ)
8#endif
9
10#ifndef HZ
11#define HZ 100
12#endif
13
14#define EXEC_PAGESIZE 8192 /* Thanks for sun4's we carry baggage... */ 4#define EXEC_PAGESIZE 8192 /* Thanks for sun4's we carry baggage... */
5#include <asm-generic/param.h>
15 6
16#ifndef NOGROUP 7#endif /* _ASMSPARC_PARAM_H */
17#define NOGROUP (-1)
18#endif
19
20#define MAXHOSTNAMELEN 64 /* max length of hostname */
21
22#endif
diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
index 7257ebb8f394..39be9f256e5a 100644
--- a/arch/sparc/include/asm/thread_info_64.h
+++ b/arch/sparc/include/asm/thread_info_64.h
@@ -228,12 +228,11 @@ register struct thread_info *current_thread_info_reg asm("g6");
228#define TIF_SECCOMP 9 /* secure computing */ 228#define TIF_SECCOMP 9 /* secure computing */
229#define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */ 229#define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
230#define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */ 230#define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
231/* flag bit 11 is available */
232/* NOTE: Thread flags >= 12 should be ones we have no interest 231/* NOTE: Thread flags >= 12 should be ones we have no interest
233 * in using in assembly, else we can't use the mask as 232 * in using in assembly, else we can't use the mask as
234 * an immediate value in instructions such as andcc. 233 * an immediate value in instructions such as andcc.
235 */ 234 */
236#define TIF_ABI_PENDING 12 235/* flag bit 12 is available */
237#define TIF_MEMDIE 13 236#define TIF_MEMDIE 13
238#define TIF_POLLING_NRFLAG 14 237#define TIF_POLLING_NRFLAG 14
239#define TIF_FREEZE 15 /* is freezing for suspend */ 238#define TIF_FREEZE 15 /* is freezing for suspend */
@@ -248,7 +247,6 @@ register struct thread_info *current_thread_info_reg asm("g6");
248#define _TIF_SECCOMP (1<<TIF_SECCOMP) 247#define _TIF_SECCOMP (1<<TIF_SECCOMP)
249#define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT) 248#define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
250#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT) 249#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
251#define _TIF_ABI_PENDING (1<<TIF_ABI_PENDING)
252#define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) 250#define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
253#define _TIF_FREEZE (1<<TIF_FREEZE) 251#define _TIF_FREEZE (1<<TIF_FREEZE)
254 252
diff --git a/arch/sparc/include/asm/timex_32.h b/arch/sparc/include/asm/timex_32.h
index b6ccdb0d6f7d..a254750e4c03 100644
--- a/arch/sparc/include/asm/timex_32.h
+++ b/arch/sparc/include/asm/timex_32.h
@@ -12,4 +12,5 @@
12typedef unsigned long cycles_t; 12typedef unsigned long cycles_t;
13#define get_cycles() (0) 13#define get_cycles() (0)
14 14
15extern u32 (*do_arch_gettimeoffset)(void);
15#endif 16#endif
diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h
index 600a79035fa1..1c79f32734a0 100644
--- a/arch/sparc/include/asm/topology_64.h
+++ b/arch/sparc/include/asm/topology_64.h
@@ -12,7 +12,9 @@ static inline int cpu_to_node(int cpu)
12 12
13#define parent_node(node) (node) 13#define parent_node(node) (node)
14 14
15#define cpumask_of_node(node) (&numa_cpumask_lookup_table[node]) 15#define cpumask_of_node(node) ((node) == -1 ? \
16 cpu_all_mask : \
17 &numa_cpumask_lookup_table[node])
16 18
17struct pci_bus; 19struct pci_bus;
18#ifdef CONFIG_PCI 20#ifdef CONFIG_PCI
diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
index 489d2ba92bcb..25f1d10155e8 100644
--- a/arch/sparc/include/asm/uaccess_32.h
+++ b/arch/sparc/include/asm/uaccess_32.h
@@ -274,7 +274,7 @@ static inline unsigned long copy_from_user(void *to, const void __user *from, un
274 274
275 if (unlikely(sz != -1 && sz < n)) { 275 if (unlikely(sz != -1 && sz < n)) {
276 copy_from_user_overflow(); 276 copy_from_user_overflow();
277 return -EFAULT; 277 return n;
278 } 278 }
279 279
280 if (n && __access_ok((unsigned long) from, n)) 280 if (n && __access_ok((unsigned long) from, n))
diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
index dbc141660994..2406788bfe5f 100644
--- a/arch/sparc/include/asm/uaccess_64.h
+++ b/arch/sparc/include/asm/uaccess_64.h
@@ -221,8 +221,8 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
221static inline unsigned long __must_check 221static inline unsigned long __must_check
222copy_from_user(void *to, const void __user *from, unsigned long size) 222copy_from_user(void *to, const void __user *from, unsigned long size)
223{ 223{
224 unsigned long ret = (unsigned long) -EFAULT;
225 int sz = __compiletime_object_size(to); 224 int sz = __compiletime_object_size(to);
225 unsigned long ret = size;
226 226
227 if (likely(sz == -1 || sz >= size)) { 227 if (likely(sz == -1 || sz >= size)) {
228 ret = ___copy_from_user(to, from, size); 228 ret = ___copy_from_user(to, from, size);
diff --git a/arch/sparc/kernel/central.c b/arch/sparc/kernel/central.c
index f3b5466c389c..4589ca33220f 100644
--- a/arch/sparc/kernel/central.c
+++ b/arch/sparc/kernel/central.c
@@ -99,7 +99,7 @@ static int __devinit clock_board_probe(struct of_device *op,
99 99
100 p->leds_resource.start = (unsigned long) 100 p->leds_resource.start = (unsigned long)
101 (p->clock_regs + CLOCK_CTRL); 101 (p->clock_regs + CLOCK_CTRL);
102 p->leds_resource.end = p->leds_resource.end; 102 p->leds_resource.end = p->leds_resource.start;
103 p->leds_resource.name = "leds"; 103 p->leds_resource.name = "leds";
104 104
105 p->leds_pdev.name = "sunfire-clockboard-leds"; 105 p->leds_pdev.name = "sunfire-clockboard-leds";
@@ -194,7 +194,7 @@ static int __devinit fhc_probe(struct of_device *op,
194 if (!p->central) { 194 if (!p->central) {
195 p->leds_resource.start = (unsigned long) 195 p->leds_resource.start = (unsigned long)
196 (p->pregs + FHC_PREGS_CTRL); 196 (p->pregs + FHC_PREGS_CTRL);
197 p->leds_resource.end = p->leds_resource.end; 197 p->leds_resource.end = p->leds_resource.start;
198 p->leds_resource.name = "leds"; 198 p->leds_resource.name = "leds";
199 199
200 p->leds_pdev.name = "sunfire-fhc-leds"; 200 p->leds_pdev.name = "sunfire-fhc-leds";
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
index 8d6882bb480a..e1cbdb94d97b 100644
--- a/arch/sparc/kernel/irq_64.c
+++ b/arch/sparc/kernel/irq_64.c
@@ -250,12 +250,12 @@ struct irq_handler_data {
250}; 250};
251 251
252#ifdef CONFIG_SMP 252#ifdef CONFIG_SMP
253static int irq_choose_cpu(unsigned int virt_irq) 253static int irq_choose_cpu(unsigned int virt_irq, const struct cpumask *affinity)
254{ 254{
255 cpumask_t mask; 255 cpumask_t mask;
256 int cpuid; 256 int cpuid;
257 257
258 cpumask_copy(&mask, irq_desc[virt_irq].affinity); 258 cpumask_copy(&mask, affinity);
259 if (cpus_equal(mask, cpu_online_map)) { 259 if (cpus_equal(mask, cpu_online_map)) {
260 cpuid = map_to_cpu(virt_irq); 260 cpuid = map_to_cpu(virt_irq);
261 } else { 261 } else {
@@ -268,10 +268,8 @@ static int irq_choose_cpu(unsigned int virt_irq)
268 return cpuid; 268 return cpuid;
269} 269}
270#else 270#else
271static int irq_choose_cpu(unsigned int virt_irq) 271#define irq_choose_cpu(virt_irq, affinity) \
272{ 272 real_hard_smp_processor_id()
273 return real_hard_smp_processor_id();
274}
275#endif 273#endif
276 274
277static void sun4u_irq_enable(unsigned int virt_irq) 275static void sun4u_irq_enable(unsigned int virt_irq)
@@ -282,7 +280,8 @@ static void sun4u_irq_enable(unsigned int virt_irq)
282 unsigned long cpuid, imap, val; 280 unsigned long cpuid, imap, val;
283 unsigned int tid; 281 unsigned int tid;
284 282
285 cpuid = irq_choose_cpu(virt_irq); 283 cpuid = irq_choose_cpu(virt_irq,
284 irq_desc[virt_irq].affinity);
286 imap = data->imap; 285 imap = data->imap;
287 286
288 tid = sun4u_compute_tid(imap, cpuid); 287 tid = sun4u_compute_tid(imap, cpuid);
@@ -299,7 +298,24 @@ static void sun4u_irq_enable(unsigned int virt_irq)
299static int sun4u_set_affinity(unsigned int virt_irq, 298static int sun4u_set_affinity(unsigned int virt_irq,
300 const struct cpumask *mask) 299 const struct cpumask *mask)
301{ 300{
302 sun4u_irq_enable(virt_irq); 301 struct irq_handler_data *data = get_irq_chip_data(virt_irq);
302
303 if (likely(data)) {
304 unsigned long cpuid, imap, val;
305 unsigned int tid;
306
307 cpuid = irq_choose_cpu(virt_irq, mask);
308 imap = data->imap;
309
310 tid = sun4u_compute_tid(imap, cpuid);
311
312 val = upa_readq(imap);
313 val &= ~(IMAP_TID_UPA | IMAP_TID_JBUS |
314 IMAP_AID_SAFARI | IMAP_NID_SAFARI);
315 val |= tid | IMAP_VALID;
316 upa_writeq(val, imap);
317 upa_writeq(ICLR_IDLE, data->iclr);
318 }
303 319
304 return 0; 320 return 0;
305} 321}
@@ -340,7 +356,8 @@ static void sun4u_irq_eoi(unsigned int virt_irq)
340static void sun4v_irq_enable(unsigned int virt_irq) 356static void sun4v_irq_enable(unsigned int virt_irq)
341{ 357{
342 unsigned int ino = virt_irq_table[virt_irq].dev_ino; 358 unsigned int ino = virt_irq_table[virt_irq].dev_ino;
343 unsigned long cpuid = irq_choose_cpu(virt_irq); 359 unsigned long cpuid = irq_choose_cpu(virt_irq,
360 irq_desc[virt_irq].affinity);
344 int err; 361 int err;
345 362
346 err = sun4v_intr_settarget(ino, cpuid); 363 err = sun4v_intr_settarget(ino, cpuid);
@@ -361,7 +378,7 @@ static int sun4v_set_affinity(unsigned int virt_irq,
361 const struct cpumask *mask) 378 const struct cpumask *mask)
362{ 379{
363 unsigned int ino = virt_irq_table[virt_irq].dev_ino; 380 unsigned int ino = virt_irq_table[virt_irq].dev_ino;
364 unsigned long cpuid = irq_choose_cpu(virt_irq); 381 unsigned long cpuid = irq_choose_cpu(virt_irq, mask);
365 int err; 382 int err;
366 383
367 err = sun4v_intr_settarget(ino, cpuid); 384 err = sun4v_intr_settarget(ino, cpuid);
@@ -403,7 +420,7 @@ static void sun4v_virq_enable(unsigned int virt_irq)
403 unsigned long cpuid, dev_handle, dev_ino; 420 unsigned long cpuid, dev_handle, dev_ino;
404 int err; 421 int err;
405 422
406 cpuid = irq_choose_cpu(virt_irq); 423 cpuid = irq_choose_cpu(virt_irq, irq_desc[virt_irq].affinity);
407 424
408 dev_handle = virt_irq_table[virt_irq].dev_handle; 425 dev_handle = virt_irq_table[virt_irq].dev_handle;
409 dev_ino = virt_irq_table[virt_irq].dev_ino; 426 dev_ino = virt_irq_table[virt_irq].dev_ino;
@@ -433,7 +450,7 @@ static int sun4v_virt_set_affinity(unsigned int virt_irq,
433 unsigned long cpuid, dev_handle, dev_ino; 450 unsigned long cpuid, dev_handle, dev_ino;
434 int err; 451 int err;
435 452
436 cpuid = irq_choose_cpu(virt_irq); 453 cpuid = irq_choose_cpu(virt_irq, mask);
437 454
438 dev_handle = virt_irq_table[virt_irq].dev_handle; 455 dev_handle = virt_irq_table[virt_irq].dev_handle;
439 dev_ino = virt_irq_table[virt_irq].dev_ino; 456 dev_ino = virt_irq_table[virt_irq].dev_ino;
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 85e7037429b9..4e2724ec2bb6 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -30,6 +30,7 @@
30#include <asm/oplib.h> 30#include <asm/oplib.h>
31#include <asm/prom.h> 31#include <asm/prom.h>
32#include <asm/pcic.h> 32#include <asm/pcic.h>
33#include <asm/timex.h>
33#include <asm/timer.h> 34#include <asm/timer.h>
34#include <asm/uaccess.h> 35#include <asm/uaccess.h>
35#include <asm/irq_regs.h> 36#include <asm/irq_regs.h>
@@ -163,8 +164,6 @@ void __iomem *pcic_regs;
163volatile int pcic_speculative; 164volatile int pcic_speculative;
164volatile int pcic_trapped; 165volatile int pcic_trapped;
165 166
166static void pci_do_gettimeofday(struct timeval *tv);
167static int pci_do_settimeofday(struct timespec *tv);
168 167
169#define CONFIG_CMD(bus, device_fn, where) (0x80000000 | (((unsigned int)bus) << 16) | (((unsigned int)device_fn) << 8) | (where & ~3)) 168#define CONFIG_CMD(bus, device_fn, where) (0x80000000 | (((unsigned int)bus) << 16) | (((unsigned int)device_fn) << 8) | (where & ~3))
170 169
@@ -716,19 +715,27 @@ static irqreturn_t pcic_timer_handler (int irq, void *h)
716#define USECS_PER_JIFFY 10000 /* We have 100HZ "standard" timer for sparc */ 715#define USECS_PER_JIFFY 10000 /* We have 100HZ "standard" timer for sparc */
717#define TICK_TIMER_LIMIT ((100*1000000/4)/100) 716#define TICK_TIMER_LIMIT ((100*1000000/4)/100)
718 717
718u32 pci_gettimeoffset(void)
719{
720 /*
721 * We divide all by 100
722 * to have microsecond resolution and to avoid overflow
723 */
724 unsigned long count =
725 readl(pcic0.pcic_regs+PCI_SYS_COUNTER) & ~PCI_SYS_COUNTER_OVERFLOW;
726 count = ((count/100)*USECS_PER_JIFFY) / (TICK_TIMER_LIMIT/100);
727 return count * 1000;
728}
729
730
719void __init pci_time_init(void) 731void __init pci_time_init(void)
720{ 732{
721 struct linux_pcic *pcic = &pcic0; 733 struct linux_pcic *pcic = &pcic0;
722 unsigned long v; 734 unsigned long v;
723 int timer_irq, irq; 735 int timer_irq, irq;
724 736
725 /* A hack until do_gettimeofday prototype is moved to arch specific headers 737 do_arch_gettimeoffset = pci_gettimeoffset;
726 and btfixupped. Patch do_gettimeofday with ba pci_do_gettimeofday; nop */ 738
727 ((unsigned int *)do_gettimeofday)[0] =
728 0x10800000 | ((((unsigned long)pci_do_gettimeofday -
729 (unsigned long)do_gettimeofday) >> 2) & 0x003fffff);
730 ((unsigned int *)do_gettimeofday)[1] = 0x01000000;
731 BTFIXUPSET_CALL(bus_do_settimeofday, pci_do_settimeofday, BTFIXUPCALL_NORM);
732 btfixup(); 739 btfixup();
733 740
734 writel (TICK_TIMER_LIMIT, pcic->pcic_regs+PCI_SYS_LIMIT); 741 writel (TICK_TIMER_LIMIT, pcic->pcic_regs+PCI_SYS_LIMIT);
@@ -746,84 +753,6 @@ void __init pci_time_init(void)
746 local_irq_enable(); 753 local_irq_enable();
747} 754}
748 755
749static inline unsigned long do_gettimeoffset(void)
750{
751 /*
752 * We divide all by 100
753 * to have microsecond resolution and to avoid overflow
754 */
755 unsigned long count =
756 readl(pcic0.pcic_regs+PCI_SYS_COUNTER) & ~PCI_SYS_COUNTER_OVERFLOW;
757 count = ((count/100)*USECS_PER_JIFFY) / (TICK_TIMER_LIMIT/100);
758 return count;
759}
760
761static void pci_do_gettimeofday(struct timeval *tv)
762{
763 unsigned long flags;
764 unsigned long seq;
765 unsigned long usec, sec;
766 unsigned long max_ntp_tick = tick_usec - tickadj;
767
768 do {
769 seq = read_seqbegin_irqsave(&xtime_lock, flags);
770 usec = do_gettimeoffset();
771
772 /*
773 * If time_adjust is negative then NTP is slowing the clock
774 * so make sure not to go into next possible interval.
775 * Better to lose some accuracy than have time go backwards..
776 */
777 if (unlikely(time_adjust < 0))
778 usec = min(usec, max_ntp_tick);
779
780 sec = xtime.tv_sec;
781 usec += (xtime.tv_nsec / 1000);
782 } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
783
784 while (usec >= 1000000) {
785 usec -= 1000000;
786 sec++;
787 }
788
789 tv->tv_sec = sec;
790 tv->tv_usec = usec;
791}
792
793static int pci_do_settimeofday(struct timespec *tv)
794{
795 if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
796 return -EINVAL;
797
798 /*
799 * This is revolting. We need to set "xtime" correctly. However, the
800 * value in this location is the value at the most recent update of
801 * wall time. Discover what correction gettimeofday() would have
802 * made, and then undo it!
803 */
804 tv->tv_nsec -= 1000 * do_gettimeoffset();
805 while (tv->tv_nsec < 0) {
806 tv->tv_nsec += NSEC_PER_SEC;
807 tv->tv_sec--;
808 }
809
810 wall_to_monotonic.tv_sec += xtime.tv_sec - tv->tv_sec;
811 wall_to_monotonic.tv_nsec += xtime.tv_nsec - tv->tv_nsec;
812
813 if (wall_to_monotonic.tv_nsec > NSEC_PER_SEC) {
814 wall_to_monotonic.tv_nsec -= NSEC_PER_SEC;
815 wall_to_monotonic.tv_sec++;
816 }
817 if (wall_to_monotonic.tv_nsec < 0) {
818 wall_to_monotonic.tv_nsec += NSEC_PER_SEC;
819 wall_to_monotonic.tv_sec--;
820 }
821
822 xtime.tv_sec = tv->tv_sec;
823 xtime.tv_nsec = tv->tv_nsec;
824 ntp_clear();
825 return 0;
826}
827 756
828#if 0 757#if 0
829static void watchdog_reset() { 758static void watchdog_reset() {
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c
index 198fb4e79ba2..e856456ec02f 100644
--- a/arch/sparc/kernel/perf_event.c
+++ b/arch/sparc/kernel/perf_event.c
@@ -1,6 +1,6 @@
1/* Performance event support for sparc64. 1/* Performance event support for sparc64.
2 * 2 *
3 * Copyright (C) 2009 David S. Miller <davem@davemloft.net> 3 * Copyright (C) 2009, 2010 David S. Miller <davem@davemloft.net>
4 * 4 *
5 * This code is based almost entirely upon the x86 perf event 5 * This code is based almost entirely upon the x86 perf event
6 * code, which is: 6 * code, which is:
@@ -18,11 +18,15 @@
18#include <linux/kdebug.h> 18#include <linux/kdebug.h>
19#include <linux/mutex.h> 19#include <linux/mutex.h>
20 20
21#include <asm/stacktrace.h>
21#include <asm/cpudata.h> 22#include <asm/cpudata.h>
23#include <asm/uaccess.h>
22#include <asm/atomic.h> 24#include <asm/atomic.h>
23#include <asm/nmi.h> 25#include <asm/nmi.h>
24#include <asm/pcr.h> 26#include <asm/pcr.h>
25 27
28#include "kstack.h"
29
26/* Sparc64 chips have two performance counters, 32-bits each, with 30/* Sparc64 chips have two performance counters, 32-bits each, with
27 * overflow interrupts generated on transition from 0xffffffff to 0. 31 * overflow interrupts generated on transition from 0xffffffff to 0.
28 * The counters are accessed in one go using a 64-bit register. 32 * The counters are accessed in one go using a 64-bit register.
@@ -51,16 +55,49 @@
51 55
52#define PIC_UPPER_INDEX 0 56#define PIC_UPPER_INDEX 0
53#define PIC_LOWER_INDEX 1 57#define PIC_LOWER_INDEX 1
58#define PIC_NO_INDEX -1
54 59
55struct cpu_hw_events { 60struct cpu_hw_events {
56 struct perf_event *events[MAX_HWEVENTS]; 61 /* Number of events currently scheduled onto this cpu.
57 unsigned long used_mask[BITS_TO_LONGS(MAX_HWEVENTS)]; 62 * This tells how many entries in the arrays below
58 unsigned long active_mask[BITS_TO_LONGS(MAX_HWEVENTS)]; 63 * are valid.
64 */
65 int n_events;
66
67 /* Number of new events added since the last hw_perf_disable().
68 * This works because the perf event layer always adds new
69 * events inside of a perf_{disable,enable}() sequence.
70 */
71 int n_added;
72
73 /* Array of events current scheduled on this cpu. */
74 struct perf_event *event[MAX_HWEVENTS];
75
76 /* Array of encoded longs, specifying the %pcr register
77 * encoding and the mask of PIC counters this even can
78 * be scheduled on. See perf_event_encode() et al.
79 */
80 unsigned long events[MAX_HWEVENTS];
81
82 /* The current counter index assigned to an event. When the
83 * event hasn't been programmed into the cpu yet, this will
84 * hold PIC_NO_INDEX. The event->hw.idx value tells us where
85 * we ought to schedule the event.
86 */
87 int current_idx[MAX_HWEVENTS];
88
89 /* Software copy of %pcr register on this cpu. */
59 u64 pcr; 90 u64 pcr;
91
92 /* Enabled/disable state. */
60 int enabled; 93 int enabled;
61}; 94};
62DEFINE_PER_CPU(struct cpu_hw_events, cpu_hw_events) = { .enabled = 1, }; 95DEFINE_PER_CPU(struct cpu_hw_events, cpu_hw_events) = { .enabled = 1, };
63 96
97/* An event map describes the characteristics of a performance
98 * counter event. In particular it gives the encoding as well as
99 * a mask telling which counters the event can be measured on.
100 */
64struct perf_event_map { 101struct perf_event_map {
65 u16 encoding; 102 u16 encoding;
66 u8 pic_mask; 103 u8 pic_mask;
@@ -69,15 +106,20 @@ struct perf_event_map {
69#define PIC_LOWER 0x02 106#define PIC_LOWER 0x02
70}; 107};
71 108
109/* Encode a perf_event_map entry into a long. */
72static unsigned long perf_event_encode(const struct perf_event_map *pmap) 110static unsigned long perf_event_encode(const struct perf_event_map *pmap)
73{ 111{
74 return ((unsigned long) pmap->encoding << 16) | pmap->pic_mask; 112 return ((unsigned long) pmap->encoding << 16) | pmap->pic_mask;
75} 113}
76 114
77static void perf_event_decode(unsigned long val, u16 *enc, u8 *msk) 115static u8 perf_event_get_msk(unsigned long val)
78{ 116{
79 *msk = val & 0xff; 117 return val & 0xff;
80 *enc = val >> 16; 118}
119
120static u64 perf_event_get_enc(unsigned long val)
121{
122 return val >> 16;
81} 123}
82 124
83#define C(x) PERF_COUNT_HW_CACHE_##x 125#define C(x) PERF_COUNT_HW_CACHE_##x
@@ -491,53 +533,6 @@ static inline void sparc_pmu_disable_event(struct cpu_hw_events *cpuc, struct hw
491 pcr_ops->write(cpuc->pcr); 533 pcr_ops->write(cpuc->pcr);
492} 534}
493 535
494void hw_perf_enable(void)
495{
496 struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
497 u64 val;
498 int i;
499
500 if (cpuc->enabled)
501 return;
502
503 cpuc->enabled = 1;
504 barrier();
505
506 val = cpuc->pcr;
507
508 for (i = 0; i < MAX_HWEVENTS; i++) {
509 struct perf_event *cp = cpuc->events[i];
510 struct hw_perf_event *hwc;
511
512 if (!cp)
513 continue;
514 hwc = &cp->hw;
515 val |= hwc->config_base;
516 }
517
518 cpuc->pcr = val;
519
520 pcr_ops->write(cpuc->pcr);
521}
522
523void hw_perf_disable(void)
524{
525 struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
526 u64 val;
527
528 if (!cpuc->enabled)
529 return;
530
531 cpuc->enabled = 0;
532
533 val = cpuc->pcr;
534 val &= ~(PCR_UTRACE | PCR_STRACE |
535 sparc_pmu->hv_bit | sparc_pmu->irq_bit);
536 cpuc->pcr = val;
537
538 pcr_ops->write(cpuc->pcr);
539}
540
541static u32 read_pmc(int idx) 536static u32 read_pmc(int idx)
542{ 537{
543 u64 val; 538 u64 val;
@@ -566,6 +561,30 @@ static void write_pmc(int idx, u64 val)
566 write_pic(pic); 561 write_pic(pic);
567} 562}
568 563
564static u64 sparc_perf_event_update(struct perf_event *event,
565 struct hw_perf_event *hwc, int idx)
566{
567 int shift = 64 - 32;
568 u64 prev_raw_count, new_raw_count;
569 s64 delta;
570
571again:
572 prev_raw_count = atomic64_read(&hwc->prev_count);
573 new_raw_count = read_pmc(idx);
574
575 if (atomic64_cmpxchg(&hwc->prev_count, prev_raw_count,
576 new_raw_count) != prev_raw_count)
577 goto again;
578
579 delta = (new_raw_count << shift) - (prev_raw_count << shift);
580 delta >>= shift;
581
582 atomic64_add(delta, &event->count);
583 atomic64_sub(delta, &hwc->period_left);
584
585 return new_raw_count;
586}
587
569static int sparc_perf_event_set_period(struct perf_event *event, 588static int sparc_perf_event_set_period(struct perf_event *event,
570 struct hw_perf_event *hwc, int idx) 589 struct hw_perf_event *hwc, int idx)
571{ 590{
@@ -598,81 +617,166 @@ static int sparc_perf_event_set_period(struct perf_event *event,
598 return ret; 617 return ret;
599} 618}
600 619
601static int sparc_pmu_enable(struct perf_event *event) 620/* If performance event entries have been added, move existing
621 * events around (if necessary) and then assign new entries to
622 * counters.
623 */
624static u64 maybe_change_configuration(struct cpu_hw_events *cpuc, u64 pcr)
602{ 625{
603 struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events); 626 int i;
604 struct hw_perf_event *hwc = &event->hw;
605 int idx = hwc->idx;
606 627
607 if (test_and_set_bit(idx, cpuc->used_mask)) 628 if (!cpuc->n_added)
608 return -EAGAIN; 629 goto out;
609 630
610 sparc_pmu_disable_event(cpuc, hwc, idx); 631 /* Read in the counters which are moving. */
632 for (i = 0; i < cpuc->n_events; i++) {
633 struct perf_event *cp = cpuc->event[i];
611 634
612 cpuc->events[idx] = event; 635 if (cpuc->current_idx[i] != PIC_NO_INDEX &&
613 set_bit(idx, cpuc->active_mask); 636 cpuc->current_idx[i] != cp->hw.idx) {
637 sparc_perf_event_update(cp, &cp->hw,
638 cpuc->current_idx[i]);
639 cpuc->current_idx[i] = PIC_NO_INDEX;
640 }
641 }
614 642
615 sparc_perf_event_set_period(event, hwc, idx); 643 /* Assign to counters all unassigned events. */
616 sparc_pmu_enable_event(cpuc, hwc, idx); 644 for (i = 0; i < cpuc->n_events; i++) {
617 perf_event_update_userpage(event); 645 struct perf_event *cp = cpuc->event[i];
618 return 0; 646 struct hw_perf_event *hwc = &cp->hw;
647 int idx = hwc->idx;
648 u64 enc;
649
650 if (cpuc->current_idx[i] != PIC_NO_INDEX)
651 continue;
652
653 sparc_perf_event_set_period(cp, hwc, idx);
654 cpuc->current_idx[i] = idx;
655
656 enc = perf_event_get_enc(cpuc->events[i]);
657 pcr |= event_encoding(enc, idx);
658 }
659out:
660 return pcr;
619} 661}
620 662
621static u64 sparc_perf_event_update(struct perf_event *event, 663void hw_perf_enable(void)
622 struct hw_perf_event *hwc, int idx)
623{ 664{
624 int shift = 64 - 32; 665 struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
625 u64 prev_raw_count, new_raw_count; 666 u64 pcr;
626 s64 delta;
627 667
628again: 668 if (cpuc->enabled)
629 prev_raw_count = atomic64_read(&hwc->prev_count); 669 return;
630 new_raw_count = read_pmc(idx);
631 670
632 if (atomic64_cmpxchg(&hwc->prev_count, prev_raw_count, 671 cpuc->enabled = 1;
633 new_raw_count) != prev_raw_count) 672 barrier();
634 goto again;
635 673
636 delta = (new_raw_count << shift) - (prev_raw_count << shift); 674 pcr = cpuc->pcr;
637 delta >>= shift; 675 if (!cpuc->n_events) {
676 pcr = 0;
677 } else {
678 pcr = maybe_change_configuration(cpuc, pcr);
638 679
639 atomic64_add(delta, &event->count); 680 /* We require that all of the events have the same
640 atomic64_sub(delta, &hwc->period_left); 681 * configuration, so just fetch the settings from the
682 * first entry.
683 */
684 cpuc->pcr = pcr | cpuc->event[0]->hw.config_base;
685 }
641 686
642 return new_raw_count; 687 pcr_ops->write(cpuc->pcr);
688}
689
690void hw_perf_disable(void)
691{
692 struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
693 u64 val;
694
695 if (!cpuc->enabled)
696 return;
697
698 cpuc->enabled = 0;
699 cpuc->n_added = 0;
700
701 val = cpuc->pcr;
702 val &= ~(PCR_UTRACE | PCR_STRACE |
703 sparc_pmu->hv_bit | sparc_pmu->irq_bit);
704 cpuc->pcr = val;
705
706 pcr_ops->write(cpuc->pcr);
643} 707}
644 708
645static void sparc_pmu_disable(struct perf_event *event) 709static void sparc_pmu_disable(struct perf_event *event)
646{ 710{
647 struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events); 711 struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
648 struct hw_perf_event *hwc = &event->hw; 712 struct hw_perf_event *hwc = &event->hw;
649 int idx = hwc->idx; 713 unsigned long flags;
714 int i;
650 715
651 clear_bit(idx, cpuc->active_mask); 716 local_irq_save(flags);
652 sparc_pmu_disable_event(cpuc, hwc, idx); 717 perf_disable();
718
719 for (i = 0; i < cpuc->n_events; i++) {
720 if (event == cpuc->event[i]) {
721 int idx = cpuc->current_idx[i];
722
723 /* Shift remaining entries down into
724 * the existing slot.
725 */
726 while (++i < cpuc->n_events) {
727 cpuc->event[i - 1] = cpuc->event[i];
728 cpuc->events[i - 1] = cpuc->events[i];
729 cpuc->current_idx[i - 1] =
730 cpuc->current_idx[i];
731 }
732
733 /* Absorb the final count and turn off the
734 * event.
735 */
736 sparc_pmu_disable_event(cpuc, hwc, idx);
737 barrier();
738 sparc_perf_event_update(event, hwc, idx);
653 739
654 barrier(); 740 perf_event_update_userpage(event);
655 741
656 sparc_perf_event_update(event, hwc, idx); 742 cpuc->n_events--;
657 cpuc->events[idx] = NULL; 743 break;
658 clear_bit(idx, cpuc->used_mask); 744 }
745 }
659 746
660 perf_event_update_userpage(event); 747 perf_enable();
748 local_irq_restore(flags);
749}
750
751static int active_event_index(struct cpu_hw_events *cpuc,
752 struct perf_event *event)
753{
754 int i;
755
756 for (i = 0; i < cpuc->n_events; i++) {
757 if (cpuc->event[i] == event)
758 break;
759 }
760 BUG_ON(i == cpuc->n_events);
761 return cpuc->current_idx[i];
661} 762}
662 763
663static void sparc_pmu_read(struct perf_event *event) 764static void sparc_pmu_read(struct perf_event *event)
664{ 765{
766 struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
767 int idx = active_event_index(cpuc, event);
665 struct hw_perf_event *hwc = &event->hw; 768 struct hw_perf_event *hwc = &event->hw;
666 769
667 sparc_perf_event_update(event, hwc, hwc->idx); 770 sparc_perf_event_update(event, hwc, idx);
668} 771}
669 772
670static void sparc_pmu_unthrottle(struct perf_event *event) 773static void sparc_pmu_unthrottle(struct perf_event *event)
671{ 774{
672 struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events); 775 struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
776 int idx = active_event_index(cpuc, event);
673 struct hw_perf_event *hwc = &event->hw; 777 struct hw_perf_event *hwc = &event->hw;
674 778
675 sparc_pmu_enable_event(cpuc, hwc, hwc->idx); 779 sparc_pmu_enable_event(cpuc, hwc, idx);
676} 780}
677 781
678static atomic_t active_events = ATOMIC_INIT(0); 782static atomic_t active_events = ATOMIC_INIT(0);
@@ -750,43 +854,75 @@ static void hw_perf_event_destroy(struct perf_event *event)
750/* Make sure all events can be scheduled into the hardware at 854/* Make sure all events can be scheduled into the hardware at
751 * the same time. This is simplified by the fact that we only 855 * the same time. This is simplified by the fact that we only
752 * need to support 2 simultaneous HW events. 856 * need to support 2 simultaneous HW events.
857 *
858 * As a side effect, the evts[]->hw.idx values will be assigned
859 * on success. These are pending indexes. When the events are
860 * actually programmed into the chip, these values will propagate
861 * to the per-cpu cpuc->current_idx[] slots, see the code in
862 * maybe_change_configuration() for details.
753 */ 863 */
754static int sparc_check_constraints(unsigned long *events, int n_ev) 864static int sparc_check_constraints(struct perf_event **evts,
865 unsigned long *events, int n_ev)
755{ 866{
756 if (n_ev <= perf_max_events) { 867 u8 msk0 = 0, msk1 = 0;
757 u8 msk1, msk2; 868 int idx0 = 0;
758 u16 dummy; 869
759 870 /* This case is possible when we are invoked from
760 if (n_ev == 1) 871 * hw_perf_group_sched_in().
761 return 0; 872 */
762 BUG_ON(n_ev != 2); 873 if (!n_ev)
763 perf_event_decode(events[0], &dummy, &msk1); 874 return 0;
764 perf_event_decode(events[1], &dummy, &msk2); 875
765 876 if (n_ev > perf_max_events)
766 /* If both events can go on any counter, OK. */ 877 return -1;
767 if (msk1 == (PIC_UPPER | PIC_LOWER) && 878
768 msk2 == (PIC_UPPER | PIC_LOWER)) 879 msk0 = perf_event_get_msk(events[0]);
769 return 0; 880 if (n_ev == 1) {
770 881 if (msk0 & PIC_LOWER)
771 /* If one event is limited to a specific counter, 882 idx0 = 1;
772 * and the other can go on both, OK. 883 goto success;
773 */
774 if ((msk1 == PIC_UPPER || msk1 == PIC_LOWER) &&
775 msk2 == (PIC_UPPER | PIC_LOWER))
776 return 0;
777 if ((msk2 == PIC_UPPER || msk2 == PIC_LOWER) &&
778 msk1 == (PIC_UPPER | PIC_LOWER))
779 return 0;
780
781 /* If the events are fixed to different counters, OK. */
782 if ((msk1 == PIC_UPPER && msk2 == PIC_LOWER) ||
783 (msk1 == PIC_LOWER && msk2 == PIC_UPPER))
784 return 0;
785
786 /* Otherwise, there is a conflict. */
787 } 884 }
885 BUG_ON(n_ev != 2);
886 msk1 = perf_event_get_msk(events[1]);
887
888 /* If both events can go on any counter, OK. */
889 if (msk0 == (PIC_UPPER | PIC_LOWER) &&
890 msk1 == (PIC_UPPER | PIC_LOWER))
891 goto success;
788 892
893 /* If one event is limited to a specific counter,
894 * and the other can go on both, OK.
895 */
896 if ((msk0 == PIC_UPPER || msk0 == PIC_LOWER) &&
897 msk1 == (PIC_UPPER | PIC_LOWER)) {
898 if (msk0 & PIC_LOWER)
899 idx0 = 1;
900 goto success;
901 }
902
903 if ((msk1 == PIC_UPPER || msk1 == PIC_LOWER) &&
904 msk0 == (PIC_UPPER | PIC_LOWER)) {
905 if (msk1 & PIC_UPPER)
906 idx0 = 1;
907 goto success;
908 }
909
910 /* If the events are fixed to different counters, OK. */
911 if ((msk0 == PIC_UPPER && msk1 == PIC_LOWER) ||
912 (msk0 == PIC_LOWER && msk1 == PIC_UPPER)) {
913 if (msk0 & PIC_LOWER)
914 idx0 = 1;
915 goto success;
916 }
917
918 /* Otherwise, there is a conflict. */
789 return -1; 919 return -1;
920
921success:
922 evts[0]->hw.idx = idx0;
923 if (n_ev == 2)
924 evts[1]->hw.idx = idx0 ^ 1;
925 return 0;
790} 926}
791 927
792static int check_excludes(struct perf_event **evts, int n_prev, int n_new) 928static int check_excludes(struct perf_event **evts, int n_prev, int n_new)
@@ -818,7 +954,8 @@ static int check_excludes(struct perf_event **evts, int n_prev, int n_new)
818} 954}
819 955
820static int collect_events(struct perf_event *group, int max_count, 956static int collect_events(struct perf_event *group, int max_count,
821 struct perf_event *evts[], unsigned long *events) 957 struct perf_event *evts[], unsigned long *events,
958 int *current_idx)
822{ 959{
823 struct perf_event *event; 960 struct perf_event *event;
824 int n = 0; 961 int n = 0;
@@ -827,7 +964,8 @@ static int collect_events(struct perf_event *group, int max_count,
827 if (n >= max_count) 964 if (n >= max_count)
828 return -1; 965 return -1;
829 evts[n] = group; 966 evts[n] = group;
830 events[n++] = group->hw.event_base; 967 events[n] = group->hw.event_base;
968 current_idx[n++] = PIC_NO_INDEX;
831 } 969 }
832 list_for_each_entry(event, &group->sibling_list, group_entry) { 970 list_for_each_entry(event, &group->sibling_list, group_entry) {
833 if (!is_software_event(event) && 971 if (!is_software_event(event) &&
@@ -835,20 +973,100 @@ static int collect_events(struct perf_event *group, int max_count,
835 if (n >= max_count) 973 if (n >= max_count)
836 return -1; 974 return -1;
837 evts[n] = event; 975 evts[n] = event;
838 events[n++] = event->hw.event_base; 976 events[n] = event->hw.event_base;
977 current_idx[n++] = PIC_NO_INDEX;
839 } 978 }
840 } 979 }
841 return n; 980 return n;
842} 981}
843 982
983static void event_sched_in(struct perf_event *event, int cpu)
984{
985 event->state = PERF_EVENT_STATE_ACTIVE;
986 event->oncpu = cpu;
987 event->tstamp_running += event->ctx->time - event->tstamp_stopped;
988 if (is_software_event(event))
989 event->pmu->enable(event);
990}
991
992int hw_perf_group_sched_in(struct perf_event *group_leader,
993 struct perf_cpu_context *cpuctx,
994 struct perf_event_context *ctx, int cpu)
995{
996 struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
997 struct perf_event *sub;
998 int n0, n;
999
1000 if (!sparc_pmu)
1001 return 0;
1002
1003 n0 = cpuc->n_events;
1004 n = collect_events(group_leader, perf_max_events - n0,
1005 &cpuc->event[n0], &cpuc->events[n0],
1006 &cpuc->current_idx[n0]);
1007 if (n < 0)
1008 return -EAGAIN;
1009 if (check_excludes(cpuc->event, n0, n))
1010 return -EINVAL;
1011 if (sparc_check_constraints(cpuc->event, cpuc->events, n + n0))
1012 return -EAGAIN;
1013 cpuc->n_events = n0 + n;
1014 cpuc->n_added += n;
1015
1016 cpuctx->active_oncpu += n;
1017 n = 1;
1018 event_sched_in(group_leader, cpu);
1019 list_for_each_entry(sub, &group_leader->sibling_list, group_entry) {
1020 if (sub->state != PERF_EVENT_STATE_OFF) {
1021 event_sched_in(sub, cpu);
1022 n++;
1023 }
1024 }
1025 ctx->nr_active += n;
1026
1027 return 1;
1028}
1029
1030static int sparc_pmu_enable(struct perf_event *event)
1031{
1032 struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
1033 int n0, ret = -EAGAIN;
1034 unsigned long flags;
1035
1036 local_irq_save(flags);
1037 perf_disable();
1038
1039 n0 = cpuc->n_events;
1040 if (n0 >= perf_max_events)
1041 goto out;
1042
1043 cpuc->event[n0] = event;
1044 cpuc->events[n0] = event->hw.event_base;
1045 cpuc->current_idx[n0] = PIC_NO_INDEX;
1046
1047 if (check_excludes(cpuc->event, n0, 1))
1048 goto out;
1049 if (sparc_check_constraints(cpuc->event, cpuc->events, n0 + 1))
1050 goto out;
1051
1052 cpuc->n_events++;
1053 cpuc->n_added++;
1054
1055 ret = 0;
1056out:
1057 perf_enable();
1058 local_irq_restore(flags);
1059 return ret;
1060}
1061
844static int __hw_perf_event_init(struct perf_event *event) 1062static int __hw_perf_event_init(struct perf_event *event)
845{ 1063{
846 struct perf_event_attr *attr = &event->attr; 1064 struct perf_event_attr *attr = &event->attr;
847 struct perf_event *evts[MAX_HWEVENTS]; 1065 struct perf_event *evts[MAX_HWEVENTS];
848 struct hw_perf_event *hwc = &event->hw; 1066 struct hw_perf_event *hwc = &event->hw;
849 unsigned long events[MAX_HWEVENTS]; 1067 unsigned long events[MAX_HWEVENTS];
1068 int current_idx_dmy[MAX_HWEVENTS];
850 const struct perf_event_map *pmap; 1069 const struct perf_event_map *pmap;
851 u64 enc;
852 int n; 1070 int n;
853 1071
854 if (atomic_read(&nmi_active) < 0) 1072 if (atomic_read(&nmi_active) < 0)
@@ -865,10 +1083,7 @@ static int __hw_perf_event_init(struct perf_event *event)
865 } else 1083 } else
866 return -EOPNOTSUPP; 1084 return -EOPNOTSUPP;
867 1085
868 /* We save the enable bits in the config_base. So to 1086 /* We save the enable bits in the config_base. */
869 * turn off sampling just write 'config', and to enable
870 * things write 'config | config_base'.
871 */
872 hwc->config_base = sparc_pmu->irq_bit; 1087 hwc->config_base = sparc_pmu->irq_bit;
873 if (!attr->exclude_user) 1088 if (!attr->exclude_user)
874 hwc->config_base |= PCR_UTRACE; 1089 hwc->config_base |= PCR_UTRACE;
@@ -879,13 +1094,11 @@ static int __hw_perf_event_init(struct perf_event *event)
879 1094
880 hwc->event_base = perf_event_encode(pmap); 1095 hwc->event_base = perf_event_encode(pmap);
881 1096
882 enc = pmap->encoding;
883
884 n = 0; 1097 n = 0;
885 if (event->group_leader != event) { 1098 if (event->group_leader != event) {
886 n = collect_events(event->group_leader, 1099 n = collect_events(event->group_leader,
887 perf_max_events - 1, 1100 perf_max_events - 1,
888 evts, events); 1101 evts, events, current_idx_dmy);
889 if (n < 0) 1102 if (n < 0)
890 return -EINVAL; 1103 return -EINVAL;
891 } 1104 }
@@ -895,9 +1108,11 @@ static int __hw_perf_event_init(struct perf_event *event)
895 if (check_excludes(evts, n, 1)) 1108 if (check_excludes(evts, n, 1))
896 return -EINVAL; 1109 return -EINVAL;
897 1110
898 if (sparc_check_constraints(events, n + 1)) 1111 if (sparc_check_constraints(evts, events, n + 1))
899 return -EINVAL; 1112 return -EINVAL;
900 1113
1114 hwc->idx = PIC_NO_INDEX;
1115
901 /* Try to do all error checking before this point, as unwinding 1116 /* Try to do all error checking before this point, as unwinding
902 * state after grabbing the PMC is difficult. 1117 * state after grabbing the PMC is difficult.
903 */ 1118 */
@@ -910,15 +1125,6 @@ static int __hw_perf_event_init(struct perf_event *event)
910 atomic64_set(&hwc->period_left, hwc->sample_period); 1125 atomic64_set(&hwc->period_left, hwc->sample_period);
911 } 1126 }
912 1127
913 if (pmap->pic_mask & PIC_UPPER) {
914 hwc->idx = PIC_UPPER_INDEX;
915 enc <<= sparc_pmu->upper_shift;
916 } else {
917 hwc->idx = PIC_LOWER_INDEX;
918 enc <<= sparc_pmu->lower_shift;
919 }
920
921 hwc->config |= enc;
922 return 0; 1128 return 0;
923} 1129}
924 1130
@@ -968,7 +1174,7 @@ static int __kprobes perf_event_nmi_handler(struct notifier_block *self,
968 struct perf_sample_data data; 1174 struct perf_sample_data data;
969 struct cpu_hw_events *cpuc; 1175 struct cpu_hw_events *cpuc;
970 struct pt_regs *regs; 1176 struct pt_regs *regs;
971 int idx; 1177 int i;
972 1178
973 if (!atomic_read(&active_events)) 1179 if (!atomic_read(&active_events))
974 return NOTIFY_DONE; 1180 return NOTIFY_DONE;
@@ -997,13 +1203,12 @@ static int __kprobes perf_event_nmi_handler(struct notifier_block *self,
997 if (sparc_pmu->irq_bit) 1203 if (sparc_pmu->irq_bit)
998 pcr_ops->write(cpuc->pcr); 1204 pcr_ops->write(cpuc->pcr);
999 1205
1000 for (idx = 0; idx < MAX_HWEVENTS; idx++) { 1206 for (i = 0; i < cpuc->n_events; i++) {
1001 struct perf_event *event = cpuc->events[idx]; 1207 struct perf_event *event = cpuc->event[i];
1208 int idx = cpuc->current_idx[i];
1002 struct hw_perf_event *hwc; 1209 struct hw_perf_event *hwc;
1003 u64 val; 1210 u64 val;
1004 1211
1005 if (!test_bit(idx, cpuc->active_mask))
1006 continue;
1007 hwc = &event->hw; 1212 hwc = &event->hw;
1008 val = sparc_perf_event_update(event, hwc, idx); 1213 val = sparc_perf_event_update(event, hwc, idx);
1009 if (val & (1ULL << 31)) 1214 if (val & (1ULL << 31))
@@ -1055,10 +1260,122 @@ void __init init_hw_perf_events(void)
1055 1260
1056 pr_cont("Supported PMU type is '%s'\n", sparc_pmu_type); 1261 pr_cont("Supported PMU type is '%s'\n", sparc_pmu_type);
1057 1262
1058 /* All sparc64 PMUs currently have 2 events. But this simple 1263 /* All sparc64 PMUs currently have 2 events. */
1059 * driver only supports one active event at a time. 1264 perf_max_events = 2;
1060 */
1061 perf_max_events = 1;
1062 1265
1063 register_die_notifier(&perf_event_nmi_notifier); 1266 register_die_notifier(&perf_event_nmi_notifier);
1064} 1267}
1268
1269static inline void callchain_store(struct perf_callchain_entry *entry, u64 ip)
1270{
1271 if (entry->nr < PERF_MAX_STACK_DEPTH)
1272 entry->ip[entry->nr++] = ip;
1273}
1274
1275static void perf_callchain_kernel(struct pt_regs *regs,
1276 struct perf_callchain_entry *entry)
1277{
1278 unsigned long ksp, fp;
1279
1280 callchain_store(entry, PERF_CONTEXT_KERNEL);
1281 callchain_store(entry, regs->tpc);
1282
1283 ksp = regs->u_regs[UREG_I6];
1284 fp = ksp + STACK_BIAS;
1285 do {
1286 struct sparc_stackf *sf;
1287 struct pt_regs *regs;
1288 unsigned long pc;
1289
1290 if (!kstack_valid(current_thread_info(), fp))
1291 break;
1292
1293 sf = (struct sparc_stackf *) fp;
1294 regs = (struct pt_regs *) (sf + 1);
1295
1296 if (kstack_is_trap_frame(current_thread_info(), regs)) {
1297 if (user_mode(regs))
1298 break;
1299 pc = regs->tpc;
1300 fp = regs->u_regs[UREG_I6] + STACK_BIAS;
1301 } else {
1302 pc = sf->callers_pc;
1303 fp = (unsigned long)sf->fp + STACK_BIAS;
1304 }
1305 callchain_store(entry, pc);
1306 } while (entry->nr < PERF_MAX_STACK_DEPTH);
1307}
1308
1309static void perf_callchain_user_64(struct pt_regs *regs,
1310 struct perf_callchain_entry *entry)
1311{
1312 unsigned long ufp;
1313
1314 callchain_store(entry, PERF_CONTEXT_USER);
1315 callchain_store(entry, regs->tpc);
1316
1317 ufp = regs->u_regs[UREG_I6] + STACK_BIAS;
1318 do {
1319 struct sparc_stackf *usf, sf;
1320 unsigned long pc;
1321
1322 usf = (struct sparc_stackf *) ufp;
1323 if (__copy_from_user_inatomic(&sf, usf, sizeof(sf)))
1324 break;
1325
1326 pc = sf.callers_pc;
1327 ufp = (unsigned long)sf.fp + STACK_BIAS;
1328 callchain_store(entry, pc);
1329 } while (entry->nr < PERF_MAX_STACK_DEPTH);
1330}
1331
1332static void perf_callchain_user_32(struct pt_regs *regs,
1333 struct perf_callchain_entry *entry)
1334{
1335 unsigned long ufp;
1336
1337 callchain_store(entry, PERF_CONTEXT_USER);
1338 callchain_store(entry, regs->tpc);
1339
1340 ufp = regs->u_regs[UREG_I6];
1341 do {
1342 struct sparc_stackf32 *usf, sf;
1343 unsigned long pc;
1344
1345 usf = (struct sparc_stackf32 *) ufp;
1346 if (__copy_from_user_inatomic(&sf, usf, sizeof(sf)))
1347 break;
1348
1349 pc = sf.callers_pc;
1350 ufp = (unsigned long)sf.fp;
1351 callchain_store(entry, pc);
1352 } while (entry->nr < PERF_MAX_STACK_DEPTH);
1353}
1354
1355/* Like powerpc we can't get PMU interrupts within the PMU handler,
1356 * so no need for seperate NMI and IRQ chains as on x86.
1357 */
1358static DEFINE_PER_CPU(struct perf_callchain_entry, callchain);
1359
1360struct perf_callchain_entry *perf_callchain(struct pt_regs *regs)
1361{
1362 struct perf_callchain_entry *entry = &__get_cpu_var(callchain);
1363
1364 entry->nr = 0;
1365 if (!user_mode(regs)) {
1366 stack_trace_flush();
1367 perf_callchain_kernel(regs, entry);
1368 if (current->mm)
1369 regs = task_pt_regs(current);
1370 else
1371 regs = NULL;
1372 }
1373 if (regs) {
1374 flushw_user();
1375 if (test_thread_flag(TIF_32BIT))
1376 perf_callchain_user_32(regs, entry);
1377 else
1378 perf_callchain_user_64(regs, entry);
1379 }
1380 return entry;
1381}
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index 18d67854a1b8..c3f1cce0e95e 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -365,14 +365,6 @@ void flush_thread(void)
365 struct thread_info *t = current_thread_info(); 365 struct thread_info *t = current_thread_info();
366 struct mm_struct *mm; 366 struct mm_struct *mm;
367 367
368 if (test_ti_thread_flag(t, TIF_ABI_PENDING)) {
369 clear_ti_thread_flag(t, TIF_ABI_PENDING);
370 if (test_ti_thread_flag(t, TIF_32BIT))
371 clear_ti_thread_flag(t, TIF_32BIT);
372 else
373 set_ti_thread_flag(t, TIF_32BIT);
374 }
375
376 mm = t->task->mm; 368 mm = t->task->mm;
377 if (mm) 369 if (mm)
378 tsb_context_switch(mm); 370 tsb_context_switch(mm);
diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
index cfa0e19abe3b..d77f54316948 100644
--- a/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
@@ -365,6 +365,7 @@ EXPORT_SYMBOL(get_fb_unmapped_area);
365void arch_pick_mmap_layout(struct mm_struct *mm) 365void arch_pick_mmap_layout(struct mm_struct *mm)
366{ 366{
367 unsigned long random_factor = 0UL; 367 unsigned long random_factor = 0UL;
368 unsigned long gap;
368 369
369 if (current->flags & PF_RANDOMIZE) { 370 if (current->flags & PF_RANDOMIZE) {
370 random_factor = get_random_int(); 371 random_factor = get_random_int();
@@ -379,9 +380,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
379 * Fall back to the standard layout if the personality 380 * Fall back to the standard layout if the personality
380 * bit is set, or if the expected stack growth is unlimited: 381 * bit is set, or if the expected stack growth is unlimited:
381 */ 382 */
383 gap = rlimit(RLIMIT_STACK);
382 if (!test_thread_flag(TIF_32BIT) || 384 if (!test_thread_flag(TIF_32BIT) ||
383 (current->personality & ADDR_COMPAT_LAYOUT) || 385 (current->personality & ADDR_COMPAT_LAYOUT) ||
384 current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY || 386 gap == RLIM_INFINITY ||
385 sysctl_legacy_va_layout) { 387 sysctl_legacy_va_layout) {
386 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor; 388 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
387 mm->get_unmapped_area = arch_get_unmapped_area; 389 mm->get_unmapped_area = arch_get_unmapped_area;
@@ -389,9 +391,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
389 } else { 391 } else {
390 /* We know it's 32-bit */ 392 /* We know it's 32-bit */
391 unsigned long task_size = STACK_TOP32; 393 unsigned long task_size = STACK_TOP32;
392 unsigned long gap;
393 394
394 gap = current->signal->rlim[RLIMIT_STACK].rlim_cur;
395 if (gap < 128 * 1024 * 1024) 395 if (gap < 128 * 1024 * 1024)
396 gap = 128 * 1024 * 1024; 396 gap = 128 * 1024 * 1024;
397 if (gap > (task_size / 6 * 5)) 397 if (gap > (task_size / 6 * 5))
diff --git a/arch/sparc/kernel/time_32.c b/arch/sparc/kernel/time_32.c
index 5b2f595fe65b..0d4c09b15efc 100644
--- a/arch/sparc/kernel/time_32.c
+++ b/arch/sparc/kernel/time_32.c
@@ -35,6 +35,7 @@
35#include <linux/platform_device.h> 35#include <linux/platform_device.h>
36 36
37#include <asm/oplib.h> 37#include <asm/oplib.h>
38#include <asm/timex.h>
38#include <asm/timer.h> 39#include <asm/timer.h>
39#include <asm/system.h> 40#include <asm/system.h>
40#include <asm/irq.h> 41#include <asm/irq.h>
@@ -51,7 +52,6 @@ DEFINE_SPINLOCK(rtc_lock);
51EXPORT_SYMBOL(rtc_lock); 52EXPORT_SYMBOL(rtc_lock);
52 53
53static int set_rtc_mmss(unsigned long); 54static int set_rtc_mmss(unsigned long);
54static int sbus_do_settimeofday(struct timespec *tv);
55 55
56unsigned long profile_pc(struct pt_regs *regs) 56unsigned long profile_pc(struct pt_regs *regs)
57{ 57{
@@ -76,6 +76,8 @@ EXPORT_SYMBOL(profile_pc);
76 76
77__volatile__ unsigned int *master_l10_counter; 77__volatile__ unsigned int *master_l10_counter;
78 78
79u32 (*do_arch_gettimeoffset)(void);
80
79/* 81/*
80 * timer_interrupt() needs to keep up the real-time clock, 82 * timer_interrupt() needs to keep up the real-time clock,
81 * as well as call the "do_timer()" routine every clocktick 83 * as well as call the "do_timer()" routine every clocktick
@@ -196,35 +198,14 @@ static int __init clock_init(void)
196{ 198{
197 return of_register_driver(&clock_driver, &of_platform_bus_type); 199 return of_register_driver(&clock_driver, &of_platform_bus_type);
198} 200}
199
200/* Must be after subsys_initcall() so that busses are probed. Must 201/* Must be after subsys_initcall() so that busses are probed. Must
201 * be before device_initcall() because things like the RTC driver 202 * be before device_initcall() because things like the RTC driver
202 * need to see the clock registers. 203 * need to see the clock registers.
203 */ 204 */
204fs_initcall(clock_init); 205fs_initcall(clock_init);
205 206
206static void __init sbus_time_init(void)
207{
208
209 BTFIXUPSET_CALL(bus_do_settimeofday, sbus_do_settimeofday, BTFIXUPCALL_NORM);
210 btfixup();
211
212 sparc_init_timers(timer_interrupt);
213}
214
215void __init time_init(void)
216{
217#ifdef CONFIG_PCI
218 extern void pci_time_init(void);
219 if (pcic_present()) {
220 pci_time_init();
221 return;
222 }
223#endif
224 sbus_time_init();
225}
226 207
227static inline unsigned long do_gettimeoffset(void) 208u32 sbus_do_gettimeoffset(void)
228{ 209{
229 unsigned long val = *master_l10_counter; 210 unsigned long val = *master_l10_counter;
230 unsigned long usec = (val >> 10) & 0x1fffff; 211 unsigned long usec = (val >> 10) & 0x1fffff;
@@ -233,86 +214,39 @@ static inline unsigned long do_gettimeoffset(void)
233 if (val & 0x80000000) 214 if (val & 0x80000000)
234 usec += 1000000 / HZ; 215 usec += 1000000 / HZ;
235 216
236 return usec; 217 return usec * 1000;
237} 218}
238 219
239/* Ok, my cute asm atomicity trick doesn't work anymore.
240 * There are just too many variables that need to be protected
241 * now (both members of xtime, et al.)
242 */
243void do_gettimeofday(struct timeval *tv)
244{
245 unsigned long flags;
246 unsigned long seq;
247 unsigned long usec, sec;
248 unsigned long max_ntp_tick = tick_usec - tickadj;
249
250 do {
251 seq = read_seqbegin_irqsave(&xtime_lock, flags);
252 usec = do_gettimeoffset();
253
254 /*
255 * If time_adjust is negative then NTP is slowing the clock
256 * so make sure not to go into next possible interval.
257 * Better to lose some accuracy than have time go backwards..
258 */
259 if (unlikely(time_adjust < 0))
260 usec = min(usec, max_ntp_tick);
261
262 sec = xtime.tv_sec;
263 usec += (xtime.tv_nsec / 1000);
264 } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
265
266 while (usec >= 1000000) {
267 usec -= 1000000;
268 sec++;
269 }
270 220
271 tv->tv_sec = sec; 221u32 arch_gettimeoffset(void)
272 tv->tv_usec = usec;
273}
274
275EXPORT_SYMBOL(do_gettimeofday);
276
277int do_settimeofday(struct timespec *tv)
278{ 222{
279 int ret; 223 if (unlikely(!do_arch_gettimeoffset))
280 224 return 0;
281 write_seqlock_irq(&xtime_lock); 225 return do_arch_gettimeoffset();
282 ret = bus_do_settimeofday(tv);
283 write_sequnlock_irq(&xtime_lock);
284 clock_was_set();
285 return ret;
286} 226}
287 227
288EXPORT_SYMBOL(do_settimeofday); 228static void __init sbus_time_init(void)
289
290static int sbus_do_settimeofday(struct timespec *tv)
291{ 229{
292 time_t wtm_sec, sec = tv->tv_sec; 230 do_arch_gettimeoffset = sbus_do_gettimeoffset;
293 long wtm_nsec, nsec = tv->tv_nsec;
294 231
295 if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC) 232 btfixup();
296 return -EINVAL;
297
298 /*
299 * This is revolting. We need to set "xtime" correctly. However, the
300 * value in this location is the value at the most recent update of
301 * wall time. Discover what correction gettimeofday() would have
302 * made, and then undo it!
303 */
304 nsec -= 1000 * do_gettimeoffset();
305
306 wtm_sec = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
307 wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
308 233
309 set_normalized_timespec(&xtime, sec, nsec); 234 sparc_init_timers(timer_interrupt);
310 set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); 235}
311 236
312 ntp_clear(); 237void __init time_init(void)
313 return 0; 238{
239#ifdef CONFIG_PCI
240 extern void pci_time_init(void);
241 if (pcic_present()) {
242 pci_time_init();
243 return;
244 }
245#endif
246 sbus_time_init();
314} 247}
315 248
249
316static int set_rtc_mmss(unsigned long secs) 250static int set_rtc_mmss(unsigned long secs)
317{ 251{
318 struct rtc_device *rtc = rtc_class_open("rtc0"); 252 struct rtc_device *rtc = rtc_class_open("rtc0");
diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
index b99f81c4906f..a3413acb8f12 100644
--- a/arch/sparc/mm/fault_32.c
+++ b/arch/sparc/mm/fault_32.c
@@ -18,6 +18,7 @@
18#include <linux/signal.h> 18#include <linux/signal.h>
19#include <linux/mm.h> 19#include <linux/mm.h>
20#include <linux/smp.h> 20#include <linux/smp.h>
21#include <linux/perf_event.h>
21#include <linux/interrupt.h> 22#include <linux/interrupt.h>
22#include <linux/module.h> 23#include <linux/module.h>
23#include <linux/kdebug.h> 24#include <linux/kdebug.h>
@@ -203,6 +204,8 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
203 if (in_atomic() || !mm) 204 if (in_atomic() || !mm)
204 goto no_context; 205 goto no_context;
205 206
207 perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
208
206 down_read(&mm->mmap_sem); 209 down_read(&mm->mmap_sem);
207 210
208 /* 211 /*
@@ -249,10 +252,15 @@ good_area:
249 goto do_sigbus; 252 goto do_sigbus;
250 BUG(); 253 BUG();
251 } 254 }
252 if (fault & VM_FAULT_MAJOR) 255 if (fault & VM_FAULT_MAJOR) {
253 current->maj_flt++; 256 current->maj_flt++;
254 else 257 perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
258 regs, address);
259 } else {
255 current->min_flt++; 260 current->min_flt++;
261 perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
262 regs, address);
263 }
256 up_read(&mm->mmap_sem); 264 up_read(&mm->mmap_sem);
257 return; 265 return;
258 266
diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
index 6081936bf03b..b9d4ff02b8fc 100644
--- a/arch/sparc/mm/fault_64.c
+++ b/arch/sparc/mm/fault_64.c
@@ -16,6 +16,7 @@
16#include <linux/mm.h> 16#include <linux/mm.h>
17#include <linux/module.h> 17#include <linux/module.h>
18#include <linux/init.h> 18#include <linux/init.h>
19#include <linux/perf_event.h>
19#include <linux/interrupt.h> 20#include <linux/interrupt.h>
20#include <linux/kprobes.h> 21#include <linux/kprobes.h>
21#include <linux/kdebug.h> 22#include <linux/kdebug.h>
@@ -296,6 +297,8 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
296 if (in_atomic() || !mm) 297 if (in_atomic() || !mm)
297 goto intr_or_no_mm; 298 goto intr_or_no_mm;
298 299
300 perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
301
299 if (!down_read_trylock(&mm->mmap_sem)) { 302 if (!down_read_trylock(&mm->mmap_sem)) {
300 if ((regs->tstate & TSTATE_PRIV) && 303 if ((regs->tstate & TSTATE_PRIV) &&
301 !search_exception_tables(regs->tpc)) { 304 !search_exception_tables(regs->tpc)) {
@@ -400,11 +403,15 @@ good_area:
400 goto do_sigbus; 403 goto do_sigbus;
401 BUG(); 404 BUG();
402 } 405 }
403 if (fault & VM_FAULT_MAJOR) 406 if (fault & VM_FAULT_MAJOR) {
404 current->maj_flt++; 407 current->maj_flt++;
405 else 408 perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
409 regs, address);
410 } else {
406 current->min_flt++; 411 current->min_flt++;
407 412 perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
413 regs, address);
414 }
408 up_read(&mm->mmap_sem); 415 up_read(&mm->mmap_sem);
409 416
410 mm_rss = get_mm_rss(mm); 417 mm_rss = get_mm_rss(mm);
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 51069245b79a..3b3c36601a7b 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -125,50 +125,36 @@ void mconsole_log(struct mc_request *req)
125void mconsole_proc(struct mc_request *req) 125void mconsole_proc(struct mc_request *req)
126{ 126{
127 struct nameidata nd; 127 struct nameidata nd;
128 struct file_system_type *proc; 128 struct vfsmount *mnt = current->nsproxy->pid_ns->proc_mnt;
129 struct super_block *super;
130 struct file *file; 129 struct file *file;
131 int n, err; 130 int n, err;
132 char *ptr = req->request.data, *buf; 131 char *ptr = req->request.data, *buf;
132 mm_segment_t old_fs = get_fs();
133 133
134 ptr += strlen("proc"); 134 ptr += strlen("proc");
135 ptr = skip_spaces(ptr); 135 ptr = skip_spaces(ptr);
136 136
137 proc = get_fs_type("proc"); 137 err = vfs_path_lookup(mnt->mnt_root, mnt, ptr, LOOKUP_FOLLOW, &nd);
138 if (proc == NULL) { 138 if (err) {
139 mconsole_reply(req, "procfs not registered", 1, 0); 139 mconsole_reply(req, "Failed to look up file", 1, 0);
140 goto out; 140 goto out;
141 } 141 }
142 142
143 super = (*proc->get_sb)(proc, 0, NULL, NULL); 143 err = may_open(&nd.path, MAY_READ, FMODE_READ);
144 put_filesystem(proc); 144 if (result) {
145 if (super == NULL) { 145 mconsole_reply(req, "Failed to open file", 1, 0);
146 mconsole_reply(req, "Failed to get procfs superblock", 1, 0); 146 path_put(&nd.path);
147 goto out; 147 goto out;
148 } 148 }
149 up_write(&super->s_umount);
150
151 nd.path.dentry = super->s_root;
152 nd.path.mnt = NULL;
153 nd.flags = O_RDONLY + 1;
154 nd.last_type = LAST_ROOT;
155
156 /* START: it was experienced that the stability problems are closed
157 * if commenting out these two calls + the below read cycle. To
158 * make UML crash again, it was enough to readd either one.*/
159 err = link_path_walk(ptr, &nd);
160 if (err) {
161 mconsole_reply(req, "Failed to look up file", 1, 0);
162 goto out_kill;
163 }
164 149
165 file = dentry_open(nd.path.dentry, nd.path.mnt, O_RDONLY, 150 file = dentry_open(nd.path.dentry, nd.path.mnt, O_RDONLY,
166 current_cred()); 151 current_cred());
152 err = PTR_ERR(file);
167 if (IS_ERR(file)) { 153 if (IS_ERR(file)) {
168 mconsole_reply(req, "Failed to open file", 1, 0); 154 mconsole_reply(req, "Failed to open file", 1, 0);
169 goto out_kill; 155 path_put(&nd.path);
156 goto out;
170 } 157 }
171 /*END*/
172 158
173 buf = kmalloc(PAGE_SIZE, GFP_KERNEL); 159 buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
174 if (buf == NULL) { 160 if (buf == NULL) {
@@ -176,10 +162,13 @@ void mconsole_proc(struct mc_request *req)
176 goto out_fput; 162 goto out_fput;
177 } 163 }
178 164
179 if ((file->f_op != NULL) && (file->f_op->read != NULL)) { 165 if (file->f_op->read) {
180 do { 166 do {
181 n = (*file->f_op->read)(file, buf, PAGE_SIZE - 1, 167 loff_t pos;
182 &file->f_pos); 168 set_fs(KERNEL_DS);
169 n = vfs_read(file, buf, PAGE_SIZE - 1, &pos);
170 file_pos_write(file, pos);
171 set_fs(old_fs);
183 if (n >= 0) { 172 if (n >= 0) {
184 buf[n] = '\0'; 173 buf[n] = '\0';
185 mconsole_reply(req, buf, 0, (n > 0)); 174 mconsole_reply(req, buf, 0, (n > 0));
@@ -197,8 +186,6 @@ void mconsole_proc(struct mc_request *req)
197 kfree(buf); 186 kfree(buf);
198 out_fput: 187 out_fput:
199 fput(file); 188 fput(file);
200 out_kill:
201 deactivate_super(super);
202 out: ; 189 out: ;
203} 190}
204#endif 191#endif
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index cbcbfdee3ee0..eb4092568f9e 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -989,12 +989,6 @@ config X86_CPUID
989 with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to 989 with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
990 /dev/cpu/31/cpuid. 990 /dev/cpu/31/cpuid.
991 991
992config X86_CPU_DEBUG
993 tristate "/sys/kernel/debug/x86/cpu/* - CPU Debug support"
994 ---help---
995 If you select this option, this will provide various x86 CPUs
996 information through debugfs.
997
998choice 992choice
999 prompt "High Memory Support" 993 prompt "High Memory Support"
1000 default HIGHMEM4G if !X86_NUMAQ 994 default HIGHMEM4G if !X86_NUMAQ
diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
index 2a4d073d2cf1..f9f472462753 100644
--- a/arch/x86/ia32/ia32_aout.c
+++ b/arch/x86/ia32/ia32_aout.c
@@ -308,14 +308,15 @@ static int load_aout_binary(struct linux_binprm *bprm, struct pt_regs *regs)
308 if (retval) 308 if (retval)
309 return retval; 309 return retval;
310 310
311 regs->cs = __USER32_CS;
312 regs->r8 = regs->r9 = regs->r10 = regs->r11 = regs->r12 =
313 regs->r13 = regs->r14 = regs->r15 = 0;
314
315 /* OK, This is the point of no return */ 311 /* OK, This is the point of no return */
316 set_personality(PER_LINUX); 312 set_personality(PER_LINUX);
317 set_thread_flag(TIF_IA32); 313 set_thread_flag(TIF_IA32);
318 clear_thread_flag(TIF_ABI_PENDING); 314
315 setup_new_exec(bprm);
316
317 regs->cs = __USER32_CS;
318 regs->r8 = regs->r9 = regs->r10 = regs->r11 = regs->r12 =
319 regs->r13 = regs->r14 = regs->r15 = 0;
319 320
320 current->mm->end_code = ex.a_text + 321 current->mm->end_code = ex.a_text +
321 (current->mm->start_code = N_TXTADDR(ex)); 322 (current->mm->start_code = N_TXTADDR(ex));
diff --git a/arch/x86/include/asm/cpu_debug.h b/arch/x86/include/asm/cpu_debug.h
deleted file mode 100644
index d96c1ee3a95c..000000000000
--- a/arch/x86/include/asm/cpu_debug.h
+++ /dev/null
@@ -1,127 +0,0 @@
1#ifndef _ASM_X86_CPU_DEBUG_H
2#define _ASM_X86_CPU_DEBUG_H
3
4/*
5 * CPU x86 architecture debug
6 *
7 * Copyright(C) 2009 Jaswinder Singh Rajput
8 */
9
10/* Register flags */
11enum cpu_debug_bit {
12/* Model Specific Registers (MSRs) */
13 CPU_MC_BIT, /* Machine Check */
14 CPU_MONITOR_BIT, /* Monitor */
15 CPU_TIME_BIT, /* Time */
16 CPU_PMC_BIT, /* Performance Monitor */
17 CPU_PLATFORM_BIT, /* Platform */
18 CPU_APIC_BIT, /* APIC */
19 CPU_POWERON_BIT, /* Power-on */
20 CPU_CONTROL_BIT, /* Control */
21 CPU_FEATURES_BIT, /* Features control */
22 CPU_LBRANCH_BIT, /* Last Branch */
23 CPU_BIOS_BIT, /* BIOS */
24 CPU_FREQ_BIT, /* Frequency */
25 CPU_MTTR_BIT, /* MTRR */
26 CPU_PERF_BIT, /* Performance */
27 CPU_CACHE_BIT, /* Cache */
28 CPU_SYSENTER_BIT, /* Sysenter */
29 CPU_THERM_BIT, /* Thermal */
30 CPU_MISC_BIT, /* Miscellaneous */
31 CPU_DEBUG_BIT, /* Debug */
32 CPU_PAT_BIT, /* PAT */
33 CPU_VMX_BIT, /* VMX */
34 CPU_CALL_BIT, /* System Call */
35 CPU_BASE_BIT, /* BASE Address */
36 CPU_VER_BIT, /* Version ID */
37 CPU_CONF_BIT, /* Configuration */
38 CPU_SMM_BIT, /* System mgmt mode */
39 CPU_SVM_BIT, /*Secure Virtual Machine*/
40 CPU_OSVM_BIT, /* OS-Visible Workaround*/
41/* Standard Registers */
42 CPU_TSS_BIT, /* Task Stack Segment */
43 CPU_CR_BIT, /* Control Registers */
44 CPU_DT_BIT, /* Descriptor Table */
45/* End of Registers flags */
46 CPU_REG_ALL_BIT, /* Select all Registers */
47};
48
49#define CPU_REG_ALL (~0) /* Select all Registers */
50
51#define CPU_MC (1 << CPU_MC_BIT)
52#define CPU_MONITOR (1 << CPU_MONITOR_BIT)
53#define CPU_TIME (1 << CPU_TIME_BIT)
54#define CPU_PMC (1 << CPU_PMC_BIT)
55#define CPU_PLATFORM (1 << CPU_PLATFORM_BIT)
56#define CPU_APIC (1 << CPU_APIC_BIT)
57#define CPU_POWERON (1 << CPU_POWERON_BIT)
58#define CPU_CONTROL (1 << CPU_CONTROL_BIT)
59#define CPU_FEATURES (1 << CPU_FEATURES_BIT)
60#define CPU_LBRANCH (1 << CPU_LBRANCH_BIT)
61#define CPU_BIOS (1 << CPU_BIOS_BIT)
62#define CPU_FREQ (1 << CPU_FREQ_BIT)
63#define CPU_MTRR (1 << CPU_MTTR_BIT)
64#define CPU_PERF (1 << CPU_PERF_BIT)
65#define CPU_CACHE (1 << CPU_CACHE_BIT)
66#define CPU_SYSENTER (1 << CPU_SYSENTER_BIT)
67#define CPU_THERM (1 << CPU_THERM_BIT)
68#define CPU_MISC (1 << CPU_MISC_BIT)
69#define CPU_DEBUG (1 << CPU_DEBUG_BIT)
70#define CPU_PAT (1 << CPU_PAT_BIT)
71#define CPU_VMX (1 << CPU_VMX_BIT)
72#define CPU_CALL (1 << CPU_CALL_BIT)
73#define CPU_BASE (1 << CPU_BASE_BIT)
74#define CPU_VER (1 << CPU_VER_BIT)
75#define CPU_CONF (1 << CPU_CONF_BIT)
76#define CPU_SMM (1 << CPU_SMM_BIT)
77#define CPU_SVM (1 << CPU_SVM_BIT)
78#define CPU_OSVM (1 << CPU_OSVM_BIT)
79#define CPU_TSS (1 << CPU_TSS_BIT)
80#define CPU_CR (1 << CPU_CR_BIT)
81#define CPU_DT (1 << CPU_DT_BIT)
82
83/* Register file flags */
84enum cpu_file_bit {
85 CPU_INDEX_BIT, /* index */
86 CPU_VALUE_BIT, /* value */
87};
88
89#define CPU_FILE_VALUE (1 << CPU_VALUE_BIT)
90
91#define MAX_CPU_FILES 512
92
93struct cpu_private {
94 unsigned cpu;
95 unsigned type;
96 unsigned reg;
97 unsigned file;
98};
99
100struct cpu_debug_base {
101 char *name; /* Register name */
102 unsigned flag; /* Register flag */
103 unsigned write; /* Register write flag */
104};
105
106/*
107 * Currently it looks similar to cpu_debug_base but once we add more files
108 * cpu_file_base will go in different direction
109 */
110struct cpu_file_base {
111 char *name; /* Register file name */
112 unsigned flag; /* Register file flag */
113 unsigned write; /* Register write flag */
114};
115
116struct cpu_cpuX_base {
117 struct dentry *dentry; /* Register dentry */
118 int init; /* Register index file */
119};
120
121struct cpu_debug_range {
122 unsigned min; /* Register range min */
123 unsigned max; /* Register range max */
124 unsigned flag; /* Supported flags */
125};
126
127#endif /* _ASM_X86_CPU_DEBUG_H */
diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
index b4501ee223ad..1994d3f58443 100644
--- a/arch/x86/include/asm/elf.h
+++ b/arch/x86/include/asm/elf.h
@@ -181,14 +181,8 @@ do { \
181void start_thread_ia32(struct pt_regs *regs, u32 new_ip, u32 new_sp); 181void start_thread_ia32(struct pt_regs *regs, u32 new_ip, u32 new_sp);
182#define compat_start_thread start_thread_ia32 182#define compat_start_thread start_thread_ia32
183 183
184#define COMPAT_SET_PERSONALITY(ex) \ 184void set_personality_ia32(void);
185do { \ 185#define COMPAT_SET_PERSONALITY(ex) set_personality_ia32()
186 if (test_thread_flag(TIF_IA32)) \
187 clear_thread_flag(TIF_ABI_PENDING); \
188 else \
189 set_thread_flag(TIF_ABI_PENDING); \
190 current->personality |= force_personality32; \
191} while (0)
192 186
193#define COMPAT_ELF_PLATFORM ("i686") 187#define COMPAT_ELF_PLATFORM ("i686")
194 188
diff --git a/arch/x86/include/asm/hpet.h b/arch/x86/include/asm/hpet.h
index 5d89fd2a3690..1d5c08a1bdfd 100644
--- a/arch/x86/include/asm/hpet.h
+++ b/arch/x86/include/asm/hpet.h
@@ -67,6 +67,7 @@ extern unsigned long hpet_address;
67extern unsigned long force_hpet_address; 67extern unsigned long force_hpet_address;
68extern u8 hpet_blockid; 68extern u8 hpet_blockid;
69extern int hpet_force_user; 69extern int hpet_force_user;
70extern u8 hpet_msi_disable;
70extern int is_hpet_enabled(void); 71extern int is_hpet_enabled(void);
71extern int hpet_enable(void); 72extern int hpet_enable(void);
72extern void hpet_disable(void); 73extern void hpet_disable(void);
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index 858baa061cfc..6c3fdd631ed3 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -108,10 +108,11 @@ struct mce_log {
108#define K8_MCE_THRESHOLD_BANK_5 (MCE_THRESHOLD_BASE + 5 * 9) 108#define K8_MCE_THRESHOLD_BANK_5 (MCE_THRESHOLD_BASE + 5 * 9)
109#define K8_MCE_THRESHOLD_DRAM_ECC (MCE_THRESHOLD_BANK_4 + 0) 109#define K8_MCE_THRESHOLD_DRAM_ECC (MCE_THRESHOLD_BANK_4 + 0)
110 110
111extern struct atomic_notifier_head x86_mce_decoder_chain;
112 111
113#ifdef __KERNEL__ 112#ifdef __KERNEL__
114 113
114extern struct atomic_notifier_head x86_mce_decoder_chain;
115
115#include <linux/percpu.h> 116#include <linux/percpu.h>
116#include <linux/init.h> 117#include <linux/init.h>
117#include <asm/atomic.h> 118#include <asm/atomic.h>
diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
index c24ca9a56458..ef51b501e22a 100644
--- a/arch/x86/include/asm/microcode.h
+++ b/arch/x86/include/asm/microcode.h
@@ -12,8 +12,6 @@ struct device;
12enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; 12enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
13 13
14struct microcode_ops { 14struct microcode_ops {
15 void (*init)(struct device *device);
16 void (*fini)(void);
17 enum ucode_state (*request_microcode_user) (int cpu, 15 enum ucode_state (*request_microcode_user) (int cpu,
18 const void __user *buf, size_t size); 16 const void __user *buf, size_t size);
19 17
diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h
index 8d9f8548a870..1380367dabd9 100644
--- a/arch/x86/include/asm/perf_event.h
+++ b/arch/x86/include/asm/perf_event.h
@@ -19,6 +19,7 @@
19#define MSR_ARCH_PERFMON_EVENTSEL1 0x187 19#define MSR_ARCH_PERFMON_EVENTSEL1 0x187
20 20
21#define ARCH_PERFMON_EVENTSEL0_ENABLE (1 << 22) 21#define ARCH_PERFMON_EVENTSEL0_ENABLE (1 << 22)
22#define ARCH_PERFMON_EVENTSEL_ANY (1 << 21)
22#define ARCH_PERFMON_EVENTSEL_INT (1 << 20) 23#define ARCH_PERFMON_EVENTSEL_INT (1 << 20)
23#define ARCH_PERFMON_EVENTSEL_OS (1 << 17) 24#define ARCH_PERFMON_EVENTSEL_OS (1 << 17)
24#define ARCH_PERFMON_EVENTSEL_USR (1 << 16) 25#define ARCH_PERFMON_EVENTSEL_USR (1 << 16)
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
index 375c917c37d2..e0d28901e969 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -87,7 +87,6 @@ struct thread_info {
87#define TIF_NOTSC 16 /* TSC is not accessible in userland */ 87#define TIF_NOTSC 16 /* TSC is not accessible in userland */
88#define TIF_IA32 17 /* 32bit process */ 88#define TIF_IA32 17 /* 32bit process */
89#define TIF_FORK 18 /* ret_from_fork */ 89#define TIF_FORK 18 /* ret_from_fork */
90#define TIF_ABI_PENDING 19
91#define TIF_MEMDIE 20 90#define TIF_MEMDIE 20
92#define TIF_DEBUG 21 /* uses debug registers */ 91#define TIF_DEBUG 21 /* uses debug registers */
93#define TIF_IO_BITMAP 22 /* uses I/O bitmap */ 92#define TIF_IO_BITMAP 22 /* uses I/O bitmap */
@@ -112,7 +111,6 @@ struct thread_info {
112#define _TIF_NOTSC (1 << TIF_NOTSC) 111#define _TIF_NOTSC (1 << TIF_NOTSC)
113#define _TIF_IA32 (1 << TIF_IA32) 112#define _TIF_IA32 (1 << TIF_IA32)
114#define _TIF_FORK (1 << TIF_FORK) 113#define _TIF_FORK (1 << TIF_FORK)
115#define _TIF_ABI_PENDING (1 << TIF_ABI_PENDING)
116#define _TIF_DEBUG (1 << TIF_DEBUG) 114#define _TIF_DEBUG (1 << TIF_DEBUG)
117#define _TIF_IO_BITMAP (1 << TIF_IO_BITMAP) 115#define _TIF_IO_BITMAP (1 << TIF_IO_BITMAP)
118#define _TIF_FREEZE (1 << TIF_FREEZE) 116#define _TIF_FREEZE (1 << TIF_FREEZE)
diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
index bc54fa965af3..40be813fefb1 100644
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@ -495,5 +495,17 @@ static inline void uv_hub_send_ipi(int pnode, int apicid, int vector)
495 uv_write_global_mmr64(pnode, UVH_IPI_INT, val); 495 uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
496} 496}
497 497
498/*
499 * Get the minimum revision number of the hub chips within the partition.
500 * 1 - initial rev 1.0 silicon
501 * 2 - rev 2.0 production silicon
502 */
503static inline int uv_get_min_hub_revision_id(void)
504{
505 extern int uv_min_hub_revision_id;
506
507 return uv_min_hub_revision_id;
508}
509
498#endif /* CONFIG_X86_64 */ 510#endif /* CONFIG_X86_64 */
499#endif /* _ASM_X86_UV_UV_HUB_H */ 511#endif /* _ASM_X86_UV_UV_HUB_H */
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index fb1035cd9a6a..036d28adf59d 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1529,16 +1529,10 @@ static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
1529 * if acpi_blacklisted() acpi_disabled = 1; 1529 * if acpi_blacklisted() acpi_disabled = 1;
1530 * acpi_irq_model=... 1530 * acpi_irq_model=...
1531 * ... 1531 * ...
1532 *
1533 * return value: (currently ignored)
1534 * 0: success
1535 * !0: failure
1536 */ 1532 */
1537 1533
1538int __init acpi_boot_table_init(void) 1534void __init acpi_boot_table_init(void)
1539{ 1535{
1540 int error;
1541
1542 dmi_check_system(acpi_dmi_table); 1536 dmi_check_system(acpi_dmi_table);
1543 1537
1544 /* 1538 /*
@@ -1546,15 +1540,14 @@ int __init acpi_boot_table_init(void)
1546 * One exception: acpi=ht continues far enough to enumerate LAPICs 1540 * One exception: acpi=ht continues far enough to enumerate LAPICs
1547 */ 1541 */
1548 if (acpi_disabled && !acpi_ht) 1542 if (acpi_disabled && !acpi_ht)
1549 return 1; 1543 return;
1550 1544
1551 /* 1545 /*
1552 * Initialize the ACPI boot-time table parser. 1546 * Initialize the ACPI boot-time table parser.
1553 */ 1547 */
1554 error = acpi_table_init(); 1548 if (acpi_table_init()) {
1555 if (error) {
1556 disable_acpi(); 1549 disable_acpi();
1557 return error; 1550 return;
1558 } 1551 }
1559 1552
1560 acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf); 1553 acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf);
@@ -1562,18 +1555,15 @@ int __init acpi_boot_table_init(void)
1562 /* 1555 /*
1563 * blacklist may disable ACPI entirely 1556 * blacklist may disable ACPI entirely
1564 */ 1557 */
1565 error = acpi_blacklisted(); 1558 if (acpi_blacklisted()) {
1566 if (error) {
1567 if (acpi_force) { 1559 if (acpi_force) {
1568 printk(KERN_WARNING PREFIX "acpi=force override\n"); 1560 printk(KERN_WARNING PREFIX "acpi=force override\n");
1569 } else { 1561 } else {
1570 printk(KERN_WARNING PREFIX "Disabling ACPI support\n"); 1562 printk(KERN_WARNING PREFIX "Disabling ACPI support\n");
1571 disable_acpi(); 1563 disable_acpi();
1572 return error; 1564 return;
1573 } 1565 }
1574 } 1566 }
1575
1576 return 0;
1577} 1567}
1578 1568
1579int __init early_acpi_boot_init(void) 1569int __init early_acpi_boot_init(void)
diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c
index 3704997e8b25..f147a95fd84a 100644
--- a/arch/x86/kernel/aperture_64.c
+++ b/arch/x86/kernel/aperture_64.c
@@ -31,6 +31,7 @@
31#include <asm/x86_init.h> 31#include <asm/x86_init.h>
32 32
33int gart_iommu_aperture; 33int gart_iommu_aperture;
34EXPORT_SYMBOL_GPL(gart_iommu_aperture);
34int gart_iommu_aperture_disabled __initdata; 35int gart_iommu_aperture_disabled __initdata;
35int gart_iommu_aperture_allowed __initdata; 36int gart_iommu_aperture_allowed __initdata;
36 37
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index e80f291472a4..3987e4408f75 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -61,12 +61,6 @@ unsigned int boot_cpu_physical_apicid = -1U;
61 61
62/* 62/*
63 * The highest APIC ID seen during enumeration. 63 * The highest APIC ID seen during enumeration.
64 *
65 * This determines the messaging protocol we can use: if all APIC IDs
66 * are in the 0 ... 7 range, then we can use logical addressing which
67 * has some performance advantages (better broadcasting).
68 *
69 * If there's an APIC ID above 8, we use physical addressing.
70 */ 64 */
71unsigned int max_physical_apicid; 65unsigned int max_physical_apicid;
72 66
@@ -1898,14 +1892,7 @@ void __cpuinit generic_processor_info(int apicid, int version)
1898 max_physical_apicid = apicid; 1892 max_physical_apicid = apicid;
1899 1893
1900#ifdef CONFIG_X86_32 1894#ifdef CONFIG_X86_32
1901 /* 1895 if (num_processors > 8) {
1902 * Would be preferable to switch to bigsmp when CONFIG_HOTPLUG_CPU=y
1903 * but we need to work other dependencies like SMP_SUSPEND etc
1904 * before this can be done without some confusion.
1905 * if (CPU_HOTPLUG_ENABLED || num_processors > 8)
1906 * - Ashok Raj <ashok.raj@intel.com>
1907 */
1908 if (max_physical_apicid >= 8) {
1909 switch (boot_cpu_data.x86_vendor) { 1896 switch (boot_cpu_data.x86_vendor) {
1910 case X86_VENDOR_INTEL: 1897 case X86_VENDOR_INTEL:
1911 if (!APIC_XAPIC(version)) { 1898 if (!APIC_XAPIC(version)) {
diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index eacbd2b31d27..e3c3d820c325 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -240,6 +240,11 @@ static int physflat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
240 printk(KERN_DEBUG "system APIC only can use physical flat"); 240 printk(KERN_DEBUG "system APIC only can use physical flat");
241 return 1; 241 return 1;
242 } 242 }
243
244 if (!strncmp(oem_id, "IBM", 3) && !strncmp(oem_table_id, "EXA", 3)) {
245 printk(KERN_DEBUG "IBM Summit detected, will use apic physical");
246 return 1;
247 }
243#endif 248#endif
244 249
245 return 0; 250 return 0;
diff --git a/arch/x86/kernel/apic/probe_64.c b/arch/x86/kernel/apic/probe_64.c
index 65edc180fc82..450fe2064a14 100644
--- a/arch/x86/kernel/apic/probe_64.c
+++ b/arch/x86/kernel/apic/probe_64.c
@@ -64,15 +64,13 @@ void __init default_setup_apic_routing(void)
64 apic = &apic_x2apic_phys; 64 apic = &apic_x2apic_phys;
65 else 65 else
66 apic = &apic_x2apic_cluster; 66 apic = &apic_x2apic_cluster;
67 printk(KERN_INFO "Setting APIC routing to %s\n", apic->name);
68 } 67 }
69#endif 68#endif
70 69
71 if (apic == &apic_flat) { 70 if (apic == &apic_flat && num_processors > 8)
72 if (max_physical_apicid >= 8)
73 apic = &apic_physflat; 71 apic = &apic_physflat;
74 printk(KERN_INFO "Setting APIC routing to %s\n", apic->name); 72
75 } 73 printk(KERN_INFO "Setting APIC routing to %s\n", apic->name);
76 74
77 if (is_vsmp_box()) { 75 if (is_vsmp_box()) {
78 /* need to update phys_pkg_id */ 76 /* need to update phys_pkg_id */
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 5f92494dab61..21db3cbea7dc 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -36,6 +36,8 @@ DEFINE_PER_CPU(int, x2apic_extra_bits);
36 36
37static enum uv_system_type uv_system_type; 37static enum uv_system_type uv_system_type;
38static u64 gru_start_paddr, gru_end_paddr; 38static u64 gru_start_paddr, gru_end_paddr;
39int uv_min_hub_revision_id;
40EXPORT_SYMBOL_GPL(uv_min_hub_revision_id);
39 41
40static inline bool is_GRU_range(u64 start, u64 end) 42static inline bool is_GRU_range(u64 start, u64 end)
41{ 43{
@@ -55,12 +57,19 @@ static int early_get_nodeid(void)
55 mmr = early_ioremap(UV_LOCAL_MMR_BASE | UVH_NODE_ID, sizeof(*mmr)); 57 mmr = early_ioremap(UV_LOCAL_MMR_BASE | UVH_NODE_ID, sizeof(*mmr));
56 node_id.v = *mmr; 58 node_id.v = *mmr;
57 early_iounmap(mmr, sizeof(*mmr)); 59 early_iounmap(mmr, sizeof(*mmr));
60
61 /* Currently, all blades have same revision number */
62 uv_min_hub_revision_id = node_id.s.revision;
63
58 return node_id.s.node_id; 64 return node_id.s.node_id;
59} 65}
60 66
61static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id) 67static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
62{ 68{
69 int nodeid;
70
63 if (!strcmp(oem_id, "SGI")) { 71 if (!strcmp(oem_id, "SGI")) {
72 nodeid = early_get_nodeid();
64 x86_platform.is_untracked_pat_range = uv_is_untracked_pat_range; 73 x86_platform.is_untracked_pat_range = uv_is_untracked_pat_range;
65 if (!strcmp(oem_table_id, "UVL")) 74 if (!strcmp(oem_table_id, "UVL"))
66 uv_system_type = UV_LEGACY_APIC; 75 uv_system_type = UV_LEGACY_APIC;
@@ -68,7 +77,7 @@ static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
68 uv_system_type = UV_X2APIC; 77 uv_system_type = UV_X2APIC;
69 else if (!strcmp(oem_table_id, "UVH")) { 78 else if (!strcmp(oem_table_id, "UVH")) {
70 __get_cpu_var(x2apic_extra_bits) = 79 __get_cpu_var(x2apic_extra_bits) =
71 early_get_nodeid() << (UV_APIC_PNODE_SHIFT - 1); 80 nodeid << (UV_APIC_PNODE_SHIFT - 1);
72 uv_system_type = UV_NON_UNIQUE_APIC; 81 uv_system_type = UV_NON_UNIQUE_APIC;
73 return 1; 82 return 1;
74 } 83 }
@@ -374,13 +383,13 @@ static __init void get_lowmem_redirect(unsigned long *base, unsigned long *size)
374 383
375enum map_type {map_wb, map_uc}; 384enum map_type {map_wb, map_uc};
376 385
377static __init void map_high(char *id, unsigned long base, int shift, 386static __init void map_high(char *id, unsigned long base, int pshift,
378 int max_pnode, enum map_type map_type) 387 int bshift, int max_pnode, enum map_type map_type)
379{ 388{
380 unsigned long bytes, paddr; 389 unsigned long bytes, paddr;
381 390
382 paddr = base << shift; 391 paddr = base << pshift;
383 bytes = (1UL << shift) * (max_pnode + 1); 392 bytes = (1UL << bshift) * (max_pnode + 1);
384 printk(KERN_INFO "UV: Map %s_HI 0x%lx - 0x%lx\n", id, paddr, 393 printk(KERN_INFO "UV: Map %s_HI 0x%lx - 0x%lx\n", id, paddr,
385 paddr + bytes); 394 paddr + bytes);
386 if (map_type == map_uc) 395 if (map_type == map_uc)
@@ -396,7 +405,7 @@ static __init void map_gru_high(int max_pnode)
396 405
397 gru.v = uv_read_local_mmr(UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR); 406 gru.v = uv_read_local_mmr(UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR);
398 if (gru.s.enable) { 407 if (gru.s.enable) {
399 map_high("GRU", gru.s.base, shift, max_pnode, map_wb); 408 map_high("GRU", gru.s.base, shift, shift, max_pnode, map_wb);
400 gru_start_paddr = ((u64)gru.s.base << shift); 409 gru_start_paddr = ((u64)gru.s.base << shift);
401 gru_end_paddr = gru_start_paddr + (1UL << shift) * (max_pnode + 1); 410 gru_end_paddr = gru_start_paddr + (1UL << shift) * (max_pnode + 1);
402 411
@@ -410,7 +419,7 @@ static __init void map_mmr_high(int max_pnode)
410 419
411 mmr.v = uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR); 420 mmr.v = uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR);
412 if (mmr.s.enable) 421 if (mmr.s.enable)
413 map_high("MMR", mmr.s.base, shift, max_pnode, map_uc); 422 map_high("MMR", mmr.s.base, shift, shift, max_pnode, map_uc);
414} 423}
415 424
416static __init void map_mmioh_high(int max_pnode) 425static __init void map_mmioh_high(int max_pnode)
@@ -420,7 +429,8 @@ static __init void map_mmioh_high(int max_pnode)
420 429
421 mmioh.v = uv_read_local_mmr(UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR); 430 mmioh.v = uv_read_local_mmr(UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR);
422 if (mmioh.s.enable) 431 if (mmioh.s.enable)
423 map_high("MMIOH", mmioh.s.base, shift, max_pnode, map_uc); 432 map_high("MMIOH", mmioh.s.base, shift, mmioh.s.m_io,
433 max_pnode, map_uc);
424} 434}
425 435
426static __init void map_low_mmrs(void) 436static __init void map_low_mmrs(void)
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 1d2cb383410e..c202b62f3671 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -19,8 +19,6 @@ obj-y += vmware.o hypervisor.o sched.o
19obj-$(CONFIG_X86_32) += bugs.o cmpxchg.o 19obj-$(CONFIG_X86_32) += bugs.o cmpxchg.o
20obj-$(CONFIG_X86_64) += bugs_64.o 20obj-$(CONFIG_X86_64) += bugs_64.o
21 21
22obj-$(CONFIG_X86_CPU_DEBUG) += cpu_debug.o
23
24obj-$(CONFIG_CPU_SUP_INTEL) += intel.o 22obj-$(CONFIG_CPU_SUP_INTEL) += intel.o
25obj-$(CONFIG_CPU_SUP_AMD) += amd.o 23obj-$(CONFIG_CPU_SUP_AMD) += amd.o
26obj-$(CONFIG_CPU_SUP_CYRIX_32) += cyrix.o 24obj-$(CONFIG_CPU_SUP_CYRIX_32) += cyrix.o
diff --git a/arch/x86/kernel/cpu/cpu_debug.c b/arch/x86/kernel/cpu/cpu_debug.c
deleted file mode 100644
index b368cd862997..000000000000
--- a/arch/x86/kernel/cpu/cpu_debug.c
+++ /dev/null
@@ -1,688 +0,0 @@
1/*
2 * CPU x86 architecture debug code
3 *
4 * Copyright(C) 2009 Jaswinder Singh Rajput
5 *
6 * For licencing details see kernel-base/COPYING
7 */
8
9#include <linux/interrupt.h>
10#include <linux/compiler.h>
11#include <linux/seq_file.h>
12#include <linux/debugfs.h>
13#include <linux/kprobes.h>
14#include <linux/uaccess.h>
15#include <linux/kernel.h>
16#include <linux/module.h>
17#include <linux/percpu.h>
18#include <linux/signal.h>
19#include <linux/errno.h>
20#include <linux/sched.h>
21#include <linux/types.h>
22#include <linux/init.h>
23#include <linux/slab.h>
24#include <linux/smp.h>
25
26#include <asm/cpu_debug.h>
27#include <asm/paravirt.h>
28#include <asm/system.h>
29#include <asm/traps.h>
30#include <asm/apic.h>
31#include <asm/desc.h>
32
33static DEFINE_PER_CPU(struct cpu_cpuX_base [CPU_REG_ALL_BIT], cpud_arr);
34static DEFINE_PER_CPU(struct cpu_private * [MAX_CPU_FILES], cpud_priv_arr);
35static DEFINE_PER_CPU(int, cpud_priv_count);
36
37static DEFINE_MUTEX(cpu_debug_lock);
38
39static struct dentry *cpu_debugfs_dir;
40
41static struct cpu_debug_base cpu_base[] = {
42 { "mc", CPU_MC, 0 },
43 { "monitor", CPU_MONITOR, 0 },
44 { "time", CPU_TIME, 0 },
45 { "pmc", CPU_PMC, 1 },
46 { "platform", CPU_PLATFORM, 0 },
47 { "apic", CPU_APIC, 0 },
48 { "poweron", CPU_POWERON, 0 },
49 { "control", CPU_CONTROL, 0 },
50 { "features", CPU_FEATURES, 0 },
51 { "lastbranch", CPU_LBRANCH, 0 },
52 { "bios", CPU_BIOS, 0 },
53 { "freq", CPU_FREQ, 0 },
54 { "mtrr", CPU_MTRR, 0 },
55 { "perf", CPU_PERF, 0 },
56 { "cache", CPU_CACHE, 0 },
57 { "sysenter", CPU_SYSENTER, 0 },
58 { "therm", CPU_THERM, 0 },
59 { "misc", CPU_MISC, 0 },
60 { "debug", CPU_DEBUG, 0 },
61 { "pat", CPU_PAT, 0 },
62 { "vmx", CPU_VMX, 0 },
63 { "call", CPU_CALL, 0 },
64 { "base", CPU_BASE, 0 },
65 { "ver", CPU_VER, 0 },
66 { "conf", CPU_CONF, 0 },
67 { "smm", CPU_SMM, 0 },
68 { "svm", CPU_SVM, 0 },
69 { "osvm", CPU_OSVM, 0 },
70 { "tss", CPU_TSS, 0 },
71 { "cr", CPU_CR, 0 },
72 { "dt", CPU_DT, 0 },
73 { "registers", CPU_REG_ALL, 0 },
74};
75
76static struct cpu_file_base cpu_file[] = {
77 { "index", CPU_REG_ALL, 0 },
78 { "value", CPU_REG_ALL, 1 },
79};
80
81/* CPU Registers Range */
82static struct cpu_debug_range cpu_reg_range[] = {
83 { 0x00000000, 0x00000001, CPU_MC, },
84 { 0x00000006, 0x00000007, CPU_MONITOR, },
85 { 0x00000010, 0x00000010, CPU_TIME, },
86 { 0x00000011, 0x00000013, CPU_PMC, },
87 { 0x00000017, 0x00000017, CPU_PLATFORM, },
88 { 0x0000001B, 0x0000001B, CPU_APIC, },
89 { 0x0000002A, 0x0000002B, CPU_POWERON, },
90 { 0x0000002C, 0x0000002C, CPU_FREQ, },
91 { 0x0000003A, 0x0000003A, CPU_CONTROL, },
92 { 0x00000040, 0x00000047, CPU_LBRANCH, },
93 { 0x00000060, 0x00000067, CPU_LBRANCH, },
94 { 0x00000079, 0x00000079, CPU_BIOS, },
95 { 0x00000088, 0x0000008A, CPU_CACHE, },
96 { 0x0000008B, 0x0000008B, CPU_BIOS, },
97 { 0x0000009B, 0x0000009B, CPU_MONITOR, },
98 { 0x000000C1, 0x000000C4, CPU_PMC, },
99 { 0x000000CD, 0x000000CD, CPU_FREQ, },
100 { 0x000000E7, 0x000000E8, CPU_PERF, },
101 { 0x000000FE, 0x000000FE, CPU_MTRR, },
102
103 { 0x00000116, 0x0000011E, CPU_CACHE, },
104 { 0x00000174, 0x00000176, CPU_SYSENTER, },
105 { 0x00000179, 0x0000017B, CPU_MC, },
106 { 0x00000186, 0x00000189, CPU_PMC, },
107 { 0x00000198, 0x00000199, CPU_PERF, },
108 { 0x0000019A, 0x0000019A, CPU_TIME, },
109 { 0x0000019B, 0x0000019D, CPU_THERM, },
110 { 0x000001A0, 0x000001A0, CPU_MISC, },
111 { 0x000001C9, 0x000001C9, CPU_LBRANCH, },
112 { 0x000001D7, 0x000001D8, CPU_LBRANCH, },
113 { 0x000001D9, 0x000001D9, CPU_DEBUG, },
114 { 0x000001DA, 0x000001E0, CPU_LBRANCH, },
115
116 { 0x00000200, 0x0000020F, CPU_MTRR, },
117 { 0x00000250, 0x00000250, CPU_MTRR, },
118 { 0x00000258, 0x00000259, CPU_MTRR, },
119 { 0x00000268, 0x0000026F, CPU_MTRR, },
120 { 0x00000277, 0x00000277, CPU_PAT, },
121 { 0x000002FF, 0x000002FF, CPU_MTRR, },
122
123 { 0x00000300, 0x00000311, CPU_PMC, },
124 { 0x00000345, 0x00000345, CPU_PMC, },
125 { 0x00000360, 0x00000371, CPU_PMC, },
126 { 0x0000038D, 0x00000390, CPU_PMC, },
127 { 0x000003A0, 0x000003BE, CPU_PMC, },
128 { 0x000003C0, 0x000003CD, CPU_PMC, },
129 { 0x000003E0, 0x000003E1, CPU_PMC, },
130 { 0x000003F0, 0x000003F2, CPU_PMC, },
131
132 { 0x00000400, 0x00000417, CPU_MC, },
133 { 0x00000480, 0x0000048B, CPU_VMX, },
134
135 { 0x00000600, 0x00000600, CPU_DEBUG, },
136 { 0x00000680, 0x0000068F, CPU_LBRANCH, },
137 { 0x000006C0, 0x000006CF, CPU_LBRANCH, },
138
139 { 0x000107CC, 0x000107D3, CPU_PMC, },
140
141 { 0xC0000080, 0xC0000080, CPU_FEATURES, },
142 { 0xC0000081, 0xC0000084, CPU_CALL, },
143 { 0xC0000100, 0xC0000102, CPU_BASE, },
144 { 0xC0000103, 0xC0000103, CPU_TIME, },
145
146 { 0xC0010000, 0xC0010007, CPU_PMC, },
147 { 0xC0010010, 0xC0010010, CPU_CONF, },
148 { 0xC0010015, 0xC0010015, CPU_CONF, },
149 { 0xC0010016, 0xC001001A, CPU_MTRR, },
150 { 0xC001001D, 0xC001001D, CPU_MTRR, },
151 { 0xC001001F, 0xC001001F, CPU_CONF, },
152 { 0xC0010030, 0xC0010035, CPU_BIOS, },
153 { 0xC0010044, 0xC0010048, CPU_MC, },
154 { 0xC0010050, 0xC0010056, CPU_SMM, },
155 { 0xC0010058, 0xC0010058, CPU_CONF, },
156 { 0xC0010060, 0xC0010060, CPU_CACHE, },
157 { 0xC0010061, 0xC0010068, CPU_SMM, },
158 { 0xC0010069, 0xC001006B, CPU_SMM, },
159 { 0xC0010070, 0xC0010071, CPU_SMM, },
160 { 0xC0010111, 0xC0010113, CPU_SMM, },
161 { 0xC0010114, 0xC0010118, CPU_SVM, },
162 { 0xC0010140, 0xC0010141, CPU_OSVM, },
163 { 0xC0011022, 0xC0011023, CPU_CONF, },
164};
165
166static int is_typeflag_valid(unsigned cpu, unsigned flag)
167{
168 int i;
169
170 /* Standard Registers should be always valid */
171 if (flag >= CPU_TSS)
172 return 1;
173
174 for (i = 0; i < ARRAY_SIZE(cpu_reg_range); i++) {
175 if (cpu_reg_range[i].flag == flag)
176 return 1;
177 }
178
179 /* Invalid */
180 return 0;
181}
182
183static unsigned get_cpu_range(unsigned cpu, unsigned *min, unsigned *max,
184 int index, unsigned flag)
185{
186 if (cpu_reg_range[index].flag == flag) {
187 *min = cpu_reg_range[index].min;
188 *max = cpu_reg_range[index].max;
189 } else
190 *max = 0;
191
192 return *max;
193}
194
195/* This function can also be called with seq = NULL for printk */
196static void print_cpu_data(struct seq_file *seq, unsigned type,
197 u32 low, u32 high)
198{
199 struct cpu_private *priv;
200 u64 val = high;
201
202 if (seq) {
203 priv = seq->private;
204 if (priv->file) {
205 val = (val << 32) | low;
206 seq_printf(seq, "0x%llx\n", val);
207 } else
208 seq_printf(seq, " %08x: %08x_%08x\n",
209 type, high, low);
210 } else
211 printk(KERN_INFO " %08x: %08x_%08x\n", type, high, low);
212}
213
214/* This function can also be called with seq = NULL for printk */
215static void print_msr(struct seq_file *seq, unsigned cpu, unsigned flag)
216{
217 unsigned msr, msr_min, msr_max;
218 struct cpu_private *priv;
219 u32 low, high;
220 int i;
221
222 if (seq) {
223 priv = seq->private;
224 if (priv->file) {
225 if (!rdmsr_safe_on_cpu(priv->cpu, priv->reg,
226 &low, &high))
227 print_cpu_data(seq, priv->reg, low, high);
228 return;
229 }
230 }
231
232 for (i = 0; i < ARRAY_SIZE(cpu_reg_range); i++) {
233 if (!get_cpu_range(cpu, &msr_min, &msr_max, i, flag))
234 continue;
235
236 for (msr = msr_min; msr <= msr_max; msr++) {
237 if (rdmsr_safe_on_cpu(cpu, msr, &low, &high))
238 continue;
239 print_cpu_data(seq, msr, low, high);
240 }
241 }
242}
243
244static void print_tss(void *arg)
245{
246 struct pt_regs *regs = task_pt_regs(current);
247 struct seq_file *seq = arg;
248 unsigned int seg;
249
250 seq_printf(seq, " RAX\t: %016lx\n", regs->ax);
251 seq_printf(seq, " RBX\t: %016lx\n", regs->bx);
252 seq_printf(seq, " RCX\t: %016lx\n", regs->cx);
253 seq_printf(seq, " RDX\t: %016lx\n", regs->dx);
254
255 seq_printf(seq, " RSI\t: %016lx\n", regs->si);
256 seq_printf(seq, " RDI\t: %016lx\n", regs->di);
257 seq_printf(seq, " RBP\t: %016lx\n", regs->bp);
258 seq_printf(seq, " ESP\t: %016lx\n", regs->sp);
259
260#ifdef CONFIG_X86_64
261 seq_printf(seq, " R08\t: %016lx\n", regs->r8);
262 seq_printf(seq, " R09\t: %016lx\n", regs->r9);
263 seq_printf(seq, " R10\t: %016lx\n", regs->r10);
264 seq_printf(seq, " R11\t: %016lx\n", regs->r11);
265 seq_printf(seq, " R12\t: %016lx\n", regs->r12);
266 seq_printf(seq, " R13\t: %016lx\n", regs->r13);
267 seq_printf(seq, " R14\t: %016lx\n", regs->r14);
268 seq_printf(seq, " R15\t: %016lx\n", regs->r15);
269#endif
270
271 asm("movl %%cs,%0" : "=r" (seg));
272 seq_printf(seq, " CS\t: %04x\n", seg);
273 asm("movl %%ds,%0" : "=r" (seg));
274 seq_printf(seq, " DS\t: %04x\n", seg);
275 seq_printf(seq, " SS\t: %04lx\n", regs->ss & 0xffff);
276 asm("movl %%es,%0" : "=r" (seg));
277 seq_printf(seq, " ES\t: %04x\n", seg);
278 asm("movl %%fs,%0" : "=r" (seg));
279 seq_printf(seq, " FS\t: %04x\n", seg);
280 asm("movl %%gs,%0" : "=r" (seg));
281 seq_printf(seq, " GS\t: %04x\n", seg);
282
283 seq_printf(seq, " EFLAGS\t: %016lx\n", regs->flags);
284
285 seq_printf(seq, " EIP\t: %016lx\n", regs->ip);
286}
287
288static void print_cr(void *arg)
289{
290 struct seq_file *seq = arg;
291
292 seq_printf(seq, " cr0\t: %016lx\n", read_cr0());
293 seq_printf(seq, " cr2\t: %016lx\n", read_cr2());
294 seq_printf(seq, " cr3\t: %016lx\n", read_cr3());
295 seq_printf(seq, " cr4\t: %016lx\n", read_cr4_safe());
296#ifdef CONFIG_X86_64
297 seq_printf(seq, " cr8\t: %016lx\n", read_cr8());
298#endif
299}
300
301static void print_desc_ptr(char *str, struct seq_file *seq, struct desc_ptr dt)
302{
303 seq_printf(seq, " %s\t: %016llx\n", str, (u64)(dt.address | dt.size));
304}
305
306static void print_dt(void *seq)
307{
308 struct desc_ptr dt;
309 unsigned long ldt;
310
311 /* IDT */
312 store_idt((struct desc_ptr *)&dt);
313 print_desc_ptr("IDT", seq, dt);
314
315 /* GDT */
316 store_gdt((struct desc_ptr *)&dt);
317 print_desc_ptr("GDT", seq, dt);
318
319 /* LDT */
320 store_ldt(ldt);
321 seq_printf(seq, " LDT\t: %016lx\n", ldt);
322
323 /* TR */
324 store_tr(ldt);
325 seq_printf(seq, " TR\t: %016lx\n", ldt);
326}
327
328static void print_dr(void *arg)
329{
330 struct seq_file *seq = arg;
331 unsigned long dr;
332 int i;
333
334 for (i = 0; i < 8; i++) {
335 /* Ignore db4, db5 */
336 if ((i == 4) || (i == 5))
337 continue;
338 get_debugreg(dr, i);
339 seq_printf(seq, " dr%d\t: %016lx\n", i, dr);
340 }
341
342 seq_printf(seq, "\n MSR\t:\n");
343}
344
345static void print_apic(void *arg)
346{
347 struct seq_file *seq = arg;
348
349#ifdef CONFIG_X86_LOCAL_APIC
350 seq_printf(seq, " LAPIC\t:\n");
351 seq_printf(seq, " ID\t\t: %08x\n", apic_read(APIC_ID) >> 24);
352 seq_printf(seq, " LVR\t\t: %08x\n", apic_read(APIC_LVR));
353 seq_printf(seq, " TASKPRI\t: %08x\n", apic_read(APIC_TASKPRI));
354 seq_printf(seq, " ARBPRI\t\t: %08x\n", apic_read(APIC_ARBPRI));
355 seq_printf(seq, " PROCPRI\t: %08x\n", apic_read(APIC_PROCPRI));
356 seq_printf(seq, " LDR\t\t: %08x\n", apic_read(APIC_LDR));
357 seq_printf(seq, " DFR\t\t: %08x\n", apic_read(APIC_DFR));
358 seq_printf(seq, " SPIV\t\t: %08x\n", apic_read(APIC_SPIV));
359 seq_printf(seq, " ISR\t\t: %08x\n", apic_read(APIC_ISR));
360 seq_printf(seq, " ESR\t\t: %08x\n", apic_read(APIC_ESR));
361 seq_printf(seq, " ICR\t\t: %08x\n", apic_read(APIC_ICR));
362 seq_printf(seq, " ICR2\t\t: %08x\n", apic_read(APIC_ICR2));
363 seq_printf(seq, " LVTT\t\t: %08x\n", apic_read(APIC_LVTT));
364 seq_printf(seq, " LVTTHMR\t: %08x\n", apic_read(APIC_LVTTHMR));
365 seq_printf(seq, " LVTPC\t\t: %08x\n", apic_read(APIC_LVTPC));
366 seq_printf(seq, " LVT0\t\t: %08x\n", apic_read(APIC_LVT0));
367 seq_printf(seq, " LVT1\t\t: %08x\n", apic_read(APIC_LVT1));
368 seq_printf(seq, " LVTERR\t\t: %08x\n", apic_read(APIC_LVTERR));
369 seq_printf(seq, " TMICT\t\t: %08x\n", apic_read(APIC_TMICT));
370 seq_printf(seq, " TMCCT\t\t: %08x\n", apic_read(APIC_TMCCT));
371 seq_printf(seq, " TDCR\t\t: %08x\n", apic_read(APIC_TDCR));
372 if (boot_cpu_has(X86_FEATURE_EXTAPIC)) {
373 unsigned int i, v, maxeilvt;
374
375 v = apic_read(APIC_EFEAT);
376 maxeilvt = (v >> 16) & 0xff;
377 seq_printf(seq, " EFEAT\t\t: %08x\n", v);
378 seq_printf(seq, " ECTRL\t\t: %08x\n", apic_read(APIC_ECTRL));
379
380 for (i = 0; i < maxeilvt; i++) {
381 v = apic_read(APIC_EILVTn(i));
382 seq_printf(seq, " EILVT%d\t\t: %08x\n", i, v);
383 }
384 }
385#endif /* CONFIG_X86_LOCAL_APIC */
386 seq_printf(seq, "\n MSR\t:\n");
387}
388
389static int cpu_seq_show(struct seq_file *seq, void *v)
390{
391 struct cpu_private *priv = seq->private;
392
393 if (priv == NULL)
394 return -EINVAL;
395
396 switch (cpu_base[priv->type].flag) {
397 case CPU_TSS:
398 smp_call_function_single(priv->cpu, print_tss, seq, 1);
399 break;
400 case CPU_CR:
401 smp_call_function_single(priv->cpu, print_cr, seq, 1);
402 break;
403 case CPU_DT:
404 smp_call_function_single(priv->cpu, print_dt, seq, 1);
405 break;
406 case CPU_DEBUG:
407 if (priv->file == CPU_INDEX_BIT)
408 smp_call_function_single(priv->cpu, print_dr, seq, 1);
409 print_msr(seq, priv->cpu, cpu_base[priv->type].flag);
410 break;
411 case CPU_APIC:
412 if (priv->file == CPU_INDEX_BIT)
413 smp_call_function_single(priv->cpu, print_apic, seq, 1);
414 print_msr(seq, priv->cpu, cpu_base[priv->type].flag);
415 break;
416
417 default:
418 print_msr(seq, priv->cpu, cpu_base[priv->type].flag);
419 break;
420 }
421 seq_printf(seq, "\n");
422
423 return 0;
424}
425
426static void *cpu_seq_start(struct seq_file *seq, loff_t *pos)
427{
428 if (*pos == 0) /* One time is enough ;-) */
429 return seq;
430
431 return NULL;
432}
433
434static void *cpu_seq_next(struct seq_file *seq, void *v, loff_t *pos)
435{
436 (*pos)++;
437
438 return cpu_seq_start(seq, pos);
439}
440
441static void cpu_seq_stop(struct seq_file *seq, void *v)
442{
443}
444
445static const struct seq_operations cpu_seq_ops = {
446 .start = cpu_seq_start,
447 .next = cpu_seq_next,
448 .stop = cpu_seq_stop,
449 .show = cpu_seq_show,
450};
451
452static int cpu_seq_open(struct inode *inode, struct file *file)
453{
454 struct cpu_private *priv = inode->i_private;
455 struct seq_file *seq;
456 int err;
457
458 err = seq_open(file, &cpu_seq_ops);
459 if (!err) {
460 seq = file->private_data;
461 seq->private = priv;
462 }
463
464 return err;
465}
466
467static int write_msr(struct cpu_private *priv, u64 val)
468{
469 u32 low, high;
470
471 high = (val >> 32) & 0xffffffff;
472 low = val & 0xffffffff;
473
474 if (!wrmsr_safe_on_cpu(priv->cpu, priv->reg, low, high))
475 return 0;
476
477 return -EPERM;
478}
479
480static int write_cpu_register(struct cpu_private *priv, const char *buf)
481{
482 int ret = -EPERM;
483 u64 val;
484
485 ret = strict_strtoull(buf, 0, &val);
486 if (ret < 0)
487 return ret;
488
489 /* Supporting only MSRs */
490 if (priv->type < CPU_TSS_BIT)
491 return write_msr(priv, val);
492
493 return ret;
494}
495
496static ssize_t cpu_write(struct file *file, const char __user *ubuf,
497 size_t count, loff_t *off)
498{
499 struct seq_file *seq = file->private_data;
500 struct cpu_private *priv = seq->private;
501 char buf[19];
502
503 if ((priv == NULL) || (count >= sizeof(buf)))
504 return -EINVAL;
505
506 if (copy_from_user(&buf, ubuf, count))
507 return -EFAULT;
508
509 buf[count] = 0;
510
511 if ((cpu_base[priv->type].write) && (cpu_file[priv->file].write))
512 if (!write_cpu_register(priv, buf))
513 return count;
514
515 return -EACCES;
516}
517
518static const struct file_operations cpu_fops = {
519 .owner = THIS_MODULE,
520 .open = cpu_seq_open,
521 .read = seq_read,
522 .write = cpu_write,
523 .llseek = seq_lseek,
524 .release = seq_release,
525};
526
527static int cpu_create_file(unsigned cpu, unsigned type, unsigned reg,
528 unsigned file, struct dentry *dentry)
529{
530 struct cpu_private *priv = NULL;
531
532 /* Already intialized */
533 if (file == CPU_INDEX_BIT)
534 if (per_cpu(cpud_arr[type].init, cpu))
535 return 0;
536
537 priv = kzalloc(sizeof(*priv), GFP_KERNEL);
538 if (priv == NULL)
539 return -ENOMEM;
540
541 priv->cpu = cpu;
542 priv->type = type;
543 priv->reg = reg;
544 priv->file = file;
545 mutex_lock(&cpu_debug_lock);
546 per_cpu(cpud_priv_arr[type], cpu) = priv;
547 per_cpu(cpud_priv_count, cpu)++;
548 mutex_unlock(&cpu_debug_lock);
549
550 if (file)
551 debugfs_create_file(cpu_file[file].name, S_IRUGO,
552 dentry, (void *)priv, &cpu_fops);
553 else {
554 debugfs_create_file(cpu_base[type].name, S_IRUGO,
555 per_cpu(cpud_arr[type].dentry, cpu),
556 (void *)priv, &cpu_fops);
557 mutex_lock(&cpu_debug_lock);
558 per_cpu(cpud_arr[type].init, cpu) = 1;
559 mutex_unlock(&cpu_debug_lock);
560 }
561
562 return 0;
563}
564
565static int cpu_init_regfiles(unsigned cpu, unsigned int type, unsigned reg,
566 struct dentry *dentry)
567{
568 unsigned file;
569 int err = 0;
570
571 for (file = 0; file < ARRAY_SIZE(cpu_file); file++) {
572 err = cpu_create_file(cpu, type, reg, file, dentry);
573 if (err)
574 return err;
575 }
576
577 return err;
578}
579
580static int cpu_init_msr(unsigned cpu, unsigned type, struct dentry *dentry)
581{
582 struct dentry *cpu_dentry = NULL;
583 unsigned reg, reg_min, reg_max;
584 int i, err = 0;
585 char reg_dir[12];
586 u32 low, high;
587
588 for (i = 0; i < ARRAY_SIZE(cpu_reg_range); i++) {
589 if (!get_cpu_range(cpu, &reg_min, &reg_max, i,
590 cpu_base[type].flag))
591 continue;
592
593 for (reg = reg_min; reg <= reg_max; reg++) {
594 if (rdmsr_safe_on_cpu(cpu, reg, &low, &high))
595 continue;
596
597 sprintf(reg_dir, "0x%x", reg);
598 cpu_dentry = debugfs_create_dir(reg_dir, dentry);
599 err = cpu_init_regfiles(cpu, type, reg, cpu_dentry);
600 if (err)
601 return err;
602 }
603 }
604
605 return err;
606}
607
608static int cpu_init_allreg(unsigned cpu, struct dentry *dentry)
609{
610 struct dentry *cpu_dentry = NULL;
611 unsigned type;
612 int err = 0;
613
614 for (type = 0; type < ARRAY_SIZE(cpu_base) - 1; type++) {
615 if (!is_typeflag_valid(cpu, cpu_base[type].flag))
616 continue;
617 cpu_dentry = debugfs_create_dir(cpu_base[type].name, dentry);
618 per_cpu(cpud_arr[type].dentry, cpu) = cpu_dentry;
619
620 if (type < CPU_TSS_BIT)
621 err = cpu_init_msr(cpu, type, cpu_dentry);
622 else
623 err = cpu_create_file(cpu, type, 0, CPU_INDEX_BIT,
624 cpu_dentry);
625 if (err)
626 return err;
627 }
628
629 return err;
630}
631
632static int cpu_init_cpu(void)
633{
634 struct dentry *cpu_dentry = NULL;
635 struct cpuinfo_x86 *cpui;
636 char cpu_dir[12];
637 unsigned cpu;
638 int err = 0;
639
640 for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
641 cpui = &cpu_data(cpu);
642 if (!cpu_has(cpui, X86_FEATURE_MSR))
643 continue;
644
645 sprintf(cpu_dir, "cpu%d", cpu);
646 cpu_dentry = debugfs_create_dir(cpu_dir, cpu_debugfs_dir);
647 err = cpu_init_allreg(cpu, cpu_dentry);
648
649 pr_info("cpu%d(%d) debug files %d\n",
650 cpu, nr_cpu_ids, per_cpu(cpud_priv_count, cpu));
651 if (per_cpu(cpud_priv_count, cpu) > MAX_CPU_FILES) {
652 pr_err("Register files count %d exceeds limit %d\n",
653 per_cpu(cpud_priv_count, cpu), MAX_CPU_FILES);
654 per_cpu(cpud_priv_count, cpu) = MAX_CPU_FILES;
655 err = -ENFILE;
656 }
657 if (err)
658 return err;
659 }
660
661 return err;
662}
663
664static int __init cpu_debug_init(void)
665{
666 cpu_debugfs_dir = debugfs_create_dir("cpu", arch_debugfs_dir);
667
668 return cpu_init_cpu();
669}
670
671static void __exit cpu_debug_exit(void)
672{
673 int i, cpu;
674
675 if (cpu_debugfs_dir)
676 debugfs_remove_recursive(cpu_debugfs_dir);
677
678 for (cpu = 0; cpu < nr_cpu_ids; cpu++)
679 for (i = 0; i < per_cpu(cpud_priv_count, cpu); i++)
680 kfree(per_cpu(cpud_priv_arr[i], cpu));
681}
682
683module_init(cpu_debug_init);
684module_exit(cpu_debug_exit);
685
686MODULE_AUTHOR("Jaswinder Singh Rajput");
687MODULE_DESCRIPTION("CPU Debug module");
688MODULE_LICENSE("GPL");
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index d616c06e99b4..8c1c07073ccc 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1343,6 +1343,13 @@ intel_pmu_enable_fixed(struct hw_perf_event *hwc, int __idx)
1343 bits |= 0x2; 1343 bits |= 0x2;
1344 if (hwc->config & ARCH_PERFMON_EVENTSEL_OS) 1344 if (hwc->config & ARCH_PERFMON_EVENTSEL_OS)
1345 bits |= 0x1; 1345 bits |= 0x1;
1346
1347 /*
1348 * ANY bit is supported in v3 and up
1349 */
1350 if (x86_pmu.version > 2 && hwc->config & ARCH_PERFMON_EVENTSEL_ANY)
1351 bits |= 0x4;
1352
1346 bits <<= (idx * 4); 1353 bits <<= (idx * 4);
1347 mask = 0xfULL << (idx * 4); 1354 mask = 0xfULL << (idx * 4);
1348 1355
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
index cb27fd6136c9..83e5e628de73 100644
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
@@ -229,7 +229,7 @@ static void __exit cpuid_exit(void)
229 for_each_online_cpu(cpu) 229 for_each_online_cpu(cpu)
230 cpuid_device_destroy(cpu); 230 cpuid_device_destroy(cpu);
231 class_destroy(cpuid_class); 231 class_destroy(cpuid_class);
232 unregister_chrdev(CPUID_MAJOR, "cpu/cpuid"); 232 __unregister_chrdev(CPUID_MAJOR, 0, NR_CPUS, "cpu/cpuid");
233 unregister_hotcpu_notifier(&cpuid_class_cpu_notifier); 233 unregister_hotcpu_notifier(&cpuid_class_cpu_notifier);
234} 234}
235 235
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index c56bc2873030..6d817554780a 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -123,13 +123,15 @@ print_context_stack_bp(struct thread_info *tinfo,
123 while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) { 123 while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
124 unsigned long addr = *ret_addr; 124 unsigned long addr = *ret_addr;
125 125
126 if (__kernel_text_address(addr)) { 126 if (!__kernel_text_address(addr))
127 ops->address(data, addr, 1); 127 break;
128 frame = frame->next_frame; 128
129 ret_addr = &frame->return_address; 129 ops->address(data, addr, 1);
130 print_ftrace_graph_addr(addr, data, ops, tinfo, graph); 130 frame = frame->next_frame;
131 } 131 ret_addr = &frame->return_address;
132 print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
132 } 133 }
134
133 return (unsigned long)frame; 135 return (unsigned long)frame;
134} 136}
135EXPORT_SYMBOL_GPL(print_context_stack_bp); 137EXPORT_SYMBOL_GPL(print_context_stack_bp);
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index ba6e65884603..ad80a1c718c6 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -34,6 +34,8 @@
34 */ 34 */
35unsigned long hpet_address; 35unsigned long hpet_address;
36u8 hpet_blockid; /* OS timer block num */ 36u8 hpet_blockid; /* OS timer block num */
37u8 hpet_msi_disable;
38
37#ifdef CONFIG_PCI_MSI 39#ifdef CONFIG_PCI_MSI
38static unsigned long hpet_num_timers; 40static unsigned long hpet_num_timers;
39#endif 41#endif
@@ -596,6 +598,9 @@ static void hpet_msi_capability_lookup(unsigned int start_timer)
596 unsigned int num_timers_used = 0; 598 unsigned int num_timers_used = 0;
597 int i; 599 int i;
598 600
601 if (hpet_msi_disable)
602 return;
603
599 if (boot_cpu_has(X86_FEATURE_ARAT)) 604 if (boot_cpu_has(X86_FEATURE_ARAT))
600 return; 605 return;
601 id = hpet_readl(HPET_ID); 606 id = hpet_readl(HPET_ID);
@@ -928,6 +933,9 @@ static __init int hpet_late_init(void)
928 hpet_reserve_platform_timers(hpet_readl(HPET_ID)); 933 hpet_reserve_platform_timers(hpet_readl(HPET_ID));
929 hpet_print_config(); 934 hpet_print_config();
930 935
936 if (hpet_msi_disable)
937 return 0;
938
931 if (boot_cpu_has(X86_FEATURE_ARAT)) 939 if (boot_cpu_has(X86_FEATURE_ARAT))
932 return 0; 940 return 0;
933 941
diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index 37542b67c57e..e1af7c055c7d 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -36,9 +36,6 @@ MODULE_LICENSE("GPL v2");
36#define UCODE_EQUIV_CPU_TABLE_TYPE 0x00000000 36#define UCODE_EQUIV_CPU_TABLE_TYPE 0x00000000
37#define UCODE_UCODE_TYPE 0x00000001 37#define UCODE_UCODE_TYPE 0x00000001
38 38
39const struct firmware *firmware;
40static int supported_cpu;
41
42struct equiv_cpu_entry { 39struct equiv_cpu_entry {
43 u32 installed_cpu; 40 u32 installed_cpu;
44 u32 fixed_errata_mask; 41 u32 fixed_errata_mask;
@@ -77,12 +74,15 @@ static struct equiv_cpu_entry *equiv_cpu_table;
77 74
78static int collect_cpu_info_amd(int cpu, struct cpu_signature *csig) 75static int collect_cpu_info_amd(int cpu, struct cpu_signature *csig)
79{ 76{
77 struct cpuinfo_x86 *c = &cpu_data(cpu);
80 u32 dummy; 78 u32 dummy;
81 79
82 if (!supported_cpu)
83 return -1;
84
85 memset(csig, 0, sizeof(*csig)); 80 memset(csig, 0, sizeof(*csig));
81 if (c->x86_vendor != X86_VENDOR_AMD || c->x86 < 0x10) {
82 pr_warning("microcode: CPU%d: AMD CPU family 0x%x not "
83 "supported\n", cpu, c->x86);
84 return -1;
85 }
86 rdmsr(MSR_AMD64_PATCH_LEVEL, csig->rev, dummy); 86 rdmsr(MSR_AMD64_PATCH_LEVEL, csig->rev, dummy);
87 pr_info("CPU%d: patch_level=0x%x\n", cpu, csig->rev); 87 pr_info("CPU%d: patch_level=0x%x\n", cpu, csig->rev);
88 return 0; 88 return 0;
@@ -294,10 +294,14 @@ generic_load_microcode(int cpu, const u8 *data, size_t size)
294 294
295static enum ucode_state request_microcode_fw(int cpu, struct device *device) 295static enum ucode_state request_microcode_fw(int cpu, struct device *device)
296{ 296{
297 const char *fw_name = "amd-ucode/microcode_amd.bin";
298 const struct firmware *firmware;
297 enum ucode_state ret; 299 enum ucode_state ret;
298 300
299 if (firmware == NULL) 301 if (request_firmware(&firmware, fw_name, device)) {
302 printk(KERN_ERR "microcode: failed to load file %s\n", fw_name);
300 return UCODE_NFOUND; 303 return UCODE_NFOUND;
304 }
301 305
302 if (*(u32 *)firmware->data != UCODE_MAGIC) { 306 if (*(u32 *)firmware->data != UCODE_MAGIC) {
303 pr_err("invalid UCODE_MAGIC (0x%08x)\n", 307 pr_err("invalid UCODE_MAGIC (0x%08x)\n",
@@ -307,6 +311,8 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
307 311
308 ret = generic_load_microcode(cpu, firmware->data, firmware->size); 312 ret = generic_load_microcode(cpu, firmware->data, firmware->size);
309 313
314 release_firmware(firmware);
315
310 return ret; 316 return ret;
311} 317}
312 318
@@ -325,31 +331,7 @@ static void microcode_fini_cpu_amd(int cpu)
325 uci->mc = NULL; 331 uci->mc = NULL;
326} 332}
327 333
328void init_microcode_amd(struct device *device)
329{
330 const char *fw_name = "amd-ucode/microcode_amd.bin";
331 struct cpuinfo_x86 *c = &boot_cpu_data;
332
333 WARN_ON(c->x86_vendor != X86_VENDOR_AMD);
334
335 if (c->x86 < 0x10) {
336 pr_warning("AMD CPU family 0x%x not supported\n", c->x86);
337 return;
338 }
339 supported_cpu = 1;
340
341 if (request_firmware(&firmware, fw_name, device))
342 pr_err("failed to load file %s\n", fw_name);
343}
344
345void fini_microcode_amd(void)
346{
347 release_firmware(firmware);
348}
349
350static struct microcode_ops microcode_amd_ops = { 334static struct microcode_ops microcode_amd_ops = {
351 .init = init_microcode_amd,
352 .fini = fini_microcode_amd,
353 .request_microcode_user = request_microcode_user, 335 .request_microcode_user = request_microcode_user,
354 .request_microcode_fw = request_microcode_fw, 336 .request_microcode_fw = request_microcode_fw,
355 .collect_cpu_info = collect_cpu_info_amd, 337 .collect_cpu_info = collect_cpu_info_amd,
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
index 0c8632433090..cceb5bc3c3c2 100644
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@ -521,9 +521,6 @@ static int __init microcode_init(void)
521 return PTR_ERR(microcode_pdev); 521 return PTR_ERR(microcode_pdev);
522 } 522 }
523 523
524 if (microcode_ops->init)
525 microcode_ops->init(&microcode_pdev->dev);
526
527 get_online_cpus(); 524 get_online_cpus();
528 mutex_lock(&microcode_mutex); 525 mutex_lock(&microcode_mutex);
529 526
@@ -566,9 +563,6 @@ static void __exit microcode_exit(void)
566 563
567 platform_device_unregister(microcode_pdev); 564 platform_device_unregister(microcode_pdev);
568 565
569 if (microcode_ops->fini)
570 microcode_ops->fini();
571
572 microcode_ops = NULL; 566 microcode_ops = NULL;
573 567
574 pr_info("Microcode Update Driver: v" MICROCODE_VERSION " removed.\n"); 568 pr_info("Microcode Update Driver: v" MICROCODE_VERSION " removed.\n");
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index 4bd93c9b2b27..206735ac8cbd 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -285,7 +285,7 @@ static void __exit msr_exit(void)
285 for_each_online_cpu(cpu) 285 for_each_online_cpu(cpu)
286 msr_device_destroy(cpu); 286 msr_device_destroy(cpu);
287 class_destroy(msr_class); 287 class_destroy(msr_class);
288 unregister_chrdev(MSR_MAJOR, "cpu/msr"); 288 __unregister_chrdev(MSR_MAJOR, 0, NR_CPUS, "cpu/msr");
289 unregister_hotcpu_notifier(&msr_class_cpu_notifier); 289 unregister_hotcpu_notifier(&msr_class_cpu_notifier);
290} 290}
291 291
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index c6ee241c8a98..c9b3522b6b46 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -115,18 +115,6 @@ void flush_thread(void)
115{ 115{
116 struct task_struct *tsk = current; 116 struct task_struct *tsk = current;
117 117
118#ifdef CONFIG_X86_64
119 if (test_tsk_thread_flag(tsk, TIF_ABI_PENDING)) {
120 clear_tsk_thread_flag(tsk, TIF_ABI_PENDING);
121 if (test_tsk_thread_flag(tsk, TIF_IA32)) {
122 clear_tsk_thread_flag(tsk, TIF_IA32);
123 } else {
124 set_tsk_thread_flag(tsk, TIF_IA32);
125 current_thread_info()->status |= TS_COMPAT;
126 }
127 }
128#endif
129
130 flush_ptrace_hw_breakpoint(tsk); 118 flush_ptrace_hw_breakpoint(tsk);
131 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array)); 119 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
132 /* 120 /*
@@ -288,6 +276,8 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
288 regs.es = __USER_DS; 276 regs.es = __USER_DS;
289 regs.fs = __KERNEL_PERCPU; 277 regs.fs = __KERNEL_PERCPU;
290 regs.gs = __KERNEL_STACK_CANARY; 278 regs.gs = __KERNEL_STACK_CANARY;
279#else
280 regs.ss = __KERNEL_DS;
291#endif 281#endif
292 282
293 regs.orig_ax = -1; 283 regs.orig_ax = -1;
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index f9e033150cdf..41a26a82470a 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -521,6 +521,17 @@ void set_personality_64bit(void)
521 current->personality &= ~READ_IMPLIES_EXEC; 521 current->personality &= ~READ_IMPLIES_EXEC;
522} 522}
523 523
524void set_personality_ia32(void)
525{
526 /* inherit personality from parent */
527
528 /* Make sure to be in 32bit mode */
529 set_thread_flag(TIF_IA32);
530
531 /* Prepare the first "return" to user space */
532 current_thread_info()->status |= TS_COMPAT;
533}
534
524unsigned long get_wchan(struct task_struct *p) 535unsigned long get_wchan(struct task_struct *p)
525{ 536{
526 unsigned long stack; 537 unsigned long stack;
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
index 18093d7498f0..12e9feaa2f7a 100644
--- a/arch/x86/kernel/quirks.c
+++ b/arch/x86/kernel/quirks.c
@@ -491,6 +491,19 @@ void force_hpet_resume(void)
491 break; 491 break;
492 } 492 }
493} 493}
494
495/*
496 * HPET MSI on some boards (ATI SB700/SB800) has side effect on
497 * floppy DMA. Disable HPET MSI on such platforms.
498 */
499static void force_disable_hpet_msi(struct pci_dev *unused)
500{
501 hpet_msi_disable = 1;
502}
503
504DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS,
505 force_disable_hpet_msi);
506
494#endif 507#endif
495 508
496#if defined(CONFIG_PCI) && defined(CONFIG_NUMA) 509#if defined(CONFIG_PCI) && defined(CONFIG_NUMA)
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 3063a0c4858b..ba8c045da782 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -373,6 +373,12 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode,
373 if (unlikely(!apic_enabled(apic))) 373 if (unlikely(!apic_enabled(apic)))
374 break; 374 break;
375 375
376 if (trig_mode) {
377 apic_debug("level trig mode for vector %d", vector);
378 apic_set_vector(vector, apic->regs + APIC_TMR);
379 } else
380 apic_clear_vector(vector, apic->regs + APIC_TMR);
381
376 result = !apic_test_and_set_irr(vector, apic); 382 result = !apic_test_and_set_irr(vector, apic);
377 trace_kvm_apic_accept_irq(vcpu->vcpu_id, delivery_mode, 383 trace_kvm_apic_accept_irq(vcpu->vcpu_id, delivery_mode,
378 trig_mode, vector, !result); 384 trig_mode, vector, !result);
@@ -383,11 +389,6 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode,
383 break; 389 break;
384 } 390 }
385 391
386 if (trig_mode) {
387 apic_debug("level trig mode for vector %d", vector);
388 apic_set_vector(vector, apic->regs + APIC_TMR);
389 } else
390 apic_clear_vector(vector, apic->regs + APIC_TMR);
391 kvm_vcpu_kick(vcpu); 392 kvm_vcpu_kick(vcpu);
392 break; 393 break;
393 394
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 4c3e5b2314cb..89a49fb46a27 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -477,7 +477,7 @@ static int host_mapping_level(struct kvm *kvm, gfn_t gfn)
477 477
478 addr = gfn_to_hva(kvm, gfn); 478 addr = gfn_to_hva(kvm, gfn);
479 if (kvm_is_error_hva(addr)) 479 if (kvm_is_error_hva(addr))
480 return page_size; 480 return PT_PAGE_TABLE_LEVEL;
481 481
482 down_read(&current->mm->mmap_sem); 482 down_read(&current->mm->mmap_sem);
483 vma = find_vma(current->mm, addr); 483 vma = find_vma(current->mm, addr);
@@ -515,11 +515,9 @@ static int mapping_level(struct kvm_vcpu *vcpu, gfn_t large_gfn)
515 if (host_level == PT_PAGE_TABLE_LEVEL) 515 if (host_level == PT_PAGE_TABLE_LEVEL)
516 return host_level; 516 return host_level;
517 517
518 for (level = PT_DIRECTORY_LEVEL; level <= host_level; ++level) { 518 for (level = PT_DIRECTORY_LEVEL; level <= host_level; ++level)
519
520 if (has_wrprotected_page(vcpu->kvm, large_gfn, level)) 519 if (has_wrprotected_page(vcpu->kvm, large_gfn, level))
521 break; 520 break;
522 }
523 521
524 return level - 1; 522 return level - 1;
525} 523}
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index 58a0f1e88596..ede2131a9225 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -150,7 +150,9 @@ walk:
150 walker->table_gfn[walker->level - 1] = table_gfn; 150 walker->table_gfn[walker->level - 1] = table_gfn;
151 walker->pte_gpa[walker->level - 1] = pte_gpa; 151 walker->pte_gpa[walker->level - 1] = pte_gpa;
152 152
153 kvm_read_guest(vcpu->kvm, pte_gpa, &pte, sizeof(pte)); 153 if (kvm_read_guest(vcpu->kvm, pte_gpa, &pte, sizeof(pte)))
154 goto not_present;
155
154 trace_kvm_mmu_paging_element(pte, walker->level); 156 trace_kvm_mmu_paging_element(pte, walker->level);
155 157
156 if (!is_present_gpte(pte)) 158 if (!is_present_gpte(pte))
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 6651dbf58675..1ddcad452add 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5072,12 +5072,13 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
5072 GFP_KERNEL); 5072 GFP_KERNEL);
5073 if (!vcpu->arch.mce_banks) { 5073 if (!vcpu->arch.mce_banks) {
5074 r = -ENOMEM; 5074 r = -ENOMEM;
5075 goto fail_mmu_destroy; 5075 goto fail_free_lapic;
5076 } 5076 }
5077 vcpu->arch.mcg_cap = KVM_MAX_MCE_BANKS; 5077 vcpu->arch.mcg_cap = KVM_MAX_MCE_BANKS;
5078 5078
5079 return 0; 5079 return 0;
5080 5080fail_free_lapic:
5081 kvm_free_lapic(vcpu);
5081fail_mmu_destroy: 5082fail_mmu_destroy:
5082 kvm_mmu_destroy(vcpu); 5083 kvm_mmu_destroy(vcpu);
5083fail_free_pio_data: 5084fail_free_pio_data:
@@ -5088,6 +5089,7 @@ fail:
5088 5089
5089void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) 5090void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)
5090{ 5091{
5092 kfree(vcpu->arch.mce_banks);
5091 kvm_free_lapic(vcpu); 5093 kvm_free_lapic(vcpu);
5092 down_read(&vcpu->kvm->slots_lock); 5094 down_read(&vcpu->kvm->slots_lock);
5093 kvm_mmu_destroy(vcpu); 5095 kvm_mmu_destroy(vcpu);
diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c
index c0f6198565eb..536fb6823366 100644
--- a/arch/x86/mm/kmmio.c
+++ b/arch/x86/mm/kmmio.c
@@ -538,14 +538,15 @@ static int
538kmmio_die_notifier(struct notifier_block *nb, unsigned long val, void *args) 538kmmio_die_notifier(struct notifier_block *nb, unsigned long val, void *args)
539{ 539{
540 struct die_args *arg = args; 540 struct die_args *arg = args;
541 unsigned long* dr6_p = (unsigned long *)ERR_PTR(arg->err);
541 542
542 if (val == DIE_DEBUG && (arg->err & DR_STEP)) 543 if (val == DIE_DEBUG && (*dr6_p & DR_STEP))
543 if (post_kmmio_handler(arg->err, arg->regs) == 1) { 544 if (post_kmmio_handler(*dr6_p, arg->regs) == 1) {
544 /* 545 /*
545 * Reset the BS bit in dr6 (pointed by args->err) to 546 * Reset the BS bit in dr6 (pointed by args->err) to
546 * denote completion of processing 547 * denote completion of processing
547 */ 548 */
548 (*(unsigned long *)ERR_PTR(arg->err)) &= ~DR_STEP; 549 *dr6_p &= ~DR_STEP;
549 return NOTIFY_STOP; 550 return NOTIFY_STOP;
550 } 551 }
551 552
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
index a27124185fc1..28c68762648f 100644
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
@@ -229,9 +229,11 @@ update_nodes_add(int node, unsigned long start, unsigned long end)
229 printk(KERN_ERR "SRAT: Hotplug zone not continuous. Partly ignored\n"); 229 printk(KERN_ERR "SRAT: Hotplug zone not continuous. Partly ignored\n");
230 } 230 }
231 231
232 if (changed) 232 if (changed) {
233 node_set(node, cpu_nodes_parsed);
233 printk(KERN_INFO "SRAT: hot plug zone found %Lx - %Lx\n", 234 printk(KERN_INFO "SRAT: hot plug zone found %Lx - %Lx\n",
234 nd->start, nd->end); 235 nd->start, nd->end);
236 }
235} 237}
236 238
237/* Callback for parsing of the Proximity Domain <-> Memory Area mappings */ 239/* Callback for parsing of the Proximity Domain <-> Memory Area mappings */
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index 564b008a51c7..39fba37f702f 100644
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -15,7 +15,7 @@ obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
15 15
16obj-y += common.o early.o 16obj-y += common.o early.o
17obj-y += amd_bus.o 17obj-y += amd_bus.o
18obj-$(CONFIG_X86_64) += bus_numa.o intel_bus.o 18obj-$(CONFIG_X86_64) += bus_numa.o
19 19
20ifeq ($(CONFIG_PCI_DEBUG),y) 20ifeq ($(CONFIG_PCI_DEBUG),y)
21EXTRA_CFLAGS += -DDEBUG 21EXTRA_CFLAGS += -DDEBUG
diff --git a/arch/x86/pci/intel_bus.c b/arch/x86/pci/intel_bus.c
deleted file mode 100644
index f81a2fa8fe25..000000000000
--- a/arch/x86/pci/intel_bus.c
+++ /dev/null
@@ -1,94 +0,0 @@
1/*
2 * to read io range from IOH pci conf, need to do it after mmconfig is there
3 */
4
5#include <linux/delay.h>
6#include <linux/dmi.h>
7#include <linux/pci.h>
8#include <linux/init.h>
9#include <asm/pci_x86.h>
10
11#include "bus_numa.h"
12
13static inline void print_ioh_resources(struct pci_root_info *info)
14{
15 int res_num;
16 int busnum;
17 int i;
18
19 printk(KERN_DEBUG "IOH bus: [%02x, %02x]\n",
20 info->bus_min, info->bus_max);
21 res_num = info->res_num;
22 busnum = info->bus_min;
23 for (i = 0; i < res_num; i++) {
24 struct resource *res;
25
26 res = &info->res[i];
27 printk(KERN_DEBUG "IOH bus: %02x index %x %s: [%llx, %llx]\n",
28 busnum, i,
29 (res->flags & IORESOURCE_IO) ? "io port" :
30 "mmio",
31 res->start, res->end);
32 }
33}
34
35#define IOH_LIO 0x108
36#define IOH_LMMIOL 0x10c
37#define IOH_LMMIOH 0x110
38#define IOH_LMMIOH_BASEU 0x114
39#define IOH_LMMIOH_LIMITU 0x118
40#define IOH_LCFGBUS 0x11c
41
42static void __devinit pci_root_bus_res(struct pci_dev *dev)
43{
44 u16 word;
45 u32 dword;
46 struct pci_root_info *info;
47 u16 io_base, io_end;
48 u32 mmiol_base, mmiol_end;
49 u64 mmioh_base, mmioh_end;
50 int bus_base, bus_end;
51
52 /* some sys doesn't get mmconf enabled */
53 if (dev->cfg_size < 0x120)
54 return;
55
56 if (pci_root_num >= PCI_ROOT_NR) {
57 printk(KERN_DEBUG "intel_bus.c: PCI_ROOT_NR is too small\n");
58 return;
59 }
60
61 info = &pci_root_info[pci_root_num];
62 pci_root_num++;
63
64 pci_read_config_word(dev, IOH_LCFGBUS, &word);
65 bus_base = (word & 0xff);
66 bus_end = (word & 0xff00) >> 8;
67 sprintf(info->name, "PCI Bus #%02x", bus_base);
68 info->bus_min = bus_base;
69 info->bus_max = bus_end;
70
71 pci_read_config_word(dev, IOH_LIO, &word);
72 io_base = (word & 0xf0) << (12 - 4);
73 io_end = (word & 0xf000) | 0xfff;
74 update_res(info, io_base, io_end, IORESOURCE_IO, 0);
75
76 pci_read_config_dword(dev, IOH_LMMIOL, &dword);
77 mmiol_base = (dword & 0xff00) << (24 - 8);
78 mmiol_end = (dword & 0xff000000) | 0xffffff;
79 update_res(info, mmiol_base, mmiol_end, IORESOURCE_MEM, 0);
80
81 pci_read_config_dword(dev, IOH_LMMIOH, &dword);
82 mmioh_base = ((u64)(dword & 0xfc00)) << (26 - 10);
83 mmioh_end = ((u64)(dword & 0xfc000000) | 0x3ffffff);
84 pci_read_config_dword(dev, IOH_LMMIOH_BASEU, &dword);
85 mmioh_base |= ((u64)(dword & 0x7ffff)) << 32;
86 pci_read_config_dword(dev, IOH_LMMIOH_LIMITU, &dword);
87 mmioh_end |= ((u64)(dword & 0x7ffff)) << 32;
88 update_res(info, mmioh_base, mmioh_end, IORESOURCE_MEM, 0);
89
90 print_ioh_resources(info);
91}
92
93/* intel IOH */
94DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x342e, pci_root_bus_res);
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 2b26dd5930c6..36daccb68642 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1151,9 +1151,13 @@ asmlinkage void __init xen_start_kernel(void)
1151 1151
1152 /* keep using Xen gdt for now; no urgent need to change it */ 1152 /* keep using Xen gdt for now; no urgent need to change it */
1153 1153
1154#ifdef CONFIG_X86_32
1154 pv_info.kernel_rpl = 1; 1155 pv_info.kernel_rpl = 1;
1155 if (xen_feature(XENFEAT_supervisor_mode_kernel)) 1156 if (xen_feature(XENFEAT_supervisor_mode_kernel))
1156 pv_info.kernel_rpl = 0; 1157 pv_info.kernel_rpl = 0;
1158#else
1159 pv_info.kernel_rpl = 0;
1160#endif
1157 1161
1158 /* set the limit of our address space */ 1162 /* set the limit of our address space */
1159 xen_reserve_top(); 1163 xen_reserve_top();
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-29 15:18:00 -0400