aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/Kconfig1
-rw-r--r--arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi1
-rw-r--r--arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi1
-rw-r--r--arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi1
-rw-r--r--arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi6
-rw-r--r--arch/powerpc/boot/dts/fsl/qoriq-bman1-portals.dtsi90
-rw-r--r--arch/powerpc/boot/dts/fsl/qoriq-bman1.dtsi41
-rw-r--r--arch/powerpc/boot/dts/fsl/qoriq-qman1-portals.dtsi101
-rw-r--r--arch/powerpc/boot/dts/fsl/qoriq-qman1.dtsi41
-rw-r--r--arch/powerpc/boot/dts/fsl/qoriq-qman3.dtsi41
-rw-r--r--arch/powerpc/boot/dts/mvme2500.dts280
-rw-r--r--arch/powerpc/boot/dts/t4240emu.dts281
-rw-r--r--arch/powerpc/configs/40x/acadia_defconfig21
-rw-r--r--arch/powerpc/configs/40x/ep405_defconfig18
-rw-r--r--arch/powerpc/configs/40x/kilauea_defconfig27
-rw-r--r--arch/powerpc/configs/40x/klondike_defconfig4
-rw-r--r--arch/powerpc/configs/40x/makalu_defconfig20
-rw-r--r--arch/powerpc/configs/40x/obs600_defconfig13
-rw-r--r--arch/powerpc/configs/40x/virtex_defconfig21
-rw-r--r--arch/powerpc/configs/40x/walnut_defconfig18
-rw-r--r--arch/powerpc/configs/44x/akebono_defconfig7
-rw-r--r--arch/powerpc/configs/44x/arches_defconfig23
-rw-r--r--arch/powerpc/configs/44x/bamboo_defconfig15
-rw-r--r--arch/powerpc/configs/44x/bluestone_defconfig16
-rw-r--r--arch/powerpc/configs/44x/canyonlands_defconfig26
-rw-r--r--arch/powerpc/configs/44x/currituck_defconfig13
-rw-r--r--arch/powerpc/configs/44x/ebony_defconfig17
-rw-r--r--arch/powerpc/configs/44x/eiger_defconfig26
-rw-r--r--arch/powerpc/configs/44x/icon_defconfig20
-rw-r--r--arch/powerpc/configs/44x/iss476-smp_defconfig16
-rw-r--r--arch/powerpc/configs/44x/katmai_defconfig15
-rw-r--r--arch/powerpc/configs/44x/rainier_defconfig15
-rw-r--r--arch/powerpc/configs/44x/redwood_defconfig26
-rw-r--r--arch/powerpc/configs/44x/sam440ep_defconfig19
-rw-r--r--arch/powerpc/configs/44x/sequoia_defconfig21
-rw-r--r--arch/powerpc/configs/44x/taishan_defconfig16
-rw-r--r--arch/powerpc/configs/44x/virtex5_defconfig21
-rw-r--r--arch/powerpc/configs/44x/warp_defconfig23
-rw-r--r--arch/powerpc/configs/52xx/cm5200_defconfig19
-rw-r--r--arch/powerpc/configs/52xx/lite5200b_defconfig20
-rw-r--r--arch/powerpc/configs/52xx/motionpro_defconfig22
-rw-r--r--arch/powerpc/configs/52xx/pcm030_defconfig21
-rw-r--r--arch/powerpc/configs/52xx/tqm5200_defconfig22
-rw-r--r--arch/powerpc/configs/83xx/asp8347_defconfig22
-rw-r--r--arch/powerpc/configs/83xx/kmeter1_defconfig4
-rw-r--r--arch/powerpc/configs/83xx/mpc8313_rdb_defconfig25
-rw-r--r--arch/powerpc/configs/83xx/mpc8315_rdb_defconfig22
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_mds_defconfig21
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_rdb_defconfig23
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itx_defconfig20
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig20
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_mds_defconfig23
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_mds_defconfig22
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_rdk_defconfig16
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_mds_defconfig15
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_rdb_defconfig17
-rw-r--r--arch/powerpc/configs/83xx/sbc834x_defconfig16
-rw-r--r--arch/powerpc/configs/85xx/ge_imp3a_defconfig16
-rw-r--r--arch/powerpc/configs/85xx/kmp204x_defconfig3
-rw-r--r--arch/powerpc/configs/85xx/ksi8560_defconfig17
-rw-r--r--arch/powerpc/configs/85xx/mpc8540_ads_defconfig19
-rw-r--r--arch/powerpc/configs/85xx/mpc8560_ads_defconfig19
-rw-r--r--arch/powerpc/configs/85xx/mpc85xx_cds_defconfig21
-rw-r--r--arch/powerpc/configs/85xx/ppa8548_defconfig62
-rw-r--r--arch/powerpc/configs/85xx/sbc8548_defconfig40
-rw-r--r--arch/powerpc/configs/85xx/socrates_defconfig24
-rw-r--r--arch/powerpc/configs/85xx/stx_gp3_defconfig15
-rw-r--r--arch/powerpc/configs/85xx/tqm8540_defconfig17
-rw-r--r--arch/powerpc/configs/85xx/tqm8541_defconfig17
-rw-r--r--arch/powerpc/configs/85xx/tqm8548_defconfig22
-rw-r--r--arch/powerpc/configs/85xx/tqm8555_defconfig17
-rw-r--r--arch/powerpc/configs/85xx/tqm8560_defconfig17
-rw-r--r--arch/powerpc/configs/85xx/xes_mpc85xx_defconfig34
-rw-r--r--arch/powerpc/configs/86xx/gef_ppc9a_defconfig36
-rw-r--r--arch/powerpc/configs/86xx/gef_sbc310_defconfig35
-rw-r--r--arch/powerpc/configs/86xx/gef_sbc610_defconfig53
-rw-r--r--arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig32
-rw-r--r--arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig33
-rw-r--r--arch/powerpc/configs/86xx/sbc8641d_defconfig54
-rw-r--r--arch/powerpc/configs/adder875_defconfig27
-rw-r--r--arch/powerpc/configs/amigaone_defconfig36
-rw-r--r--arch/powerpc/configs/c2k_defconfig82
-rw-r--r--arch/powerpc/configs/cell_defconfig30
-rw-r--r--arch/powerpc/configs/celleb_defconfig21
-rw-r--r--arch/powerpc/configs/chrp32_defconfig37
-rw-r--r--arch/powerpc/configs/corenet32_smp_defconfig21
-rw-r--r--arch/powerpc/configs/corenet64_smp_defconfig6
-rw-r--r--arch/powerpc/configs/ep8248e_defconfig17
-rw-r--r--arch/powerpc/configs/ep88xc_defconfig29
-rw-r--r--arch/powerpc/configs/g5_defconfig63
-rw-r--r--arch/powerpc/configs/gamecube_defconfig15
-rw-r--r--arch/powerpc/configs/holly_defconfig15
-rw-r--r--arch/powerpc/configs/linkstation_defconfig28
-rw-r--r--arch/powerpc/configs/maple_defconfig26
-rw-r--r--arch/powerpc/configs/mgcoge_defconfig12
-rw-r--r--arch/powerpc/configs/mpc512x_defconfig2
-rw-r--r--arch/powerpc/configs/mpc5200_defconfig18
-rw-r--r--arch/powerpc/configs/mpc7448_hpc2_defconfig18
-rw-r--r--arch/powerpc/configs/mpc8272_ads_defconfig24
-rw-r--r--arch/powerpc/configs/mpc83xx_defconfig7
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig72
-rw-r--r--arch/powerpc/configs/mpc85xx_smp_defconfig63
-rw-r--r--arch/powerpc/configs/mpc866_ads_defconfig22
-rw-r--r--arch/powerpc/configs/mpc86xx_defconfig39
-rw-r--r--arch/powerpc/configs/mpc885_ads_defconfig29
-rw-r--r--arch/powerpc/configs/mvme5100_defconfig9
-rw-r--r--arch/powerpc/configs/pasemi_defconfig3
-rw-r--r--arch/powerpc/configs/pmac32_defconfig65
-rw-r--r--arch/powerpc/configs/ppc40x_defconfig17
-rw-r--r--arch/powerpc/configs/ppc44x_defconfig14
-rw-r--r--arch/powerpc/configs/ppc64_defconfig16
-rw-r--r--arch/powerpc/configs/ppc64e_defconfig4
-rw-r--r--arch/powerpc/configs/ppc6xx_defconfig348
-rw-r--r--arch/powerpc/configs/pq2fads_defconfig28
-rw-r--r--arch/powerpc/configs/ps3_defconfig18
-rw-r--r--arch/powerpc/configs/pseries_defconfig29
-rw-r--r--arch/powerpc/configs/pseries_le_defconfig31
-rw-r--r--arch/powerpc/configs/storcenter_defconfig12
-rw-r--r--arch/powerpc/configs/tqm8xx_defconfig32
-rw-r--r--arch/powerpc/configs/wii_defconfig18
-rw-r--r--arch/powerpc/include/asm/cputable.h2
-rw-r--r--arch/powerpc/include/asm/eeh.h13
-rw-r--r--arch/powerpc/include/asm/kprobes.h63
-rw-r--r--arch/powerpc/include/asm/opal.h10
-rw-r--r--arch/powerpc/include/asm/pci-bridge.h4
-rw-r--r--arch/powerpc/include/asm/pgtable-ppc32.h23
-rw-r--r--arch/powerpc/include/asm/pgtable.h7
-rw-r--r--arch/powerpc/include/asm/pnv-pci.h4
-rw-r--r--arch/powerpc/include/asm/pte-8xx.h9
-rw-r--r--arch/powerpc/include/asm/pte-common.h25
-rw-r--r--arch/powerpc/include/asm/rtas.h2
-rw-r--r--arch/powerpc/include/asm/smp.h1
-rw-r--r--arch/powerpc/include/asm/thread_info.h2
-rw-r--r--arch/powerpc/kernel/asm-offsets.c15
-rw-r--r--arch/powerpc/kernel/cputable.c1
-rw-r--r--arch/powerpc/kernel/eeh.c24
-rw-r--r--arch/powerpc/kernel/eeh_driver.c4
-rw-r--r--arch/powerpc/kernel/eeh_pe.c20
-rw-r--r--arch/powerpc/kernel/entry_32.S83
-rw-r--r--arch/powerpc/kernel/entry_64.S37
-rw-r--r--arch/powerpc/kernel/head_8xx.S123
-rw-r--r--arch/powerpc/kernel/paca.c8
-rw-r--r--arch/powerpc/kernel/pci_dn.c4
-rw-r--r--arch/powerpc/kernel/prom.c3
-rw-r--r--arch/powerpc/kernel/rtas.c22
-rw-r--r--arch/powerpc/kernel/smp.c14
-rw-r--r--arch/powerpc/kernel/syscalls.c14
-rw-r--r--arch/powerpc/kernel/traps.c15
-rw-r--r--arch/powerpc/kvm/book3s_hv_interrupts.S26
-rw-r--r--arch/powerpc/kvm/book3s_hv_rmhandlers.S28
-rw-r--r--arch/powerpc/lib/Makefile27
-rw-r--r--arch/powerpc/lib/memcmp_64.S233
-rw-r--r--arch/powerpc/lib/string.S2
-rw-r--r--arch/powerpc/mm/fsl_booke_mmu.c2
-rw-r--r--arch/powerpc/mm/mmu_context_nohash.c43
-rw-r--r--arch/powerpc/mm/pgtable_32.c19
-rw-r--r--arch/powerpc/mm/slice.c29
-rw-r--r--arch/powerpc/mm/tlb_nohash.c9
-rw-r--r--arch/powerpc/perf/core-fsl-emb.c10
-rw-r--r--arch/powerpc/perf/hv-24x7-catalog.h25
-rw-r--r--arch/powerpc/perf/hv-24x7-domains.h28
-rw-r--r--arch/powerpc/perf/hv-24x7.c793
-rw-r--r--arch/powerpc/perf/hv-24x7.h12
-rw-r--r--arch/powerpc/perf/hv-common.c10
-rw-r--r--arch/powerpc/perf/hv-common.h10
-rw-r--r--arch/powerpc/perf/hv-gpci-requests.h261
-rw-r--r--arch/powerpc/perf/hv-gpci.c23
-rw-r--r--arch/powerpc/perf/hv-gpci.h37
-rw-r--r--arch/powerpc/perf/req-gen/_begin.h13
-rw-r--r--arch/powerpc/perf/req-gen/_clear.h5
-rw-r--r--arch/powerpc/perf/req-gen/_end.h4
-rw-r--r--arch/powerpc/perf/req-gen/_request-begin.h15
-rw-r--r--arch/powerpc/perf/req-gen/_request-end.h8
-rw-r--r--arch/powerpc/perf/req-gen/perf.h155
-rw-r--r--arch/powerpc/platforms/44x/Kconfig1
-rw-r--r--arch/powerpc/platforms/83xx/usb.c3
-rw-r--r--arch/powerpc/platforms/85xx/Kconfig6
-rw-r--r--arch/powerpc/platforms/85xx/Makefile1
-rw-r--r--arch/powerpc/platforms/85xx/mvme2500.c74
-rw-r--r--arch/powerpc/platforms/cell/smp.c2
-rw-r--r--arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c11
-rw-r--r--arch/powerpc/platforms/powernv/Makefile2
-rw-r--r--arch/powerpc/platforms/powernv/eeh-powernv.c11
-rw-r--r--arch/powerpc/platforms/powernv/opal-power.c65
-rw-r--r--arch/powerpc/platforms/powernv/opal.c72
-rw-r--r--arch/powerpc/platforms/powernv/pci-ioda.c41
-rw-r--r--arch/powerpc/platforms/powernv/pci.c30
-rw-r--r--arch/powerpc/platforms/ps3/mm.c77
-rw-r--r--arch/powerpc/platforms/ps3/platform.h13
-rw-r--r--arch/powerpc/platforms/pseries/Kconfig20
-rw-r--r--arch/powerpc/platforms/pseries/hotplug-cpu.c2
-rw-r--r--arch/powerpc/platforms/pseries/mobility.c22
-rw-r--r--arch/powerpc/platforms/pseries/ras.c2
-rw-r--r--arch/powerpc/sysdev/fsl_pci.c11
-rw-r--r--arch/powerpc/sysdev/indirect_pci.c25
-rw-r--r--arch/powerpc/sysdev/mpic.c2
-rw-r--r--arch/powerpc/sysdev/ppc4xx_hsta_msi.c2
-rw-r--r--arch/powerpc/sysdev/qe_lib/qe.c6
-rw-r--r--arch/powerpc/sysdev/xics/xics-common.c2
-rw-r--r--arch/powerpc/xmon/xmon.c14
200 files changed, 3536 insertions, 3098 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index a2a168e2dfe7..22b0940494bb 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -256,6 +256,7 @@ config PPC_OF_PLATFORM_PCI
256 default n 256 default n
257 257
258config ARCH_SUPPORTS_DEBUG_PAGEALLOC 258config ARCH_SUPPORTS_DEBUG_PAGEALLOC
259 depends on PPC32 || PPC_STD_MMU_64
259 def_bool y 260 def_bool y
260 261
261config ARCH_SUPPORTS_UPROBES 262config ARCH_SUPPORTS_UPROBES
diff --git a/arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi
index 1382fec9e8c5..7fcb1ac0f232 100644
--- a/arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi
+++ b/arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi
@@ -50,6 +50,7 @@ ethernet@b0000 {
50 fsl,num_tx_queues = <0x8>; 50 fsl,num_tx_queues = <0x8>;
51 fsl,magic-packet; 51 fsl,magic-packet;
52 local-mac-address = [ 00 00 00 00 00 00 ]; 52 local-mac-address = [ 00 00 00 00 00 00 ];
53 ranges;
53 54
54 queue-group@b0000 { 55 queue-group@b0000 {
55 #address-cells = <1>; 56 #address-cells = <1>;
diff --git a/arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi b/arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi
index 221cd2ea5b31..9f25427c1527 100644
--- a/arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi
+++ b/arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi
@@ -50,6 +50,7 @@ ethernet@b1000 {
50 fsl,num_tx_queues = <0x8>; 50 fsl,num_tx_queues = <0x8>;
51 fsl,magic-packet; 51 fsl,magic-packet;
52 local-mac-address = [ 00 00 00 00 00 00 ]; 52 local-mac-address = [ 00 00 00 00 00 00 ];
53 ranges;
53 54
54 queue-group@b1000 { 55 queue-group@b1000 {
55 #address-cells = <1>; 56 #address-cells = <1>;
diff --git a/arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi b/arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi
index 61456c317609..cd7c318ab131 100644
--- a/arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi
+++ b/arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi
@@ -49,6 +49,7 @@ ethernet@b2000 {
49 fsl,num_tx_queues = <0x8>; 49 fsl,num_tx_queues = <0x8>;
50 fsl,magic-packet; 50 fsl,magic-packet;
51 local-mac-address = [ 00 00 00 00 00 00 ]; 51 local-mac-address = [ 00 00 00 00 00 00 ];
52 ranges;
52 53
53 queue-group@b2000 { 54 queue-group@b2000 {
54 #address-cells = <1>; 55 #address-cells = <1>;
diff --git a/arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi
index 72a3ef5945c1..a1b48546b02d 100644
--- a/arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi
+++ b/arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi
@@ -1,5 +1,5 @@
1/* 1/*
2 * PQ3 GPIO device tree stub [ controller @ offset 0xf000 ] 2 * PQ3 GPIO device tree stub [ controller @ offset 0xfc00 ]
3 * 3 *
4 * Copyright 2011 Freescale Semiconductor Inc. 4 * Copyright 2011 Freescale Semiconductor Inc.
5 * 5 *
@@ -32,10 +32,10 @@
32 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34 34
35gpio-controller@f000 { 35gpio-controller@fc00 {
36 #gpio-cells = <2>; 36 #gpio-cells = <2>;
37 compatible = "fsl,pq3-gpio"; 37 compatible = "fsl,pq3-gpio";
38 reg = <0xf000 0x100>; 38 reg = <0xfc00 0x100>;
39 interrupts = <47 0x2 0 0>; 39 interrupts = <47 0x2 0 0>;
40 gpio-controller; 40 gpio-controller;
41}; 41};
diff --git a/arch/powerpc/boot/dts/fsl/qoriq-bman1-portals.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-bman1-portals.dtsi
new file mode 100644
index 000000000000..5022432ebaa9
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/qoriq-bman1-portals.dtsi
@@ -0,0 +1,90 @@
1/*
2 * QorIQ BMan Portal device tree stub for 10 portals
3 *
4 * Copyright 2011 - 2014 Freescale Semiconductor Inc.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are met:
8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * * Neither the name of Freescale Semiconductor nor the
14 * names of its contributors may be used to endorse or promote products
15 * derived from this software without specific prior written permission.
16 *
17 *
18 * ALTERNATIVELY, this software may be distributed under the terms of the
19 * GNU General Public License ("GPL") as published by the Free Software
20 * Foundation, either version 2 of that License or (at your option) any
21 * later version.
22 *
23 * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
24 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
25 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
26 * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
27 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
28 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
29 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
30 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
32 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */
34
35&bportals {
36 #address-cells = <1>;
37 #size-cells = <1>;
38 compatible = "simple-bus";
39
40 bman-portal@0 {
41 compatible = "fsl,bman-portal";
42 reg = <0x0 0x4000>, <0x100000 0x1000>;
43 interrupts = <105 2 0 0>;
44 };
45 bman-portal@4000 {
46 compatible = "fsl,bman-portal";
47 reg = <0x4000 0x4000>, <0x101000 0x1000>;
48 interrupts = <107 2 0 0>;
49 };
50 bman-portal@8000 {
51 compatible = "fsl,bman-portal";
52 reg = <0x8000 0x4000>, <0x102000 0x1000>;
53 interrupts = <109 2 0 0>;
54 };
55 bman-portal@c000 {
56 compatible = "fsl,bman-portal";
57 reg = <0xc000 0x4000>, <0x103000 0x1000>;
58 interrupts = <111 2 0 0>;
59 };
60 bman-portal@10000 {
61 compatible = "fsl,bman-portal";
62 reg = <0x10000 0x4000>, <0x104000 0x1000>;
63 interrupts = <113 2 0 0>;
64 };
65 bman-portal@14000 {
66 compatible = "fsl,bman-portal";
67 reg = <0x14000 0x4000>, <0x105000 0x1000>;
68 interrupts = <115 2 0 0>;
69 };
70 bman-portal@18000 {
71 compatible = "fsl,bman-portal";
72 reg = <0x18000 0x4000>, <0x106000 0x1000>;
73 interrupts = <117 2 0 0>;
74 };
75 bman-portal@1c000 {
76 compatible = "fsl,bman-portal";
77 reg = <0x1c000 0x4000>, <0x107000 0x1000>;
78 interrupts = <119 2 0 0>;
79 };
80 bman-portal@20000 {
81 compatible = "fsl,bman-portal";
82 reg = <0x20000 0x4000>, <0x108000 0x1000>;
83 interrupts = <121 2 0 0>;
84 };
85 bman-portal@24000 {
86 compatible = "fsl,bman-portal";
87 reg = <0x24000 0x4000>, <0x109000 0x1000>;
88 interrupts = <123 2 0 0>;
89 };
90};
diff --git a/arch/powerpc/boot/dts/fsl/qoriq-bman1.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-bman1.dtsi
new file mode 100644
index 000000000000..3b5e3504acb7
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/qoriq-bman1.dtsi
@@ -0,0 +1,41 @@
1/*
2 * QorIQ BMan device tree stub [ controller @ offset 0x31a000 ]
3 *
4 * Copyright 2011 - 2014 Freescale Semiconductor Inc.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are met:
8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * * Neither the name of Freescale Semiconductor nor the
14 * names of its contributors may be used to endorse or promote products
15 * derived from this software without specific prior written permission.
16 *
17 *
18 * ALTERNATIVELY, this software may be distributed under the terms of the
19 * GNU General Public License ("GPL") as published by the Free Software
20 * Foundation, either version 2 of that License or (at your option) any
21 * later version.
22 *
23 * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
24 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
25 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
26 * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
27 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
28 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
29 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
30 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
32 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */
34
35bman: bman@31a000 {
36 compatible = "fsl,bman";
37 reg = <0x31a000 0x1000>;
38 interrupts = <16 2 1 2>;
39 fsl,bman-portals = <&bportals>;
40 memory-region = <&bman_fbpr>;
41};
diff --git a/arch/powerpc/boot/dts/fsl/qoriq-qman1-portals.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-qman1-portals.dtsi
new file mode 100644
index 000000000000..05d51acafa67
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/qoriq-qman1-portals.dtsi
@@ -0,0 +1,101 @@
1/*
2 * QorIQ QMan Portal device tree stub for 10 portals & 15 pool channels
3 *
4 * Copyright 2011 - 2014 Freescale Semiconductor Inc.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are met:
8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * * Neither the name of Freescale Semiconductor nor the
14 * names of its contributors may be used to endorse or promote products
15 * derived from this software without specific prior written permission.
16 *
17 *
18 * ALTERNATIVELY, this software may be distributed under the terms of the
19 * GNU General Public License ("GPL") as published by the Free Software
20 * Foundation, either version 2 of that License or (at your option) any
21 * later version.
22 *
23 * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
24 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
25 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
26 * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
27 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
28 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
29 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
30 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
32 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */
34
35&qportals {
36 #address-cells = <1>;
37 #size-cells = <1>;
38 compatible = "simple-bus";
39
40 qportal0: qman-portal@0 {
41 compatible = "fsl,qman-portal";
42 reg = <0x0 0x4000>, <0x100000 0x1000>;
43 interrupts = <104 2 0 0>;
44 fsl,qman-channel-id = <0x0>;
45 };
46 qportal1: qman-portal@4000 {
47 compatible = "fsl,qman-portal";
48 reg = <0x4000 0x4000>, <0x101000 0x1000>;
49 interrupts = <106 2 0 0>;
50 fsl,qman-channel-id = <1>;
51 };
52 qportal2: qman-portal@8000 {
53 compatible = "fsl,qman-portal";
54 reg = <0x8000 0x4000>, <0x102000 0x1000>;
55 interrupts = <108 2 0 0>;
56 fsl,qman-channel-id = <2>;
57 };
58 qportal3: qman-portal@c000 {
59 compatible = "fsl,qman-portal";
60 reg = <0xc000 0x4000>, <0x103000 0x1000>;
61 interrupts = <110 2 0 0>;
62 fsl,qman-channel-id = <3>;
63 };
64 qportal4: qman-portal@10000 {
65 compatible = "fsl,qman-portal";
66 reg = <0x10000 0x4000>, <0x104000 0x1000>;
67 interrupts = <112 2 0 0>;
68 fsl,qman-channel-id = <4>;
69 };
70 qportal5: qman-portal@14000 {
71 compatible = "fsl,qman-portal";
72 reg = <0x14000 0x4000>, <0x105000 0x1000>;
73 interrupts = <114 2 0 0>;
74 fsl,qman-channel-id = <5>;
75 };
76 qportal6: qman-portal@18000 {
77 compatible = "fsl,qman-portal";
78 reg = <0x18000 0x4000>, <0x106000 0x1000>;
79 interrupts = <116 2 0 0>;
80 fsl,qman-channel-id = <6>;
81 };
82
83 qportal7: qman-portal@1c000 {
84 compatible = "fsl,qman-portal";
85 reg = <0x1c000 0x4000>, <0x107000 0x1000>;
86 interrupts = <118 2 0 0>;
87 fsl,qman-channel-id = <7>;
88 };
89 qportal8: qman-portal@20000 {
90 compatible = "fsl,qman-portal";
91 reg = <0x20000 0x4000>, <0x108000 0x1000>;
92 interrupts = <120 2 0 0>;
93 fsl,qman-channel-id = <8>;
94 };
95 qportal9: qman-portal@24000 {
96 compatible = "fsl,qman-portal";
97 reg = <0x24000 0x4000>, <0x109000 0x1000>;
98 interrupts = <122 2 0 0>;
99 fsl,qman-channel-id = <9>;
100 };
101};
diff --git a/arch/powerpc/boot/dts/fsl/qoriq-qman1.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-qman1.dtsi
new file mode 100644
index 000000000000..0695778c4386
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/qoriq-qman1.dtsi
@@ -0,0 +1,41 @@
1/*
2 * QorIQ QMan device tree stub [ controller @ offset 0x318000 ]
3 *
4 * Copyright 2011 - 2014 Freescale Semiconductor Inc.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are met:
8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * * Neither the name of Freescale Semiconductor nor the
14 * names of its contributors may be used to endorse or promote products
15 * derived from this software without specific prior written permission.
16 *
17 *
18 * ALTERNATIVELY, this software may be distributed under the terms of the
19 * GNU General Public License ("GPL") as published by the Free Software
20 * Foundation, either version 2 of that License or (at your option) any
21 * later version.
22 *
23 * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
24 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
25 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
26 * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
27 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
28 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
29 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
30 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
32 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */
34
35qman: qman@318000 {
36 compatible = "fsl,qman";
37 reg = <0x318000 0x1000>;
38 interrupts = <16 2 1 3>;
39 fsl,qman-portals = <&qportals>;
40 memory-region = <&qman_fqd &qman_pfdr>;
41};
diff --git a/arch/powerpc/boot/dts/fsl/qoriq-qman3.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-qman3.dtsi
new file mode 100644
index 000000000000..b379abd1439d
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/qoriq-qman3.dtsi
@@ -0,0 +1,41 @@
1/*
2 * QorIQ QMan rev3 device tree stub [ controller @ offset 0x318000 ]
3 *
4 * Copyright 2014 Freescale Semiconductor Inc.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are met:
8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * * Neither the name of Freescale Semiconductor nor the
14 * names of its contributors may be used to endorse or promote products
15 * derived from this software without specific prior written permission.
16 *
17 *
18 * ALTERNATIVELY, this software may be distributed under the terms of the
19 * GNU General Public License ("GPL") as published by the Free Software
20 * Foundation, either version 2 of that License or (at your option) any
21 * later version.
22 *
23 * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
24 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
25 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
26 * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
27 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
28 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
29 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
30 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
32 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */
34
35qman: qman@318000 {
36 compatible = "fsl,qman";
37 reg = <0x318000 0x2000>;
38 interrupts = <16 2 1 3>;
39 fsl,qman-portals = <&qportals>;
40 memory-region = <&qman_fqd &qman_pfdr>;
41};
diff --git a/arch/powerpc/boot/dts/mvme2500.dts b/arch/powerpc/boot/dts/mvme2500.dts
new file mode 100644
index 000000000000..67714cf0f745
--- /dev/null
+++ b/arch/powerpc/boot/dts/mvme2500.dts
@@ -0,0 +1,280 @@
1/*
2 * Device tree source for the Emerson/Artesyn MVME2500
3 *
4 * Copyright 2014 Elettra-Sincrotrone Trieste S.C.p.A.
5 *
6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License as published by the
8 * Free Software Foundation; either version 2 of the License, or (at your
9 * option) any later version.
10 *
11 * Based on: P2020 DS Device Tree Source
12 * Copyright 2009 Freescale Semiconductor Inc.
13 */
14
15/include/ "fsl/p2020si-pre.dtsi"
16
17/ {
18 model = "MVME2500";
19 compatible = "artesyn,MVME2500";
20
21 aliases {
22 serial2 = &serial2;
23 serial3 = &serial3;
24 serial4 = &serial4;
25 serial5 = &serial5;
26 };
27
28 memory {
29 device_type = "memory";
30 };
31
32 soc: soc@ffe00000 {
33 ranges = <0x0 0 0xffe00000 0x100000>;
34
35 i2c@3000 {
36 hwmon@4c {
37 compatible = "adi,adt7461";
38 reg = <0x4c>;
39 };
40
41 rtc@68 {
42 compatible = "dallas,ds1337";
43 reg = <0x68>;
44 interrupts = <8 1 0 0>;
45 };
46
47 eeprom@54 {
48 compatible = "atmel,24c64";
49 reg = <0x54>;
50 };
51
52 eeprom@52 {
53 compatible = "atmel,24c512";
54 reg = <0x52>;
55 };
56
57 eeprom@53 {
58 compatible = "atmel,24c512";
59 reg = <0x53>;
60 };
61
62 eeprom@50 {
63 compatible = "atmel,24c02";
64 reg = <0x50>;
65 };
66
67 };
68
69 spi0: spi@7000 {
70 fsl,espi-num-chipselects = <2>;
71
72 flash@0 {
73 compatible = "atmel,at25df641";
74 reg = <0>;
75 spi-max-frequency = <10000000>;
76 };
77 flash@1 {
78 compatible = "atmel,at25df641";
79 reg = <1>;
80 spi-max-frequency = <10000000>;
81 };
82 };
83
84 usb@22000 {
85 dr_mode = "host";
86 phy_type = "ulpi";
87 };
88
89 enet0: ethernet@24000 {
90 tbi-handle = <&tbi0>;
91 phy-handle = <&phy1>;
92 phy-connection-type = "rgmii-id";
93 };
94
95 mdio@24520 {
96 phy1: ethernet-phy@1 {
97 compatible = "brcm,bcm54616S";
98 interrupts = <6 1 0 0>;
99 reg = <0x1>;
100 };
101
102 phy2: ethernet-phy@2 {
103 compatible = "brcm,bcm54616S";
104 interrupts = <6 1 0 0>;
105 reg = <0x2>;
106 };
107
108 phy3: ethernet-phy@3 {
109 compatible = "brcm,bcm54616S";
110 interrupts = <5 1 0 0>;
111 reg = <0x3>;
112 };
113
114 phy7: ethernet-phy@7 {
115 compatible = "brcm,bcm54616S";
116 interrupts = <7 1 0 0>;
117 reg = <0x7>;
118 };
119
120 tbi0: tbi-phy@11 {
121 reg = <0x11>;
122 device_type = "tbi-phy";
123 };
124 };
125
126 enet1: ethernet@25000 {
127 tbi-handle = <&tbi1>;
128 phy-handle = <&phy7>;
129 phy-connection-type = "rgmii-id";
130 };
131
132 mdio@25520 {
133 tbi1: tbi-phy@11 {
134 reg = <0x11>;
135 device_type = "tbi-phy";
136 };
137 };
138
139 enet2: ethernet@26000 {
140 tbi-handle = <&tbi2>;
141 phy-handle = <&phy3>;
142 phy-connection-type = "rgmii-id";
143 };
144
145 mdio@26520 {
146 tbi2: tbi-phy@11 {
147 reg = <0x11>;
148 device_type = "tbi-phy";
149 };
150 };
151 };
152
153 lbc: localbus@ffe05000 {
154 reg = <0 0xffe05000 0 0x1000>;
155
156 ranges = <0x0 0x0 0x0 0xfff00000 0x00080000
157 0x1 0x0 0x0 0xffc40000 0x00010000
158 0x2 0x0 0x0 0xffc50000 0x00010000
159 0x3 0x0 0x0 0xffc60000 0x00010000
160 0x4 0x0 0x0 0xffc70000 0x00010000
161 0x6 0x0 0x0 0xffc80000 0x00010000
162 0x5 0x0 0x0 0xffdf0000 0x00008000>;
163
164 serial2: serial@1,0 {
165 device_type = "serial";
166 compatible = "ns16550";
167 reg = <0x1 0x0 0x100>;
168 clock-frequency = <1843200>;
169 interrupts = <11 2 0 0>;
170 };
171
172 serial3: serial@2,0 {
173 device_type = "serial";
174 compatible = "ns16550";
175 reg = <0x2 0x0 0x100>;
176 clock-frequency = <1843200>;
177 interrupts = <1 2 0 0>;
178 };
179
180 serial4: serial@3,0 {
181 device_type = "serial";
182 compatible = "ns16550";
183 reg = <0x3 0x0 0x100>;
184 clock-frequency = <1843200>;
185 interrupts = <2 2 0 0>;
186 };
187
188 serial5: serial@4,0 {
189 device_type = "serial";
190 compatible = "ns16550";
191 reg = <0x4 0x0 0x100>;
192 clock-frequency = <1843200>;
193 interrupts = <3 2 0 0>;
194 };
195
196 mram@0,0 {
197 compatible = "everspin,mram", "mtd-ram";
198 reg = <0x0 0x0 0x80000>;
199 bank-width = <2>;
200 };
201
202 board-control@5,0 {
203 compatible = "artesyn,mvme2500-fpga";
204 reg = <0x5 0x0 0x01000>;
205 };
206
207 cpld@6,0 {
208 compatible = "artesyn,mvme2500-cpld";
209 reg = <0x6 0x0 0x10000>;
210 interrupts = <9 1 0 0>;
211 };
212 };
213
214 pci0: pcie@ffe08000 {
215 reg = <0 0xffe08000 0 0x1000>;
216 ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000
217 0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;
218 pcie@0 {
219 ranges = <0x2000000 0x0 0x80000000
220 0x2000000 0x0 0x80000000
221 0x0 0x20000000
222
223 0x1000000 0x0 0x0
224 0x1000000 0x0 0x0
225 0x0 0x10000>;
226 };
227 };
228
229 pci1: pcie@ffe09000 {
230 reg = <0 0xffe09000 0 0x1000>;
231 ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
232 0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;
233 pcie@0 {
234 ranges = <0x2000000 0x0 0xa0000000
235 0x2000000 0x0 0xa0000000
236 0x0 0x20000000
237
238 0x1000000 0x0 0x0
239 0x1000000 0x0 0x0
240 0x0 0x10000>;
241 };
242
243 };
244
245 pci2: pcie@ffe0a000 {
246 reg = <0 0xffe0a000 0 0x1000>;
247 ranges = <0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000
248 0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x10000>;
249 pcie@0 {
250 ranges = <0x2000000 0x0 0xc0000000
251 0x2000000 0x0 0xc0000000
252 0x0 0x20000000
253
254 0x1000000 0x0 0x0
255 0x1000000 0x0 0x0
256 0x0 0x10000>;
257 };
258 };
259};
260
261/include/ "fsl/p2020si-post.dtsi"
262
263/ {
264 soc@ffe00000 {
265 serial@4600 {
266 status = "disabled";
267 };
268
269 i2c@3100 {
270 status = "disabled";
271 };
272
273 sdhc@2e000 {
274 compatible = "fsl,p2020-esdhc", "fsl,esdhc";
275 non-removable;
276 };
277
278 };
279
280};
diff --git a/arch/powerpc/boot/dts/t4240emu.dts b/arch/powerpc/boot/dts/t4240emu.dts
deleted file mode 100644
index decaf357db9c..000000000000
--- a/arch/powerpc/boot/dts/t4240emu.dts
+++ /dev/null
@@ -1,281 +0,0 @@
1/*
2 * T4240 emulator Device Tree Source
3 *
4 * Copyright 2013 Freescale Semiconductor Inc.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are met:
8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * * Neither the name of Freescale Semiconductor nor the
14 * names of its contributors may be used to endorse or promote products
15 * derived from this software without specific prior written permission.
16 *
17 *
18 * ALTERNATIVELY, this software may be distributed under the terms of the
19 * GNU General Public License ("GPL") as published by the Free Software
20 * Foundation, either version 2 of that License or (at your option) any
21 * later version.
22 *
23 * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor "AS IS" AND ANY
24 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
25 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
26 * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
27 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
28 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
29 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
30 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
32 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */
34
35/dts-v1/;
36
37/include/ "fsl/e6500_power_isa.dtsi"
38/ {
39 compatible = "fsl,T4240";
40 #address-cells = <2>;
41 #size-cells = <2>;
42 interrupt-parent = <&mpic>;
43
44 aliases {
45 ccsr = &soc;
46
47 serial0 = &serial0;
48 serial1 = &serial1;
49 serial2 = &serial2;
50 serial3 = &serial3;
51 dma0 = &dma0;
52 dma1 = &dma1;
53 };
54
55 cpus {
56 #address-cells = <1>;
57 #size-cells = <0>;
58
59 cpu0: PowerPC,e6500@0 {
60 device_type = "cpu";
61 reg = <0 1>;
62 next-level-cache = <&L2_1>;
63 fsl,portid-mapping = <0x80000000>;
64 };
65 cpu1: PowerPC,e6500@2 {
66 device_type = "cpu";
67 reg = <2 3>;
68 next-level-cache = <&L2_1>;
69 fsl,portid-mapping = <0x80000000>;
70 };
71 cpu2: PowerPC,e6500@4 {
72 device_type = "cpu";
73 reg = <4 5>;
74 next-level-cache = <&L2_1>;
75 fsl,portid-mapping = <0x80000000>;
76 };
77 cpu3: PowerPC,e6500@6 {
78 device_type = "cpu";
79 reg = <6 7>;
80 next-level-cache = <&L2_1>;
81 fsl,portid-mapping = <0x80000000>;
82 };
83
84 cpu4: PowerPC,e6500@8 {
85 device_type = "cpu";
86 reg = <8 9>;
87 next-level-cache = <&L2_2>;
88 fsl,portid-mapping = <0x40000000>;
89 };
90 cpu5: PowerPC,e6500@10 {
91 device_type = "cpu";
92 reg = <10 11>;
93 next-level-cache = <&L2_2>;
94 fsl,portid-mapping = <0x40000000>;
95 };
96 cpu6: PowerPC,e6500@12 {
97 device_type = "cpu";
98 reg = <12 13>;
99 next-level-cache = <&L2_2>;
100 fsl,portid-mapping = <0x40000000>;
101 };
102 cpu7: PowerPC,e6500@14 {
103 device_type = "cpu";
104 reg = <14 15>;
105 next-level-cache = <&L2_2>;
106 fsl,portid-mapping = <0x40000000>;
107 };
108
109 cpu8: PowerPC,e6500@16 {
110 device_type = "cpu";
111 reg = <16 17>;
112 next-level-cache = <&L2_3>;
113 fsl,portid-mapping = <0x20000000>;
114 };
115 cpu9: PowerPC,e6500@18 {
116 device_type = "cpu";
117 reg = <18 19>;
118 next-level-cache = <&L2_3>;
119 fsl,portid-mapping = <0x20000000>;
120 };
121 cpu10: PowerPC,e6500@20 {
122 device_type = "cpu";
123 reg = <20 21>;
124 next-level-cache = <&L2_3>;
125 fsl,portid-mapping = <0x20000000>;
126 };
127 cpu11: PowerPC,e6500@22 {
128 device_type = "cpu";
129 reg = <22 23>;
130 next-level-cache = <&L2_3>;
131 fsl,portid-mapping = <0x20000000>;
132 };
133 };
134};
135
136/ {
137 model = "fsl,T4240QDS";
138 compatible = "fsl,T4240EMU", "fsl,T4240QDS";
139 #address-cells = <2>;
140 #size-cells = <2>;
141 interrupt-parent = <&mpic>;
142
143 ifc: localbus@ffe124000 {
144 reg = <0xf 0xfe124000 0 0x2000>;
145 ranges = <0 0 0xf 0xe8000000 0x08000000
146 2 0 0xf 0xff800000 0x00010000
147 3 0 0xf 0xffdf0000 0x00008000>;
148
149 nor@0,0 {
150 #address-cells = <1>;
151 #size-cells = <1>;
152 compatible = "cfi-flash";
153 reg = <0x0 0x0 0x8000000>;
154
155 bank-width = <2>;
156 device-width = <1>;
157 };
158
159 };
160
161 memory {
162 device_type = "memory";
163 };
164
165 soc: soc@ffe000000 {
166 ranges = <0x00000000 0xf 0xfe000000 0x1000000>;
167 reg = <0xf 0xfe000000 0 0x00001000>;
168
169 };
170};
171
172&ifc {
173 #address-cells = <2>;
174 #size-cells = <1>;
175 compatible = "fsl,ifc", "simple-bus";
176 interrupts = <25 2 0 0>;
177};
178
179&soc {
180 #address-cells = <1>;
181 #size-cells = <1>;
182 device_type = "soc";
183 compatible = "simple-bus";
184
185 soc-sram-error {
186 compatible = "fsl,soc-sram-error";
187 interrupts = <16 2 1 29>;
188 };
189
190 corenet-law@0 {
191 compatible = "fsl,corenet-law";
192 reg = <0x0 0x1000>;
193 fsl,num-laws = <32>;
194 };
195
196 ddr1: memory-controller@8000 {
197 compatible = "fsl,qoriq-memory-controller-v4.7",
198 "fsl,qoriq-memory-controller";
199 reg = <0x8000 0x1000>;
200 interrupts = <16 2 1 23>;
201 };
202
203 ddr2: memory-controller@9000 {
204 compatible = "fsl,qoriq-memory-controller-v4.7",
205 "fsl,qoriq-memory-controller";
206 reg = <0x9000 0x1000>;
207 interrupts = <16 2 1 22>;
208 };
209
210 ddr3: memory-controller@a000 {
211 compatible = "fsl,qoriq-memory-controller-v4.7",
212 "fsl,qoriq-memory-controller";
213 reg = <0xa000 0x1000>;
214 interrupts = <16 2 1 21>;
215 };
216
217 cpc: l3-cache-controller@10000 {
218 compatible = "fsl,t4240-l3-cache-controller", "cache";
219 reg = <0x10000 0x1000
220 0x11000 0x1000
221 0x12000 0x1000>;
222 interrupts = <16 2 1 27
223 16 2 1 26
224 16 2 1 25>;
225 };
226
227 corenet-cf@18000 {
228 compatible = "fsl,corenet2-cf", "fsl,corenet-cf";
229 reg = <0x18000 0x1000>;
230 interrupts = <16 2 1 31>;
231 fsl,ccf-num-csdids = <32>;
232 fsl,ccf-num-snoopids = <32>;
233 };
234
235 iommu@20000 {
236 compatible = "fsl,pamu-v1.0", "fsl,pamu";
237 reg = <0x20000 0x6000>;
238 fsl,portid-mapping = <0x8000>;
239 interrupts = <
240 24 2 0 0
241 16 2 1 30>;
242 };
243
244/include/ "fsl/qoriq-mpic.dtsi"
245
246 guts: global-utilities@e0000 {
247 compatible = "fsl,t4240-device-config", "fsl,qoriq-device-config-2.0";
248 reg = <0xe0000 0xe00>;
249 fsl,has-rstcr;
250 fsl,liodn-bits = <12>;
251 };
252
253/include/ "fsl/qoriq-clockgen2.dtsi"
254 global-utilities@e1000 {
255 compatible = "fsl,t4240-clockgen", "fsl,qoriq-clockgen-2.0";
256 };
257
258/include/ "fsl/qoriq-dma-0.dtsi"
259/include/ "fsl/qoriq-dma-1.dtsi"
260
261/include/ "fsl/qoriq-i2c-0.dtsi"
262/include/ "fsl/qoriq-i2c-1.dtsi"
263/include/ "fsl/qoriq-duart-0.dtsi"
264/include/ "fsl/qoriq-duart-1.dtsi"
265
266 L2_1: l2-cache-controller@c20000 {
267 compatible = "fsl,t4240-l2-cache-controller";
268 reg = <0xc20000 0x40000>;
269 next-level-cache = <&cpc>;
270 };
271 L2_2: l2-cache-controller@c60000 {
272 compatible = "fsl,t4240-l2-cache-controller";
273 reg = <0xc60000 0x40000>;
274 next-level-cache = <&cpc>;
275 };
276 L2_3: l2-cache-controller@ca0000 {
277 compatible = "fsl,t4240-l2-cache-controller";
278 reg = <0xca0000 0x40000>;
279 next-level-cache = <&cpc>;
280 };
281};
diff --git a/arch/powerpc/configs/40x/acadia_defconfig b/arch/powerpc/configs/40x/acadia_defconfig
index 69e06eeae6a6..9110a5cb1bb7 100644
--- a/arch/powerpc/configs/40x/acadia_defconfig
+++ b/arch/powerpc/configs/40x/acadia_defconfig
@@ -1,19 +1,15 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 7CONFIG_KALLSYMS_ALL=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11CONFIG_MODULES=y 8CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
13# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
14CONFIG_ACADIA=y 11CONFIG_ACADIA=y
15# CONFIG_WALNUT is not set 12# CONFIG_WALNUT is not set
16CONFIG_SPARSE_IRQ=y
17CONFIG_PCI=y 13CONFIG_PCI=y
18CONFIG_NET=y 14CONFIG_NET=y
19CONFIG_PACKET=y 15CONFIG_PACKET=y
@@ -31,27 +27,18 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31CONFIG_CONNECTOR=y 27CONFIG_CONNECTOR=y
32CONFIG_MTD=y 28CONFIG_MTD=y
33CONFIG_MTD_CMDLINE_PARTS=y 29CONFIG_MTD_CMDLINE_PARTS=y
34CONFIG_MTD_OF_PARTS=y
35CONFIG_MTD_CHAR=y
36CONFIG_MTD_BLOCK=m 30CONFIG_MTD_BLOCK=m
37CONFIG_MTD_CFI=y 31CONFIG_MTD_CFI=y
38CONFIG_MTD_JEDECPROBE=y 32CONFIG_MTD_JEDECPROBE=y
39CONFIG_MTD_CFI_AMDSTD=y 33CONFIG_MTD_CFI_AMDSTD=y
40CONFIG_MTD_PHYSMAP_OF=y 34CONFIG_MTD_PHYSMAP_OF=y
41CONFIG_PROC_DEVICETREE=y
42CONFIG_BLK_DEV_RAM=y 35CONFIG_BLK_DEV_RAM=y
43CONFIG_BLK_DEV_RAM_SIZE=35000 36CONFIG_BLK_DEV_RAM_SIZE=35000
44# CONFIG_MISC_DEVICES is not set
45CONFIG_NETDEVICES=y 37CONFIG_NETDEVICES=y
46CONFIG_ETHERNET=y
47CONFIG_NET_VENDOR_IBM=y
48CONFIG_MII=y
49CONFIG_IBM_EMAC=y 38CONFIG_IBM_EMAC=y
50CONFIG_IBM_EMAC_RXB=256 39CONFIG_IBM_EMAC_RXB=256
51CONFIG_IBM_EMAC_TXB=256 40CONFIG_IBM_EMAC_TXB=256
52CONFIG_IBM_EMAC_DEBUG=y 41CONFIG_IBM_EMAC_DEBUG=y
53# CONFIG_NETDEV_1000 is not set
54# CONFIG_NETDEV_10000 is not set
55# CONFIG_INPUT is not set 42# CONFIG_INPUT is not set
56# CONFIG_SERIO is not set 43# CONFIG_SERIO is not set
57# CONFIG_VT is not set 44# CONFIG_VT is not set
@@ -65,20 +52,14 @@ CONFIG_SERIAL_OF_PLATFORM=y
65CONFIG_THERMAL=y 52CONFIG_THERMAL=y
66# CONFIG_USB_SUPPORT is not set 53# CONFIG_USB_SUPPORT is not set
67CONFIG_EXT2_FS=y 54CONFIG_EXT2_FS=y
68CONFIG_INOTIFY=y
69CONFIG_PROC_KCORE=y 55CONFIG_PROC_KCORE=y
70CONFIG_TMPFS=y 56CONFIG_TMPFS=y
71CONFIG_CRAMFS=y 57CONFIG_CRAMFS=y
72CONFIG_NFS_FS=y 58CONFIG_NFS_FS=y
73CONFIG_NFS_V3=y
74CONFIG_ROOT_NFS=y 59CONFIG_ROOT_NFS=y
75CONFIG_MAGIC_SYSRQ=y
76CONFIG_DEBUG_FS=y 60CONFIG_DEBUG_FS=y
77CONFIG_DEBUG_KERNEL=y 61CONFIG_MAGIC_SYSRQ=y
78CONFIG_DETECT_HUNG_TASK=y 62CONFIG_DETECT_HUNG_TASK=y
79# CONFIG_RCU_CPU_STALL_DETECTOR is not set
80CONFIG_SYSCTL_SYSCALL_CHECK=y
81CONFIG_CRYPTO=y
82CONFIG_CRYPTO_CBC=y 63CONFIG_CRYPTO_CBC=y
83CONFIG_CRYPTO_ECB=y 64CONFIG_CRYPTO_ECB=y
84CONFIG_CRYPTO_PCBC=y 65CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/40x/ep405_defconfig b/arch/powerpc/configs/40x/ep405_defconfig
index e9d84b5d0ab6..790366652ba3 100644
--- a/arch/powerpc/configs/40x/ep405_defconfig
+++ b/arch/powerpc/configs/40x/ep405_defconfig
@@ -1,19 +1,15 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 7CONFIG_KALLSYMS_ALL=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11CONFIG_MODULES=y 8CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
13# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
14CONFIG_EP405=y 11CONFIG_EP405=y
15# CONFIG_WALNUT is not set 12# CONFIG_WALNUT is not set
16CONFIG_SPARSE_IRQ=y
17CONFIG_NET=y 13CONFIG_NET=y
18CONFIG_PACKET=y 14CONFIG_PACKET=y
19CONFIG_UNIX=y 15CONFIG_UNIX=y
@@ -30,19 +26,14 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30CONFIG_CONNECTOR=y 26CONFIG_CONNECTOR=y
31CONFIG_MTD=y 27CONFIG_MTD=y
32CONFIG_MTD_CMDLINE_PARTS=y 28CONFIG_MTD_CMDLINE_PARTS=y
33CONFIG_MTD_OF_PARTS=y
34CONFIG_MTD_CHAR=y
35CONFIG_MTD_BLOCK=m 29CONFIG_MTD_BLOCK=m
36CONFIG_MTD_CFI=y 30CONFIG_MTD_CFI=y
37CONFIG_MTD_JEDECPROBE=y 31CONFIG_MTD_JEDECPROBE=y
38CONFIG_MTD_CFI_AMDSTD=y 32CONFIG_MTD_CFI_AMDSTD=y
39CONFIG_MTD_PHYSMAP_OF=y 33CONFIG_MTD_PHYSMAP_OF=y
40CONFIG_PROC_DEVICETREE=y
41CONFIG_BLK_DEV_RAM=y 34CONFIG_BLK_DEV_RAM=y
42CONFIG_BLK_DEV_RAM_SIZE=35000 35CONFIG_BLK_DEV_RAM_SIZE=35000
43CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
44CONFIG_ETHERNET=y
45CONFIG_NET_VENDOR_IBM=y
46CONFIG_IBM_EMAC=y 37CONFIG_IBM_EMAC=y
47# CONFIG_INPUT is not set 38# CONFIG_INPUT is not set
48# CONFIG_SERIO is not set 39# CONFIG_SERIO is not set
@@ -55,27 +46,20 @@ CONFIG_SERIAL_OF_PLATFORM=y
55# CONFIG_HW_RANDOM is not set 46# CONFIG_HW_RANDOM is not set
56# CONFIG_HWMON is not set 47# CONFIG_HWMON is not set
57CONFIG_THERMAL=y 48CONFIG_THERMAL=y
58CONFIG_VIDEO_OUTPUT_CONTROL=m
59CONFIG_USB=y 49CONFIG_USB=y
60CONFIG_USB_MON=y 50CONFIG_USB_MON=y
61CONFIG_USB_OHCI_HCD=y 51CONFIG_USB_OHCI_HCD=y
62CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 52CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
63CONFIG_USB_OHCI_HCD_PPC_OF_LE=y 53CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
64CONFIG_EXT2_FS=y 54CONFIG_EXT2_FS=y
65CONFIG_INOTIFY=y
66CONFIG_PROC_KCORE=y 55CONFIG_PROC_KCORE=y
67CONFIG_TMPFS=y 56CONFIG_TMPFS=y
68CONFIG_CRAMFS=y 57CONFIG_CRAMFS=y
69CONFIG_NFS_FS=y 58CONFIG_NFS_FS=y
70CONFIG_NFS_V3=y
71CONFIG_ROOT_NFS=y 59CONFIG_ROOT_NFS=y
72CONFIG_MAGIC_SYSRQ=y
73CONFIG_DEBUG_FS=y 60CONFIG_DEBUG_FS=y
74CONFIG_DEBUG_KERNEL=y 61CONFIG_MAGIC_SYSRQ=y
75CONFIG_DETECT_HUNG_TASK=y 62CONFIG_DETECT_HUNG_TASK=y
76# CONFIG_RCU_CPU_STALL_DETECTOR is not set
77CONFIG_SYSCTL_SYSCALL_CHECK=y
78CONFIG_CRYPTO=y
79CONFIG_CRYPTO_CBC=y 63CONFIG_CRYPTO_CBC=y
80CONFIG_CRYPTO_ECB=y 64CONFIG_CRYPTO_ECB=y
81CONFIG_CRYPTO_PCBC=y 65CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/40x/kilauea_defconfig b/arch/powerpc/configs/40x/kilauea_defconfig
index 5ff338f6443f..01bd71bac027 100644
--- a/arch/powerpc/configs/40x/kilauea_defconfig
+++ b/arch/powerpc/configs/40x/kilauea_defconfig
@@ -1,21 +1,17 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 8CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 9CONFIG_KALLSYMS_ALL=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11CONFIG_MODULES=y 10CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 11CONFIG_MODULE_UNLOAD=y
13# CONFIG_BLK_DEV_BSG is not set 12# CONFIG_BLK_DEV_BSG is not set
14CONFIG_KILAUEA=y 13CONFIG_KILAUEA=y
15CONFIG_NO_HZ=y
16CONFIG_HIGH_RES_TIMERS=y
17# CONFIG_WALNUT is not set 14# CONFIG_WALNUT is not set
18CONFIG_SPARSE_IRQ=y
19CONFIG_PCI=y 15CONFIG_PCI=y
20CONFIG_NET=y 16CONFIG_NET=y
21CONFIG_PACKET=y 17CONFIG_PACKET=y
@@ -33,8 +29,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
33CONFIG_CONNECTOR=y 29CONFIG_CONNECTOR=y
34CONFIG_MTD=y 30CONFIG_MTD=y
35CONFIG_MTD_CMDLINE_PARTS=y 31CONFIG_MTD_CMDLINE_PARTS=y
36CONFIG_MTD_OF_PARTS=y
37CONFIG_MTD_CHAR=y
38CONFIG_MTD_BLOCK=y 32CONFIG_MTD_BLOCK=y
39CONFIG_MTD_CFI=y 33CONFIG_MTD_CFI=y
40CONFIG_MTD_JEDECPROBE=y 34CONFIG_MTD_JEDECPROBE=y
@@ -42,21 +36,12 @@ CONFIG_MTD_CFI_AMDSTD=y
42CONFIG_MTD_PHYSMAP_OF=y 36CONFIG_MTD_PHYSMAP_OF=y
43CONFIG_MTD_NAND=y 37CONFIG_MTD_NAND=y
44CONFIG_MTD_NAND_NDFC=y 38CONFIG_MTD_NAND_NDFC=y
45CONFIG_PROC_DEVICETREE=y
46CONFIG_PM=y
47CONFIG_SUSPEND=y
48CONFIG_PPC4xx_CPM=y
49CONFIG_BLK_DEV_RAM=y 39CONFIG_BLK_DEV_RAM=y
50CONFIG_BLK_DEV_RAM_SIZE=35000 40CONFIG_BLK_DEV_RAM_SIZE=35000
51# CONFIG_MISC_DEVICES is not set
52CONFIG_NETDEVICES=y 41CONFIG_NETDEVICES=y
53CONFIG_ETHERNET=y
54CONFIG_NET_VENDOR_IBM=y
55CONFIG_IBM_EMAC=y 42CONFIG_IBM_EMAC=y
56CONFIG_IBM_EMAC_RXB=256 43CONFIG_IBM_EMAC_RXB=256
57CONFIG_IBM_EMAC_TXB=256 44CONFIG_IBM_EMAC_TXB=256
58# CONFIG_NETDEV_1000 is not set
59# CONFIG_NETDEV_10000 is not set
60# CONFIG_INPUT is not set 45# CONFIG_INPUT is not set
61# CONFIG_SERIO is not set 46# CONFIG_SERIO is not set
62# CONFIG_VT is not set 47# CONFIG_VT is not set
@@ -75,20 +60,14 @@ CONFIG_THERMAL=y
75CONFIG_RTC_CLASS=y 60CONFIG_RTC_CLASS=y
76CONFIG_RTC_DRV_DS1307=y 61CONFIG_RTC_DRV_DS1307=y
77CONFIG_EXT2_FS=y 62CONFIG_EXT2_FS=y
78CONFIG_INOTIFY=y
79CONFIG_PROC_KCORE=y 63CONFIG_PROC_KCORE=y
80CONFIG_TMPFS=y 64CONFIG_TMPFS=y
81CONFIG_CRAMFS=y 65CONFIG_CRAMFS=y
82CONFIG_NFS_FS=y 66CONFIG_NFS_FS=y
83CONFIG_NFS_V3=y
84CONFIG_ROOT_NFS=y 67CONFIG_ROOT_NFS=y
85CONFIG_MAGIC_SYSRQ=y
86CONFIG_DEBUG_FS=y 68CONFIG_DEBUG_FS=y
87CONFIG_DEBUG_KERNEL=y 69CONFIG_MAGIC_SYSRQ=y
88CONFIG_DETECT_HUNG_TASK=y 70CONFIG_DETECT_HUNG_TASK=y
89# CONFIG_RCU_CPU_STALL_DETECTOR is not set
90CONFIG_SYSCTL_SYSCALL_CHECK=y
91CONFIG_CRYPTO=y
92CONFIG_CRYPTO_CBC=y 71CONFIG_CRYPTO_CBC=y
93CONFIG_CRYPTO_ECB=y 72CONFIG_CRYPTO_ECB=y
94CONFIG_CRYPTO_PCBC=y 73CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/40x/klondike_defconfig b/arch/powerpc/configs/40x/klondike_defconfig
index c0d228dc73dc..e2036b7c7edb 100644
--- a/arch/powerpc/configs/40x/klondike_defconfig
+++ b/arch/powerpc/configs/40x/klondike_defconfig
@@ -1,5 +1,4 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
5CONFIG_SYSFS_DEPRECATED=y 4CONFIG_SYSFS_DEPRECATED=y
@@ -14,10 +13,8 @@ CONFIG_MODULE_UNLOAD=y
14CONFIG_APM8018X=y 13CONFIG_APM8018X=y
15# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 14# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
16CONFIG_MATH_EMULATION=y 15CONFIG_MATH_EMULATION=y
17# CONFIG_MIGRATION is not set
18# CONFIG_SUSPEND is not set 16# CONFIG_SUSPEND is not set
19CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 17CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
20CONFIG_PROC_DEVICETREE=y
21CONFIG_BLK_DEV_RAM=y 18CONFIG_BLK_DEV_RAM=y
22CONFIG_BLK_DEV_RAM_SIZE=35000 19CONFIG_BLK_DEV_RAM_SIZE=35000
23CONFIG_SCSI=y 20CONFIG_SCSI=y
@@ -51,5 +48,4 @@ CONFIG_AVERAGE=y
51CONFIG_MAGIC_SYSRQ=y 48CONFIG_MAGIC_SYSRQ=y
52# CONFIG_SCHED_DEBUG is not set 49# CONFIG_SCHED_DEBUG is not set
53# CONFIG_DEBUG_BUGVERBOSE is not set 50# CONFIG_DEBUG_BUGVERBOSE is not set
54CONFIG_SYSCTL_SYSCALL_CHECK=y
55# CONFIG_FTRACE is not set 51# CONFIG_FTRACE is not set
diff --git a/arch/powerpc/configs/40x/makalu_defconfig b/arch/powerpc/configs/40x/makalu_defconfig
index 84505e3aa0fb..efd51701fb4d 100644
--- a/arch/powerpc/configs/40x/makalu_defconfig
+++ b/arch/powerpc/configs/40x/makalu_defconfig
@@ -1,19 +1,15 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 7CONFIG_KALLSYMS_ALL=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11CONFIG_MODULES=y 8CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
13# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
14CONFIG_MAKALU=y 11CONFIG_MAKALU=y
15# CONFIG_WALNUT is not set 12# CONFIG_WALNUT is not set
16CONFIG_SPARSE_IRQ=y
17CONFIG_NET=y 13CONFIG_NET=y
18CONFIG_PACKET=y 14CONFIG_PACKET=y
19CONFIG_UNIX=y 15CONFIG_UNIX=y
@@ -30,25 +26,17 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30CONFIG_CONNECTOR=y 26CONFIG_CONNECTOR=y
31CONFIG_MTD=y 27CONFIG_MTD=y
32CONFIG_MTD_CMDLINE_PARTS=y 28CONFIG_MTD_CMDLINE_PARTS=y
33CONFIG_MTD_OF_PARTS=y
34CONFIG_MTD_CHAR=y
35CONFIG_MTD_BLOCK=m 29CONFIG_MTD_BLOCK=m
36CONFIG_MTD_CFI=y 30CONFIG_MTD_CFI=y
37CONFIG_MTD_JEDECPROBE=y 31CONFIG_MTD_JEDECPROBE=y
38CONFIG_MTD_CFI_AMDSTD=y 32CONFIG_MTD_CFI_AMDSTD=y
39CONFIG_MTD_PHYSMAP_OF=y 33CONFIG_MTD_PHYSMAP_OF=y
40CONFIG_PROC_DEVICETREE=y
41CONFIG_BLK_DEV_RAM=y 34CONFIG_BLK_DEV_RAM=y
42CONFIG_BLK_DEV_RAM_SIZE=35000 35CONFIG_BLK_DEV_RAM_SIZE=35000
43# CONFIG_MISC_DEVICES is not set
44CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
45CONFIG_ETHERNET=y
46CONFIG_NET_VENDOR_IBM=y
47CONFIG_IBM_EMAC=y 37CONFIG_IBM_EMAC=y
48CONFIG_IBM_EMAC_RXB=256 38CONFIG_IBM_EMAC_RXB=256
49CONFIG_IBM_EMAC_TXB=256 39CONFIG_IBM_EMAC_TXB=256
50# CONFIG_NETDEV_1000 is not set
51# CONFIG_NETDEV_10000 is not set
52# CONFIG_INPUT is not set 40# CONFIG_INPUT is not set
53# CONFIG_SERIO is not set 41# CONFIG_SERIO is not set
54# CONFIG_VT is not set 42# CONFIG_VT is not set
@@ -62,20 +50,14 @@ CONFIG_SERIAL_OF_PLATFORM=y
62CONFIG_THERMAL=y 50CONFIG_THERMAL=y
63# CONFIG_USB_SUPPORT is not set 51# CONFIG_USB_SUPPORT is not set
64CONFIG_EXT2_FS=y 52CONFIG_EXT2_FS=y
65CONFIG_INOTIFY=y
66CONFIG_PROC_KCORE=y 53CONFIG_PROC_KCORE=y
67CONFIG_TMPFS=y 54CONFIG_TMPFS=y
68CONFIG_CRAMFS=y 55CONFIG_CRAMFS=y
69CONFIG_NFS_FS=y 56CONFIG_NFS_FS=y
70CONFIG_NFS_V3=y
71CONFIG_ROOT_NFS=y 57CONFIG_ROOT_NFS=y
72CONFIG_MAGIC_SYSRQ=y
73CONFIG_DEBUG_FS=y 58CONFIG_DEBUG_FS=y
74CONFIG_DEBUG_KERNEL=y 59CONFIG_MAGIC_SYSRQ=y
75CONFIG_DETECT_HUNG_TASK=y 60CONFIG_DETECT_HUNG_TASK=y
76# CONFIG_RCU_CPU_STALL_DETECTOR is not set
77CONFIG_SYSCTL_SYSCALL_CHECK=y
78CONFIG_CRYPTO=y
79CONFIG_CRYPTO_CBC=y 61CONFIG_CRYPTO_CBC=y
80CONFIG_CRYPTO_ECB=y 62CONFIG_CRYPTO_ECB=y
81CONFIG_CRYPTO_PCBC=y 63CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/40x/obs600_defconfig b/arch/powerpc/configs/40x/obs600_defconfig
index 91c110dad2d6..5ded3dcdf60a 100644
--- a/arch/powerpc/configs/40x/obs600_defconfig
+++ b/arch/powerpc/configs/40x/obs600_defconfig
@@ -1,7 +1,8 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
7CONFIG_EXPERT=y 8CONFIG_EXPERT=y
@@ -11,8 +12,6 @@ CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set 12# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_WALNUT is not set 13# CONFIG_WALNUT is not set
13CONFIG_OBS600=y 14CONFIG_OBS600=y
14CONFIG_NO_HZ=y
15CONFIG_HIGH_RES_TIMERS=y
16CONFIG_MATH_EMULATION=y 15CONFIG_MATH_EMULATION=y
17CONFIG_NET=y 16CONFIG_NET=y
18CONFIG_PACKET=y 17CONFIG_PACKET=y
@@ -30,8 +29,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30CONFIG_CONNECTOR=y 29CONFIG_CONNECTOR=y
31CONFIG_MTD=y 30CONFIG_MTD=y
32CONFIG_MTD_CMDLINE_PARTS=y 31CONFIG_MTD_CMDLINE_PARTS=y
33CONFIG_MTD_OF_PARTS=y
34CONFIG_MTD_CHAR=y
35CONFIG_MTD_BLOCK=y 32CONFIG_MTD_BLOCK=y
36CONFIG_MTD_CFI=y 33CONFIG_MTD_CFI=y
37CONFIG_MTD_JEDECPROBE=y 34CONFIG_MTD_JEDECPROBE=y
@@ -39,7 +36,6 @@ CONFIG_MTD_CFI_AMDSTD=y
39CONFIG_MTD_PHYSMAP_OF=y 36CONFIG_MTD_PHYSMAP_OF=y
40CONFIG_MTD_NAND=y 37CONFIG_MTD_NAND=y
41CONFIG_MTD_NAND_NDFC=y 38CONFIG_MTD_NAND_NDFC=y
42CONFIG_PROC_DEVICETREE=y
43CONFIG_BLK_DEV_RAM=y 39CONFIG_BLK_DEV_RAM=y
44CONFIG_BLK_DEV_RAM_SIZE=35000 40CONFIG_BLK_DEV_RAM_SIZE=35000
45CONFIG_NETDEVICES=y 41CONFIG_NETDEVICES=y
@@ -68,13 +64,10 @@ CONFIG_PROC_KCORE=y
68CONFIG_TMPFS=y 64CONFIG_TMPFS=y
69CONFIG_CRAMFS=y 65CONFIG_CRAMFS=y
70CONFIG_NFS_FS=y 66CONFIG_NFS_FS=y
71CONFIG_NFS_V3=y
72CONFIG_ROOT_NFS=y 67CONFIG_ROOT_NFS=y
73CONFIG_MAGIC_SYSRQ=y
74CONFIG_DEBUG_FS=y 68CONFIG_DEBUG_FS=y
69CONFIG_MAGIC_SYSRQ=y
75CONFIG_DETECT_HUNG_TASK=y 70CONFIG_DETECT_HUNG_TASK=y
76CONFIG_SYSCTL_SYSCALL_CHECK=y
77CONFIG_CRYPTO=y
78CONFIG_CRYPTO_CBC=y 71CONFIG_CRYPTO_CBC=y
79CONFIG_CRYPTO_ECB=y 72CONFIG_CRYPTO_ECB=y
80CONFIG_CRYPTO_PCBC=y 73CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/40x/virtex_defconfig b/arch/powerpc/configs/40x/virtex_defconfig
index 0a81e1f7dd59..bcb0c4d854db 100644
--- a/arch/powerpc/configs/40x/virtex_defconfig
+++ b/arch/powerpc/configs/40x/virtex_defconfig
@@ -1,5 +1,4 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
@@ -7,7 +6,6 @@ CONFIG_IKCONFIG=y
7CONFIG_IKCONFIG_PROC=y 6CONFIG_IKCONFIG_PROC=y
8CONFIG_LOG_BUF_SHIFT=14 7CONFIG_LOG_BUF_SHIFT=14
9CONFIG_BLK_DEV_INITRD=y 8CONFIG_BLK_DEV_INITRD=y
10# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
11CONFIG_SLAB=y 9CONFIG_SLAB=y
12CONFIG_MODULES=y 10CONFIG_MODULES=y
13CONFIG_MODULE_UNLOAD=y 11CONFIG_MODULE_UNLOAD=y
@@ -35,16 +33,11 @@ CONFIG_IP_NF_IPTABLES=m
35CONFIG_IP_NF_FILTER=m 33CONFIG_IP_NF_FILTER=m
36CONFIG_IP_NF_MANGLE=m 34CONFIG_IP_NF_MANGLE=m
37CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 35CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
38CONFIG_PROC_DEVICETREE=y
39CONFIG_BLK_DEV_LOOP=y 36CONFIG_BLK_DEV_LOOP=y
40CONFIG_BLK_DEV_RAM=y 37CONFIG_BLK_DEV_RAM=y
41CONFIG_BLK_DEV_RAM_SIZE=8192 38CONFIG_BLK_DEV_RAM_SIZE=8192
42CONFIG_XILINX_SYSACE=y 39CONFIG_XILINX_SYSACE=y
43CONFIG_NETDEVICES=y 40CONFIG_NETDEVICES=y
44CONFIG_NET_ETHERNET=y
45CONFIG_MII=y
46# CONFIG_NETDEV_10000 is not set
47# CONFIG_SERIO_I8042 is not set
48# CONFIG_SERIO_SERPORT is not set 41# CONFIG_SERIO_SERPORT is not set
49CONFIG_SERIO_XILINX_XPS_PS2=y 42CONFIG_SERIO_XILINX_XPS_PS2=y
50CONFIG_SERIAL_8250=y 43CONFIG_SERIAL_8250=y
@@ -60,15 +53,9 @@ CONFIG_GPIO_XILINX=y
60CONFIG_FB=y 53CONFIG_FB=y
61CONFIG_FB_XILINX=y 54CONFIG_FB_XILINX=y
62CONFIG_FRAMEBUFFER_CONSOLE=y 55CONFIG_FRAMEBUFFER_CONSOLE=y
63CONFIG_FONTS=y
64CONFIG_FONT_8x8=y
65CONFIG_FONT_8x16=y
66CONFIG_LOGO=y 56CONFIG_LOGO=y
67# CONFIG_HID_SUPPORT is not set
68# CONFIG_USB_SUPPORT is not set 57# CONFIG_USB_SUPPORT is not set
69CONFIG_EXT2_FS=y 58CONFIG_EXT2_FS=y
70CONFIG_INOTIFY=y
71CONFIG_AUTOFS_FS=y
72CONFIG_AUTOFS4_FS=y 59CONFIG_AUTOFS4_FS=y
73CONFIG_MSDOS_FS=y 60CONFIG_MSDOS_FS=y
74CONFIG_VFAT_FS=y 61CONFIG_VFAT_FS=y
@@ -76,16 +63,16 @@ CONFIG_TMPFS=y
76CONFIG_CRAMFS=y 63CONFIG_CRAMFS=y
77CONFIG_ROMFS_FS=y 64CONFIG_ROMFS_FS=y
78CONFIG_NFS_FS=y 65CONFIG_NFS_FS=y
79CONFIG_NFS_V3=y
80CONFIG_ROOT_NFS=y 66CONFIG_ROOT_NFS=y
81CONFIG_NLS_CODEPAGE_437=y 67CONFIG_NLS_CODEPAGE_437=y
82CONFIG_NLS_ASCII=m 68CONFIG_NLS_ASCII=m
83CONFIG_NLS_ISO8859_1=m 69CONFIG_NLS_ISO8859_1=m
84CONFIG_NLS_UTF8=m 70CONFIG_NLS_UTF8=m
85CONFIG_CRC_CCITT=y 71CONFIG_CRC_CCITT=y
72CONFIG_FONTS=y
73CONFIG_FONT_8x8=y
74CONFIG_FONT_8x16=y
86CONFIG_PRINTK_TIME=y 75CONFIG_PRINTK_TIME=y
87CONFIG_DEBUG_KERNEL=y
88CONFIG_DEBUG_INFO=y 76CONFIG_DEBUG_INFO=y
89# CONFIG_RCU_CPU_STALL_DETECTOR is not set 77CONFIG_DEBUG_KERNEL=y
90CONFIG_SYSCTL_SYSCALL_CHECK=y
91# CONFIG_CRYPTO_ANSI_CPRNG is not set 78# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/40x/walnut_defconfig b/arch/powerpc/configs/40x/walnut_defconfig
index 0a19f4386ee9..37c838f26e53 100644
--- a/arch/powerpc/configs/40x/walnut_defconfig
+++ b/arch/powerpc/configs/40x/walnut_defconfig
@@ -1,17 +1,13 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 7CONFIG_KALLSYMS_ALL=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11CONFIG_MODULES=y 8CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
13# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
14CONFIG_SPARSE_IRQ=y
15CONFIG_NET=y 11CONFIG_NET=y
16CONFIG_PACKET=y 12CONFIG_PACKET=y
17CONFIG_UNIX=y 13CONFIG_UNIX=y
@@ -28,19 +24,14 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
28CONFIG_CONNECTOR=y 24CONFIG_CONNECTOR=y
29CONFIG_MTD=y 25CONFIG_MTD=y
30CONFIG_MTD_CMDLINE_PARTS=y 26CONFIG_MTD_CMDLINE_PARTS=y
31CONFIG_MTD_OF_PARTS=y
32CONFIG_MTD_CHAR=y
33CONFIG_MTD_BLOCK=m 27CONFIG_MTD_BLOCK=m
34CONFIG_MTD_CFI=y 28CONFIG_MTD_CFI=y
35CONFIG_MTD_JEDECPROBE=y 29CONFIG_MTD_JEDECPROBE=y
36CONFIG_MTD_CFI_AMDSTD=y 30CONFIG_MTD_CFI_AMDSTD=y
37CONFIG_MTD_PHYSMAP_OF=y 31CONFIG_MTD_PHYSMAP_OF=y
38CONFIG_PROC_DEVICETREE=y
39CONFIG_BLK_DEV_RAM=y 32CONFIG_BLK_DEV_RAM=y
40CONFIG_BLK_DEV_RAM_SIZE=35000 33CONFIG_BLK_DEV_RAM_SIZE=35000
41CONFIG_NETDEVICES=y 34CONFIG_NETDEVICES=y
42CONFIG_ETHERNET=y
43CONFIG_NET_VENDOR_IBM=y
44CONFIG_IBM_EMAC=y 35CONFIG_IBM_EMAC=y
45# CONFIG_INPUT is not set 36# CONFIG_INPUT is not set
46# CONFIG_SERIO is not set 37# CONFIG_SERIO is not set
@@ -53,22 +44,15 @@ CONFIG_SERIAL_OF_PLATFORM=y
53# CONFIG_HW_RANDOM is not set 44# CONFIG_HW_RANDOM is not set
54# CONFIG_HWMON is not set 45# CONFIG_HWMON is not set
55CONFIG_THERMAL=y 46CONFIG_THERMAL=y
56CONFIG_VIDEO_OUTPUT_CONTROL=m
57CONFIG_EXT2_FS=y 47CONFIG_EXT2_FS=y
58CONFIG_INOTIFY=y
59CONFIG_PROC_KCORE=y 48CONFIG_PROC_KCORE=y
60CONFIG_TMPFS=y 49CONFIG_TMPFS=y
61CONFIG_CRAMFS=y 50CONFIG_CRAMFS=y
62CONFIG_NFS_FS=y 51CONFIG_NFS_FS=y
63CONFIG_NFS_V3=y
64CONFIG_ROOT_NFS=y 52CONFIG_ROOT_NFS=y
65CONFIG_MAGIC_SYSRQ=y
66CONFIG_DEBUG_FS=y 53CONFIG_DEBUG_FS=y
67CONFIG_DEBUG_KERNEL=y 54CONFIG_MAGIC_SYSRQ=y
68CONFIG_DETECT_HUNG_TASK=y 55CONFIG_DETECT_HUNG_TASK=y
69# CONFIG_RCU_CPU_STALL_DETECTOR is not set
70CONFIG_SYSCTL_SYSCALL_CHECK=y
71CONFIG_CRYPTO=y
72CONFIG_CRYPTO_CBC=y 56CONFIG_CRYPTO_CBC=y
73CONFIG_CRYPTO_ECB=y 57CONFIG_CRYPTO_ECB=y
74CONFIG_CRYPTO_PCBC=y 58CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/akebono_defconfig b/arch/powerpc/configs/44x/akebono_defconfig
index 7e2530cd9d30..ea4ef02a0578 100644
--- a/arch/powerpc/configs/44x/akebono_defconfig
+++ b/arch/powerpc/configs/44x/akebono_defconfig
@@ -4,9 +4,6 @@ CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
7CONFIG_RD_BZIP2=y
8CONFIG_RD_LZMA=y
9CONFIG_RD_XZ=y
10CONFIG_EXPERT=y 7CONFIG_EXPERT=y
11CONFIG_KALLSYMS_ALL=y 8CONFIG_KALLSYMS_ALL=y
12# CONFIG_SLUB_CPU_PARTIAL is not set 9# CONFIG_SLUB_CPU_PARTIAL is not set
@@ -15,7 +12,6 @@ CONFIG_OPROFILE=y
15CONFIG_MODULES=y 12CONFIG_MODULES=y
16CONFIG_MODULE_UNLOAD=y 13CONFIG_MODULE_UNLOAD=y
17# CONFIG_BLK_DEV_BSG is not set 14# CONFIG_BLK_DEV_BSG is not set
18# CONFIG_POWERNV_MSI is not set
19CONFIG_PPC_47x=y 15CONFIG_PPC_47x=y
20# CONFIG_EBONY is not set 16# CONFIG_EBONY is not set
21CONFIG_AKEBONO=y 17CONFIG_AKEBONO=y
@@ -26,7 +22,6 @@ CONFIG_IRQ_ALL_CPUS=y
26CONFIG_CMDLINE_BOOL=y 22CONFIG_CMDLINE_BOOL=y
27CONFIG_CMDLINE="" 23CONFIG_CMDLINE=""
28# CONFIG_SUSPEND is not set 24# CONFIG_SUSPEND is not set
29CONFIG_PCI_MSI=y
30CONFIG_NET=y 25CONFIG_NET=y
31CONFIG_PACKET=y 26CONFIG_PACKET=y
32CONFIG_UNIX=y 27CONFIG_UNIX=y
@@ -48,7 +43,6 @@ CONFIG_MTD_BLOCK=y
48CONFIG_MTD_JEDECPROBE=y 43CONFIG_MTD_JEDECPROBE=y
49CONFIG_MTD_CFI_AMDSTD=y 44CONFIG_MTD_CFI_AMDSTD=y
50CONFIG_MTD_PHYSMAP_OF=y 45CONFIG_MTD_PHYSMAP_OF=y
51CONFIG_PROC_DEVICETREE=y
52CONFIG_BLK_DEV_RAM=y 46CONFIG_BLK_DEV_RAM=y
53CONFIG_BLK_DEV_RAM_SIZE=35000 47CONFIG_BLK_DEV_RAM_SIZE=35000
54# CONFIG_SCSI_PROC_FS is not set 48# CONFIG_SCSI_PROC_FS is not set
@@ -62,7 +56,6 @@ CONFIG_BLK_DEV_SD=y
62# CONFIG_NET_VENDOR_AMD is not set 56# CONFIG_NET_VENDOR_AMD is not set
63# CONFIG_NET_VENDOR_ARC is not set 57# CONFIG_NET_VENDOR_ARC is not set
64# CONFIG_NET_VENDOR_ATHEROS is not set 58# CONFIG_NET_VENDOR_ATHEROS is not set
65# CONFIG_NET_CADENCE is not set
66# CONFIG_NET_VENDOR_BROADCOM is not set 59# CONFIG_NET_VENDOR_BROADCOM is not set
67# CONFIG_NET_VENDOR_BROCADE is not set 60# CONFIG_NET_VENDOR_BROCADE is not set
68# CONFIG_NET_VENDOR_CHELSIO is not set 61# CONFIG_NET_VENDOR_CHELSIO is not set
diff --git a/arch/powerpc/configs/44x/arches_defconfig b/arch/powerpc/configs/44x/arches_defconfig
index 44355c53cd30..95494209c124 100644
--- a/arch/powerpc/configs/44x/arches_defconfig
+++ b/arch/powerpc/configs/44x/arches_defconfig
@@ -1,19 +1,16 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 8CONFIG_EXPERT=y
9CONFIG_MODULES=y 9CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 10CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set 11# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_EBONY is not set 12# CONFIG_EBONY is not set
13CONFIG_ARCHES=y 13CONFIG_ARCHES=y
14CONFIG_NO_HZ=y
15CONFIG_HIGH_RES_TIMERS=y
16CONFIG_SPARSE_IRQ=y
17CONFIG_CMDLINE_BOOL=y 14CONFIG_CMDLINE_BOOL=y
18CONFIG_CMDLINE="" 15CONFIG_CMDLINE=""
19CONFIG_NET=y 16CONFIG_NET=y
@@ -32,24 +29,16 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32CONFIG_CONNECTOR=y 29CONFIG_CONNECTOR=y
33CONFIG_MTD=y 30CONFIG_MTD=y
34CONFIG_MTD_CMDLINE_PARTS=y 31CONFIG_MTD_CMDLINE_PARTS=y
35CONFIG_MTD_OF_PARTS=y
36CONFIG_MTD_CHAR=y
37CONFIG_MTD_BLOCK=y 32CONFIG_MTD_BLOCK=y
38CONFIG_MTD_CFI=y 33CONFIG_MTD_CFI=y
39CONFIG_MTD_CFI_AMDSTD=y 34CONFIG_MTD_CFI_AMDSTD=y
40CONFIG_MTD_PHYSMAP_OF=y 35CONFIG_MTD_PHYSMAP_OF=y
41CONFIG_PROC_DEVICETREE=y
42CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
43CONFIG_BLK_DEV_RAM_SIZE=35000 37CONFIG_BLK_DEV_RAM_SIZE=35000
44# CONFIG_MISC_DEVICES is not set
45CONFIG_NETDEVICES=y 38CONFIG_NETDEVICES=y
46CONFIG_ETHERNET=y
47CONFIG_NET_VENDOR_IBM=y
48CONFIG_IBM_EMAC=y 39CONFIG_IBM_EMAC=y
49CONFIG_IBM_EMAC_RXB=256 40CONFIG_IBM_EMAC_RXB=256
50CONFIG_IBM_EMAC_TXB=256 41CONFIG_IBM_EMAC_TXB=256
51# CONFIG_NETDEV_1000 is not set
52# CONFIG_NETDEV_10000 is not set
53# CONFIG_INPUT is not set 42# CONFIG_INPUT is not set
54# CONFIG_SERIO is not set 43# CONFIG_SERIO is not set
55# CONFIG_VT is not set 44# CONFIG_VT is not set
@@ -64,21 +53,15 @@ CONFIG_I2C=y
64CONFIG_I2C_CHARDEV=y 53CONFIG_I2C_CHARDEV=y
65CONFIG_I2C_IBM_IIC=y 54CONFIG_I2C_IBM_IIC=y
66CONFIG_SENSORS_AD7414=y 55CONFIG_SENSORS_AD7414=y
67CONFIG_VIDEO_OUTPUT_CONTROL=m
68# CONFIG_USB_SUPPORT is not set 56# CONFIG_USB_SUPPORT is not set
69CONFIG_EXT2_FS=y 57CONFIG_EXT2_FS=y
70CONFIG_INOTIFY=y
71CONFIG_PROC_KCORE=y 58CONFIG_PROC_KCORE=y
72CONFIG_TMPFS=y 59CONFIG_TMPFS=y
73CONFIG_JFFS2_FS=y 60CONFIG_JFFS2_FS=y
74CONFIG_CRAMFS=y 61CONFIG_CRAMFS=y
75CONFIG_NFS_FS=y 62CONFIG_NFS_FS=y
76CONFIG_NFS_V3=y
77CONFIG_ROOT_NFS=y 63CONFIG_ROOT_NFS=y
78CONFIG_MAGIC_SYSRQ=y
79CONFIG_DEBUG_FS=y 64CONFIG_DEBUG_FS=y
80CONFIG_DEBUG_KERNEL=y 65CONFIG_MAGIC_SYSRQ=y
81CONFIG_DETECT_HUNG_TASK=y 66CONFIG_DETECT_HUNG_TASK=y
82# CONFIG_DEBUG_BUGVERBOSE is not set 67# CONFIG_DEBUG_BUGVERBOSE is not set
83# CONFIG_RCU_CPU_STALL_DETECTOR is not set
84CONFIG_SYSCTL_SYSCALL_CHECK=y
diff --git a/arch/powerpc/configs/44x/bamboo_defconfig b/arch/powerpc/configs/44x/bamboo_defconfig
index cef7d62560c4..a046f08413fd 100644
--- a/arch/powerpc/configs/44x/bamboo_defconfig
+++ b/arch/powerpc/configs/44x/bamboo_defconfig
@@ -1,17 +1,14 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_MODULES=y 7CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 8CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set 9# CONFIG_BLK_DEV_BSG is not set
12CONFIG_BAMBOO=y 10CONFIG_BAMBOO=y
13# CONFIG_EBONY is not set 11# CONFIG_EBONY is not set
14CONFIG_SPARSE_IRQ=y
15CONFIG_CMDLINE_BOOL=y 12CONFIG_CMDLINE_BOOL=y
16CONFIG_CMDLINE="" 13CONFIG_CMDLINE=""
17CONFIG_NET=y 14CONFIG_NET=y
@@ -28,12 +25,9 @@ CONFIG_IP_PNP_BOOTP=y
28# CONFIG_IPV6 is not set 25# CONFIG_IPV6 is not set
29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 26CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30CONFIG_CONNECTOR=y 27CONFIG_CONNECTOR=y
31CONFIG_PROC_DEVICETREE=y
32CONFIG_BLK_DEV_RAM=y 28CONFIG_BLK_DEV_RAM=y
33CONFIG_BLK_DEV_RAM_SIZE=35000 29CONFIG_BLK_DEV_RAM_SIZE=35000
34CONFIG_NETDEVICES=y 30CONFIG_NETDEVICES=y
35CONFIG_ETHERNET=y
36CONFIG_NET_VENDOR_IBM=y
37CONFIG_IBM_EMAC=y 31CONFIG_IBM_EMAC=y
38# CONFIG_INPUT is not set 32# CONFIG_INPUT is not set
39# CONFIG_SERIO is not set 33# CONFIG_SERIO is not set
@@ -47,23 +41,16 @@ CONFIG_SERIAL_OF_PLATFORM=y
47# CONFIG_HW_RANDOM is not set 41# CONFIG_HW_RANDOM is not set
48# CONFIG_HWMON is not set 42# CONFIG_HWMON is not set
49CONFIG_THERMAL=y 43CONFIG_THERMAL=y
50CONFIG_VIDEO_OUTPUT_CONTROL=m
51CONFIG_EXT2_FS=y 44CONFIG_EXT2_FS=y
52CONFIG_INOTIFY=y
53CONFIG_PROC_KCORE=y 45CONFIG_PROC_KCORE=y
54CONFIG_TMPFS=y 46CONFIG_TMPFS=y
55CONFIG_CRAMFS=y 47CONFIG_CRAMFS=y
56CONFIG_NFS_FS=y 48CONFIG_NFS_FS=y
57CONFIG_NFS_V3=y
58CONFIG_ROOT_NFS=y 49CONFIG_ROOT_NFS=y
59CONFIG_MAGIC_SYSRQ=y
60CONFIG_DEBUG_FS=y 50CONFIG_DEBUG_FS=y
61CONFIG_DEBUG_KERNEL=y 51CONFIG_MAGIC_SYSRQ=y
62CONFIG_DETECT_HUNG_TASK=y 52CONFIG_DETECT_HUNG_TASK=y
63# CONFIG_DEBUG_BUGVERBOSE is not set 53# CONFIG_DEBUG_BUGVERBOSE is not set
64# CONFIG_RCU_CPU_STALL_DETECTOR is not set
65CONFIG_SYSCTL_SYSCALL_CHECK=y
66CONFIG_CRYPTO=y
67CONFIG_CRYPTO_CBC=y 54CONFIG_CRYPTO_CBC=y
68CONFIG_CRYPTO_ECB=y 55CONFIG_CRYPTO_ECB=y
69CONFIG_CRYPTO_PCBC=y 56CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/bluestone_defconfig b/arch/powerpc/configs/44x/bluestone_defconfig
index ca7f1f32f2b2..a326b773ac05 100644
--- a/arch/powerpc/configs/44x/bluestone_defconfig
+++ b/arch/powerpc/configs/44x/bluestone_defconfig
@@ -1,19 +1,16 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
7CONFIG_EXPERT=y 8CONFIG_EXPERT=y
8# CONFIG_VM_EVENT_COUNTERS is not set
9# CONFIG_PCI_QUIRKS is not set 9# CONFIG_PCI_QUIRKS is not set
10# CONFIG_VM_EVENT_COUNTERS is not set
10# CONFIG_COMPAT_BRK is not set 11# CONFIG_COMPAT_BRK is not set
11CONFIG_BLUESTONE=y 12CONFIG_BLUESTONE=y
12# CONFIG_EBONY is not set 13# CONFIG_EBONY is not set
13# CONFIG_KVM_GUEST is not set
14CONFIG_NO_HZ=y
15CONFIG_HIGH_RES_TIMERS=y
16CONFIG_SPARSE_IRQ=y
17CONFIG_CMDLINE_BOOL=y 14CONFIG_CMDLINE_BOOL=y
18CONFIG_CMDLINE="" 15CONFIG_CMDLINE=""
19CONFIG_NET=y 16CONFIG_NET=y
@@ -27,18 +24,13 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
27CONFIG_CONNECTOR=y 24CONFIG_CONNECTOR=y
28CONFIG_MTD=y 25CONFIG_MTD=y
29CONFIG_MTD_CMDLINE_PARTS=y 26CONFIG_MTD_CMDLINE_PARTS=y
30CONFIG_MTD_OF_PARTS=y
31CONFIG_MTD_CHAR=y
32CONFIG_MTD_BLOCK=y 27CONFIG_MTD_BLOCK=y
33CONFIG_MTD_CFI=y 28CONFIG_MTD_CFI=y
34CONFIG_MTD_CFI_AMDSTD=y 29CONFIG_MTD_CFI_AMDSTD=y
35CONFIG_MTD_PHYSMAP_OF=y 30CONFIG_MTD_PHYSMAP_OF=y
36CONFIG_PROC_DEVICETREE=y
37CONFIG_BLK_DEV_RAM=y 31CONFIG_BLK_DEV_RAM=y
38CONFIG_BLK_DEV_RAM_SIZE=35000 32CONFIG_BLK_DEV_RAM_SIZE=35000
39CONFIG_NETDEVICES=y 33CONFIG_NETDEVICES=y
40CONFIG_ETHERNET=y
41CONFIG_NET_VENDOR_IBM=y
42CONFIG_IBM_EMAC=y 34CONFIG_IBM_EMAC=y
43CONFIG_IBM_EMAC_RXB=256 35CONFIG_IBM_EMAC_RXB=256
44CONFIG_IBM_EMAC_TXB=256 36CONFIG_IBM_EMAC_TXB=256
@@ -53,7 +45,6 @@ CONFIG_I2C=y
53CONFIG_I2C_CHARDEV=y 45CONFIG_I2C_CHARDEV=y
54CONFIG_I2C_IBM_IIC=y 46CONFIG_I2C_IBM_IIC=y
55CONFIG_SENSORS_AD7414=y 47CONFIG_SENSORS_AD7414=y
56# CONFIG_HID_SUPPORT is not set
57# CONFIG_USB_SUPPORT is not set 48# CONFIG_USB_SUPPORT is not set
58CONFIG_RTC_CLASS=y 49CONFIG_RTC_CLASS=y
59CONFIG_RTC_DRV_M41T80=y 50CONFIG_RTC_DRV_M41T80=y
@@ -63,6 +54,5 @@ CONFIG_PROC_KCORE=y
63CONFIG_TMPFS=y 54CONFIG_TMPFS=y
64CONFIG_CRAMFS=y 55CONFIG_CRAMFS=y
65CONFIG_NFS_FS=y 56CONFIG_NFS_FS=y
66CONFIG_NFS_V3=y
67CONFIG_ROOT_NFS=y 57CONFIG_ROOT_NFS=y
68CONFIG_NLS=y 58CONFIG_NLS=y
diff --git a/arch/powerpc/configs/44x/canyonlands_defconfig b/arch/powerpc/configs/44x/canyonlands_defconfig
index 9919a91add12..d939e71fff7d 100644
--- a/arch/powerpc/configs/44x/canyonlands_defconfig
+++ b/arch/powerpc/configs/44x/canyonlands_defconfig
@@ -1,19 +1,16 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 8CONFIG_EXPERT=y
9CONFIG_MODULES=y 9CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 10CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set 11# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_EBONY is not set 12# CONFIG_EBONY is not set
13CONFIG_CANYONLANDS=y 13CONFIG_CANYONLANDS=y
14CONFIG_NO_HZ=y
15CONFIG_HIGH_RES_TIMERS=y
16CONFIG_SPARSE_IRQ=y
17CONFIG_CMDLINE_BOOL=y 14CONFIG_CMDLINE_BOOL=y
18CONFIG_CMDLINE="" 15CONFIG_CMDLINE=""
19CONFIG_NET=y 16CONFIG_NET=y
@@ -32,29 +29,18 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32CONFIG_CONNECTOR=y 29CONFIG_CONNECTOR=y
33CONFIG_MTD=y 30CONFIG_MTD=y
34CONFIG_MTD_CMDLINE_PARTS=y 31CONFIG_MTD_CMDLINE_PARTS=y
35CONFIG_MTD_OF_PARTS=y
36CONFIG_MTD_CHAR=y
37CONFIG_MTD_BLOCK=y 32CONFIG_MTD_BLOCK=y
38CONFIG_MTD_CFI=y 33CONFIG_MTD_CFI=y
39CONFIG_MTD_CFI_AMDSTD=y 34CONFIG_MTD_CFI_AMDSTD=y
40CONFIG_MTD_PHYSMAP_OF=y 35CONFIG_MTD_PHYSMAP_OF=y
41CONFIG_MTD_NAND=y 36CONFIG_MTD_NAND=y
42CONFIG_MTD_NAND_NDFC=y 37CONFIG_MTD_NAND_NDFC=y
43CONFIG_PROC_DEVICETREE=y
44CONFIG_PM=y
45CONFIG_SUSPEND=y
46CONFIG_PPC4xx_CPM=y
47CONFIG_BLK_DEV_RAM=y 38CONFIG_BLK_DEV_RAM=y
48CONFIG_BLK_DEV_RAM_SIZE=35000 39CONFIG_BLK_DEV_RAM_SIZE=35000
49# CONFIG_MISC_DEVICES is not set
50CONFIG_NETDEVICES=y 40CONFIG_NETDEVICES=y
51CONFIG_ETHERNET=y
52CONFIG_NET_VENDOR_IBM=y
53CONFIG_IBM_EMAC=y 41CONFIG_IBM_EMAC=y
54CONFIG_IBM_EMAC_RXB=256 42CONFIG_IBM_EMAC_RXB=256
55CONFIG_IBM_EMAC_TXB=256 43CONFIG_IBM_EMAC_TXB=256
56# CONFIG_NETDEV_1000 is not set
57# CONFIG_NETDEV_10000 is not set
58# CONFIG_INPUT is not set 44# CONFIG_INPUT is not set
59# CONFIG_SERIO is not set 45# CONFIG_SERIO is not set
60# CONFIG_VT is not set 46# CONFIG_VT is not set
@@ -76,21 +62,15 @@ CONFIG_USB_EHCI_HCD=m
76CONFIG_USB_OHCI_HCD=y 62CONFIG_USB_OHCI_HCD=y
77CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 63CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
78CONFIG_USB_OHCI_HCD_PPC_OF_LE=y 64CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
79CONFIG_USB_LIBUSUAL=y
80CONFIG_RTC_CLASS=y 65CONFIG_RTC_CLASS=y
81CONFIG_RTC_DRV_M41T80=y 66CONFIG_RTC_DRV_M41T80=y
82CONFIG_EXT2_FS=y 67CONFIG_EXT2_FS=y
83CONFIG_INOTIFY=y
84CONFIG_PROC_KCORE=y 68CONFIG_PROC_KCORE=y
85CONFIG_TMPFS=y 69CONFIG_TMPFS=y
86CONFIG_CRAMFS=y 70CONFIG_CRAMFS=y
87CONFIG_NFS_FS=y 71CONFIG_NFS_FS=y
88CONFIG_NFS_V3=y
89CONFIG_ROOT_NFS=y 72CONFIG_ROOT_NFS=y
90CONFIG_MAGIC_SYSRQ=y
91CONFIG_DEBUG_FS=y 73CONFIG_DEBUG_FS=y
92CONFIG_DEBUG_KERNEL=y 74CONFIG_MAGIC_SYSRQ=y
93CONFIG_DETECT_HUNG_TASK=y 75CONFIG_DETECT_HUNG_TASK=y
94# CONFIG_DEBUG_BUGVERBOSE is not set 76# CONFIG_DEBUG_BUGVERBOSE is not set
95# CONFIG_RCU_CPU_STALL_DETECTOR is not set
96CONFIG_SYSCTL_SYSCALL_CHECK=y
diff --git a/arch/powerpc/configs/44x/currituck_defconfig b/arch/powerpc/configs/44x/currituck_defconfig
index 47de68261443..5aa312a158dd 100644
--- a/arch/powerpc/configs/44x/currituck_defconfig
+++ b/arch/powerpc/configs/44x/currituck_defconfig
@@ -1,9 +1,7 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_SMP=y 2CONFIG_SMP=y
3CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
6CONFIG_SPARSE_IRQ=y
7CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 7CONFIG_KALLSYMS_ALL=y
@@ -39,12 +37,10 @@ CONFIG_DEVTMPFS=y
39CONFIG_DEVTMPFS_MOUNT=y 37CONFIG_DEVTMPFS_MOUNT=y
40CONFIG_CONNECTOR=y 38CONFIG_CONNECTOR=y
41CONFIG_MTD=y 39CONFIG_MTD=y
42CONFIG_MTD_CHAR=y
43CONFIG_MTD_BLOCK=y 40CONFIG_MTD_BLOCK=y
44CONFIG_MTD_JEDECPROBE=y 41CONFIG_MTD_JEDECPROBE=y
45CONFIG_MTD_CFI_AMDSTD=y 42CONFIG_MTD_CFI_AMDSTD=y
46CONFIG_MTD_PHYSMAP_OF=y 43CONFIG_MTD_PHYSMAP_OF=y
47CONFIG_PROC_DEVICETREE=y
48CONFIG_BLK_DEV_RAM=y 44CONFIG_BLK_DEV_RAM=y
49CONFIG_BLK_DEV_RAM_SIZE=35000 45CONFIG_BLK_DEV_RAM_SIZE=35000
50# CONFIG_SCSI_PROC_FS is not set 46# CONFIG_SCSI_PROC_FS is not set
@@ -56,7 +52,6 @@ CONFIG_SATA_SIL24=y
56# CONFIG_ATA_SFF is not set 52# CONFIG_ATA_SFF is not set
57CONFIG_NETDEVICES=y 53CONFIG_NETDEVICES=y
58CONFIG_E1000E=y 54CONFIG_E1000E=y
59# CONFIG_NETDEV_10000 is not set
60# CONFIG_INPUT is not set 55# CONFIG_INPUT is not set
61# CONFIG_SERIO is not set 56# CONFIG_SERIO is not set
62# CONFIG_VT is not set 57# CONFIG_VT is not set
@@ -84,22 +79,18 @@ CONFIG_PROC_KCORE=y
84CONFIG_TMPFS=y 79CONFIG_TMPFS=y
85CONFIG_CRAMFS=y 80CONFIG_CRAMFS=y
86CONFIG_NFS_FS=y 81CONFIG_NFS_FS=y
87CONFIG_NFS_V3=y
88CONFIG_NFS_V3_ACL=y 82CONFIG_NFS_V3_ACL=y
89CONFIG_NFS_V4=y 83CONFIG_NFS_V4=y
90CONFIG_NLS_DEFAULT="n" 84CONFIG_NLS_DEFAULT="n"
91CONFIG_MAGIC_SYSRQ=y 85CONFIG_DEBUG_INFO=y
92CONFIG_DEBUG_FS=y 86CONFIG_DEBUG_FS=y
93CONFIG_DEBUG_KERNEL=y 87CONFIG_MAGIC_SYSRQ=y
94CONFIG_DETECT_HUNG_TASK=y 88CONFIG_DETECT_HUNG_TASK=y
95CONFIG_DEBUG_INFO=y
96CONFIG_SYSCTL_SYSCALL_CHECK=y
97CONFIG_XMON=y 89CONFIG_XMON=y
98CONFIG_XMON_DEFAULT=y 90CONFIG_XMON_DEFAULT=y
99CONFIG_PPC_EARLY_DEBUG=y 91CONFIG_PPC_EARLY_DEBUG=y
100CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0x10000000 92CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0x10000000
101CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x200 93CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x200
102CONFIG_CRYPTO=y
103CONFIG_CRYPTO_CBC=y 94CONFIG_CRYPTO_CBC=y
104CONFIG_CRYPTO_ECB=y 95CONFIG_CRYPTO_ECB=y
105CONFIG_CRYPTO_PCBC=y 96CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/ebony_defconfig b/arch/powerpc/configs/44x/ebony_defconfig
index 31b58b0d52e2..5909e016c37d 100644
--- a/arch/powerpc/configs/44x/ebony_defconfig
+++ b/arch/powerpc/configs/44x/ebony_defconfig
@@ -1,18 +1,14 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 7CONFIG_KALLSYMS_ALL=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11CONFIG_MODULES=y 8CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
13# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
14CONFIG_MATH_EMULATION=y 11CONFIG_MATH_EMULATION=y
15CONFIG_SPARSE_IRQ=y
16CONFIG_NET=y 12CONFIG_NET=y
17CONFIG_PACKET=y 13CONFIG_PACKET=y
18CONFIG_UNIX=y 14CONFIG_UNIX=y
@@ -28,19 +24,14 @@ CONFIG_IP_PNP_BOOTP=y
28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 24CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
29CONFIG_CONNECTOR=y 25CONFIG_CONNECTOR=y
30CONFIG_MTD=y 26CONFIG_MTD=y
31CONFIG_MTD_OF_PARTS=y
32CONFIG_MTD_CHAR=y
33CONFIG_MTD_BLOCK=y 27CONFIG_MTD_BLOCK=y
34CONFIG_MTD_CFI=y 28CONFIG_MTD_CFI=y
35CONFIG_MTD_JEDECPROBE=y 29CONFIG_MTD_JEDECPROBE=y
36CONFIG_MTD_CFI_AMDSTD=y 30CONFIG_MTD_CFI_AMDSTD=y
37CONFIG_MTD_PHYSMAP_OF=y 31CONFIG_MTD_PHYSMAP_OF=y
38CONFIG_PROC_DEVICETREE=y
39CONFIG_BLK_DEV_RAM=y 32CONFIG_BLK_DEV_RAM=y
40CONFIG_BLK_DEV_RAM_SIZE=35000 33CONFIG_BLK_DEV_RAM_SIZE=35000
41CONFIG_NETDEVICES=y 34CONFIG_NETDEVICES=y
42CONFIG_ETHERNET=y
43CONFIG_NET_VENDOR_IBM=y
44CONFIG_IBM_EMAC=y 35CONFIG_IBM_EMAC=y
45# CONFIG_INPUT is not set 36# CONFIG_INPUT is not set
46# CONFIG_SERIO is not set 37# CONFIG_SERIO is not set
@@ -55,21 +46,15 @@ CONFIG_SERIAL_OF_PLATFORM=y
55# CONFIG_HWMON is not set 46# CONFIG_HWMON is not set
56CONFIG_THERMAL=y 47CONFIG_THERMAL=y
57CONFIG_EXT2_FS=y 48CONFIG_EXT2_FS=y
58CONFIG_INOTIFY=y
59CONFIG_PROC_KCORE=y 49CONFIG_PROC_KCORE=y
60CONFIG_TMPFS=y 50CONFIG_TMPFS=y
61CONFIG_JFFS2_FS=y 51CONFIG_JFFS2_FS=y
62CONFIG_CRAMFS=y 52CONFIG_CRAMFS=y
63CONFIG_NFS_FS=y 53CONFIG_NFS_FS=y
64CONFIG_NFS_V3=y
65CONFIG_ROOT_NFS=y 54CONFIG_ROOT_NFS=y
66CONFIG_MAGIC_SYSRQ=y
67CONFIG_DEBUG_FS=y 55CONFIG_DEBUG_FS=y
68CONFIG_DEBUG_KERNEL=y 56CONFIG_MAGIC_SYSRQ=y
69CONFIG_DETECT_HUNG_TASK=y 57CONFIG_DETECT_HUNG_TASK=y
70# CONFIG_RCU_CPU_STALL_DETECTOR is not set
71CONFIG_SYSCTL_SYSCALL_CHECK=y
72CONFIG_CRYPTO=y
73CONFIG_CRYPTO_CBC=y 58CONFIG_CRYPTO_CBC=y
74CONFIG_CRYPTO_ECB=y 59CONFIG_CRYPTO_ECB=y
75CONFIG_CRYPTO_PCBC=y 60CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/eiger_defconfig b/arch/powerpc/configs/44x/eiger_defconfig
index faccaf65f394..57499d25c877 100644
--- a/arch/powerpc/configs/44x/eiger_defconfig
+++ b/arch/powerpc/configs/44x/eiger_defconfig
@@ -1,19 +1,15 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 8CONFIG_EXPERT=y
9CONFIG_MODULES=y 9CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 10CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_EBONY is not set 11# CONFIG_EBONY is not set
13CONFIG_EIGER=y 12CONFIG_EIGER=y
14CONFIG_NO_HZ=y
15CONFIG_HIGH_RES_TIMERS=y
16CONFIG_SPARSE_IRQ=y
17CONFIG_CMDLINE_BOOL=y 13CONFIG_CMDLINE_BOOL=y
18CONFIG_CMDLINE="" 14CONFIG_CMDLINE=""
19CONFIG_PCIEPORTBUS=y 15CONFIG_PCIEPORTBUS=y
@@ -33,20 +29,15 @@ CONFIG_IP_PNP_BOOTP=y
33CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
34CONFIG_CONNECTOR=y 30CONFIG_CONNECTOR=y
35CONFIG_MTD=y 31CONFIG_MTD=y
36CONFIG_MTD_CONCAT=y
37CONFIG_MTD_CMDLINE_PARTS=y 32CONFIG_MTD_CMDLINE_PARTS=y
38CONFIG_MTD_OF_PARTS=y
39CONFIG_MTD_CHAR=y
40CONFIG_MTD_BLOCK=y 33CONFIG_MTD_BLOCK=y
41CONFIG_MTD_CFI=y 34CONFIG_MTD_CFI=y
42CONFIG_MTD_CFI_AMDSTD=y 35CONFIG_MTD_CFI_AMDSTD=y
43CONFIG_MTD_PHYSMAP_OF=y 36CONFIG_MTD_PHYSMAP_OF=y
44CONFIG_MTD_NAND=y 37CONFIG_MTD_NAND=y
45CONFIG_MTD_NAND_NDFC=y 38CONFIG_MTD_NAND_NDFC=y
46CONFIG_PROC_DEVICETREE=y
47CONFIG_BLK_DEV_RAM=y 39CONFIG_BLK_DEV_RAM=y
48CONFIG_BLK_DEV_RAM_SIZE=35000 40CONFIG_BLK_DEV_RAM_SIZE=35000
49# CONFIG_MISC_DEVICES is not set
50CONFIG_SCSI=y 41CONFIG_SCSI=y
51CONFIG_BLK_DEV_SD=y 42CONFIG_BLK_DEV_SD=y
52CONFIG_CHR_DEV_SG=y 43CONFIG_CHR_DEV_SG=y
@@ -54,13 +45,10 @@ CONFIG_FUSION=y
54CONFIG_FUSION_SAS=y 45CONFIG_FUSION_SAS=y
55CONFIG_I2O=y 46CONFIG_I2O=y
56CONFIG_NETDEVICES=y 47CONFIG_NETDEVICES=y
57CONFIG_ETHERNET=y
58CONFIG_NET_VENDOR_IBM=y
59CONFIG_IBM_EMAC=y 48CONFIG_IBM_EMAC=y
60CONFIG_IBM_EMAC_RXB=256 49CONFIG_IBM_EMAC_RXB=256
61CONFIG_IBM_EMAC_TXB=256 50CONFIG_IBM_EMAC_TXB=256
62CONFIG_E1000E=y 51CONFIG_E1000E=y
63# CONFIG_NETDEV_10000 is not set
64# CONFIG_INPUT is not set 52# CONFIG_INPUT is not set
65# CONFIG_SERIO is not set 53# CONFIG_SERIO is not set
66# CONFIG_VT is not set 54# CONFIG_VT is not set
@@ -80,25 +68,18 @@ CONFIG_I2C_DEBUG_CORE=y
80CONFIG_I2C_DEBUG_ALGO=y 68CONFIG_I2C_DEBUG_ALGO=y
81CONFIG_I2C_DEBUG_BUS=y 69CONFIG_I2C_DEBUG_BUS=y
82# CONFIG_HWMON is not set 70# CONFIG_HWMON is not set
83CONFIG_VIDEO_OUTPUT_CONTROL=m
84# CONFIG_USB_SUPPORT is not set 71# CONFIG_USB_SUPPORT is not set
85CONFIG_DMADEVICES=y 72CONFIG_DMADEVICES=y
86CONFIG_EXT2_FS=y 73CONFIG_EXT2_FS=y
87CONFIG_INOTIFY=y
88CONFIG_PROC_KCORE=y 74CONFIG_PROC_KCORE=y
89CONFIG_TMPFS=y 75CONFIG_TMPFS=y
90CONFIG_CRAMFS=y 76CONFIG_CRAMFS=y
91CONFIG_NFS_FS=y 77CONFIG_NFS_FS=y
92CONFIG_NFS_V3=y
93CONFIG_ROOT_NFS=y 78CONFIG_ROOT_NFS=y
94CONFIG_MAGIC_SYSRQ=y
95CONFIG_DEBUG_FS=y 79CONFIG_DEBUG_FS=y
96CONFIG_DEBUG_KERNEL=y 80CONFIG_MAGIC_SYSRQ=y
97CONFIG_DETECT_HUNG_TASK=y 81CONFIG_DETECT_HUNG_TASK=y
98# CONFIG_DEBUG_BUGVERBOSE is not set 82# CONFIG_DEBUG_BUGVERBOSE is not set
99# CONFIG_RCU_CPU_STALL_DETECTOR is not set
100CONFIG_SYSCTL_SYSCALL_CHECK=y
101CONFIG_CRYPTO=y
102CONFIG_CRYPTO_CRYPTD=y 83CONFIG_CRYPTO_CRYPTD=y
103CONFIG_CRYPTO_AUTHENC=y 84CONFIG_CRYPTO_AUTHENC=y
104CONFIG_CRYPTO_CCM=y 85CONFIG_CRYPTO_CCM=y
@@ -116,7 +97,6 @@ CONFIG_CRYPTO_MD5=y
116CONFIG_CRYPTO_SHA1=y 97CONFIG_CRYPTO_SHA1=y
117CONFIG_CRYPTO_SHA256=y 98CONFIG_CRYPTO_SHA256=y
118CONFIG_CRYPTO_SHA512=y 99CONFIG_CRYPTO_SHA512=y
119CONFIG_CRYPTO_AES=y
120CONFIG_CRYPTO_ARC4=y 100CONFIG_CRYPTO_ARC4=y
121CONFIG_CRYPTO_BLOWFISH=y 101CONFIG_CRYPTO_BLOWFISH=y
122CONFIG_CRYPTO_DES=y 102CONFIG_CRYPTO_DES=y
diff --git a/arch/powerpc/configs/44x/icon_defconfig b/arch/powerpc/configs/44x/icon_defconfig
index 05782c145141..5d52185d8f5a 100644
--- a/arch/powerpc/configs/44x/icon_defconfig
+++ b/arch/powerpc/configs/44x/icon_defconfig
@@ -1,19 +1,14 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_SYSFS_DEPRECATED_V2=y
7CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
8# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
9CONFIG_EXPERT=y 6CONFIG_EXPERT=y
10CONFIG_MODULES=y 7CONFIG_MODULES=y
11CONFIG_MODULE_UNLOAD=y 8CONFIG_MODULE_UNLOAD=y
12# CONFIG_BLK_DEV_BSG is not set
13# CONFIG_EBONY is not set 9# CONFIG_EBONY is not set
14CONFIG_ICON=y 10CONFIG_ICON=y
15CONFIG_HIGHMEM=y 11CONFIG_HIGHMEM=y
16CONFIG_SPARSE_IRQ=y
17CONFIG_CMDLINE_BOOL=y 12CONFIG_CMDLINE_BOOL=y
18CONFIG_CMDLINE="" 13CONFIG_CMDLINE=""
19CONFIG_PCIEPORTBUS=y 14CONFIG_PCIEPORTBUS=y
@@ -34,17 +29,13 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
34CONFIG_CONNECTOR=y 29CONFIG_CONNECTOR=y
35CONFIG_MTD=y 30CONFIG_MTD=y
36CONFIG_MTD_CMDLINE_PARTS=y 31CONFIG_MTD_CMDLINE_PARTS=y
37CONFIG_MTD_OF_PARTS=y
38CONFIG_MTD_CHAR=y
39CONFIG_MTD_BLOCK=y 32CONFIG_MTD_BLOCK=y
40CONFIG_MTD_CFI=y 33CONFIG_MTD_CFI=y
41CONFIG_MTD_CFI_AMDSTD=y 34CONFIG_MTD_CFI_AMDSTD=y
42CONFIG_MTD_PHYSMAP_OF=y 35CONFIG_MTD_PHYSMAP_OF=y
43CONFIG_PROC_DEVICETREE=y
44CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
45CONFIG_BLK_DEV_RAM_SIZE=35000 37CONFIG_BLK_DEV_RAM_SIZE=35000
46CONFIG_XILINX_SYSACE=y 38CONFIG_XILINX_SYSACE=y
47# CONFIG_MISC_DEVICES is not set
48CONFIG_SCSI=y 39CONFIG_SCSI=y
49CONFIG_BLK_DEV_SD=y 40CONFIG_BLK_DEV_SD=y
50CONFIG_SCSI_CONSTANTS=y 41CONFIG_SCSI_CONSTANTS=y
@@ -55,11 +46,7 @@ CONFIG_FUSION_SAS=y
55CONFIG_FUSION_CTL=y 46CONFIG_FUSION_CTL=y
56CONFIG_FUSION_LOGGING=y 47CONFIG_FUSION_LOGGING=y
57CONFIG_NETDEVICES=y 48CONFIG_NETDEVICES=y
58CONFIG_ETHERNET=y
59CONFIG_NET_VENDOR_IBM=y
60CONFIG_IBM_EMAC=y 49CONFIG_IBM_EMAC=y
61# CONFIG_NETDEV_1000 is not set
62# CONFIG_NETDEV_10000 is not set
63# CONFIG_WLAN is not set 50# CONFIG_WLAN is not set
64CONFIG_INPUT_MOUSEDEV_SCREEN_X=640 51CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
65CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480 52CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
@@ -79,7 +66,6 @@ CONFIG_I2C_CHARDEV=y
79CONFIG_I2C_IBM_IIC=y 66CONFIG_I2C_IBM_IIC=y
80# CONFIG_HWMON is not set 67# CONFIG_HWMON is not set
81CONFIG_MFD_SM501=y 68CONFIG_MFD_SM501=y
82CONFIG_VIDEO_OUTPUT_CONTROL=m
83CONFIG_FB=y 69CONFIG_FB=y
84CONFIG_FB_SM501=y 70CONFIG_FB_SM501=y
85CONFIG_FRAMEBUFFER_CONSOLE=y 71CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -92,25 +78,19 @@ CONFIG_RTC_DRV_DS1307=y
92CONFIG_EXT2_FS=y 78CONFIG_EXT2_FS=y
93CONFIG_EXT3_FS=y 79CONFIG_EXT3_FS=y
94# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 80# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
95CONFIG_INOTIFY=y
96CONFIG_VFAT_FS=y 81CONFIG_VFAT_FS=y
97CONFIG_PROC_KCORE=y 82CONFIG_PROC_KCORE=y
98CONFIG_TMPFS=y 83CONFIG_TMPFS=y
99CONFIG_CRAMFS=y 84CONFIG_CRAMFS=y
100CONFIG_NFS_FS=y 85CONFIG_NFS_FS=y
101CONFIG_NFS_V3=y
102CONFIG_ROOT_NFS=y 86CONFIG_ROOT_NFS=y
103CONFIG_NLS_CODEPAGE_437=y 87CONFIG_NLS_CODEPAGE_437=y
104CONFIG_NLS_CODEPAGE_850=y 88CONFIG_NLS_CODEPAGE_850=y
105CONFIG_NLS_ISO8859_1=y 89CONFIG_NLS_ISO8859_1=y
106CONFIG_NLS_ISO8859_15=y 90CONFIG_NLS_ISO8859_15=y
107CONFIG_MAGIC_SYSRQ=y 91CONFIG_MAGIC_SYSRQ=y
108CONFIG_DEBUG_KERNEL=y
109CONFIG_DETECT_HUNG_TASK=y 92CONFIG_DETECT_HUNG_TASK=y
110# CONFIG_DEBUG_BUGVERBOSE is not set 93# CONFIG_DEBUG_BUGVERBOSE is not set
111# CONFIG_RCU_CPU_STALL_DETECTOR is not set
112CONFIG_SYSCTL_SYSCALL_CHECK=y
113CONFIG_CRYPTO=y
114CONFIG_CRYPTO_CBC=y 94CONFIG_CRYPTO_CBC=y
115CONFIG_CRYPTO_ECB=y 95CONFIG_CRYPTO_ECB=y
116CONFIG_CRYPTO_PCBC=y 96CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/iss476-smp_defconfig b/arch/powerpc/configs/44x/iss476-smp_defconfig
index 49a1518a4e69..0ad3e449526e 100644
--- a/arch/powerpc/configs/44x/iss476-smp_defconfig
+++ b/arch/powerpc/configs/44x/iss476-smp_defconfig
@@ -1,15 +1,11 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_SMP=y 2CONFIG_SMP=y
3CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
6CONFIG_SPARSE_IRQ=y
7CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
8CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
9# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
10CONFIG_EXPERT=y 7CONFIG_EXPERT=y
11CONFIG_KALLSYMS_ALL=y 8CONFIG_KALLSYMS_ALL=y
12CONFIG_KALLSYMS_EXTRA_PASS=y
13CONFIG_PROFILING=y 9CONFIG_PROFILING=y
14CONFIG_OPROFILE=y 10CONFIG_OPROFILE=y
15CONFIG_MODULES=y 11CONFIG_MODULES=y
@@ -25,7 +21,6 @@ CONFIG_CMDLINE_BOOL=y
25CONFIG_CMDLINE="root=/dev/issblk0" 21CONFIG_CMDLINE="root=/dev/issblk0"
26# CONFIG_PCI is not set 22# CONFIG_PCI is not set
27CONFIG_ADVANCED_OPTIONS=y 23CONFIG_ADVANCED_OPTIONS=y
28CONFIG_NONSTATIC_KERNEL=y
29CONFIG_DYNAMIC_MEMSTART=y 24CONFIG_DYNAMIC_MEMSTART=y
30CONFIG_NET=y 25CONFIG_NET=y
31CONFIG_PACKET=y 26CONFIG_PACKET=y
@@ -42,13 +37,10 @@ CONFIG_IP_PNP_BOOTP=y
42CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 37CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
43CONFIG_CONNECTOR=y 38CONFIG_CONNECTOR=y
44CONFIG_MTD=y 39CONFIG_MTD=y
45CONFIG_MTD_OF_PARTS=y
46CONFIG_MTD_CHAR=y
47CONFIG_MTD_BLOCK=y 40CONFIG_MTD_BLOCK=y
48CONFIG_MTD_JEDECPROBE=y 41CONFIG_MTD_JEDECPROBE=y
49CONFIG_MTD_CFI_AMDSTD=y 42CONFIG_MTD_CFI_AMDSTD=y
50CONFIG_MTD_PHYSMAP_OF=y 43CONFIG_MTD_PHYSMAP_OF=y
51CONFIG_PROC_DEVICETREE=y
52CONFIG_BLK_DEV_RAM=y 44CONFIG_BLK_DEV_RAM=y
53CONFIG_BLK_DEV_RAM_SIZE=35000 45CONFIG_BLK_DEV_RAM_SIZE=35000
54# CONFIG_INPUT is not set 46# CONFIG_INPUT is not set
@@ -72,15 +64,11 @@ CONFIG_PROC_KCORE=y
72CONFIG_TMPFS=y 64CONFIG_TMPFS=y
73CONFIG_CRAMFS=y 65CONFIG_CRAMFS=y
74# CONFIG_NETWORK_FILESYSTEMS is not set 66# CONFIG_NETWORK_FILESYSTEMS is not set
75CONFIG_MAGIC_SYSRQ=y 67CONFIG_DEBUG_INFO=y
76CONFIG_DEBUG_FS=y 68CONFIG_DEBUG_FS=y
77CONFIG_DEBUG_KERNEL=y 69CONFIG_MAGIC_SYSRQ=y
78CONFIG_DETECT_HUNG_TASK=y 70CONFIG_DETECT_HUNG_TASK=y
79CONFIG_DEBUG_INFO=y
80# CONFIG_RCU_CPU_STALL_DETECTOR is not set
81CONFIG_SYSCTL_SYSCALL_CHECK=y
82CONFIG_PPC_EARLY_DEBUG=y 71CONFIG_PPC_EARLY_DEBUG=y
83CONFIG_CRYPTO=y
84CONFIG_CRYPTO_CBC=y 72CONFIG_CRYPTO_CBC=y
85CONFIG_CRYPTO_ECB=y 73CONFIG_CRYPTO_ECB=y
86CONFIG_CRYPTO_PCBC=y 74CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/katmai_defconfig b/arch/powerpc/configs/44x/katmai_defconfig
index f1137972ed41..a042335971da 100644
--- a/arch/powerpc/configs/44x/katmai_defconfig
+++ b/arch/powerpc/configs/44x/katmai_defconfig
@@ -1,17 +1,14 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_MODULES=y 7CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 8CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set 9# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_EBONY is not set 10# CONFIG_EBONY is not set
13CONFIG_KATMAI=y 11CONFIG_KATMAI=y
14CONFIG_SPARSE_IRQ=y
15CONFIG_CMDLINE_BOOL=y 12CONFIG_CMDLINE_BOOL=y
16CONFIG_CMDLINE="" 13CONFIG_CMDLINE=""
17CONFIG_NET=y 14CONFIG_NET=y
@@ -30,19 +27,14 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30CONFIG_CONNECTOR=y 27CONFIG_CONNECTOR=y
31CONFIG_MTD=y 28CONFIG_MTD=y
32CONFIG_MTD_CMDLINE_PARTS=y 29CONFIG_MTD_CMDLINE_PARTS=y
33CONFIG_MTD_OF_PARTS=y
34CONFIG_MTD_CHAR=y
35CONFIG_MTD_BLOCK=y 30CONFIG_MTD_BLOCK=y
36CONFIG_MTD_CFI=y 31CONFIG_MTD_CFI=y
37CONFIG_MTD_CFI_AMDSTD=y 32CONFIG_MTD_CFI_AMDSTD=y
38CONFIG_MTD_PHYSMAP_OF=y 33CONFIG_MTD_PHYSMAP_OF=y
39CONFIG_PROC_DEVICETREE=y
40CONFIG_BLK_DEV_RAM=y 34CONFIG_BLK_DEV_RAM=y
41CONFIG_BLK_DEV_RAM_SIZE=35000 35CONFIG_BLK_DEV_RAM_SIZE=35000
42CONFIG_MACINTOSH_DRIVERS=y 36CONFIG_MACINTOSH_DRIVERS=y
43CONFIG_NETDEVICES=y 37CONFIG_NETDEVICES=y
44CONFIG_ETHERNET=y
45CONFIG_NET_VENDOR_IBM=y
46CONFIG_IBM_EMAC=y 38CONFIG_IBM_EMAC=y
47# CONFIG_INPUT is not set 39# CONFIG_INPUT is not set
48# CONFIG_SERIO is not set 40# CONFIG_SERIO is not set
@@ -55,22 +47,15 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
55CONFIG_SERIAL_OF_PLATFORM=y 47CONFIG_SERIAL_OF_PLATFORM=y
56# CONFIG_HW_RANDOM is not set 48# CONFIG_HW_RANDOM is not set
57# CONFIG_HWMON is not set 49# CONFIG_HWMON is not set
58CONFIG_VIDEO_OUTPUT_CONTROL=m
59CONFIG_EXT2_FS=y 50CONFIG_EXT2_FS=y
60CONFIG_INOTIFY=y
61CONFIG_PROC_KCORE=y 51CONFIG_PROC_KCORE=y
62CONFIG_TMPFS=y 52CONFIG_TMPFS=y
63CONFIG_CRAMFS=y 53CONFIG_CRAMFS=y
64CONFIG_NFS_FS=y 54CONFIG_NFS_FS=y
65CONFIG_NFS_V3=y
66CONFIG_ROOT_NFS=y 55CONFIG_ROOT_NFS=y
67CONFIG_MAGIC_SYSRQ=y 56CONFIG_MAGIC_SYSRQ=y
68CONFIG_DEBUG_KERNEL=y
69CONFIG_DETECT_HUNG_TASK=y 57CONFIG_DETECT_HUNG_TASK=y
70# CONFIG_DEBUG_BUGVERBOSE is not set 58# CONFIG_DEBUG_BUGVERBOSE is not set
71# CONFIG_RCU_CPU_STALL_DETECTOR is not set
72CONFIG_SYSCTL_SYSCALL_CHECK=y
73CONFIG_CRYPTO=y
74CONFIG_CRYPTO_CBC=y 59CONFIG_CRYPTO_CBC=y
75CONFIG_CRYPTO_ECB=y 60CONFIG_CRYPTO_ECB=y
76CONFIG_CRYPTO_PCBC=y 61CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/rainier_defconfig b/arch/powerpc/configs/44x/rainier_defconfig
index 4b91a44c4c32..91c2aff9bd55 100644
--- a/arch/powerpc/configs/44x/rainier_defconfig
+++ b/arch/powerpc/configs/44x/rainier_defconfig
@@ -1,10 +1,8 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_MODULES=y 7CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 8CONFIG_MODULE_UNLOAD=y
@@ -12,7 +10,6 @@ CONFIG_MODULE_UNLOAD=y
12# CONFIG_EBONY is not set 10# CONFIG_EBONY is not set
13CONFIG_RAINIER=y 11CONFIG_RAINIER=y
14CONFIG_MATH_EMULATION=y 12CONFIG_MATH_EMULATION=y
15CONFIG_SPARSE_IRQ=y
16CONFIG_CMDLINE_BOOL=y 13CONFIG_CMDLINE_BOOL=y
17CONFIG_CMDLINE="" 14CONFIG_CMDLINE=""
18CONFIG_NET=y 15CONFIG_NET=y
@@ -31,14 +28,11 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31CONFIG_CONNECTOR=y 28CONFIG_CONNECTOR=y
32CONFIG_MTD=y 29CONFIG_MTD=y
33CONFIG_MTD_CMDLINE_PARTS=y 30CONFIG_MTD_CMDLINE_PARTS=y
34CONFIG_MTD_OF_PARTS=y
35CONFIG_MTD_CHAR=y
36CONFIG_MTD_CFI=y 31CONFIG_MTD_CFI=y
37CONFIG_MTD_JEDECPROBE=y 32CONFIG_MTD_JEDECPROBE=y
38CONFIG_MTD_CFI_INTELEXT=y 33CONFIG_MTD_CFI_INTELEXT=y
39CONFIG_MTD_CFI_AMDSTD=y 34CONFIG_MTD_CFI_AMDSTD=y
40CONFIG_MTD_PHYSMAP_OF=y 35CONFIG_MTD_PHYSMAP_OF=y
41CONFIG_PROC_DEVICETREE=y
42CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
43CONFIG_BLK_DEV_RAM_SIZE=35000 37CONFIG_BLK_DEV_RAM_SIZE=35000
44CONFIG_MACINTOSH_DRIVERS=y 38CONFIG_MACINTOSH_DRIVERS=y
@@ -55,26 +49,19 @@ CONFIG_SERIAL_OF_PLATFORM=y
55# CONFIG_HW_RANDOM is not set 49# CONFIG_HW_RANDOM is not set
56# CONFIG_HWMON is not set 50# CONFIG_HWMON is not set
57CONFIG_THERMAL=y 51CONFIG_THERMAL=y
58CONFIG_VIDEO_OUTPUT_CONTROL=m
59CONFIG_EXT2_FS=y 52CONFIG_EXT2_FS=y
60CONFIG_INOTIFY=y
61CONFIG_PROC_KCORE=y 53CONFIG_PROC_KCORE=y
62CONFIG_TMPFS=y 54CONFIG_TMPFS=y
63CONFIG_JFFS2_FS=y 55CONFIG_JFFS2_FS=y
64CONFIG_CRAMFS=y 56CONFIG_CRAMFS=y
65CONFIG_NFS_FS=y 57CONFIG_NFS_FS=y
66CONFIG_NFS_V3=y
67CONFIG_ROOT_NFS=y 58CONFIG_ROOT_NFS=y
68CONFIG_MAGIC_SYSRQ=y
69CONFIG_DEBUG_FS=y 59CONFIG_DEBUG_FS=y
70CONFIG_DEBUG_KERNEL=y 60CONFIG_MAGIC_SYSRQ=y
71CONFIG_DETECT_HUNG_TASK=y 61CONFIG_DETECT_HUNG_TASK=y
72# CONFIG_DEBUG_BUGVERBOSE is not set 62# CONFIG_DEBUG_BUGVERBOSE is not set
73# CONFIG_RCU_CPU_STALL_DETECTOR is not set
74CONFIG_SYSCTL_SYSCALL_CHECK=y
75CONFIG_PPC_EARLY_DEBUG=y 63CONFIG_PPC_EARLY_DEBUG=y
76CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300 64CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
77CONFIG_CRYPTO=y
78CONFIG_CRYPTO_CBC=y 65CONFIG_CRYPTO_CBC=y
79CONFIG_CRYPTO_ECB=y 66CONFIG_CRYPTO_ECB=y
80CONFIG_CRYPTO_PCBC=y 67CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/redwood_defconfig b/arch/powerpc/configs/44x/redwood_defconfig
index b7113e114a14..7fddf3fe275c 100644
--- a/arch/powerpc/configs/44x/redwood_defconfig
+++ b/arch/powerpc/configs/44x/redwood_defconfig
@@ -1,19 +1,15 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 8CONFIG_EXPERT=y
9CONFIG_MODULES=y 9CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 10CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_EBONY is not set 11# CONFIG_EBONY is not set
13CONFIG_REDWOOD=y 12CONFIG_REDWOOD=y
14CONFIG_NO_HZ=y
15CONFIG_HIGH_RES_TIMERS=y
16CONFIG_SPARSE_IRQ=y
17CONFIG_CMDLINE_BOOL=y 13CONFIG_CMDLINE_BOOL=y
18CONFIG_CMDLINE="" 14CONFIG_CMDLINE=""
19CONFIG_PCIEPORTBUS=y 15CONFIG_PCIEPORTBUS=y
@@ -33,18 +29,13 @@ CONFIG_IP_PNP_BOOTP=y
33CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
34CONFIG_CONNECTOR=y 30CONFIG_CONNECTOR=y
35CONFIG_MTD=y 31CONFIG_MTD=y
36CONFIG_MTD_CONCAT=y
37CONFIG_MTD_CMDLINE_PARTS=y 32CONFIG_MTD_CMDLINE_PARTS=y
38CONFIG_MTD_OF_PARTS=y
39CONFIG_MTD_CHAR=y
40CONFIG_MTD_BLOCK=y 33CONFIG_MTD_BLOCK=y
41CONFIG_MTD_CFI=y 34CONFIG_MTD_CFI=y
42CONFIG_MTD_CFI_AMDSTD=y 35CONFIG_MTD_CFI_AMDSTD=y
43CONFIG_MTD_PHYSMAP_OF=y 36CONFIG_MTD_PHYSMAP_OF=y
44CONFIG_PROC_DEVICETREE=y
45CONFIG_BLK_DEV_RAM=y 37CONFIG_BLK_DEV_RAM=y
46CONFIG_BLK_DEV_RAM_SIZE=35000 38CONFIG_BLK_DEV_RAM_SIZE=35000
47# CONFIG_MISC_DEVICES is not set
48CONFIG_SCSI=y 39CONFIG_SCSI=y
49CONFIG_BLK_DEV_SD=y 40CONFIG_BLK_DEV_SD=y
50CONFIG_CHR_DEV_SG=y 41CONFIG_CHR_DEV_SG=y
@@ -52,14 +43,11 @@ CONFIG_FUSION=y
52CONFIG_FUSION_SAS=y 43CONFIG_FUSION_SAS=y
53CONFIG_I2O=y 44CONFIG_I2O=y
54CONFIG_NETDEVICES=y 45CONFIG_NETDEVICES=y
55CONFIG_ETHERNET=y
56CONFIG_NET_VENDOR_IBM=y
57CONFIG_IBM_EMAC=y 46CONFIG_IBM_EMAC=y
58CONFIG_IBM_EMAC_RXB=256 47CONFIG_IBM_EMAC_RXB=256
59CONFIG_IBM_EMAC_TXB=256 48CONFIG_IBM_EMAC_TXB=256
60CONFIG_IBM_EMAC_DEBUG=y 49CONFIG_IBM_EMAC_DEBUG=y
61CONFIG_E1000E=y 50CONFIG_E1000E=y
62# CONFIG_NETDEV_10000 is not set
63# CONFIG_INPUT is not set 51# CONFIG_INPUT is not set
64# CONFIG_SERIO is not set 52# CONFIG_SERIO is not set
65# CONFIG_VT is not set 53# CONFIG_VT is not set
@@ -79,25 +67,18 @@ CONFIG_I2C_DEBUG_CORE=y
79CONFIG_I2C_DEBUG_ALGO=y 67CONFIG_I2C_DEBUG_ALGO=y
80CONFIG_I2C_DEBUG_BUS=y 68CONFIG_I2C_DEBUG_BUS=y
81# CONFIG_HWMON is not set 69# CONFIG_HWMON is not set
82CONFIG_VIDEO_OUTPUT_CONTROL=m
83# CONFIG_USB_SUPPORT is not set 70# CONFIG_USB_SUPPORT is not set
84CONFIG_DMADEVICES=y 71CONFIG_DMADEVICES=y
85CONFIG_EXT2_FS=y 72CONFIG_EXT2_FS=y
86CONFIG_INOTIFY=y
87CONFIG_PROC_KCORE=y 73CONFIG_PROC_KCORE=y
88CONFIG_TMPFS=y 74CONFIG_TMPFS=y
89CONFIG_CRAMFS=y 75CONFIG_CRAMFS=y
90CONFIG_NFS_FS=y 76CONFIG_NFS_FS=y
91CONFIG_NFS_V3=y
92CONFIG_ROOT_NFS=y 77CONFIG_ROOT_NFS=y
93CONFIG_MAGIC_SYSRQ=y
94CONFIG_DEBUG_FS=y 78CONFIG_DEBUG_FS=y
95CONFIG_DEBUG_KERNEL=y 79CONFIG_MAGIC_SYSRQ=y
96CONFIG_DETECT_HUNG_TASK=y 80CONFIG_DETECT_HUNG_TASK=y
97# CONFIG_DEBUG_BUGVERBOSE is not set 81# CONFIG_DEBUG_BUGVERBOSE is not set
98# CONFIG_RCU_CPU_STALL_DETECTOR is not set
99CONFIG_SYSCTL_SYSCALL_CHECK=y
100CONFIG_CRYPTO=y
101CONFIG_CRYPTO_CRYPTD=y 82CONFIG_CRYPTO_CRYPTD=y
102CONFIG_CRYPTO_AUTHENC=y 83CONFIG_CRYPTO_AUTHENC=y
103CONFIG_CRYPTO_CCM=y 84CONFIG_CRYPTO_CCM=y
@@ -115,7 +96,6 @@ CONFIG_CRYPTO_MD5=y
115CONFIG_CRYPTO_SHA1=y 96CONFIG_CRYPTO_SHA1=y
116CONFIG_CRYPTO_SHA256=y 97CONFIG_CRYPTO_SHA256=y
117CONFIG_CRYPTO_SHA512=y 98CONFIG_CRYPTO_SHA512=y
118CONFIG_CRYPTO_AES=y
119CONFIG_CRYPTO_ARC4=y 99CONFIG_CRYPTO_ARC4=y
120CONFIG_CRYPTO_BLOWFISH=y 100CONFIG_CRYPTO_BLOWFISH=y
121CONFIG_CRYPTO_DES=y 101CONFIG_CRYPTO_DES=y
diff --git a/arch/powerpc/configs/44x/sam440ep_defconfig b/arch/powerpc/configs/44x/sam440ep_defconfig
index 9622eb2a3e37..6928012f3813 100644
--- a/arch/powerpc/configs/44x/sam440ep_defconfig
+++ b/arch/powerpc/configs/44x/sam440ep_defconfig
@@ -1,20 +1,19 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_IKCONFIG=y 4CONFIG_IKCONFIG=y
6CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
7CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
8# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
9CONFIG_EXPERT=y 7CONFIG_EXPERT=y
10CONFIG_MODULES=y 8CONFIG_MODULES=y
11CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
12# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
12CONFIG_AMIGA_PARTITION=y
13# CONFIG_IOSCHED_DEADLINE is not set 13# CONFIG_IOSCHED_DEADLINE is not set
14# CONFIG_IOSCHED_CFQ is not set 14# CONFIG_IOSCHED_CFQ is not set
15# CONFIG_EBONY is not set 15# CONFIG_EBONY is not set
16CONFIG_SAM440EP=y 16CONFIG_SAM440EP=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_CMDLINE_BOOL=y 17CONFIG_CMDLINE_BOOL=y
19CONFIG_CMDLINE="" 18CONFIG_CMDLINE=""
20CONFIG_NET=y 19CONFIG_NET=y
@@ -31,11 +30,9 @@ CONFIG_IP_PNP_BOOTP=y
31# CONFIG_IPV6 is not set 30# CONFIG_IPV6 is not set
32CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
33CONFIG_CONNECTOR=y 32CONFIG_CONNECTOR=y
34CONFIG_PROC_DEVICETREE=y
35CONFIG_BLK_DEV_LOOP=y 33CONFIG_BLK_DEV_LOOP=y
36CONFIG_BLK_DEV_RAM=y 34CONFIG_BLK_DEV_RAM=y
37CONFIG_BLK_DEV_RAM_SIZE=35000 35CONFIG_BLK_DEV_RAM_SIZE=35000
38# CONFIG_MISC_DEVICES is not set
39CONFIG_BLK_DEV_SD=y 36CONFIG_BLK_DEV_SD=y
40CONFIG_BLK_DEV_SR=y 37CONFIG_BLK_DEV_SR=y
41CONFIG_CHR_DEV_SG=y 38CONFIG_CHR_DEV_SG=y
@@ -44,11 +41,7 @@ CONFIG_ATA=y
44# CONFIG_SATA_PMP is not set 41# CONFIG_SATA_PMP is not set
45CONFIG_SATA_SIL=y 42CONFIG_SATA_SIL=y
46CONFIG_NETDEVICES=y 43CONFIG_NETDEVICES=y
47CONFIG_ETHERNET=y
48CONFIG_NET_VENDOR_IBM=y
49CONFIG_IBM_EMAC=y 44CONFIG_IBM_EMAC=y
50# CONFIG_NETDEV_1000 is not set
51# CONFIG_NETDEV_10000 is not set
52CONFIG_INPUT_FF_MEMLESS=m 45CONFIG_INPUT_FF_MEMLESS=m
53CONFIG_SERIAL_8250=y 46CONFIG_SERIAL_8250=y
54CONFIG_SERIAL_8250_CONSOLE=y 47CONFIG_SERIAL_8250_CONSOLE=y
@@ -59,7 +52,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
59# CONFIG_HW_RANDOM is not set 52# CONFIG_HW_RANDOM is not set
60CONFIG_I2C_IBM_IIC=y 53CONFIG_I2C_IBM_IIC=y
61# CONFIG_HWMON is not set 54# CONFIG_HWMON is not set
62CONFIG_VIDEO_OUTPUT_CONTROL=y
63CONFIG_FB=y 55CONFIG_FB=y
64CONFIG_FB_RADEON=y 56CONFIG_FB_RADEON=y
65CONFIG_LCD_CLASS_DEVICE=y 57CONFIG_LCD_CLASS_DEVICE=y
@@ -80,10 +72,8 @@ CONFIG_HID_MONTEREY=y
80CONFIG_HID_PANTHERLORD=y 72CONFIG_HID_PANTHERLORD=y
81CONFIG_HID_PETALYNX=y 73CONFIG_HID_PETALYNX=y
82CONFIG_HID_SAMSUNG=y 74CONFIG_HID_SAMSUNG=y
83CONFIG_HID_SONY=y
84CONFIG_HID_SUNPLUS=y 75CONFIG_HID_SUNPLUS=y
85CONFIG_USB=y 76CONFIG_USB=y
86# CONFIG_USB_DEVICE_CLASS is not set
87CONFIG_USB_EHCI_HCD=m 77CONFIG_USB_EHCI_HCD=m
88CONFIG_USB_OHCI_HCD=y 78CONFIG_USB_OHCI_HCD=y
89CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 79CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
@@ -99,7 +89,6 @@ CONFIG_EXT3_FS=y
99# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 89# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
100CONFIG_EXT3_FS_POSIX_ACL=y 90CONFIG_EXT3_FS_POSIX_ACL=y
101CONFIG_REISERFS_FS=y 91CONFIG_REISERFS_FS=y
102CONFIG_INOTIFY=y
103CONFIG_AUTOFS4_FS=y 92CONFIG_AUTOFS4_FS=y
104CONFIG_ISO9660_FS=y 93CONFIG_ISO9660_FS=y
105CONFIG_JOLIET=y 94CONFIG_JOLIET=y
@@ -111,11 +100,7 @@ CONFIG_PROC_KCORE=y
111CONFIG_TMPFS=y 100CONFIG_TMPFS=y
112CONFIG_AFFS_FS=m 101CONFIG_AFFS_FS=m
113# CONFIG_NETWORK_FILESYSTEMS is not set 102# CONFIG_NETWORK_FILESYSTEMS is not set
114CONFIG_PARTITION_ADVANCED=y
115CONFIG_AMIGA_PARTITION=y
116CONFIG_NLS_CODEPAGE_437=y 103CONFIG_NLS_CODEPAGE_437=y
117CONFIG_NLS_ISO8859_1=y 104CONFIG_NLS_ISO8859_1=y
118CONFIG_CRC_T10DIF=y 105CONFIG_CRC_T10DIF=y
119CONFIG_MAGIC_SYSRQ=y 106CONFIG_MAGIC_SYSRQ=y
120# CONFIG_RCU_CPU_STALL_DETECTOR is not set
121CONFIG_SYSCTL_SYSCALL_CHECK=y
diff --git a/arch/powerpc/configs/44x/sequoia_defconfig b/arch/powerpc/configs/44x/sequoia_defconfig
index 9642d99b47f1..c294369cc39f 100644
--- a/arch/powerpc/configs/44x/sequoia_defconfig
+++ b/arch/powerpc/configs/44x/sequoia_defconfig
@@ -1,19 +1,16 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 8CONFIG_EXPERT=y
9CONFIG_MODULES=y 9CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 10CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set 11# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_EBONY is not set 12# CONFIG_EBONY is not set
13CONFIG_SEQUOIA=y 13CONFIG_SEQUOIA=y
14CONFIG_NO_HZ=y
15CONFIG_HIGH_RES_TIMERS=y
16CONFIG_SPARSE_IRQ=y
17CONFIG_CMDLINE_BOOL=y 14CONFIG_CMDLINE_BOOL=y
18CONFIG_CMDLINE="" 15CONFIG_CMDLINE=""
19CONFIG_NET=y 16CONFIG_NET=y
@@ -32,8 +29,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32CONFIG_CONNECTOR=y 29CONFIG_CONNECTOR=y
33CONFIG_MTD=y 30CONFIG_MTD=y
34CONFIG_MTD_CMDLINE_PARTS=y 31CONFIG_MTD_CMDLINE_PARTS=y
35CONFIG_MTD_OF_PARTS=y
36CONFIG_MTD_CHAR=y
37CONFIG_MTD_CFI=y 32CONFIG_MTD_CFI=y
38CONFIG_MTD_JEDECPROBE=y 33CONFIG_MTD_JEDECPROBE=y
39CONFIG_MTD_CFI_INTELEXT=y 34CONFIG_MTD_CFI_INTELEXT=y
@@ -41,12 +36,9 @@ CONFIG_MTD_CFI_AMDSTD=y
41CONFIG_MTD_PHYSMAP_OF=y 36CONFIG_MTD_PHYSMAP_OF=y
42CONFIG_MTD_NAND=y 37CONFIG_MTD_NAND=y
43CONFIG_MTD_NAND_NDFC=y 38CONFIG_MTD_NAND_NDFC=y
44CONFIG_PROC_DEVICETREE=y
45CONFIG_BLK_DEV_RAM=y 39CONFIG_BLK_DEV_RAM=y
46CONFIG_BLK_DEV_RAM_SIZE=35000 40CONFIG_BLK_DEV_RAM_SIZE=35000
47CONFIG_NETDEVICES=y 41CONFIG_NETDEVICES=y
48CONFIG_ETHERNET=y
49CONFIG_NET_VENDOR_IBM=y
50CONFIG_IBM_EMAC=y 42CONFIG_IBM_EMAC=y
51# CONFIG_INPUT is not set 43# CONFIG_INPUT is not set
52# CONFIG_SERIO is not set 44# CONFIG_SERIO is not set
@@ -60,24 +52,17 @@ CONFIG_SERIAL_OF_PLATFORM=y
60# CONFIG_HW_RANDOM is not set 52# CONFIG_HW_RANDOM is not set
61# CONFIG_HWMON is not set 53# CONFIG_HWMON is not set
62CONFIG_THERMAL=y 54CONFIG_THERMAL=y
63CONFIG_VIDEO_OUTPUT_CONTROL=m
64CONFIG_EXT2_FS=y 55CONFIG_EXT2_FS=y
65CONFIG_INOTIFY=y
66CONFIG_PROC_KCORE=y 56CONFIG_PROC_KCORE=y
67CONFIG_TMPFS=y 57CONFIG_TMPFS=y
68CONFIG_JFFS2_FS=y 58CONFIG_JFFS2_FS=y
69CONFIG_CRAMFS=y 59CONFIG_CRAMFS=y
70CONFIG_NFS_FS=y 60CONFIG_NFS_FS=y
71CONFIG_NFS_V3=y
72CONFIG_ROOT_NFS=y 61CONFIG_ROOT_NFS=y
73CONFIG_MAGIC_SYSRQ=y
74CONFIG_DEBUG_FS=y 62CONFIG_DEBUG_FS=y
75CONFIG_DEBUG_KERNEL=y 63CONFIG_MAGIC_SYSRQ=y
76CONFIG_DETECT_HUNG_TASK=y 64CONFIG_DETECT_HUNG_TASK=y
77# CONFIG_DEBUG_BUGVERBOSE is not set 65# CONFIG_DEBUG_BUGVERBOSE is not set
78# CONFIG_RCU_CPU_STALL_DETECTOR is not set
79CONFIG_SYSCTL_SYSCALL_CHECK=y
80CONFIG_CRYPTO=y
81CONFIG_CRYPTO_CBC=y 66CONFIG_CRYPTO_CBC=y
82CONFIG_CRYPTO_ECB=y 67CONFIG_CRYPTO_ECB=y
83CONFIG_CRYPTO_PCBC=y 68CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/taishan_defconfig b/arch/powerpc/configs/44x/taishan_defconfig
index 09e3075030bf..e779228d6cd6 100644
--- a/arch/powerpc/configs/44x/taishan_defconfig
+++ b/arch/powerpc/configs/44x/taishan_defconfig
@@ -1,17 +1,14 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_MODULES=y 7CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 8CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set 9# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_EBONY is not set 10# CONFIG_EBONY is not set
13CONFIG_TAISHAN=y 11CONFIG_TAISHAN=y
14CONFIG_SPARSE_IRQ=y
15CONFIG_CMDLINE_BOOL=y 12CONFIG_CMDLINE_BOOL=y
16CONFIG_CMDLINE="" 13CONFIG_CMDLINE=""
17CONFIG_NET=y 14CONFIG_NET=y
@@ -30,17 +27,13 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30CONFIG_CONNECTOR=y 27CONFIG_CONNECTOR=y
31CONFIG_MTD=y 28CONFIG_MTD=y
32CONFIG_MTD_CMDLINE_PARTS=y 29CONFIG_MTD_CMDLINE_PARTS=y
33CONFIG_MTD_CHAR=y
34CONFIG_MTD_CFI=y 30CONFIG_MTD_CFI=y
35CONFIG_MTD_CFI_AMDSTD=y 31CONFIG_MTD_CFI_AMDSTD=y
36CONFIG_MTD_PHYSMAP_OF=y 32CONFIG_MTD_PHYSMAP_OF=y
37CONFIG_PROC_DEVICETREE=y
38CONFIG_BLK_DEV_RAM=y 33CONFIG_BLK_DEV_RAM=y
39CONFIG_BLK_DEV_RAM_SIZE=35000 34CONFIG_BLK_DEV_RAM_SIZE=35000
40CONFIG_MACINTOSH_DRIVERS=y 35CONFIG_MACINTOSH_DRIVERS=y
41CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
42CONFIG_ETHERNET=y
43CONFIG_NET_VENDOR_IBM=y
44CONFIG_IBM_EMAC=y 37CONFIG_IBM_EMAC=y
45# CONFIG_INPUT is not set 38# CONFIG_INPUT is not set
46# CONFIG_SERIO is not set 39# CONFIG_SERIO is not set
@@ -54,23 +47,16 @@ CONFIG_SERIAL_OF_PLATFORM=y
54# CONFIG_HW_RANDOM is not set 47# CONFIG_HW_RANDOM is not set
55# CONFIG_HWMON is not set 48# CONFIG_HWMON is not set
56CONFIG_THERMAL=y 49CONFIG_THERMAL=y
57CONFIG_VIDEO_OUTPUT_CONTROL=m
58CONFIG_EXT2_FS=y 50CONFIG_EXT2_FS=y
59CONFIG_INOTIFY=y
60CONFIG_PROC_KCORE=y 51CONFIG_PROC_KCORE=y
61CONFIG_TMPFS=y 52CONFIG_TMPFS=y
62CONFIG_CRAMFS=y 53CONFIG_CRAMFS=y
63CONFIG_NFS_FS=y 54CONFIG_NFS_FS=y
64CONFIG_NFS_V3=y
65CONFIG_ROOT_NFS=y 55CONFIG_ROOT_NFS=y
66CONFIG_MAGIC_SYSRQ=y
67CONFIG_DEBUG_FS=y 56CONFIG_DEBUG_FS=y
68CONFIG_DEBUG_KERNEL=y 57CONFIG_MAGIC_SYSRQ=y
69CONFIG_DETECT_HUNG_TASK=y 58CONFIG_DETECT_HUNG_TASK=y
70# CONFIG_DEBUG_BUGVERBOSE is not set 59# CONFIG_DEBUG_BUGVERBOSE is not set
71# CONFIG_RCU_CPU_STALL_DETECTOR is not set
72CONFIG_SYSCTL_SYSCALL_CHECK=y
73CONFIG_CRYPTO=y
74CONFIG_CRYPTO_CBC=y 60CONFIG_CRYPTO_CBC=y
75CONFIG_CRYPTO_ECB=y 61CONFIG_CRYPTO_ECB=y
76CONFIG_CRYPTO_PCBC=y 62CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/virtex5_defconfig b/arch/powerpc/configs/44x/virtex5_defconfig
index 1eb3caf828a5..53d0300b3390 100644
--- a/arch/powerpc/configs/44x/virtex5_defconfig
+++ b/arch/powerpc/configs/44x/virtex5_defconfig
@@ -1,5 +1,4 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
@@ -7,7 +6,6 @@ CONFIG_IKCONFIG=y
7CONFIG_IKCONFIG_PROC=y 6CONFIG_IKCONFIG_PROC=y
8CONFIG_LOG_BUF_SHIFT=14 7CONFIG_LOG_BUF_SHIFT=14
9CONFIG_BLK_DEV_INITRD=y 8CONFIG_BLK_DEV_INITRD=y
10# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
11CONFIG_SLAB=y 9CONFIG_SLAB=y
12CONFIG_MODULES=y 10CONFIG_MODULES=y
13CONFIG_MODULE_UNLOAD=y 11CONFIG_MODULE_UNLOAD=y
@@ -34,16 +32,11 @@ CONFIG_IP_NF_IPTABLES=m
34CONFIG_IP_NF_FILTER=m 32CONFIG_IP_NF_FILTER=m
35CONFIG_IP_NF_MANGLE=m 33CONFIG_IP_NF_MANGLE=m
36CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 34CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
37CONFIG_PROC_DEVICETREE=y
38CONFIG_BLK_DEV_LOOP=y 35CONFIG_BLK_DEV_LOOP=y
39CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
40CONFIG_BLK_DEV_RAM_SIZE=8192 37CONFIG_BLK_DEV_RAM_SIZE=8192
41CONFIG_XILINX_SYSACE=y 38CONFIG_XILINX_SYSACE=y
42CONFIG_NETDEVICES=y 39CONFIG_NETDEVICES=y
43CONFIG_NET_ETHERNET=y
44CONFIG_MII=y
45# CONFIG_NETDEV_10000 is not set
46# CONFIG_SERIO_I8042 is not set
47# CONFIG_SERIO_SERPORT is not set 40# CONFIG_SERIO_SERPORT is not set
48CONFIG_SERIO_XILINX_XPS_PS2=y 41CONFIG_SERIO_XILINX_XPS_PS2=y
49CONFIG_SERIAL_8250=y 42CONFIG_SERIAL_8250=y
@@ -59,15 +52,9 @@ CONFIG_GPIO_XILINX=y
59CONFIG_FB=y 52CONFIG_FB=y
60CONFIG_FB_XILINX=y 53CONFIG_FB_XILINX=y
61CONFIG_FRAMEBUFFER_CONSOLE=y 54CONFIG_FRAMEBUFFER_CONSOLE=y
62CONFIG_FONTS=y
63CONFIG_FONT_8x8=y
64CONFIG_FONT_8x16=y
65CONFIG_LOGO=y 55CONFIG_LOGO=y
66# CONFIG_HID_SUPPORT is not set
67# CONFIG_USB_SUPPORT is not set 56# CONFIG_USB_SUPPORT is not set
68CONFIG_EXT2_FS=y 57CONFIG_EXT2_FS=y
69CONFIG_INOTIFY=y
70CONFIG_AUTOFS_FS=y
71CONFIG_AUTOFS4_FS=y 58CONFIG_AUTOFS4_FS=y
72CONFIG_MSDOS_FS=y 59CONFIG_MSDOS_FS=y
73CONFIG_VFAT_FS=y 60CONFIG_VFAT_FS=y
@@ -75,16 +62,16 @@ CONFIG_TMPFS=y
75CONFIG_CRAMFS=y 62CONFIG_CRAMFS=y
76CONFIG_ROMFS_FS=y 63CONFIG_ROMFS_FS=y
77CONFIG_NFS_FS=y 64CONFIG_NFS_FS=y
78CONFIG_NFS_V3=y
79CONFIG_ROOT_NFS=y 65CONFIG_ROOT_NFS=y
80CONFIG_NLS_CODEPAGE_437=y 66CONFIG_NLS_CODEPAGE_437=y
81CONFIG_NLS_ASCII=m 67CONFIG_NLS_ASCII=m
82CONFIG_NLS_ISO8859_1=m 68CONFIG_NLS_ISO8859_1=m
83CONFIG_NLS_UTF8=m 69CONFIG_NLS_UTF8=m
84CONFIG_CRC_CCITT=y 70CONFIG_CRC_CCITT=y
71CONFIG_FONTS=y
72CONFIG_FONT_8x8=y
73CONFIG_FONT_8x16=y
85CONFIG_PRINTK_TIME=y 74CONFIG_PRINTK_TIME=y
86CONFIG_DEBUG_KERNEL=y
87CONFIG_DEBUG_INFO=y 75CONFIG_DEBUG_INFO=y
88# CONFIG_RCU_CPU_STALL_DETECTOR is not set 76CONFIG_DEBUG_KERNEL=y
89CONFIG_SYSCTL_SYSCALL_CHECK=y
90# CONFIG_CRYPTO_ANSI_CPRNG is not set 77# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/44x/warp_defconfig b/arch/powerpc/configs/44x/warp_defconfig
index 551e50a0be5e..ee434375fc24 100644
--- a/arch/powerpc/configs/44x/warp_defconfig
+++ b/arch/powerpc/configs/44x/warp_defconfig
@@ -1,5 +1,4 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_LOCALVERSION="-pika" 2CONFIG_LOCALVERSION="-pika"
4# CONFIG_LOCALVERSION_AUTO is not set 3# CONFIG_LOCALVERSION_AUTO is not set
5CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
@@ -7,7 +6,6 @@ CONFIG_IKCONFIG=y
7CONFIG_IKCONFIG_PROC=y 6CONFIG_IKCONFIG_PROC=y
8CONFIG_LOG_BUF_SHIFT=14 7CONFIG_LOG_BUF_SHIFT=14
9CONFIG_BLK_DEV_INITRD=y 8CONFIG_BLK_DEV_INITRD=y
10# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
11CONFIG_EXPERT=y 9CONFIG_EXPERT=y
12CONFIG_MODULES=y 10CONFIG_MODULES=y
13CONFIG_MODULE_UNLOAD=y 11CONFIG_MODULE_UNLOAD=y
@@ -16,7 +14,6 @@ CONFIG_MODULE_UNLOAD=y
16CONFIG_WARP=y 14CONFIG_WARP=y
17CONFIG_PPC4xx_GPIO=y 15CONFIG_PPC4xx_GPIO=y
18CONFIG_HZ_1000=y 16CONFIG_HZ_1000=y
19CONFIG_SPARSE_IRQ=y
20CONFIG_CMDLINE_BOOL=y 17CONFIG_CMDLINE_BOOL=y
21CONFIG_CMDLINE="ip=on" 18CONFIG_CMDLINE="ip=on"
22# CONFIG_PCI is not set 19# CONFIG_PCI is not set
@@ -35,8 +32,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
35# CONFIG_FIRMWARE_IN_KERNEL is not set 32# CONFIG_FIRMWARE_IN_KERNEL is not set
36CONFIG_MTD=y 33CONFIG_MTD=y
37CONFIG_MTD_CMDLINE_PARTS=y 34CONFIG_MTD_CMDLINE_PARTS=y
38CONFIG_MTD_OF_PARTS=y
39CONFIG_MTD_CHAR=y
40CONFIG_MTD_BLOCK=y 35CONFIG_MTD_BLOCK=y
41CONFIG_MTD_CFI=y 36CONFIG_MTD_CFI=y
42CONFIG_MTD_CFI_AMDSTD=y 37CONFIG_MTD_CFI_AMDSTD=y
@@ -44,21 +39,14 @@ CONFIG_MTD_PHYSMAP_OF=y
44CONFIG_MTD_NAND=y 39CONFIG_MTD_NAND=y
45CONFIG_MTD_NAND_NDFC=y 40CONFIG_MTD_NAND_NDFC=y
46CONFIG_MTD_UBI=y 41CONFIG_MTD_UBI=y
47CONFIG_PROC_DEVICETREE=y
48CONFIG_BLK_DEV_RAM=y 42CONFIG_BLK_DEV_RAM=y
49CONFIG_MISC_DEVICES=y
50CONFIG_EEPROM_AT24=y 43CONFIG_EEPROM_AT24=y
51CONFIG_SCSI=y 44CONFIG_SCSI=y
52CONFIG_BLK_DEV_SD=y 45CONFIG_BLK_DEV_SD=y
53CONFIG_SCSI_SPI_ATTRS=y 46CONFIG_SCSI_SPI_ATTRS=y
54# CONFIG_SCSI_LOWLEVEL is not set 47# CONFIG_SCSI_LOWLEVEL is not set
55CONFIG_NETDEVICES=y 48CONFIG_NETDEVICES=y
56CONFIG_ETHERNET=y
57CONFIG_NET_VENDOR_IBM=y
58CONFIG_MII=y
59CONFIG_IBM_EMAC=y 49CONFIG_IBM_EMAC=y
60# CONFIG_NETDEV_1000 is not set
61# CONFIG_NETDEV_10000 is not set
62# CONFIG_INPUT is not set 50# CONFIG_INPUT is not set
63# CONFIG_SERIO is not set 51# CONFIG_SERIO is not set
64# CONFIG_VT is not set 52# CONFIG_VT is not set
@@ -72,7 +60,6 @@ CONFIG_I2C_IBM_IIC=y
72CONFIG_GPIO_SYSFS=y 60CONFIG_GPIO_SYSFS=y
73CONFIG_SENSORS_AD7414=y 61CONFIG_SENSORS_AD7414=y
74CONFIG_THERMAL=y 62CONFIG_THERMAL=y
75CONFIG_THERMAL_HWMON=y
76CONFIG_WATCHDOG=y 63CONFIG_WATCHDOG=y
77CONFIG_USB=y 64CONFIG_USB=y
78CONFIG_USB_MON=y 65CONFIG_USB_MON=y
@@ -83,14 +70,12 @@ CONFIG_MMC=y
83CONFIG_NEW_LEDS=y 70CONFIG_NEW_LEDS=y
84CONFIG_LEDS_CLASS=y 71CONFIG_LEDS_CLASS=y
85CONFIG_LEDS_GPIO=y 72CONFIG_LEDS_GPIO=y
86# CONFIG_LEDS_GPIO_PLATFORM is not set
87CONFIG_LEDS_TRIGGERS=y 73CONFIG_LEDS_TRIGGERS=y
88CONFIG_LEDS_TRIGGER_DEFAULT_ON=y 74CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
89CONFIG_EXT2_FS=y 75CONFIG_EXT2_FS=y
90CONFIG_EXT3_FS=y 76CONFIG_EXT3_FS=y
91# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 77# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
92# CONFIG_EXT3_FS_XATTR is not set 78# CONFIG_EXT3_FS_XATTR is not set
93CONFIG_INOTIFY=y
94CONFIG_MSDOS_FS=y 79CONFIG_MSDOS_FS=y
95CONFIG_VFAT_FS=y 80CONFIG_VFAT_FS=y
96CONFIG_PROC_KCORE=y 81CONFIG_PROC_KCORE=y
@@ -99,7 +84,6 @@ CONFIG_JFFS2_FS=y
99CONFIG_UBIFS_FS=y 84CONFIG_UBIFS_FS=y
100CONFIG_CRAMFS=y 85CONFIG_CRAMFS=y
101CONFIG_NFS_FS=y 86CONFIG_NFS_FS=y
102CONFIG_NFS_V3=y
103CONFIG_ROOT_NFS=y 87CONFIG_ROOT_NFS=y
104CONFIG_NLS_CODEPAGE_437=y 88CONFIG_NLS_CODEPAGE_437=y
105CONFIG_NLS_CODEPAGE_850=y 89CONFIG_NLS_CODEPAGE_850=y
@@ -110,13 +94,10 @@ CONFIG_NLS_UTF8=y
110CONFIG_CRC_CCITT=y 94CONFIG_CRC_CCITT=y
111CONFIG_CRC_T10DIF=y 95CONFIG_CRC_T10DIF=y
112CONFIG_PRINTK_TIME=y 96CONFIG_PRINTK_TIME=y
113CONFIG_MAGIC_SYSRQ=y 97CONFIG_DEBUG_INFO=y
114CONFIG_DEBUG_FS=y 98CONFIG_DEBUG_FS=y
115CONFIG_DEBUG_KERNEL=y 99CONFIG_MAGIC_SYSRQ=y
116CONFIG_DETECT_HUNG_TASK=y 100CONFIG_DETECT_HUNG_TASK=y
117# CONFIG_SCHED_DEBUG is not set 101# CONFIG_SCHED_DEBUG is not set
118# CONFIG_DEBUG_BUGVERBOSE is not set 102# CONFIG_DEBUG_BUGVERBOSE is not set
119CONFIG_DEBUG_INFO=y
120# CONFIG_RCU_CPU_STALL_DETECTOR is not set
121CONFIG_SYSCTL_SYSCALL_CHECK=y
122# CONFIG_CRYPTO_ANSI_CPRNG is not set 103# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/52xx/cm5200_defconfig b/arch/powerpc/configs/52xx/cm5200_defconfig
index 0dc99e141035..19fad0e0016e 100644
--- a/arch/powerpc/configs/52xx/cm5200_defconfig
+++ b/arch/powerpc/configs/52xx/cm5200_defconfig
@@ -1,18 +1,15 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_LOG_BUF_SHIFT=14 2CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 3CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 4CONFIG_EXPERT=y
7# CONFIG_SYSCTL_SYSCALL is not set
8# CONFIG_KALLSYMS is not set 5# CONFIG_KALLSYMS is not set
9# CONFIG_EPOLL is not set 6# CONFIG_EPOLL is not set
10# CONFIG_BLK_DEV_BSG is not set 7# CONFIG_BLK_DEV_BSG is not set
8CONFIG_PARTITION_ADVANCED=y
11# CONFIG_PPC_CHRP is not set 9# CONFIG_PPC_CHRP is not set
12CONFIG_PPC_MPC52xx=y 10CONFIG_PPC_MPC52xx=y
13CONFIG_PPC_MPC5200_SIMPLE=y 11CONFIG_PPC_MPC5200_SIMPLE=y
14# CONFIG_PPC_PMAC is not set 12# CONFIG_PPC_PMAC is not set
15CONFIG_SPARSE_IRQ=y
16CONFIG_PM=y 13CONFIG_PM=y
17# CONFIG_PCI is not set 14# CONFIG_PCI is not set
18CONFIG_NET=y 15CONFIG_NET=y
@@ -31,26 +28,20 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31# CONFIG_FW_LOADER is not set 28# CONFIG_FW_LOADER is not set
32CONFIG_MTD=y 29CONFIG_MTD=y
33CONFIG_MTD_CMDLINE_PARTS=y 30CONFIG_MTD_CMDLINE_PARTS=y
34CONFIG_MTD_CHAR=y
35CONFIG_MTD_BLOCK=y 31CONFIG_MTD_BLOCK=y
36CONFIG_MTD_CFI=y 32CONFIG_MTD_CFI=y
37CONFIG_MTD_CFI_AMDSTD=y 33CONFIG_MTD_CFI_AMDSTD=y
38CONFIG_MTD_PHYSMAP_OF=y 34CONFIG_MTD_PHYSMAP_OF=y
39CONFIG_PROC_DEVICETREE=y
40CONFIG_BLK_DEV_LOOP=y 35CONFIG_BLK_DEV_LOOP=y
41CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
42CONFIG_BLK_DEV_RAM_SIZE=32768 37CONFIG_BLK_DEV_RAM_SIZE=32768
43# CONFIG_MISC_DEVICES is not set
44CONFIG_SCSI=y 38CONFIG_SCSI=y
45CONFIG_BLK_DEV_SD=y 39CONFIG_BLK_DEV_SD=y
46CONFIG_CHR_DEV_SG=y 40CONFIG_CHR_DEV_SG=y
47# CONFIG_SCSI_LOWLEVEL is not set 41# CONFIG_SCSI_LOWLEVEL is not set
48CONFIG_NETDEVICES=y 42CONFIG_NETDEVICES=y
49CONFIG_LXT_PHY=y
50CONFIG_NET_ETHERNET=y
51CONFIG_FEC_MPC52xx=y 43CONFIG_FEC_MPC52xx=y
52# CONFIG_NETDEV_1000 is not set 44CONFIG_LXT_PHY=y
53# CONFIG_NETDEV_10000 is not set
54# CONFIG_INPUT is not set 45# CONFIG_INPUT is not set
55# CONFIG_SERIO is not set 46# CONFIG_SERIO is not set
56# CONFIG_VT is not set 47# CONFIG_VT is not set
@@ -64,7 +55,6 @@ CONFIG_I2C_MPC=y
64# CONFIG_HWMON is not set 55# CONFIG_HWMON is not set
65CONFIG_WATCHDOG=y 56CONFIG_WATCHDOG=y
66CONFIG_USB=y 57CONFIG_USB=y
67# CONFIG_USB_DEVICE_CLASS is not set
68CONFIG_USB_OHCI_HCD=y 58CONFIG_USB_OHCI_HCD=y
69CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 59CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
70CONFIG_USB_STORAGE=y 60CONFIG_USB_STORAGE=y
@@ -73,7 +63,6 @@ CONFIG_PPC_BESTCOMM=y
73CONFIG_EXT2_FS=y 63CONFIG_EXT2_FS=y
74CONFIG_EXT3_FS=y 64CONFIG_EXT3_FS=y
75# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 65# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
76CONFIG_INOTIFY=y
77CONFIG_MSDOS_FS=y 66CONFIG_MSDOS_FS=y
78CONFIG_VFAT_FS=y 67CONFIG_VFAT_FS=y
79CONFIG_PROC_KCORE=y 68CONFIG_PROC_KCORE=y
@@ -81,17 +70,13 @@ CONFIG_TMPFS=y
81CONFIG_JFFS2_FS=y 70CONFIG_JFFS2_FS=y
82CONFIG_CRAMFS=y 71CONFIG_CRAMFS=y
83CONFIG_NFS_FS=y 72CONFIG_NFS_FS=y
84CONFIG_NFS_V3=y
85CONFIG_NFS_V4=y 73CONFIG_NFS_V4=y
86CONFIG_ROOT_NFS=y 74CONFIG_ROOT_NFS=y
87CONFIG_PARTITION_ADVANCED=y
88CONFIG_NLS_CODEPAGE_437=y 75CONFIG_NLS_CODEPAGE_437=y
89CONFIG_NLS_ISO8859_1=y 76CONFIG_NLS_ISO8859_1=y
90CONFIG_PRINTK_TIME=y 77CONFIG_PRINTK_TIME=y
91CONFIG_DEBUG_KERNEL=y
92CONFIG_DETECT_HUNG_TASK=y 78CONFIG_DETECT_HUNG_TASK=y
93# CONFIG_DEBUG_BUGVERBOSE is not set 79# CONFIG_DEBUG_BUGVERBOSE is not set
94# CONFIG_RCU_CPU_STALL_DETECTOR is not set
95CONFIG_CRYPTO_ECB=y 80CONFIG_CRYPTO_ECB=y
96CONFIG_CRYPTO_PCBC=y 81CONFIG_CRYPTO_PCBC=y
97# CONFIG_CRYPTO_ANSI_CPRNG is not set 82# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/52xx/lite5200b_defconfig b/arch/powerpc/configs/52xx/lite5200b_defconfig
index 104a332e79ab..5f40ba92a39a 100644
--- a/arch/powerpc/configs/52xx/lite5200b_defconfig
+++ b/arch/powerpc/configs/52xx/lite5200b_defconfig
@@ -1,10 +1,9 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7# CONFIG_SYSCTL_SYSCALL is not set
8# CONFIG_KALLSYMS is not set 7# CONFIG_KALLSYMS is not set
9# CONFIG_EPOLL is not set 8# CONFIG_EPOLL is not set
10CONFIG_MODULES=y 9CONFIG_MODULES=y
@@ -15,10 +14,6 @@ CONFIG_PPC_MPC52xx=y
15CONFIG_PPC_MPC5200_SIMPLE=y 14CONFIG_PPC_MPC5200_SIMPLE=y
16CONFIG_PPC_LITE5200=y 15CONFIG_PPC_LITE5200=y
17# CONFIG_PPC_PMAC is not set 16# CONFIG_PPC_PMAC is not set
18CONFIG_NO_HZ=y
19CONFIG_HIGH_RES_TIMERS=y
20CONFIG_SPARSE_IRQ=y
21CONFIG_PM=y
22CONFIG_NET=y 17CONFIG_NET=y
23CONFIG_PACKET=y 18CONFIG_PACKET=y
24CONFIG_UNIX=y 19CONFIG_UNIX=y
@@ -33,7 +28,6 @@ CONFIG_SYN_COOKIES=y
33# CONFIG_IPV6 is not set 28# CONFIG_IPV6 is not set
34CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
35# CONFIG_FW_LOADER is not set 30# CONFIG_FW_LOADER is not set
36CONFIG_PROC_DEVICETREE=y
37CONFIG_BLK_DEV_LOOP=y 31CONFIG_BLK_DEV_LOOP=y
38CONFIG_BLK_DEV_RAM=y 32CONFIG_BLK_DEV_RAM=y
39CONFIG_BLK_DEV_RAM_SIZE=32768 33CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -42,9 +36,8 @@ CONFIG_BLK_DEV_SD=y
42CONFIG_ATA=y 36CONFIG_ATA=y
43CONFIG_PATA_MPC52xx=y 37CONFIG_PATA_MPC52xx=y
44CONFIG_NETDEVICES=y 38CONFIG_NETDEVICES=y
45CONFIG_LXT_PHY=y
46CONFIG_NET_ETHERNET=y
47CONFIG_FEC_MPC52xx=y 39CONFIG_FEC_MPC52xx=y
40CONFIG_LXT_PHY=y
48# CONFIG_INPUT is not set 41# CONFIG_INPUT is not set
49# CONFIG_SERIO is not set 42# CONFIG_SERIO is not set
50# CONFIG_VT is not set 43# CONFIG_VT is not set
@@ -57,23 +50,18 @@ CONFIG_I2C=y
57CONFIG_I2C_CHARDEV=y 50CONFIG_I2C_CHARDEV=y
58CONFIG_I2C_MPC=y 51CONFIG_I2C_MPC=y
59# CONFIG_HWMON is not set 52# CONFIG_HWMON is not set
60CONFIG_VIDEO_OUTPUT_CONTROL=m
61CONFIG_DMADEVICES=y 53CONFIG_DMADEVICES=y
62CONFIG_PPC_BESTCOMM=y 54CONFIG_PPC_BESTCOMM=y
63CONFIG_EXT2_FS=y 55CONFIG_EXT2_FS=y
64CONFIG_EXT3_FS=y 56CONFIG_EXT3_FS=y
65# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 57# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
66CONFIG_INOTIFY=y
67CONFIG_PROC_KCORE=y 58CONFIG_PROC_KCORE=y
68CONFIG_TMPFS=y 59CONFIG_TMPFS=y
69CONFIG_NFS_FS=y 60CONFIG_NFS_FS=y
70CONFIG_NFS_V3=y
71CONFIG_NFS_V4=y 61CONFIG_NFS_V4=y
72CONFIG_ROOT_NFS=y 62CONFIG_ROOT_NFS=y
73CONFIG_PRINTK_TIME=y 63CONFIG_PRINTK_TIME=y
74CONFIG_DEBUG_KERNEL=y 64CONFIG_DEBUG_INFO=y
75CONFIG_DETECT_HUNG_TASK=y 65CONFIG_DETECT_HUNG_TASK=y
76# CONFIG_DEBUG_BUGVERBOSE is not set 66# CONFIG_DEBUG_BUGVERBOSE is not set
77CONFIG_DEBUG_INFO=y
78# CONFIG_RCU_CPU_STALL_DETECTOR is not set
79# CONFIG_CRYPTO_ANSI_CPRNG is not set 67# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/52xx/motionpro_defconfig b/arch/powerpc/configs/52xx/motionpro_defconfig
index c936fab9ec4a..909e185a88d1 100644
--- a/arch/powerpc/configs/52xx/motionpro_defconfig
+++ b/arch/powerpc/configs/52xx/motionpro_defconfig
@@ -1,18 +1,15 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_LOG_BUF_SHIFT=14 2CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 3CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 4CONFIG_EXPERT=y
7# CONFIG_SYSCTL_SYSCALL is not set
8# CONFIG_KALLSYMS is not set 5# CONFIG_KALLSYMS is not set
9# CONFIG_EPOLL is not set 6# CONFIG_EPOLL is not set
10# CONFIG_BLK_DEV_BSG is not set 7# CONFIG_BLK_DEV_BSG is not set
8CONFIG_PARTITION_ADVANCED=y
11# CONFIG_PPC_CHRP is not set 9# CONFIG_PPC_CHRP is not set
12CONFIG_PPC_MPC52xx=y 10CONFIG_PPC_MPC52xx=y
13CONFIG_PPC_MPC5200_SIMPLE=y 11CONFIG_PPC_MPC5200_SIMPLE=y
14# CONFIG_PPC_PMAC is not set 12# CONFIG_PPC_PMAC is not set
15CONFIG_SPARSE_IRQ=y
16CONFIG_PM=y 13CONFIG_PM=y
17# CONFIG_PCI is not set 14# CONFIG_PCI is not set
18CONFIG_NET=y 15CONFIG_NET=y
@@ -30,24 +27,21 @@ CONFIG_SYN_COOKIES=y
30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 27CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31# CONFIG_FW_LOADER is not set 28# CONFIG_FW_LOADER is not set
32CONFIG_MTD=y 29CONFIG_MTD=y
33CONFIG_MTD_CONCAT=y
34CONFIG_MTD_CMDLINE_PARTS=y 30CONFIG_MTD_CMDLINE_PARTS=y
35CONFIG_MTD_CHAR=y
36CONFIG_MTD_BLOCK=y 31CONFIG_MTD_BLOCK=y
37CONFIG_MTD_CFI=y 32CONFIG_MTD_CFI=y
38CONFIG_MTD_CFI_AMDSTD=y 33CONFIG_MTD_CFI_AMDSTD=y
39CONFIG_MTD_ROM=y 34CONFIG_MTD_ROM=y
40CONFIG_PROC_DEVICETREE=y
41CONFIG_BLK_DEV_LOOP=y 35CONFIG_BLK_DEV_LOOP=y
42CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
43CONFIG_BLK_DEV_RAM_SIZE=32768 37CONFIG_BLK_DEV_RAM_SIZE=32768
44CONFIG_MISC_DEVICES=y
45CONFIG_EEPROM_LEGACY=y 38CONFIG_EEPROM_LEGACY=y
46CONFIG_BLK_DEV_SD=y 39CONFIG_BLK_DEV_SD=y
47CONFIG_CHR_DEV_SG=y 40CONFIG_CHR_DEV_SG=y
48CONFIG_ATA=y 41CONFIG_ATA=y
49CONFIG_PATA_MPC52xx=y 42CONFIG_PATA_MPC52xx=y
50CONFIG_NETDEVICES=y 43CONFIG_NETDEVICES=y
44CONFIG_FEC_MPC52xx=y
51CONFIG_MARVELL_PHY=y 45CONFIG_MARVELL_PHY=y
52CONFIG_DAVICOM_PHY=y 46CONFIG_DAVICOM_PHY=y
53CONFIG_QSEMI_PHY=y 47CONFIG_QSEMI_PHY=y
@@ -58,11 +52,6 @@ CONFIG_SMSC_PHY=y
58CONFIG_BROADCOM_PHY=y 52CONFIG_BROADCOM_PHY=y
59CONFIG_ICPLUS_PHY=y 53CONFIG_ICPLUS_PHY=y
60CONFIG_MDIO_BITBANG=y 54CONFIG_MDIO_BITBANG=y
61CONFIG_NET_ETHERNET=y
62CONFIG_MII=y
63CONFIG_FEC_MPC52xx=y
64# CONFIG_NETDEV_1000 is not set
65# CONFIG_NETDEV_10000 is not set
66# CONFIG_INPUT is not set 55# CONFIG_INPUT is not set
67# CONFIG_SERIO is not set 56# CONFIG_SERIO is not set
68# CONFIG_VT is not set 57# CONFIG_VT is not set
@@ -86,7 +75,6 @@ CONFIG_PPC_BESTCOMM=y
86CONFIG_EXT2_FS=y 75CONFIG_EXT2_FS=y
87CONFIG_EXT3_FS=y 76CONFIG_EXT3_FS=y
88# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 77# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
89CONFIG_INOTIFY=y
90CONFIG_MSDOS_FS=y 78CONFIG_MSDOS_FS=y
91CONFIG_VFAT_FS=y 79CONFIG_VFAT_FS=y
92CONFIG_PROC_KCORE=y 80CONFIG_PROC_KCORE=y
@@ -94,18 +82,14 @@ CONFIG_TMPFS=y
94CONFIG_JFFS2_FS=y 82CONFIG_JFFS2_FS=y
95CONFIG_CRAMFS=y 83CONFIG_CRAMFS=y
96CONFIG_NFS_FS=y 84CONFIG_NFS_FS=y
97CONFIG_NFS_V3=y
98CONFIG_NFS_V4=y 85CONFIG_NFS_V4=y
99CONFIG_ROOT_NFS=y 86CONFIG_ROOT_NFS=y
100CONFIG_PARTITION_ADVANCED=y
101CONFIG_NLS_CODEPAGE_437=y 87CONFIG_NLS_CODEPAGE_437=y
102CONFIG_NLS_ISO8859_1=y 88CONFIG_NLS_ISO8859_1=y
103CONFIG_PRINTK_TIME=y 89CONFIG_PRINTK_TIME=y
104CONFIG_DEBUG_KERNEL=y 90CONFIG_DEBUG_INFO=y
105CONFIG_DETECT_HUNG_TASK=y 91CONFIG_DETECT_HUNG_TASK=y
106# CONFIG_DEBUG_BUGVERBOSE is not set 92# CONFIG_DEBUG_BUGVERBOSE is not set
107CONFIG_DEBUG_INFO=y
108# CONFIG_RCU_CPU_STALL_DETECTOR is not set
109CONFIG_CRYPTO_ECB=y 93CONFIG_CRYPTO_ECB=y
110CONFIG_CRYPTO_PCBC=y 94CONFIG_CRYPTO_PCBC=y
111# CONFIG_CRYPTO_ANSI_CPRNG is not set 95# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/52xx/pcm030_defconfig b/arch/powerpc/configs/52xx/pcm030_defconfig
index 1d03c35540c7..649a01a0044d 100644
--- a/arch/powerpc/configs/52xx/pcm030_defconfig
+++ b/arch/powerpc/configs/52xx/pcm030_defconfig
@@ -1,15 +1,14 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_LOCALVERSION="trunk" 1CONFIG_LOCALVERSION="trunk"
3# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
4# CONFIG_SWAP is not set 3# CONFIG_SWAP is not set
5CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
6CONFIG_POSIX_MQUEUE=y 5CONFIG_POSIX_MQUEUE=y
6CONFIG_NO_HZ=y
7CONFIG_HIGH_RES_TIMERS=y
7CONFIG_IKCONFIG=y 8CONFIG_IKCONFIG=y
8CONFIG_IKCONFIG_PROC=y 9CONFIG_IKCONFIG_PROC=y
9CONFIG_LOG_BUF_SHIFT=14 10CONFIG_LOG_BUF_SHIFT=14
10# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
11CONFIG_EXPERT=y 11CONFIG_EXPERT=y
12# CONFIG_SYSCTL_SYSCALL is not set
13# CONFIG_VM_EVENT_COUNTERS is not set 12# CONFIG_VM_EVENT_COUNTERS is not set
14CONFIG_SLAB=y 13CONFIG_SLAB=y
15CONFIG_MODULES=y 14CONFIG_MODULES=y
@@ -21,11 +20,8 @@ CONFIG_MODULE_UNLOAD=y
21CONFIG_PPC_MPC52xx=y 20CONFIG_PPC_MPC52xx=y
22CONFIG_PPC_MPC5200_SIMPLE=y 21CONFIG_PPC_MPC5200_SIMPLE=y
23# CONFIG_PPC_PMAC is not set 22# CONFIG_PPC_PMAC is not set
24CONFIG_NO_HZ=y
25CONFIG_HIGH_RES_TIMERS=y
26CONFIG_HZ_100=y 23CONFIG_HZ_100=y
27CONFIG_PREEMPT=y 24CONFIG_PREEMPT=y
28CONFIG_SPARSE_IRQ=y
29# CONFIG_SECCOMP is not set 25# CONFIG_SECCOMP is not set
30CONFIG_NET=y 26CONFIG_NET=y
31CONFIG_PACKET=y 27CONFIG_PACKET=y
@@ -45,40 +41,31 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
45# CONFIG_FW_LOADER is not set 41# CONFIG_FW_LOADER is not set
46CONFIG_MTD=y 42CONFIG_MTD=y
47CONFIG_MTD_CMDLINE_PARTS=y 43CONFIG_MTD_CMDLINE_PARTS=y
48CONFIG_MTD_CHAR=y
49CONFIG_MTD_BLOCK=y 44CONFIG_MTD_BLOCK=y
50CONFIG_MTD_CFI=y 45CONFIG_MTD_CFI=y
51CONFIG_MTD_CFI_INTELEXT=y 46CONFIG_MTD_CFI_INTELEXT=y
52CONFIG_MTD_PHYSMAP=y 47CONFIG_MTD_PHYSMAP=y
53CONFIG_PROC_DEVICETREE=y
54# CONFIG_BLK_DEV is not set 48# CONFIG_BLK_DEV is not set
55# CONFIG_MISC_DEVICES is not set
56# CONFIG_SCSI_PROC_FS is not set 49# CONFIG_SCSI_PROC_FS is not set
57CONFIG_BLK_DEV_SD=m 50CONFIG_BLK_DEV_SD=m
58# CONFIG_SCSI_LOWLEVEL is not set 51# CONFIG_SCSI_LOWLEVEL is not set
59CONFIG_ATA=m 52CONFIG_ATA=m
60CONFIG_PATA_MPC52xx=m 53CONFIG_PATA_MPC52xx=m
61CONFIG_NETDEVICES=y 54CONFIG_NETDEVICES=y
62CONFIG_NET_ETHERNET=y
63CONFIG_MII=y
64CONFIG_FEC_MPC52xx=y 55CONFIG_FEC_MPC52xx=y
65# CONFIG_NETDEV_1000 is not set
66# CONFIG_NETDEV_10000 is not set
67# CONFIG_INPUT is not set 56# CONFIG_INPUT is not set
68# CONFIG_SERIO is not set 57# CONFIG_SERIO is not set
69# CONFIG_VT is not set 58# CONFIG_VT is not set
59# CONFIG_LEGACY_PTYS is not set
70CONFIG_SERIAL_MPC52xx=y 60CONFIG_SERIAL_MPC52xx=y
71CONFIG_SERIAL_MPC52xx_CONSOLE=y 61CONFIG_SERIAL_MPC52xx_CONSOLE=y
72# CONFIG_LEGACY_PTYS is not set
73CONFIG_HW_RANDOM=y 62CONFIG_HW_RANDOM=y
74CONFIG_I2C=y 63CONFIG_I2C=y
75CONFIG_I2C_CHARDEV=y 64CONFIG_I2C_CHARDEV=y
76CONFIG_I2C_MPC=y 65CONFIG_I2C_MPC=y
77# CONFIG_HWMON is not set 66# CONFIG_HWMON is not set
78CONFIG_USB=y 67CONFIG_USB=y
79# CONFIG_USB_DEVICE_CLASS is not set
80CONFIG_USB_OHCI_HCD=m 68CONFIG_USB_OHCI_HCD=m
81# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
82CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 69CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
83# CONFIG_USB_OHCI_HCD_PCI is not set 70# CONFIG_USB_OHCI_HCD_PCI is not set
84CONFIG_USB_STORAGE=m 71CONFIG_USB_STORAGE=m
@@ -95,8 +82,6 @@ CONFIG_FAT_DEFAULT_CODEPAGE=850
95CONFIG_TMPFS=y 82CONFIG_TMPFS=y
96CONFIG_JFFS2_FS=y 83CONFIG_JFFS2_FS=y
97CONFIG_NFS_FS=y 84CONFIG_NFS_FS=y
98CONFIG_NFS_V3=y
99CONFIG_ROOT_NFS=y 85CONFIG_ROOT_NFS=y
100CONFIG_NLS_CODEPAGE_850=y 86CONFIG_NLS_CODEPAGE_850=y
101CONFIG_NLS_ISO8859_1=y 87CONFIG_NLS_ISO8859_1=y
102# CONFIG_RCU_CPU_STALL_DETECTOR is not set
diff --git a/arch/powerpc/configs/52xx/tqm5200_defconfig b/arch/powerpc/configs/52xx/tqm5200_defconfig
index ca83ec88b114..efab8388ea92 100644
--- a/arch/powerpc/configs/52xx/tqm5200_defconfig
+++ b/arch/powerpc/configs/52xx/tqm5200_defconfig
@@ -1,17 +1,14 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_SPARSE_IRQ=y
4CONFIG_LOG_BUF_SHIFT=14 2CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 3CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EMBEDDED=y
8# CONFIG_SYSCTL_SYSCALL is not set
9# CONFIG_KALLSYMS is not set 4# CONFIG_KALLSYMS is not set
10# CONFIG_EPOLL is not set 5# CONFIG_EPOLL is not set
6CONFIG_EMBEDDED=y
11CONFIG_MODULES=y 7CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 8CONFIG_MODULE_UNLOAD=y
13CONFIG_MODVERSIONS=y 9CONFIG_MODVERSIONS=y
14# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
15# CONFIG_PPC_CHRP is not set 12# CONFIG_PPC_CHRP is not set
16CONFIG_PPC_MPC52xx=y 13CONFIG_PPC_MPC52xx=y
17CONFIG_PPC_MPC5200_SIMPLE=y 14CONFIG_PPC_MPC5200_SIMPLE=y
@@ -34,17 +31,13 @@ CONFIG_SYN_COOKIES=y
34CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
35# CONFIG_FW_LOADER is not set 32# CONFIG_FW_LOADER is not set
36CONFIG_MTD=y 33CONFIG_MTD=y
37CONFIG_MTD_CONCAT=y
38CONFIG_MTD_CMDLINE_PARTS=y 34CONFIG_MTD_CMDLINE_PARTS=y
39CONFIG_MTD_OF_PARTS=y
40CONFIG_MTD_CHAR=y
41CONFIG_MTD_BLOCK=y 35CONFIG_MTD_BLOCK=y
42CONFIG_MTD_CFI=y 36CONFIG_MTD_CFI=y
43CONFIG_MTD_CFI_AMDSTD=y 37CONFIG_MTD_CFI_AMDSTD=y
44CONFIG_MTD_ROM=y 38CONFIG_MTD_ROM=y
45CONFIG_MTD_PHYSMAP_OF=y 39CONFIG_MTD_PHYSMAP_OF=y
46CONFIG_MTD_PLATRAM=y 40CONFIG_MTD_PLATRAM=y
47CONFIG_PROC_DEVICETREE=y
48CONFIG_BLK_DEV_LOOP=y 41CONFIG_BLK_DEV_LOOP=y
49CONFIG_BLK_DEV_RAM=y 42CONFIG_BLK_DEV_RAM=y
50CONFIG_BLK_DEV_RAM_SIZE=32768 43CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -54,12 +47,9 @@ CONFIG_ATA=y
54CONFIG_PATA_MPC52xx=y 47CONFIG_PATA_MPC52xx=y
55CONFIG_PATA_PLATFORM=y 48CONFIG_PATA_PLATFORM=y
56CONFIG_NETDEVICES=y 49CONFIG_NETDEVICES=y
50CONFIG_FEC_MPC52xx=y
57CONFIG_LXT_PHY=y 51CONFIG_LXT_PHY=y
58CONFIG_FIXED_PHY=y 52CONFIG_FIXED_PHY=y
59CONFIG_NET_ETHERNET=y
60CONFIG_FEC_MPC52xx=y
61# CONFIG_NETDEV_1000 is not set
62# CONFIG_NETDEV_10000 is not set
63CONFIG_SERIAL_MPC52xx=y 53CONFIG_SERIAL_MPC52xx=y
64CONFIG_SERIAL_MPC52xx_CONSOLE=y 54CONFIG_SERIAL_MPC52xx_CONSOLE=y
65CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 55CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
@@ -75,7 +65,6 @@ CONFIG_FB_FOREIGN_ENDIAN=y
75CONFIG_FB_SM501=y 65CONFIG_FB_SM501=y
76CONFIG_FRAMEBUFFER_CONSOLE=y 66CONFIG_FRAMEBUFFER_CONSOLE=y
77CONFIG_USB=y 67CONFIG_USB=y
78# CONFIG_USB_DEVICE_CLASS is not set
79CONFIG_USB_MON=y 68CONFIG_USB_MON=y
80CONFIG_USB_OHCI_HCD=y 69CONFIG_USB_OHCI_HCD=y
81CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 70CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
@@ -95,17 +84,14 @@ CONFIG_TMPFS=y
95CONFIG_JFFS2_FS=y 84CONFIG_JFFS2_FS=y
96CONFIG_CRAMFS=y 85CONFIG_CRAMFS=y
97CONFIG_NFS_FS=y 86CONFIG_NFS_FS=y
98CONFIG_NFS_V3=y
99CONFIG_NFS_V4=y 87CONFIG_NFS_V4=y
100CONFIG_ROOT_NFS=y 88CONFIG_ROOT_NFS=y
101CONFIG_PARTITION_ADVANCED=y
102CONFIG_NLS_CODEPAGE_437=y 89CONFIG_NLS_CODEPAGE_437=y
103CONFIG_NLS_ISO8859_1=y 90CONFIG_NLS_ISO8859_1=y
104CONFIG_PRINTK_TIME=y 91CONFIG_PRINTK_TIME=y
105CONFIG_DEBUG_KERNEL=y 92CONFIG_DEBUG_INFO=y
106CONFIG_DETECT_HUNG_TASK=y 93CONFIG_DETECT_HUNG_TASK=y
107# CONFIG_DEBUG_BUGVERBOSE is not set 94# CONFIG_DEBUG_BUGVERBOSE is not set
108CONFIG_DEBUG_INFO=y
109CONFIG_CRYPTO_ECB=y 95CONFIG_CRYPTO_ECB=y
110CONFIG_CRYPTO_PCBC=y 96CONFIG_CRYPTO_PCBC=y
111# CONFIG_CRYPTO_ANSI_CPRNG is not set 97# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig
index 985f95c7280a..bcdfb07921fc 100644
--- a/arch/powerpc/configs/83xx/asp8347_defconfig
+++ b/arch/powerpc/configs/83xx/asp8347_defconfig
@@ -1,21 +1,20 @@
1CONFIG_FSL_EMB_PERFMON=y 1CONFIG_FSL_EMB_PERFMON=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y
4CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 7CONFIG_EXPERT=y
8# CONFIG_KALLSYMS is not set 8# CONFIG_KALLSYMS is not set
9CONFIG_MODULES=y 9CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 10CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set 11# CONFIG_BLK_DEV_BSG is not set
12CONFIG_PARTITION_ADVANCED=y
13# CONFIG_MSDOS_PARTITION is not set
12# CONFIG_PPC_CHRP is not set 14# CONFIG_PPC_CHRP is not set
13# CONFIG_PPC_PMAC is not set 15# CONFIG_PPC_PMAC is not set
14CONFIG_PPC_83xx=y 16CONFIG_PPC_83xx=y
15CONFIG_ASP834x=y 17CONFIG_ASP834x=y
16CONFIG_NO_HZ=y
17CONFIG_HIGH_RES_TIMERS=y
18CONFIG_SPARSE_IRQ=y
19CONFIG_PCI=y 18CONFIG_PCI=y
20CONFIG_NET=y 19CONFIG_NET=y
21CONFIG_PACKET=y 20CONFIG_PACKET=y
@@ -34,22 +33,16 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
34CONFIG_MTD=y 33CONFIG_MTD=y
35CONFIG_MTD_REDBOOT_PARTS=y 34CONFIG_MTD_REDBOOT_PARTS=y
36CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y 35CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
37CONFIG_MTD_OF_PARTS=y
38CONFIG_MTD_CHAR=y
39CONFIG_MTD_BLOCK=y 36CONFIG_MTD_BLOCK=y
40CONFIG_MTD_CFI=y 37CONFIG_MTD_CFI=y
41CONFIG_MTD_CFI_INTELEXT=y 38CONFIG_MTD_CFI_INTELEXT=y
42CONFIG_MTD_CFI_AMDSTD=y 39CONFIG_MTD_CFI_AMDSTD=y
43CONFIG_MTD_PHYSMAP_OF=y 40CONFIG_MTD_PHYSMAP_OF=y
44CONFIG_PROC_DEVICETREE=y
45CONFIG_BLK_DEV_LOOP=y 41CONFIG_BLK_DEV_LOOP=y
46CONFIG_BLK_DEV_RAM=y 42CONFIG_BLK_DEV_RAM=y
47CONFIG_BLK_DEV_RAM_SIZE=32768 43CONFIG_BLK_DEV_RAM_SIZE=32768
48CONFIG_NETDEVICES=y 44CONFIG_NETDEVICES=y
49CONFIG_NET_ETHERNET=y
50CONFIG_MII=y
51CONFIG_GIANFAR=y 45CONFIG_GIANFAR=y
52# CONFIG_NETDEV_10000 is not set
53# CONFIG_INPUT_MOUSEDEV is not set 46# CONFIG_INPUT_MOUSEDEV is not set
54# CONFIG_INPUT_KEYBOARD is not set 47# CONFIG_INPUT_KEYBOARD is not set
55# CONFIG_INPUT_MOUSE is not set 48# CONFIG_INPUT_MOUSE is not set
@@ -63,8 +56,6 @@ CONFIG_I2C_CHARDEV=y
63CONFIG_I2C_MPC=y 56CONFIG_I2C_MPC=y
64CONFIG_THERMAL=y 57CONFIG_THERMAL=y
65CONFIG_WATCHDOG=y 58CONFIG_WATCHDOG=y
66CONFIG_VIDEO_OUTPUT_CONTROL=m
67# CONFIG_HID_SUPPORT is not set
68CONFIG_USB=y 59CONFIG_USB=y
69CONFIG_USB_MON=y 60CONFIG_USB_MON=y
70CONFIG_USB_EHCI_HCD=y 61CONFIG_USB_EHCI_HCD=y
@@ -74,17 +65,12 @@ CONFIG_RTC_DRV_DS1374=y
74CONFIG_EXT2_FS=y 65CONFIG_EXT2_FS=y
75CONFIG_EXT3_FS=y 66CONFIG_EXT3_FS=y
76# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 67# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
77CONFIG_INOTIFY=y
78CONFIG_PROC_KCORE=y 68CONFIG_PROC_KCORE=y
79CONFIG_TMPFS=y 69CONFIG_TMPFS=y
80CONFIG_JFFS2_FS=y 70CONFIG_JFFS2_FS=y
81CONFIG_NFS_FS=y 71CONFIG_NFS_FS=y
82CONFIG_NFS_V3=y
83CONFIG_NFS_V4=y 72CONFIG_NFS_V4=y
84CONFIG_ROOT_NFS=y 73CONFIG_ROOT_NFS=y
85CONFIG_PARTITION_ADVANCED=y
86# CONFIG_MSDOS_PARTITION is not set
87# CONFIG_RCU_CPU_STALL_DETECTOR is not set
88CONFIG_CRYPTO_ECB=m 74CONFIG_CRYPTO_ECB=m
89CONFIG_CRYPTO_PCBC=m 75CONFIG_CRYPTO_PCBC=m
90# CONFIG_CRYPTO_ANSI_CPRNG is not set 76# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/kmeter1_defconfig b/arch/powerpc/configs/83xx/kmeter1_defconfig
index e12e60c3b9a2..11a959283149 100644
--- a/arch/powerpc/configs/83xx/kmeter1_defconfig
+++ b/arch/powerpc/configs/83xx/kmeter1_defconfig
@@ -1,4 +1,3 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_SWAP is not set 1# CONFIG_SWAP is not set
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
@@ -36,7 +35,6 @@ CONFIG_BRIDGE=m
36CONFIG_VLAN_8021Q=y 35CONFIG_VLAN_8021Q=y
37CONFIG_MTD=y 36CONFIG_MTD=y
38CONFIG_MTD_CMDLINE_PARTS=y 37CONFIG_MTD_CMDLINE_PARTS=y
39CONFIG_MTD_CHAR=y
40CONFIG_MTD_BLOCK=y 38CONFIG_MTD_BLOCK=y
41CONFIG_MTD_CFI=y 39CONFIG_MTD_CFI=y
42CONFIG_MTD_CFI_INTELEXT=y 40CONFIG_MTD_CFI_INTELEXT=y
@@ -45,10 +43,8 @@ CONFIG_MTD_PHYSMAP_OF=y
45CONFIG_MTD_PHRAM=y 43CONFIG_MTD_PHRAM=y
46CONFIG_MTD_UBI=y 44CONFIG_MTD_UBI=y
47CONFIG_MTD_UBI_GLUEBI=y 45CONFIG_MTD_UBI_GLUEBI=y
48CONFIG_PROC_DEVICETREE=y
49CONFIG_NETDEVICES=y 46CONFIG_NETDEVICES=y
50CONFIG_DUMMY=y 47CONFIG_DUMMY=y
51CONFIG_MII=y
52CONFIG_TUN=y 48CONFIG_TUN=y
53CONFIG_UCC_GETH=y 49CONFIG_UCC_GETH=y
54CONFIG_MARVELL_PHY=y 50CONFIG_MARVELL_PHY=y
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
index 4b4a2a9133a5..b47a41f77836 100644
--- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
@@ -1,20 +1,18 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 7# CONFIG_KALLSYMS is not set
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
11# CONFIG_PPC_CHRP is not set 12# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 13# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 14CONFIG_PPC_83xx=y
14CONFIG_MPC831x_RDB=y 15CONFIG_MPC831x_RDB=y
15CONFIG_NO_HZ=y
16CONFIG_HIGH_RES_TIMERS=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_PCI=y 16CONFIG_PCI=y
19CONFIG_NET=y 17CONFIG_NET=y
20CONFIG_PACKET=y 18CONFIG_PACKET=y
@@ -30,15 +28,12 @@ CONFIG_SYN_COOKIES=y
30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31# CONFIG_FW_LOADER is not set 29# CONFIG_FW_LOADER is not set
32CONFIG_MTD=y 30CONFIG_MTD=y
33CONFIG_MTD_OF_PARTS=y
34CONFIG_MTD_CHAR=y
35CONFIG_MTD_BLOCK=y 31CONFIG_MTD_BLOCK=y
36CONFIG_MTD_CFI=y 32CONFIG_MTD_CFI=y
37CONFIG_MTD_CFI_AMDSTD=y 33CONFIG_MTD_CFI_AMDSTD=y
38CONFIG_MTD_PHYSMAP_OF=y 34CONFIG_MTD_PHYSMAP_OF=y
39CONFIG_MTD_NAND=y 35CONFIG_MTD_NAND=y
40CONFIG_MTD_NAND_FSL_ELBC=y 36CONFIG_MTD_NAND_FSL_ELBC=y
41CONFIG_PROC_DEVICETREE=y
42CONFIG_BLK_DEV_LOOP=y 37CONFIG_BLK_DEV_LOOP=y
43CONFIG_BLK_DEV_RAM=y 38CONFIG_BLK_DEV_RAM=y
44CONFIG_BLK_DEV_RAM_SIZE=32768 39CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -51,12 +46,10 @@ CONFIG_MD_LINEAR=y
51CONFIG_MD_RAID0=y 46CONFIG_MD_RAID0=y
52CONFIG_MD_RAID1=y 47CONFIG_MD_RAID1=y
53CONFIG_NETDEVICES=y 48CONFIG_NETDEVICES=y
49CONFIG_GIANFAR=y
50CONFIG_E100=y
54CONFIG_CICADA_PHY=y 51CONFIG_CICADA_PHY=y
55CONFIG_FIXED_PHY=y 52CONFIG_FIXED_PHY=y
56CONFIG_NET_ETHERNET=y
57CONFIG_NET_PCI=y
58CONFIG_E100=y
59CONFIG_GIANFAR=y
60# CONFIG_INPUT_MOUSEDEV is not set 53# CONFIG_INPUT_MOUSEDEV is not set
61# CONFIG_INPUT_KEYBOARD is not set 54# CONFIG_INPUT_KEYBOARD is not set
62# CONFIG_INPUT_MOUSE is not set 55# CONFIG_INPUT_MOUSE is not set
@@ -71,7 +64,6 @@ CONFIG_I2C_MPC=y
71CONFIG_SPI=y 64CONFIG_SPI=y
72CONFIG_SPI_BITBANG=y 65CONFIG_SPI_BITBANG=y
73CONFIG_WATCHDOG=y 66CONFIG_WATCHDOG=y
74CONFIG_VIDEO_OUTPUT_CONTROL=m
75# CONFIG_USB_HID is not set 67# CONFIG_USB_HID is not set
76CONFIG_USB=y 68CONFIG_USB=y
77CONFIG_USB_MON=y 69CONFIG_USB_MON=y
@@ -82,7 +74,6 @@ CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
82CONFIG_USB_UHCI_HCD=y 74CONFIG_USB_UHCI_HCD=y
83CONFIG_USB_STORAGE=y 75CONFIG_USB_STORAGE=y
84CONFIG_USB_GADGET=y 76CONFIG_USB_GADGET=y
85CONFIG_USB_GADGET_NET2280=y
86CONFIG_USB_ETH=m 77CONFIG_USB_ETH=m
87CONFIG_RTC_CLASS=y 78CONFIG_RTC_CLASS=y
88CONFIG_RTC_INTF_DEV_UIE_EMUL=y 79CONFIG_RTC_INTF_DEV_UIE_EMUL=y
@@ -90,18 +81,12 @@ CONFIG_RTC_DRV_DS1307=y
90CONFIG_EXT2_FS=y 81CONFIG_EXT2_FS=y
91CONFIG_EXT3_FS=y 82CONFIG_EXT3_FS=y
92# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 83# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
93CONFIG_INOTIFY=y
94CONFIG_PROC_KCORE=y 84CONFIG_PROC_KCORE=y
95CONFIG_TMPFS=y 85CONFIG_TMPFS=y
96CONFIG_JFFS2_FS=y 86CONFIG_JFFS2_FS=y
97CONFIG_NFS_FS=y 87CONFIG_NFS_FS=y
98CONFIG_NFS_V3=y
99CONFIG_NFS_V4=y 88CONFIG_NFS_V4=y
100CONFIG_ROOT_NFS=y 89CONFIG_ROOT_NFS=y
101CONFIG_PARTITION_ADVANCED=y
102CONFIG_DEBUG_KERNEL=y
103CONFIG_DETECT_HUNG_TASK=y 90CONFIG_DETECT_HUNG_TASK=y
104# CONFIG_RCU_CPU_STALL_DETECTOR is not set
105CONFIG_SYSCTL_SYSCALL_CHECK=y
106CONFIG_CRYPTO_PCBC=m 91CONFIG_CRYPTO_PCBC=m
107# CONFIG_CRYPTO_ANSI_CPRNG is not set 92# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
index 5871395573c5..e28c83f320c1 100644
--- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
@@ -1,20 +1,18 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 7# CONFIG_KALLSYMS is not set
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
11# CONFIG_PPC_CHRP is not set 12# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 13# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 14CONFIG_PPC_83xx=y
14CONFIG_MPC831x_RDB=y 15CONFIG_MPC831x_RDB=y
15CONFIG_NO_HZ=y
16CONFIG_HIGH_RES_TIMERS=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_PCI=y 16CONFIG_PCI=y
19CONFIG_NET=y 17CONFIG_NET=y
20CONFIG_PACKET=y 18CONFIG_PACKET=y
@@ -30,13 +28,11 @@ CONFIG_SYN_COOKIES=y
30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31# CONFIG_FW_LOADER is not set 29# CONFIG_FW_LOADER is not set
32CONFIG_MTD=y 30CONFIG_MTD=y
33CONFIG_MTD_CHAR=y
34CONFIG_MTD_BLOCK=y 31CONFIG_MTD_BLOCK=y
35CONFIG_MTD_CFI=y 32CONFIG_MTD_CFI=y
36CONFIG_MTD_CFI_AMDSTD=y 33CONFIG_MTD_CFI_AMDSTD=y
37CONFIG_MTD_PHYSMAP_OF=y 34CONFIG_MTD_PHYSMAP_OF=y
38CONFIG_MTD_NAND=y 35CONFIG_MTD_NAND=y
39CONFIG_PROC_DEVICETREE=y
40CONFIG_BLK_DEV_LOOP=y 36CONFIG_BLK_DEV_LOOP=y
41CONFIG_BLK_DEV_RAM=y 37CONFIG_BLK_DEV_RAM=y
42CONFIG_BLK_DEV_RAM_SIZE=32768 38CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -50,10 +46,8 @@ CONFIG_MD_LINEAR=y
50CONFIG_MD_RAID0=y 46CONFIG_MD_RAID0=y
51CONFIG_MD_RAID1=y 47CONFIG_MD_RAID1=y
52CONFIG_NETDEVICES=y 48CONFIG_NETDEVICES=y
53CONFIG_NET_ETHERNET=y
54CONFIG_NET_PCI=y
55CONFIG_E100=y
56CONFIG_GIANFAR=y 49CONFIG_GIANFAR=y
50CONFIG_E100=y
57# CONFIG_INPUT_MOUSEDEV is not set 51# CONFIG_INPUT_MOUSEDEV is not set
58# CONFIG_INPUT_KEYBOARD is not set 52# CONFIG_INPUT_KEYBOARD is not set
59# CONFIG_INPUT_MOUSE is not set 53# CONFIG_INPUT_MOUSE is not set
@@ -68,7 +62,6 @@ CONFIG_I2C_MPC=y
68CONFIG_SPI=y 62CONFIG_SPI=y
69CONFIG_SPI_BITBANG=y 63CONFIG_SPI_BITBANG=y
70CONFIG_WATCHDOG=y 64CONFIG_WATCHDOG=y
71CONFIG_VIDEO_OUTPUT_CONTROL=m
72# CONFIG_USB_HID is not set 65# CONFIG_USB_HID is not set
73CONFIG_USB=y 66CONFIG_USB=y
74CONFIG_USB_MON=y 67CONFIG_USB_MON=y
@@ -79,7 +72,6 @@ CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
79CONFIG_USB_UHCI_HCD=y 72CONFIG_USB_UHCI_HCD=y
80CONFIG_USB_STORAGE=y 73CONFIG_USB_STORAGE=y
81CONFIG_USB_GADGET=y 74CONFIG_USB_GADGET=y
82CONFIG_USB_GADGET_NET2280=y
83CONFIG_USB_ETH=m 75CONFIG_USB_ETH=m
84CONFIG_RTC_CLASS=y 76CONFIG_RTC_CLASS=y
85CONFIG_RTC_INTF_DEV_UIE_EMUL=y 77CONFIG_RTC_INTF_DEV_UIE_EMUL=y
@@ -87,18 +79,12 @@ CONFIG_RTC_DRV_DS1307=y
87CONFIG_EXT2_FS=y 79CONFIG_EXT2_FS=y
88CONFIG_EXT3_FS=y 80CONFIG_EXT3_FS=y
89# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 81# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
90CONFIG_INOTIFY=y
91CONFIG_PROC_KCORE=y 82CONFIG_PROC_KCORE=y
92CONFIG_TMPFS=y 83CONFIG_TMPFS=y
93CONFIG_JFFS2_FS=y 84CONFIG_JFFS2_FS=y
94CONFIG_NFS_FS=y 85CONFIG_NFS_FS=y
95CONFIG_NFS_V3=y
96CONFIG_NFS_V4=y 86CONFIG_NFS_V4=y
97CONFIG_ROOT_NFS=y 87CONFIG_ROOT_NFS=y
98CONFIG_PARTITION_ADVANCED=y
99CONFIG_DEBUG_KERNEL=y
100CONFIG_DETECT_HUNG_TASK=y 88CONFIG_DETECT_HUNG_TASK=y
101# CONFIG_RCU_CPU_STALL_DETECTOR is not set
102CONFIG_SYSCTL_SYSCALL_CHECK=y
103CONFIG_CRYPTO_PCBC=m 89CONFIG_CRYPTO_PCBC=m
104# CONFIG_CRYPTO_ANSI_CPRNG is not set 90# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
index a5699a1f7d0a..e84d35b848c0 100644
--- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
@@ -1,22 +1,21 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 7# CONFIG_KALLSYMS is not set
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
12# CONFIG_MSDOS_PARTITION is not set
11# CONFIG_PPC_CHRP is not set 13# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 14# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 15CONFIG_PPC_83xx=y
14CONFIG_MPC832x_MDS=y 16CONFIG_MPC832x_MDS=y
15CONFIG_QUICC_ENGINE=y 17CONFIG_QUICC_ENGINE=y
16CONFIG_NO_HZ=y
17CONFIG_HIGH_RES_TIMERS=y
18CONFIG_MATH_EMULATION=y 18CONFIG_MATH_EMULATION=y
19CONFIG_SPARSE_IRQ=y
20CONFIG_PCI=y 19CONFIG_PCI=y
21CONFIG_NET=y 20CONFIG_NET=y
22CONFIG_PACKET=y 21CONFIG_PACKET=y
@@ -31,16 +30,13 @@ CONFIG_SYN_COOKIES=y
31# CONFIG_IPV6 is not set 30# CONFIG_IPV6 is not set
32CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
33# CONFIG_FW_LOADER is not set 32# CONFIG_FW_LOADER is not set
34CONFIG_PROC_DEVICETREE=y
35CONFIG_BLK_DEV_LOOP=y 33CONFIG_BLK_DEV_LOOP=y
36CONFIG_BLK_DEV_RAM=y 34CONFIG_BLK_DEV_RAM=y
37CONFIG_BLK_DEV_RAM_SIZE=32768 35CONFIG_BLK_DEV_RAM_SIZE=32768
38CONFIG_SCSI=y 36CONFIG_SCSI=y
39CONFIG_NETDEVICES=y 37CONFIG_NETDEVICES=y
40CONFIG_DAVICOM_PHY=y
41CONFIG_NET_ETHERNET=y
42CONFIG_MII=y
43CONFIG_UCC_GETH=y 38CONFIG_UCC_GETH=y
39CONFIG_DAVICOM_PHY=y
44# CONFIG_INPUT_MOUSEDEV is not set 40# CONFIG_INPUT_MOUSEDEV is not set
45# CONFIG_INPUT_KEYBOARD is not set 41# CONFIG_INPUT_KEYBOARD is not set
46# CONFIG_INPUT_MOUSE is not set 42# CONFIG_INPUT_MOUSE is not set
@@ -53,23 +49,16 @@ CONFIG_I2C=y
53CONFIG_I2C_CHARDEV=y 49CONFIG_I2C_CHARDEV=y
54CONFIG_I2C_MPC=y 50CONFIG_I2C_MPC=y
55CONFIG_WATCHDOG=y 51CONFIG_WATCHDOG=y
56CONFIG_VIDEO_OUTPUT_CONTROL=m
57CONFIG_RTC_CLASS=y 52CONFIG_RTC_CLASS=y
58CONFIG_RTC_DRV_DS1374=y 53CONFIG_RTC_DRV_DS1374=y
59CONFIG_EXT2_FS=y 54CONFIG_EXT2_FS=y
60CONFIG_EXT3_FS=y 55CONFIG_EXT3_FS=y
61# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 56# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
62CONFIG_INOTIFY=y
63CONFIG_PROC_KCORE=y 57CONFIG_PROC_KCORE=y
64CONFIG_TMPFS=y 58CONFIG_TMPFS=y
65CONFIG_NFS_FS=y 59CONFIG_NFS_FS=y
66CONFIG_NFS_V3=y
67CONFIG_NFS_V4=y 60CONFIG_NFS_V4=y
68CONFIG_ROOT_NFS=y 61CONFIG_ROOT_NFS=y
69CONFIG_PARTITION_ADVANCED=y
70# CONFIG_MSDOS_PARTITION is not set
71# CONFIG_RCU_CPU_STALL_DETECTOR is not set
72CONFIG_SYSCTL_SYSCALL_CHECK=y
73CONFIG_CRYPTO_ECB=m 62CONFIG_CRYPTO_ECB=m
74CONFIG_CRYPTO_PCBC=m 63CONFIG_CRYPTO_PCBC=m
75# CONFIG_CRYPTO_ANSI_CPRNG is not set 64# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
index 5adc4cea42d3..ae145f410590 100644
--- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
@@ -1,22 +1,21 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 7# CONFIG_KALLSYMS is not set
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
12CONFIG_LDM_PARTITION=y
11# CONFIG_PPC_CHRP is not set 13# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 14# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 15CONFIG_PPC_83xx=y
14CONFIG_MPC832x_RDB=y 16CONFIG_MPC832x_RDB=y
15CONFIG_QUICC_ENGINE=y 17CONFIG_QUICC_ENGINE=y
16CONFIG_NO_HZ=y
17CONFIG_HIGH_RES_TIMERS=y
18CONFIG_MATH_EMULATION=y 18CONFIG_MATH_EMULATION=y
19CONFIG_SPARSE_IRQ=y
20CONFIG_PCI=y 19CONFIG_PCI=y
21CONFIG_NET=y 20CONFIG_NET=y
22CONFIG_PACKET=y 21CONFIG_PACKET=y
@@ -31,18 +30,15 @@ CONFIG_SYN_COOKIES=y
31# CONFIG_IPV6 is not set 30# CONFIG_IPV6 is not set
32CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
33# CONFIG_FW_LOADER is not set 32# CONFIG_FW_LOADER is not set
34CONFIG_PROC_DEVICETREE=y
35CONFIG_BLK_DEV_LOOP=y 33CONFIG_BLK_DEV_LOOP=y
36CONFIG_BLK_DEV_RAM=y 34CONFIG_BLK_DEV_RAM=y
37CONFIG_BLK_DEV_RAM_SIZE=32768 35CONFIG_BLK_DEV_RAM_SIZE=32768
38CONFIG_SCSI=y 36CONFIG_SCSI=y
39CONFIG_BLK_DEV_SD=y 37CONFIG_BLK_DEV_SD=y
40CONFIG_NETDEVICES=y 38CONFIG_NETDEVICES=y
41CONFIG_ICPLUS_PHY=y
42CONFIG_NET_ETHERNET=y
43CONFIG_MII=y
44CONFIG_E1000=y
45CONFIG_UCC_GETH=y 39CONFIG_UCC_GETH=y
40CONFIG_E1000=y
41CONFIG_ICPLUS_PHY=y
46# CONFIG_INPUT_MOUSEDEV is not set 42# CONFIG_INPUT_MOUSEDEV is not set
47# CONFIG_INPUT_KEYBOARD is not set 43# CONFIG_INPUT_KEYBOARD is not set
48# CONFIG_INPUT_MOUSE is not set 44# CONFIG_INPUT_MOUSE is not set
@@ -58,7 +54,6 @@ CONFIG_I2C_MPC=y
58CONFIG_SPI=y 54CONFIG_SPI=y
59CONFIG_SPI_BITBANG=y 55CONFIG_SPI_BITBANG=y
60CONFIG_WATCHDOG=y 56CONFIG_WATCHDOG=y
61CONFIG_VIDEO_OUTPUT_CONTROL=m
62# CONFIG_USB_HID is not set 57# CONFIG_USB_HID is not set
63CONFIG_USB=y 58CONFIG_USB=y
64CONFIG_USB_MON=y 59CONFIG_USB_MON=y
@@ -71,24 +66,18 @@ CONFIG_MMC_SPI=y
71CONFIG_EXT2_FS=y 66CONFIG_EXT2_FS=y
72CONFIG_EXT3_FS=y 67CONFIG_EXT3_FS=y
73# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 68# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
74CONFIG_INOTIFY=y
75CONFIG_MSDOS_FS=y 69CONFIG_MSDOS_FS=y
76CONFIG_VFAT_FS=y 70CONFIG_VFAT_FS=y
77CONFIG_PROC_KCORE=y 71CONFIG_PROC_KCORE=y
78CONFIG_TMPFS=y 72CONFIG_TMPFS=y
79CONFIG_NFS_FS=y 73CONFIG_NFS_FS=y
80CONFIG_NFS_V3=y
81CONFIG_NFS_V4=y 74CONFIG_NFS_V4=y
82CONFIG_ROOT_NFS=y 75CONFIG_ROOT_NFS=y
83CONFIG_PARTITION_ADVANCED=y
84CONFIG_LDM_PARTITION=y
85CONFIG_NLS_CODEPAGE_437=y 76CONFIG_NLS_CODEPAGE_437=y
86CONFIG_NLS_CODEPAGE_932=y 77CONFIG_NLS_CODEPAGE_932=y
87CONFIG_NLS_ISO8859_8=y 78CONFIG_NLS_ISO8859_8=y
88CONFIG_NLS_ISO8859_1=y 79CONFIG_NLS_ISO8859_1=y
89CONFIG_CRC_T10DIF=y 80CONFIG_CRC_T10DIF=y
90# CONFIG_RCU_CPU_STALL_DETECTOR is not set
91CONFIG_SYSCTL_SYSCALL_CHECK=y
92CONFIG_CRYPTO_ECB=m 81CONFIG_CRYPTO_ECB=m
93CONFIG_CRYPTO_PCBC=m 82CONFIG_CRYPTO_PCBC=m
94# CONFIG_CRYPTO_ANSI_CPRNG is not set 83# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
index 82b6b6c88d6a..2a5fdcbabcdd 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
@@ -1,20 +1,19 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 7# CONFIG_KALLSYMS is not set
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
12CONFIG_MAC_PARTITION=y
11# CONFIG_PPC_CHRP is not set 13# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 14# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 15CONFIG_PPC_83xx=y
14CONFIG_MPC834x_ITX=y 16CONFIG_MPC834x_ITX=y
15CONFIG_NO_HZ=y
16CONFIG_HIGH_RES_TIMERS=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_PCI=y 17CONFIG_PCI=y
19CONFIG_NET=y 18CONFIG_NET=y
20CONFIG_PACKET=y 19CONFIG_PACKET=y
@@ -30,11 +29,9 @@ CONFIG_SYN_COOKIES=y
30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31# CONFIG_FW_LOADER is not set 30# CONFIG_FW_LOADER is not set
32CONFIG_MTD=y 31CONFIG_MTD=y
33CONFIG_MTD_CHAR=y
34CONFIG_MTD_CFI=y 32CONFIG_MTD_CFI=y
35CONFIG_MTD_CFI_AMDSTD=y 33CONFIG_MTD_CFI_AMDSTD=y
36CONFIG_MTD_PHYSMAP=y 34CONFIG_MTD_PHYSMAP=y
37CONFIG_PROC_DEVICETREE=y
38CONFIG_BLK_DEV_LOOP=y 35CONFIG_BLK_DEV_LOOP=y
39CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
40CONFIG_BLK_DEV_RAM_SIZE=32768 37CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -52,9 +49,9 @@ CONFIG_MD_LINEAR=y
52CONFIG_MD_RAID0=y 49CONFIG_MD_RAID0=y
53CONFIG_MD_RAID1=y 50CONFIG_MD_RAID1=y
54CONFIG_NETDEVICES=y 51CONFIG_NETDEVICES=y
52CONFIG_GIANFAR=y
55CONFIG_CICADA_PHY=y 53CONFIG_CICADA_PHY=y
56CONFIG_FIXED_PHY=y 54CONFIG_FIXED_PHY=y
57CONFIG_GIANFAR=y
58# CONFIG_INPUT is not set 55# CONFIG_INPUT is not set
59# CONFIG_SERIO is not set 56# CONFIG_SERIO is not set
60# CONFIG_VT is not set 57# CONFIG_VT is not set
@@ -69,7 +66,6 @@ CONFIG_SPI=y
69CONFIG_SPI_BITBANG=y 66CONFIG_SPI_BITBANG=y
70# CONFIG_HWMON is not set 67# CONFIG_HWMON is not set
71CONFIG_WATCHDOG=y 68CONFIG_WATCHDOG=y
72CONFIG_VIDEO_OUTPUT_CONTROL=m
73CONFIG_USB=y 69CONFIG_USB=y
74CONFIG_USB_MON=y 70CONFIG_USB_MON=y
75CONFIG_USB_EHCI_HCD=y 71CONFIG_USB_EHCI_HCD=y
@@ -82,19 +78,13 @@ CONFIG_RTC_DRV_DS1307=y
82CONFIG_EXT2_FS=y 78CONFIG_EXT2_FS=y
83CONFIG_EXT3_FS=y 79CONFIG_EXT3_FS=y
84# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 80# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
85CONFIG_INOTIFY=y
86CONFIG_MSDOS_FS=y 81CONFIG_MSDOS_FS=y
87CONFIG_VFAT_FS=y 82CONFIG_VFAT_FS=y
88CONFIG_PROC_KCORE=y 83CONFIG_PROC_KCORE=y
89CONFIG_TMPFS=y 84CONFIG_TMPFS=y
90CONFIG_NFS_FS=y 85CONFIG_NFS_FS=y
91CONFIG_NFS_V3=y
92CONFIG_NFS_V4=y 86CONFIG_NFS_V4=y
93CONFIG_ROOT_NFS=y 87CONFIG_ROOT_NFS=y
94CONFIG_PARTITION_ADVANCED=y
95CONFIG_MAC_PARTITION=y
96CONFIG_CRC_T10DIF=y 88CONFIG_CRC_T10DIF=y
97# CONFIG_RCU_CPU_STALL_DETECTOR is not set
98CONFIG_SYSCTL_SYSCALL_CHECK=y
99CONFIG_CRYPTO_PCBC=m 89CONFIG_CRYPTO_PCBC=m
100# CONFIG_CRYPTO_ANSI_CPRNG is not set 90# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
index f8b228aaa03a..9a2ff25a2e98 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
@@ -1,20 +1,19 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 7# CONFIG_KALLSYMS is not set
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
12CONFIG_MAC_PARTITION=y
11# CONFIG_PPC_CHRP is not set 13# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 14# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 15CONFIG_PPC_83xx=y
14CONFIG_MPC834x_ITX=y 16CONFIG_MPC834x_ITX=y
15CONFIG_NO_HZ=y
16CONFIG_HIGH_RES_TIMERS=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_PCI=y 17CONFIG_PCI=y
19CONFIG_NET=y 18CONFIG_NET=y
20CONFIG_PACKET=y 19CONFIG_PACKET=y
@@ -30,11 +29,9 @@ CONFIG_SYN_COOKIES=y
30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31# CONFIG_FW_LOADER is not set 30# CONFIG_FW_LOADER is not set
32CONFIG_MTD=y 31CONFIG_MTD=y
33CONFIG_MTD_CHAR=y
34CONFIG_MTD_CFI=y 32CONFIG_MTD_CFI=y
35CONFIG_MTD_CFI_AMDSTD=y 33CONFIG_MTD_CFI_AMDSTD=y
36CONFIG_MTD_PHYSMAP=y 34CONFIG_MTD_PHYSMAP=y
37CONFIG_PROC_DEVICETREE=y
38CONFIG_BLK_DEV_LOOP=y 35CONFIG_BLK_DEV_LOOP=y
39CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
40CONFIG_BLK_DEV_RAM_SIZE=32768 37CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -43,8 +40,8 @@ CONFIG_BLK_DEV_SD=y
43CONFIG_CHR_DEV_SG=y 40CONFIG_CHR_DEV_SG=y
44CONFIG_SCSI_SPI_ATTRS=y 41CONFIG_SCSI_SPI_ATTRS=y
45CONFIG_NETDEVICES=y 42CONFIG_NETDEVICES=y
46CONFIG_CICADA_PHY=y
47CONFIG_GIANFAR=y 43CONFIG_GIANFAR=y
44CONFIG_CICADA_PHY=y
48# CONFIG_INPUT is not set 45# CONFIG_INPUT is not set
49# CONFIG_SERIO is not set 46# CONFIG_SERIO is not set
50# CONFIG_VT is not set 47# CONFIG_VT is not set
@@ -59,7 +56,6 @@ CONFIG_SPI=y
59CONFIG_SPI_BITBANG=y 56CONFIG_SPI_BITBANG=y
60# CONFIG_HWMON is not set 57# CONFIG_HWMON is not set
61CONFIG_WATCHDOG=y 58CONFIG_WATCHDOG=y
62CONFIG_VIDEO_OUTPUT_CONTROL=m
63CONFIG_USB=y 59CONFIG_USB=y
64CONFIG_USB_MON=y 60CONFIG_USB_MON=y
65CONFIG_USB_EHCI_HCD=y 61CONFIG_USB_EHCI_HCD=y
@@ -72,19 +68,13 @@ CONFIG_RTC_DRV_DS1307=y
72CONFIG_EXT2_FS=y 68CONFIG_EXT2_FS=y
73CONFIG_EXT3_FS=y 69CONFIG_EXT3_FS=y
74# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 70# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
75CONFIG_INOTIFY=y
76CONFIG_MSDOS_FS=y 71CONFIG_MSDOS_FS=y
77CONFIG_VFAT_FS=y 72CONFIG_VFAT_FS=y
78CONFIG_PROC_KCORE=y 73CONFIG_PROC_KCORE=y
79CONFIG_TMPFS=y 74CONFIG_TMPFS=y
80CONFIG_NFS_FS=y 75CONFIG_NFS_FS=y
81CONFIG_NFS_V3=y
82CONFIG_NFS_V4=y 76CONFIG_NFS_V4=y
83CONFIG_ROOT_NFS=y 77CONFIG_ROOT_NFS=y
84CONFIG_PARTITION_ADVANCED=y
85CONFIG_MAC_PARTITION=y
86CONFIG_CRC_T10DIF=y 78CONFIG_CRC_T10DIF=y
87# CONFIG_RCU_CPU_STALL_DETECTOR is not set
88CONFIG_SYSCTL_SYSCALL_CHECK=y
89CONFIG_CRYPTO_PCBC=m 79CONFIG_CRYPTO_PCBC=m
90# CONFIG_CRYPTO_ANSI_CPRNG is not set 80# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
index 99660c062191..e44edc575549 100644
--- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
@@ -1,20 +1,19 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 7# CONFIG_KALLSYMS is not set
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
12# CONFIG_MSDOS_PARTITION is not set
11# CONFIG_PPC_CHRP is not set 13# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 14# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 15CONFIG_PPC_83xx=y
14CONFIG_MPC834x_MDS=y 16CONFIG_MPC834x_MDS=y
15CONFIG_NO_HZ=y
16CONFIG_HIGH_RES_TIMERS=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_PCI=y 17CONFIG_PCI=y
19CONFIG_NET=y 18CONFIG_NET=y
20CONFIG_PACKET=y 19CONFIG_PACKET=y
@@ -30,16 +29,13 @@ CONFIG_SYN_COOKIES=y
30# CONFIG_IPV6 is not set 29# CONFIG_IPV6 is not set
31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32# CONFIG_FW_LOADER is not set 31# CONFIG_FW_LOADER is not set
33CONFIG_PROC_DEVICETREE=y
34CONFIG_BLK_DEV_LOOP=y 32CONFIG_BLK_DEV_LOOP=y
35CONFIG_BLK_DEV_RAM=y 33CONFIG_BLK_DEV_RAM=y
36CONFIG_BLK_DEV_RAM_SIZE=32768 34CONFIG_BLK_DEV_RAM_SIZE=32768
37CONFIG_NETDEVICES=y 35CONFIG_NETDEVICES=y
38CONFIG_MARVELL_PHY=y
39CONFIG_NET_ETHERNET=y
40CONFIG_NET_PCI=y
41CONFIG_E100=y
42CONFIG_GIANFAR=y 36CONFIG_GIANFAR=y
37CONFIG_E100=y
38CONFIG_MARVELL_PHY=y
43# CONFIG_INPUT_MOUSEDEV is not set 39# CONFIG_INPUT_MOUSEDEV is not set
44# CONFIG_INPUT_KEYBOARD is not set 40# CONFIG_INPUT_KEYBOARD is not set
45# CONFIG_INPUT_MOUSE is not set 41# CONFIG_INPUT_MOUSE is not set
@@ -52,23 +48,16 @@ CONFIG_I2C=y
52CONFIG_I2C_CHARDEV=y 48CONFIG_I2C_CHARDEV=y
53CONFIG_I2C_MPC=y 49CONFIG_I2C_MPC=y
54CONFIG_WATCHDOG=y 50CONFIG_WATCHDOG=y
55CONFIG_VIDEO_OUTPUT_CONTROL=m
56CONFIG_RTC_CLASS=y 51CONFIG_RTC_CLASS=y
57CONFIG_RTC_DRV_DS1374=y 52CONFIG_RTC_DRV_DS1374=y
58CONFIG_EXT2_FS=y 53CONFIG_EXT2_FS=y
59CONFIG_EXT3_FS=y 54CONFIG_EXT3_FS=y
60# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 55# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
61CONFIG_INOTIFY=y
62CONFIG_PROC_KCORE=y 56CONFIG_PROC_KCORE=y
63CONFIG_TMPFS=y 57CONFIG_TMPFS=y
64CONFIG_NFS_FS=y 58CONFIG_NFS_FS=y
65CONFIG_NFS_V3=y
66CONFIG_NFS_V4=y 59CONFIG_NFS_V4=y
67CONFIG_ROOT_NFS=y 60CONFIG_ROOT_NFS=y
68CONFIG_PARTITION_ADVANCED=y
69# CONFIG_MSDOS_PARTITION is not set
70# CONFIG_RCU_CPU_STALL_DETECTOR is not set
71CONFIG_SYSCTL_SYSCALL_CHECK=y
72CONFIG_CRYPTO_ECB=m 61CONFIG_CRYPTO_ECB=m
73CONFIG_CRYPTO_PCBC=m 62CONFIG_CRYPTO_PCBC=m
74# CONFIG_CRYPTO_ANSI_CPRNG is not set 63# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
index 05710bbfd2ef..94a7d85f1603 100644
--- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
@@ -1,21 +1,20 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 7# CONFIG_KALLSYMS is not set
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
12# CONFIG_MSDOS_PARTITION is not set
11# CONFIG_PPC_CHRP is not set 13# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 14# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 15CONFIG_PPC_83xx=y
14CONFIG_MPC836x_MDS=y 16CONFIG_MPC836x_MDS=y
15CONFIG_QUICC_ENGINE=y 17CONFIG_QUICC_ENGINE=y
16CONFIG_NO_HZ=y
17CONFIG_HIGH_RES_TIMERS=y
18CONFIG_SPARSE_IRQ=y
19CONFIG_PCI=y 18CONFIG_PCI=y
20CONFIG_NET=y 19CONFIG_NET=y
21CONFIG_PACKET=y 20CONFIG_PACKET=y
@@ -32,21 +31,17 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32# CONFIG_FW_LOADER is not set 31# CONFIG_FW_LOADER is not set
33CONFIG_MTD=y 32CONFIG_MTD=y
34CONFIG_MTD_CMDLINE_PARTS=y 33CONFIG_MTD_CMDLINE_PARTS=y
35CONFIG_MTD_CHAR=y
36CONFIG_MTD_BLOCK=y 34CONFIG_MTD_BLOCK=y
37CONFIG_MTD_CFI=y 35CONFIG_MTD_CFI=y
38CONFIG_MTD_CFI_AMDSTD=y 36CONFIG_MTD_CFI_AMDSTD=y
39CONFIG_MTD_PHYSMAP_OF=y 37CONFIG_MTD_PHYSMAP_OF=y
40CONFIG_PROC_DEVICETREE=y
41CONFIG_BLK_DEV_LOOP=y 38CONFIG_BLK_DEV_LOOP=y
42CONFIG_BLK_DEV_RAM=y 39CONFIG_BLK_DEV_RAM=y
43CONFIG_BLK_DEV_RAM_SIZE=32768 40CONFIG_BLK_DEV_RAM_SIZE=32768
44CONFIG_SCSI=y 41CONFIG_SCSI=y
45CONFIG_NETDEVICES=y 42CONFIG_NETDEVICES=y
46CONFIG_MARVELL_PHY=y
47CONFIG_NET_ETHERNET=y
48CONFIG_MII=y
49CONFIG_UCC_GETH=y 43CONFIG_UCC_GETH=y
44CONFIG_MARVELL_PHY=y
50# CONFIG_INPUT_MOUSEDEV is not set 45# CONFIG_INPUT_MOUSEDEV is not set
51# CONFIG_INPUT_KEYBOARD is not set 46# CONFIG_INPUT_KEYBOARD is not set
52# CONFIG_INPUT_MOUSE is not set 47# CONFIG_INPUT_MOUSE is not set
@@ -59,23 +54,16 @@ CONFIG_I2C=y
59CONFIG_I2C_CHARDEV=y 54CONFIG_I2C_CHARDEV=y
60CONFIG_I2C_MPC=y 55CONFIG_I2C_MPC=y
61CONFIG_WATCHDOG=y 56CONFIG_WATCHDOG=y
62CONFIG_VIDEO_OUTPUT_CONTROL=m
63CONFIG_RTC_CLASS=y 57CONFIG_RTC_CLASS=y
64CONFIG_RTC_DRV_DS1374=y 58CONFIG_RTC_DRV_DS1374=y
65CONFIG_EXT2_FS=y 59CONFIG_EXT2_FS=y
66CONFIG_EXT3_FS=y 60CONFIG_EXT3_FS=y
67# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 61# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
68CONFIG_INOTIFY=y
69CONFIG_PROC_KCORE=y 62CONFIG_PROC_KCORE=y
70CONFIG_TMPFS=y 63CONFIG_TMPFS=y
71CONFIG_NFS_FS=y 64CONFIG_NFS_FS=y
72CONFIG_NFS_V3=y
73CONFIG_NFS_V4=y 65CONFIG_NFS_V4=y
74CONFIG_ROOT_NFS=y 66CONFIG_ROOT_NFS=y
75CONFIG_PARTITION_ADVANCED=y
76# CONFIG_MSDOS_PARTITION is not set
77# CONFIG_RCU_CPU_STALL_DETECTOR is not set
78CONFIG_SYSCTL_SYSCALL_CHECK=y
79CONFIG_CRYPTO_ECB=m 67CONFIG_CRYPTO_ECB=m
80CONFIG_CRYPTO_PCBC=m 68CONFIG_CRYPTO_PCBC=m
81# CONFIG_CRYPTO_ANSI_CPRNG is not set 69# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
index 0540d673a052..761ed8ea0729 100644
--- a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
@@ -1,20 +1,19 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_LOG_BUF_SHIFT=14 2CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 3CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 4CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 5# CONFIG_KALLSYMS is not set
8CONFIG_MODULES=y 6CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 7CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
10# CONFIG_MSDOS_PARTITION is not set
11# CONFIG_PPC_CHRP is not set 11# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 12# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 13CONFIG_PPC_83xx=y
14CONFIG_MPC836x_RDK=y 14CONFIG_MPC836x_RDK=y
15CONFIG_QUICC_ENGINE=y 15CONFIG_QUICC_ENGINE=y
16CONFIG_QE_GPIO=y 16CONFIG_QE_GPIO=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_PCI=y 17CONFIG_PCI=y
19CONFIG_NET=y 18CONFIG_NET=y
20CONFIG_PACKET=y 19CONFIG_PACKET=y
@@ -30,20 +29,17 @@ CONFIG_SYN_COOKIES=y
30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31CONFIG_MTD=y 30CONFIG_MTD=y
32CONFIG_MTD_CMDLINE_PARTS=y 31CONFIG_MTD_CMDLINE_PARTS=y
33CONFIG_MTD_CHAR=y
34CONFIG_MTD_BLOCK=y 32CONFIG_MTD_BLOCK=y
35CONFIG_MTD_CFI=y 33CONFIG_MTD_CFI=y
36CONFIG_MTD_CFI_ADV_OPTIONS=y 34CONFIG_MTD_CFI_ADV_OPTIONS=y
37CONFIG_MTD_CFI_INTELEXT=y 35CONFIG_MTD_CFI_INTELEXT=y
38CONFIG_MTD_PHYSMAP_OF=y 36CONFIG_MTD_PHYSMAP_OF=y
39CONFIG_PROC_DEVICETREE=y
40CONFIG_BLK_DEV_LOOP=y 37CONFIG_BLK_DEV_LOOP=y
41CONFIG_BLK_DEV_RAM=y 38CONFIG_BLK_DEV_RAM=y
42CONFIG_BLK_DEV_RAM_SIZE=32768 39CONFIG_BLK_DEV_RAM_SIZE=32768
43CONFIG_NETDEVICES=y 40CONFIG_NETDEVICES=y
44CONFIG_BROADCOM_PHY=y
45CONFIG_UCC_GETH=y 41CONFIG_UCC_GETH=y
46# CONFIG_NETDEV_10000 is not set 42CONFIG_BROADCOM_PHY=y
47# CONFIG_INPUT_MOUSEDEV is not set 43# CONFIG_INPUT_MOUSEDEV is not set
48# CONFIG_INPUT_KEYBOARD is not set 44# CONFIG_INPUT_KEYBOARD is not set
49# CONFIG_INPUT_MOUSE is not set 45# CONFIG_INPUT_MOUSE is not set
@@ -71,17 +67,11 @@ CONFIG_LOGO=y
71CONFIG_EXT2_FS=y 67CONFIG_EXT2_FS=y
72CONFIG_EXT3_FS=y 68CONFIG_EXT3_FS=y
73# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 69# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
74CONFIG_INOTIFY=y
75CONFIG_PROC_KCORE=y 70CONFIG_PROC_KCORE=y
76CONFIG_TMPFS=y 71CONFIG_TMPFS=y
77CONFIG_JFFS2_FS=y 72CONFIG_JFFS2_FS=y
78CONFIG_NFS_FS=y 73CONFIG_NFS_FS=y
79CONFIG_NFS_V3=y
80CONFIG_NFS_V4=y 74CONFIG_NFS_V4=y
81CONFIG_ROOT_NFS=y 75CONFIG_ROOT_NFS=y
82CONFIG_PARTITION_ADVANCED=y
83# CONFIG_MSDOS_PARTITION is not set
84# CONFIG_RCU_CPU_STALL_DETECTOR is not set
85CONFIG_SYSCTL_SYSCALL_CHECK=y
86CONFIG_PPC_EARLY_DEBUG=y 76CONFIG_PPC_EARLY_DEBUG=y
87# CONFIG_CRYPTO_ANSI_CPRNG is not set 77# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
index f367985be6f7..bcf1b48cc9e6 100644
--- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
@@ -1,18 +1,16 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_LOG_BUF_SHIFT=14 2CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 3CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 4CONFIG_EXPERT=y
7CONFIG_SLAB=y 5CONFIG_SLAB=y
8CONFIG_MODULES=y 6CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 7CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
11# CONFIG_PPC_CHRP is not set 10# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 11# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 12CONFIG_PPC_83xx=y
14CONFIG_MPC837x_MDS=y 13CONFIG_MPC837x_MDS=y
15CONFIG_SPARSE_IRQ=y
16CONFIG_PCI=y 14CONFIG_PCI=y
17CONFIG_NET=y 15CONFIG_NET=y
18CONFIG_PACKET=y 16CONFIG_PACKET=y
@@ -28,7 +26,6 @@ CONFIG_SYN_COOKIES=y
28# CONFIG_IPV6 is not set 26# CONFIG_IPV6 is not set
29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 27CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30# CONFIG_FW_LOADER is not set 28# CONFIG_FW_LOADER is not set
31CONFIG_PROC_DEVICETREE=y
32CONFIG_BLK_DEV_LOOP=y 29CONFIG_BLK_DEV_LOOP=y
33CONFIG_BLK_DEV_RAM=y 30CONFIG_BLK_DEV_RAM=y
34CONFIG_BLK_DEV_RAM_SIZE=32768 31CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -37,10 +34,8 @@ CONFIG_CHR_DEV_SG=y
37CONFIG_ATA=y 34CONFIG_ATA=y
38CONFIG_SATA_FSL=y 35CONFIG_SATA_FSL=y
39CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
40CONFIG_MARVELL_PHY=y
41CONFIG_NET_ETHERNET=y
42CONFIG_MII=y
43CONFIG_GIANFAR=y 37CONFIG_GIANFAR=y
38CONFIG_MARVELL_PHY=y
44# CONFIG_INPUT_MOUSEDEV is not set 39# CONFIG_INPUT_MOUSEDEV is not set
45# CONFIG_INPUT_KEYBOARD is not set 40# CONFIG_INPUT_KEYBOARD is not set
46# CONFIG_INPUT_MOUSE is not set 41# CONFIG_INPUT_MOUSE is not set
@@ -54,21 +49,15 @@ CONFIG_I2C=y
54CONFIG_I2C_CHARDEV=y 49CONFIG_I2C_CHARDEV=y
55CONFIG_I2C_MPC=y 50CONFIG_I2C_MPC=y
56CONFIG_WATCHDOG=y 51CONFIG_WATCHDOG=y
57CONFIG_VIDEO_OUTPUT_CONTROL=m
58CONFIG_EXT2_FS=y 52CONFIG_EXT2_FS=y
59CONFIG_EXT3_FS=y 53CONFIG_EXT3_FS=y
60# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 54# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
61CONFIG_INOTIFY=y
62CONFIG_PROC_KCORE=y 55CONFIG_PROC_KCORE=y
63CONFIG_TMPFS=y 56CONFIG_TMPFS=y
64CONFIG_NFS_FS=y 57CONFIG_NFS_FS=y
65CONFIG_NFS_V3=y
66CONFIG_NFS_V4=y 58CONFIG_NFS_V4=y
67CONFIG_ROOT_NFS=y 59CONFIG_ROOT_NFS=y
68CONFIG_PARTITION_ADVANCED=y
69CONFIG_CRC_T10DIF=y 60CONFIG_CRC_T10DIF=y
70# CONFIG_RCU_CPU_STALL_DETECTOR is not set
71CONFIG_SYSCTL_SYSCALL_CHECK=y
72CONFIG_CRYPTO_ECB=m 61CONFIG_CRYPTO_ECB=m
73CONFIG_CRYPTO_PCBC=m 62CONFIG_CRYPTO_PCBC=m
74# CONFIG_CRYPTO_ANSI_CPRNG is not set 63# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
index 414eda381591..f0f0ebf75125 100644
--- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
@@ -1,18 +1,16 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_LOG_BUF_SHIFT=14 2CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 3CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 4CONFIG_EXPERT=y
7CONFIG_SLAB=y 5CONFIG_SLAB=y
8CONFIG_MODULES=y 6CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 7CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
11# CONFIG_PPC_CHRP is not set 10# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 11# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 12CONFIG_PPC_83xx=y
14CONFIG_MPC837x_RDB=y 13CONFIG_MPC837x_RDB=y
15CONFIG_SPARSE_IRQ=y
16CONFIG_PCI=y 14CONFIG_PCI=y
17CONFIG_NET=y 15CONFIG_NET=y
18CONFIG_PACKET=y 16CONFIG_PACKET=y
@@ -30,7 +28,6 @@ CONFIG_SYN_COOKIES=y
30# CONFIG_IPV6 is not set 28# CONFIG_IPV6 is not set
31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32# CONFIG_FW_LOADER is not set 30# CONFIG_FW_LOADER is not set
33CONFIG_PROC_DEVICETREE=y
34CONFIG_BLK_DEV_LOOP=y 31CONFIG_BLK_DEV_LOOP=y
35CONFIG_BLK_DEV_RAM=y 32CONFIG_BLK_DEV_RAM=y
36CONFIG_BLK_DEV_RAM_SIZE=32768 33CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -43,12 +40,9 @@ CONFIG_BLK_DEV_MD=y
43CONFIG_MD_RAID1=y 40CONFIG_MD_RAID1=y
44CONFIG_MD_RAID456=y 41CONFIG_MD_RAID456=y
45CONFIG_NETDEVICES=y 42CONFIG_NETDEVICES=y
43CONFIG_GIANFAR=y
46CONFIG_MARVELL_PHY=y 44CONFIG_MARVELL_PHY=y
47CONFIG_FIXED_PHY=y 45CONFIG_FIXED_PHY=y
48CONFIG_NET_ETHERNET=y
49CONFIG_MII=y
50CONFIG_GIANFAR=y
51# CONFIG_NETDEV_10000 is not set
52CONFIG_INPUT_FF_MEMLESS=m 46CONFIG_INPUT_FF_MEMLESS=m
53# CONFIG_INPUT_MOUSEDEV is not set 47# CONFIG_INPUT_MOUSEDEV is not set
54# CONFIG_INPUT_KEYBOARD is not set 48# CONFIG_INPUT_KEYBOARD is not set
@@ -63,7 +57,6 @@ CONFIG_I2C=y
63CONFIG_I2C_CHARDEV=y 57CONFIG_I2C_CHARDEV=y
64CONFIG_I2C_MPC=y 58CONFIG_I2C_MPC=y
65CONFIG_WATCHDOG=y 59CONFIG_WATCHDOG=y
66CONFIG_VIDEO_OUTPUT_CONTROL=m
67CONFIG_HID_A4TECH=y 60CONFIG_HID_A4TECH=y
68CONFIG_HID_APPLE=y 61CONFIG_HID_APPLE=y
69CONFIG_HID_BELKIN=y 62CONFIG_HID_BELKIN=y
@@ -78,7 +71,6 @@ CONFIG_HID_MONTEREY=y
78CONFIG_HID_PANTHERLORD=y 71CONFIG_HID_PANTHERLORD=y
79CONFIG_HID_PETALYNX=y 72CONFIG_HID_PETALYNX=y
80CONFIG_HID_SAMSUNG=y 73CONFIG_HID_SAMSUNG=y
81CONFIG_HID_SONY=y
82CONFIG_HID_SUNPLUS=y 74CONFIG_HID_SUNPLUS=y
83CONFIG_USB=y 75CONFIG_USB=y
84CONFIG_USB_MON=y 76CONFIG_USB_MON=y
@@ -87,18 +79,13 @@ CONFIG_USB_EHCI_FSL=y
87CONFIG_EXT2_FS=y 79CONFIG_EXT2_FS=y
88CONFIG_EXT3_FS=y 80CONFIG_EXT3_FS=y
89# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 81# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
90CONFIG_INOTIFY=y
91CONFIG_PROC_KCORE=y 82CONFIG_PROC_KCORE=y
92CONFIG_TMPFS=y 83CONFIG_TMPFS=y
93CONFIG_NFS_FS=y 84CONFIG_NFS_FS=y
94CONFIG_NFS_V3=y
95CONFIG_NFS_V4=y 85CONFIG_NFS_V4=y
96CONFIG_ROOT_NFS=y 86CONFIG_ROOT_NFS=y
97CONFIG_PARTITION_ADVANCED=y
98CONFIG_CRC_T10DIF=y 87CONFIG_CRC_T10DIF=y
99# CONFIG_ENABLE_MUST_CHECK is not set 88# CONFIG_ENABLE_MUST_CHECK is not set
100# CONFIG_RCU_CPU_STALL_DETECTOR is not set
101CONFIG_SYSCTL_SYSCALL_CHECK=y
102CONFIG_CRYPTO_ECB=m 89CONFIG_CRYPTO_ECB=m
103CONFIG_CRYPTO_PCBC=m 90CONFIG_CRYPTO_PCBC=m
104# CONFIG_CRYPTO_ANSI_CPRNG is not set 91# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig
index 4ae385894c64..d2e4d82de14d 100644
--- a/arch/powerpc/configs/83xx/sbc834x_defconfig
+++ b/arch/powerpc/configs/83xx/sbc834x_defconfig
@@ -1,8 +1,6 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_LOG_BUF_SHIFT=14 2CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 3CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 4CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 5# CONFIG_KALLSYMS is not set
8CONFIG_SLAB=y 6CONFIG_SLAB=y
@@ -13,7 +11,6 @@ CONFIG_MODULE_UNLOAD=y
13# CONFIG_PPC_PMAC is not set 11# CONFIG_PPC_PMAC is not set
14CONFIG_PPC_83xx=y 12CONFIG_PPC_83xx=y
15CONFIG_SBC834x=y 13CONFIG_SBC834x=y
16CONFIG_SPARSE_IRQ=y
17CONFIG_PCI=y 14CONFIG_PCI=y
18CONFIG_NET=y 15CONFIG_NET=y
19CONFIG_PACKET=y 16CONFIG_PACKET=y
@@ -30,15 +27,11 @@ CONFIG_SYN_COOKIES=y
30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 27CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31# CONFIG_FW_LOADER is not set 28# CONFIG_FW_LOADER is not set
32CONFIG_MTD=y 29CONFIG_MTD=y
33CONFIG_MTD_CONCAT=y
34CONFIG_MTD_CMDLINE_PARTS=y 30CONFIG_MTD_CMDLINE_PARTS=y
35CONFIG_MTD_OF_PARTS=y
36CONFIG_MTD_CHAR=y
37CONFIG_MTD_BLOCK=y 31CONFIG_MTD_BLOCK=y
38CONFIG_MTD_CFI=y 32CONFIG_MTD_CFI=y
39CONFIG_MTD_CFI_INTELEXT=y 33CONFIG_MTD_CFI_INTELEXT=y
40CONFIG_MTD_PHYSMAP_OF=y 34CONFIG_MTD_PHYSMAP_OF=y
41CONFIG_PROC_DEVICETREE=y
42CONFIG_BLK_DEV_LOOP=y 35CONFIG_BLK_DEV_LOOP=y
43CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
44CONFIG_BLK_DEV_RAM_SIZE=32768 37CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -47,11 +40,8 @@ CONFIG_SCSI=y
47CONFIG_BLK_DEV_SD=y 40CONFIG_BLK_DEV_SD=y
48# CONFIG_SCSI_LOWLEVEL is not set 41# CONFIG_SCSI_LOWLEVEL is not set
49CONFIG_NETDEVICES=y 42CONFIG_NETDEVICES=y
50CONFIG_BROADCOM_PHY=y
51CONFIG_NET_ETHERNET=y
52CONFIG_MII=y
53CONFIG_GIANFAR=y 43CONFIG_GIANFAR=y
54# CONFIG_NETDEV_10000 is not set 44CONFIG_BROADCOM_PHY=y
55# CONFIG_INPUT_MOUSEDEV is not set 45# CONFIG_INPUT_MOUSEDEV is not set
56# CONFIG_INPUT_KEYBOARD is not set 46# CONFIG_INPUT_KEYBOARD is not set
57# CONFIG_INPUT_MOUSE is not set 47# CONFIG_INPUT_MOUSE is not set
@@ -78,15 +68,11 @@ CONFIG_EXT2_FS=y
78CONFIG_EXT3_FS=y 68CONFIG_EXT3_FS=y
79# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 69# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
80# CONFIG_EXT3_FS_XATTR is not set 70# CONFIG_EXT3_FS_XATTR is not set
81CONFIG_INOTIFY=y
82CONFIG_PROC_KCORE=y 71CONFIG_PROC_KCORE=y
83CONFIG_TMPFS=y 72CONFIG_TMPFS=y
84CONFIG_NFS_FS=y 73CONFIG_NFS_FS=y
85CONFIG_NFS_V3=y
86CONFIG_NFS_V4=y 74CONFIG_NFS_V4=y
87CONFIG_ROOT_NFS=y 75CONFIG_ROOT_NFS=y
88# CONFIG_RCU_CPU_STALL_DETECTOR is not set
89CONFIG_SYSCTL_SYSCALL_CHECK=y
90CONFIG_CRYPTO_ECB=m 76CONFIG_CRYPTO_ECB=m
91CONFIG_CRYPTO_PCBC=m 77CONFIG_CRYPTO_PCBC=m
92# CONFIG_CRYPTO_ANSI_CPRNG is not set 78# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/ge_imp3a_defconfig b/arch/powerpc/configs/85xx/ge_imp3a_defconfig
index b4c4b469e320..b0939dd9ad6f 100644
--- a/arch/powerpc/configs/85xx/ge_imp3a_defconfig
+++ b/arch/powerpc/configs/85xx/ge_imp3a_defconfig
@@ -1,17 +1,15 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_SMP=y 2CONFIG_SMP=y
3CONFIG_NR_CPUS=2 3CONFIG_NR_CPUS=2
4CONFIG_EXPERIMENTAL=y
5CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
6CONFIG_POSIX_MQUEUE=y 5CONFIG_POSIX_MQUEUE=y
6CONFIG_HIGH_RES_TIMERS=y
7CONFIG_BSD_PROCESS_ACCT=y 7CONFIG_BSD_PROCESS_ACCT=y
8CONFIG_BSD_PROCESS_ACCT_V3=y 8CONFIG_BSD_PROCESS_ACCT_V3=y
9CONFIG_SPARSE_IRQ=y
10CONFIG_IKCONFIG=y 9CONFIG_IKCONFIG=y
11CONFIG_IKCONFIG_PROC=y 10CONFIG_IKCONFIG_PROC=y
12# CONFIG_UTS_NS is not set 11# CONFIG_UTS_NS is not set
13# CONFIG_IPC_NS is not set 12# CONFIG_IPC_NS is not set
14# CONFIG_USER_NS is not set
15# CONFIG_PID_NS is not set 13# CONFIG_PID_NS is not set
16# CONFIG_NET_NS is not set 14# CONFIG_NET_NS is not set
17CONFIG_SYSFS_DEPRECATED=y 15CONFIG_SYSFS_DEPRECATED=y
@@ -28,7 +26,6 @@ CONFIG_QUICC_ENGINE=y
28CONFIG_QE_GPIO=y 26CONFIG_QE_GPIO=y
29CONFIG_CPM2=y 27CONFIG_CPM2=y
30CONFIG_HIGHMEM=y 28CONFIG_HIGHMEM=y
31CONFIG_HIGH_RES_TIMERS=y
32CONFIG_HZ_1000=y 29CONFIG_HZ_1000=y
33CONFIG_PREEMPT=y 30CONFIG_PREEMPT=y
34# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 31# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -71,8 +68,6 @@ CONFIG_IPV6_TUNNEL=m
71CONFIG_NET_PKTGEN=m 68CONFIG_NET_PKTGEN=m
72CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 69CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
73CONFIG_MTD=y 70CONFIG_MTD=y
74CONFIG_MTD_OF_PARTS=y
75CONFIG_MTD_CHAR=y
76CONFIG_MTD_BLOCK=y 71CONFIG_MTD_BLOCK=y
77CONFIG_MTD_CFI=y 72CONFIG_MTD_CFI=y
78CONFIG_MTD_JEDECPROBE=y 73CONFIG_MTD_JEDECPROBE=y
@@ -81,13 +76,11 @@ CONFIG_MTD_CFI_AMDSTD=y
81CONFIG_MTD_PHYSMAP_OF=y 76CONFIG_MTD_PHYSMAP_OF=y
82CONFIG_MTD_NAND=y 77CONFIG_MTD_NAND=y
83CONFIG_MTD_NAND_FSL_ELBC=y 78CONFIG_MTD_NAND_FSL_ELBC=y
84CONFIG_PROC_DEVICETREE=y
85CONFIG_BLK_DEV_LOOP=m 79CONFIG_BLK_DEV_LOOP=m
86CONFIG_BLK_DEV_CRYPTOLOOP=m 80CONFIG_BLK_DEV_CRYPTOLOOP=m
87CONFIG_BLK_DEV_NBD=m 81CONFIG_BLK_DEV_NBD=m
88CONFIG_BLK_DEV_RAM=y 82CONFIG_BLK_DEV_RAM=y
89CONFIG_BLK_DEV_RAM_SIZE=131072 83CONFIG_BLK_DEV_RAM_SIZE=131072
90CONFIG_MISC_DEVICES=y
91CONFIG_DS1682=y 84CONFIG_DS1682=y
92CONFIG_BLK_DEV_SD=y 85CONFIG_BLK_DEV_SD=y
93CONFIG_CHR_DEV_ST=y 86CONFIG_CHR_DEV_ST=y
@@ -125,7 +118,6 @@ CONFIG_SERIAL_8250=y
125CONFIG_SERIAL_8250_CONSOLE=y 118CONFIG_SERIAL_8250_CONSOLE=y
126CONFIG_SERIAL_8250_NR_UARTS=2 119CONFIG_SERIAL_8250_NR_UARTS=2
127CONFIG_SERIAL_8250_RUNTIME_UARTS=2 120CONFIG_SERIAL_8250_RUNTIME_UARTS=2
128CONFIG_SERIAL_8250_EXTENDED=y
129CONFIG_SERIAL_8250_MANY_PORTS=y 121CONFIG_SERIAL_8250_MANY_PORTS=y
130CONFIG_SERIAL_8250_DETECT_IRQ=y 122CONFIG_SERIAL_8250_DETECT_IRQ=y
131CONFIG_SERIAL_8250_RSA=y 123CONFIG_SERIAL_8250_RSA=y
@@ -141,7 +133,6 @@ CONFIG_SENSORS_LM90=y
141CONFIG_SENSORS_LM92=y 133CONFIG_SENSORS_LM92=y
142CONFIG_WATCHDOG=y 134CONFIG_WATCHDOG=y
143CONFIG_GEF_WDT=y 135CONFIG_GEF_WDT=y
144CONFIG_VIDEO_OUTPUT_CONTROL=m
145CONFIG_HID_DRAGONRISE=y 136CONFIG_HID_DRAGONRISE=y
146CONFIG_HID_GYRATION=y 137CONFIG_HID_GYRATION=y
147CONFIG_HID_TWINHAN=y 138CONFIG_HID_TWINHAN=y
@@ -149,7 +140,6 @@ CONFIG_HID_ORTEK=y
149CONFIG_HID_PANTHERLORD=y 140CONFIG_HID_PANTHERLORD=y
150CONFIG_HID_PETALYNX=y 141CONFIG_HID_PETALYNX=y
151CONFIG_HID_SAMSUNG=y 142CONFIG_HID_SAMSUNG=y
152CONFIG_HID_SONY=y
153CONFIG_HID_SUNPLUS=y 143CONFIG_HID_SUNPLUS=y
154CONFIG_HID_GREENASIA=y 144CONFIG_HID_GREENASIA=y
155CONFIG_HID_SMARTJOYPLUS=y 145CONFIG_HID_SMARTJOYPLUS=y
@@ -172,7 +162,6 @@ CONFIG_RTC_CLASS=y
172CONFIG_RTC_DRV_RX8581=y 162CONFIG_RTC_DRV_RX8581=y
173CONFIG_DMADEVICES=y 163CONFIG_DMADEVICES=y
174CONFIG_FSL_DMA=y 164CONFIG_FSL_DMA=y
175# CONFIG_NET_DMA is not set
176CONFIG_EXT2_FS=y 165CONFIG_EXT2_FS=y
177CONFIG_EXT2_FS_XATTR=y 166CONFIG_EXT2_FS_XATTR=y
178CONFIG_EXT2_FS_POSIX_ACL=y 167CONFIG_EXT2_FS_POSIX_ACL=y
@@ -194,7 +183,6 @@ CONFIG_PROC_KCORE=y
194CONFIG_TMPFS=y 183CONFIG_TMPFS=y
195CONFIG_JFFS2_FS=y 184CONFIG_JFFS2_FS=y
196CONFIG_NFS_FS=y 185CONFIG_NFS_FS=y
197CONFIG_NFS_V3=y
198CONFIG_NFS_V4=y 186CONFIG_NFS_V4=y
199CONFIG_ROOT_NFS=y 187CONFIG_ROOT_NFS=y
200CONFIG_NFSD=y 188CONFIG_NFSD=y
@@ -244,10 +232,8 @@ CONFIG_CRC_CCITT=y
244CONFIG_CRC_T10DIF=y 232CONFIG_CRC_T10DIF=y
245CONFIG_LIBCRC32C=y 233CONFIG_LIBCRC32C=y
246CONFIG_MAGIC_SYSRQ=y 234CONFIG_MAGIC_SYSRQ=y
247CONFIG_SYSCTL_SYSCALL_CHECK=y
248CONFIG_CRYPTO_CBC=y 235CONFIG_CRYPTO_CBC=y
249CONFIG_CRYPTO_MD5=y 236CONFIG_CRYPTO_MD5=y
250CONFIG_CRYPTO_SHA256=m
251CONFIG_CRYPTO_SHA512=m 237CONFIG_CRYPTO_SHA512=m
252CONFIG_CRYPTO_DES=y 238CONFIG_CRYPTO_DES=y
253# CONFIG_CRYPTO_ANSI_CPRNG is not set 239# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/kmp204x_defconfig b/arch/powerpc/configs/85xx/kmp204x_defconfig
index e362d588dfbf..e94d3eb4a8c1 100644
--- a/arch/powerpc/configs/85xx/kmp204x_defconfig
+++ b/arch/powerpc/configs/85xx/kmp204x_defconfig
@@ -94,7 +94,6 @@ CONFIG_MTD_BLOCK=y
94CONFIG_MTD_CFI=y 94CONFIG_MTD_CFI=y
95CONFIG_MTD_CFI_AMDSTD=y 95CONFIG_MTD_CFI_AMDSTD=y
96CONFIG_MTD_PHYSMAP_OF=y 96CONFIG_MTD_PHYSMAP_OF=y
97CONFIG_MTD_M25P80=y
98CONFIG_MTD_PHRAM=y 97CONFIG_MTD_PHRAM=y
99CONFIG_MTD_NAND=y 98CONFIG_MTD_NAND=y
100CONFIG_MTD_NAND_ECC_BCH=y 99CONFIG_MTD_NAND_ECC_BCH=y
@@ -111,7 +110,6 @@ CONFIG_BLK_DEV_SD=y
111CONFIG_CHR_DEV_ST=y 110CONFIG_CHR_DEV_ST=y
112CONFIG_BLK_DEV_SR=y 111CONFIG_BLK_DEV_SR=y
113CONFIG_CHR_DEV_SG=y 112CONFIG_CHR_DEV_SG=y
114CONFIG_SCSI_MULTI_LUN=y
115CONFIG_SCSI_LOGGING=y 113CONFIG_SCSI_LOGGING=y
116CONFIG_SCSI_SYM53C8XX_2=y 114CONFIG_SCSI_SYM53C8XX_2=y
117CONFIG_NETDEVICES=y 115CONFIG_NETDEVICES=y
@@ -120,7 +118,6 @@ CONFIG_NETDEVICES=y
120# CONFIG_NET_VENDOR_ALTEON is not set 118# CONFIG_NET_VENDOR_ALTEON is not set
121# CONFIG_NET_VENDOR_AMD is not set 119# CONFIG_NET_VENDOR_AMD is not set
122# CONFIG_NET_VENDOR_ATHEROS is not set 120# CONFIG_NET_VENDOR_ATHEROS is not set
123# CONFIG_NET_CADENCE is not set
124# CONFIG_NET_VENDOR_BROADCOM is not set 121# CONFIG_NET_VENDOR_BROADCOM is not set
125# CONFIG_NET_VENDOR_BROCADE is not set 122# CONFIG_NET_VENDOR_BROCADE is not set
126# CONFIG_NET_VENDOR_CHELSIO is not set 123# CONFIG_NET_VENDOR_CHELSIO is not set
diff --git a/arch/powerpc/configs/85xx/ksi8560_defconfig b/arch/powerpc/configs/85xx/ksi8560_defconfig
index aee0d17a9551..3be85c5f1a2a 100644
--- a/arch/powerpc/configs/85xx/ksi8560_defconfig
+++ b/arch/powerpc/configs/85xx/ksi8560_defconfig
@@ -1,17 +1,16 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8# CONFIG_BLK_DEV_BSG is not set 6# CONFIG_BLK_DEV_BSG is not set
7CONFIG_PARTITION_ADVANCED=y
8# CONFIG_MSDOS_PARTITION is not set
9CONFIG_KSI8560=y 9CONFIG_KSI8560=y
10CONFIG_CPM2=y 10CONFIG_CPM2=y
11CONFIG_HIGHMEM=y 11CONFIG_HIGHMEM=y
12CONFIG_BINFMT_MISC=y 12CONFIG_BINFMT_MISC=y
13CONFIG_MATH_EMULATION=y 13CONFIG_MATH_EMULATION=y
14CONFIG_SPARSE_IRQ=y
15# CONFIG_SECCOMP is not set 14# CONFIG_SECCOMP is not set
16CONFIG_NET=y 15CONFIG_NET=y
17CONFIG_PACKET=y 16CONFIG_PACKET=y
@@ -27,8 +26,6 @@ CONFIG_SYN_COOKIES=y
27CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 26CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
28# CONFIG_FW_LOADER is not set 27# CONFIG_FW_LOADER is not set
29CONFIG_MTD=y 28CONFIG_MTD=y
30CONFIG_MTD_CONCAT=y
31CONFIG_MTD_CHAR=y
32CONFIG_MTD_BLOCK=y 29CONFIG_MTD_BLOCK=y
33CONFIG_MTD_CFI=y 30CONFIG_MTD_CFI=y
34CONFIG_MTD_JEDECPROBE=y 31CONFIG_MTD_JEDECPROBE=y
@@ -39,12 +36,11 @@ CONFIG_BLK_DEV_RAM=y
39CONFIG_BLK_DEV_RAM_SIZE=32768 36CONFIG_BLK_DEV_RAM_SIZE=32768
40CONFIG_IDE=y 37CONFIG_IDE=y
41CONFIG_NETDEVICES=y 38CONFIG_NETDEVICES=y
42CONFIG_MARVELL_PHY=y
43CONFIG_NET_ETHERNET=y
44CONFIG_FS_ENET=y 39CONFIG_FS_ENET=y
45# CONFIG_FS_ENET_HAS_SCC is not set 40# CONFIG_FS_ENET_HAS_SCC is not set
46CONFIG_FS_ENET_MDIO_FCC=y 41CONFIG_FS_ENET_MDIO_FCC=y
47CONFIG_GIANFAR=y 42CONFIG_GIANFAR=y
43CONFIG_MARVELL_PHY=y
48# CONFIG_INPUT_MOUSEDEV is not set 44# CONFIG_INPUT_MOUSEDEV is not set
49# CONFIG_INPUT_KEYBOARD is not set 45# CONFIG_INPUT_KEYBOARD is not set
50# CONFIG_INPUT_MOUSE is not set 46# CONFIG_INPUT_MOUSE is not set
@@ -53,22 +49,15 @@ CONFIG_GIANFAR=y
53CONFIG_SERIAL_CPM=y 49CONFIG_SERIAL_CPM=y
54CONFIG_SERIAL_CPM_CONSOLE=y 50CONFIG_SERIAL_CPM_CONSOLE=y
55CONFIG_GEN_RTC=y 51CONFIG_GEN_RTC=y
56CONFIG_VIDEO_OUTPUT_CONTROL=y
57CONFIG_EXT2_FS=y 52CONFIG_EXT2_FS=y
58CONFIG_EXT3_FS=y 53CONFIG_EXT3_FS=y
59# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 54# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
60CONFIG_INOTIFY=y
61CONFIG_PROC_KCORE=y 55CONFIG_PROC_KCORE=y
62CONFIG_TMPFS=y 56CONFIG_TMPFS=y
63CONFIG_NFS_FS=y 57CONFIG_NFS_FS=y
64CONFIG_ROOT_NFS=y 58CONFIG_ROOT_NFS=y
65CONFIG_PARTITION_ADVANCED=y
66# CONFIG_MSDOS_PARTITION is not set
67CONFIG_DEBUG_FS=y 59CONFIG_DEBUG_FS=y
68CONFIG_DEBUG_KERNEL=y
69CONFIG_DETECT_HUNG_TASK=y 60CONFIG_DETECT_HUNG_TASK=y
70CONFIG_DEBUG_MUTEXES=y 61CONFIG_DEBUG_MUTEXES=y
71# CONFIG_DEBUG_BUGVERBOSE is not set 62# CONFIG_DEBUG_BUGVERBOSE is not set
72# CONFIG_RCU_CPU_STALL_DETECTOR is not set
73CONFIG_SYSCTL_SYSCALL_CHECK=y
74# CONFIG_CRYPTO_ANSI_CPRNG is not set 63# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
index 11662c217ac0..e38c373f2edf 100644
--- a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
+++ b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
@@ -1,17 +1,16 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y
4CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 7CONFIG_EXPERT=y
8# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
10# CONFIG_MSDOS_PARTITION is not set
9CONFIG_MPC8540_ADS=y 11CONFIG_MPC8540_ADS=y
10CONFIG_NO_HZ=y
11CONFIG_HIGH_RES_TIMERS=y
12CONFIG_BINFMT_MISC=y 12CONFIG_BINFMT_MISC=y
13CONFIG_MATH_EMULATION=y 13CONFIG_MATH_EMULATION=y
14CONFIG_SPARSE_IRQ=y
15# CONFIG_SECCOMP is not set 14# CONFIG_SECCOMP is not set
16CONFIG_NET=y 15CONFIG_NET=y
17CONFIG_PACKET=y 16CONFIG_PACKET=y
@@ -27,13 +26,10 @@ CONFIG_SYN_COOKIES=y
27# CONFIG_IPV6 is not set 26# CONFIG_IPV6 is not set
28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 27CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
29# CONFIG_FW_LOADER is not set 28# CONFIG_FW_LOADER is not set
30CONFIG_PROC_DEVICETREE=y
31CONFIG_BLK_DEV_LOOP=y 29CONFIG_BLK_DEV_LOOP=y
32CONFIG_BLK_DEV_RAM=y 30CONFIG_BLK_DEV_RAM=y
33CONFIG_BLK_DEV_RAM_SIZE=32768 31CONFIG_BLK_DEV_RAM_SIZE=32768
34CONFIG_NETDEVICES=y 32CONFIG_NETDEVICES=y
35CONFIG_NET_ETHERNET=y
36CONFIG_MII=y
37CONFIG_GIANFAR=y 33CONFIG_GIANFAR=y
38# CONFIG_INPUT_MOUSEDEV is not set 34# CONFIG_INPUT_MOUSEDEV is not set
39# CONFIG_INPUT_KEYBOARD is not set 35# CONFIG_INPUT_KEYBOARD is not set
@@ -44,20 +40,13 @@ CONFIG_SERIAL_8250=y
44CONFIG_SERIAL_8250_CONSOLE=y 40CONFIG_SERIAL_8250_CONSOLE=y
45# CONFIG_HW_RANDOM is not set 41# CONFIG_HW_RANDOM is not set
46CONFIG_GEN_RTC=y 42CONFIG_GEN_RTC=y
47CONFIG_VIDEO_OUTPUT_CONTROL=y
48CONFIG_EXT2_FS=y 43CONFIG_EXT2_FS=y
49CONFIG_EXT3_FS=y 44CONFIG_EXT3_FS=y
50# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 45# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
51CONFIG_INOTIFY=y
52CONFIG_PROC_KCORE=y 46CONFIG_PROC_KCORE=y
53CONFIG_TMPFS=y 47CONFIG_TMPFS=y
54CONFIG_NFS_FS=y 48CONFIG_NFS_FS=y
55CONFIG_ROOT_NFS=y 49CONFIG_ROOT_NFS=y
56CONFIG_PARTITION_ADVANCED=y
57# CONFIG_MSDOS_PARTITION is not set
58CONFIG_DEBUG_KERNEL=y
59CONFIG_DETECT_HUNG_TASK=y 50CONFIG_DETECT_HUNG_TASK=y
60CONFIG_DEBUG_MUTEXES=y 51CONFIG_DEBUG_MUTEXES=y
61# CONFIG_RCU_CPU_STALL_DETECTOR is not set
62CONFIG_SYSCTL_SYSCALL_CHECK=y
63# CONFIG_CRYPTO_ANSI_CPRNG is not set 52# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
index ebe9b30b0721..48fc8e3a7be0 100644
--- a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
+++ b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
@@ -1,15 +1,14 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8# CONFIG_BLK_DEV_BSG is not set 6# CONFIG_BLK_DEV_BSG is not set
7CONFIG_PARTITION_ADVANCED=y
8# CONFIG_MSDOS_PARTITION is not set
9CONFIG_MPC8560_ADS=y 9CONFIG_MPC8560_ADS=y
10CONFIG_BINFMT_MISC=y 10CONFIG_BINFMT_MISC=y
11CONFIG_MATH_EMULATION=y 11CONFIG_MATH_EMULATION=y
12CONFIG_SPARSE_IRQ=y
13# CONFIG_SECCOMP is not set 12# CONFIG_SECCOMP is not set
14CONFIG_PCI=y 13CONFIG_PCI=y
15CONFIG_PCI_DEBUG=y 14CONFIG_PCI_DEBUG=y
@@ -30,13 +29,12 @@ CONFIG_BLK_DEV_LOOP=y
30CONFIG_BLK_DEV_RAM=y 29CONFIG_BLK_DEV_RAM=y
31CONFIG_BLK_DEV_RAM_SIZE=32768 30CONFIG_BLK_DEV_RAM_SIZE=32768
32CONFIG_NETDEVICES=y 31CONFIG_NETDEVICES=y
33CONFIG_MARVELL_PHY=y
34CONFIG_DAVICOM_PHY=y
35CONFIG_NET_ETHERNET=y
36CONFIG_FS_ENET=y 32CONFIG_FS_ENET=y
37# CONFIG_FS_ENET_HAS_SCC is not set 33# CONFIG_FS_ENET_HAS_SCC is not set
38CONFIG_E1000=y
39CONFIG_GIANFAR=y 34CONFIG_GIANFAR=y
35CONFIG_E1000=y
36CONFIG_MARVELL_PHY=y
37CONFIG_DAVICOM_PHY=y
40# CONFIG_INPUT_MOUSEDEV is not set 38# CONFIG_INPUT_MOUSEDEV is not set
41# CONFIG_INPUT_KEYBOARD is not set 39# CONFIG_INPUT_KEYBOARD is not set
42# CONFIG_INPUT_MOUSE is not set 40# CONFIG_INPUT_MOUSE is not set
@@ -45,20 +43,13 @@ CONFIG_GIANFAR=y
45CONFIG_SERIAL_CPM=y 43CONFIG_SERIAL_CPM=y
46CONFIG_SERIAL_CPM_CONSOLE=y 44CONFIG_SERIAL_CPM_CONSOLE=y
47CONFIG_GEN_RTC=y 45CONFIG_GEN_RTC=y
48CONFIG_VIDEO_OUTPUT_CONTROL=y
49CONFIG_EXT2_FS=y 46CONFIG_EXT2_FS=y
50CONFIG_EXT3_FS=y 47CONFIG_EXT3_FS=y
51# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 48# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
52CONFIG_INOTIFY=y
53CONFIG_PROC_KCORE=y 49CONFIG_PROC_KCORE=y
54CONFIG_TMPFS=y 50CONFIG_TMPFS=y
55CONFIG_NFS_FS=y 51CONFIG_NFS_FS=y
56CONFIG_ROOT_NFS=y 52CONFIG_ROOT_NFS=y
57CONFIG_PARTITION_ADVANCED=y
58# CONFIG_MSDOS_PARTITION is not set
59CONFIG_DEBUG_KERNEL=y
60CONFIG_DETECT_HUNG_TASK=y 53CONFIG_DETECT_HUNG_TASK=y
61CONFIG_DEBUG_MUTEXES=y 54CONFIG_DEBUG_MUTEXES=y
62# CONFIG_RCU_CPU_STALL_DETECTOR is not set
63CONFIG_SYSCTL_SYSCALL_CHECK=y
64# CONFIG_CRYPTO_ANSI_CPRNG is not set 55# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
index eb25229b387a..ecb0c3bf8796 100644
--- a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
+++ b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
@@ -1,17 +1,16 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y
4CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 7CONFIG_EXPERT=y
8# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
10# CONFIG_MSDOS_PARTITION is not set
9CONFIG_MPC85xx_CDS=y 11CONFIG_MPC85xx_CDS=y
10CONFIG_NO_HZ=y
11CONFIG_HIGH_RES_TIMERS=y
12CONFIG_BINFMT_MISC=y 12CONFIG_BINFMT_MISC=y
13CONFIG_MATH_EMULATION=y 13CONFIG_MATH_EMULATION=y
14CONFIG_SPARSE_IRQ=y
15# CONFIG_SECCOMP is not set 14# CONFIG_SECCOMP is not set
16CONFIG_PCI=y 15CONFIG_PCI=y
17CONFIG_NET=y 16CONFIG_NET=y
@@ -28,7 +27,6 @@ CONFIG_SYN_COOKIES=y
28# CONFIG_IPV6 is not set 27# CONFIG_IPV6 is not set
29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30# CONFIG_FW_LOADER is not set 29# CONFIG_FW_LOADER is not set
31CONFIG_PROC_DEVICETREE=y
32CONFIG_BLK_DEV_LOOP=y 30CONFIG_BLK_DEV_LOOP=y
33CONFIG_BLK_DEV_RAM=y 31CONFIG_BLK_DEV_RAM=y
34CONFIG_BLK_DEV_RAM_SIZE=32768 32CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -36,10 +34,8 @@ CONFIG_IDE=y
36CONFIG_BLK_DEV_GENERIC=y 34CONFIG_BLK_DEV_GENERIC=y
37CONFIG_BLK_DEV_VIA82CXXX=y 35CONFIG_BLK_DEV_VIA82CXXX=y
38CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
39CONFIG_NET_ETHERNET=y
40CONFIG_MII=y
41CONFIG_E1000=y
42CONFIG_GIANFAR=y 37CONFIG_GIANFAR=y
38CONFIG_E1000=y
43# CONFIG_INPUT_MOUSEDEV is not set 39# CONFIG_INPUT_MOUSEDEV is not set
44# CONFIG_INPUT_KEYBOARD is not set 40# CONFIG_INPUT_KEYBOARD is not set
45# CONFIG_INPUT_MOUSE is not set 41# CONFIG_INPUT_MOUSE is not set
@@ -49,20 +45,13 @@ CONFIG_SERIAL_8250=y
49CONFIG_SERIAL_8250_CONSOLE=y 45CONFIG_SERIAL_8250_CONSOLE=y
50# CONFIG_HW_RANDOM is not set 46# CONFIG_HW_RANDOM is not set
51CONFIG_GEN_RTC=y 47CONFIG_GEN_RTC=y
52CONFIG_VIDEO_OUTPUT_CONTROL=y
53CONFIG_EXT2_FS=y 48CONFIG_EXT2_FS=y
54CONFIG_EXT3_FS=y 49CONFIG_EXT3_FS=y
55# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 50# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
56CONFIG_INOTIFY=y
57CONFIG_PROC_KCORE=y 51CONFIG_PROC_KCORE=y
58CONFIG_TMPFS=y 52CONFIG_TMPFS=y
59CONFIG_NFS_FS=y 53CONFIG_NFS_FS=y
60CONFIG_ROOT_NFS=y 54CONFIG_ROOT_NFS=y
61CONFIG_PARTITION_ADVANCED=y
62# CONFIG_MSDOS_PARTITION is not set
63CONFIG_DEBUG_KERNEL=y
64CONFIG_DETECT_HUNG_TASK=y 55CONFIG_DETECT_HUNG_TASK=y
65CONFIG_DEBUG_MUTEXES=y 56CONFIG_DEBUG_MUTEXES=y
66# CONFIG_RCU_CPU_STALL_DETECTOR is not set
67CONFIG_SYSCTL_SYSCALL_CHECK=y
68# CONFIG_CRYPTO_ANSI_CPRNG is not set 57# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/ppa8548_defconfig b/arch/powerpc/configs/85xx/ppa8548_defconfig
index e80bb9b21eac..190978a5b7d5 100644
--- a/arch/powerpc/configs/85xx/ppa8548_defconfig
+++ b/arch/powerpc/configs/85xx/ppa8548_defconfig
@@ -1,11 +1,16 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_PPA8548=y
3CONFIG_DTC=y
4CONFIG_DEFAULT_UIMAGE=y
5CONFIG_IKCONFIG=y 2CONFIG_IKCONFIG=y
6CONFIG_IKCONFIG_PROC=y 3CONFIG_IKCONFIG_PROC=y
7# CONFIG_PCI is not set 4CONFIG_PPA8548=y
8# CONFIG_USB_SUPPORT is not set 5CONFIG_FSL_LBC=y
6CONFIG_RAPIDIO=y
7CONFIG_FSL_RIO=y
8CONFIG_RAPIDIO_DMA_ENGINE=y
9CONFIG_RAPIDIO_ENUM_BASIC=y
10CONFIG_RAPIDIO_TSI57X=y
11CONFIG_RAPIDIO_CPS_XX=y
12CONFIG_RAPIDIO_TSI568=y
13CONFIG_RAPIDIO_CPS_GEN2=y
9CONFIG_ADVANCED_OPTIONS=y 14CONFIG_ADVANCED_OPTIONS=y
10CONFIG_LOWMEM_SIZE_BOOL=y 15CONFIG_LOWMEM_SIZE_BOOL=y
11CONFIG_LOWMEM_SIZE=0x40000000 16CONFIG_LOWMEM_SIZE=0x40000000
@@ -14,51 +19,28 @@ CONFIG_LOWMEM_CAM_NUM=4
14CONFIG_PAGE_OFFSET_BOOL=y 19CONFIG_PAGE_OFFSET_BOOL=y
15CONFIG_PAGE_OFFSET=0xb0000000 20CONFIG_PAGE_OFFSET=0xb0000000
16CONFIG_KERNEL_START_BOOL=y 21CONFIG_KERNEL_START_BOOL=y
17CONFIG_KERNEL_START=0xb0000000
18# CONFIG_PHYSICAL_START_BOOL is not set
19CONFIG_PHYSICAL_START=0x00000000
20CONFIG_PHYSICAL_ALIGN=0x04000000
21CONFIG_TASK_SIZE_BOOL=y 22CONFIG_TASK_SIZE_BOOL=y
22CONFIG_TASK_SIZE=0xb0000000 23CONFIG_TASK_SIZE=0xb0000000
23 24CONFIG_NET=y
24CONFIG_FSL_LBC=y 25CONFIG_INET=y
25CONFIG_FSL_DMA=y 26CONFIG_IP_PNP=y
26CONFIG_FSL_RIO=y
27
28CONFIG_RAPIDIO=y
29CONFIG_RAPIDIO_DMA_ENGINE=y
30CONFIG_RAPIDIO_TSI57X=y
31CONFIG_RAPIDIO_TSI568=y
32CONFIG_RAPIDIO_CPS_XX=y
33CONFIG_RAPIDIO_CPS_GEN2=y
34CONFIG_SERIAL_8250=y
35CONFIG_SERIAL_8250_CONSOLE=y
36CONFIG_PROC_DEVICETREE=y
37
38CONFIG_MTD=y 27CONFIG_MTD=y
39CONFIG_MTD_BLKDEVS=y 28CONFIG_MTD_CMDLINE_PARTS=y
40CONFIG_MTD_BLOCK=y 29CONFIG_MTD_BLOCK=y
41CONFIG_MTD_CFI=y 30CONFIG_MTD_CFI=y
42CONFIG_MTD_CFI_AMDSTD=y
43CONFIG_MTD_CFI_INTELEXT=y 31CONFIG_MTD_CFI_INTELEXT=y
44CONFIG_MTD_CHAR=y 32CONFIG_MTD_CFI_AMDSTD=y
45CONFIG_MTD_CMDLINE_PARTS=y
46CONFIG_MTD_CONCAT=y
47CONFIG_MTD_PHYSMAP_OF=y 33CONFIG_MTD_PHYSMAP_OF=y
48 34CONFIG_NETDEVICES=y
35CONFIG_GIANFAR=y
36CONFIG_MARVELL_PHY=y
37CONFIG_SERIAL_8250=y
38CONFIG_SERIAL_8250_CONSOLE=y
49CONFIG_I2C=y 39CONFIG_I2C=y
50CONFIG_I2C_MPC=y 40CONFIG_I2C_MPC=y
51CONFIG_I2C_CHARDEV 41# CONFIG_USB_SUPPORT is not set
52CONFIG_RTC_CLASS=y 42CONFIG_RTC_CLASS=y
53CONFIG_RTC_HCTOSYS=y
54CONFIG_RTC_DRV_ISL1208=y 43CONFIG_RTC_DRV_ISL1208=y
55 44CONFIG_FSL_DMA=y
56CONFIG_NET=y
57CONFIG_INET=y
58CONFIG_IP_PNP=y
59CONFIG_NETDEVICES=y
60CONFIG_MII=y
61CONFIG_GIANFAR=y
62CONFIG_MARVELL_PHY=y
63CONFIG_NFS_FS=y 45CONFIG_NFS_FS=y
64CONFIG_ROOT_NFS=y 46CONFIG_ROOT_NFS=y
diff --git a/arch/powerpc/configs/85xx/sbc8548_defconfig b/arch/powerpc/configs/85xx/sbc8548_defconfig
index 008a7a47b89b..72b7ccfbe2c2 100644
--- a/arch/powerpc/configs/85xx/sbc8548_defconfig
+++ b/arch/powerpc/configs/85xx/sbc8548_defconfig
@@ -1,16 +1,13 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8CONFIG_SLAB=y 6CONFIG_SLAB=y
9# CONFIG_BLK_DEV_BSG is not set 7# CONFIG_BLK_DEV_BSG is not set
10CONFIG_SBC8548=y 8CONFIG_SBC8548=y
11CONFIG_BINFMT_MISC=y 9CONFIG_BINFMT_MISC=y
12CONFIG_MATH_EMULATION=y 10CONFIG_MATH_EMULATION=y
13CONFIG_SPARSE_IRQ=y
14# CONFIG_SECCOMP is not set 11# CONFIG_SECCOMP is not set
15CONFIG_PCI=y 12CONFIG_PCI=y
16CONFIG_NET=y 13CONFIG_NET=y
@@ -27,14 +24,19 @@ CONFIG_SYN_COOKIES=y
27# CONFIG_IPV6 is not set 24# CONFIG_IPV6 is not set
28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 25CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
29# CONFIG_FW_LOADER is not set 26# CONFIG_FW_LOADER is not set
30CONFIG_PROC_DEVICETREE=y 27CONFIG_MTD=y
28CONFIG_MTD_BLOCK=y
29CONFIG_MTD_CFI=y
30CONFIG_MTD_CFI_ADV_OPTIONS=y
31CONFIG_MTD_CFI_GEOMETRY=y
32CONFIG_MTD_CFI_I4=y
33CONFIG_MTD_CFI_INTELEXT=y
34CONFIG_MTD_PHYSMAP_OF=y
31CONFIG_BLK_DEV_LOOP=y 35CONFIG_BLK_DEV_LOOP=y
32CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
33CONFIG_NETDEVICES=y 37CONFIG_NETDEVICES=y
34CONFIG_BROADCOM_PHY=y
35CONFIG_NET_ETHERNET=y
36CONFIG_MII=y
37CONFIG_GIANFAR=y 38CONFIG_GIANFAR=y
39CONFIG_BROADCOM_PHY=y
38# CONFIG_INPUT_MOUSEDEV is not set 40# CONFIG_INPUT_MOUSEDEV is not set
39# CONFIG_INPUT_KEYBOARD is not set 41# CONFIG_INPUT_KEYBOARD is not set
40# CONFIG_INPUT_MOUSE is not set 42# CONFIG_INPUT_MOUSE is not set
@@ -44,33 +46,9 @@ CONFIG_SERIAL_8250=y
44CONFIG_SERIAL_8250_CONSOLE=y 46CONFIG_SERIAL_8250_CONSOLE=y
45# CONFIG_HW_RANDOM is not set 47# CONFIG_HW_RANDOM is not set
46CONFIG_GEN_RTC=y 48CONFIG_GEN_RTC=y
47CONFIG_VIDEO_OUTPUT_CONTROL=y
48# CONFIG_HID_SUPPORT is not set
49# CONFIG_USB_SUPPORT is not set 49# CONFIG_USB_SUPPORT is not set
50CONFIG_INOTIFY=y
51CONFIG_PROC_KCORE=y 50CONFIG_PROC_KCORE=y
52CONFIG_TMPFS=y 51CONFIG_TMPFS=y
53CONFIG_NFS_FS=y 52CONFIG_NFS_FS=y
54CONFIG_ROOT_NFS=y 53CONFIG_ROOT_NFS=y
55# CONFIG_RCU_CPU_STALL_DETECTOR is not set
56CONFIG_SYSCTL_SYSCALL_CHECK=y
57# CONFIG_CRYPTO_ANSI_CPRNG is not set 54# CONFIG_CRYPTO_ANSI_CPRNG is not set
58CONFIG_MTD=y
59CONFIG_MTD_OF_PARTS=y
60CONFIG_MTD_CHAR=y
61CONFIG_MTD_BLKDEVS=y
62CONFIG_MTD_BLOCK=y
63CONFIG_MTD_CFI=y
64CONFIG_MTD_GEN_PROBE=y
65CONFIG_MTD_CFI_ADV_OPTIONS=y
66CONFIG_MTD_CFI_NOSWAP=y
67CONFIG_MTD_CFI_GEOMETRY=y
68CONFIG_MTD_MAP_BANK_WIDTH_1=y
69CONFIG_MTD_MAP_BANK_WIDTH_2=y
70CONFIG_MTD_MAP_BANK_WIDTH_4=y
71CONFIG_MTD_CFI_I1=y
72CONFIG_MTD_CFI_I2=y
73CONFIG_MTD_CFI_I4=y
74CONFIG_MTD_CFI_INTELEXT=y
75CONFIG_MTD_CFI_UTIL=y
76CONFIG_MTD_PHYSMAP_OF=y
diff --git a/arch/powerpc/configs/85xx/socrates_defconfig b/arch/powerpc/configs/85xx/socrates_defconfig
index 435fd408eef1..0ad7bd5ee6b6 100644
--- a/arch/powerpc/configs/85xx/socrates_defconfig
+++ b/arch/powerpc/configs/85xx/socrates_defconfig
@@ -1,20 +1,17 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=16 3CONFIG_LOG_BUF_SHIFT=16
5CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8# CONFIG_KALLSYMS is not set 6# CONFIG_KALLSYMS is not set
9# CONFIG_HOTPLUG is not set
10# CONFIG_EPOLL is not set 7# CONFIG_EPOLL is not set
11CONFIG_MODULES=y 8CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
13CONFIG_MODULE_FORCE_UNLOAD=y 10CONFIG_MODULE_FORCE_UNLOAD=y
14# CONFIG_BLK_DEV_BSG is not set 11# CONFIG_BLK_DEV_BSG is not set
12CONFIG_PARTITION_ADVANCED=y
15CONFIG_SOCRATES=y 13CONFIG_SOCRATES=y
16CONFIG_MATH_EMULATION=y 14CONFIG_MATH_EMULATION=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_PCI=y 15CONFIG_PCI=y
19CONFIG_NET=y 16CONFIG_NET=y
20CONFIG_PACKET=y 17CONFIG_PACKET=y
@@ -28,13 +25,8 @@ CONFIG_SYN_COOKIES=y
28# CONFIG_INET_LRO is not set 25# CONFIG_INET_LRO is not set
29# CONFIG_IPV6 is not set 26# CONFIG_IPV6 is not set
30CONFIG_CAN=y 27CONFIG_CAN=y
31CONFIG_CAN_RAW=y
32CONFIG_CAN_BCM=y
33CONFIG_MTD=y 28CONFIG_MTD=y
34CONFIG_MTD_CONCAT=y
35CONFIG_MTD_CMDLINE_PARTS=y 29CONFIG_MTD_CMDLINE_PARTS=y
36CONFIG_MTD_OF_PARTS=y
37CONFIG_MTD_CHAR=y
38CONFIG_MTD_BLOCK=y 30CONFIG_MTD_BLOCK=y
39CONFIG_MTD_CFI=y 31CONFIG_MTD_CFI=y
40CONFIG_MTD_JEDECPROBE=y 32CONFIG_MTD_JEDECPROBE=y
@@ -49,11 +41,8 @@ CONFIG_SCSI=y
49CONFIG_BLK_DEV_SD=y 41CONFIG_BLK_DEV_SD=y
50# CONFIG_SCSI_LOWLEVEL is not set 42# CONFIG_SCSI_LOWLEVEL is not set
51CONFIG_NETDEVICES=y 43CONFIG_NETDEVICES=y
52CONFIG_MARVELL_PHY=y
53CONFIG_NET_ETHERNET=y
54CONFIG_MII=y
55CONFIG_GIANFAR=y 44CONFIG_GIANFAR=y
56# CONFIG_NETDEV_10000 is not set 45CONFIG_MARVELL_PHY=y
57CONFIG_INPUT_MOUSEDEV_SCREEN_X=800 46CONFIG_INPUT_MOUSEDEV_SCREEN_X=800
58CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480 47CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
59CONFIG_INPUT_EVDEV=y 48CONFIG_INPUT_EVDEV=y
@@ -65,7 +54,6 @@ CONFIG_SERIAL_8250=y
65CONFIG_SERIAL_8250_CONSOLE=y 54CONFIG_SERIAL_8250_CONSOLE=y
66CONFIG_SERIAL_8250_NR_UARTS=2 55CONFIG_SERIAL_8250_NR_UARTS=2
67CONFIG_SERIAL_8250_RUNTIME_UARTS=2 56CONFIG_SERIAL_8250_RUNTIME_UARTS=2
68CONFIG_SERIAL_8250_EXTENDED=y
69CONFIG_SERIAL_8250_MANY_PORTS=y 57CONFIG_SERIAL_8250_MANY_PORTS=y
70CONFIG_SERIAL_8250_DETECT_IRQ=y 58CONFIG_SERIAL_8250_DETECT_IRQ=y
71CONFIG_SERIAL_8250_RSA=y 59CONFIG_SERIAL_8250_RSA=y
@@ -82,8 +70,6 @@ CONFIG_FB_MB862XX=y
82CONFIG_FB_MB862XX_LIME=y 70CONFIG_FB_MB862XX_LIME=y
83# CONFIG_VGA_CONSOLE is not set 71# CONFIG_VGA_CONSOLE is not set
84CONFIG_FRAMEBUFFER_CONSOLE=y 72CONFIG_FRAMEBUFFER_CONSOLE=y
85CONFIG_FONTS=y
86CONFIG_FONT_8x16=y
87CONFIG_USB=y 73CONFIG_USB=y
88CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 74CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
89CONFIG_USB_MON=y 75CONFIG_USB_MON=y
@@ -95,15 +81,11 @@ CONFIG_RTC_CLASS=y
95CONFIG_EXT2_FS=y 81CONFIG_EXT2_FS=y
96CONFIG_EXT3_FS=y 82CONFIG_EXT3_FS=y
97# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 83# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
98CONFIG_INOTIFY=y
99CONFIG_PROC_KCORE=y 84CONFIG_PROC_KCORE=y
100CONFIG_TMPFS=y 85CONFIG_TMPFS=y
101CONFIG_JFFS2_FS=y 86CONFIG_JFFS2_FS=y
102CONFIG_CRAMFS=y 87CONFIG_CRAMFS=y
103CONFIG_NFS_FS=y 88CONFIG_NFS_FS=y
104CONFIG_NFS_V3=y
105CONFIG_ROOT_NFS=y 89CONFIG_ROOT_NFS=y
106CONFIG_PARTITION_ADVANCED=y 90CONFIG_FONTS=y
107# CONFIG_RCU_CPU_STALL_DETECTOR is not set
108CONFIG_SYSCTL_SYSCALL_CHECK=y
109# CONFIG_CRYPTO_ANSI_CPRNG is not set 91# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/stx_gp3_defconfig b/arch/powerpc/configs/85xx/stx_gp3_defconfig
index 5d4db154bf59..f66d16ba8c58 100644
--- a/arch/powerpc/configs/85xx/stx_gp3_defconfig
+++ b/arch/powerpc/configs/85xx/stx_gp3_defconfig
@@ -1,9 +1,7 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8CONFIG_MODULES=y 6CONFIG_MODULES=y
9CONFIG_MODVERSIONS=y 7CONFIG_MODVERSIONS=y
@@ -12,7 +10,6 @@ CONFIG_STX_GP3=y
12CONFIG_HIGHMEM=y 10CONFIG_HIGHMEM=y
13CONFIG_BINFMT_MISC=m 11CONFIG_BINFMT_MISC=m
14CONFIG_MATH_EMULATION=y 12CONFIG_MATH_EMULATION=y
15CONFIG_SPARSE_IRQ=y
16CONFIG_PCI=y 13CONFIG_PCI=y
17CONFIG_NET=y 14CONFIG_NET=y
18CONFIG_PACKET=y 15CONFIG_PACKET=y
@@ -28,7 +25,6 @@ CONFIG_IP_NF_FILTER=m
28CONFIG_NET_PKTGEN=y 25CONFIG_NET_PKTGEN=y
29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 26CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30# CONFIG_FW_LOADER is not set 27# CONFIG_FW_LOADER is not set
31CONFIG_PROC_DEVICETREE=y
32CONFIG_PARPORT=m 28CONFIG_PARPORT=m
33CONFIG_PARPORT_PC=m 29CONFIG_PARPORT_PC=m
34CONFIG_BLK_DEV_LOOP=m 30CONFIG_BLK_DEV_LOOP=m
@@ -42,12 +38,10 @@ CONFIG_BLK_DEV_SD=m
42CONFIG_CHR_DEV_ST=m 38CONFIG_CHR_DEV_ST=m
43CONFIG_BLK_DEV_SR=m 39CONFIG_BLK_DEV_SR=m
44CONFIG_CHR_DEV_SG=m 40CONFIG_CHR_DEV_SG=m
45CONFIG_SCSI_MULTI_LUN=y
46CONFIG_SCSI_CONSTANTS=y 41CONFIG_SCSI_CONSTANTS=y
47CONFIG_NETDEVICES=y 42CONFIG_NETDEVICES=y
48CONFIG_MARVELL_PHY=y
49CONFIG_NET_ETHERNET=y
50CONFIG_GIANFAR=y 43CONFIG_GIANFAR=y
44CONFIG_MARVELL_PHY=y
51CONFIG_INPUT_MOUSEDEV_SCREEN_X=1280 45CONFIG_INPUT_MOUSEDEV_SCREEN_X=1280
52CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1024 46CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1024
53CONFIG_INPUT_JOYDEV=m 47CONFIG_INPUT_JOYDEV=m
@@ -63,8 +57,6 @@ CONFIG_SOUND=m
63CONFIG_EXT2_FS=y 57CONFIG_EXT2_FS=y
64CONFIG_EXT3_FS=y 58CONFIG_EXT3_FS=y
65# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 59# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
66CONFIG_INOTIFY=y
67CONFIG_AUTOFS_FS=m
68CONFIG_AUTOFS4_FS=y 60CONFIG_AUTOFS4_FS=y
69CONFIG_ISO9660_FS=m 61CONFIG_ISO9660_FS=m
70CONFIG_UDF_FS=m 62CONFIG_UDF_FS=m
@@ -73,16 +65,11 @@ CONFIG_VFAT_FS=m
73CONFIG_TMPFS=y 65CONFIG_TMPFS=y
74CONFIG_CRAMFS=m 66CONFIG_CRAMFS=m
75CONFIG_NFS_FS=y 67CONFIG_NFS_FS=y
76CONFIG_NFS_V3=y
77CONFIG_ROOT_NFS=y 68CONFIG_ROOT_NFS=y
78CONFIG_SMB_FS=m
79CONFIG_NLS=y 69CONFIG_NLS=y
80CONFIG_CRC_CCITT=y 70CONFIG_CRC_CCITT=y
81CONFIG_CRC_T10DIF=m 71CONFIG_CRC_T10DIF=m
82CONFIG_DEBUG_KERNEL=y
83CONFIG_DETECT_HUNG_TASK=y 72CONFIG_DETECT_HUNG_TASK=y
84# CONFIG_DEBUG_BUGVERBOSE is not set 73# CONFIG_DEBUG_BUGVERBOSE is not set
85# CONFIG_RCU_CPU_STALL_DETECTOR is not set
86CONFIG_SYSCTL_SYSCALL_CHECK=y
87CONFIG_BDI_SWITCH=y 74CONFIG_BDI_SWITCH=y
88# CONFIG_CRYPTO_ANSI_CPRNG is not set 75# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig
index 5a800e6e38e3..4daaf2943b44 100644
--- a/arch/powerpc/configs/85xx/tqm8540_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8540_defconfig
@@ -1,17 +1,15 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8# CONFIG_KALLSYMS is not set 6# CONFIG_KALLSYMS is not set
9# CONFIG_HOTPLUG is not set
10# CONFIG_EPOLL is not set 7# CONFIG_EPOLL is not set
11# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
10# CONFIG_MSDOS_PARTITION is not set
12CONFIG_TQM8540=y 11CONFIG_TQM8540=y
13CONFIG_MATH_EMULATION=y 12CONFIG_MATH_EMULATION=y
14CONFIG_SPARSE_IRQ=y
15CONFIG_PCI=y 13CONFIG_PCI=y
16CONFIG_NET=y 14CONFIG_NET=y
17CONFIG_PACKET=y 15CONFIG_PACKET=y
@@ -25,9 +23,7 @@ CONFIG_SYN_COOKIES=y
25# CONFIG_INET_LRO is not set 23# CONFIG_INET_LRO is not set
26# CONFIG_IPV6 is not set 24# CONFIG_IPV6 is not set
27CONFIG_MTD=y 25CONFIG_MTD=y
28CONFIG_MTD_CONCAT=y
29CONFIG_MTD_CMDLINE_PARTS=y 26CONFIG_MTD_CMDLINE_PARTS=y
30CONFIG_MTD_CHAR=y
31CONFIG_MTD_BLOCK=y 27CONFIG_MTD_BLOCK=y
32CONFIG_MTD_CFI=y 28CONFIG_MTD_CFI=y
33CONFIG_MTD_CFI_AMDSTD=y 29CONFIG_MTD_CFI_AMDSTD=y
@@ -38,10 +34,8 @@ CONFIG_IDE=y
38CONFIG_BLK_DEV_GENERIC=y 34CONFIG_BLK_DEV_GENERIC=y
39CONFIG_BLK_DEV_VIA82CXXX=y 35CONFIG_BLK_DEV_VIA82CXXX=y
40CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
41CONFIG_NET_ETHERNET=y
42CONFIG_NET_PCI=y
43CONFIG_E100=y
44CONFIG_GIANFAR=y 37CONFIG_GIANFAR=y
38CONFIG_E100=y
45# CONFIG_INPUT_MOUSEDEV is not set 39# CONFIG_INPUT_MOUSEDEV is not set
46# CONFIG_INPUT_KEYBOARD is not set 40# CONFIG_INPUT_KEYBOARD is not set
47# CONFIG_INPUT_MOUSE is not set 41# CONFIG_INPUT_MOUSE is not set
@@ -58,15 +52,10 @@ CONFIG_SENSORS_LM75=y
58CONFIG_EXT2_FS=y 52CONFIG_EXT2_FS=y
59CONFIG_EXT3_FS=y 53CONFIG_EXT3_FS=y
60# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 54# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
61CONFIG_INOTIFY=y
62CONFIG_PROC_KCORE=y 55CONFIG_PROC_KCORE=y
63CONFIG_TMPFS=y 56CONFIG_TMPFS=y
64CONFIG_JFFS2_FS=y 57CONFIG_JFFS2_FS=y
65CONFIG_CRAMFS=y 58CONFIG_CRAMFS=y
66CONFIG_NFS_FS=y 59CONFIG_NFS_FS=y
67CONFIG_ROOT_NFS=y 60CONFIG_ROOT_NFS=y
68CONFIG_PARTITION_ADVANCED=y
69# CONFIG_MSDOS_PARTITION is not set
70# CONFIG_RCU_CPU_STALL_DETECTOR is not set
71CONFIG_SYSCTL_SYSCALL_CHECK=y
72# CONFIG_CRYPTO_ANSI_CPRNG is not set 61# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig
index 2d936697d69e..bb402b3cf786 100644
--- a/arch/powerpc/configs/85xx/tqm8541_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8541_defconfig
@@ -1,17 +1,15 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8# CONFIG_KALLSYMS is not set 6# CONFIG_KALLSYMS is not set
9# CONFIG_HOTPLUG is not set
10# CONFIG_EPOLL is not set 7# CONFIG_EPOLL is not set
11# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
10# CONFIG_MSDOS_PARTITION is not set
12CONFIG_TQM8541=y 11CONFIG_TQM8541=y
13CONFIG_MATH_EMULATION=y 12CONFIG_MATH_EMULATION=y
14CONFIG_SPARSE_IRQ=y
15CONFIG_PCI=y 13CONFIG_PCI=y
16CONFIG_NET=y 14CONFIG_NET=y
17CONFIG_PACKET=y 15CONFIG_PACKET=y
@@ -25,9 +23,7 @@ CONFIG_SYN_COOKIES=y
25# CONFIG_INET_LRO is not set 23# CONFIG_INET_LRO is not set
26# CONFIG_IPV6 is not set 24# CONFIG_IPV6 is not set
27CONFIG_MTD=y 25CONFIG_MTD=y
28CONFIG_MTD_CONCAT=y
29CONFIG_MTD_CMDLINE_PARTS=y 26CONFIG_MTD_CMDLINE_PARTS=y
30CONFIG_MTD_CHAR=y
31CONFIG_MTD_BLOCK=y 27CONFIG_MTD_BLOCK=y
32CONFIG_MTD_CFI=y 28CONFIG_MTD_CFI=y
33CONFIG_MTD_CFI_AMDSTD=y 29CONFIG_MTD_CFI_AMDSTD=y
@@ -38,10 +34,8 @@ CONFIG_IDE=y
38CONFIG_BLK_DEV_GENERIC=y 34CONFIG_BLK_DEV_GENERIC=y
39CONFIG_BLK_DEV_VIA82CXXX=y 35CONFIG_BLK_DEV_VIA82CXXX=y
40CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
41CONFIG_NET_ETHERNET=y
42CONFIG_NET_PCI=y
43CONFIG_E100=y
44CONFIG_GIANFAR=y 37CONFIG_GIANFAR=y
38CONFIG_E100=y
45# CONFIG_INPUT_MOUSEDEV is not set 39# CONFIG_INPUT_MOUSEDEV is not set
46# CONFIG_INPUT_KEYBOARD is not set 40# CONFIG_INPUT_KEYBOARD is not set
47# CONFIG_INPUT_MOUSE is not set 41# CONFIG_INPUT_MOUSE is not set
@@ -60,15 +54,10 @@ CONFIG_SENSORS_LM75=y
60CONFIG_EXT2_FS=y 54CONFIG_EXT2_FS=y
61CONFIG_EXT3_FS=y 55CONFIG_EXT3_FS=y
62# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 56# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
63CONFIG_INOTIFY=y
64CONFIG_PROC_KCORE=y 57CONFIG_PROC_KCORE=y
65CONFIG_TMPFS=y 58CONFIG_TMPFS=y
66CONFIG_JFFS2_FS=y 59CONFIG_JFFS2_FS=y
67CONFIG_CRAMFS=y 60CONFIG_CRAMFS=y
68CONFIG_NFS_FS=y 61CONFIG_NFS_FS=y
69CONFIG_ROOT_NFS=y 62CONFIG_ROOT_NFS=y
70CONFIG_PARTITION_ADVANCED=y
71# CONFIG_MSDOS_PARTITION is not set
72# CONFIG_RCU_CPU_STALL_DETECTOR is not set
73CONFIG_SYSCTL_SYSCALL_CHECK=y
74# CONFIG_CRYPTO_ANSI_CPRNG is not set 63# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/tqm8548_defconfig b/arch/powerpc/configs/85xx/tqm8548_defconfig
index ce8a67e89473..685d0fb132d6 100644
--- a/arch/powerpc/configs/85xx/tqm8548_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8548_defconfig
@@ -1,20 +1,19 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y
4CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 7CONFIG_EXPERT=y
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
12# CONFIG_MSDOS_PARTITION is not set
11CONFIG_TQM8548=y 13CONFIG_TQM8548=y
12CONFIG_HIGHMEM=y 14CONFIG_HIGHMEM=y
13CONFIG_NO_HZ=y
14CONFIG_HIGH_RES_TIMERS=y
15CONFIG_BINFMT_MISC=y 15CONFIG_BINFMT_MISC=y
16CONFIG_MATH_EMULATION=y 16CONFIG_MATH_EMULATION=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_SECCOMP is not set 17# CONFIG_SECCOMP is not set
19CONFIG_PCI=y 18CONFIG_PCI=y
20CONFIG_PCIEPORTBUS=y 19CONFIG_PCIEPORTBUS=y
@@ -34,22 +33,16 @@ CONFIG_SYN_COOKIES=y
34CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 33CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
35# CONFIG_FW_LOADER is not set 34# CONFIG_FW_LOADER is not set
36CONFIG_MTD=y 35CONFIG_MTD=y
37CONFIG_MTD_OF_PARTS=y
38CONFIG_MTD_CHAR=y
39CONFIG_MTD_BLKDEVS=y
40CONFIG_MTD_CFI=y 36CONFIG_MTD_CFI=y
41CONFIG_MTD_CFI_AMDSTD=y 37CONFIG_MTD_CFI_AMDSTD=y
42CONFIG_MTD_PHYSMAP_OF=y 38CONFIG_MTD_PHYSMAP_OF=y
43CONFIG_MTD_NAND_ECC_SMC=y 39CONFIG_MTD_NAND_ECC_SMC=y
44CONFIG_MTD_NAND=y 40CONFIG_MTD_NAND=y
45CONFIG_MTD_NAND_FSL_UPM=y 41CONFIG_MTD_NAND_FSL_UPM=y
46CONFIG_PROC_DEVICETREE=y
47CONFIG_BLK_DEV_LOOP=y 42CONFIG_BLK_DEV_LOOP=y
48CONFIG_BLK_DEV_RAM=y 43CONFIG_BLK_DEV_RAM=y
49CONFIG_BLK_DEV_RAM_SIZE=32768 44CONFIG_BLK_DEV_RAM_SIZE=32768
50CONFIG_NETDEVICES=y 45CONFIG_NETDEVICES=y
51CONFIG_NET_ETHERNET=y
52CONFIG_MII=y
53CONFIG_GIANFAR=y 46CONFIG_GIANFAR=y
54# CONFIG_INPUT_MOUSEDEV is not set 47# CONFIG_INPUT_MOUSEDEV is not set
55# CONFIG_INPUT_KEYBOARD is not set 48# CONFIG_INPUT_KEYBOARD is not set
@@ -63,22 +56,15 @@ CONFIG_I2C=y
63CONFIG_I2C_CHARDEV=y 56CONFIG_I2C_CHARDEV=y
64CONFIG_I2C_MPC=y 57CONFIG_I2C_MPC=y
65CONFIG_SENSORS_LM75=y 58CONFIG_SENSORS_LM75=y
66CONFIG_VIDEO_OUTPUT_CONTROL=y
67# CONFIG_USB_SUPPORT is not set 59# CONFIG_USB_SUPPORT is not set
68CONFIG_RTC_CLASS=y 60CONFIG_RTC_CLASS=y
69CONFIG_RTC_DRV_DS1307=y 61CONFIG_RTC_DRV_DS1307=y
70CONFIG_INOTIFY=y
71CONFIG_PROC_KCORE=y 62CONFIG_PROC_KCORE=y
72CONFIG_TMPFS=y 63CONFIG_TMPFS=y
73CONFIG_JFFS2_FS=y 64CONFIG_JFFS2_FS=y
74CONFIG_NFS_FS=y 65CONFIG_NFS_FS=y
75CONFIG_ROOT_NFS=y 66CONFIG_ROOT_NFS=y
76CONFIG_PARTITION_ADVANCED=y
77# CONFIG_MSDOS_PARTITION is not set
78CONFIG_DEBUG_KERNEL=y
79CONFIG_DETECT_HUNG_TASK=y 67CONFIG_DETECT_HUNG_TASK=y
80CONFIG_DEBUG_MUTEXES=y 68CONFIG_DEBUG_MUTEXES=y
81# CONFIG_DEBUG_BUGVERBOSE is not set 69# CONFIG_DEBUG_BUGVERBOSE is not set
82# CONFIG_RCU_CPU_STALL_DETECTOR is not set
83CONFIG_SYSCTL_SYSCALL_CHECK=y
84# CONFIG_CRYPTO_ANSI_CPRNG is not set 70# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig
index a4e12971ccac..02a931d4e954 100644
--- a/arch/powerpc/configs/85xx/tqm8555_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8555_defconfig
@@ -1,17 +1,15 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8# CONFIG_KALLSYMS is not set 6# CONFIG_KALLSYMS is not set
9# CONFIG_HOTPLUG is not set
10# CONFIG_EPOLL is not set 7# CONFIG_EPOLL is not set
11# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
10# CONFIG_MSDOS_PARTITION is not set
12CONFIG_TQM8555=y 11CONFIG_TQM8555=y
13CONFIG_MATH_EMULATION=y 12CONFIG_MATH_EMULATION=y
14CONFIG_SPARSE_IRQ=y
15CONFIG_PCI=y 13CONFIG_PCI=y
16CONFIG_NET=y 14CONFIG_NET=y
17CONFIG_PACKET=y 15CONFIG_PACKET=y
@@ -25,9 +23,7 @@ CONFIG_SYN_COOKIES=y
25# CONFIG_INET_LRO is not set 23# CONFIG_INET_LRO is not set
26# CONFIG_IPV6 is not set 24# CONFIG_IPV6 is not set
27CONFIG_MTD=y 25CONFIG_MTD=y
28CONFIG_MTD_CONCAT=y
29CONFIG_MTD_CMDLINE_PARTS=y 26CONFIG_MTD_CMDLINE_PARTS=y
30CONFIG_MTD_CHAR=y
31CONFIG_MTD_BLOCK=y 27CONFIG_MTD_BLOCK=y
32CONFIG_MTD_CFI=y 28CONFIG_MTD_CFI=y
33CONFIG_MTD_CFI_AMDSTD=y 29CONFIG_MTD_CFI_AMDSTD=y
@@ -38,10 +34,8 @@ CONFIG_IDE=y
38CONFIG_BLK_DEV_GENERIC=y 34CONFIG_BLK_DEV_GENERIC=y
39CONFIG_BLK_DEV_VIA82CXXX=y 35CONFIG_BLK_DEV_VIA82CXXX=y
40CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
41CONFIG_NET_ETHERNET=y
42CONFIG_NET_PCI=y
43CONFIG_E100=y
44CONFIG_GIANFAR=y 37CONFIG_GIANFAR=y
38CONFIG_E100=y
45# CONFIG_INPUT_MOUSEDEV is not set 39# CONFIG_INPUT_MOUSEDEV is not set
46# CONFIG_INPUT_KEYBOARD is not set 40# CONFIG_INPUT_KEYBOARD is not set
47# CONFIG_INPUT_MOUSE is not set 41# CONFIG_INPUT_MOUSE is not set
@@ -60,15 +54,10 @@ CONFIG_SENSORS_LM75=y
60CONFIG_EXT2_FS=y 54CONFIG_EXT2_FS=y
61CONFIG_EXT3_FS=y 55CONFIG_EXT3_FS=y
62# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 56# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
63CONFIG_INOTIFY=y
64CONFIG_PROC_KCORE=y 57CONFIG_PROC_KCORE=y
65CONFIG_TMPFS=y 58CONFIG_TMPFS=y
66CONFIG_JFFS2_FS=y 59CONFIG_JFFS2_FS=y
67CONFIG_CRAMFS=y 60CONFIG_CRAMFS=y
68CONFIG_NFS_FS=y 61CONFIG_NFS_FS=y
69CONFIG_ROOT_NFS=y 62CONFIG_ROOT_NFS=y
70CONFIG_PARTITION_ADVANCED=y
71# CONFIG_MSDOS_PARTITION is not set
72# CONFIG_RCU_CPU_STALL_DETECTOR is not set
73CONFIG_SYSCTL_SYSCALL_CHECK=y
74# CONFIG_CRYPTO_ANSI_CPRNG is not set 63# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig
index 341abe18a74d..633d5b759a36 100644
--- a/arch/powerpc/configs/85xx/tqm8560_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8560_defconfig
@@ -1,17 +1,15 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8# CONFIG_KALLSYMS is not set 6# CONFIG_KALLSYMS is not set
9# CONFIG_HOTPLUG is not set
10# CONFIG_EPOLL is not set 7# CONFIG_EPOLL is not set
11# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
10# CONFIG_MSDOS_PARTITION is not set
12CONFIG_TQM8560=y 11CONFIG_TQM8560=y
13CONFIG_MATH_EMULATION=y 12CONFIG_MATH_EMULATION=y
14CONFIG_SPARSE_IRQ=y
15CONFIG_PCI=y 13CONFIG_PCI=y
16CONFIG_NET=y 14CONFIG_NET=y
17CONFIG_PACKET=y 15CONFIG_PACKET=y
@@ -25,9 +23,7 @@ CONFIG_SYN_COOKIES=y
25# CONFIG_INET_LRO is not set 23# CONFIG_INET_LRO is not set
26# CONFIG_IPV6 is not set 24# CONFIG_IPV6 is not set
27CONFIG_MTD=y 25CONFIG_MTD=y
28CONFIG_MTD_CONCAT=y
29CONFIG_MTD_CMDLINE_PARTS=y 26CONFIG_MTD_CMDLINE_PARTS=y
30CONFIG_MTD_CHAR=y
31CONFIG_MTD_BLOCK=y 27CONFIG_MTD_BLOCK=y
32CONFIG_MTD_CFI=y 28CONFIG_MTD_CFI=y
33CONFIG_MTD_CFI_AMDSTD=y 29CONFIG_MTD_CFI_AMDSTD=y
@@ -38,10 +34,8 @@ CONFIG_IDE=y
38CONFIG_BLK_DEV_GENERIC=y 34CONFIG_BLK_DEV_GENERIC=y
39CONFIG_BLK_DEV_VIA82CXXX=y 35CONFIG_BLK_DEV_VIA82CXXX=y
40CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
41CONFIG_NET_ETHERNET=y
42CONFIG_NET_PCI=y
43CONFIG_E100=y
44CONFIG_GIANFAR=y 37CONFIG_GIANFAR=y
38CONFIG_E100=y
45# CONFIG_INPUT_MOUSEDEV is not set 39# CONFIG_INPUT_MOUSEDEV is not set
46# CONFIG_INPUT_KEYBOARD is not set 40# CONFIG_INPUT_KEYBOARD is not set
47# CONFIG_INPUT_MOUSE is not set 41# CONFIG_INPUT_MOUSE is not set
@@ -60,15 +54,10 @@ CONFIG_SENSORS_LM75=y
60CONFIG_EXT2_FS=y 54CONFIG_EXT2_FS=y
61CONFIG_EXT3_FS=y 55CONFIG_EXT3_FS=y
62# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 56# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
63CONFIG_INOTIFY=y
64CONFIG_PROC_KCORE=y 57CONFIG_PROC_KCORE=y
65CONFIG_TMPFS=y 58CONFIG_TMPFS=y
66CONFIG_JFFS2_FS=y 59CONFIG_JFFS2_FS=y
67CONFIG_CRAMFS=y 60CONFIG_CRAMFS=y
68CONFIG_NFS_FS=y 61CONFIG_NFS_FS=y
69CONFIG_ROOT_NFS=y 62CONFIG_ROOT_NFS=y
70CONFIG_PARTITION_ADVANCED=y
71# CONFIG_MSDOS_PARTITION is not set
72# CONFIG_RCU_CPU_STALL_DETECTOR is not set
73CONFIG_SYSCTL_SYSCALL_CHECK=y
74# CONFIG_CRYPTO_ANSI_CPRNG is not set 63# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
index 72df8ab8449e..34f3ea1729e0 100644
--- a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
+++ b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
@@ -1,29 +1,25 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_SMP=y 2CONFIG_SMP=y
3CONFIG_NR_CPUS=2 3CONFIG_NR_CPUS=2
4CONFIG_EXPERIMENTAL=y
5CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
6CONFIG_POSIX_MQUEUE=y 5CONFIG_POSIX_MQUEUE=y
7CONFIG_BSD_PROCESS_ACCT=y
8CONFIG_AUDIT=y 6CONFIG_AUDIT=y
7CONFIG_BSD_PROCESS_ACCT=y
9CONFIG_IKCONFIG=y 8CONFIG_IKCONFIG=y
10CONFIG_IKCONFIG_PROC=y 9CONFIG_IKCONFIG_PROC=y
11CONFIG_LOG_BUF_SHIFT=14 10CONFIG_LOG_BUF_SHIFT=14
12CONFIG_BLK_DEV_INITRD=y 11CONFIG_BLK_DEV_INITRD=y
13# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
14CONFIG_EXPERT=y 12CONFIG_EXPERT=y
15CONFIG_KALLSYMS_ALL=y 13CONFIG_KALLSYMS_ALL=y
16CONFIG_KALLSYMS_EXTRA_PASS=y
17CONFIG_MODULES=y 14CONFIG_MODULES=y
18CONFIG_MODULE_UNLOAD=y 15CONFIG_MODULE_UNLOAD=y
19CONFIG_MODULE_FORCE_UNLOAD=y 16CONFIG_MODULE_FORCE_UNLOAD=y
20CONFIG_MODVERSIONS=y 17CONFIG_MODVERSIONS=y
21# CONFIG_BLK_DEV_BSG is not set 18# CONFIG_BLK_DEV_BSG is not set
19CONFIG_PARTITION_ADVANCED=y
22CONFIG_XES_MPC85xx=y 20CONFIG_XES_MPC85xx=y
23CONFIG_GPIO_MPC8XXX=y
24CONFIG_HIGHMEM=y 21CONFIG_HIGHMEM=y
25CONFIG_MATH_EMULATION=y 22CONFIG_MATH_EMULATION=y
26CONFIG_SPARSE_IRQ=y
27CONFIG_PCI=y 23CONFIG_PCI=y
28CONFIG_PCIEPORTBUS=y 24CONFIG_PCIEPORTBUS=y
29# CONFIG_PCIEASPM is not set 25# CONFIG_PCIEASPM is not set
@@ -52,12 +48,9 @@ CONFIG_IP_PNP_DHCP=y
52CONFIG_IP_PNP_BOOTP=y 48CONFIG_IP_PNP_BOOTP=y
53CONFIG_IP_PNP_RARP=y 49CONFIG_IP_PNP_RARP=y
54CONFIG_NET_IPIP=y 50CONFIG_NET_IPIP=y
55CONFIG_NET_IPGRE=y
56CONFIG_NET_IPGRE_BROADCAST=y
57CONFIG_IP_MROUTE=y 51CONFIG_IP_MROUTE=y
58CONFIG_IP_PIMSM_V1=y 52CONFIG_IP_PIMSM_V1=y
59CONFIG_IP_PIMSM_V2=y 53CONFIG_IP_PIMSM_V2=y
60CONFIG_ARPD=y
61# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 54# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
62# CONFIG_INET_XFRM_MODE_TUNNEL is not set 55# CONFIG_INET_XFRM_MODE_TUNNEL is not set
63# CONFIG_INET_XFRM_MODE_BEET is not set 56# CONFIG_INET_XFRM_MODE_BEET is not set
@@ -67,8 +60,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
67CONFIG_MTD=y 60CONFIG_MTD=y
68CONFIG_MTD_REDBOOT_PARTS=y 61CONFIG_MTD_REDBOOT_PARTS=y
69CONFIG_MTD_CMDLINE_PARTS=y 62CONFIG_MTD_CMDLINE_PARTS=y
70CONFIG_MTD_OF_PARTS=y
71CONFIG_MTD_CHAR=y
72CONFIG_MTD_BLOCK=y 63CONFIG_MTD_BLOCK=y
73CONFIG_MTD_CFI=y 64CONFIG_MTD_CFI=y
74CONFIG_MTD_JEDECPROBE=y 65CONFIG_MTD_JEDECPROBE=y
@@ -79,7 +70,6 @@ CONFIG_MTD_PHYSMAP_OF=y
79CONFIG_MTD_NAND=y 70CONFIG_MTD_NAND=y
80CONFIG_MTD_NAND_FSL_ELBC=y 71CONFIG_MTD_NAND_FSL_ELBC=y
81CONFIG_MTD_NAND_FSL_UPM=y 72CONFIG_MTD_NAND_FSL_UPM=y
82CONFIG_PROC_DEVICETREE=y
83CONFIG_BLK_DEV_LOOP=y 73CONFIG_BLK_DEV_LOOP=y
84CONFIG_BLK_DEV_NBD=y 74CONFIG_BLK_DEV_NBD=y
85CONFIG_BLK_DEV_RAM=y 75CONFIG_BLK_DEV_RAM=y
@@ -88,19 +78,15 @@ CONFIG_BLK_DEV_SD=y
88CONFIG_CHR_DEV_ST=y 78CONFIG_CHR_DEV_ST=y
89CONFIG_BLK_DEV_SR=y 79CONFIG_BLK_DEV_SR=y
90CONFIG_CHR_DEV_SG=y 80CONFIG_CHR_DEV_SG=y
91CONFIG_SCSI_MULTI_LUN=y
92CONFIG_SCSI_LOGGING=y 81CONFIG_SCSI_LOGGING=y
93CONFIG_ATA=y 82CONFIG_ATA=y
94CONFIG_SATA_AHCI=y 83CONFIG_SATA_AHCI=y
95CONFIG_PATA_ALI=y 84CONFIG_PATA_ALI=y
96CONFIG_NETDEVICES=y 85CONFIG_NETDEVICES=y
97CONFIG_DUMMY=y 86CONFIG_DUMMY=y
98CONFIG_BROADCOM_PHY=y
99CONFIG_NET_ETHERNET=y
100CONFIG_MII=y
101CONFIG_E1000=y
102CONFIG_GIANFAR=y 87CONFIG_GIANFAR=y
103# CONFIG_NETDEV_10000 is not set 88CONFIG_E1000=y
89CONFIG_BROADCOM_PHY=y
104# CONFIG_INPUT_MOUSEDEV is not set 90# CONFIG_INPUT_MOUSEDEV is not set
105# CONFIG_INPUT_KEYBOARD is not set 91# CONFIG_INPUT_KEYBOARD is not set
106# CONFIG_INPUT_MOUSE is not set 92# CONFIG_INPUT_MOUSE is not set
@@ -109,7 +95,6 @@ CONFIG_SERIAL_8250=y
109CONFIG_SERIAL_8250_CONSOLE=y 95CONFIG_SERIAL_8250_CONSOLE=y
110CONFIG_SERIAL_8250_NR_UARTS=2 96CONFIG_SERIAL_8250_NR_UARTS=2
111CONFIG_SERIAL_8250_RUNTIME_UARTS=2 97CONFIG_SERIAL_8250_RUNTIME_UARTS=2
112CONFIG_SERIAL_8250_EXTENDED=y
113CONFIG_SERIAL_8250_MANY_PORTS=y 98CONFIG_SERIAL_8250_MANY_PORTS=y
114CONFIG_SERIAL_8250_DETECT_IRQ=y 99CONFIG_SERIAL_8250_DETECT_IRQ=y
115CONFIG_SERIAL_8250_RSA=y 100CONFIG_SERIAL_8250_RSA=y
@@ -118,25 +103,19 @@ CONFIG_NVRAM=y
118CONFIG_I2C=y 103CONFIG_I2C=y
119CONFIG_I2C_CHARDEV=y 104CONFIG_I2C_CHARDEV=y
120CONFIG_I2C_MPC=y 105CONFIG_I2C_MPC=y
121CONFIG_GPIO_SYSFS=y
122CONFIG_GPIO_PCA953X=y
123CONFIG_SENSORS_DS1621=y 106CONFIG_SENSORS_DS1621=y
124CONFIG_SENSORS_LM90=y 107CONFIG_SENSORS_LM90=y
125CONFIG_WATCHDOG=y 108CONFIG_WATCHDOG=y
126CONFIG_VIDEO_OUTPUT_CONTROL=y
127CONFIG_USB=y 109CONFIG_USB=y
128# CONFIG_USB_DEVICE_CLASS is not set
129CONFIG_USB_MON=y 110CONFIG_USB_MON=y
130CONFIG_USB_ISP1760_HCD=y 111CONFIG_USB_ISP1760_HCD=y
131CONFIG_USB_STORAGE=y 112CONFIG_USB_STORAGE=y
132CONFIG_NEW_LEDS=y 113CONFIG_NEW_LEDS=y
133CONFIG_LEDS_CLASS=y 114CONFIG_LEDS_CLASS=y
134CONFIG_LEDS_GPIO=y
135CONFIG_LEDS_PCA955X=y 115CONFIG_LEDS_PCA955X=y
136CONFIG_LEDS_TRIGGERS=y 116CONFIG_LEDS_TRIGGERS=y
137CONFIG_LEDS_TRIGGER_TIMER=y 117CONFIG_LEDS_TRIGGER_TIMER=y
138CONFIG_LEDS_TRIGGER_HEARTBEAT=y 118CONFIG_LEDS_TRIGGER_HEARTBEAT=y
139CONFIG_LEDS_TRIGGER_GPIO=y
140CONFIG_EDAC=y 119CONFIG_EDAC=y
141CONFIG_EDAC_MM_EDAC=y 120CONFIG_EDAC_MM_EDAC=y
142CONFIG_RTC_CLASS=y 121CONFIG_RTC_CLASS=y
@@ -147,7 +126,6 @@ CONFIG_FSL_DMA=y
147CONFIG_EXT2_FS=y 126CONFIG_EXT2_FS=y
148CONFIG_EXT3_FS=y 127CONFIG_EXT3_FS=y
149# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 128# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
150CONFIG_INOTIFY=y
151CONFIG_ISO9660_FS=y 129CONFIG_ISO9660_FS=y
152CONFIG_JOLIET=y 130CONFIG_JOLIET=y
153CONFIG_ZISOFS=y 131CONFIG_ZISOFS=y
@@ -159,17 +137,13 @@ CONFIG_TMPFS=y
159CONFIG_JFFS2_FS=y 137CONFIG_JFFS2_FS=y
160CONFIG_JFFS2_SUMMARY=y 138CONFIG_JFFS2_SUMMARY=y
161CONFIG_NFS_FS=y 139CONFIG_NFS_FS=y
162CONFIG_NFS_V3=y
163CONFIG_ROOT_NFS=y 140CONFIG_ROOT_NFS=y
164CONFIG_NFSD=y 141CONFIG_NFSD=y
165CONFIG_PARTITION_ADVANCED=y
166CONFIG_NLS_CODEPAGE_437=y 142CONFIG_NLS_CODEPAGE_437=y
167CONFIG_NLS_ISO8859_1=y 143CONFIG_NLS_ISO8859_1=y
168CONFIG_CRC_T10DIF=y 144CONFIG_CRC_T10DIF=y
169CONFIG_DEBUG_KERNEL=y
170CONFIG_DETECT_HUNG_TASK=y 145CONFIG_DETECT_HUNG_TASK=y
171# CONFIG_DEBUG_BUGVERBOSE is not set 146# CONFIG_DEBUG_BUGVERBOSE is not set
172# CONFIG_RCU_CPU_STALL_DETECTOR is not set
173CONFIG_CRYPTO_HMAC=y 147CONFIG_CRYPTO_HMAC=y
174CONFIG_CRYPTO_MD5=y 148CONFIG_CRYPTO_MD5=y
175# CONFIG_CRYPTO_ANSI_CPRNG is not set 149# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig b/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
index 7cb9719abf3d..9792a2cb9b20 100644
--- a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
+++ b/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
@@ -1,8 +1,8 @@
1CONFIG_SMP=y 1CONFIG_SMP=y
2CONFIG_NR_CPUS=2 2CONFIG_NR_CPUS=2
3CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_HIGH_RES_TIMERS=y
6CONFIG_BSD_PROCESS_ACCT=y 6CONFIG_BSD_PROCESS_ACCT=y
7CONFIG_BSD_PROCESS_ACCT_V3=y 7CONFIG_BSD_PROCESS_ACCT_V3=y
8CONFIG_IKCONFIG=y 8CONFIG_IKCONFIG=y
@@ -10,7 +10,6 @@ CONFIG_IKCONFIG_PROC=y
10CONFIG_LOG_BUF_SHIFT=14 10CONFIG_LOG_BUF_SHIFT=14
11CONFIG_RELAY=y 11CONFIG_RELAY=y
12CONFIG_BLK_DEV_INITRD=y 12CONFIG_BLK_DEV_INITRD=y
13# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
14CONFIG_EXPERT=y 13CONFIG_EXPERT=y
15CONFIG_SLAB=y 14CONFIG_SLAB=y
16CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -21,11 +20,9 @@ CONFIG_MODULE_UNLOAD=y
21CONFIG_PPC_86xx=y 20CONFIG_PPC_86xx=y
22CONFIG_GEF_PPC9A=y 21CONFIG_GEF_PPC9A=y
23CONFIG_HIGHMEM=y 22CONFIG_HIGHMEM=y
24CONFIG_HIGH_RES_TIMERS=y
25CONFIG_HZ_1000=y 23CONFIG_HZ_1000=y
26CONFIG_PREEMPT=y 24CONFIG_PREEMPT=y
27CONFIG_BINFMT_MISC=m 25CONFIG_BINFMT_MISC=m
28CONFIG_SPARSE_IRQ=y
29CONFIG_PCI=y 26CONFIG_PCI=y
30CONFIG_PCIEPORTBUS=y 27CONFIG_PCIEPORTBUS=y
31# CONFIG_PCIEASPM is not set 28# CONFIG_PCIEASPM is not set
@@ -52,8 +49,6 @@ CONFIG_IP_PNP_DHCP=y
52CONFIG_IP_PNP_BOOTP=y 49CONFIG_IP_PNP_BOOTP=y
53CONFIG_IP_PNP_RARP=y 50CONFIG_IP_PNP_RARP=y
54CONFIG_NET_IPIP=m 51CONFIG_NET_IPIP=m
55CONFIG_NET_IPGRE=m
56CONFIG_NET_IPGRE_BROADCAST=y
57CONFIG_IP_MROUTE=y 52CONFIG_IP_MROUTE=y
58CONFIG_IP_PIMSM_V1=y 53CONFIG_IP_PIMSM_V1=y
59CONFIG_IP_PIMSM_V2=y 54CONFIG_IP_PIMSM_V2=y
@@ -69,9 +64,6 @@ CONFIG_IPV6_TUNNEL=m
69CONFIG_NET_PKTGEN=m 64CONFIG_NET_PKTGEN=m
70CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 65CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
71CONFIG_MTD=y 66CONFIG_MTD=y
72CONFIG_MTD_CONCAT=y
73CONFIG_MTD_OF_PARTS=y
74CONFIG_MTD_CHAR=y
75CONFIG_MTD_BLOCK=y 67CONFIG_MTD_BLOCK=y
76CONFIG_MTD_CFI=y 68CONFIG_MTD_CFI=y
77CONFIG_MTD_JEDECPROBE=y 69CONFIG_MTD_JEDECPROBE=y
@@ -83,7 +75,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
83CONFIG_BLK_DEV_NBD=m 75CONFIG_BLK_DEV_NBD=m
84CONFIG_BLK_DEV_RAM=y 76CONFIG_BLK_DEV_RAM=y
85CONFIG_BLK_DEV_RAM_SIZE=131072 77CONFIG_BLK_DEV_RAM_SIZE=131072
86CONFIG_MISC_DEVICES=y
87CONFIG_DS1682=y 78CONFIG_DS1682=y
88CONFIG_IDE=y 79CONFIG_IDE=y
89CONFIG_BLK_DEV_IDECS=y 80CONFIG_BLK_DEV_IDECS=y
@@ -93,35 +84,32 @@ CONFIG_BLK_DEV_SR=y
93CONFIG_ATA=y 84CONFIG_ATA=y
94CONFIG_SATA_SIL=y 85CONFIG_SATA_SIL=y
95CONFIG_NETDEVICES=y 86CONFIG_NETDEVICES=y
96CONFIG_DUMMY=m
97CONFIG_BONDING=m 87CONFIG_BONDING=m
88CONFIG_DUMMY=m
89CONFIG_NETCONSOLE=y
98CONFIG_TUN=m 90CONFIG_TUN=m
99CONFIG_NET_ETHERNET=y
100CONFIG_MII=y
101CONFIG_GIANFAR=y 91CONFIG_GIANFAR=y
102# CONFIG_NETDEV_10000 is not set
103CONFIG_PPP=m 92CONFIG_PPP=m
104CONFIG_PPP_MULTILINK=y 93CONFIG_PPP_BSDCOMP=m
94CONFIG_PPP_DEFLATE=m
105CONFIG_PPP_FILTER=y 95CONFIG_PPP_FILTER=y
96CONFIG_PPP_MULTILINK=y
97CONFIG_PPPOE=m
106CONFIG_PPP_ASYNC=m 98CONFIG_PPP_ASYNC=m
107CONFIG_PPP_SYNC_TTY=m 99CONFIG_PPP_SYNC_TTY=m
108CONFIG_PPP_DEFLATE=m
109CONFIG_PPP_BSDCOMP=m
110CONFIG_PPPOE=m
111CONFIG_SLIP=m 100CONFIG_SLIP=m
112CONFIG_SLIP_COMPRESSED=y 101CONFIG_SLIP_COMPRESSED=y
113CONFIG_SLIP_SMART=y 102CONFIG_SLIP_SMART=y
114CONFIG_SLIP_MODE_SLIP6=y 103CONFIG_SLIP_MODE_SLIP6=y
115CONFIG_NETCONSOLE=y
116# CONFIG_INPUT_KEYBOARD is not set 104# CONFIG_INPUT_KEYBOARD is not set
117# CONFIG_INPUT_MOUSE is not set 105# CONFIG_INPUT_MOUSE is not set
118# CONFIG_SERIO is not set 106# CONFIG_SERIO is not set
107# CONFIG_LEGACY_PTYS is not set
119CONFIG_SERIAL_8250=y 108CONFIG_SERIAL_8250=y
120CONFIG_SERIAL_8250_CONSOLE=y 109CONFIG_SERIAL_8250_CONSOLE=y
121# CONFIG_SERIAL_8250_PCI is not set 110# CONFIG_SERIAL_8250_PCI is not set
122CONFIG_SERIAL_8250_NR_UARTS=2 111CONFIG_SERIAL_8250_NR_UARTS=2
123CONFIG_SERIAL_8250_RUNTIME_UARTS=2 112CONFIG_SERIAL_8250_RUNTIME_UARTS=2
124# CONFIG_LEGACY_PTYS is not set
125CONFIG_HW_RANDOM=y 113CONFIG_HW_RANDOM=y
126CONFIG_NVRAM=y 114CONFIG_NVRAM=y
127CONFIG_I2C=y 115CONFIG_I2C=y
@@ -133,7 +121,6 @@ CONFIG_SENSORS_LM90=y
133CONFIG_SENSORS_LM92=y 121CONFIG_SENSORS_LM92=y
134CONFIG_WATCHDOG=y 122CONFIG_WATCHDOG=y
135CONFIG_GEF_WDT=y 123CONFIG_GEF_WDT=y
136CONFIG_VIDEO_OUTPUT_CONTROL=m
137CONFIG_HID_A4TECH=y 124CONFIG_HID_A4TECH=y
138CONFIG_HID_APPLE=y 125CONFIG_HID_APPLE=y
139CONFIG_HID_BELKIN=y 126CONFIG_HID_BELKIN=y
@@ -148,10 +135,8 @@ CONFIG_HID_MONTEREY=y
148CONFIG_HID_PANTHERLORD=y 135CONFIG_HID_PANTHERLORD=y
149CONFIG_HID_PETALYNX=y 136CONFIG_HID_PETALYNX=y
150CONFIG_HID_SAMSUNG=y 137CONFIG_HID_SAMSUNG=y
151CONFIG_HID_SONY=y
152CONFIG_HID_SUNPLUS=y 138CONFIG_HID_SUNPLUS=y
153CONFIG_USB=y 139CONFIG_USB=y
154# CONFIG_USB_DEVICE_CLASS is not set
155CONFIG_USB_EHCI_HCD=y 140CONFIG_USB_EHCI_HCD=y
156# CONFIG_USB_EHCI_HCD_PPC_OF is not set 141# CONFIG_USB_EHCI_HCD_PPC_OF is not set
157CONFIG_USB_OHCI_HCD=y 142CONFIG_USB_OHCI_HCD=y
@@ -160,7 +145,6 @@ CONFIG_RTC_CLASS=y
160# CONFIG_RTC_INTF_PROC is not set 145# CONFIG_RTC_INTF_PROC is not set
161CONFIG_RTC_DRV_RX8581=y 146CONFIG_RTC_DRV_RX8581=y
162CONFIG_STAGING=y 147CONFIG_STAGING=y
163# CONFIG_STAGING_EXCLUDE_BUILD is not set
164CONFIG_VME_BUS=y 148CONFIG_VME_BUS=y
165CONFIG_VME_TSI148=y 149CONFIG_VME_TSI148=y
166CONFIG_EXT2_FS=y 150CONFIG_EXT2_FS=y
@@ -169,7 +153,6 @@ CONFIG_EXT2_FS_POSIX_ACL=y
169CONFIG_EXT3_FS=y 153CONFIG_EXT3_FS=y
170# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 154# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
171CONFIG_EXT3_FS_POSIX_ACL=y 155CONFIG_EXT3_FS_POSIX_ACL=y
172CONFIG_INOTIFY=y
173CONFIG_ISO9660_FS=y 156CONFIG_ISO9660_FS=y
174CONFIG_JOLIET=y 157CONFIG_JOLIET=y
175CONFIG_ZISOFS=y 158CONFIG_ZISOFS=y
@@ -182,7 +165,6 @@ CONFIG_PROC_KCORE=y
182CONFIG_TMPFS=y 165CONFIG_TMPFS=y
183CONFIG_JFFS2_FS=y 166CONFIG_JFFS2_FS=y
184CONFIG_NFS_FS=y 167CONFIG_NFS_FS=y
185CONFIG_NFS_V3=y
186CONFIG_NFS_V4=y 168CONFIG_NFS_V4=y
187CONFIG_ROOT_NFS=y 169CONFIG_ROOT_NFS=y
188CONFIG_CIFS=m 170CONFIG_CIFS=m
@@ -230,7 +212,5 @@ CONFIG_CRC_CCITT=y
230CONFIG_CRC_T10DIF=y 212CONFIG_CRC_T10DIF=y
231CONFIG_LIBCRC32C=y 213CONFIG_LIBCRC32C=y
232CONFIG_MAGIC_SYSRQ=y 214CONFIG_MAGIC_SYSRQ=y
233# CONFIG_RCU_CPU_STALL_DETECTOR is not set
234CONFIG_SYSCTL_SYSCALL_CHECK=y
235# CONFIG_CRYPTO_ANSI_CPRNG is not set 215# CONFIG_CRYPTO_ANSI_CPRNG is not set
236# CONFIG_CRYPTO_HW is not set 216# CONFIG_CRYPTO_HW is not set
diff --git a/arch/powerpc/configs/86xx/gef_sbc310_defconfig b/arch/powerpc/configs/86xx/gef_sbc310_defconfig
index ecabf625d249..cadc36682bb4 100644
--- a/arch/powerpc/configs/86xx/gef_sbc310_defconfig
+++ b/arch/powerpc/configs/86xx/gef_sbc310_defconfig
@@ -1,8 +1,8 @@
1CONFIG_SMP=y 1CONFIG_SMP=y
2CONFIG_NR_CPUS=2 2CONFIG_NR_CPUS=2
3CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_HIGH_RES_TIMERS=y
6CONFIG_BSD_PROCESS_ACCT=y 6CONFIG_BSD_PROCESS_ACCT=y
7CONFIG_BSD_PROCESS_ACCT_V3=y 7CONFIG_BSD_PROCESS_ACCT_V3=y
8CONFIG_IKCONFIG=y 8CONFIG_IKCONFIG=y
@@ -10,7 +10,6 @@ CONFIG_IKCONFIG_PROC=y
10CONFIG_LOG_BUF_SHIFT=14 10CONFIG_LOG_BUF_SHIFT=14
11CONFIG_RELAY=y 11CONFIG_RELAY=y
12CONFIG_BLK_DEV_INITRD=y 12CONFIG_BLK_DEV_INITRD=y
13# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
14CONFIG_EXPERT=y 13CONFIG_EXPERT=y
15CONFIG_SLAB=y 14CONFIG_SLAB=y
16CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -21,11 +20,9 @@ CONFIG_MODULE_UNLOAD=y
21CONFIG_PPC_86xx=y 20CONFIG_PPC_86xx=y
22CONFIG_GEF_SBC310=y 21CONFIG_GEF_SBC310=y
23CONFIG_HIGHMEM=y 22CONFIG_HIGHMEM=y
24CONFIG_HIGH_RES_TIMERS=y
25CONFIG_HZ_1000=y 23CONFIG_HZ_1000=y
26CONFIG_PREEMPT=y 24CONFIG_PREEMPT=y
27CONFIG_BINFMT_MISC=y 25CONFIG_BINFMT_MISC=y
28CONFIG_SPARSE_IRQ=y
29CONFIG_PCI=y 26CONFIG_PCI=y
30CONFIG_PCIEPORTBUS=y 27CONFIG_PCIEPORTBUS=y
31# CONFIG_PCIEASPM is not set 28# CONFIG_PCIEASPM is not set
@@ -52,8 +49,6 @@ CONFIG_IP_PNP_DHCP=y
52CONFIG_IP_PNP_BOOTP=y 49CONFIG_IP_PNP_BOOTP=y
53CONFIG_IP_PNP_RARP=y 50CONFIG_IP_PNP_RARP=y
54CONFIG_NET_IPIP=m 51CONFIG_NET_IPIP=m
55CONFIG_NET_IPGRE=m
56CONFIG_NET_IPGRE_BROADCAST=y
57CONFIG_IP_MROUTE=y 52CONFIG_IP_MROUTE=y
58CONFIG_IP_PIMSM_V1=y 53CONFIG_IP_PIMSM_V1=y
59CONFIG_IP_PIMSM_V2=y 54CONFIG_IP_PIMSM_V2=y
@@ -69,9 +64,6 @@ CONFIG_IPV6_TUNNEL=m
69CONFIG_NET_PKTGEN=m 64CONFIG_NET_PKTGEN=m
70CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 65CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
71CONFIG_MTD=y 66CONFIG_MTD=y
72CONFIG_MTD_CONCAT=y
73CONFIG_MTD_OF_PARTS=y
74CONFIG_MTD_CHAR=y
75CONFIG_MTD_BLOCK=y 67CONFIG_MTD_BLOCK=y
76CONFIG_MTD_CFI=y 68CONFIG_MTD_CFI=y
77CONFIG_MTD_JEDECPROBE=y 69CONFIG_MTD_JEDECPROBE=y
@@ -83,7 +75,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
83CONFIG_BLK_DEV_NBD=m 75CONFIG_BLK_DEV_NBD=m
84CONFIG_BLK_DEV_RAM=y 76CONFIG_BLK_DEV_RAM=y
85CONFIG_BLK_DEV_RAM_SIZE=131072 77CONFIG_BLK_DEV_RAM_SIZE=131072
86CONFIG_MISC_DEVICES=y
87CONFIG_DS1682=y 78CONFIG_DS1682=y
88CONFIG_IDE=y 79CONFIG_IDE=y
89CONFIG_BLK_DEV_IDECS=y 80CONFIG_BLK_DEV_IDECS=y
@@ -94,35 +85,32 @@ CONFIG_ATA=y
94CONFIG_SATA_SIL24=y 85CONFIG_SATA_SIL24=y
95# CONFIG_ATA_SFF is not set 86# CONFIG_ATA_SFF is not set
96CONFIG_NETDEVICES=y 87CONFIG_NETDEVICES=y
97CONFIG_DUMMY=m
98CONFIG_BONDING=m 88CONFIG_BONDING=m
89CONFIG_DUMMY=m
90CONFIG_NETCONSOLE=y
99CONFIG_TUN=m 91CONFIG_TUN=m
100CONFIG_NET_ETHERNET=y
101CONFIG_MII=y
102CONFIG_GIANFAR=y 92CONFIG_GIANFAR=y
103# CONFIG_NETDEV_10000 is not set
104CONFIG_PPP=m 93CONFIG_PPP=m
105CONFIG_PPP_MULTILINK=y 94CONFIG_PPP_BSDCOMP=m
95CONFIG_PPP_DEFLATE=m
106CONFIG_PPP_FILTER=y 96CONFIG_PPP_FILTER=y
97CONFIG_PPP_MULTILINK=y
98CONFIG_PPPOE=m
107CONFIG_PPP_ASYNC=m 99CONFIG_PPP_ASYNC=m
108CONFIG_PPP_SYNC_TTY=m 100CONFIG_PPP_SYNC_TTY=m
109CONFIG_PPP_DEFLATE=m
110CONFIG_PPP_BSDCOMP=m
111CONFIG_PPPOE=m
112CONFIG_SLIP=m 101CONFIG_SLIP=m
113CONFIG_SLIP_COMPRESSED=y 102CONFIG_SLIP_COMPRESSED=y
114CONFIG_SLIP_SMART=y 103CONFIG_SLIP_SMART=y
115CONFIG_SLIP_MODE_SLIP6=y 104CONFIG_SLIP_MODE_SLIP6=y
116CONFIG_NETCONSOLE=y
117# CONFIG_INPUT_KEYBOARD is not set 105# CONFIG_INPUT_KEYBOARD is not set
118# CONFIG_INPUT_MOUSE is not set 106# CONFIG_INPUT_MOUSE is not set
119# CONFIG_SERIO is not set 107# CONFIG_SERIO is not set
108# CONFIG_LEGACY_PTYS is not set
120CONFIG_SERIAL_8250=y 109CONFIG_SERIAL_8250=y
121CONFIG_SERIAL_8250_CONSOLE=y 110CONFIG_SERIAL_8250_CONSOLE=y
122# CONFIG_SERIAL_8250_PCI is not set 111# CONFIG_SERIAL_8250_PCI is not set
123CONFIG_SERIAL_8250_NR_UARTS=2 112CONFIG_SERIAL_8250_NR_UARTS=2
124CONFIG_SERIAL_8250_RUNTIME_UARTS=2 113CONFIG_SERIAL_8250_RUNTIME_UARTS=2
125# CONFIG_LEGACY_PTYS is not set
126CONFIG_HW_RANDOM=y 114CONFIG_HW_RANDOM=y
127CONFIG_NVRAM=y 115CONFIG_NVRAM=y
128CONFIG_I2C=y 116CONFIG_I2C=y
@@ -134,7 +122,6 @@ CONFIG_SENSORS_LM90=y
134CONFIG_SENSORS_LM92=y 122CONFIG_SENSORS_LM92=y
135CONFIG_WATCHDOG=y 123CONFIG_WATCHDOG=y
136CONFIG_GEF_WDT=y 124CONFIG_GEF_WDT=y
137CONFIG_VIDEO_OUTPUT_CONTROL=m
138CONFIG_HID_A4TECH=y 125CONFIG_HID_A4TECH=y
139CONFIG_HID_APPLE=y 126CONFIG_HID_APPLE=y
140CONFIG_HID_BELKIN=y 127CONFIG_HID_BELKIN=y
@@ -149,10 +136,8 @@ CONFIG_HID_MONTEREY=y
149CONFIG_HID_PANTHERLORD=y 136CONFIG_HID_PANTHERLORD=y
150CONFIG_HID_PETALYNX=y 137CONFIG_HID_PETALYNX=y
151CONFIG_HID_SAMSUNG=y 138CONFIG_HID_SAMSUNG=y
152CONFIG_HID_SONY=y
153CONFIG_HID_SUNPLUS=y 139CONFIG_HID_SUNPLUS=y
154CONFIG_USB=y 140CONFIG_USB=y
155# CONFIG_USB_DEVICE_CLASS is not set
156CONFIG_USB_EHCI_HCD=y 141CONFIG_USB_EHCI_HCD=y
157# CONFIG_USB_EHCI_HCD_PPC_OF is not set 142# CONFIG_USB_EHCI_HCD_PPC_OF is not set
158CONFIG_USB_OHCI_HCD=y 143CONFIG_USB_OHCI_HCD=y
@@ -166,7 +151,6 @@ CONFIG_EXT2_FS_POSIX_ACL=y
166CONFIG_EXT3_FS=y 151CONFIG_EXT3_FS=y
167# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 152# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
168CONFIG_EXT3_FS_POSIX_ACL=y 153CONFIG_EXT3_FS_POSIX_ACL=y
169CONFIG_INOTIFY=y
170CONFIG_ISO9660_FS=y 154CONFIG_ISO9660_FS=y
171CONFIG_JOLIET=y 155CONFIG_JOLIET=y
172CONFIG_ZISOFS=y 156CONFIG_ZISOFS=y
@@ -179,7 +163,6 @@ CONFIG_PROC_KCORE=y
179CONFIG_TMPFS=y 163CONFIG_TMPFS=y
180CONFIG_JFFS2_FS=y 164CONFIG_JFFS2_FS=y
181CONFIG_NFS_FS=y 165CONFIG_NFS_FS=y
182CONFIG_NFS_V3=y
183CONFIG_NFS_V4=y 166CONFIG_NFS_V4=y
184CONFIG_ROOT_NFS=y 167CONFIG_ROOT_NFS=y
185CONFIG_CIFS=m 168CONFIG_CIFS=m
@@ -227,7 +210,5 @@ CONFIG_CRC_CCITT=y
227CONFIG_CRC_T10DIF=y 210CONFIG_CRC_T10DIF=y
228CONFIG_LIBCRC32C=y 211CONFIG_LIBCRC32C=y
229CONFIG_MAGIC_SYSRQ=y 212CONFIG_MAGIC_SYSRQ=y
230# CONFIG_RCU_CPU_STALL_DETECTOR is not set
231CONFIG_SYSCTL_SYSCALL_CHECK=y
232# CONFIG_CRYPTO_ANSI_CPRNG is not set 213# CONFIG_CRYPTO_ANSI_CPRNG is not set
233# CONFIG_CRYPTO_HW is not set 214# CONFIG_CRYPTO_HW is not set
diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
index 4a4a86fb0d3d..2aa7d9737e43 100644
--- a/arch/powerpc/configs/86xx/gef_sbc610_defconfig
+++ b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
@@ -1,8 +1,8 @@
1CONFIG_SMP=y 1CONFIG_SMP=y
2CONFIG_NR_CPUS=2 2CONFIG_NR_CPUS=2
3CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_HIGH_RES_TIMERS=y
6CONFIG_BSD_PROCESS_ACCT=y 6CONFIG_BSD_PROCESS_ACCT=y
7CONFIG_BSD_PROCESS_ACCT_V3=y 7CONFIG_BSD_PROCESS_ACCT_V3=y
8CONFIG_IKCONFIG=y 8CONFIG_IKCONFIG=y
@@ -10,7 +10,6 @@ CONFIG_IKCONFIG_PROC=y
10CONFIG_LOG_BUF_SHIFT=14 10CONFIG_LOG_BUF_SHIFT=14
11CONFIG_RELAY=y 11CONFIG_RELAY=y
12CONFIG_BLK_DEV_INITRD=y 12CONFIG_BLK_DEV_INITRD=y
13# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
14CONFIG_EXPERT=y 13CONFIG_EXPERT=y
15CONFIG_SLAB=y 14CONFIG_SLAB=y
16CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -21,11 +20,9 @@ CONFIG_MODULE_UNLOAD=y
21CONFIG_PPC_86xx=y 20CONFIG_PPC_86xx=y
22CONFIG_GEF_SBC610=y 21CONFIG_GEF_SBC610=y
23CONFIG_HIGHMEM=y 22CONFIG_HIGHMEM=y
24CONFIG_HIGH_RES_TIMERS=y
25CONFIG_HZ_1000=y 23CONFIG_HZ_1000=y
26CONFIG_PREEMPT=y 24CONFIG_PREEMPT=y
27CONFIG_BINFMT_MISC=m 25CONFIG_BINFMT_MISC=m
28CONFIG_SPARSE_IRQ=y
29CONFIG_PCI=y 26CONFIG_PCI=y
30CONFIG_PCIEPORTBUS=y 27CONFIG_PCIEPORTBUS=y
31# CONFIG_PCIEASPM is not set 28# CONFIG_PCIEASPM is not set
@@ -46,8 +43,6 @@ CONFIG_IP_PNP_DHCP=y
46CONFIG_IP_PNP_BOOTP=y 43CONFIG_IP_PNP_BOOTP=y
47CONFIG_IP_PNP_RARP=y 44CONFIG_IP_PNP_RARP=y
48CONFIG_NET_IPIP=m 45CONFIG_NET_IPIP=m
49CONFIG_NET_IPGRE=m
50CONFIG_NET_IPGRE_BROADCAST=y
51CONFIG_IP_MROUTE=y 46CONFIG_IP_MROUTE=y
52CONFIG_IP_PIMSM_V1=y 47CONFIG_IP_PIMSM_V1=y
53CONFIG_IP_PIMSM_V2=y 48CONFIG_IP_PIMSM_V2=y
@@ -62,22 +57,17 @@ CONFIG_INET6_IPCOMP=m
62CONFIG_IPV6_TUNNEL=m 57CONFIG_IPV6_TUNNEL=m
63CONFIG_NETFILTER=y 58CONFIG_NETFILTER=y
64# CONFIG_NETFILTER_XT_MATCH_SCTP is not set 59# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
65CONFIG_IP_NF_QUEUE=m
66CONFIG_IP_NF_IPTABLES=m 60CONFIG_IP_NF_IPTABLES=m
67CONFIG_IP_NF_MATCH_ADDRTYPE=m
68CONFIG_IP_NF_MATCH_ECN=m 61CONFIG_IP_NF_MATCH_ECN=m
69CONFIG_IP_NF_MATCH_TTL=m 62CONFIG_IP_NF_MATCH_TTL=m
70CONFIG_IP_NF_FILTER=m 63CONFIG_IP_NF_FILTER=m
71CONFIG_IP_NF_TARGET_REJECT=m 64CONFIG_IP_NF_TARGET_REJECT=m
72CONFIG_IP_NF_TARGET_LOG=m
73CONFIG_IP_NF_TARGET_ULOG=m
74CONFIG_IP_NF_MANGLE=m 65CONFIG_IP_NF_MANGLE=m
75CONFIG_IP_NF_TARGET_ECN=m 66CONFIG_IP_NF_TARGET_ECN=m
76CONFIG_IP_NF_RAW=m 67CONFIG_IP_NF_RAW=m
77CONFIG_IP_NF_ARPTABLES=m 68CONFIG_IP_NF_ARPTABLES=m
78CONFIG_IP_NF_ARPFILTER=m 69CONFIG_IP_NF_ARPFILTER=m
79CONFIG_IP_NF_ARP_MANGLE=m 70CONFIG_IP_NF_ARP_MANGLE=m
80CONFIG_IP6_NF_QUEUE=m
81CONFIG_IP6_NF_IPTABLES=m 71CONFIG_IP6_NF_IPTABLES=m
82CONFIG_IP6_NF_MATCH_EUI64=m 72CONFIG_IP6_NF_MATCH_EUI64=m
83CONFIG_IP6_NF_MATCH_FRAG=m 73CONFIG_IP6_NF_MATCH_FRAG=m
@@ -85,7 +75,6 @@ CONFIG_IP6_NF_MATCH_OPTS=m
85CONFIG_IP6_NF_MATCH_HL=m 75CONFIG_IP6_NF_MATCH_HL=m
86CONFIG_IP6_NF_MATCH_IPV6HEADER=m 76CONFIG_IP6_NF_MATCH_IPV6HEADER=m
87CONFIG_IP6_NF_MATCH_RT=m 77CONFIG_IP6_NF_MATCH_RT=m
88CONFIG_IP6_NF_TARGET_LOG=m
89CONFIG_IP6_NF_FILTER=m 78CONFIG_IP6_NF_FILTER=m
90CONFIG_IP6_NF_MANGLE=m 79CONFIG_IP6_NF_MANGLE=m
91CONFIG_IP6_NF_RAW=m 80CONFIG_IP6_NF_RAW=m
@@ -98,7 +87,6 @@ CONFIG_ATM_MPOA=m
98CONFIG_ATM_BR2684=m 87CONFIG_ATM_BR2684=m
99CONFIG_BRIDGE=m 88CONFIG_BRIDGE=m
100CONFIG_VLAN_8021Q=m 89CONFIG_VLAN_8021Q=m
101CONFIG_WAN_ROUTER=m
102CONFIG_NET_SCHED=y 90CONFIG_NET_SCHED=y
103CONFIG_NET_SCH_CBQ=m 91CONFIG_NET_SCH_CBQ=m
104CONFIG_NET_SCH_HTB=m 92CONFIG_NET_SCH_HTB=m
@@ -122,9 +110,6 @@ CONFIG_NET_PKTGEN=m
122CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 110CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
123# CONFIG_FW_LOADER is not set 111# CONFIG_FW_LOADER is not set
124CONFIG_MTD=y 112CONFIG_MTD=y
125CONFIG_MTD_CONCAT=y
126CONFIG_MTD_OF_PARTS=y
127CONFIG_MTD_CHAR=y
128CONFIG_MTD_BLOCK=y 113CONFIG_MTD_BLOCK=y
129CONFIG_MTD_CFI=y 114CONFIG_MTD_CFI=y
130CONFIG_MTD_JEDECPROBE=y 115CONFIG_MTD_JEDECPROBE=y
@@ -136,7 +121,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
136CONFIG_BLK_DEV_NBD=m 121CONFIG_BLK_DEV_NBD=m
137CONFIG_BLK_DEV_RAM=y 122CONFIG_BLK_DEV_RAM=y
138CONFIG_BLK_DEV_RAM_SIZE=131072 123CONFIG_BLK_DEV_RAM_SIZE=131072
139CONFIG_MISC_DEVICES=y
140CONFIG_DS1682=y 124CONFIG_DS1682=y
141CONFIG_BLK_DEV_SD=y 125CONFIG_BLK_DEV_SD=y
142CONFIG_CHR_DEV_ST=y 126CONFIG_CHR_DEV_ST=y
@@ -144,37 +128,34 @@ CONFIG_BLK_DEV_SR=y
144CONFIG_ATA=y 128CONFIG_ATA=y
145CONFIG_SATA_SIL=y 129CONFIG_SATA_SIL=y
146CONFIG_NETDEVICES=y 130CONFIG_NETDEVICES=y
147CONFIG_DUMMY=m
148CONFIG_BONDING=m 131CONFIG_BONDING=m
132CONFIG_DUMMY=m
133CONFIG_NETCONSOLE=y
149CONFIG_TUN=m 134CONFIG_TUN=m
150CONFIG_NET_ETHERNET=y
151CONFIG_MII=y
152CONFIG_GIANFAR=y 135CONFIG_GIANFAR=y
153# CONFIG_NETDEV_10000 is not set
154CONFIG_PPP=m 136CONFIG_PPP=m
155CONFIG_PPP_MULTILINK=y 137CONFIG_PPP_BSDCOMP=m
138CONFIG_PPP_DEFLATE=m
156CONFIG_PPP_FILTER=y 139CONFIG_PPP_FILTER=y
140CONFIG_PPP_MULTILINK=y
141CONFIG_PPPOATM=m
142CONFIG_PPPOE=m
157CONFIG_PPP_ASYNC=m 143CONFIG_PPP_ASYNC=m
158CONFIG_PPP_SYNC_TTY=m 144CONFIG_PPP_SYNC_TTY=m
159CONFIG_PPP_DEFLATE=m
160CONFIG_PPP_BSDCOMP=m
161CONFIG_PPPOE=m
162CONFIG_PPPOATM=m
163CONFIG_SLIP=m 145CONFIG_SLIP=m
164CONFIG_SLIP_COMPRESSED=y 146CONFIG_SLIP_COMPRESSED=y
165CONFIG_SLIP_SMART=y 147CONFIG_SLIP_SMART=y
166CONFIG_SLIP_MODE_SLIP6=y 148CONFIG_SLIP_MODE_SLIP6=y
167CONFIG_NETCONSOLE=y
168CONFIG_INPUT_FF_MEMLESS=m 149CONFIG_INPUT_FF_MEMLESS=m
169# CONFIG_INPUT_KEYBOARD is not set 150# CONFIG_INPUT_KEYBOARD is not set
170# CONFIG_INPUT_MOUSE is not set 151# CONFIG_INPUT_MOUSE is not set
171# CONFIG_SERIO is not set 152# CONFIG_SERIO is not set
153# CONFIG_LEGACY_PTYS is not set
172CONFIG_SERIAL_8250=y 154CONFIG_SERIAL_8250=y
173CONFIG_SERIAL_8250_CONSOLE=y 155CONFIG_SERIAL_8250_CONSOLE=y
174# CONFIG_SERIAL_8250_PCI is not set 156# CONFIG_SERIAL_8250_PCI is not set
175CONFIG_SERIAL_8250_NR_UARTS=2 157CONFIG_SERIAL_8250_NR_UARTS=2
176CONFIG_SERIAL_8250_RUNTIME_UARTS=2 158CONFIG_SERIAL_8250_RUNTIME_UARTS=2
177# CONFIG_LEGACY_PTYS is not set
178CONFIG_HW_RANDOM=y 159CONFIG_HW_RANDOM=y
179CONFIG_NVRAM=y 160CONFIG_NVRAM=y
180CONFIG_I2C=y 161CONFIG_I2C=y
@@ -186,7 +167,6 @@ CONFIG_SENSORS_LM90=y
186CONFIG_SENSORS_LM92=y 167CONFIG_SENSORS_LM92=y
187CONFIG_WATCHDOG=y 168CONFIG_WATCHDOG=y
188CONFIG_GEF_WDT=y 169CONFIG_GEF_WDT=y
189CONFIG_VIDEO_OUTPUT_CONTROL=m
190CONFIG_HID_A4TECH=y 170CONFIG_HID_A4TECH=y
191CONFIG_HID_APPLE=y 171CONFIG_HID_APPLE=y
192CONFIG_HID_BELKIN=y 172CONFIG_HID_BELKIN=y
@@ -201,10 +181,8 @@ CONFIG_HID_MONTEREY=y
201CONFIG_HID_PANTHERLORD=y 181CONFIG_HID_PANTHERLORD=y
202CONFIG_HID_PETALYNX=y 182CONFIG_HID_PETALYNX=y
203CONFIG_HID_SAMSUNG=y 183CONFIG_HID_SAMSUNG=y
204CONFIG_HID_SONY=y
205CONFIG_HID_SUNPLUS=y 184CONFIG_HID_SUNPLUS=y
206CONFIG_USB=y 185CONFIG_USB=y
207# CONFIG_USB_DEVICE_CLASS is not set
208CONFIG_USB_EHCI_HCD=y 186CONFIG_USB_EHCI_HCD=y
209# CONFIG_USB_EHCI_HCD_PPC_OF is not set 187# CONFIG_USB_EHCI_HCD_PPC_OF is not set
210CONFIG_USB_OHCI_HCD=y 188CONFIG_USB_OHCI_HCD=y
@@ -213,7 +191,6 @@ CONFIG_RTC_CLASS=y
213# CONFIG_RTC_INTF_PROC is not set 191# CONFIG_RTC_INTF_PROC is not set
214CONFIG_RTC_DRV_RX8581=y 192CONFIG_RTC_DRV_RX8581=y
215CONFIG_STAGING=y 193CONFIG_STAGING=y
216# CONFIG_STAGING_EXCLUDE_BUILD is not set
217CONFIG_VME_BUS=y 194CONFIG_VME_BUS=y
218CONFIG_VME_TSI148=y 195CONFIG_VME_TSI148=y
219CONFIG_EXT2_FS=y 196CONFIG_EXT2_FS=y
@@ -222,14 +199,12 @@ CONFIG_EXT2_FS_POSIX_ACL=y
222CONFIG_EXT3_FS=y 199CONFIG_EXT3_FS=y
223# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 200# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
224CONFIG_EXT3_FS_POSIX_ACL=y 201CONFIG_EXT3_FS_POSIX_ACL=y
225CONFIG_INOTIFY=y
226CONFIG_MSDOS_FS=y 202CONFIG_MSDOS_FS=y
227CONFIG_VFAT_FS=y 203CONFIG_VFAT_FS=y
228CONFIG_PROC_KCORE=y 204CONFIG_PROC_KCORE=y
229CONFIG_TMPFS=y 205CONFIG_TMPFS=y
230CONFIG_JFFS2_FS=y 206CONFIG_JFFS2_FS=y
231CONFIG_NFS_FS=y 207CONFIG_NFS_FS=y
232CONFIG_NFS_V3=y
233CONFIG_NFS_V4=y 208CONFIG_NFS_V4=y
234CONFIG_ROOT_NFS=y 209CONFIG_ROOT_NFS=y
235CONFIG_CIFS=m 210CONFIG_CIFS=m
@@ -273,28 +248,20 @@ CONFIG_NLS_ISO8859_15=m
273CONFIG_NLS_KOI8_R=m 248CONFIG_NLS_KOI8_R=m
274CONFIG_NLS_KOI8_U=m 249CONFIG_NLS_KOI8_U=m
275CONFIG_NLS_UTF8=m 250CONFIG_NLS_UTF8=m
251CONFIG_DEBUG_INFO=y
276CONFIG_MAGIC_SYSRQ=y 252CONFIG_MAGIC_SYSRQ=y
277CONFIG_DEBUG_KERNEL=y
278CONFIG_DETECT_HUNG_TASK=y 253CONFIG_DETECT_HUNG_TASK=y
279# CONFIG_DEBUG_BUGVERBOSE is not set 254# CONFIG_DEBUG_BUGVERBOSE is not set
280CONFIG_DEBUG_INFO=y
281# CONFIG_RCU_CPU_STALL_DETECTOR is not set
282CONFIG_SYSCTL_SYSCALL_CHECK=y
283CONFIG_SECURITY=y 255CONFIG_SECURITY=y
284CONFIG_SECURITY_NETWORK=y 256CONFIG_SECURITY_NETWORK=y
285CONFIG_CRYPTO_NULL=m 257CONFIG_CRYPTO_NULL=m
286CONFIG_CRYPTO_TEST=m 258CONFIG_CRYPTO_TEST=m
287CONFIG_CRYPTO_ECB=m
288CONFIG_CRYPTO_PCBC=m 259CONFIG_CRYPTO_PCBC=m
289CONFIG_CRYPTO_HMAC=y 260CONFIG_CRYPTO_HMAC=y
290CONFIG_CRYPTO_MD4=m
291CONFIG_CRYPTO_MICHAEL_MIC=m 261CONFIG_CRYPTO_MICHAEL_MIC=m
292CONFIG_CRYPTO_SHA256=m
293CONFIG_CRYPTO_SHA512=m 262CONFIG_CRYPTO_SHA512=m
294CONFIG_CRYPTO_WP512=m 263CONFIG_CRYPTO_WP512=m
295CONFIG_CRYPTO_AES=m
296CONFIG_CRYPTO_ANUBIS=m 264CONFIG_CRYPTO_ANUBIS=m
297CONFIG_CRYPTO_ARC4=m
298CONFIG_CRYPTO_BLOWFISH=m 265CONFIG_CRYPTO_BLOWFISH=m
299CONFIG_CRYPTO_CAST5=m 266CONFIG_CRYPTO_CAST5=m
300CONFIG_CRYPTO_CAST6=m 267CONFIG_CRYPTO_CAST6=m
diff --git a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
index 9b192bb6bd3d..e32207de2b77 100644
--- a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
+++ b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
@@ -1,27 +1,25 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_SWAP is not set 1# CONFIG_SWAP is not set
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y
4CONFIG_IKCONFIG=y 5CONFIG_IKCONFIG=y
5CONFIG_IKCONFIG_PROC=y 6CONFIG_IKCONFIG_PROC=y
6CONFIG_LOG_BUF_SHIFT=14 7CONFIG_LOG_BUF_SHIFT=14
7CONFIG_BLK_DEV_INITRD=y 8CONFIG_BLK_DEV_INITRD=y
8# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
9CONFIG_EXPERT=y 9CONFIG_EXPERT=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11# CONFIG_ELF_CORE is not set 10# CONFIG_ELF_CORE is not set
12CONFIG_MODULES=y 11CONFIG_MODULES=y
13CONFIG_MODULE_UNLOAD=y 12CONFIG_MODULE_UNLOAD=y
14# CONFIG_BLK_DEV_BSG is not set 13# CONFIG_BLK_DEV_BSG is not set
14CONFIG_PARTITION_ADVANCED=y
15CONFIG_LDM_PARTITION=y
15# CONFIG_IOSCHED_CFQ is not set 16# CONFIG_IOSCHED_CFQ is not set
16# CONFIG_PPC_CHRP is not set 17# CONFIG_PPC_CHRP is not set
17# CONFIG_PPC_PMAC is not set 18# CONFIG_PPC_PMAC is not set
18CONFIG_PPC_86xx=y 19CONFIG_PPC_86xx=y
19CONFIG_MPC8610_HPCD=y 20CONFIG_MPC8610_HPCD=y
20CONFIG_HIGHMEM=y 21CONFIG_HIGHMEM=y
21CONFIG_NO_HZ=y
22CONFIG_HIGH_RES_TIMERS=y
23CONFIG_HZ_1000=y 22CONFIG_HZ_1000=y
24CONFIG_SPARSE_IRQ=y
25CONFIG_FORCE_MAX_ZONEORDER=12 23CONFIG_FORCE_MAX_ZONEORDER=12
26# CONFIG_SECCOMP is not set 24# CONFIG_SECCOMP is not set
27CONFIG_PCI=y 25CONFIG_PCI=y
@@ -42,14 +40,12 @@ CONFIG_IPV6=y
42CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
43CONFIG_MTD=y 41CONFIG_MTD=y
44CONFIG_MTD_CMDLINE_PARTS=y 42CONFIG_MTD_CMDLINE_PARTS=y
45CONFIG_MTD_CHAR=y
46CONFIG_MTD_BLOCK=y 43CONFIG_MTD_BLOCK=y
47CONFIG_MTD_CFI=y 44CONFIG_MTD_CFI=y
48CONFIG_MTD_CFI_AMDSTD=y 45CONFIG_MTD_CFI_AMDSTD=y
49CONFIG_MTD_PHYSMAP_OF=y 46CONFIG_MTD_PHYSMAP_OF=y
50CONFIG_MTD_NAND=y 47CONFIG_MTD_NAND=y
51CONFIG_MTD_NAND_FSL_ELBC=y 48CONFIG_MTD_NAND_FSL_ELBC=y
52CONFIG_PROC_DEVICETREE=y
53CONFIG_BLK_DEV_LOOP=y 49CONFIG_BLK_DEV_LOOP=y
54CONFIG_BLK_DEV_RAM=y 50CONFIG_BLK_DEV_RAM=y
55CONFIG_BLK_DEV_RAM_SIZE=131072 51CONFIG_BLK_DEV_RAM_SIZE=131072
@@ -61,15 +57,13 @@ CONFIG_SATA_AHCI=y
61CONFIG_PATA_ALI=y 57CONFIG_PATA_ALI=y
62CONFIG_NETDEVICES=y 58CONFIG_NETDEVICES=y
63CONFIG_DUMMY=y 59CONFIG_DUMMY=y
64CONFIG_NET_ETHERNET=y
65CONFIG_NET_TULIP=y 60CONFIG_NET_TULIP=y
66CONFIG_ULI526X=y 61CONFIG_ULI526X=y
67# CONFIG_NETDEV_1000 is not set
68# CONFIG_NETDEV_10000 is not set
69# CONFIG_INPUT_MOUSEDEV is not set 62# CONFIG_INPUT_MOUSEDEV is not set
70# CONFIG_INPUT_KEYBOARD is not set 63# CONFIG_INPUT_KEYBOARD is not set
71# CONFIG_INPUT_MOUSE is not set 64# CONFIG_INPUT_MOUSE is not set
72CONFIG_SERIO_LIBPS2=y 65CONFIG_SERIO_LIBPS2=y
66# CONFIG_LEGACY_PTYS is not set
73CONFIG_SERIAL_8250=y 67CONFIG_SERIAL_8250=y
74CONFIG_SERIAL_8250_CONSOLE=y 68CONFIG_SERIAL_8250_CONSOLE=y
75CONFIG_SERIAL_8250_NR_UARTS=2 69CONFIG_SERIAL_8250_NR_UARTS=2
@@ -79,19 +73,14 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
79CONFIG_SERIAL_8250_SHARE_IRQ=y 73CONFIG_SERIAL_8250_SHARE_IRQ=y
80CONFIG_SERIAL_8250_DETECT_IRQ=y 74CONFIG_SERIAL_8250_DETECT_IRQ=y
81CONFIG_SERIAL_8250_RSA=y 75CONFIG_SERIAL_8250_RSA=y
82# CONFIG_LEGACY_PTYS is not set
83# CONFIG_HW_RANDOM is not set 76# CONFIG_HW_RANDOM is not set
84CONFIG_I2C=y 77CONFIG_I2C=y
85CONFIG_I2C_MPC=y 78CONFIG_I2C_MPC=y
86# CONFIG_HWMON is not set 79# CONFIG_HWMON is not set
87CONFIG_VIDEO_OUTPUT_CONTROL=y
88CONFIG_FB=y 80CONFIG_FB=y
89CONFIG_FB_FSL_DIU=y 81CONFIG_FB_FSL_DIU=y
90CONFIG_VGACON_SOFT_SCROLLBACK=y 82CONFIG_VGACON_SOFT_SCROLLBACK=y
91CONFIG_FRAMEBUFFER_CONSOLE=y 83CONFIG_FRAMEBUFFER_CONSOLE=y
92CONFIG_FONTS=y
93CONFIG_FONT_8x8=y
94CONFIG_FONT_8x16=y
95CONFIG_SOUND=y 84CONFIG_SOUND=y
96CONFIG_SND=y 85CONFIG_SND=y
97CONFIG_SND_MIXER_OSS=y 86CONFIG_SND_MIXER_OSS=y
@@ -108,17 +97,14 @@ CONFIG_EXT3_FS=y
108CONFIG_PROC_KCORE=y 97CONFIG_PROC_KCORE=y
109CONFIG_TMPFS=y 98CONFIG_TMPFS=y
110CONFIG_NFS_FS=y 99CONFIG_NFS_FS=y
111CONFIG_NFS_V3=y
112CONFIG_ROOT_NFS=y 100CONFIG_ROOT_NFS=y
113CONFIG_NFSD=y 101CONFIG_NFSD=y
114CONFIG_PARTITION_ADVANCED=y
115CONFIG_LDM_PARTITION=y
116CONFIG_NLS=y 102CONFIG_NLS=y
117CONFIG_CRC_T10DIF=y 103CONFIG_CRC_T10DIF=y
118CONFIG_DEBUG_KERNEL=y 104CONFIG_FONTS=y
105CONFIG_FONT_8x8=y
106CONFIG_FONT_8x16=y
107CONFIG_DEBUG_INFO=y
119CONFIG_DEBUG_SHIRQ=y 108CONFIG_DEBUG_SHIRQ=y
120CONFIG_DETECT_HUNG_TASK=y 109CONFIG_DETECT_HUNG_TASK=y
121CONFIG_DEBUG_INFO=y
122# CONFIG_RCU_CPU_STALL_DETECTOR is not set
123CONFIG_SYSCTL_SYSCALL_CHECK=y
124# CONFIG_CRYPTO_ANSI_CPRNG is not set 110# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
index 76f43df3dec7..a36e11ddaebd 100644
--- a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
+++ b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
@@ -1,33 +1,31 @@
1CONFIG_SMP=y 1CONFIG_SMP=y
2CONFIG_NR_CPUS=2 2CONFIG_NR_CPUS=2
3CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
6CONFIG_BSD_PROCESS_ACCT=y
7CONFIG_AUDIT=y 5CONFIG_AUDIT=y
6CONFIG_NO_HZ=y
7CONFIG_HIGH_RES_TIMERS=y
8CONFIG_BSD_PROCESS_ACCT=y
8CONFIG_IKCONFIG=y 9CONFIG_IKCONFIG=y
9CONFIG_IKCONFIG_PROC=y 10CONFIG_IKCONFIG_PROC=y
10CONFIG_LOG_BUF_SHIFT=14 11CONFIG_LOG_BUF_SHIFT=14
11CONFIG_BLK_DEV_INITRD=y 12CONFIG_BLK_DEV_INITRD=y
12# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
13CONFIG_EXPERT=y 13CONFIG_EXPERT=y
14CONFIG_KALLSYMS_ALL=y 14CONFIG_KALLSYMS_ALL=y
15CONFIG_KALLSYMS_EXTRA_PASS=y
16CONFIG_MODULES=y 15CONFIG_MODULES=y
17CONFIG_MODULE_UNLOAD=y 16CONFIG_MODULE_UNLOAD=y
18CONFIG_MODULE_FORCE_UNLOAD=y 17CONFIG_MODULE_FORCE_UNLOAD=y
19CONFIG_MODVERSIONS=y 18CONFIG_MODVERSIONS=y
20# CONFIG_BLK_DEV_BSG is not set 19# CONFIG_BLK_DEV_BSG is not set
20CONFIG_PARTITION_ADVANCED=y
21CONFIG_MAC_PARTITION=y
21# CONFIG_PPC_CHRP is not set 22# CONFIG_PPC_CHRP is not set
22# CONFIG_PPC_PMAC is not set 23# CONFIG_PPC_PMAC is not set
23CONFIG_PPC_86xx=y 24CONFIG_PPC_86xx=y
24CONFIG_MPC8641_HPCN=y 25CONFIG_MPC8641_HPCN=y
25CONFIG_HIGHMEM=y 26CONFIG_HIGHMEM=y
26CONFIG_NO_HZ=y
27CONFIG_HIGH_RES_TIMERS=y
28CONFIG_HZ_1000=y 27CONFIG_HZ_1000=y
29CONFIG_BINFMT_MISC=m 28CONFIG_BINFMT_MISC=m
30CONFIG_SPARSE_IRQ=y
31CONFIG_PCI=y 29CONFIG_PCI=y
32CONFIG_NET=y 30CONFIG_NET=y
33CONFIG_PACKET=y 31CONFIG_PACKET=y
@@ -45,12 +43,9 @@ CONFIG_IP_PNP_DHCP=y
45CONFIG_IP_PNP_BOOTP=y 43CONFIG_IP_PNP_BOOTP=y
46CONFIG_IP_PNP_RARP=y 44CONFIG_IP_PNP_RARP=y
47CONFIG_NET_IPIP=y 45CONFIG_NET_IPIP=y
48CONFIG_NET_IPGRE=y
49CONFIG_NET_IPGRE_BROADCAST=y
50CONFIG_IP_MROUTE=y 46CONFIG_IP_MROUTE=y
51CONFIG_IP_PIMSM_V1=y 47CONFIG_IP_PIMSM_V1=y
52CONFIG_IP_PIMSM_V2=y 48CONFIG_IP_PIMSM_V2=y
53CONFIG_ARPD=y
54# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 49# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
55# CONFIG_INET_XFRM_MODE_TUNNEL is not set 50# CONFIG_INET_XFRM_MODE_TUNNEL is not set
56# CONFIG_INET_XFRM_MODE_BEET is not set 51# CONFIG_INET_XFRM_MODE_BEET is not set
@@ -58,28 +53,23 @@ CONFIG_ARPD=y
58CONFIG_IPV6=y 53CONFIG_IPV6=y
59CONFIG_IP_SCTP=m 54CONFIG_IP_SCTP=m
60CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 55CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
61CONFIG_PROC_DEVICETREE=y
62CONFIG_BLK_DEV_LOOP=y 56CONFIG_BLK_DEV_LOOP=y
63CONFIG_BLK_DEV_NBD=y 57CONFIG_BLK_DEV_NBD=y
64CONFIG_BLK_DEV_RAM=y 58CONFIG_BLK_DEV_RAM=y
65CONFIG_BLK_DEV_RAM_SIZE=131072 59CONFIG_BLK_DEV_RAM_SIZE=131072
66CONFIG_MISC_DEVICES=y
67CONFIG_EEPROM_LEGACY=y 60CONFIG_EEPROM_LEGACY=y
68CONFIG_BLK_DEV_SD=y 61CONFIG_BLK_DEV_SD=y
69CONFIG_CHR_DEV_ST=y 62CONFIG_CHR_DEV_ST=y
70CONFIG_BLK_DEV_SR=y 63CONFIG_BLK_DEV_SR=y
71CONFIG_CHR_DEV_SG=y 64CONFIG_CHR_DEV_SG=y
72CONFIG_SCSI_MULTI_LUN=y
73CONFIG_SCSI_LOGGING=y 65CONFIG_SCSI_LOGGING=y
74CONFIG_ATA=y 66CONFIG_ATA=y
75CONFIG_SATA_AHCI=y 67CONFIG_SATA_AHCI=y
76CONFIG_PATA_ALI=y 68CONFIG_PATA_ALI=y
77CONFIG_NETDEVICES=y 69CONFIG_NETDEVICES=y
78CONFIG_DUMMY=y 70CONFIG_DUMMY=y
79CONFIG_VITESSE_PHY=y
80CONFIG_NET_ETHERNET=y
81CONFIG_MII=y
82CONFIG_GIANFAR=y 71CONFIG_GIANFAR=y
72CONFIG_VITESSE_PHY=y
83CONFIG_INPUT_FF_MEMLESS=m 73CONFIG_INPUT_FF_MEMLESS=m
84# CONFIG_INPUT_MOUSEDEV is not set 74# CONFIG_INPUT_MOUSEDEV is not set
85# CONFIG_INPUT_KEYBOARD is not set 75# CONFIG_INPUT_KEYBOARD is not set
@@ -99,7 +89,6 @@ CONFIG_NVRAM=y
99CONFIG_I2C=y 89CONFIG_I2C=y
100CONFIG_I2C_MPC=y 90CONFIG_I2C_MPC=y
101# CONFIG_HWMON is not set 91# CONFIG_HWMON is not set
102CONFIG_VIDEO_OUTPUT_CONTROL=y
103CONFIG_SOUND=y 92CONFIG_SOUND=y
104CONFIG_SND=y 93CONFIG_SND=y
105CONFIG_SND_MIXER_OSS=y 94CONFIG_SND_MIXER_OSS=y
@@ -120,7 +109,6 @@ CONFIG_HID_MONTEREY=y
120CONFIG_HID_PANTHERLORD=y 109CONFIG_HID_PANTHERLORD=y
121CONFIG_HID_PETALYNX=y 110CONFIG_HID_PETALYNX=y
122CONFIG_HID_SAMSUNG=y 111CONFIG_HID_SAMSUNG=y
123CONFIG_HID_SONY=y
124CONFIG_HID_SUNPLUS=y 112CONFIG_HID_SUNPLUS=y
125CONFIG_USB=y 113CONFIG_USB=y
126CONFIG_USB_MON=y 114CONFIG_USB_MON=y
@@ -134,7 +122,6 @@ CONFIG_RTC_DRV_CMOS=y
134CONFIG_EXT2_FS=y 122CONFIG_EXT2_FS=y
135CONFIG_EXT3_FS=y 123CONFIG_EXT3_FS=y
136# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 124# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
137CONFIG_INOTIFY=y
138CONFIG_ISO9660_FS=m 125CONFIG_ISO9660_FS=m
139CONFIG_JOLIET=y 126CONFIG_JOLIET=y
140CONFIG_ZISOFS=y 127CONFIG_ZISOFS=y
@@ -158,18 +145,12 @@ CONFIG_QNX4FS_FS=m
158CONFIG_SYSV_FS=m 145CONFIG_SYSV_FS=m
159CONFIG_UFS_FS=m 146CONFIG_UFS_FS=m
160CONFIG_NFS_FS=y 147CONFIG_NFS_FS=y
161CONFIG_NFS_V3=y
162CONFIG_NFS_V4=y 148CONFIG_NFS_V4=y
163CONFIG_ROOT_NFS=y 149CONFIG_ROOT_NFS=y
164CONFIG_NFSD=y 150CONFIG_NFSD=y
165CONFIG_PARTITION_ADVANCED=y
166CONFIG_MAC_PARTITION=y
167CONFIG_CRC_T10DIF=y 151CONFIG_CRC_T10DIF=y
168CONFIG_DEBUG_KERNEL=y
169CONFIG_DETECT_HUNG_TASK=y
170CONFIG_DEBUG_INFO=y 152CONFIG_DEBUG_INFO=y
171# CONFIG_RCU_CPU_STALL_DETECTOR is not set 153CONFIG_DETECT_HUNG_TASK=y
172CONFIG_SYSCTL_SYSCALL_CHECK=y
173CONFIG_CRYPTO_PCBC=m 154CONFIG_CRYPTO_PCBC=m
174CONFIG_CRYPTO_HMAC=y 155CONFIG_CRYPTO_HMAC=y
175# CONFIG_CRYPTO_ANSI_CPRNG is not set 156# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/86xx/sbc8641d_defconfig b/arch/powerpc/configs/86xx/sbc8641d_defconfig
index 99ea8746bbaf..db79bdee844b 100644
--- a/arch/powerpc/configs/86xx/sbc8641d_defconfig
+++ b/arch/powerpc/configs/86xx/sbc8641d_defconfig
@@ -1,8 +1,8 @@
1CONFIG_SMP=y 1CONFIG_SMP=y
2CONFIG_NR_CPUS=2 2CONFIG_NR_CPUS=2
3CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_HIGH_RES_TIMERS=y
6CONFIG_BSD_PROCESS_ACCT=y 6CONFIG_BSD_PROCESS_ACCT=y
7CONFIG_BSD_PROCESS_ACCT_V3=y 7CONFIG_BSD_PROCESS_ACCT_V3=y
8CONFIG_IKCONFIG=y 8CONFIG_IKCONFIG=y
@@ -10,7 +10,6 @@ CONFIG_IKCONFIG_PROC=y
10CONFIG_LOG_BUF_SHIFT=14 10CONFIG_LOG_BUF_SHIFT=14
11CONFIG_RELAY=y 11CONFIG_RELAY=y
12CONFIG_BLK_DEV_INITRD=y 12CONFIG_BLK_DEV_INITRD=y
13# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
14CONFIG_EXPERT=y 13CONFIG_EXPERT=y
15CONFIG_SLAB=y 14CONFIG_SLAB=y
16CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -20,10 +19,8 @@ CONFIG_MODULE_UNLOAD=y
20# CONFIG_PPC_PMAC is not set 19# CONFIG_PPC_PMAC is not set
21CONFIG_PPC_86xx=y 20CONFIG_PPC_86xx=y
22CONFIG_SBC8641D=y 21CONFIG_SBC8641D=y
23CONFIG_HIGH_RES_TIMERS=y
24CONFIG_PREEMPT=y 22CONFIG_PREEMPT=y
25CONFIG_BINFMT_MISC=m 23CONFIG_BINFMT_MISC=m
26CONFIG_SPARSE_IRQ=y
27CONFIG_PCI=y 24CONFIG_PCI=y
28CONFIG_PCIEPORTBUS=y 25CONFIG_PCIEPORTBUS=y
29# CONFIG_PCIEASPM is not set 26# CONFIG_PCIEASPM is not set
@@ -43,8 +40,6 @@ CONFIG_IP_PNP_DHCP=y
43CONFIG_IP_PNP_BOOTP=y 40CONFIG_IP_PNP_BOOTP=y
44CONFIG_IP_PNP_RARP=y 41CONFIG_IP_PNP_RARP=y
45CONFIG_NET_IPIP=m 42CONFIG_NET_IPIP=m
46CONFIG_NET_IPGRE=m
47CONFIG_NET_IPGRE_BROADCAST=y
48CONFIG_IP_MROUTE=y 43CONFIG_IP_MROUTE=y
49CONFIG_IP_PIMSM_V1=y 44CONFIG_IP_PIMSM_V1=y
50CONFIG_IP_PIMSM_V2=y 45CONFIG_IP_PIMSM_V2=y
@@ -59,22 +54,17 @@ CONFIG_INET6_IPCOMP=m
59CONFIG_IPV6_TUNNEL=m 54CONFIG_IPV6_TUNNEL=m
60CONFIG_NETFILTER=y 55CONFIG_NETFILTER=y
61# CONFIG_NETFILTER_XT_MATCH_SCTP is not set 56# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
62CONFIG_IP_NF_QUEUE=m
63CONFIG_IP_NF_IPTABLES=m 57CONFIG_IP_NF_IPTABLES=m
64CONFIG_IP_NF_MATCH_ADDRTYPE=m
65CONFIG_IP_NF_MATCH_ECN=m 58CONFIG_IP_NF_MATCH_ECN=m
66CONFIG_IP_NF_MATCH_TTL=m 59CONFIG_IP_NF_MATCH_TTL=m
67CONFIG_IP_NF_FILTER=m 60CONFIG_IP_NF_FILTER=m
68CONFIG_IP_NF_TARGET_REJECT=m 61CONFIG_IP_NF_TARGET_REJECT=m
69CONFIG_IP_NF_TARGET_LOG=m
70CONFIG_IP_NF_TARGET_ULOG=m
71CONFIG_IP_NF_MANGLE=m 62CONFIG_IP_NF_MANGLE=m
72CONFIG_IP_NF_TARGET_ECN=m 63CONFIG_IP_NF_TARGET_ECN=m
73CONFIG_IP_NF_RAW=m 64CONFIG_IP_NF_RAW=m
74CONFIG_IP_NF_ARPTABLES=m 65CONFIG_IP_NF_ARPTABLES=m
75CONFIG_IP_NF_ARPFILTER=m 66CONFIG_IP_NF_ARPFILTER=m
76CONFIG_IP_NF_ARP_MANGLE=m 67CONFIG_IP_NF_ARP_MANGLE=m
77CONFIG_IP6_NF_QUEUE=m
78CONFIG_IP6_NF_IPTABLES=m 68CONFIG_IP6_NF_IPTABLES=m
79CONFIG_IP6_NF_MATCH_EUI64=m 69CONFIG_IP6_NF_MATCH_EUI64=m
80CONFIG_IP6_NF_MATCH_FRAG=m 70CONFIG_IP6_NF_MATCH_FRAG=m
@@ -82,7 +72,6 @@ CONFIG_IP6_NF_MATCH_OPTS=m
82CONFIG_IP6_NF_MATCH_HL=m 72CONFIG_IP6_NF_MATCH_HL=m
83CONFIG_IP6_NF_MATCH_IPV6HEADER=m 73CONFIG_IP6_NF_MATCH_IPV6HEADER=m
84CONFIG_IP6_NF_MATCH_RT=m 74CONFIG_IP6_NF_MATCH_RT=m
85CONFIG_IP6_NF_TARGET_LOG=m
86CONFIG_IP6_NF_FILTER=m 75CONFIG_IP6_NF_FILTER=m
87CONFIG_IP6_NF_MANGLE=m 76CONFIG_IP6_NF_MANGLE=m
88CONFIG_IP6_NF_RAW=m 77CONFIG_IP6_NF_RAW=m
@@ -95,7 +84,6 @@ CONFIG_ATM_MPOA=m
95CONFIG_ATM_BR2684=m 84CONFIG_ATM_BR2684=m
96CONFIG_BRIDGE=m 85CONFIG_BRIDGE=m
97CONFIG_VLAN_8021Q=m 86CONFIG_VLAN_8021Q=m
98CONFIG_WAN_ROUTER=m
99CONFIG_NET_SCHED=y 87CONFIG_NET_SCHED=y
100CONFIG_NET_SCH_CBQ=m 88CONFIG_NET_SCH_CBQ=m
101CONFIG_NET_SCH_HTB=m 89CONFIG_NET_SCH_HTB=m
@@ -119,8 +107,6 @@ CONFIG_NET_PKTGEN=m
119CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 107CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
120# CONFIG_FW_LOADER is not set 108# CONFIG_FW_LOADER is not set
121CONFIG_MTD=y 109CONFIG_MTD=y
122CONFIG_MTD_CONCAT=y
123CONFIG_MTD_CHAR=y
124CONFIG_MTD_BLOCK=y 110CONFIG_MTD_BLOCK=y
125CONFIG_MTD_CFI=y 111CONFIG_MTD_CFI=y
126CONFIG_MTD_CFI_ADV_OPTIONS=y 112CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -145,28 +131,25 @@ CONFIG_DM_SNAPSHOT=y
145CONFIG_DM_MIRROR=y 131CONFIG_DM_MIRROR=y
146CONFIG_DM_ZERO=y 132CONFIG_DM_ZERO=y
147CONFIG_NETDEVICES=y 133CONFIG_NETDEVICES=y
148CONFIG_DUMMY=m
149CONFIG_BONDING=m 134CONFIG_BONDING=m
135CONFIG_DUMMY=m
136CONFIG_NETCONSOLE=y
150CONFIG_TUN=m 137CONFIG_TUN=m
151CONFIG_BROADCOM_PHY=y
152CONFIG_NET_ETHERNET=y
153CONFIG_MII=y
154CONFIG_GIANFAR=y 138CONFIG_GIANFAR=y
155# CONFIG_NETDEV_10000 is not set 139CONFIG_BROADCOM_PHY=y
156CONFIG_PPP=m 140CONFIG_PPP=m
157CONFIG_PPP_MULTILINK=y 141CONFIG_PPP_BSDCOMP=m
142CONFIG_PPP_DEFLATE=m
158CONFIG_PPP_FILTER=y 143CONFIG_PPP_FILTER=y
144CONFIG_PPP_MULTILINK=y
145CONFIG_PPPOATM=m
146CONFIG_PPPOE=m
159CONFIG_PPP_ASYNC=m 147CONFIG_PPP_ASYNC=m
160CONFIG_PPP_SYNC_TTY=m 148CONFIG_PPP_SYNC_TTY=m
161CONFIG_PPP_DEFLATE=m
162CONFIG_PPP_BSDCOMP=m
163CONFIG_PPPOE=m
164CONFIG_PPPOATM=m
165CONFIG_SLIP=m 149CONFIG_SLIP=m
166CONFIG_SLIP_COMPRESSED=y 150CONFIG_SLIP_COMPRESSED=y
167CONFIG_SLIP_SMART=y 151CONFIG_SLIP_SMART=y
168CONFIG_SLIP_MODE_SLIP6=y 152CONFIG_SLIP_MODE_SLIP6=y
169CONFIG_NETCONSOLE=y
170# CONFIG_INPUT_KEYBOARD is not set 153# CONFIG_INPUT_KEYBOARD is not set
171# CONFIG_INPUT_MOUSE is not set 154# CONFIG_INPUT_MOUSE is not set
172# CONFIG_SERIO is not set 155# CONFIG_SERIO is not set
@@ -180,7 +163,6 @@ CONFIG_I2C_CHARDEV=y
180CONFIG_I2C_MPC=y 163CONFIG_I2C_MPC=y
181CONFIG_WATCHDOG=y 164CONFIG_WATCHDOG=y
182CONFIG_SOFT_WATCHDOG=m 165CONFIG_SOFT_WATCHDOG=m
183CONFIG_VIDEO_OUTPUT_CONTROL=m
184CONFIG_EXT2_FS=y 166CONFIG_EXT2_FS=y
185CONFIG_EXT2_FS_XATTR=y 167CONFIG_EXT2_FS_XATTR=y
186CONFIG_EXT2_FS_POSIX_ACL=y 168CONFIG_EXT2_FS_POSIX_ACL=y
@@ -190,20 +172,14 @@ CONFIG_EXT3_FS_POSIX_ACL=y
190CONFIG_REISERFS_FS=m 172CONFIG_REISERFS_FS=m
191CONFIG_REISERFS_FS_XATTR=y 173CONFIG_REISERFS_FS_XATTR=y
192CONFIG_REISERFS_FS_POSIX_ACL=y 174CONFIG_REISERFS_FS_POSIX_ACL=y
193CONFIG_OCFS2_FS=m
194CONFIG_INOTIFY=y
195CONFIG_AUTOFS_FS=m
196CONFIG_AUTOFS4_FS=m 175CONFIG_AUTOFS4_FS=m
197CONFIG_PROC_KCORE=y 176CONFIG_PROC_KCORE=y
198CONFIG_TMPFS=y 177CONFIG_TMPFS=y
199CONFIG_MINIX_FS=m 178CONFIG_MINIX_FS=m
200CONFIG_ROMFS_FS=m 179CONFIG_ROMFS_FS=m
201CONFIG_NFS_FS=y 180CONFIG_NFS_FS=y
202CONFIG_NFS_V3=y
203CONFIG_NFS_V4=y 181CONFIG_NFS_V4=y
204CONFIG_ROOT_NFS=y 182CONFIG_ROOT_NFS=y
205CONFIG_SMB_FS=m
206CONFIG_SMB_NLS_DEFAULT=y
207CONFIG_CIFS=m 183CONFIG_CIFS=m
208CONFIG_CIFS_XATTR=y 184CONFIG_CIFS_XATTR=y
209CONFIG_CIFS_POSIX=y 185CONFIG_CIFS_POSIX=y
@@ -245,29 +221,21 @@ CONFIG_NLS_ISO8859_15=m
245CONFIG_NLS_KOI8_R=m 221CONFIG_NLS_KOI8_R=m
246CONFIG_NLS_KOI8_U=m 222CONFIG_NLS_KOI8_U=m
247CONFIG_NLS_UTF8=m 223CONFIG_NLS_UTF8=m
248CONFIG_MAGIC_SYSRQ=y 224CONFIG_DEBUG_INFO=y
249CONFIG_DEBUG_FS=y 225CONFIG_DEBUG_FS=y
250CONFIG_DEBUG_KERNEL=y 226CONFIG_MAGIC_SYSRQ=y
251CONFIG_DETECT_HUNG_TASK=y 227CONFIG_DETECT_HUNG_TASK=y
252# CONFIG_DEBUG_BUGVERBOSE is not set 228# CONFIG_DEBUG_BUGVERBOSE is not set
253CONFIG_DEBUG_INFO=y
254# CONFIG_RCU_CPU_STALL_DETECTOR is not set
255CONFIG_SYSCTL_SYSCALL_CHECK=y
256CONFIG_SECURITY=y 229CONFIG_SECURITY=y
257CONFIG_SECURITY_NETWORK=y 230CONFIG_SECURITY_NETWORK=y
258CONFIG_CRYPTO_NULL=m 231CONFIG_CRYPTO_NULL=m
259CONFIG_CRYPTO_TEST=m 232CONFIG_CRYPTO_TEST=m
260CONFIG_CRYPTO_ECB=m
261CONFIG_CRYPTO_PCBC=m 233CONFIG_CRYPTO_PCBC=m
262CONFIG_CRYPTO_HMAC=y 234CONFIG_CRYPTO_HMAC=y
263CONFIG_CRYPTO_MD4=m
264CONFIG_CRYPTO_MICHAEL_MIC=m 235CONFIG_CRYPTO_MICHAEL_MIC=m
265CONFIG_CRYPTO_SHA256=m
266CONFIG_CRYPTO_SHA512=m 236CONFIG_CRYPTO_SHA512=m
267CONFIG_CRYPTO_WP512=m 237CONFIG_CRYPTO_WP512=m
268CONFIG_CRYPTO_AES=m
269CONFIG_CRYPTO_ANUBIS=m 238CONFIG_CRYPTO_ANUBIS=m
270CONFIG_CRYPTO_ARC4=m
271CONFIG_CRYPTO_BLOWFISH=m 239CONFIG_CRYPTO_BLOWFISH=m
272CONFIG_CRYPTO_CAST5=m 240CONFIG_CRYPTO_CAST5=m
273CONFIG_CRYPTO_CAST6=m 241CONFIG_CRYPTO_CAST6=m
diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig
index 15b1ff5d96e7..d89ff40d39b7 100644
--- a/arch/powerpc/configs/adder875_defconfig
+++ b/arch/powerpc/configs/adder875_defconfig
@@ -1,21 +1,18 @@
1CONFIG_PPC_8xx=y 1CONFIG_PPC_8xx=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8# CONFIG_SYSCTL_SYSCALL is not set
9# CONFIG_ELF_CORE is not set 6# CONFIG_ELF_CORE is not set
10# CONFIG_BASE_FULL is not set 7# CONFIG_BASE_FULL is not set
11# CONFIG_FUTEX is not set 8# CONFIG_FUTEX is not set
12# CONFIG_VM_EVENT_COUNTERS is not set 9# CONFIG_VM_EVENT_COUNTERS is not set
13# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
14# CONFIG_IOSCHED_CFQ is not set 12# CONFIG_IOSCHED_CFQ is not set
15CONFIG_PPC_ADDER875=y 13CONFIG_PPC_ADDER875=y
16CONFIG_8xx_COPYBACK=y 14CONFIG_8xx_COPYBACK=y
17CONFIG_HZ_1000=y 15CONFIG_HZ_1000=y
18CONFIG_SPARSE_IRQ=y
19# CONFIG_SECCOMP is not set 16# CONFIG_SECCOMP is not set
20CONFIG_NET=y 17CONFIG_NET=y
21CONFIG_PACKET=y 18CONFIG_PACKET=y
@@ -32,42 +29,30 @@ CONFIG_SYN_COOKIES=y
32CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
33# CONFIG_FW_LOADER is not set 30# CONFIG_FW_LOADER is not set
34CONFIG_MTD=y 31CONFIG_MTD=y
35CONFIG_MTD_CHAR=y
36CONFIG_MTD_BLOCK=y 32CONFIG_MTD_BLOCK=y
37CONFIG_MTD_CFI=y 33CONFIG_MTD_CFI=y
38CONFIG_MTD_CFI_AMDSTD=y 34CONFIG_MTD_CFI_AMDSTD=y
39CONFIG_MTD_PHYSMAP_OF=y 35CONFIG_MTD_PHYSMAP_OF=y
40# CONFIG_BLK_DEV is not set 36# CONFIG_BLK_DEV is not set
41# CONFIG_MISC_DEVICES is not set
42CONFIG_NETDEVICES=y 37CONFIG_NETDEVICES=y
43CONFIG_DAVICOM_PHY=y
44CONFIG_NET_ETHERNET=y
45CONFIG_FS_ENET=y 38CONFIG_FS_ENET=y
46# CONFIG_FS_ENET_HAS_SCC is not set 39# CONFIG_FS_ENET_HAS_SCC is not set
47# CONFIG_NETDEV_1000 is not set 40CONFIG_DAVICOM_PHY=y
48# CONFIG_NETDEV_10000 is not set
49# CONFIG_VT is not set 41# CONFIG_VT is not set
42# CONFIG_LEGACY_PTYS is not set
50CONFIG_SERIAL_CPM=y 43CONFIG_SERIAL_CPM=y
51CONFIG_SERIAL_CPM_CONSOLE=y 44CONFIG_SERIAL_CPM_CONSOLE=y
52# CONFIG_LEGACY_PTYS is not set
53CONFIG_GEN_RTC=y 45CONFIG_GEN_RTC=y
54# CONFIG_HWMON is not set 46# CONFIG_HWMON is not set
55CONFIG_THERMAL=y 47CONFIG_THERMAL=y
56CONFIG_VIDEO_OUTPUT_CONTROL=y
57# CONFIG_HID_SUPPORT is not set
58# CONFIG_USB_SUPPORT is not set 48# CONFIG_USB_SUPPORT is not set
59# CONFIG_DNOTIFY is not set 49# CONFIG_DNOTIFY is not set
60CONFIG_TMPFS=y 50CONFIG_TMPFS=y
61CONFIG_CRAMFS=y 51CONFIG_CRAMFS=y
62CONFIG_NFS_FS=y 52CONFIG_NFS_FS=y
63CONFIG_NFS_V3=y
64CONFIG_ROOT_NFS=y 53CONFIG_ROOT_NFS=y
65CONFIG_PARTITION_ADVANCED=y 54CONFIG_CRC32_SLICEBY4=y
66# CONFIG_CRC32 is not set 55CONFIG_DEBUG_INFO=y
67CONFIG_MAGIC_SYSRQ=y
68CONFIG_DEBUG_FS=y 56CONFIG_DEBUG_FS=y
69CONFIG_DEBUG_KERNEL=y 57CONFIG_MAGIC_SYSRQ=y
70CONFIG_DETECT_HUNG_TASK=y 58CONFIG_DETECT_HUNG_TASK=y
71CONFIG_DEBUG_INFO=y
72# CONFIG_RCU_CPU_STALL_DETECTOR is not set
73CONFIG_CRC32_SLICEBY4=y
diff --git a/arch/powerpc/configs/amigaone_defconfig b/arch/powerpc/configs/amigaone_defconfig
index 8c66b13e59fc..84f1b4140579 100644
--- a/arch/powerpc/configs/amigaone_defconfig
+++ b/arch/powerpc/configs/amigaone_defconfig
@@ -1,8 +1,9 @@
1CONFIG_ALTIVEC=y 1CONFIG_ALTIVEC=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_NO_HZ=y
6CONFIG_HIGH_RES_TIMERS=y
6CONFIG_IKCONFIG=y 7CONFIG_IKCONFIG=y
7CONFIG_IKCONFIG_PROC=y 8CONFIG_IKCONFIG_PROC=y
8CONFIG_LOG_BUF_SHIFT=15 9CONFIG_LOG_BUF_SHIFT=15
@@ -12,14 +13,13 @@ CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 13CONFIG_MODULE_UNLOAD=y
13CONFIG_MODULE_FORCE_UNLOAD=y 14CONFIG_MODULE_FORCE_UNLOAD=y
14# CONFIG_BLK_DEV_BSG is not set 15# CONFIG_BLK_DEV_BSG is not set
16CONFIG_PARTITION_ADVANCED=y
17CONFIG_AMIGA_PARTITION=y
15# CONFIG_PPC_CHRP is not set 18# CONFIG_PPC_CHRP is not set
16# CONFIG_PPC_PMAC is not set 19# CONFIG_PPC_PMAC is not set
17CONFIG_AMIGAONE=y 20CONFIG_AMIGAONE=y
18CONFIG_HIGHMEM=y 21CONFIG_HIGHMEM=y
19CONFIG_NO_HZ=y
20CONFIG_HIGH_RES_TIMERS=y
21CONFIG_BINFMT_MISC=y 22CONFIG_BINFMT_MISC=y
22# CONFIG_MIGRATION is not set
23CONFIG_NET=y 23CONFIG_NET=y
24CONFIG_PACKET=y 24CONFIG_PACKET=y
25CONFIG_UNIX=y 25CONFIG_UNIX=y
@@ -37,11 +37,9 @@ CONFIG_NETFILTER=y
37# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 37# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
38# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set 38# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
39# CONFIG_NETFILTER_XT_MATCH_STATE is not set 39# CONFIG_NETFILTER_XT_MATCH_STATE is not set
40# CONFIG_IP_NF_TARGET_ULOG is not set
41# CONFIG_IP_NF_MANGLE is not set 40# CONFIG_IP_NF_MANGLE is not set
42CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 41CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
43# CONFIG_STANDALONE is not set 42# CONFIG_STANDALONE is not set
44CONFIG_PROC_DEVICETREE=y
45CONFIG_PARPORT=y 43CONFIG_PARPORT=y
46CONFIG_PARPORT_PC=y 44CONFIG_PARPORT_PC=y
47CONFIG_PARPORT_PC_FIFO=y 45CONFIG_PARPORT_PC_FIFO=y
@@ -65,24 +63,19 @@ CONFIG_SCSI_SYM53C8XX_2=y
65CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 63CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
66# CONFIG_SCSI_SYM53C8XX_MMIO is not set 64# CONFIG_SCSI_SYM53C8XX_MMIO is not set
67CONFIG_NETDEVICES=y 65CONFIG_NETDEVICES=y
68CONFIG_PHYLIB=y
69CONFIG_NET_ETHERNET=y
70CONFIG_NET_VENDOR_3COM=y
71CONFIG_VORTEX=y 66CONFIG_VORTEX=y
72CONFIG_NET_PCI=y
73CONFIG_8139CP=y 67CONFIG_8139CP=y
74CONFIG_8139TOO=y 68CONFIG_8139TOO=y
75# CONFIG_NETDEV_1000 is not set 69CONFIG_PHYLIB=y
76# CONFIG_NETDEV_10000 is not set
77CONFIG_PPP=m 70CONFIG_PPP=m
78CONFIG_PPP_MULTILINK=y
79CONFIG_PPP_FILTER=y
80CONFIG_PPP_ASYNC=m
81CONFIG_PPP_SYNC_TTY=m
82CONFIG_PPP_DEFLATE=m
83CONFIG_PPP_BSDCOMP=m 71CONFIG_PPP_BSDCOMP=m
72CONFIG_PPP_DEFLATE=m
73CONFIG_PPP_FILTER=y
84CONFIG_PPP_MPPE=m 74CONFIG_PPP_MPPE=m
75CONFIG_PPP_MULTILINK=y
85CONFIG_PPPOE=m 76CONFIG_PPPOE=m
77CONFIG_PPP_ASYNC=m
78CONFIG_PPP_SYNC_TTY=m
86CONFIG_INPUT_EVDEV=y 79CONFIG_INPUT_EVDEV=y
87CONFIG_INPUT_MISC=y 80CONFIG_INPUT_MISC=y
88CONFIG_INPUT_PCSPKR=y 81CONFIG_INPUT_PCSPKR=y
@@ -96,7 +89,6 @@ CONFIG_FIRMWARE_EDID=y
96CONFIG_FB_TILEBLITTING=y 89CONFIG_FB_TILEBLITTING=y
97CONFIG_FB_RADEON=y 90CONFIG_FB_RADEON=y
98CONFIG_FB_3DFX=y 91CONFIG_FB_3DFX=y
99CONFIG_DISPLAY_SUPPORT=m
100CONFIG_FRAMEBUFFER_CONSOLE=y 92CONFIG_FRAMEBUFFER_CONSOLE=y
101CONFIG_LOGO=y 93CONFIG_LOGO=y
102CONFIG_HID_GYRATION=y 94CONFIG_HID_GYRATION=y
@@ -104,7 +96,6 @@ CONFIG_HID_NTRIG=y
104CONFIG_HID_PANTHERLORD=y 96CONFIG_HID_PANTHERLORD=y
105CONFIG_HID_PETALYNX=y 97CONFIG_HID_PETALYNX=y
106CONFIG_HID_SAMSUNG=y 98CONFIG_HID_SAMSUNG=y
107CONFIG_HID_SONY=y
108CONFIG_HID_SUNPLUS=y 99CONFIG_HID_SUNPLUS=y
109CONFIG_HID_TOPSEED=y 100CONFIG_HID_TOPSEED=y
110CONFIG_USB=y 101CONFIG_USB=y
@@ -117,27 +108,20 @@ CONFIG_RTC_DRV_CMOS=y
117CONFIG_EXT2_FS=y 108CONFIG_EXT2_FS=y
118CONFIG_EXT3_FS=y 109CONFIG_EXT3_FS=y
119CONFIG_EXT4_FS=y 110CONFIG_EXT4_FS=y
120CONFIG_INOTIFY=y
121CONFIG_ISO9660_FS=y 111CONFIG_ISO9660_FS=y
122CONFIG_MSDOS_FS=m 112CONFIG_MSDOS_FS=m
123CONFIG_VFAT_FS=m 113CONFIG_VFAT_FS=m
124CONFIG_PROC_KCORE=y 114CONFIG_PROC_KCORE=y
125CONFIG_TMPFS=y 115CONFIG_TMPFS=y
126CONFIG_AFFS_FS=m 116CONFIG_AFFS_FS=m
127CONFIG_PARTITION_ADVANCED=y
128CONFIG_AMIGA_PARTITION=y
129CONFIG_NLS_ASCII=y 117CONFIG_NLS_ASCII=y
130CONFIG_NLS_ISO8859_1=m 118CONFIG_NLS_ISO8859_1=m
131CONFIG_CRC_T10DIF=y 119CONFIG_CRC_T10DIF=y
132CONFIG_MAGIC_SYSRQ=y 120CONFIG_MAGIC_SYSRQ=y
133CONFIG_DEBUG_KERNEL=y 121CONFIG_DEBUG_KERNEL=y
134CONFIG_DEBUG_MUTEXES=y 122CONFIG_DEBUG_MUTEXES=y
135CONFIG_DEBUG_SPINLOCK_SLEEP=y
136# CONFIG_RCU_CPU_STALL_DETECTOR is not set
137CONFIG_SYSCTL_SYSCALL_CHECK=y
138CONFIG_XMON=y 123CONFIG_XMON=y
139CONFIG_XMON_DEFAULT=y 124CONFIG_XMON_DEFAULT=y
140CONFIG_CRYPTO=y
141CONFIG_CRYPTO_CBC=m 125CONFIG_CRYPTO_CBC=m
142CONFIG_CRYPTO_PCBC=m 126CONFIG_CRYPTO_PCBC=m
143# CONFIG_CRYPTO_ANSI_CPRNG is not set 127# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig
index 8a08d6dcb0b4..91862292cd55 100644
--- a/arch/powerpc/configs/c2k_defconfig
+++ b/arch/powerpc/configs/c2k_defconfig
@@ -1,17 +1,23 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 2CONFIG_POSIX_MQUEUE=y
4CONFIG_BSD_PROCESS_ACCT=y
5CONFIG_AUDIT=y 3CONFIG_AUDIT=y
4CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7CONFIG_KALLSYMS_EXTRA_PASS=y
8CONFIG_PROFILING=y 6CONFIG_PROFILING=y
9CONFIG_OPROFILE=m 7CONFIG_OPROFILE=m
10CONFIG_KPROBES=y 8CONFIG_KPROBES=y
11CONFIG_MODULES=y 9CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 10CONFIG_MODULE_UNLOAD=y
13CONFIG_MODVERSIONS=y 11CONFIG_MODVERSIONS=y
14# CONFIG_BLK_DEV_BSG is not set 12CONFIG_PARTITION_ADVANCED=y
13CONFIG_OSF_PARTITION=y
14CONFIG_MAC_PARTITION=y
15CONFIG_BSD_DISKLABEL=y
16CONFIG_MINIX_SUBPARTITION=y
17CONFIG_SOLARIS_X86_PARTITION=y
18CONFIG_UNIXWARE_DISKLABEL=y
19CONFIG_SGI_PARTITION=y
20CONFIG_SUN_PARTITION=y
15# CONFIG_PPC_CHRP is not set 21# CONFIG_PPC_CHRP is not set
16# CONFIG_PPC_PMAC is not set 22# CONFIG_PPC_PMAC is not set
17CONFIG_EMBEDDED6xx=y 23CONFIG_EMBEDDED6xx=y
@@ -24,7 +30,6 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=m
24CONFIG_HIGHMEM=y 30CONFIG_HIGHMEM=y
25CONFIG_PREEMPT_VOLUNTARY=y 31CONFIG_PREEMPT_VOLUNTARY=y
26CONFIG_BINFMT_MISC=y 32CONFIG_BINFMT_MISC=y
27CONFIG_SPARSE_IRQ=y
28CONFIG_PM=y 33CONFIG_PM=y
29CONFIG_PCI_MSI=y 34CONFIG_PCI_MSI=y
30CONFIG_HOTPLUG_PCI=y 35CONFIG_HOTPLUG_PCI=y
@@ -43,8 +48,6 @@ CONFIG_IP_ROUTE_VERBOSE=y
43CONFIG_IP_PNP=y 48CONFIG_IP_PNP=y
44CONFIG_IP_PNP_DHCP=y 49CONFIG_IP_PNP_DHCP=y
45CONFIG_NET_IPIP=m 50CONFIG_NET_IPIP=m
46CONFIG_NET_IPGRE=m
47CONFIG_NET_IPGRE_BROADCAST=y
48CONFIG_IP_MROUTE=y 51CONFIG_IP_MROUTE=y
49CONFIG_IP_PIMSM_V1=y 52CONFIG_IP_PIMSM_V1=y
50CONFIG_IP_PIMSM_V2=y 53CONFIG_IP_PIMSM_V2=y
@@ -52,22 +55,17 @@ CONFIG_SYN_COOKIES=y
52CONFIG_INET_AH=m 55CONFIG_INET_AH=m
53CONFIG_INET_ESP=m 56CONFIG_INET_ESP=m
54CONFIG_INET_IPCOMP=m 57CONFIG_INET_IPCOMP=m
55CONFIG_IPV6_PRIVACY=y
56CONFIG_INET6_AH=m 58CONFIG_INET6_AH=m
57CONFIG_INET6_ESP=m 59CONFIG_INET6_ESP=m
58CONFIG_INET6_IPCOMP=m 60CONFIG_INET6_IPCOMP=m
59CONFIG_IPV6_TUNNEL=m 61CONFIG_IPV6_TUNNEL=m
60CONFIG_NETFILTER=y 62CONFIG_NETFILTER=y
61# CONFIG_NETFILTER_XT_MATCH_SCTP is not set 63# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
62CONFIG_IP_NF_QUEUE=m
63CONFIG_IP_NF_IPTABLES=m 64CONFIG_IP_NF_IPTABLES=m
64CONFIG_IP_NF_MATCH_ADDRTYPE=m
65CONFIG_IP_NF_MATCH_ECN=m 65CONFIG_IP_NF_MATCH_ECN=m
66CONFIG_IP_NF_MATCH_TTL=m 66CONFIG_IP_NF_MATCH_TTL=m
67CONFIG_IP_NF_FILTER=m 67CONFIG_IP_NF_FILTER=m
68CONFIG_IP_NF_TARGET_REJECT=m 68CONFIG_IP_NF_TARGET_REJECT=m
69CONFIG_IP_NF_TARGET_LOG=m
70CONFIG_IP_NF_TARGET_ULOG=m
71CONFIG_IP_NF_MANGLE=m 69CONFIG_IP_NF_MANGLE=m
72CONFIG_IP_NF_TARGET_ECN=m 70CONFIG_IP_NF_TARGET_ECN=m
73CONFIG_IP_NF_RAW=m 71CONFIG_IP_NF_RAW=m
@@ -81,7 +79,6 @@ CONFIG_IP6_NF_MATCH_OPTS=m
81CONFIG_IP6_NF_MATCH_HL=m 79CONFIG_IP6_NF_MATCH_HL=m
82CONFIG_IP6_NF_MATCH_IPV6HEADER=m 80CONFIG_IP6_NF_MATCH_IPV6HEADER=m
83CONFIG_IP6_NF_MATCH_RT=m 81CONFIG_IP6_NF_MATCH_RT=m
84CONFIG_IP6_NF_TARGET_LOG=m
85CONFIG_IP6_NF_FILTER=m 82CONFIG_IP6_NF_FILTER=m
86CONFIG_IP6_NF_MANGLE=m 83CONFIG_IP6_NF_MANGLE=m
87CONFIG_IP6_NF_RAW=m 84CONFIG_IP6_NF_RAW=m
@@ -133,8 +130,6 @@ CONFIG_NET_CLS_RSVP=m
133CONFIG_NET_CLS_RSVP6=m 130CONFIG_NET_CLS_RSVP6=m
134CONFIG_NET_CLS_IND=y 131CONFIG_NET_CLS_IND=y
135CONFIG_BT=m 132CONFIG_BT=m
136CONFIG_BT_L2CAP=y
137CONFIG_BT_SCO=y
138CONFIG_BT_RFCOMM=m 133CONFIG_BT_RFCOMM=m
139CONFIG_BT_RFCOMM_TTY=y 134CONFIG_BT_RFCOMM_TTY=y
140CONFIG_BT_BNEP=m 135CONFIG_BT_BNEP=m
@@ -149,9 +144,6 @@ CONFIG_BT_HCIBFUSB=m
149CONFIG_BT_HCIVHCI=m 144CONFIG_BT_HCIVHCI=m
150CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 145CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
151CONFIG_MTD=y 146CONFIG_MTD=y
152CONFIG_MTD_CONCAT=m
153CONFIG_MTD_OF_PARTS=y
154CONFIG_MTD_CHAR=m
155CONFIG_MTD_BLOCK=y 147CONFIG_MTD_BLOCK=y
156CONFIG_MTD_CFI=y 148CONFIG_MTD_CFI=y
157CONFIG_MTD_CFI_AMDSTD=y 149CONFIG_MTD_CFI_AMDSTD=y
@@ -162,7 +154,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
162CONFIG_BLK_DEV_NBD=m 154CONFIG_BLK_DEV_NBD=m
163CONFIG_BLK_DEV_RAM=y 155CONFIG_BLK_DEV_RAM=y
164CONFIG_BLK_DEV_RAM_SIZE=16384 156CONFIG_BLK_DEV_RAM_SIZE=16384
165# CONFIG_MISC_DEVICES is not set
166CONFIG_SCSI=m 157CONFIG_SCSI=m
167CONFIG_BLK_DEV_SD=m 158CONFIG_BLK_DEV_SD=m
168CONFIG_CHR_DEV_ST=m 159CONFIG_CHR_DEV_ST=m
@@ -182,7 +173,6 @@ CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
182CONFIG_AIC7XXX_RESET_DELAY_MS=15000 173CONFIG_AIC7XXX_RESET_DELAY_MS=15000
183# CONFIG_AIC7XXX_DEBUG_ENABLE is not set 174# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
184# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set 175# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
185CONFIG_SCSI_AIC7XXX_OLD=m
186CONFIG_SCSI_AIC79XX=m 176CONFIG_SCSI_AIC79XX=m
187CONFIG_AIC79XX_CMDS_PER_DEVICE=4 177CONFIG_AIC79XX_CMDS_PER_DEVICE=4
188CONFIG_AIC79XX_RESET_DELAY_MS=15000 178CONFIG_AIC79XX_RESET_DELAY_MS=15000
@@ -199,18 +189,14 @@ CONFIG_SCSI_IPS=m
199CONFIG_SCSI_INITIO=m 189CONFIG_SCSI_INITIO=m
200CONFIG_SCSI_SYM53C8XX_2=m 190CONFIG_SCSI_SYM53C8XX_2=m
201CONFIG_SCSI_QLOGIC_1280=m 191CONFIG_SCSI_QLOGIC_1280=m
202CONFIG_SCSI_LPFC=m
203CONFIG_NETDEVICES=y 192CONFIG_NETDEVICES=y
204CONFIG_DUMMY=m
205CONFIG_BONDING=m 193CONFIG_BONDING=m
194CONFIG_DUMMY=m
195CONFIG_NETCONSOLE=m
206CONFIG_TUN=m 196CONFIG_TUN=m
207CONFIG_VITESSE_PHY=y
208CONFIG_NET_ETHERNET=y
209CONFIG_MII=y
210CONFIG_MV643XX_ETH=y
211# CONFIG_NETDEV_10000 is not set
212# CONFIG_ATM_DRIVERS is not set 197# CONFIG_ATM_DRIVERS is not set
213CONFIG_NETCONSOLE=m 198CONFIG_MV643XX_ETH=y
199CONFIG_VITESSE_PHY=y
214# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 200# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
215CONFIG_INPUT_EVDEV=y 201CONFIG_INPUT_EVDEV=y
216# CONFIG_INPUT_KEYBOARD is not set 202# CONFIG_INPUT_KEYBOARD is not set
@@ -218,10 +204,10 @@ CONFIG_INPUT_EVDEV=y
218CONFIG_INPUT_MISC=y 204CONFIG_INPUT_MISC=y
219CONFIG_INPUT_UINPUT=m 205CONFIG_INPUT_UINPUT=m
220# CONFIG_SERIO is not set 206# CONFIG_SERIO is not set
207# CONFIG_LEGACY_PTYS is not set
221CONFIG_SERIAL_NONSTANDARD=y 208CONFIG_SERIAL_NONSTANDARD=y
222CONFIG_SERIAL_MPSC=y 209CONFIG_SERIAL_MPSC=y
223CONFIG_SERIAL_MPSC_CONSOLE=y 210CONFIG_SERIAL_MPSC_CONSOLE=y
224# CONFIG_LEGACY_PTYS is not set
225CONFIG_NVRAM=m 211CONFIG_NVRAM=m
226CONFIG_GEN_RTC=m 212CONFIG_GEN_RTC=m
227CONFIG_RAW_DRIVER=y 213CONFIG_RAW_DRIVER=y
@@ -236,7 +222,7 @@ CONFIG_SENSORS_ADM1026=m
236CONFIG_SENSORS_ADM1031=m 222CONFIG_SENSORS_ADM1031=m
237CONFIG_SENSORS_DS1621=m 223CONFIG_SENSORS_DS1621=m
238CONFIG_SENSORS_GL518SM=m 224CONFIG_SENSORS_GL518SM=m
239CONFIG_SENSORS_IT87=m 225CONFIG_SENSORS_MAX1619=m
240CONFIG_SENSORS_LM75=m 226CONFIG_SENSORS_LM75=m
241CONFIG_SENSORS_LM77=m 227CONFIG_SENSORS_LM77=m
242CONFIG_SENSORS_LM78=m 228CONFIG_SENSORS_LM78=m
@@ -245,23 +231,17 @@ CONFIG_SENSORS_LM83=m
245CONFIG_SENSORS_LM85=m 231CONFIG_SENSORS_LM85=m
246CONFIG_SENSORS_LM87=m 232CONFIG_SENSORS_LM87=m
247CONFIG_SENSORS_LM90=m 233CONFIG_SENSORS_LM90=m
248CONFIG_SENSORS_MAX1619=m
249CONFIG_SENSORS_PCF8591=m 234CONFIG_SENSORS_PCF8591=m
250CONFIG_SENSORS_SMSC47M1=m
251CONFIG_SENSORS_SMSC47B397=m
252CONFIG_SENSORS_VIA686A=m 235CONFIG_SENSORS_VIA686A=m
253CONFIG_SENSORS_W83781D=m 236CONFIG_SENSORS_W83781D=m
254CONFIG_SENSORS_W83L785TS=m 237CONFIG_SENSORS_W83L785TS=m
255CONFIG_SENSORS_W83627HF=m
256CONFIG_WATCHDOG=y 238CONFIG_WATCHDOG=y
257CONFIG_SOFT_WATCHDOG=m 239CONFIG_SOFT_WATCHDOG=m
258CONFIG_PCIPCWATCHDOG=m 240CONFIG_PCIPCWATCHDOG=m
259CONFIG_WDTPCI=m 241CONFIG_WDTPCI=m
260CONFIG_USBPCWATCHDOG=m 242CONFIG_USBPCWATCHDOG=m
261# CONFIG_VGA_CONSOLE is not set 243# CONFIG_VGA_CONSOLE is not set
262# CONFIG_HID_SUPPORT is not set
263CONFIG_USB=m 244CONFIG_USB=m
264# CONFIG_USB_DEVICE_CLASS is not set
265CONFIG_USB_MON=m 245CONFIG_USB_MON=m
266CONFIG_USB_EHCI_HCD=m 246CONFIG_USB_EHCI_HCD=m
267CONFIG_USB_EHCI_ROOT_HUB_TT=y 247CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -350,24 +330,12 @@ CONFIG_JFFS2_FS=y
350CONFIG_CRAMFS=m 330CONFIG_CRAMFS=m
351CONFIG_VXFS_FS=m 331CONFIG_VXFS_FS=m
352CONFIG_NFS_FS=y 332CONFIG_NFS_FS=y
353CONFIG_NFS_V3=y
354CONFIG_NFS_V3_ACL=y 333CONFIG_NFS_V3_ACL=y
355CONFIG_NFS_V4=y 334CONFIG_NFS_V4=y
356CONFIG_ROOT_NFS=y 335CONFIG_ROOT_NFS=y
357CONFIG_RPCSEC_GSS_SPKM3=m
358CONFIG_CIFS=m 336CONFIG_CIFS=m
359CONFIG_CIFS_XATTR=y 337CONFIG_CIFS_XATTR=y
360CONFIG_CIFS_POSIX=y 338CONFIG_CIFS_POSIX=y
361CONFIG_PARTITION_ADVANCED=y
362CONFIG_OSF_PARTITION=y
363CONFIG_MAC_PARTITION=y
364CONFIG_BSD_DISKLABEL=y
365CONFIG_MINIX_SUBPARTITION=y
366CONFIG_SOLARIS_X86_PARTITION=y
367CONFIG_UNIXWARE_DISKLABEL=y
368CONFIG_SGI_PARTITION=y
369CONFIG_SUN_PARTITION=y
370CONFIG_EFI_PARTITION=y
371CONFIG_NLS=y 339CONFIG_NLS=y
372CONFIG_NLS_DEFAULT="utf8" 340CONFIG_NLS_DEFAULT="utf8"
373CONFIG_NLS_CODEPAGE_437=y 341CONFIG_NLS_CODEPAGE_437=y
@@ -409,21 +377,16 @@ CONFIG_NLS_KOI8_R=m
409CONFIG_NLS_KOI8_U=m 377CONFIG_NLS_KOI8_U=m
410CONFIG_CRC_CCITT=m 378CONFIG_CRC_CCITT=m
411CONFIG_CRC_T10DIF=m 379CONFIG_CRC_T10DIF=m
380CONFIG_DEBUG_INFO=y
412CONFIG_MAGIC_SYSRQ=y 381CONFIG_MAGIC_SYSRQ=y
413CONFIG_DEBUG_KERNEL=y 382CONFIG_DEBUG_KERNEL=y
414CONFIG_DETECT_HUNG_TASK=y 383CONFIG_DEBUG_STACK_USAGE=y
415CONFIG_DEBUG_SPINLOCK=y
416CONFIG_DEBUG_SPINLOCK_SLEEP=y
417CONFIG_DEBUG_HIGHMEM=y 384CONFIG_DEBUG_HIGHMEM=y
418CONFIG_DEBUG_INFO=y
419# CONFIG_RCU_CPU_STALL_DETECTOR is not set
420CONFIG_SYSCTL_SYSCALL_CHECK=y
421CONFIG_DEBUG_STACKOVERFLOW=y 385CONFIG_DEBUG_STACKOVERFLOW=y
422CONFIG_DEBUG_STACK_USAGE=y 386CONFIG_DETECT_HUNG_TASK=y
387CONFIG_DEBUG_SPINLOCK=y
423CONFIG_BOOTX_TEXT=y 388CONFIG_BOOTX_TEXT=y
424CONFIG_PPC_EARLY_DEBUG=y 389CONFIG_PPC_EARLY_DEBUG=y
425CONFIG_PPC_EARLY_DEBUG_BOOTX=y
426CONFIG_KEYS=y
427CONFIG_KEYS_DEBUG_PROC_KEYS=y 390CONFIG_KEYS_DEBUG_PROC_KEYS=y
428CONFIG_SECURITY=y 391CONFIG_SECURITY=y
429CONFIG_SECURITY_NETWORK=y 392CONFIG_SECURITY_NETWORK=y
@@ -431,16 +394,11 @@ CONFIG_SECURITY_SELINUX=y
431CONFIG_SECURITY_SELINUX_BOOTPARAM=y 394CONFIG_SECURITY_SELINUX_BOOTPARAM=y
432CONFIG_SECURITY_SELINUX_DISABLE=y 395CONFIG_SECURITY_SELINUX_DISABLE=y
433CONFIG_CRYPTO_NULL=m 396CONFIG_CRYPTO_NULL=m
434CONFIG_CRYPTO_ECB=m
435CONFIG_CRYPTO_HMAC=y 397CONFIG_CRYPTO_HMAC=y
436CONFIG_CRYPTO_MD4=m
437CONFIG_CRYPTO_MICHAEL_MIC=m 398CONFIG_CRYPTO_MICHAEL_MIC=m
438CONFIG_CRYPTO_SHA1=y 399CONFIG_CRYPTO_SHA1=y
439CONFIG_CRYPTO_SHA256=m
440CONFIG_CRYPTO_SHA512=m 400CONFIG_CRYPTO_SHA512=m
441CONFIG_CRYPTO_WP512=m 401CONFIG_CRYPTO_WP512=m
442CONFIG_CRYPTO_AES=m
443CONFIG_CRYPTO_ARC4=m
444CONFIG_CRYPTO_BLOWFISH=m 402CONFIG_CRYPTO_BLOWFISH=m
445CONFIG_CRYPTO_CAST6=m 403CONFIG_CRYPTO_CAST6=m
446CONFIG_CRYPTO_KHAZAD=m 404CONFIG_CRYPTO_KHAZAD=m
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig
index 7a7b3c879f96..9788b3c2d563 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_defconfig
@@ -3,9 +3,10 @@ CONFIG_TUNE_CELL=y
3CONFIG_ALTIVEC=y 3CONFIG_ALTIVEC=y
4CONFIG_SMP=y 4CONFIG_SMP=y
5CONFIG_NR_CPUS=4 5CONFIG_NR_CPUS=4
6CONFIG_EXPERIMENTAL=y
7CONFIG_SYSVIPC=y 6CONFIG_SYSVIPC=y
8CONFIG_FHANDLE=y 7CONFIG_FHANDLE=y
8CONFIG_NO_HZ=y
9CONFIG_HIGH_RES_TIMERS=y
9CONFIG_IKCONFIG=y 10CONFIG_IKCONFIG=y
10CONFIG_IKCONFIG_PROC=y 11CONFIG_IKCONFIG_PROC=y
11CONFIG_LOG_BUF_SHIFT=15 12CONFIG_LOG_BUF_SHIFT=15
@@ -17,7 +18,7 @@ CONFIG_PROFILING=y
17CONFIG_OPROFILE=m 18CONFIG_OPROFILE=m
18CONFIG_MODULES=y 19CONFIG_MODULES=y
19CONFIG_MODULE_UNLOAD=y 20CONFIG_MODULE_UNLOAD=y
20# CONFIG_BLK_DEV_BSG is not set 21CONFIG_PARTITION_ADVANCED=y
21# CONFIG_PPC_POWERNV is not set 22# CONFIG_PPC_POWERNV is not set
22# CONFIG_PPC_PSERIES is not set 23# CONFIG_PPC_PSERIES is not set
23# CONFIG_PPC_PMAC is not set 24# CONFIG_PPC_PMAC is not set
@@ -34,8 +35,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
34CONFIG_CPU_FREQ_GOV_USERSPACE=y 35CONFIG_CPU_FREQ_GOV_USERSPACE=y
35CONFIG_CPU_FREQ_GOV_ONDEMAND=y 36CONFIG_CPU_FREQ_GOV_ONDEMAND=y
36CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y 37CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
37CONFIG_NO_HZ=y
38CONFIG_HIGH_RES_TIMERS=y
39CONFIG_BINFMT_MISC=m 38CONFIG_BINFMT_MISC=m
40CONFIG_IRQ_ALL_CPUS=y 39CONFIG_IRQ_ALL_CPUS=y
41CONFIG_NUMA=y 40CONFIG_NUMA=y
@@ -63,7 +62,6 @@ CONFIG_INET6_IPCOMP=m
63# CONFIG_IPV6_SIT is not set 62# CONFIG_IPV6_SIT is not set
64CONFIG_IPV6_TUNNEL=m 63CONFIG_IPV6_TUNNEL=m
65CONFIG_NETFILTER=y 64CONFIG_NETFILTER=y
66CONFIG_NETFILTER_NETLINK_QUEUE=m
67CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 65CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
68CONFIG_NETFILTER_XT_TARGET_DSCP=m 66CONFIG_NETFILTER_XT_TARGET_DSCP=m
69CONFIG_NETFILTER_XT_TARGET_MARK=m 67CONFIG_NETFILTER_XT_TARGET_MARK=m
@@ -94,16 +92,12 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
94CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 92CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
95CONFIG_NETFILTER_XT_MATCH_TIME=m 93CONFIG_NETFILTER_XT_MATCH_TIME=m
96CONFIG_NETFILTER_XT_MATCH_U32=m 94CONFIG_NETFILTER_XT_MATCH_U32=m
97CONFIG_IP_NF_QUEUE=m
98CONFIG_IP_NF_IPTABLES=m 95CONFIG_IP_NF_IPTABLES=m
99CONFIG_IP_NF_MATCH_ADDRTYPE=m
100CONFIG_IP_NF_MATCH_AH=m 96CONFIG_IP_NF_MATCH_AH=m
101CONFIG_IP_NF_MATCH_ECN=m 97CONFIG_IP_NF_MATCH_ECN=m
102CONFIG_IP_NF_MATCH_TTL=m 98CONFIG_IP_NF_MATCH_TTL=m
103CONFIG_IP_NF_FILTER=m 99CONFIG_IP_NF_FILTER=m
104CONFIG_IP_NF_TARGET_REJECT=m 100CONFIG_IP_NF_TARGET_REJECT=m
105CONFIG_IP_NF_TARGET_LOG=m
106CONFIG_IP_NF_TARGET_ULOG=m
107CONFIG_IP_NF_MANGLE=m 101CONFIG_IP_NF_MANGLE=m
108CONFIG_IP_NF_TARGET_ECN=m 102CONFIG_IP_NF_TARGET_ECN=m
109CONFIG_IP_NF_TARGET_TTL=m 103CONFIG_IP_NF_TARGET_TTL=m
@@ -112,7 +106,6 @@ CONFIG_IP_NF_ARPTABLES=m
112CONFIG_IP_NF_ARPFILTER=m 106CONFIG_IP_NF_ARPFILTER=m
113CONFIG_IP_NF_ARP_MANGLE=m 107CONFIG_IP_NF_ARP_MANGLE=m
114CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 108CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
115CONFIG_PROC_DEVICETREE=y
116CONFIG_BLK_DEV_LOOP=y 109CONFIG_BLK_DEV_LOOP=y
117CONFIG_BLK_DEV_RAM=y 110CONFIG_BLK_DEV_RAM=y
118CONFIG_BLK_DEV_RAM_SIZE=131072 111CONFIG_BLK_DEV_RAM_SIZE=131072
@@ -144,26 +137,24 @@ CONFIG_NETDEVICES=y
144CONFIG_BONDING=m 137CONFIG_BONDING=m
145CONFIG_MACVLAN=m 138CONFIG_MACVLAN=m
146CONFIG_TUN=y 139CONFIG_TUN=y
147CONFIG_NET_ETHERNET=y 140CONFIG_TIGON3=y
148CONFIG_MII=y
149CONFIG_E1000=m 141CONFIG_E1000=m
150CONFIG_SKGE=m 142CONFIG_SKGE=m
151CONFIG_SKY2=m 143CONFIG_SKY2=m
152CONFIG_TIGON3=y
153CONFIG_SPIDER_NET=y
154CONFIG_GELIC_NET=m 144CONFIG_GELIC_NET=m
155CONFIG_GELIC_WIRELESS=y 145CONFIG_GELIC_WIRELESS=y
146CONFIG_SPIDER_NET=y
156# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 147# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
157# CONFIG_INPUT_KEYBOARD is not set 148# CONFIG_INPUT_KEYBOARD is not set
158# CONFIG_INPUT_MOUSE is not set 149# CONFIG_INPUT_MOUSE is not set
159# CONFIG_SERIO_I8042 is not set 150# CONFIG_SERIO_I8042 is not set
151# CONFIG_LEGACY_PTYS is not set
160CONFIG_SERIAL_NONSTANDARD=y 152CONFIG_SERIAL_NONSTANDARD=y
161CONFIG_SERIAL_8250=y 153CONFIG_SERIAL_8250=y
162CONFIG_SERIAL_8250_CONSOLE=y 154CONFIG_SERIAL_8250_CONSOLE=y
163CONFIG_SERIAL_TXX9_NR_UARTS=2 155CONFIG_SERIAL_TXX9_NR_UARTS=2
164CONFIG_SERIAL_TXX9_CONSOLE=y 156CONFIG_SERIAL_TXX9_CONSOLE=y
165CONFIG_SERIAL_OF_PLATFORM=y 157CONFIG_SERIAL_OF_PLATFORM=y
166# CONFIG_LEGACY_PTYS is not set
167CONFIG_HVC_RTAS=y 158CONFIG_HVC_RTAS=y
168CONFIG_HVC_BEAT=y 159CONFIG_HVC_BEAT=y
169CONFIG_IPMI_HANDLER=m 160CONFIG_IPMI_HANDLER=m
@@ -174,9 +165,7 @@ CONFIG_IPMI_POWEROFF=m
174# CONFIG_HW_RANDOM is not set 165# CONFIG_HW_RANDOM is not set
175CONFIG_GEN_RTC=y 166CONFIG_GEN_RTC=y
176CONFIG_I2C=y 167CONFIG_I2C=y
177# CONFIG_HWMON is not set
178CONFIG_WATCHDOG=y 168CONFIG_WATCHDOG=y
179CONFIG_VIDEO_OUTPUT_CONTROL=m
180# CONFIG_VGA_CONSOLE is not set 169# CONFIG_VGA_CONSOLE is not set
181CONFIG_HID=m 170CONFIG_HID=m
182# CONFIG_USB_HID is not set 171# CONFIG_USB_HID is not set
@@ -199,7 +188,6 @@ CONFIG_EDAC_CELL=y
199CONFIG_UIO=m 188CONFIG_UIO=m
200CONFIG_EXT2_FS=y 189CONFIG_EXT2_FS=y
201CONFIG_EXT3_FS=y 190CONFIG_EXT3_FS=y
202CONFIG_INOTIFY=y
203CONFIG_AUTOFS4_FS=m 191CONFIG_AUTOFS4_FS=m
204CONFIG_ISO9660_FS=m 192CONFIG_ISO9660_FS=m
205CONFIG_JOLIET=y 193CONFIG_JOLIET=y
@@ -210,11 +198,8 @@ CONFIG_PROC_KCORE=y
210CONFIG_TMPFS=y 198CONFIG_TMPFS=y
211CONFIG_HUGETLBFS=y 199CONFIG_HUGETLBFS=y
212CONFIG_NFS_FS=y 200CONFIG_NFS_FS=y
213CONFIG_NFS_V3=y
214CONFIG_NFS_V3_ACL=y 201CONFIG_NFS_V3_ACL=y
215CONFIG_ROOT_NFS=y 202CONFIG_ROOT_NFS=y
216CONFIG_PARTITION_ADVANCED=y
217CONFIG_EFI_PARTITION=y
218CONFIG_NLS_ISO8859_1=m 203CONFIG_NLS_ISO8859_1=m
219CONFIG_NLS_ISO8859_2=m 204CONFIG_NLS_ISO8859_2=m
220CONFIG_NLS_ISO8859_3=m 205CONFIG_NLS_ISO8859_3=m
@@ -227,11 +212,10 @@ CONFIG_NLS_ISO8859_13=m
227CONFIG_NLS_ISO8859_14=m 212CONFIG_NLS_ISO8859_14=m
228CONFIG_NLS_ISO8859_15=m 213CONFIG_NLS_ISO8859_15=m
229# CONFIG_ENABLE_MUST_CHECK is not set 214# CONFIG_ENABLE_MUST_CHECK is not set
230CONFIG_MAGIC_SYSRQ=y
231CONFIG_DEBUG_FS=y 215CONFIG_DEBUG_FS=y
216CONFIG_MAGIC_SYSRQ=y
232CONFIG_DEBUG_KERNEL=y 217CONFIG_DEBUG_KERNEL=y
233CONFIG_DEBUG_MUTEXES=y 218CONFIG_DEBUG_MUTEXES=y
234CONFIG_DEBUG_SPINLOCK_SLEEP=y
235CONFIG_XMON=y 219CONFIG_XMON=y
236CONFIG_XMON_DEFAULT=y 220CONFIG_XMON_DEFAULT=y
237CONFIG_CRYPTO_ECB=m 221CONFIG_CRYPTO_ECB=m
diff --git a/arch/powerpc/configs/celleb_defconfig b/arch/powerpc/configs/celleb_defconfig
index acccbfde8a50..ff454dcd2dd3 100644
--- a/arch/powerpc/configs/celleb_defconfig
+++ b/arch/powerpc/configs/celleb_defconfig
@@ -3,9 +3,10 @@ CONFIG_TUNE_CELL=y
3CONFIG_ALTIVEC=y 3CONFIG_ALTIVEC=y
4CONFIG_SMP=y 4CONFIG_SMP=y
5CONFIG_NR_CPUS=4 5CONFIG_NR_CPUS=4
6CONFIG_EXPERIMENTAL=y
7CONFIG_SYSVIPC=y 6CONFIG_SYSVIPC=y
8CONFIG_FHANDLE=y 7CONFIG_FHANDLE=y
8CONFIG_NO_HZ=y
9CONFIG_HIGH_RES_TIMERS=y
9CONFIG_IKCONFIG=y 10CONFIG_IKCONFIG=y
10CONFIG_IKCONFIG_PROC=y 11CONFIG_IKCONFIG_PROC=y
11CONFIG_LOG_BUF_SHIFT=15 12CONFIG_LOG_BUF_SHIFT=15
@@ -15,6 +16,7 @@ CONFIG_MODULES=y
15CONFIG_MODULE_UNLOAD=y 16CONFIG_MODULE_UNLOAD=y
16CONFIG_MODVERSIONS=y 17CONFIG_MODVERSIONS=y
17CONFIG_MODULE_SRCVERSION_ALL=y 18CONFIG_MODULE_SRCVERSION_ALL=y
19CONFIG_PARTITION_ADVANCED=y
18# CONFIG_PPC_POWERNV is not set 20# CONFIG_PPC_POWERNV is not set
19# CONFIG_PPC_PSERIES is not set 21# CONFIG_PPC_PSERIES is not set
20# CONFIG_PPC_PMAC is not set 22# CONFIG_PPC_PMAC is not set
@@ -23,8 +25,6 @@ CONFIG_SPU_FS=y
23# CONFIG_CBE_THERM is not set 25# CONFIG_CBE_THERM is not set
24CONFIG_UDBG_RTAS_CONSOLE=y 26CONFIG_UDBG_RTAS_CONSOLE=y
25# CONFIG_RTAS_PROC is not set 27# CONFIG_RTAS_PROC is not set
26CONFIG_NO_HZ=y
27CONFIG_HIGH_RES_TIMERS=y
28CONFIG_BINFMT_MISC=m 28CONFIG_BINFMT_MISC=m
29CONFIG_KEXEC=y 29CONFIG_KEXEC=y
30CONFIG_NUMA=y 30CONFIG_NUMA=y
@@ -40,9 +40,7 @@ CONFIG_INET6_ESP=m
40CONFIG_INET6_IPCOMP=m 40CONFIG_INET6_IPCOMP=m
41CONFIG_IPV6_TUNNEL=m 41CONFIG_IPV6_TUNNEL=m
42CONFIG_NETFILTER=y 42CONFIG_NETFILTER=y
43CONFIG_IP_NF_QUEUE=m
44CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 43CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
45CONFIG_PROC_DEVICETREE=y
46CONFIG_BLK_DEV_LOOP=y 44CONFIG_BLK_DEV_LOOP=y
47CONFIG_BLK_DEV_RAM=y 45CONFIG_BLK_DEV_RAM=y
48CONFIG_BLK_DEV_RAM_SIZE=131072 46CONFIG_BLK_DEV_RAM_SIZE=131072
@@ -55,7 +53,6 @@ CONFIG_SCSI=m
55CONFIG_BLK_DEV_SD=m 53CONFIG_BLK_DEV_SD=m
56CONFIG_BLK_DEV_SR=m 54CONFIG_BLK_DEV_SR=m
57CONFIG_CHR_DEV_SG=m 55CONFIG_CHR_DEV_SG=m
58CONFIG_SCSI_MULTI_LUN=y
59CONFIG_MD=y 56CONFIG_MD=y
60CONFIG_BLK_DEV_MD=m 57CONFIG_BLK_DEV_MD=m
61CONFIG_MD_LINEAR=m 58CONFIG_MD_LINEAR=m
@@ -68,17 +65,15 @@ CONFIG_DM_MIRROR=m
68CONFIG_DM_ZERO=m 65CONFIG_DM_ZERO=m
69CONFIG_DM_MULTIPATH=m 66CONFIG_DM_MULTIPATH=m
70CONFIG_NETDEVICES=y 67CONFIG_NETDEVICES=y
71CONFIG_NET_ETHERNET=y
72CONFIG_MII=y
73CONFIG_SPIDER_NET=y 68CONFIG_SPIDER_NET=y
74# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 69# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
75# CONFIG_INPUT_KEYBOARD is not set 70# CONFIG_INPUT_KEYBOARD is not set
76# CONFIG_INPUT_MOUSE is not set 71# CONFIG_INPUT_MOUSE is not set
77# CONFIG_SERIO_I8042 is not set 72# CONFIG_SERIO_I8042 is not set
73# CONFIG_LEGACY_PTYS is not set
78CONFIG_SERIAL_NONSTANDARD=y 74CONFIG_SERIAL_NONSTANDARD=y
79CONFIG_SERIAL_TXX9_NR_UARTS=3 75CONFIG_SERIAL_TXX9_NR_UARTS=3
80CONFIG_SERIAL_TXX9_CONSOLE=y 76CONFIG_SERIAL_TXX9_CONSOLE=y
81# CONFIG_LEGACY_PTYS is not set
82CONFIG_HVC_RTAS=y 77CONFIG_HVC_RTAS=y
83CONFIG_HVC_BEAT=y 78CONFIG_HVC_BEAT=y
84# CONFIG_HW_RANDOM is not set 79# CONFIG_HW_RANDOM is not set
@@ -89,7 +84,6 @@ CONFIG_WATCHDOG=y
89# CONFIG_VGA_CONSOLE is not set 84# CONFIG_VGA_CONSOLE is not set
90CONFIG_USB_HIDDEV=y 85CONFIG_USB_HIDDEV=y
91CONFIG_USB=y 86CONFIG_USB=y
92# CONFIG_USB_DEVICE_CLASS is not set
93CONFIG_USB_MON=y 87CONFIG_USB_MON=y
94CONFIG_USB_EHCI_HCD=m 88CONFIG_USB_EHCI_HCD=m
95# CONFIG_USB_EHCI_HCD_PPC_OF is not set 89# CONFIG_USB_EHCI_HCD_PPC_OF is not set
@@ -103,7 +97,6 @@ CONFIG_EXT2_FS_XIP=y
103CONFIG_EXT3_FS=y 97CONFIG_EXT3_FS=y
104CONFIG_EXT3_FS_POSIX_ACL=y 98CONFIG_EXT3_FS_POSIX_ACL=y
105CONFIG_EXT3_FS_SECURITY=y 99CONFIG_EXT3_FS_SECURITY=y
106CONFIG_INOTIFY=y
107CONFIG_ISO9660_FS=m 100CONFIG_ISO9660_FS=m
108CONFIG_JOLIET=y 101CONFIG_JOLIET=y
109CONFIG_UDF_FS=m 102CONFIG_UDF_FS=m
@@ -113,13 +106,10 @@ CONFIG_PROC_KCORE=y
113CONFIG_TMPFS=y 106CONFIG_TMPFS=y
114CONFIG_HUGETLBFS=y 107CONFIG_HUGETLBFS=y
115CONFIG_NFS_FS=m 108CONFIG_NFS_FS=m
116CONFIG_NFS_V3=y
117CONFIG_NFS_V3_ACL=y 109CONFIG_NFS_V3_ACL=y
118CONFIG_NFSD=m 110CONFIG_NFSD=m
119CONFIG_NFSD_V3=y 111CONFIG_NFSD_V3=y
120CONFIG_NFSD_V3_ACL=y 112CONFIG_NFSD_V3_ACL=y
121CONFIG_PARTITION_ADVANCED=y
122CONFIG_EFI_PARTITION=y
123CONFIG_NLS_ISO8859_1=m 113CONFIG_NLS_ISO8859_1=m
124CONFIG_NLS_ISO8859_2=m 114CONFIG_NLS_ISO8859_2=m
125CONFIG_NLS_ISO8859_3=m 115CONFIG_NLS_ISO8859_3=m
@@ -132,11 +122,10 @@ CONFIG_NLS_ISO8859_13=m
132CONFIG_NLS_ISO8859_14=m 122CONFIG_NLS_ISO8859_14=m
133CONFIG_NLS_ISO8859_15=m 123CONFIG_NLS_ISO8859_15=m
134CONFIG_LIBCRC32C=m 124CONFIG_LIBCRC32C=m
135CONFIG_MAGIC_SYSRQ=y
136CONFIG_DEBUG_FS=y 125CONFIG_DEBUG_FS=y
126CONFIG_MAGIC_SYSRQ=y
137CONFIG_DEBUG_KERNEL=y 127CONFIG_DEBUG_KERNEL=y
138CONFIG_DEBUG_MUTEXES=y 128CONFIG_DEBUG_MUTEXES=y
139CONFIG_DEBUG_SPINLOCK_SLEEP=y
140CONFIG_XMON=y 129CONFIG_XMON=y
141CONFIG_XMON_DEFAULT=y 130CONFIG_XMON_DEFAULT=y
142CONFIG_CRYPTO_NULL=m 131CONFIG_CRYPTO_NULL=m
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
index db5b30857e1c..253a9f200097 100644
--- a/arch/powerpc/configs/chrp32_defconfig
+++ b/arch/powerpc/configs/chrp32_defconfig
@@ -1,25 +1,24 @@
1CONFIG_SMP=y 1CONFIG_SMP=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_NO_HZ=y
6CONFIG_HIGH_RES_TIMERS=y
6CONFIG_IKCONFIG=y 7CONFIG_IKCONFIG=y
7CONFIG_IKCONFIG_PROC=y 8CONFIG_IKCONFIG_PROC=y
8CONFIG_LOG_BUF_SHIFT=15 9CONFIG_LOG_BUF_SHIFT=15
9CONFIG_BLK_DEV_INITRD=y 10CONFIG_BLK_DEV_INITRD=y
10# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
11# CONFIG_COMPAT_BRK is not set 11# CONFIG_COMPAT_BRK is not set
12CONFIG_MODULES=y 12CONFIG_MODULES=y
13CONFIG_MODULE_UNLOAD=y 13CONFIG_MODULE_UNLOAD=y
14CONFIG_MODULE_FORCE_UNLOAD=y 14CONFIG_MODULE_FORCE_UNLOAD=y
15# CONFIG_BLK_DEV_BSG is not set 15# CONFIG_BLK_DEV_BSG is not set
16CONFIG_PARTITION_ADVANCED=y
17CONFIG_MAC_PARTITION=y
16# CONFIG_PPC_PMAC is not set 18# CONFIG_PPC_PMAC is not set
17CONFIG_HIGHMEM=y 19CONFIG_HIGHMEM=y
18CONFIG_NO_HZ=y
19CONFIG_HIGH_RES_TIMERS=y
20CONFIG_BINFMT_MISC=y 20CONFIG_BINFMT_MISC=y
21CONFIG_IRQ_ALL_CPUS=y 21CONFIG_IRQ_ALL_CPUS=y
22# CONFIG_MIGRATION is not set
23CONFIG_ISA=y 22CONFIG_ISA=y
24CONFIG_NET=y 23CONFIG_NET=y
25CONFIG_PACKET=y 24CONFIG_PACKET=y
@@ -37,11 +36,9 @@ CONFIG_NETFILTER=y
37# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 36# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
38# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set 37# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
39# CONFIG_NETFILTER_XT_MATCH_STATE is not set 38# CONFIG_NETFILTER_XT_MATCH_STATE is not set
40# CONFIG_IP_NF_TARGET_ULOG is not set
41# CONFIG_IP_NF_MANGLE is not set 39# CONFIG_IP_NF_MANGLE is not set
42CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
43# CONFIG_STANDALONE is not set 41# CONFIG_STANDALONE is not set
44CONFIG_PROC_DEVICETREE=y
45CONFIG_BLK_DEV_FD=y 42CONFIG_BLK_DEV_FD=y
46CONFIG_BLK_DEV_LOOP=y 43CONFIG_BLK_DEV_LOOP=y
47CONFIG_BLK_DEV_RAM=y 44CONFIG_BLK_DEV_RAM=y
@@ -60,31 +57,28 @@ CONFIG_SCSI_CONSTANTS=y
60CONFIG_SCSI_SYM53C8XX_2=y 57CONFIG_SCSI_SYM53C8XX_2=y
61CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 58CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
62CONFIG_NETDEVICES=y 59CONFIG_NETDEVICES=y
63CONFIG_NET_ETHERNET=y 60CONFIG_PCNET32=y
64CONFIG_NET_TULIP=y 61CONFIG_NET_TULIP=y
65CONFIG_DE4X5=y 62CONFIG_DE4X5=y
66CONFIG_NET_PCI=y 63CONFIG_MV643XX_ETH=y
67CONFIG_PCNET32=y
68CONFIG_8139CP=y 64CONFIG_8139CP=y
69CONFIG_8139TOO=y 65CONFIG_8139TOO=y
70# CONFIG_8139TOO_PIO is not set 66# CONFIG_8139TOO_PIO is not set
71CONFIG_VIA_RHINE=y 67CONFIG_VIA_RHINE=y
72CONFIG_MV643XX_ETH=y
73CONFIG_PPP=m 68CONFIG_PPP=m
74CONFIG_PPP_MULTILINK=y
75CONFIG_PPP_FILTER=y
76CONFIG_PPP_ASYNC=m
77CONFIG_PPP_SYNC_TTY=m
78CONFIG_PPP_DEFLATE=m
79CONFIG_PPP_BSDCOMP=m 69CONFIG_PPP_BSDCOMP=m
70CONFIG_PPP_DEFLATE=m
71CONFIG_PPP_FILTER=y
80CONFIG_PPP_MPPE=m 72CONFIG_PPP_MPPE=m
73CONFIG_PPP_MULTILINK=y
81CONFIG_PPPOE=m 74CONFIG_PPPOE=m
75CONFIG_PPP_ASYNC=m
76CONFIG_PPP_SYNC_TTY=m
82CONFIG_INPUT_EVDEV=y 77CONFIG_INPUT_EVDEV=y
83CONFIG_INPUT_MISC=y 78CONFIG_INPUT_MISC=y
84CONFIG_INPUT_UINPUT=y 79CONFIG_INPUT_UINPUT=y
85CONFIG_SERIAL_8250=y 80CONFIG_SERIAL_8250=y
86CONFIG_SERIAL_8250_CONSOLE=y 81CONFIG_SERIAL_8250_CONSOLE=y
87CONFIG_BRIQ_PANEL=m
88# CONFIG_HW_RANDOM is not set 82# CONFIG_HW_RANDOM is not set
89CONFIG_NVRAM=y 83CONFIG_NVRAM=y
90CONFIG_GEN_RTC=y 84CONFIG_GEN_RTC=y
@@ -101,14 +95,12 @@ CONFIG_FB_ATY=y
101CONFIG_FB_ATY_CT=y 95CONFIG_FB_ATY_CT=y
102CONFIG_FB_ATY_GX=y 96CONFIG_FB_ATY_GX=y
103CONFIG_FB_3DFX=y 97CONFIG_FB_3DFX=y
104CONFIG_DISPLAY_SUPPORT=m
105CONFIG_FRAMEBUFFER_CONSOLE=y 98CONFIG_FRAMEBUFFER_CONSOLE=y
106CONFIG_LOGO=y 99CONFIG_LOGO=y
107CONFIG_HID_GYRATION=y 100CONFIG_HID_GYRATION=y
108CONFIG_HID_PANTHERLORD=y 101CONFIG_HID_PANTHERLORD=y
109CONFIG_HID_PETALYNX=y 102CONFIG_HID_PETALYNX=y
110CONFIG_HID_SAMSUNG=y 103CONFIG_HID_SAMSUNG=y
111CONFIG_HID_SONY=y
112CONFIG_HID_SUNPLUS=y 104CONFIG_HID_SUNPLUS=y
113CONFIG_USB=y 105CONFIG_USB=y
114CONFIG_USB_MON=y 106CONFIG_USB_MON=y
@@ -120,26 +112,19 @@ CONFIG_USB_STORAGE=m
120CONFIG_EXT2_FS=y 112CONFIG_EXT2_FS=y
121CONFIG_EXT3_FS=y 113CONFIG_EXT3_FS=y
122CONFIG_EXT4_FS=y 114CONFIG_EXT4_FS=y
123CONFIG_INOTIFY=y
124CONFIG_ISO9660_FS=y 115CONFIG_ISO9660_FS=y
125CONFIG_MSDOS_FS=m 116CONFIG_MSDOS_FS=m
126CONFIG_VFAT_FS=m 117CONFIG_VFAT_FS=m
127CONFIG_PROC_KCORE=y 118CONFIG_PROC_KCORE=y
128CONFIG_TMPFS=y 119CONFIG_TMPFS=y
129CONFIG_PARTITION_ADVANCED=y
130CONFIG_MAC_PARTITION=y
131CONFIG_NLS_ASCII=y 120CONFIG_NLS_ASCII=y
132CONFIG_NLS_ISO8859_1=m 121CONFIG_NLS_ISO8859_1=m
133CONFIG_CRC_T10DIF=y 122CONFIG_CRC_T10DIF=y
134CONFIG_MAGIC_SYSRQ=y 123CONFIG_MAGIC_SYSRQ=y
135CONFIG_DEBUG_KERNEL=y 124CONFIG_DEBUG_KERNEL=y
136CONFIG_DEBUG_MUTEXES=y 125CONFIG_DEBUG_MUTEXES=y
137CONFIG_DEBUG_SPINLOCK_SLEEP=y
138# CONFIG_RCU_CPU_STALL_DETECTOR is not set
139CONFIG_SYSCTL_SYSCALL_CHECK=y
140CONFIG_XMON=y 126CONFIG_XMON=y
141CONFIG_XMON_DEFAULT=y 127CONFIG_XMON_DEFAULT=y
142CONFIG_CRYPTO=y
143CONFIG_CRYPTO_CBC=m 128CONFIG_CRYPTO_CBC=m
144CONFIG_CRYPTO_PCBC=m 129CONFIG_CRYPTO_PCBC=m
145# CONFIG_CRYPTO_ANSI_CPRNG is not set 130# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig
index 611efe99faeb..51866f170684 100644
--- a/arch/powerpc/configs/corenet32_smp_defconfig
+++ b/arch/powerpc/configs/corenet32_smp_defconfig
@@ -1,13 +1,12 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_SMP=y 2CONFIG_SMP=y
3CONFIG_NR_CPUS=8 3CONFIG_NR_CPUS=8
4CONFIG_EXPERIMENTAL=y
5CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
6CONFIG_POSIX_MQUEUE=y 5CONFIG_POSIX_MQUEUE=y
7CONFIG_BSD_PROCESS_ACCT=y
8CONFIG_AUDIT=y 6CONFIG_AUDIT=y
9CONFIG_NO_HZ=y 7CONFIG_NO_HZ=y
10CONFIG_HIGH_RES_TIMERS=y 8CONFIG_HIGH_RES_TIMERS=y
9CONFIG_BSD_PROCESS_ACCT=y
11CONFIG_IKCONFIG=y 10CONFIG_IKCONFIG=y
12CONFIG_IKCONFIG_PROC=y 11CONFIG_IKCONFIG_PROC=y
13CONFIG_LOG_BUF_SHIFT=14 12CONFIG_LOG_BUF_SHIFT=14
@@ -57,7 +56,6 @@ CONFIG_NET_IPIP=y
57CONFIG_IP_MROUTE=y 56CONFIG_IP_MROUTE=y
58CONFIG_IP_PIMSM_V1=y 57CONFIG_IP_PIMSM_V1=y
59CONFIG_IP_PIMSM_V2=y 58CONFIG_IP_PIMSM_V2=y
60CONFIG_ARPD=y
61CONFIG_INET_AH=y 59CONFIG_INET_AH=y
62CONFIG_INET_ESP=y 60CONFIG_INET_ESP=y
63CONFIG_INET_IPCOMP=y 61CONFIG_INET_IPCOMP=y
@@ -69,17 +67,15 @@ CONFIG_DEVTMPFS=y
69CONFIG_DEVTMPFS_MOUNT=y 67CONFIG_DEVTMPFS_MOUNT=y
70CONFIG_MTD=y 68CONFIG_MTD=y
71CONFIG_MTD_CMDLINE_PARTS=y 69CONFIG_MTD_CMDLINE_PARTS=y
72CONFIG_MTD_CHAR=y
73CONFIG_MTD_BLOCK=y 70CONFIG_MTD_BLOCK=y
74CONFIG_MTD_CFI=y 71CONFIG_MTD_CFI=y
75CONFIG_MTD_CFI_INTELEXT=y 72CONFIG_MTD_CFI_INTELEXT=y
76CONFIG_MTD_CFI_AMDSTD=y 73CONFIG_MTD_CFI_AMDSTD=y
77CONFIG_MTD_PHYSMAP_OF=y 74CONFIG_MTD_PHYSMAP_OF=y
78CONFIG_MTD_M25P80=y
79CONFIG_MTD_NAND=y 75CONFIG_MTD_NAND=y
80CONFIG_MTD_NAND_FSL_ELBC=y 76CONFIG_MTD_NAND_FSL_ELBC=y
81CONFIG_MTD_NAND_FSL_IFC=y 77CONFIG_MTD_NAND_FSL_IFC=y
82CONFIG_PROC_DEVICETREE=y 78CONFIG_MTD_SPI_NOR=y
83CONFIG_BLK_DEV_LOOP=y 79CONFIG_BLK_DEV_LOOP=y
84CONFIG_BLK_DEV_RAM=y 80CONFIG_BLK_DEV_RAM=y
85CONFIG_BLK_DEV_RAM_SIZE=131072 81CONFIG_BLK_DEV_RAM_SIZE=131072
@@ -87,7 +83,6 @@ CONFIG_BLK_DEV_SD=y
87CONFIG_CHR_DEV_ST=y 83CONFIG_CHR_DEV_ST=y
88CONFIG_BLK_DEV_SR=y 84CONFIG_BLK_DEV_SR=y
89CONFIG_CHR_DEV_SG=y 85CONFIG_CHR_DEV_SG=y
90CONFIG_SCSI_MULTI_LUN=y
91CONFIG_SCSI_LOGGING=y 86CONFIG_SCSI_LOGGING=y
92CONFIG_SCSI_SYM53C8XX_2=y 87CONFIG_SCSI_SYM53C8XX_2=y
93CONFIG_ATA=y 88CONFIG_ATA=y
@@ -98,10 +93,11 @@ CONFIG_SATA_SIL=y
98CONFIG_PATA_SIL680=y 93CONFIG_PATA_SIL680=y
99CONFIG_NETDEVICES=y 94CONFIG_NETDEVICES=y
100CONFIG_FSL_PQ_MDIO=y 95CONFIG_FSL_PQ_MDIO=y
96CONFIG_FSL_XGMAC_MDIO=y
101CONFIG_E1000=y 97CONFIG_E1000=y
102CONFIG_E1000E=y 98CONFIG_E1000E=y
103CONFIG_VITESSE_PHY=y
104CONFIG_AT803X_PHY=y 99CONFIG_AT803X_PHY=y
100CONFIG_VITESSE_PHY=y
105CONFIG_FIXED_PHY=y 101CONFIG_FIXED_PHY=y
106# CONFIG_INPUT_MOUSEDEV is not set 102# CONFIG_INPUT_MOUSEDEV is not set
107# CONFIG_INPUT_KEYBOARD is not set 103# CONFIG_INPUT_KEYBOARD is not set
@@ -123,7 +119,6 @@ CONFIG_SPI_GPIO=y
123CONFIG_SPI_FSL_SPI=y 119CONFIG_SPI_FSL_SPI=y
124CONFIG_SPI_FSL_ESPI=y 120CONFIG_SPI_FSL_ESPI=y
125# CONFIG_HWMON is not set 121# CONFIG_HWMON is not set
126CONFIG_VIDEO_OUTPUT_CONTROL=y
127CONFIG_USB_HID=m 122CONFIG_USB_HID=m
128CONFIG_USB=y 123CONFIG_USB=y
129CONFIG_USB_MON=y 124CONFIG_USB_MON=y
@@ -143,10 +138,10 @@ CONFIG_RTC_DRV_DS1307=y
143CONFIG_RTC_DRV_DS1374=y 138CONFIG_RTC_DRV_DS1374=y
144CONFIG_RTC_DRV_DS3232=y 139CONFIG_RTC_DRV_DS3232=y
145CONFIG_UIO=y 140CONFIG_UIO=y
146CONFIG_STAGING=y
147CONFIG_MEMORY=y
148CONFIG_VIRT_DRIVERS=y 141CONFIG_VIRT_DRIVERS=y
149CONFIG_FSL_HV_MANAGER=y 142CONFIG_FSL_HV_MANAGER=y
143CONFIG_STAGING=y
144CONFIG_FSL_CORENET_CF=y
150CONFIG_EXT2_FS=y 145CONFIG_EXT2_FS=y
151CONFIG_EXT3_FS=y 146CONFIG_EXT3_FS=y
152# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 147# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
@@ -170,17 +165,15 @@ CONFIG_NLS_CODEPAGE_437=y
170CONFIG_NLS_CODEPAGE_850=y 165CONFIG_NLS_CODEPAGE_850=y
171CONFIG_NLS_ISO8859_1=y 166CONFIG_NLS_ISO8859_1=y
172CONFIG_NLS_UTF8=m 167CONFIG_NLS_UTF8=m
168CONFIG_DEBUG_INFO=y
173CONFIG_MAGIC_SYSRQ=y 169CONFIG_MAGIC_SYSRQ=y
174CONFIG_DEBUG_SHIRQ=y 170CONFIG_DEBUG_SHIRQ=y
175CONFIG_DETECT_HUNG_TASK=y 171CONFIG_DETECT_HUNG_TASK=y
176CONFIG_DEBUG_INFO=y
177CONFIG_RCU_TRACE=y 172CONFIG_RCU_TRACE=y
178CONFIG_CRYPTO_NULL=y 173CONFIG_CRYPTO_NULL=y
179CONFIG_CRYPTO_PCBC=m 174CONFIG_CRYPTO_PCBC=m
180CONFIG_CRYPTO_MD4=y 175CONFIG_CRYPTO_MD4=y
181CONFIG_CRYPTO_SHA256=y 176CONFIG_CRYPTO_SHA256=y
182CONFIG_CRYPTO_SHA512=y 177CONFIG_CRYPTO_SHA512=y
183CONFIG_CRYPTO_AES=y
184# CONFIG_CRYPTO_ANSI_CPRNG is not set 178# CONFIG_CRYPTO_ANSI_CPRNG is not set
185CONFIG_CRYPTO_DEV_FSL_CAAM=y 179CONFIG_CRYPTO_DEV_FSL_CAAM=y
186CONFIG_FSL_CORENET_CF=y
diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig
index be24a18c0d96..d6c0c8198952 100644
--- a/arch/powerpc/configs/corenet64_smp_defconfig
+++ b/arch/powerpc/configs/corenet64_smp_defconfig
@@ -69,6 +69,7 @@ CONFIG_MTD_PHYSMAP_OF=y
69CONFIG_MTD_NAND=y 69CONFIG_MTD_NAND=y
70CONFIG_MTD_NAND_FSL_ELBC=y 70CONFIG_MTD_NAND_FSL_ELBC=y
71CONFIG_MTD_NAND_FSL_IFC=y 71CONFIG_MTD_NAND_FSL_IFC=y
72CONFIG_MTD_SPI_NOR=y
72CONFIG_MTD_UBI=y 73CONFIG_MTD_UBI=y
73CONFIG_BLK_DEV_LOOP=y 74CONFIG_BLK_DEV_LOOP=y
74CONFIG_BLK_DEV_RAM=y 75CONFIG_BLK_DEV_RAM=y
@@ -79,7 +80,11 @@ CONFIG_SATA_FSL=y
79CONFIG_SATA_SIL24=y 80CONFIG_SATA_SIL24=y
80CONFIG_NETDEVICES=y 81CONFIG_NETDEVICES=y
81CONFIG_DUMMY=y 82CONFIG_DUMMY=y
83CONFIG_FSL_PQ_MDIO=y
84CONFIG_FSL_XGMAC_MDIO=y
82CONFIG_E1000E=y 85CONFIG_E1000E=y
86CONFIG_VITESSE_PHY=y
87CONFIG_FIXED_PHY=y
83CONFIG_INPUT_FF_MEMLESS=m 88CONFIG_INPUT_FF_MEMLESS=m
84# CONFIG_INPUT_MOUSEDEV is not set 89# CONFIG_INPUT_MOUSEDEV is not set
85# CONFIG_INPUT_KEYBOARD is not set 90# CONFIG_INPUT_KEYBOARD is not set
@@ -118,7 +123,6 @@ CONFIG_FSL_DMA=y
118CONFIG_VIRT_DRIVERS=y 123CONFIG_VIRT_DRIVERS=y
119CONFIG_FSL_HV_MANAGER=y 124CONFIG_FSL_HV_MANAGER=y
120CONFIG_FSL_CORENET_CF=y 125CONFIG_FSL_CORENET_CF=y
121CONFIG_MEMORY=y
122CONFIG_EXT2_FS=y 126CONFIG_EXT2_FS=y
123CONFIG_EXT3_FS=y 127CONFIG_EXT3_FS=y
124CONFIG_ISO9660_FS=m 128CONFIG_ISO9660_FS=m
diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig
index fceffb3cffbe..7c137041f1d6 100644
--- a/arch/powerpc/configs/ep8248e_defconfig
+++ b/arch/powerpc/configs/ep8248e_defconfig
@@ -5,13 +5,13 @@ CONFIG_LOG_BUF_SHIFT=14
5CONFIG_EXPERT=y 5CONFIG_EXPERT=y
6CONFIG_KALLSYMS_ALL=y 6CONFIG_KALLSYMS_ALL=y
7CONFIG_SLAB=y 7CONFIG_SLAB=y
8CONFIG_PARTITION_ADVANCED=y
8# CONFIG_IOSCHED_CFQ is not set 9# CONFIG_IOSCHED_CFQ is not set
9# CONFIG_PPC_CHRP is not set 10# CONFIG_PPC_CHRP is not set
10# CONFIG_PPC_PMAC is not set 11# CONFIG_PPC_PMAC is not set
11CONFIG_PPC_82xx=y 12CONFIG_PPC_82xx=y
12CONFIG_EP8248E=y 13CONFIG_EP8248E=y
13CONFIG_BINFMT_MISC=y 14CONFIG_BINFMT_MISC=y
14CONFIG_SPARSE_IRQ=y
15# CONFIG_SECCOMP is not set 15# CONFIG_SECCOMP is not set
16CONFIG_PCI=y 16CONFIG_PCI=y
17CONFIG_NET=y 17CONFIG_NET=y
@@ -28,7 +28,6 @@ CONFIG_NETFILTER=y
28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
29# CONFIG_FW_LOADER is not set 29# CONFIG_FW_LOADER is not set
30CONFIG_MTD=y 30CONFIG_MTD=y
31CONFIG_MTD_CHAR=y
32CONFIG_MTD_BLOCK=y 31CONFIG_MTD_BLOCK=y
33CONFIG_MTD_CFI=y 32CONFIG_MTD_CFI=y
34CONFIG_MTD_CFI_ADV_OPTIONS=y 33CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -38,14 +37,11 @@ CONFIG_MTD_CFI_GEOMETRY=y
38# CONFIG_MTD_CFI_I1 is not set 37# CONFIG_MTD_CFI_I1 is not set
39CONFIG_MTD_CFI_AMDSTD=y 38CONFIG_MTD_CFI_AMDSTD=y
40CONFIG_MTD_PHYSMAP_OF=y 39CONFIG_MTD_PHYSMAP_OF=y
41CONFIG_PROC_DEVICETREE=y
42CONFIG_BLK_DEV_LOOP=y 40CONFIG_BLK_DEV_LOOP=y
43# CONFIG_MISC_DEVICES is not set
44CONFIG_NETDEVICES=y 41CONFIG_NETDEVICES=y
45CONFIG_DAVICOM_PHY=y
46CONFIG_NET_ETHERNET=y
47CONFIG_FS_ENET=y 42CONFIG_FS_ENET=y
48# CONFIG_FS_ENET_HAS_SCC is not set 43# CONFIG_FS_ENET_HAS_SCC is not set
44CONFIG_DAVICOM_PHY=y
49# CONFIG_INPUT is not set 45# CONFIG_INPUT is not set
50# CONFIG_SERIO is not set 46# CONFIG_SERIO is not set
51# CONFIG_VT is not set 47# CONFIG_VT is not set
@@ -57,27 +53,20 @@ CONFIG_EXT2_FS=y
57CONFIG_EXT3_FS=y 53CONFIG_EXT3_FS=y
58# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 54# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
59# CONFIG_EXT3_FS_XATTR is not set 55# CONFIG_EXT3_FS_XATTR is not set
60CONFIG_INOTIFY=y
61CONFIG_AUTOFS4_FS=y 56CONFIG_AUTOFS4_FS=y
62CONFIG_PROC_KCORE=y 57CONFIG_PROC_KCORE=y
63CONFIG_TMPFS=y 58CONFIG_TMPFS=y
64CONFIG_CRAMFS=y 59CONFIG_CRAMFS=y
65CONFIG_NFS_FS=y 60CONFIG_NFS_FS=y
66CONFIG_NFS_V3=y
67CONFIG_ROOT_NFS=y 61CONFIG_ROOT_NFS=y
68CONFIG_PARTITION_ADVANCED=y
69CONFIG_NLS=y 62CONFIG_NLS=y
70CONFIG_NLS_CODEPAGE_437=y 63CONFIG_NLS_CODEPAGE_437=y
71CONFIG_NLS_ASCII=y 64CONFIG_NLS_ASCII=y
72CONFIG_NLS_ISO8859_1=y 65CONFIG_NLS_ISO8859_1=y
73CONFIG_NLS_UTF8=y 66CONFIG_NLS_UTF8=y
74# CONFIG_CRC32 is not set 67CONFIG_DEBUG_INFO=y
75CONFIG_MAGIC_SYSRQ=y 68CONFIG_MAGIC_SYSRQ=y
76CONFIG_DEBUG_KERNEL=y
77# CONFIG_SCHED_DEBUG is not set 69# CONFIG_SCHED_DEBUG is not set
78CONFIG_DEBUG_INFO=y
79# CONFIG_RCU_CPU_STALL_DETECTOR is not set
80CONFIG_SYSCTL_SYSCALL_CHECK=y
81CONFIG_BDI_SWITCH=y 70CONFIG_BDI_SWITCH=y
82CONFIG_CRYPTO_CBC=y 71CONFIG_CRYPTO_CBC=y
83CONFIG_CRYPTO_ECB=y 72CONFIG_CRYPTO_ECB=y
diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig
index b8a79d7ee89f..ee96be889dac 100644
--- a/arch/powerpc/configs/ep88xc_defconfig
+++ b/arch/powerpc/configs/ep88xc_defconfig
@@ -1,24 +1,20 @@
1CONFIG_PPC_8xx=y 1CONFIG_PPC_8xx=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 7CONFIG_EXPERT=y
8# CONFIG_SYSCTL_SYSCALL is not set
9# CONFIG_ELF_CORE is not set 8# CONFIG_ELF_CORE is not set
10# CONFIG_BASE_FULL is not set 9# CONFIG_BASE_FULL is not set
11# CONFIG_FUTEX is not set 10# CONFIG_FUTEX is not set
12# CONFIG_VM_EVENT_COUNTERS is not set 11# CONFIG_VM_EVENT_COUNTERS is not set
13# CONFIG_BLK_DEV_BSG is not set 12# CONFIG_BLK_DEV_BSG is not set
13CONFIG_PARTITION_ADVANCED=y
14# CONFIG_IOSCHED_CFQ is not set 14# CONFIG_IOSCHED_CFQ is not set
15CONFIG_PPC_EP88XC=y 15CONFIG_PPC_EP88XC=y
16CONFIG_8xx_COPYBACK=y 16CONFIG_8xx_COPYBACK=y
17CONFIG_NO_HZ=y
18CONFIG_HIGH_RES_TIMERS=y
19CONFIG_HZ_100=y 17CONFIG_HZ_100=y
20CONFIG_8XX_MINIMAL_FPEMU=y
21CONFIG_SPARSE_IRQ=y
22# CONFIG_SECCOMP is not set 18# CONFIG_SECCOMP is not set
23CONFIG_NET=y 19CONFIG_NET=y
24CONFIG_PACKET=y 20CONFIG_PACKET=y
@@ -35,27 +31,21 @@ CONFIG_SYN_COOKIES=y
35CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
36# CONFIG_FW_LOADER is not set 32# CONFIG_FW_LOADER is not set
37CONFIG_MTD=y 33CONFIG_MTD=y
38CONFIG_MTD_CHAR=y
39CONFIG_MTD_BLOCK=y 34CONFIG_MTD_BLOCK=y
40CONFIG_MTD_CFI=y 35CONFIG_MTD_CFI=y
41CONFIG_MTD_CFI_AMDSTD=y 36CONFIG_MTD_CFI_AMDSTD=y
42CONFIG_MTD_PHYSMAP_OF=y 37CONFIG_MTD_PHYSMAP_OF=y
43CONFIG_PROC_DEVICETREE=y
44# CONFIG_BLK_DEV is not set 38# CONFIG_BLK_DEV is not set
45# CONFIG_MISC_DEVICES is not set
46CONFIG_NETDEVICES=y 39CONFIG_NETDEVICES=y
47CONFIG_LXT_PHY=y
48CONFIG_NET_ETHERNET=y
49CONFIG_FS_ENET=y 40CONFIG_FS_ENET=y
50# CONFIG_FS_ENET_HAS_SCC is not set 41# CONFIG_FS_ENET_HAS_SCC is not set
51# CONFIG_NETDEV_1000 is not set 42CONFIG_LXT_PHY=y
52# CONFIG_NETDEV_10000 is not set
53# CONFIG_INPUT is not set 43# CONFIG_INPUT is not set
54# CONFIG_SERIO is not set 44# CONFIG_SERIO is not set
55# CONFIG_VT is not set 45# CONFIG_VT is not set
46# CONFIG_LEGACY_PTYS is not set
56CONFIG_SERIAL_CPM=y 47CONFIG_SERIAL_CPM=y
57CONFIG_SERIAL_CPM_CONSOLE=y 48CONFIG_SERIAL_CPM_CONSOLE=y
58# CONFIG_LEGACY_PTYS is not set
59CONFIG_GEN_RTC=y 49CONFIG_GEN_RTC=y
60# CONFIG_HWMON is not set 50# CONFIG_HWMON is not set
61# CONFIG_USB_SUPPORT is not set 51# CONFIG_USB_SUPPORT is not set
@@ -63,13 +53,8 @@ CONFIG_GEN_RTC=y
63CONFIG_TMPFS=y 53CONFIG_TMPFS=y
64CONFIG_CRAMFS=y 54CONFIG_CRAMFS=y
65CONFIG_NFS_FS=y 55CONFIG_NFS_FS=y
66CONFIG_NFS_V3=y
67CONFIG_ROOT_NFS=y 56CONFIG_ROOT_NFS=y
68CONFIG_PARTITION_ADVANCED=y 57CONFIG_CRC32_SLICEBY4=y
69# CONFIG_CRC32 is not set 58CONFIG_DEBUG_INFO=y
70CONFIG_MAGIC_SYSRQ=y 59CONFIG_MAGIC_SYSRQ=y
71CONFIG_DEBUG_KERNEL=y
72CONFIG_DETECT_HUNG_TASK=y 60CONFIG_DETECT_HUNG_TASK=y
73CONFIG_DEBUG_INFO=y
74# CONFIG_RCU_CPU_STALL_DETECTOR is not set
75CONFIG_CRC32_SLICEBY4=y
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index 6fab06f7f411..1d9ad8500909 100644
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_defconfig
@@ -2,12 +2,14 @@ CONFIG_PPC64=y
2CONFIG_ALTIVEC=y 2CONFIG_ALTIVEC=y
3CONFIG_SMP=y 3CONFIG_SMP=y
4CONFIG_NR_CPUS=4 4CONFIG_NR_CPUS=4
5CONFIG_EXPERIMENTAL=y
6CONFIG_SYSVIPC=y 5CONFIG_SYSVIPC=y
7CONFIG_POSIX_MQUEUE=y 6CONFIG_POSIX_MQUEUE=y
8CONFIG_FHANDLE=y 7CONFIG_FHANDLE=y
8CONFIG_NO_HZ=y
9CONFIG_HIGH_RES_TIMERS=y
9CONFIG_IKCONFIG=y 10CONFIG_IKCONFIG=y
10CONFIG_IKCONFIG_PROC=y 11CONFIG_IKCONFIG_PROC=y
12CONFIG_CGROUPS=y
11CONFIG_BLK_DEV_INITRD=y 13CONFIG_BLK_DEV_INITRD=y
12# CONFIG_COMPAT_BRK is not set 14# CONFIG_COMPAT_BRK is not set
13CONFIG_PROFILING=y 15CONFIG_PROFILING=y
@@ -16,17 +18,15 @@ CONFIG_MODULES=y
16CONFIG_MODULE_UNLOAD=y 18CONFIG_MODULE_UNLOAD=y
17CONFIG_MODVERSIONS=y 19CONFIG_MODVERSIONS=y
18CONFIG_MODULE_SRCVERSION_ALL=y 20CONFIG_MODULE_SRCVERSION_ALL=y
21CONFIG_PARTITION_ADVANCED=y
19# CONFIG_PPC_POWERNV is not set 22# CONFIG_PPC_POWERNV is not set
20# CONFIG_PPC_PSERIES is not set 23# CONFIG_PPC_PSERIES is not set
21CONFIG_CPU_FREQ=y 24CONFIG_CPU_FREQ=y
22CONFIG_CPU_FREQ_GOV_POWERSAVE=y 25CONFIG_CPU_FREQ_GOV_POWERSAVE=y
23CONFIG_CPU_FREQ_GOV_USERSPACE=y 26CONFIG_CPU_FREQ_GOV_USERSPACE=y
24CONFIG_CPU_FREQ_PMAC64=y 27CONFIG_CPU_FREQ_PMAC64=y
25CONFIG_NO_HZ=y
26CONFIG_HIGH_RES_TIMERS=y
27CONFIG_KEXEC=y 28CONFIG_KEXEC=y
28CONFIG_IRQ_ALL_CPUS=y 29CONFIG_IRQ_ALL_CPUS=y
29# CONFIG_MIGRATION is not set
30CONFIG_PCI_MSI=y 30CONFIG_PCI_MSI=y
31CONFIG_NET=y 31CONFIG_NET=y
32CONFIG_PACKET=y 32CONFIG_PACKET=y
@@ -52,9 +52,9 @@ CONFIG_NF_CONNTRACK_IRC=m
52CONFIG_NF_CONNTRACK_TFTP=m 52CONFIG_NF_CONNTRACK_TFTP=m
53CONFIG_NF_CT_NETLINK=m 53CONFIG_NF_CT_NETLINK=m
54CONFIG_NF_CONNTRACK_IPV4=m 54CONFIG_NF_CONNTRACK_IPV4=m
55CONFIG_IP_NF_QUEUE=m
56CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 55CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
57CONFIG_PROC_DEVICETREE=y 56CONFIG_DEVTMPFS=y
57CONFIG_DEVTMPFS_MOUNT=y
58CONFIG_BLK_DEV_LOOP=y 58CONFIG_BLK_DEV_LOOP=y
59CONFIG_BLK_DEV_NBD=m 59CONFIG_BLK_DEV_NBD=m
60CONFIG_BLK_DEV_RAM=y 60CONFIG_BLK_DEV_RAM=y
@@ -69,7 +69,6 @@ CONFIG_CHR_DEV_ST=y
69CONFIG_BLK_DEV_SR=y 69CONFIG_BLK_DEV_SR=y
70CONFIG_BLK_DEV_SR_VENDOR=y 70CONFIG_BLK_DEV_SR_VENDOR=y
71CONFIG_CHR_DEV_SG=y 71CONFIG_CHR_DEV_SG=y
72CONFIG_SCSI_MULTI_LUN=y
73CONFIG_SCSI_CONSTANTS=y 72CONFIG_SCSI_CONSTANTS=y
74CONFIG_SCSI_SPI_ATTRS=y 73CONFIG_SCSI_SPI_ATTRS=y
75CONFIG_ATA=y 74CONFIG_ATA=y
@@ -87,33 +86,29 @@ CONFIG_DM_CRYPT=m
87CONFIG_DM_SNAPSHOT=m 86CONFIG_DM_SNAPSHOT=m
88CONFIG_DM_MIRROR=m 87CONFIG_DM_MIRROR=m
89CONFIG_DM_ZERO=m 88CONFIG_DM_ZERO=m
90CONFIG_IEEE1394=y
91CONFIG_IEEE1394_OHCI1394=y
92CONFIG_IEEE1394_SBP2=m
93CONFIG_IEEE1394_ETH1394=m
94CONFIG_IEEE1394_RAWIO=y
95CONFIG_IEEE1394_VIDEO1394=m
96CONFIG_IEEE1394_DV1394=m
97CONFIG_ADB_PMU=y 89CONFIG_ADB_PMU=y
98CONFIG_PMAC_SMU=y 90CONFIG_PMAC_SMU=y
99CONFIG_MAC_EMUMOUSEBTN=y 91CONFIG_MAC_EMUMOUSEBTN=y
100CONFIG_THERM_PM72=y
101CONFIG_WINDFARM=y 92CONFIG_WINDFARM=y
102CONFIG_WINDFARM_PM81=y 93CONFIG_WINDFARM_PM81=y
103CONFIG_WINDFARM_PM91=y 94CONFIG_WINDFARM_PM91=y
104CONFIG_WINDFARM_PM112=y 95CONFIG_WINDFARM_PM112=y
105CONFIG_WINDFARM_PM121=y 96CONFIG_WINDFARM_PM121=y
106CONFIG_NETDEVICES=y 97CONFIG_NETDEVICES=y
107CONFIG_DUMMY=m
108CONFIG_BONDING=m 98CONFIG_BONDING=m
99CONFIG_DUMMY=m
109CONFIG_TUN=m 100CONFIG_TUN=m
110CONFIG_NET_ETHERNET=y
111CONFIG_MII=y
112CONFIG_SUNGEM=y
113CONFIG_ACENIC=m 101CONFIG_ACENIC=m
114CONFIG_ACENIC_OMIT_TIGON_I=y 102CONFIG_ACENIC_OMIT_TIGON_I=y
115CONFIG_E1000=y
116CONFIG_TIGON3=y 103CONFIG_TIGON3=y
104CONFIG_E1000=y
105CONFIG_SUNGEM=y
106CONFIG_PPP=m
107CONFIG_PPP_BSDCOMP=m
108CONFIG_PPP_DEFLATE=m
109CONFIG_PPPOE=m
110CONFIG_PPP_ASYNC=m
111CONFIG_PPP_SYNC_TTY=m
117CONFIG_USB_CATC=m 112CONFIG_USB_CATC=m
118CONFIG_USB_KAWETH=m 113CONFIG_USB_KAWETH=m
119CONFIG_USB_PEGASUS=m 114CONFIG_USB_PEGASUS=m
@@ -123,12 +118,6 @@ CONFIG_USB_USBNET=m
123# CONFIG_USB_NET_NET1080 is not set 118# CONFIG_USB_NET_NET1080 is not set
124# CONFIG_USB_NET_CDC_SUBSET is not set 119# CONFIG_USB_NET_CDC_SUBSET is not set
125# CONFIG_USB_NET_ZAURUS is not set 120# CONFIG_USB_NET_ZAURUS is not set
126CONFIG_PPP=m
127CONFIG_PPP_ASYNC=m
128CONFIG_PPP_SYNC_TTY=m
129CONFIG_PPP_DEFLATE=m
130CONFIG_PPP_BSDCOMP=m
131CONFIG_PPPOE=m
132# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 121# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
133CONFIG_INPUT_JOYDEV=m 122CONFIG_INPUT_JOYDEV=m
134CONFIG_INPUT_EVDEV=y 123CONFIG_INPUT_EVDEV=y
@@ -140,10 +129,8 @@ CONFIG_INPUT_EVDEV=y
140CONFIG_GEN_RTC=y 129CONFIG_GEN_RTC=y
141CONFIG_RAW_DRIVER=y 130CONFIG_RAW_DRIVER=y
142CONFIG_I2C_CHARDEV=y 131CONFIG_I2C_CHARDEV=y
143# CONFIG_HWMON is not set
144CONFIG_AGP=m 132CONFIG_AGP=m
145CONFIG_AGP_UNINORTH=m 133CONFIG_AGP_UNINORTH=m
146CONFIG_VIDEO_OUTPUT_CONTROL=m
147CONFIG_FB=y 134CONFIG_FB=y
148CONFIG_FIRMWARE_EDID=y 135CONFIG_FIRMWARE_EDID=y
149CONFIG_FB_TILEBLITTING=y 136CONFIG_FB_TILEBLITTING=y
@@ -167,15 +154,14 @@ CONFIG_SND_AOA_ONYX=m
167CONFIG_SND_AOA_TAS=m 154CONFIG_SND_AOA_TAS=m
168CONFIG_SND_AOA_TOONIE=m 155CONFIG_SND_AOA_TOONIE=m
169CONFIG_SND_USB_AUDIO=m 156CONFIG_SND_USB_AUDIO=m
170CONFIG_HID_PID=y
171CONFIG_USB_HIDDEV=y
172CONFIG_HID_GYRATION=y 157CONFIG_HID_GYRATION=y
173CONFIG_LOGITECH_FF=y 158CONFIG_LOGITECH_FF=y
174CONFIG_HID_PANTHERLORD=y 159CONFIG_HID_PANTHERLORD=y
175CONFIG_HID_PETALYNX=y 160CONFIG_HID_PETALYNX=y
176CONFIG_HID_SAMSUNG=y 161CONFIG_HID_SAMSUNG=y
177CONFIG_HID_SONY=y
178CONFIG_HID_SUNPLUS=y 162CONFIG_HID_SUNPLUS=y
163CONFIG_HID_PID=y
164CONFIG_USB_HIDDEV=y
179CONFIG_USB=y 165CONFIG_USB=y
180CONFIG_USB_MON=y 166CONFIG_USB_MON=y
181CONFIG_USB_EHCI_HCD=y 167CONFIG_USB_EHCI_HCD=y
@@ -245,8 +231,6 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
245CONFIG_REISERFS_FS_SECURITY=y 231CONFIG_REISERFS_FS_SECURITY=y
246CONFIG_XFS_FS=m 232CONFIG_XFS_FS=m
247CONFIG_XFS_POSIX_ACL=y 233CONFIG_XFS_POSIX_ACL=y
248CONFIG_INOTIFY=y
249CONFIG_AUTOFS_FS=m
250CONFIG_ISO9660_FS=y 234CONFIG_ISO9660_FS=y
251CONFIG_JOLIET=y 235CONFIG_JOLIET=y
252CONFIG_ZISOFS=y 236CONFIG_ZISOFS=y
@@ -260,14 +244,12 @@ CONFIG_HFS_FS=m
260CONFIG_HFSPLUS_FS=m 244CONFIG_HFSPLUS_FS=m
261CONFIG_CRAMFS=y 245CONFIG_CRAMFS=y
262CONFIG_NFS_FS=y 246CONFIG_NFS_FS=y
263CONFIG_NFS_V3=y
264CONFIG_NFS_V3_ACL=y 247CONFIG_NFS_V3_ACL=y
265CONFIG_NFS_V4=y 248CONFIG_NFS_V4=y
266CONFIG_NFSD=y 249CONFIG_NFSD=y
267CONFIG_NFSD_V3_ACL=y 250CONFIG_NFSD_V3_ACL=y
268CONFIG_NFSD_V4=y 251CONFIG_NFSD_V4=y
269CONFIG_CIFS=m 252CONFIG_CIFS=m
270CONFIG_PARTITION_ADVANCED=y
271CONFIG_NLS_CODEPAGE_437=y 253CONFIG_NLS_CODEPAGE_437=y
272CONFIG_NLS_CODEPAGE_1250=y 254CONFIG_NLS_CODEPAGE_1250=y
273CONFIG_NLS_CODEPAGE_1251=y 255CONFIG_NLS_CODEPAGE_1251=y
@@ -276,30 +258,21 @@ CONFIG_NLS_ISO8859_1=y
276CONFIG_NLS_ISO8859_15=y 258CONFIG_NLS_ISO8859_15=y
277CONFIG_NLS_UTF8=y 259CONFIG_NLS_UTF8=y
278CONFIG_CRC_T10DIF=y 260CONFIG_CRC_T10DIF=y
279CONFIG_LIBCRC32C=m
280CONFIG_MAGIC_SYSRQ=y
281CONFIG_DEBUG_FS=y 261CONFIG_DEBUG_FS=y
262CONFIG_MAGIC_SYSRQ=y
282CONFIG_DEBUG_KERNEL=y 263CONFIG_DEBUG_KERNEL=y
283CONFIG_DEBUG_MUTEXES=y 264CONFIG_DEBUG_MUTEXES=y
284# CONFIG_RCU_CPU_STALL_DETECTOR is not set
285CONFIG_LATENCYTOP=y 265CONFIG_LATENCYTOP=y
286CONFIG_SYSCTL_SYSCALL_CHECK=y
287CONFIG_BOOTX_TEXT=y 266CONFIG_BOOTX_TEXT=y
288CONFIG_PPC_EARLY_DEBUG=y 267CONFIG_PPC_EARLY_DEBUG=y
289CONFIG_PPC_EARLY_DEBUG_BOOTX=y
290CONFIG_CRYPTO_NULL=m 268CONFIG_CRYPTO_NULL=m
291CONFIG_CRYPTO_TEST=m 269CONFIG_CRYPTO_TEST=m
292CONFIG_CRYPTO_ECB=m
293CONFIG_CRYPTO_PCBC=m 270CONFIG_CRYPTO_PCBC=m
294CONFIG_CRYPTO_HMAC=y 271CONFIG_CRYPTO_HMAC=y
295CONFIG_CRYPTO_MD4=m
296CONFIG_CRYPTO_MICHAEL_MIC=m 272CONFIG_CRYPTO_MICHAEL_MIC=m
297CONFIG_CRYPTO_SHA256=m
298CONFIG_CRYPTO_SHA512=m 273CONFIG_CRYPTO_SHA512=m
299CONFIG_CRYPTO_WP512=m 274CONFIG_CRYPTO_WP512=m
300CONFIG_CRYPTO_AES=m
301CONFIG_CRYPTO_ANUBIS=m 275CONFIG_CRYPTO_ANUBIS=m
302CONFIG_CRYPTO_ARC4=m
303CONFIG_CRYPTO_BLOWFISH=m 276CONFIG_CRYPTO_BLOWFISH=m
304CONFIG_CRYPTO_CAST5=m 277CONFIG_CRYPTO_CAST5=m
305CONFIG_CRYPTO_CAST6=m 278CONFIG_CRYPTO_CAST6=m
diff --git a/arch/powerpc/configs/gamecube_defconfig b/arch/powerpc/configs/gamecube_defconfig
index 9ef2cc13e1b4..6c6c60f1aba4 100644
--- a/arch/powerpc/configs/gamecube_defconfig
+++ b/arch/powerpc/configs/gamecube_defconfig
@@ -1,11 +1,9 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_LOCALVERSION="-gcn" 1CONFIG_LOCALVERSION="-gcn"
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_IKCONFIG=y 3CONFIG_IKCONFIG=y
5CONFIG_IKCONFIG_PROC=y 4CONFIG_IKCONFIG_PROC=y
6CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
7CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
8# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
9CONFIG_EXPERT=y 7CONFIG_EXPERT=y
10# CONFIG_ELF_CORE is not set 8# CONFIG_ELF_CORE is not set
11CONFIG_PERF_EVENTS=y 9CONFIG_PERF_EVENTS=y
@@ -22,7 +20,6 @@ CONFIG_GAMECUBE=y
22CONFIG_PREEMPT=y 20CONFIG_PREEMPT=y
23CONFIG_BINFMT_MISC=m 21CONFIG_BINFMT_MISC=m
24CONFIG_KEXEC=y 22CONFIG_KEXEC=y
25# CONFIG_MIGRATION is not set
26# CONFIG_SECCOMP is not set 23# CONFIG_SECCOMP is not set
27CONFIG_ADVANCED_OPTIONS=y 24CONFIG_ADVANCED_OPTIONS=y
28CONFIG_NET=y 25CONFIG_NET=y
@@ -42,15 +39,11 @@ CONFIG_IP_PNP_RARP=y
42CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 39CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
43# CONFIG_STANDALONE is not set 40# CONFIG_STANDALONE is not set
44# CONFIG_FW_LOADER is not set 41# CONFIG_FW_LOADER is not set
45CONFIG_PROC_DEVICETREE=y
46CONFIG_BLK_DEV_LOOP=y 42CONFIG_BLK_DEV_LOOP=y
47CONFIG_BLK_DEV_NBD=m 43CONFIG_BLK_DEV_NBD=m
48CONFIG_BLK_DEV_RAM=y 44CONFIG_BLK_DEV_RAM=y
49CONFIG_BLK_DEV_RAM_COUNT=2 45CONFIG_BLK_DEV_RAM_COUNT=2
50CONFIG_NETDEVICES=y 46CONFIG_NETDEVICES=y
51CONFIG_NET_ETHERNET=y
52# CONFIG_NETDEV_1000 is not set
53# CONFIG_NETDEV_10000 is not set
54# CONFIG_WLAN is not set 47# CONFIG_WLAN is not set
55CONFIG_INPUT_FF_MEMLESS=m 48CONFIG_INPUT_FF_MEMLESS=m
56# CONFIG_INPUT_MOUSEDEV is not set 49# CONFIG_INPUT_MOUSEDEV is not set
@@ -61,8 +54,8 @@ CONFIG_INPUT_EVDEV=y
61CONFIG_INPUT_JOYSTICK=y 54CONFIG_INPUT_JOYSTICK=y
62# CONFIG_SERIO_I8042 is not set 55# CONFIG_SERIO_I8042 is not set
63# CONFIG_SERIO_SERPORT is not set 56# CONFIG_SERIO_SERPORT is not set
64# CONFIG_DEVKMEM is not set
65CONFIG_LEGACY_PTY_COUNT=64 57CONFIG_LEGACY_PTY_COUNT=64
58# CONFIG_DEVKMEM is not set
66# CONFIG_HW_RANDOM is not set 59# CONFIG_HW_RANDOM is not set
67# CONFIG_HWMON is not set 60# CONFIG_HWMON is not set
68CONFIG_FB=y 61CONFIG_FB=y
@@ -86,7 +79,6 @@ CONFIG_EXT2_FS=y
86CONFIG_EXT3_FS=y 79CONFIG_EXT3_FS=y
87# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 80# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
88# CONFIG_EXT3_FS_XATTR is not set 81# CONFIG_EXT3_FS_XATTR is not set
89CONFIG_INOTIFY=y
90CONFIG_ISO9660_FS=y 82CONFIG_ISO9660_FS=y
91CONFIG_JOLIET=y 83CONFIG_JOLIET=y
92CONFIG_MSDOS_FS=y 84CONFIG_MSDOS_FS=y
@@ -95,20 +87,15 @@ CONFIG_PROC_KCORE=y
95# CONFIG_PROC_PAGE_MONITOR is not set 87# CONFIG_PROC_PAGE_MONITOR is not set
96CONFIG_TMPFS=y 88CONFIG_TMPFS=y
97CONFIG_NFS_FS=y 89CONFIG_NFS_FS=y
98CONFIG_NFS_V3=y
99CONFIG_ROOT_NFS=y 90CONFIG_ROOT_NFS=y
100CONFIG_CIFS=y 91CONFIG_CIFS=y
101CONFIG_NLS_CODEPAGE_437=y 92CONFIG_NLS_CODEPAGE_437=y
102CONFIG_NLS_ISO8859_1=y 93CONFIG_NLS_ISO8859_1=y
103CONFIG_CRC_CCITT=y 94CONFIG_CRC_CCITT=y
104CONFIG_PRINTK_TIME=y 95CONFIG_PRINTK_TIME=y
105CONFIG_DEBUG_KERNEL=y
106CONFIG_DEBUG_SPINLOCK=y 96CONFIG_DEBUG_SPINLOCK=y
107CONFIG_DEBUG_MUTEXES=y 97CONFIG_DEBUG_MUTEXES=y
108CONFIG_DEBUG_SPINLOCK_SLEEP=y
109# CONFIG_RCU_CPU_STALL_DETECTOR is not set
110CONFIG_LATENCYTOP=y 98CONFIG_LATENCYTOP=y
111CONFIG_SYSCTL_SYSCALL_CHECK=y
112CONFIG_SCHED_TRACER=y 99CONFIG_SCHED_TRACER=y
113CONFIG_DMA_API_DEBUG=y 100CONFIG_DMA_API_DEBUG=y
114CONFIG_PPC_EARLY_DEBUG=y 101CONFIG_PPC_EARLY_DEBUG=y
diff --git a/arch/powerpc/configs/holly_defconfig b/arch/powerpc/configs/holly_defconfig
index 94ebfee188db..5e0f2551e5c7 100644
--- a/arch/powerpc/configs/holly_defconfig
+++ b/arch/powerpc/configs/holly_defconfig
@@ -1,17 +1,16 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7CONFIG_MODULES=y 7CONFIG_MODULES=y
8# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
9# CONFIG_PPC_CHRP is not set 10# CONFIG_PPC_CHRP is not set
10# CONFIG_PPC_PMAC is not set 11# CONFIG_PPC_PMAC is not set
11CONFIG_EMBEDDED6xx=y 12CONFIG_EMBEDDED6xx=y
12CONFIG_PPC_HOLLY=y 13CONFIG_PPC_HOLLY=y
13CONFIG_NO_HZ=y
14CONFIG_HIGH_RES_TIMERS=y
15CONFIG_BINFMT_MISC=y 14CONFIG_BINFMT_MISC=y
16CONFIG_CMDLINE_BOOL=y 15CONFIG_CMDLINE_BOOL=y
17CONFIG_CMDLINE="console=ttyS0,115200" 16CONFIG_CMDLINE="console=ttyS0,115200"
@@ -30,18 +29,15 @@ CONFIG_SYN_COOKIES=y
30# CONFIG_IPV6 is not set 29# CONFIG_IPV6 is not set
31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32# CONFIG_FW_LOADER is not set 31# CONFIG_FW_LOADER is not set
33CONFIG_PROC_DEVICETREE=y
34CONFIG_BLK_DEV_LOOP=y 32CONFIG_BLK_DEV_LOOP=y
35CONFIG_BLK_DEV_RAM=y 33CONFIG_BLK_DEV_RAM=y
36CONFIG_BLK_DEV_RAM_SIZE=131072 34CONFIG_BLK_DEV_RAM_SIZE=131072
37CONFIG_BLK_DEV_SD=y 35CONFIG_BLK_DEV_SD=y
38CONFIG_ATA=y 36CONFIG_ATA=y
39CONFIG_NETDEVICES=y 37CONFIG_NETDEVICES=y
40CONFIG_PHYLIB=y
41CONFIG_NET_ETHERNET=y
42CONFIG_NET_VENDOR_3COM=y
43CONFIG_VORTEX=y 38CONFIG_VORTEX=y
44CONFIG_TSI108_ETH=y 39CONFIG_TSI108_ETH=y
40CONFIG_PHYLIB=y
45# CONFIG_INPUT_MOUSEDEV is not set 41# CONFIG_INPUT_MOUSEDEV is not set
46# CONFIG_INPUT_KEYBOARD is not set 42# CONFIG_INPUT_KEYBOARD is not set
47# CONFIG_INPUT_MOUSE is not set 43# CONFIG_INPUT_MOUSE is not set
@@ -57,14 +53,11 @@ CONFIG_SERIAL_OF_PLATFORM=y
57CONFIG_GEN_RTC=y 53CONFIG_GEN_RTC=y
58CONFIG_EXT2_FS=y 54CONFIG_EXT2_FS=y
59CONFIG_EXT3_FS=y 55CONFIG_EXT3_FS=y
60CONFIG_INOTIFY=y
61CONFIG_PROC_KCORE=y 56CONFIG_PROC_KCORE=y
62CONFIG_TMPFS=y 57CONFIG_TMPFS=y
63CONFIG_NFS_FS=y 58CONFIG_NFS_FS=y
64CONFIG_ROOT_NFS=y 59CONFIG_ROOT_NFS=y
65CONFIG_PARTITION_ADVANCED=y
66CONFIG_MAGIC_SYSRQ=y 60CONFIG_MAGIC_SYSRQ=y
67CONFIG_DEBUG_KERNEL=y
68# CONFIG_SCHED_DEBUG is not set 61# CONFIG_SCHED_DEBUG is not set
69# CONFIG_DEBUG_BUGVERBOSE is not set 62# CONFIG_DEBUG_BUGVERBOSE is not set
70CONFIG_XMON=y 63CONFIG_XMON=y
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig
index b5e684640fdf..62ae92956d05 100644
--- a/arch/powerpc/configs/linkstation_defconfig
+++ b/arch/powerpc/configs/linkstation_defconfig
@@ -1,6 +1,7 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 2CONFIG_POSIX_MQUEUE=y
3CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y
4CONFIG_IKCONFIG=y 5CONFIG_IKCONFIG=y
5CONFIG_IKCONFIG_PROC=y 6CONFIG_IKCONFIG_PROC=y
6CONFIG_LOG_BUF_SHIFT=14 7CONFIG_LOG_BUF_SHIFT=14
@@ -13,10 +14,7 @@ CONFIG_MODULE_UNLOAD=y
13# CONFIG_PPC_PMAC is not set 14# CONFIG_PPC_PMAC is not set
14CONFIG_EMBEDDED6xx=y 15CONFIG_EMBEDDED6xx=y
15CONFIG_LINKSTATION=y 16CONFIG_LINKSTATION=y
16CONFIG_NO_HZ=y
17CONFIG_HIGH_RES_TIMERS=y
18CONFIG_HZ_100=y 17CONFIG_HZ_100=y
19CONFIG_SPARSE_IRQ=y
20CONFIG_NET=y 18CONFIG_NET=y
21CONFIG_PACKET=y 19CONFIG_PACKET=y
22CONFIG_UNIX=y 20CONFIG_UNIX=y
@@ -43,12 +41,8 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
43CONFIG_NETFILTER_XT_MATCH_STATE=m 41CONFIG_NETFILTER_XT_MATCH_STATE=m
44CONFIG_NF_CONNTRACK_IPV4=m 42CONFIG_NF_CONNTRACK_IPV4=m
45CONFIG_IP_NF_IPTABLES=m 43CONFIG_IP_NF_IPTABLES=m
46CONFIG_IP_NF_MATCH_ADDRTYPE=m
47CONFIG_IP_NF_FILTER=m 44CONFIG_IP_NF_FILTER=m
48CONFIG_IP_NF_TARGET_REJECT=m 45CONFIG_IP_NF_TARGET_REJECT=m
49CONFIG_NF_NAT=m
50CONFIG_IP_NF_TARGET_MASQUERADE=m
51CONFIG_IP_NF_TARGET_REDIRECT=m
52CONFIG_IP_NF_MANGLE=m 46CONFIG_IP_NF_MANGLE=m
53CONFIG_IP_NF_TARGET_ECN=m 47CONFIG_IP_NF_TARGET_ECN=m
54CONFIG_IP_NF_TARGET_TTL=m 48CONFIG_IP_NF_TARGET_TTL=m
@@ -58,10 +52,7 @@ CONFIG_IP_NF_ARPFILTER=m
58CONFIG_IP_NF_ARP_MANGLE=m 52CONFIG_IP_NF_ARP_MANGLE=m
59CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 53CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
60CONFIG_MTD=y 54CONFIG_MTD=y
61CONFIG_MTD_CONCAT=y
62CONFIG_MTD_CMDLINE_PARTS=y 55CONFIG_MTD_CMDLINE_PARTS=y
63CONFIG_MTD_OF_PARTS=y
64CONFIG_MTD_CHAR=y
65CONFIG_MTD_BLOCK=y 56CONFIG_MTD_BLOCK=y
66CONFIG_MTD_CFI=y 57CONFIG_MTD_CFI=y
67CONFIG_MTD_JEDECPROBE=y 58CONFIG_MTD_JEDECPROBE=y
@@ -72,27 +63,23 @@ CONFIG_MTD_CFI_GEOMETRY=y
72# CONFIG_MTD_CFI_I2 is not set 63# CONFIG_MTD_CFI_I2 is not set
73CONFIG_MTD_CFI_AMDSTD=y 64CONFIG_MTD_CFI_AMDSTD=y
74CONFIG_MTD_PHYSMAP=y 65CONFIG_MTD_PHYSMAP=y
75CONFIG_PROC_DEVICETREE=y
76CONFIG_BLK_DEV_LOOP=y 66CONFIG_BLK_DEV_LOOP=y
77CONFIG_BLK_DEV_RAM=y 67CONFIG_BLK_DEV_RAM=y
78CONFIG_BLK_DEV_RAM_COUNT=2 68CONFIG_BLK_DEV_RAM_COUNT=2
79CONFIG_BLK_DEV_RAM_SIZE=8192 69CONFIG_BLK_DEV_RAM_SIZE=8192
80CONFIG_MISC_DEVICES=y
81CONFIG_EEPROM_LEGACY=m 70CONFIG_EEPROM_LEGACY=m
82CONFIG_BLK_DEV_SD=y 71CONFIG_BLK_DEV_SD=y
83CONFIG_CHR_DEV_SG=y 72CONFIG_CHR_DEV_SG=y
84CONFIG_SCSI_MULTI_LUN=y
85CONFIG_ATA=y 73CONFIG_ATA=y
86CONFIG_PATA_IT821X=y 74CONFIG_PATA_IT821X=y
87CONFIG_PATA_SIL680=y 75CONFIG_PATA_SIL680=y
88CONFIG_NETDEVICES=y 76CONFIG_NETDEVICES=y
77CONFIG_NETCONSOLE=y
89CONFIG_TUN=m 78CONFIG_TUN=m
90CONFIG_NET_ETHERNET=y
91CONFIG_NET_TULIP=y 79CONFIG_NET_TULIP=y
92CONFIG_TULIP=y 80CONFIG_TULIP=y
93CONFIG_TULIP_MMIO=y 81CONFIG_TULIP_MMIO=y
94CONFIG_R8169=y 82CONFIG_R8169=y
95CONFIG_NETCONSOLE=y
96# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 83# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
97CONFIG_INPUT_EVDEV=m 84CONFIG_INPUT_EVDEV=m
98# CONFIG_INPUT_KEYBOARD is not set 85# CONFIG_INPUT_KEYBOARD is not set
@@ -106,7 +93,6 @@ CONFIG_HW_RANDOM=y
106CONFIG_I2C=y 93CONFIG_I2C=y
107CONFIG_I2C_CHARDEV=y 94CONFIG_I2C_CHARDEV=y
108CONFIG_I2C_MPC=y 95CONFIG_I2C_MPC=y
109CONFIG_VIDEO_OUTPUT_CONTROL=m
110# CONFIG_VGA_CONSOLE is not set 96# CONFIG_VGA_CONSOLE is not set
111CONFIG_HID=m 97CONFIG_HID=m
112# CONFIG_USB_HID is not set 98# CONFIG_USB_HID is not set
@@ -126,7 +112,6 @@ CONFIG_EXT2_FS=y
126CONFIG_EXT3_FS=y 112CONFIG_EXT3_FS=y
127# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 113# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
128CONFIG_XFS_FS=m 114CONFIG_XFS_FS=m
129CONFIG_INOTIFY=y
130CONFIG_ISO9660_FS=m 115CONFIG_ISO9660_FS=m
131CONFIG_JOLIET=y 116CONFIG_JOLIET=y
132CONFIG_ZISOFS=y 117CONFIG_ZISOFS=y
@@ -137,7 +122,6 @@ CONFIG_NTFS_FS=m
137CONFIG_PROC_KCORE=y 122CONFIG_PROC_KCORE=y
138CONFIG_TMPFS=y 123CONFIG_TMPFS=y
139CONFIG_NFS_FS=y 124CONFIG_NFS_FS=y
140CONFIG_NFS_V3=y
141CONFIG_NFS_V3_ACL=y 125CONFIG_NFS_V3_ACL=y
142CONFIG_NFS_V4=y 126CONFIG_NFS_V4=y
143CONFIG_ROOT_NFS=y 127CONFIG_ROOT_NFS=y
@@ -153,15 +137,9 @@ CONFIG_CRC_T10DIF=y
153CONFIG_MAGIC_SYSRQ=y 137CONFIG_MAGIC_SYSRQ=y
154CONFIG_DEBUG_KERNEL=y 138CONFIG_DEBUG_KERNEL=y
155CONFIG_DETECT_HUNG_TASK=y 139CONFIG_DETECT_HUNG_TASK=y
156# CONFIG_RCU_CPU_STALL_DETECTOR is not set
157CONFIG_SYSCTL_SYSCALL_CHECK=y
158CONFIG_CRYPTO_ECB=m
159CONFIG_CRYPTO_PCBC=m 140CONFIG_CRYPTO_PCBC=m
160CONFIG_CRYPTO_MD4=m
161CONFIG_CRYPTO_MICHAEL_MIC=m 141CONFIG_CRYPTO_MICHAEL_MIC=m
162CONFIG_CRYPTO_SHA1=m 142CONFIG_CRYPTO_SHA1=m
163CONFIG_CRYPTO_AES=m
164CONFIG_CRYPTO_ARC4=m
165CONFIG_CRYPTO_BLOWFISH=m 143CONFIG_CRYPTO_BLOWFISH=m
166CONFIG_CRYPTO_SERPENT=m 144CONFIG_CRYPTO_SERPENT=m
167CONFIG_CRYPTO_TWOFISH=m 145CONFIG_CRYPTO_TWOFISH=m
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index fbd9e4163311..ac9666f8abf1 100644
--- a/arch/powerpc/configs/maple_defconfig
+++ b/arch/powerpc/configs/maple_defconfig
@@ -1,10 +1,11 @@
1CONFIG_PPC64=y 1CONFIG_PPC64=y
2CONFIG_SMP=y 2CONFIG_SMP=y
3CONFIG_NR_CPUS=4 3CONFIG_NR_CPUS=4
4CONFIG_EXPERIMENTAL=y
5CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
6CONFIG_POSIX_MQUEUE=y 5CONFIG_POSIX_MQUEUE=y
7CONFIG_FHANDLE=y 6CONFIG_FHANDLE=y
7CONFIG_NO_HZ=y
8CONFIG_HIGH_RES_TIMERS=y
8CONFIG_IKCONFIG=y 9CONFIG_IKCONFIG=y
9CONFIG_IKCONFIG_PROC=y 10CONFIG_IKCONFIG_PROC=y
10# CONFIG_COMPAT_BRK is not set 11# CONFIG_COMPAT_BRK is not set
@@ -16,16 +17,15 @@ CONFIG_MODULE_UNLOAD=y
16CONFIG_MODVERSIONS=y 17CONFIG_MODVERSIONS=y
17CONFIG_MODULE_SRCVERSION_ALL=y 18CONFIG_MODULE_SRCVERSION_ALL=y
18# CONFIG_BLK_DEV_BSG is not set 19# CONFIG_BLK_DEV_BSG is not set
20CONFIG_PARTITION_ADVANCED=y
21CONFIG_MAC_PARTITION=y
19# CONFIG_PPC_POWERNV is not set 22# CONFIG_PPC_POWERNV is not set
20# CONFIG_PPC_PSERIES is not set 23# CONFIG_PPC_PSERIES is not set
21# CONFIG_PPC_PMAC is not set 24# CONFIG_PPC_PMAC is not set
22CONFIG_PPC_MAPLE=y 25CONFIG_PPC_MAPLE=y
23CONFIG_UDBG_RTAS_CONSOLE=y 26CONFIG_UDBG_RTAS_CONSOLE=y
24CONFIG_NO_HZ=y
25CONFIG_HIGH_RES_TIMERS=y
26CONFIG_KEXEC=y 27CONFIG_KEXEC=y
27CONFIG_IRQ_ALL_CPUS=y 28CONFIG_IRQ_ALL_CPUS=y
28# CONFIG_MIGRATION is not set
29CONFIG_PCI_MSI=y 29CONFIG_PCI_MSI=y
30CONFIG_NET=y 30CONFIG_NET=y
31CONFIG_PACKET=y 31CONFIG_PACKET=y
@@ -38,7 +38,6 @@ CONFIG_IP_PNP_DHCP=y
38# CONFIG_INET_LRO is not set 38# CONFIG_INET_LRO is not set
39# CONFIG_IPV6 is not set 39# CONFIG_IPV6 is not set
40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
41CONFIG_PROC_DEVICETREE=y
42CONFIG_BLK_DEV_RAM=y 41CONFIG_BLK_DEV_RAM=y
43CONFIG_BLK_DEV_RAM_SIZE=8192 42CONFIG_BLK_DEV_RAM_SIZE=8192
44CONFIG_IDE=y 43CONFIG_IDE=y
@@ -52,11 +51,9 @@ CONFIG_CHR_DEV_SG=y
52CONFIG_SCSI_IPR=y 51CONFIG_SCSI_IPR=y
53CONFIG_ATA=y 52CONFIG_ATA=y
54CONFIG_NETDEVICES=y 53CONFIG_NETDEVICES=y
55CONFIG_NET_ETHERNET=y
56CONFIG_NET_PCI=y
57CONFIG_AMD8111_ETH=y 54CONFIG_AMD8111_ETH=y
58CONFIG_E1000=y
59CONFIG_TIGON3=y 55CONFIG_TIGON3=y
56CONFIG_E1000=y
60CONFIG_USB_PEGASUS=y 57CONFIG_USB_PEGASUS=y
61# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 58# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
62CONFIG_INPUT_MOUSEDEV_SCREEN_X=1600 59CONFIG_INPUT_MOUSEDEV_SCREEN_X=1600
@@ -72,13 +69,11 @@ CONFIG_GEN_RTC=y
72CONFIG_I2C=y 69CONFIG_I2C=y
73CONFIG_I2C_CHARDEV=y 70CONFIG_I2C_CHARDEV=y
74CONFIG_I2C_AMD8111=y 71CONFIG_I2C_AMD8111=y
75# CONFIG_HWMON is not set
76# CONFIG_VGA_CONSOLE is not set 72# CONFIG_VGA_CONSOLE is not set
77CONFIG_HID_GYRATION=y 73CONFIG_HID_GYRATION=y
78CONFIG_HID_PANTHERLORD=y 74CONFIG_HID_PANTHERLORD=y
79CONFIG_HID_PETALYNX=y 75CONFIG_HID_PETALYNX=y
80CONFIG_HID_SAMSUNG=y 76CONFIG_HID_SAMSUNG=y
81CONFIG_HID_SONY=y
82CONFIG_HID_SUNPLUS=y 77CONFIG_HID_SUNPLUS=y
83CONFIG_USB=y 78CONFIG_USB=y
84CONFIG_USB_MON=y 79CONFIG_USB_MON=y
@@ -111,7 +106,6 @@ CONFIG_EXT2_FS_XIP=y
111CONFIG_EXT3_FS=y 106CONFIG_EXT3_FS=y
112# CONFIG_EXT3_FS_XATTR is not set 107# CONFIG_EXT3_FS_XATTR is not set
113CONFIG_EXT4_FS=y 108CONFIG_EXT4_FS=y
114CONFIG_INOTIFY=y
115CONFIG_MSDOS_FS=y 109CONFIG_MSDOS_FS=y
116CONFIG_VFAT_FS=y 110CONFIG_VFAT_FS=y
117CONFIG_PROC_KCORE=y 111CONFIG_PROC_KCORE=y
@@ -119,28 +113,22 @@ CONFIG_TMPFS=y
119CONFIG_HUGETLBFS=y 113CONFIG_HUGETLBFS=y
120CONFIG_CRAMFS=y 114CONFIG_CRAMFS=y
121CONFIG_NFS_FS=y 115CONFIG_NFS_FS=y
122CONFIG_NFS_V3=y
123CONFIG_NFS_V3_ACL=y 116CONFIG_NFS_V3_ACL=y
124CONFIG_NFS_V4=y 117CONFIG_NFS_V4=y
125CONFIG_ROOT_NFS=y 118CONFIG_ROOT_NFS=y
126CONFIG_PARTITION_ADVANCED=y
127CONFIG_MAC_PARTITION=y
128CONFIG_NLS_DEFAULT="utf-8" 119CONFIG_NLS_DEFAULT="utf-8"
129CONFIG_NLS_UTF8=y 120CONFIG_NLS_UTF8=y
130CONFIG_CRC_CCITT=y 121CONFIG_CRC_CCITT=y
131CONFIG_CRC_T10DIF=y 122CONFIG_CRC_T10DIF=y
132CONFIG_MAGIC_SYSRQ=y 123CONFIG_MAGIC_SYSRQ=y
133CONFIG_DEBUG_KERNEL=y 124CONFIG_DEBUG_KERNEL=y
134CONFIG_DEBUG_SPINLOCK_SLEEP=y
135# CONFIG_RCU_CPU_STALL_DETECTOR is not set
136CONFIG_LATENCYTOP=y
137CONFIG_DEBUG_STACKOVERFLOW=y
138CONFIG_DEBUG_STACK_USAGE=y 125CONFIG_DEBUG_STACK_USAGE=y
126CONFIG_DEBUG_STACKOVERFLOW=y
127CONFIG_LATENCYTOP=y
139CONFIG_XMON=y 128CONFIG_XMON=y
140CONFIG_XMON_DEFAULT=y 129CONFIG_XMON_DEFAULT=y
141CONFIG_BOOTX_TEXT=y 130CONFIG_BOOTX_TEXT=y
142CONFIG_PPC_EARLY_DEBUG=y 131CONFIG_PPC_EARLY_DEBUG=y
143CONFIG_PPC_EARLY_DEBUG_BOOTX=y
144CONFIG_CRYPTO_ECB=m 132CONFIG_CRYPTO_ECB=m
145CONFIG_CRYPTO_PCBC=m 133CONFIG_CRYPTO_PCBC=m
146# CONFIG_CRYPTO_ANSI_CPRNG is not set 134# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/mgcoge_defconfig b/arch/powerpc/configs/mgcoge_defconfig
index 8fa84f156ef3..666922c5b572 100644
--- a/arch/powerpc/configs/mgcoge_defconfig
+++ b/arch/powerpc/configs/mgcoge_defconfig
@@ -1,7 +1,7 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_SWAP is not set 1# CONFIG_SWAP is not set
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_HIGH_RES_TIMERS=y
5CONFIG_IKCONFIG=y 5CONFIG_IKCONFIG=y
6CONFIG_IKCONFIG_PROC=y 6CONFIG_IKCONFIG_PROC=y
7CONFIG_LOG_BUF_SHIFT=14 7CONFIG_LOG_BUF_SHIFT=14
@@ -16,7 +16,6 @@ CONFIG_PARTITION_ADVANCED=y
16# CONFIG_PPC_PMAC is not set 16# CONFIG_PPC_PMAC is not set
17CONFIG_PPC_82xx=y 17CONFIG_PPC_82xx=y
18CONFIG_MGCOGE=y 18CONFIG_MGCOGE=y
19CONFIG_HIGH_RES_TIMERS=y
20CONFIG_BINFMT_MISC=y 19CONFIG_BINFMT_MISC=y
21# CONFIG_SECCOMP is not set 20# CONFIG_SECCOMP is not set
22CONFIG_NET=y 21CONFIG_NET=y
@@ -36,8 +35,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
36# CONFIG_FW_LOADER is not set 35# CONFIG_FW_LOADER is not set
37CONFIG_MTD=y 36CONFIG_MTD=y
38CONFIG_MTD_CMDLINE_PARTS=y 37CONFIG_MTD_CMDLINE_PARTS=y
39CONFIG_MTD_CHAR=y
40CONFIG_MTD_BLKDEVS=y
41CONFIG_MTD_CFI=y 38CONFIG_MTD_CFI=y
42CONFIG_MTD_CFI_ADV_OPTIONS=y 39CONFIG_MTD_CFI_ADV_OPTIONS=y
43CONFIG_MTD_CFI_GEOMETRY=y 40CONFIG_MTD_CFI_GEOMETRY=y
@@ -45,7 +42,6 @@ CONFIG_MTD_CFI_GEOMETRY=y
45CONFIG_MTD_CFI_INTELEXT=y 42CONFIG_MTD_CFI_INTELEXT=y
46CONFIG_MTD_CFI_AMDSTD=y 43CONFIG_MTD_CFI_AMDSTD=y
47CONFIG_MTD_PHYSMAP_OF=y 44CONFIG_MTD_PHYSMAP_OF=y
48CONFIG_PROC_DEVICETREE=y
49CONFIG_BLK_DEV_LOOP=y 45CONFIG_BLK_DEV_LOOP=y
50CONFIG_BLK_DEV_RAM=y 46CONFIG_BLK_DEV_RAM=y
51CONFIG_NETDEVICES=y 47CONFIG_NETDEVICES=y
@@ -68,7 +64,6 @@ CONFIG_USB_GADGET=y
68CONFIG_USB_FSL_USB2=y 64CONFIG_USB_FSL_USB2=y
69CONFIG_USB_G_SERIAL=y 65CONFIG_USB_G_SERIAL=y
70CONFIG_UIO=y 66CONFIG_UIO=y
71CONFIG_UIO_PDRV=y
72CONFIG_EXT2_FS=y 67CONFIG_EXT2_FS=y
73CONFIG_AUTOFS4_FS=y 68CONFIG_AUTOFS4_FS=y
74CONFIG_PROC_KCORE=y 69CONFIG_PROC_KCORE=y
@@ -77,16 +72,15 @@ CONFIG_JFFS2_FS=y
77CONFIG_CRAMFS=y 72CONFIG_CRAMFS=y
78CONFIG_SQUASHFS=y 73CONFIG_SQUASHFS=y
79CONFIG_NFS_FS=y 74CONFIG_NFS_FS=y
80CONFIG_NFS_V3=y
81CONFIG_ROOT_NFS=y 75CONFIG_ROOT_NFS=y
82CONFIG_NLS_CODEPAGE_437=y 76CONFIG_NLS_CODEPAGE_437=y
83CONFIG_NLS_ASCII=y 77CONFIG_NLS_ASCII=y
84CONFIG_NLS_ISO8859_1=y 78CONFIG_NLS_ISO8859_1=y
85CONFIG_NLS_UTF8=y 79CONFIG_NLS_UTF8=y
86CONFIG_MAGIC_SYSRQ=y 80CONFIG_DEBUG_INFO=y
87CONFIG_DEBUG_FS=y 81CONFIG_DEBUG_FS=y
82CONFIG_MAGIC_SYSRQ=y
88# CONFIG_SCHED_DEBUG is not set 83# CONFIG_SCHED_DEBUG is not set
89CONFIG_DEBUG_INFO=y
90CONFIG_BDI_SWITCH=y 84CONFIG_BDI_SWITCH=y
91CONFIG_CRYPTO_ECB=y 85CONFIG_CRYPTO_ECB=y
92CONFIG_CRYPTO_PCBC=y 86CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/mpc512x_defconfig b/arch/powerpc/configs/mpc512x_defconfig
index ee853a1b1b2c..59b85cb95259 100644
--- a/arch/powerpc/configs/mpc512x_defconfig
+++ b/arch/powerpc/configs/mpc512x_defconfig
@@ -50,7 +50,6 @@ CONFIG_MTD_PHYSMAP_OF=y
50CONFIG_MTD_NAND=y 50CONFIG_MTD_NAND=y
51CONFIG_MTD_NAND_MPC5121_NFC=y 51CONFIG_MTD_NAND_MPC5121_NFC=y
52CONFIG_MTD_UBI=y 52CONFIG_MTD_UBI=y
53CONFIG_PROC_DEVICETREE=y
54CONFIG_BLK_DEV_RAM=y 53CONFIG_BLK_DEV_RAM=y
55CONFIG_BLK_DEV_RAM_COUNT=1 54CONFIG_BLK_DEV_RAM_COUNT=1
56CONFIG_BLK_DEV_RAM_SIZE=8192 55CONFIG_BLK_DEV_RAM_SIZE=8192
@@ -81,7 +80,6 @@ CONFIG_MDIO_BITBANG=y
81# CONFIG_WLAN is not set 80# CONFIG_WLAN is not set
82# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 81# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
83CONFIG_INPUT_EVDEV=y 82CONFIG_INPUT_EVDEV=y
84CONFIG_VT_HW_CONSOLE_BINDING=y
85# CONFIG_DEVKMEM is not set 83# CONFIG_DEVKMEM is not set
86CONFIG_SERIAL_MPC52xx=y 84CONFIG_SERIAL_MPC52xx=y
87CONFIG_SERIAL_MPC52xx_CONSOLE=y 85CONFIG_SERIAL_MPC52xx_CONSOLE=y
diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig
index 69fd8adf9f5e..9fd041bfd778 100644
--- a/arch/powerpc/configs/mpc5200_defconfig
+++ b/arch/powerpc/configs/mpc5200_defconfig
@@ -1,6 +1,6 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_SPARSE_IRQ=y 2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
4CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
6CONFIG_MODULES=y 6CONFIG_MODULES=y
@@ -16,8 +16,6 @@ CONFIG_PPC_MPC5200_BUGFIX=y
16CONFIG_PPC_MPC5200_LPBFIFO=m 16CONFIG_PPC_MPC5200_LPBFIFO=m
17# CONFIG_PPC_PMAC is not set 17# CONFIG_PPC_PMAC is not set
18CONFIG_SIMPLE_GPIO=y 18CONFIG_SIMPLE_GPIO=y
19CONFIG_NO_HZ=y
20CONFIG_HIGH_RES_TIMERS=y
21CONFIG_NET=y 19CONFIG_NET=y
22CONFIG_PACKET=y 20CONFIG_PACKET=y
23CONFIG_UNIX=y 21CONFIG_UNIX=y
@@ -33,8 +31,6 @@ CONFIG_SYN_COOKIES=y
33CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
34CONFIG_MTD=y 32CONFIG_MTD=y
35CONFIG_MTD_CMDLINE_PARTS=y 33CONFIG_MTD_CMDLINE_PARTS=y
36CONFIG_MTD_OF_PARTS=y
37CONFIG_MTD_CHAR=y
38CONFIG_MTD_BLOCK=y 34CONFIG_MTD_BLOCK=y
39CONFIG_MTD_CFI=y 35CONFIG_MTD_CFI=y
40CONFIG_MTD_CFI_AMDSTD=y 36CONFIG_MTD_CFI_AMDSTD=y
@@ -42,7 +38,6 @@ CONFIG_MTD_ROM=y
42CONFIG_MTD_PHYSMAP_OF=y 38CONFIG_MTD_PHYSMAP_OF=y
43CONFIG_MTD_PLATRAM=y 39CONFIG_MTD_PLATRAM=y
44CONFIG_MTD_UBI=m 40CONFIG_MTD_UBI=m
45CONFIG_PROC_DEVICETREE=y
46CONFIG_BLK_DEV_LOOP=y 41CONFIG_BLK_DEV_LOOP=y
47CONFIG_BLK_DEV_RAM=y 42CONFIG_BLK_DEV_RAM=y
48CONFIG_BLK_DEV_RAM_SIZE=32768 43CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -77,7 +72,6 @@ CONFIG_SENSORS_LM87=m
77CONFIG_WATCHDOG=y 72CONFIG_WATCHDOG=y
78CONFIG_MFD_SM501=m 73CONFIG_MFD_SM501=m
79CONFIG_DRM=y 74CONFIG_DRM=y
80CONFIG_VIDEO_OUTPUT_CONTROL=y
81CONFIG_FB=y 75CONFIG_FB=y
82CONFIG_FB_FOREIGN_ENDIAN=y 76CONFIG_FB_FOREIGN_ENDIAN=y
83CONFIG_FB_RADEON=y 77CONFIG_FB_RADEON=y
@@ -94,9 +88,6 @@ CONFIG_SND=y
94# CONFIG_SND_SPI is not set 88# CONFIG_SND_SPI is not set
95# CONFIG_SND_USB is not set 89# CONFIG_SND_USB is not set
96CONFIG_SND_SOC=y 90CONFIG_SND_SOC=y
97CONFIG_SND_SOC_MPC5200_I2S=y
98CONFIG_SND_MPC52xx_SOC_PCM030=y
99CONFIG_SND_MPC52xx_SOC_EFIKA=y
100CONFIG_HID_DRAGONRISE=y 91CONFIG_HID_DRAGONRISE=y
101CONFIG_HID_GYRATION=y 92CONFIG_HID_GYRATION=y
102CONFIG_HID_TWINHAN=y 93CONFIG_HID_TWINHAN=y
@@ -104,7 +95,6 @@ CONFIG_HID_ORTEK=y
104CONFIG_HID_PANTHERLORD=y 95CONFIG_HID_PANTHERLORD=y
105CONFIG_HID_PETALYNX=y 96CONFIG_HID_PETALYNX=y
106CONFIG_HID_SAMSUNG=y 97CONFIG_HID_SAMSUNG=y
107CONFIG_HID_SONY=y
108CONFIG_HID_SUNPLUS=y 98CONFIG_HID_SUNPLUS=y
109CONFIG_HID_GREENASIA=y 99CONFIG_HID_GREENASIA=y
110CONFIG_HID_SMARTJOYPLUS=y 100CONFIG_HID_SMARTJOYPLUS=y
@@ -112,7 +102,6 @@ CONFIG_HID_TOPSEED=y
112CONFIG_HID_THRUSTMASTER=y 102CONFIG_HID_THRUSTMASTER=y
113CONFIG_HID_ZEROPLUS=y 103CONFIG_HID_ZEROPLUS=y
114CONFIG_USB=y 104CONFIG_USB=y
115# CONFIG_USB_DEVICE_CLASS is not set
116CONFIG_USB_MON=y 105CONFIG_USB_MON=y
117CONFIG_USB_OHCI_HCD=y 106CONFIG_USB_OHCI_HCD=y
118CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 107CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
@@ -135,13 +124,12 @@ CONFIG_JFFS2_FS=y
135CONFIG_UBIFS_FS=m 124CONFIG_UBIFS_FS=m
136CONFIG_CRAMFS=y 125CONFIG_CRAMFS=y
137CONFIG_NFS_FS=y 126CONFIG_NFS_FS=y
138CONFIG_NFS_V3=y
139CONFIG_NFS_V4=y 127CONFIG_NFS_V4=y
140CONFIG_ROOT_NFS=y 128CONFIG_ROOT_NFS=y
141CONFIG_NLS_CODEPAGE_437=y 129CONFIG_NLS_CODEPAGE_437=y
142CONFIG_NLS_ISO8859_1=y 130CONFIG_NLS_ISO8859_1=y
143CONFIG_PRINTK_TIME=y 131CONFIG_PRINTK_TIME=y
132CONFIG_DEBUG_INFO=y
144CONFIG_DEBUG_KERNEL=y 133CONFIG_DEBUG_KERNEL=y
145CONFIG_DETECT_HUNG_TASK=y 134CONFIG_DETECT_HUNG_TASK=y
146CONFIG_DEBUG_INFO=y
147# CONFIG_CRYPTO_ANSI_CPRNG is not set 135# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig
index 75f0bbf0f6e8..e2647d5bb605 100644
--- a/arch/powerpc/configs/mpc7448_hpc2_defconfig
+++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig
@@ -1,19 +1,17 @@
1CONFIG_ALTIVEC=y 1CONFIG_ALTIVEC=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y
4CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 7CONFIG_EXPERT=y
8# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
9# CONFIG_PPC_CHRP is not set 10# CONFIG_PPC_CHRP is not set
10# CONFIG_PPC_PMAC is not set 11# CONFIG_PPC_PMAC is not set
11CONFIG_EMBEDDED6xx=y 12CONFIG_EMBEDDED6xx=y
12CONFIG_MPC7448HPC2=y 13CONFIG_MPC7448HPC2=y
13CONFIG_NO_HZ=y
14CONFIG_HIGH_RES_TIMERS=y
15CONFIG_BINFMT_MISC=y 14CONFIG_BINFMT_MISC=y
16CONFIG_SPARSE_IRQ=y
17# CONFIG_SECCOMP is not set 15# CONFIG_SECCOMP is not set
18CONFIG_NET=y 16CONFIG_NET=y
19CONFIG_PACKET=y 17CONFIG_PACKET=y
@@ -29,7 +27,6 @@ CONFIG_SYN_COOKIES=y
29# CONFIG_IPV6 is not set 27# CONFIG_IPV6 is not set
30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31# CONFIG_FW_LOADER is not set 29# CONFIG_FW_LOADER is not set
32CONFIG_PROC_DEVICETREE=y
33CONFIG_BLK_DEV_LOOP=y 30CONFIG_BLK_DEV_LOOP=y
34CONFIG_BLK_DEV_RAM=y 31CONFIG_BLK_DEV_RAM=y
35CONFIG_BLK_DEV_RAM_SIZE=131072 32CONFIG_BLK_DEV_RAM_SIZE=131072
@@ -37,13 +34,11 @@ CONFIG_BLK_DEV_SD=y
37CONFIG_ATA=y 34CONFIG_ATA=y
38CONFIG_SATA_MV=y 35CONFIG_SATA_MV=y
39CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
40CONFIG_PHYLIB=y
41CONFIG_NET_ETHERNET=y
42CONFIG_NET_PCI=y
43CONFIG_E100=y 37CONFIG_E100=y
44CONFIG_8139TOO=y 38CONFIG_8139TOO=y
45# CONFIG_8139TOO_PIO is not set 39# CONFIG_8139TOO_PIO is not set
46CONFIG_TSI108_ETH=y 40CONFIG_TSI108_ETH=y
41CONFIG_PHYLIB=y
47# CONFIG_INPUT_MOUSEDEV is not set 42# CONFIG_INPUT_MOUSEDEV is not set
48# CONFIG_INPUT_KEYBOARD is not set 43# CONFIG_INPUT_KEYBOARD is not set
49# CONFIG_INPUT_MOUSE is not set 44# CONFIG_INPUT_MOUSE is not set
@@ -53,17 +48,12 @@ CONFIG_SERIAL_8250=y
53CONFIG_SERIAL_8250_CONSOLE=y 48CONFIG_SERIAL_8250_CONSOLE=y
54# CONFIG_HW_RANDOM is not set 49# CONFIG_HW_RANDOM is not set
55CONFIG_GEN_RTC=y 50CONFIG_GEN_RTC=y
56CONFIG_VIDEO_OUTPUT_CONTROL=y
57CONFIG_EXT2_FS=y 51CONFIG_EXT2_FS=y
58CONFIG_EXT3_FS=y 52CONFIG_EXT3_FS=y
59# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 53# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
60CONFIG_INOTIFY=y
61CONFIG_PROC_KCORE=y 54CONFIG_PROC_KCORE=y
62CONFIG_TMPFS=y 55CONFIG_TMPFS=y
63CONFIG_NFS_FS=y 56CONFIG_NFS_FS=y
64CONFIG_ROOT_NFS=y 57CONFIG_ROOT_NFS=y
65CONFIG_PARTITION_ADVANCED=y
66CONFIG_CRC_T10DIF=y 58CONFIG_CRC_T10DIF=y
67# CONFIG_RCU_CPU_STALL_DETECTOR is not set
68CONFIG_SYSCTL_SYSCALL_CHECK=y
69# CONFIG_CRYPTO_ANSI_CPRNG is not set 59# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig
index 6a22400f73c1..825b052176af 100644
--- a/arch/powerpc/configs/mpc8272_ads_defconfig
+++ b/arch/powerpc/configs/mpc8272_ads_defconfig
@@ -1,17 +1,17 @@
1CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
2CONFIG_IKCONFIG=y 4CONFIG_IKCONFIG=y
3CONFIG_IKCONFIG_PROC=y 5CONFIG_IKCONFIG_PROC=y
4CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
5CONFIG_EXPERT=y 7CONFIG_EXPERT=y
6CONFIG_KALLSYMS_ALL=y 8CONFIG_KALLSYMS_ALL=y
9CONFIG_PARTITION_ADVANCED=y
7# CONFIG_PPC_CHRP is not set 10# CONFIG_PPC_CHRP is not set
8# CONFIG_PPC_PMAC is not set 11# CONFIG_PPC_PMAC is not set
9CONFIG_PPC_82xx=y 12CONFIG_PPC_82xx=y
10CONFIG_MPC8272_ADS=y 13CONFIG_MPC8272_ADS=y
11CONFIG_NO_HZ=y
12CONFIG_HIGH_RES_TIMERS=y
13CONFIG_BINFMT_MISC=y 14CONFIG_BINFMT_MISC=y
14CONFIG_SPARSE_IRQ=y
15CONFIG_PCI=y 15CONFIG_PCI=y
16CONFIG_NET=y 16CONFIG_NET=y
17CONFIG_PACKET=y 17CONFIG_PACKET=y
@@ -27,7 +27,6 @@ CONFIG_NETFILTER=y
27CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 27CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
28# CONFIG_FW_LOADER is not set 28# CONFIG_FW_LOADER is not set
29CONFIG_MTD=y 29CONFIG_MTD=y
30CONFIG_MTD_CHAR=y
31CONFIG_MTD_BLOCK=y 30CONFIG_MTD_BLOCK=y
32CONFIG_MTD_JEDECPROBE=y 31CONFIG_MTD_JEDECPROBE=y
33CONFIG_MTD_CFI_ADV_OPTIONS=y 32CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -39,52 +38,41 @@ CONFIG_MTD_CFI_GEOMETRY=y
39CONFIG_MTD_CFI_I4=y 38CONFIG_MTD_CFI_I4=y
40CONFIG_MTD_CFI_INTELEXT=y 39CONFIG_MTD_CFI_INTELEXT=y
41CONFIG_MTD_PHYSMAP_OF=y 40CONFIG_MTD_PHYSMAP_OF=y
42CONFIG_PROC_DEVICETREE=y
43CONFIG_BLK_DEV_LOOP=y 41CONFIG_BLK_DEV_LOOP=y
44# CONFIG_MISC_DEVICES is not set
45CONFIG_NETDEVICES=y 42CONFIG_NETDEVICES=y
46CONFIG_TUN=y 43CONFIG_TUN=y
47CONFIG_DAVICOM_PHY=y
48CONFIG_NET_ETHERNET=y
49CONFIG_FS_ENET=y 44CONFIG_FS_ENET=y
50# CONFIG_FS_ENET_HAS_SCC is not set 45# CONFIG_FS_ENET_HAS_SCC is not set
51CONFIG_FS_ENET_MDIO_FCC=y 46CONFIG_FS_ENET_MDIO_FCC=y
47CONFIG_DAVICOM_PHY=y
52CONFIG_PPP=y 48CONFIG_PPP=y
49CONFIG_PPP_DEFLATE=y
53CONFIG_PPP_ASYNC=y 50CONFIG_PPP_ASYNC=y
54CONFIG_PPP_SYNC_TTY=y 51CONFIG_PPP_SYNC_TTY=y
55CONFIG_PPP_DEFLATE=y
56CONFIG_INPUT_EVDEV=y 52CONFIG_INPUT_EVDEV=y
57# CONFIG_SERIO_I8042 is not set
58# CONFIG_VT is not set 53# CONFIG_VT is not set
59CONFIG_SERIAL_CPM=y 54CONFIG_SERIAL_CPM=y
60CONFIG_SERIAL_CPM_CONSOLE=y 55CONFIG_SERIAL_CPM_CONSOLE=y
61# CONFIG_HWMON is not set 56# CONFIG_HWMON is not set
62# CONFIG_HID_SUPPORT is not set
63# CONFIG_USB_SUPPORT is not set 57# CONFIG_USB_SUPPORT is not set
64CONFIG_EXT2_FS=y 58CONFIG_EXT2_FS=y
65CONFIG_EXT3_FS=y 59CONFIG_EXT3_FS=y
66# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 60# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
67CONFIG_INOTIFY=y
68CONFIG_AUTOFS4_FS=y 61CONFIG_AUTOFS4_FS=y
69CONFIG_PROC_KCORE=y 62CONFIG_PROC_KCORE=y
70CONFIG_TMPFS=y 63CONFIG_TMPFS=y
71CONFIG_CRAMFS=y 64CONFIG_CRAMFS=y
72CONFIG_NFS_FS=y 65CONFIG_NFS_FS=y
73CONFIG_NFS_V3=y
74CONFIG_NFS_V3_ACL=y 66CONFIG_NFS_V3_ACL=y
75CONFIG_ROOT_NFS=y 67CONFIG_ROOT_NFS=y
76CONFIG_PARTITION_ADVANCED=y
77CONFIG_NLS=y 68CONFIG_NLS=y
78CONFIG_NLS_CODEPAGE_437=y 69CONFIG_NLS_CODEPAGE_437=y
79CONFIG_NLS_ASCII=y 70CONFIG_NLS_ASCII=y
80CONFIG_NLS_ISO8859_1=y 71CONFIG_NLS_ISO8859_1=y
81CONFIG_NLS_UTF8=y 72CONFIG_NLS_UTF8=y
73CONFIG_DEBUG_INFO=y
82CONFIG_MAGIC_SYSRQ=y 74CONFIG_MAGIC_SYSRQ=y
83CONFIG_DEBUG_KERNEL=y
84CONFIG_DETECT_HUNG_TASK=y 75CONFIG_DETECT_HUNG_TASK=y
85CONFIG_DEBUG_INFO=y
86# CONFIG_RCU_CPU_STALL_DETECTOR is not set
87CONFIG_SYSCTL_SYSCALL_CHECK=y
88CONFIG_BDI_SWITCH=y 76CONFIG_BDI_SWITCH=y
89CONFIG_CRYPTO_CBC=y 77CONFIG_CRYPTO_CBC=y
90CONFIG_CRYPTO_ECB=y 78CONFIG_CRYPTO_ECB=y
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
index 23fec79964cf..671e220a9a98 100644
--- a/arch/powerpc/configs/mpc83xx_defconfig
+++ b/arch/powerpc/configs/mpc83xx_defconfig
@@ -1,4 +1,3 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_LOG_BUF_SHIFT=14 2CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 3CONFIG_BLK_DEV_INITRD=y
@@ -45,14 +44,12 @@ CONFIG_DEVTMPFS=y
45CONFIG_DEVTMPFS_MOUNT=y 44CONFIG_DEVTMPFS_MOUNT=y
46# CONFIG_FW_LOADER is not set 45# CONFIG_FW_LOADER is not set
47CONFIG_MTD=y 46CONFIG_MTD=y
48CONFIG_MTD_CHAR=y
49CONFIG_MTD_BLOCK=y 47CONFIG_MTD_BLOCK=y
50CONFIG_MTD_CFI=y 48CONFIG_MTD_CFI=y
51CONFIG_MTD_CFI_AMDSTD=y 49CONFIG_MTD_CFI_AMDSTD=y
52CONFIG_MTD_PHYSMAP_OF=y 50CONFIG_MTD_PHYSMAP_OF=y
53CONFIG_MTD_NAND=y 51CONFIG_MTD_NAND=y
54CONFIG_MTD_NAND_FSL_ELBC=y 52CONFIG_MTD_NAND_FSL_ELBC=y
55CONFIG_PROC_DEVICETREE=y
56CONFIG_BLK_DEV_LOOP=y 53CONFIG_BLK_DEV_LOOP=y
57CONFIG_BLK_DEV_RAM=y 54CONFIG_BLK_DEV_RAM=y
58CONFIG_BLK_DEV_RAM_SIZE=32768 55CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -62,7 +59,6 @@ CONFIG_ATA=y
62CONFIG_SATA_FSL=y 59CONFIG_SATA_FSL=y
63CONFIG_SATA_SIL=y 60CONFIG_SATA_SIL=y
64CONFIG_NETDEVICES=y 61CONFIG_NETDEVICES=y
65CONFIG_MII=y
66CONFIG_UCC_GETH=y 62CONFIG_UCC_GETH=y
67CONFIG_GIANFAR=y 63CONFIG_GIANFAR=y
68CONFIG_MARVELL_PHY=y 64CONFIG_MARVELL_PHY=y
@@ -82,7 +78,6 @@ CONFIG_I2C=y
82CONFIG_I2C_CHARDEV=y 78CONFIG_I2C_CHARDEV=y
83CONFIG_I2C_MPC=y 79CONFIG_I2C_MPC=y
84CONFIG_WATCHDOG=y 80CONFIG_WATCHDOG=y
85CONFIG_VIDEO_OUTPUT_CONTROL=m
86CONFIG_HID_A4TECH=y 81CONFIG_HID_A4TECH=y
87CONFIG_HID_APPLE=y 82CONFIG_HID_APPLE=y
88CONFIG_HID_BELKIN=y 83CONFIG_HID_BELKIN=y
@@ -97,7 +92,6 @@ CONFIG_HID_MONTEREY=y
97CONFIG_HID_PANTHERLORD=y 92CONFIG_HID_PANTHERLORD=y
98CONFIG_HID_PETALYNX=y 93CONFIG_HID_PETALYNX=y
99CONFIG_HID_SAMSUNG=y 94CONFIG_HID_SAMSUNG=y
100CONFIG_HID_SONY=y
101CONFIG_HID_SUNPLUS=y 95CONFIG_HID_SUNPLUS=y
102CONFIG_USB=y 96CONFIG_USB=y
103CONFIG_USB_MON=y 97CONFIG_USB_MON=y
@@ -119,6 +113,5 @@ CONFIG_CRYPTO_ECB=m
119CONFIG_CRYPTO_PCBC=m 113CONFIG_CRYPTO_PCBC=m
120CONFIG_CRYPTO_SHA256=y 114CONFIG_CRYPTO_SHA256=y
121CONFIG_CRYPTO_SHA512=y 115CONFIG_CRYPTO_SHA512=y
122CONFIG_CRYPTO_AES=y
123# CONFIG_CRYPTO_ANSI_CPRNG is not set 116# CONFIG_CRYPTO_ANSI_CPRNG is not set
124CONFIG_CRYPTO_DEV_TALITOS=y 117CONFIG_CRYPTO_DEV_TALITOS=y
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index 02395fab19bd..8535c343dd57 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_defconfig
@@ -20,6 +20,7 @@ CONFIG_MODVERSIONS=y
20# CONFIG_BLK_DEV_BSG is not set 20# CONFIG_BLK_DEV_BSG is not set
21CONFIG_PARTITION_ADVANCED=y 21CONFIG_PARTITION_ADVANCED=y
22CONFIG_MAC_PARTITION=y 22CONFIG_MAC_PARTITION=y
23CONFIG_C293_PCIE=y
23CONFIG_MPC8540_ADS=y 24CONFIG_MPC8540_ADS=y
24CONFIG_MPC8560_ADS=y 25CONFIG_MPC8560_ADS=y
25CONFIG_MPC85xx_CDS=y 26CONFIG_MPC85xx_CDS=y
@@ -27,7 +28,6 @@ CONFIG_MPC85xx_MDS=y
27CONFIG_MPC8536_DS=y 28CONFIG_MPC8536_DS=y
28CONFIG_MPC85xx_DS=y 29CONFIG_MPC85xx_DS=y
29CONFIG_MPC85xx_RDB=y 30CONFIG_MPC85xx_RDB=y
30CONFIG_C293_PCIE=y
31CONFIG_P1010_RDB=y 31CONFIG_P1010_RDB=y
32CONFIG_P1022_DS=y 32CONFIG_P1022_DS=y
33CONFIG_P1022_RDK=y 33CONFIG_P1022_RDK=y
@@ -42,6 +42,7 @@ CONFIG_TQM8548=y
42CONFIG_TQM8555=y 42CONFIG_TQM8555=y
43CONFIG_TQM8560=y 43CONFIG_TQM8560=y
44CONFIG_SBC8548=y 44CONFIG_SBC8548=y
45CONFIG_MVME2500=y
45CONFIG_QUICC_ENGINE=y 46CONFIG_QUICC_ENGINE=y
46CONFIG_QE_GPIO=y 47CONFIG_QE_GPIO=y
47CONFIG_HIGHMEM=y 48CONFIG_HIGHMEM=y
@@ -49,6 +50,8 @@ CONFIG_BINFMT_MISC=m
49CONFIG_MATH_EMULATION=y 50CONFIG_MATH_EMULATION=y
50CONFIG_FORCE_MAX_ZONEORDER=12 51CONFIG_FORCE_MAX_ZONEORDER=12
51CONFIG_PCI=y 52CONFIG_PCI=y
53CONFIG_PCIEPORTBUS=y
54# CONFIG_PCIEASPM is not set
52CONFIG_PCI_MSI=y 55CONFIG_PCI_MSI=y
53CONFIG_RAPIDIO=y 56CONFIG_RAPIDIO=y
54CONFIG_NET=y 57CONFIG_NET=y
@@ -70,7 +73,6 @@ CONFIG_NET_IPIP=y
70CONFIG_IP_MROUTE=y 73CONFIG_IP_MROUTE=y
71CONFIG_IP_PIMSM_V1=y 74CONFIG_IP_PIMSM_V1=y
72CONFIG_IP_PIMSM_V2=y 75CONFIG_IP_PIMSM_V2=y
73CONFIG_ARPD=y
74CONFIG_INET_ESP=y 76CONFIG_INET_ESP=y
75# CONFIG_INET_XFRM_MODE_BEET is not set 77# CONFIG_INET_XFRM_MODE_BEET is not set
76# CONFIG_INET_LRO is not set 78# CONFIG_INET_LRO is not set
@@ -80,33 +82,21 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
80CONFIG_DEVTMPFS=y 82CONFIG_DEVTMPFS=y
81CONFIG_DEVTMPFS_MOUNT=y 83CONFIG_DEVTMPFS_MOUNT=y
82CONFIG_MTD=y 84CONFIG_MTD=y
83CONFIG_MTD_OF_PARTS=y
84CONFIG_MTD_CMDLINE_PARTS=y 85CONFIG_MTD_CMDLINE_PARTS=y
85CONFIG_MTD_CHAR=y
86CONFIG_MTD_BLKDEVS=y
87CONFIG_MTD_BLOCK=y 86CONFIG_MTD_BLOCK=y
88CONFIG_FTL=y 87CONFIG_FTL=y
89CONFIG_MTD_CFI=y 88CONFIG_MTD_CFI=y
90CONFIG_MTD_GEN_PROBE=y
91CONFIG_MTD_MAP_BANK_WIDTH_1=y
92CONFIG_MTD_MAP_BANK_WIDTH_2=y
93CONFIG_MTD_MAP_BANK_WIDTH_4=y
94CONFIG_MTD_CFI_I1=y
95CONFIG_MTD_CFI_I2=y
96CONFIG_MTD_CFI_INTELEXT=y 89CONFIG_MTD_CFI_INTELEXT=y
97CONFIG_MTD_CFI_AMDSTD=y 90CONFIG_MTD_CFI_AMDSTD=y
91CONFIG_MTD_PHYSMAP=y
98CONFIG_MTD_PHYSMAP_OF=y 92CONFIG_MTD_PHYSMAP_OF=y
93CONFIG_MTD_PLATRAM=y
99CONFIG_MTD_M25P80=y 94CONFIG_MTD_M25P80=y
100CONFIG_MTD_CFI_UTIL=y
101CONFIG_MTD_NAND_ECC=y
102CONFIG_MTD_NAND=y 95CONFIG_MTD_NAND=y
103CONFIG_MTD_NAND_IDS=y
104CONFIG_MTD_NAND_FSL_ELBC=y 96CONFIG_MTD_NAND_FSL_ELBC=y
105CONFIG_MTD_NAND_FSL_IFC=y 97CONFIG_MTD_NAND_FSL_IFC=y
98CONFIG_MTD_SPI_NOR=y
106CONFIG_MTD_UBI=y 99CONFIG_MTD_UBI=y
107CONFIG_MTD_UBI_WL_THRESHOLD=4096
108CONFIG_MTD_UBI_BEB_RESERVE=1
109CONFIG_PROC_DEVICETREE=y
110CONFIG_BLK_DEV_LOOP=y 100CONFIG_BLK_DEV_LOOP=y
111CONFIG_BLK_DEV_NBD=y 101CONFIG_BLK_DEV_NBD=y
112CONFIG_BLK_DEV_RAM=y 102CONFIG_BLK_DEV_RAM=y
@@ -117,7 +107,6 @@ CONFIG_BLK_DEV_SD=y
117CONFIG_CHR_DEV_ST=y 107CONFIG_CHR_DEV_ST=y
118CONFIG_BLK_DEV_SR=y 108CONFIG_BLK_DEV_SR=y
119CONFIG_CHR_DEV_SG=y 109CONFIG_CHR_DEV_SG=y
120CONFIG_SCSI_MULTI_LUN=y
121CONFIG_SCSI_LOGGING=y 110CONFIG_SCSI_LOGGING=y
122CONFIG_ATA=y 111CONFIG_ATA=y
123CONFIG_SATA_AHCI=y 112CONFIG_SATA_AHCI=y
@@ -133,11 +122,12 @@ CONFIG_GIANFAR=y
133CONFIG_E1000=y 122CONFIG_E1000=y
134CONFIG_E1000E=y 123CONFIG_E1000E=y
135CONFIG_IGB=y 124CONFIG_IGB=y
125CONFIG_AT803X_PHY=y
136CONFIG_MARVELL_PHY=y 126CONFIG_MARVELL_PHY=y
137CONFIG_DAVICOM_PHY=y 127CONFIG_DAVICOM_PHY=y
138CONFIG_CICADA_PHY=y 128CONFIG_CICADA_PHY=y
139CONFIG_VITESSE_PHY=y 129CONFIG_VITESSE_PHY=y
140CONFIG_AT803X_PHY=y 130CONFIG_BROADCOM_PHY=y
141CONFIG_FIXED_PHY=y 131CONFIG_FIXED_PHY=y
142CONFIG_INPUT_FF_MEMLESS=m 132CONFIG_INPUT_FF_MEMLESS=m
143# CONFIG_INPUT_MOUSEDEV is not set 133# CONFIG_INPUT_MOUSEDEV is not set
@@ -146,8 +136,8 @@ CONFIG_INPUT_FF_MEMLESS=m
146CONFIG_SERIO_LIBPS2=y 136CONFIG_SERIO_LIBPS2=y
147CONFIG_SERIAL_8250=y 137CONFIG_SERIAL_8250=y
148CONFIG_SERIAL_8250_CONSOLE=y 138CONFIG_SERIAL_8250_CONSOLE=y
149CONFIG_SERIAL_8250_NR_UARTS=2 139CONFIG_SERIAL_8250_NR_UARTS=6
150CONFIG_SERIAL_8250_RUNTIME_UARTS=2 140CONFIG_SERIAL_8250_RUNTIME_UARTS=6
151CONFIG_SERIAL_8250_MANY_PORTS=y 141CONFIG_SERIAL_8250_MANY_PORTS=y
152CONFIG_SERIAL_8250_DETECT_IRQ=y 142CONFIG_SERIAL_8250_DETECT_IRQ=y
153CONFIG_SERIAL_8250_RSA=y 143CONFIG_SERIAL_8250_RSA=y
@@ -160,15 +150,12 @@ CONFIG_SPI=y
160CONFIG_SPI_FSL_SPI=y 150CONFIG_SPI_FSL_SPI=y
161CONFIG_SPI_FSL_ESPI=y 151CONFIG_SPI_FSL_ESPI=y
162CONFIG_GPIO_MPC8XXX=y 152CONFIG_GPIO_MPC8XXX=y
163# CONFIG_HWMON is not set 153CONFIG_HWMON=m
164CONFIG_VIDEO_OUTPUT_CONTROL=y 154CONFIG_SENSORS_LM90=m
165CONFIG_FB=y 155CONFIG_FB=y
166CONFIG_FB_FSL_DIU=y 156CONFIG_FB_FSL_DIU=y
167# CONFIG_VGA_CONSOLE is not set 157# CONFIG_VGA_CONSOLE is not set
168CONFIG_FRAMEBUFFER_CONSOLE=y 158CONFIG_FRAMEBUFFER_CONSOLE=y
169CONFIG_FONTS=y
170CONFIG_FONT_8x8=y
171CONFIG_FONT_8x16=y
172CONFIG_SOUND=y 159CONFIG_SOUND=y
173CONFIG_SND=y 160CONFIG_SND=y
174# CONFIG_SND_SUPPORT_OLD_API is not set 161# CONFIG_SND_SUPPORT_OLD_API is not set
@@ -192,7 +179,6 @@ CONFIG_HID_MONTEREY=y
192CONFIG_HID_PANTHERLORD=y 179CONFIG_HID_PANTHERLORD=y
193CONFIG_HID_PETALYNX=y 180CONFIG_HID_PETALYNX=y
194CONFIG_HID_SAMSUNG=y 181CONFIG_HID_SAMSUNG=y
195CONFIG_HID_SONY=y
196CONFIG_HID_SUNPLUS=y 182CONFIG_HID_SUNPLUS=y
197CONFIG_USB=y 183CONFIG_USB=y
198CONFIG_USB_MON=y 184CONFIG_USB_MON=y
@@ -208,6 +194,7 @@ CONFIG_MMC_SDHCI_PLTFM=y
208CONFIG_MMC_SDHCI_OF_ESDHC=y 194CONFIG_MMC_SDHCI_OF_ESDHC=y
209CONFIG_EDAC=y 195CONFIG_EDAC=y
210CONFIG_EDAC_MM_EDAC=y 196CONFIG_EDAC_MM_EDAC=y
197CONFIG_EDAC_MPC85XX=y
211CONFIG_RTC_CLASS=y 198CONFIG_RTC_CLASS=y
212CONFIG_RTC_DRV_DS1307=y 199CONFIG_RTC_DRV_DS1307=y
213CONFIG_RTC_DRV_DS1374=y 200CONFIG_RTC_DRV_DS1374=y
@@ -215,8 +202,6 @@ CONFIG_RTC_DRV_DS3232=y
215CONFIG_RTC_DRV_CMOS=y 202CONFIG_RTC_DRV_CMOS=y
216CONFIG_DMADEVICES=y 203CONFIG_DMADEVICES=y
217CONFIG_FSL_DMA=y 204CONFIG_FSL_DMA=y
218CONFIG_MEMORY=y
219# CONFIG_NET_DMA is not set
220CONFIG_EXT2_FS=y 205CONFIG_EXT2_FS=y
221CONFIG_EXT3_FS=y 206CONFIG_EXT3_FS=y
222# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 207# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
@@ -227,21 +212,9 @@ CONFIG_UDF_FS=m
227CONFIG_MSDOS_FS=m 212CONFIG_MSDOS_FS=m
228CONFIG_VFAT_FS=y 213CONFIG_VFAT_FS=y
229CONFIG_NTFS_FS=y 214CONFIG_NTFS_FS=y
230CONFIG_NLS_CODEPAGE_437=y
231CONFIG_NLS_CODEPAGE_850=y
232CONFIG_NLS_ISO8859_1=y
233CONFIG_PROC_KCORE=y 215CONFIG_PROC_KCORE=y
234CONFIG_TMPFS=y 216CONFIG_TMPFS=y
235CONFIG_HUGETLBFS=y 217CONFIG_HUGETLBFS=y
236CONFIG_JFFS2_FS=y
237CONFIG_JFFS2_FS_DEBUG=1
238CONFIG_JFFS2_FS_WRITEBUFFER=y
239CONFIG_JFFS2_ZLIB=y
240CONFIG_JFFS2_RTIME=y
241CONFIG_UBIFS_FS=y
242CONFIG_UBIFS_FS_XATTR=y
243CONFIG_UBIFS_FS_LZO=y
244CONFIG_UBIFS_FS_ZLIB=y
245CONFIG_ADFS_FS=m 218CONFIG_ADFS_FS=m
246CONFIG_AFFS_FS=m 219CONFIG_AFFS_FS=m
247CONFIG_HFS_FS=m 220CONFIG_HFS_FS=m
@@ -249,6 +222,9 @@ CONFIG_HFSPLUS_FS=m
249CONFIG_BEFS_FS=m 222CONFIG_BEFS_FS=m
250CONFIG_BFS_FS=m 223CONFIG_BFS_FS=m
251CONFIG_EFS_FS=m 224CONFIG_EFS_FS=m
225CONFIG_JFFS2_FS=y
226CONFIG_JFFS2_FS_DEBUG=1
227CONFIG_UBIFS_FS=y
252CONFIG_CRAMFS=y 228CONFIG_CRAMFS=y
253CONFIG_VXFS_FS=m 229CONFIG_VXFS_FS=m
254CONFIG_HPFS_FS=m 230CONFIG_HPFS_FS=m
@@ -259,16 +235,16 @@ CONFIG_NFS_FS=y
259CONFIG_NFS_V4=y 235CONFIG_NFS_V4=y
260CONFIG_ROOT_NFS=y 236CONFIG_ROOT_NFS=y
261CONFIG_NFSD=y 237CONFIG_NFSD=y
238CONFIG_NLS_CODEPAGE_437=y
239CONFIG_NLS_CODEPAGE_850=y
240CONFIG_NLS_ISO8859_1=y
262CONFIG_CRC_T10DIF=y 241CONFIG_CRC_T10DIF=y
263CONFIG_CRC16=y 242CONFIG_FONTS=y
264CONFIG_ZLIB_DEFLATE=y 243CONFIG_FONT_8x8=y
265CONFIG_LZO_COMPRESS=y 244CONFIG_FONT_8x16=y
266CONFIG_LZO_DECOMPRESS=y 245CONFIG_DEBUG_INFO=y
267CONFIG_CRYPTO_DEFLATE=y
268CONFIG_CRYPTO_LZO=y
269CONFIG_DEBUG_FS=y 246CONFIG_DEBUG_FS=y
270CONFIG_DETECT_HUNG_TASK=y 247CONFIG_DETECT_HUNG_TASK=y
271CONFIG_DEBUG_INFO=y
272CONFIG_CRYPTO_PCBC=m 248CONFIG_CRYPTO_PCBC=m
273CONFIG_CRYPTO_SHA256=y 249CONFIG_CRYPTO_SHA256=y
274CONFIG_CRYPTO_SHA512=y 250CONFIG_CRYPTO_SHA512=y
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
index b5d1b82a1b43..c45ad2e01b0c 100644
--- a/arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/arch/powerpc/configs/mpc85xx_smp_defconfig
@@ -2,14 +2,13 @@ CONFIG_PPC_85xx=y
2CONFIG_PHYS_64BIT=y 2CONFIG_PHYS_64BIT=y
3CONFIG_SMP=y 3CONFIG_SMP=y
4CONFIG_NR_CPUS=8 4CONFIG_NR_CPUS=8
5CONFIG_EXPERIMENTAL=y
6CONFIG_SYSVIPC=y 5CONFIG_SYSVIPC=y
7CONFIG_POSIX_MQUEUE=y 6CONFIG_POSIX_MQUEUE=y
8CONFIG_BSD_PROCESS_ACCT=y
9CONFIG_AUDIT=y 7CONFIG_AUDIT=y
10CONFIG_IRQ_DOMAIN_DEBUG=y 8CONFIG_IRQ_DOMAIN_DEBUG=y
11CONFIG_NO_HZ=y 9CONFIG_NO_HZ=y
12CONFIG_HIGH_RES_TIMERS=y 10CONFIG_HIGH_RES_TIMERS=y
11CONFIG_BSD_PROCESS_ACCT=y
13CONFIG_IKCONFIG=y 12CONFIG_IKCONFIG=y
14CONFIG_IKCONFIG_PROC=y 13CONFIG_IKCONFIG_PROC=y
15CONFIG_LOG_BUF_SHIFT=14 14CONFIG_LOG_BUF_SHIFT=14
@@ -23,6 +22,7 @@ CONFIG_MODVERSIONS=y
23# CONFIG_BLK_DEV_BSG is not set 22# CONFIG_BLK_DEV_BSG is not set
24CONFIG_PARTITION_ADVANCED=y 23CONFIG_PARTITION_ADVANCED=y
25CONFIG_MAC_PARTITION=y 24CONFIG_MAC_PARTITION=y
25CONFIG_C293_PCIE=y
26CONFIG_MPC8540_ADS=y 26CONFIG_MPC8540_ADS=y
27CONFIG_MPC8560_ADS=y 27CONFIG_MPC8560_ADS=y
28CONFIG_MPC85xx_CDS=y 28CONFIG_MPC85xx_CDS=y
@@ -30,7 +30,6 @@ CONFIG_MPC85xx_MDS=y
30CONFIG_MPC8536_DS=y 30CONFIG_MPC8536_DS=y
31CONFIG_MPC85xx_DS=y 31CONFIG_MPC85xx_DS=y
32CONFIG_MPC85xx_RDB=y 32CONFIG_MPC85xx_RDB=y
33CONFIG_C293_PCIE=y
34CONFIG_P1010_RDB=y 33CONFIG_P1010_RDB=y
35CONFIG_P1022_DS=y 34CONFIG_P1022_DS=y
36CONFIG_P1022_RDK=y 35CONFIG_P1022_RDK=y
@@ -73,7 +72,6 @@ CONFIG_NET_IPIP=y
73CONFIG_IP_MROUTE=y 72CONFIG_IP_MROUTE=y
74CONFIG_IP_PIMSM_V1=y 73CONFIG_IP_PIMSM_V1=y
75CONFIG_IP_PIMSM_V2=y 74CONFIG_IP_PIMSM_V2=y
76CONFIG_ARPD=y
77CONFIG_INET_ESP=y 75CONFIG_INET_ESP=y
78# CONFIG_INET_XFRM_MODE_BEET is not set 76# CONFIG_INET_XFRM_MODE_BEET is not set
79# CONFIG_INET_LRO is not set 77# CONFIG_INET_LRO is not set
@@ -83,33 +81,18 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
83CONFIG_DEVTMPFS=y 81CONFIG_DEVTMPFS=y
84CONFIG_DEVTMPFS_MOUNT=y 82CONFIG_DEVTMPFS_MOUNT=y
85CONFIG_MTD=y 83CONFIG_MTD=y
86CONFIG_MTD_OF_PARTS=y
87CONFIG_MTD_CMDLINE_PARTS=y 84CONFIG_MTD_CMDLINE_PARTS=y
88CONFIG_MTD_CHAR=y
89CONFIG_MTD_BLKDEVS=y
90CONFIG_MTD_BLOCK=y 85CONFIG_MTD_BLOCK=y
91CONFIG_FTL=y 86CONFIG_FTL=y
92CONFIG_MTD_CFI=y 87CONFIG_MTD_CFI=y
93CONFIG_MTD_GEN_PROBE=y
94CONFIG_MTD_MAP_BANK_WIDTH_1=y
95CONFIG_MTD_MAP_BANK_WIDTH_2=y
96CONFIG_MTD_MAP_BANK_WIDTH_4=y
97CONFIG_MTD_CFI_I1=y
98CONFIG_MTD_CFI_I2=y
99CONFIG_MTD_CFI_INTELEXT=y 88CONFIG_MTD_CFI_INTELEXT=y
100CONFIG_MTD_CFI_AMDSTD=y 89CONFIG_MTD_CFI_AMDSTD=y
101CONFIG_MTD_PHYSMAP_OF=y 90CONFIG_MTD_PHYSMAP_OF=y
102CONFIG_MTD_M25P80=y
103CONFIG_MTD_CFI_UTIL=y
104CONFIG_MTD_NAND_ECC=y
105CONFIG_MTD_NAND=y 91CONFIG_MTD_NAND=y
106CONFIG_MTD_NAND_IDS=y
107CONFIG_MTD_NAND_FSL_ELBC=y 92CONFIG_MTD_NAND_FSL_ELBC=y
108CONFIG_MTD_NAND_FSL_IFC=y 93CONFIG_MTD_NAND_FSL_IFC=y
94CONFIG_MTD_SPI_NOR=y
109CONFIG_MTD_UBI=y 95CONFIG_MTD_UBI=y
110CONFIG_MTD_UBI_WL_THRESHOLD=4096
111CONFIG_MTD_UBI_BEB_RESERVE=1
112CONFIG_PROC_DEVICETREE=y
113CONFIG_BLK_DEV_LOOP=y 96CONFIG_BLK_DEV_LOOP=y
114CONFIG_BLK_DEV_NBD=y 97CONFIG_BLK_DEV_NBD=y
115CONFIG_BLK_DEV_RAM=y 98CONFIG_BLK_DEV_RAM=y
@@ -120,7 +103,6 @@ CONFIG_BLK_DEV_SD=y
120CONFIG_CHR_DEV_ST=y 103CONFIG_CHR_DEV_ST=y
121CONFIG_BLK_DEV_SR=y 104CONFIG_BLK_DEV_SR=y
122CONFIG_CHR_DEV_SG=y 105CONFIG_CHR_DEV_SG=y
123CONFIG_SCSI_MULTI_LUN=y
124CONFIG_SCSI_LOGGING=y 106CONFIG_SCSI_LOGGING=y
125CONFIG_ATA=y 107CONFIG_ATA=y
126CONFIG_SATA_AHCI=y 108CONFIG_SATA_AHCI=y
@@ -133,11 +115,11 @@ CONFIG_FS_ENET=y
133CONFIG_UCC_GETH=y 115CONFIG_UCC_GETH=y
134CONFIG_GIANFAR=y 116CONFIG_GIANFAR=y
135CONFIG_E1000E=y 117CONFIG_E1000E=y
118CONFIG_AT803X_PHY=y
136CONFIG_MARVELL_PHY=y 119CONFIG_MARVELL_PHY=y
137CONFIG_DAVICOM_PHY=y 120CONFIG_DAVICOM_PHY=y
138CONFIG_CICADA_PHY=y 121CONFIG_CICADA_PHY=y
139CONFIG_VITESSE_PHY=y 122CONFIG_VITESSE_PHY=y
140CONFIG_AT803X_PHY=y
141CONFIG_FIXED_PHY=y 123CONFIG_FIXED_PHY=y
142CONFIG_INPUT_FF_MEMLESS=m 124CONFIG_INPUT_FF_MEMLESS=m
143# CONFIG_INPUT_MOUSEDEV is not set 125# CONFIG_INPUT_MOUSEDEV is not set
@@ -162,14 +144,10 @@ CONFIG_SPI_FSL_SPI=y
162CONFIG_SPI_FSL_ESPI=y 144CONFIG_SPI_FSL_ESPI=y
163CONFIG_GPIO_MPC8XXX=y 145CONFIG_GPIO_MPC8XXX=y
164# CONFIG_HWMON is not set 146# CONFIG_HWMON is not set
165CONFIG_VIDEO_OUTPUT_CONTROL=y
166CONFIG_FB=y 147CONFIG_FB=y
167CONFIG_FB_FSL_DIU=y 148CONFIG_FB_FSL_DIU=y
168# CONFIG_VGA_CONSOLE is not set 149# CONFIG_VGA_CONSOLE is not set
169CONFIG_FRAMEBUFFER_CONSOLE=y 150CONFIG_FRAMEBUFFER_CONSOLE=y
170CONFIG_FONTS=y
171CONFIG_FONT_8x8=y
172CONFIG_FONT_8x16=y
173CONFIG_SOUND=y 151CONFIG_SOUND=y
174CONFIG_SND=y 152CONFIG_SND=y
175# CONFIG_SND_SUPPORT_OLD_API is not set 153# CONFIG_SND_SUPPORT_OLD_API is not set
@@ -193,7 +171,6 @@ CONFIG_HID_MONTEREY=y
193CONFIG_HID_PANTHERLORD=y 171CONFIG_HID_PANTHERLORD=y
194CONFIG_HID_PETALYNX=y 172CONFIG_HID_PETALYNX=y
195CONFIG_HID_SAMSUNG=y 173CONFIG_HID_SAMSUNG=y
196CONFIG_HID_SONY=y
197CONFIG_HID_SUNPLUS=y 174CONFIG_HID_SUNPLUS=y
198CONFIG_USB=y 175CONFIG_USB=y
199CONFIG_USB_MON=y 176CONFIG_USB_MON=y
@@ -216,8 +193,6 @@ CONFIG_RTC_DRV_DS3232=y
216CONFIG_RTC_DRV_CMOS=y 193CONFIG_RTC_DRV_CMOS=y
217CONFIG_DMADEVICES=y 194CONFIG_DMADEVICES=y
218CONFIG_FSL_DMA=y 195CONFIG_FSL_DMA=y
219CONFIG_MEMORY=y
220# CONFIG_NET_DMA is not set
221CONFIG_EXT2_FS=y 196CONFIG_EXT2_FS=y
222CONFIG_EXT3_FS=y 197CONFIG_EXT3_FS=y
223# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 198# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
@@ -228,21 +203,9 @@ CONFIG_UDF_FS=m
228CONFIG_MSDOS_FS=m 203CONFIG_MSDOS_FS=m
229CONFIG_VFAT_FS=y 204CONFIG_VFAT_FS=y
230CONFIG_NTFS_FS=y 205CONFIG_NTFS_FS=y
231CONFIG_NLS_CODEPAGE_437=y
232CONFIG_NLS_CODEPAGE_850=y
233CONFIG_NLS_ISO8859_1=y
234CONFIG_PROC_KCORE=y 206CONFIG_PROC_KCORE=y
235CONFIG_TMPFS=y 207CONFIG_TMPFS=y
236CONFIG_HUGETLBFS=y 208CONFIG_HUGETLBFS=y
237CONFIG_JFFS2_FS=y
238CONFIG_JFFS2_FS_DEBUG=1
239CONFIG_JFFS2_FS_WRITEBUFFER=y
240CONFIG_JFFS2_ZLIB=y
241CONFIG_JFFS2_RTIME=y
242CONFIG_UBIFS_FS=y
243CONFIG_UBIFS_FS_XATTR=y
244CONFIG_UBIFS_FS_LZO=y
245CONFIG_UBIFS_FS_ZLIB=y
246CONFIG_ADFS_FS=m 209CONFIG_ADFS_FS=m
247CONFIG_AFFS_FS=m 210CONFIG_AFFS_FS=m
248CONFIG_HFS_FS=m 211CONFIG_HFS_FS=m
@@ -250,6 +213,9 @@ CONFIG_HFSPLUS_FS=m
250CONFIG_BEFS_FS=m 213CONFIG_BEFS_FS=m
251CONFIG_BFS_FS=m 214CONFIG_BFS_FS=m
252CONFIG_EFS_FS=m 215CONFIG_EFS_FS=m
216CONFIG_JFFS2_FS=y
217CONFIG_JFFS2_FS_DEBUG=1
218CONFIG_UBIFS_FS=y
253CONFIG_CRAMFS=y 219CONFIG_CRAMFS=y
254CONFIG_VXFS_FS=m 220CONFIG_VXFS_FS=m
255CONFIG_HPFS_FS=m 221CONFIG_HPFS_FS=m
@@ -260,20 +226,19 @@ CONFIG_NFS_FS=y
260CONFIG_NFS_V4=y 226CONFIG_NFS_V4=y
261CONFIG_ROOT_NFS=y 227CONFIG_ROOT_NFS=y
262CONFIG_NFSD=y 228CONFIG_NFSD=y
229CONFIG_NLS_CODEPAGE_437=y
230CONFIG_NLS_CODEPAGE_850=y
231CONFIG_NLS_ISO8859_1=y
263CONFIG_CRC_T10DIF=y 232CONFIG_CRC_T10DIF=y
264CONFIG_CRC16=y 233CONFIG_FONTS=y
265CONFIG_ZLIB_DEFLATE=y 234CONFIG_FONT_8x8=y
266CONFIG_LZO_COMPRESS=y 235CONFIG_FONT_8x16=y
267CONFIG_LZO_DECOMPRESS=y 236CONFIG_DEBUG_INFO=y
268CONFIG_CRYPTO_DEFLATE=y
269CONFIG_CRYPTO_LZO=y
270CONFIG_DEBUG_FS=y 237CONFIG_DEBUG_FS=y
271CONFIG_DETECT_HUNG_TASK=y 238CONFIG_DETECT_HUNG_TASK=y
272CONFIG_DEBUG_INFO=y
273CONFIG_CRYPTO_PCBC=m 239CONFIG_CRYPTO_PCBC=m
274CONFIG_CRYPTO_SHA256=y 240CONFIG_CRYPTO_SHA256=y
275CONFIG_CRYPTO_SHA512=y 241CONFIG_CRYPTO_SHA512=y
276CONFIG_CRYPTO_AES=y
277# CONFIG_CRYPTO_ANSI_CPRNG is not set 242# CONFIG_CRYPTO_ANSI_CPRNG is not set
278CONFIG_CRYPTO_DEV_FSL_CAAM=y 243CONFIG_CRYPTO_DEV_FSL_CAAM=y
279CONFIG_CRYPTO_DEV_TALITOS=y 244CONFIG_CRYPTO_DEV_TALITOS=y
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig
index d954e80c286a..321412c5dae4 100644
--- a/arch/powerpc/configs/mpc866_ads_defconfig
+++ b/arch/powerpc/configs/mpc866_ads_defconfig
@@ -1,25 +1,21 @@
1CONFIG_PPC_8xx=y 1CONFIG_PPC_8xx=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 7CONFIG_EXPERT=y
8# CONFIG_SYSCTL_SYSCALL is not set
9# CONFIG_HOTPLUG is not set
10# CONFIG_BUG is not set 8# CONFIG_BUG is not set
11# CONFIG_BASE_FULL is not set 9# CONFIG_BASE_FULL is not set
12# CONFIG_EPOLL is not set 10# CONFIG_EPOLL is not set
13# CONFIG_VM_EVENT_COUNTERS is not set 11# CONFIG_VM_EVENT_COUNTERS is not set
14# CONFIG_BLK_DEV_BSG is not set 12# CONFIG_BLK_DEV_BSG is not set
13CONFIG_PARTITION_ADVANCED=y
15CONFIG_MPC86XADS=y 14CONFIG_MPC86XADS=y
16CONFIG_8xx_COPYBACK=y 15CONFIG_8xx_COPYBACK=y
17CONFIG_8xx_CPU6=y 16CONFIG_8xx_CPU6=y
18CONFIG_NO_HZ=y
19CONFIG_HIGH_RES_TIMERS=y
20CONFIG_HZ_1000=y 17CONFIG_HZ_1000=y
21CONFIG_MATH_EMULATION=y 18CONFIG_MATH_EMULATION=y
22CONFIG_SPARSE_IRQ=y
23# CONFIG_SECCOMP is not set 19# CONFIG_SECCOMP is not set
24CONFIG_NET=y 20CONFIG_NET=y
25CONFIG_PACKET=y 21CONFIG_PACKET=y
@@ -32,27 +28,21 @@ CONFIG_SYN_COOKIES=y
32# CONFIG_IPV6 is not set 28# CONFIG_IPV6 is not set
33CONFIG_BLK_DEV_LOOP=y 29CONFIG_BLK_DEV_LOOP=y
34CONFIG_NETDEVICES=y 30CONFIG_NETDEVICES=y
35CONFIG_FIXED_PHY=y
36CONFIG_NET_ETHERNET=y
37CONFIG_FS_ENET=y 31CONFIG_FS_ENET=y
32CONFIG_FIXED_PHY=y
38# CONFIG_VT is not set 33# CONFIG_VT is not set
34# CONFIG_LEGACY_PTYS is not set
39CONFIG_SERIAL_CPM=y 35CONFIG_SERIAL_CPM=y
40CONFIG_SERIAL_CPM_CONSOLE=y 36CONFIG_SERIAL_CPM_CONSOLE=y
41# CONFIG_LEGACY_PTYS is not set
42CONFIG_GEN_RTC=y 37CONFIG_GEN_RTC=y
43CONFIG_VIDEO_OUTPUT_CONTROL=y
44CONFIG_EXT2_FS=y 38CONFIG_EXT2_FS=y
45CONFIG_EXT2_FS_XATTR=y 39CONFIG_EXT2_FS_XATTR=y
46CONFIG_EXT3_FS=y 40CONFIG_EXT3_FS=y
47# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 41# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
48CONFIG_INOTIFY=y
49CONFIG_TMPFS=y 42CONFIG_TMPFS=y
50CONFIG_CRAMFS=y 43CONFIG_CRAMFS=y
51CONFIG_NFS_FS=y 44CONFIG_NFS_FS=y
52CONFIG_NFS_V3=y
53CONFIG_ROOT_NFS=y 45CONFIG_ROOT_NFS=y
54CONFIG_PARTITION_ADVANCED=y
55CONFIG_CRC_CCITT=y 46CONFIG_CRC_CCITT=y
56# CONFIG_RCU_CPU_STALL_DETECTOR is not set
57# CONFIG_CRYPTO_ANSI_CPRNG is not set
58CONFIG_CRC32_SLICEBY4=y 47CONFIG_CRC32_SLICEBY4=y
48# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/mpc86xx_defconfig b/arch/powerpc/configs/mpc86xx_defconfig
index fc58aa8a89e4..a4572563681c 100644
--- a/arch/powerpc/configs/mpc86xx_defconfig
+++ b/arch/powerpc/configs/mpc86xx_defconfig
@@ -1,23 +1,24 @@
1CONFIG_SMP=y 1CONFIG_SMP=y
2CONFIG_NR_CPUS=2 2CONFIG_NR_CPUS=2
3CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
6CONFIG_BSD_PROCESS_ACCT=y
7CONFIG_AUDIT=y 5CONFIG_AUDIT=y
6CONFIG_NO_HZ=y
7CONFIG_HIGH_RES_TIMERS=y
8CONFIG_BSD_PROCESS_ACCT=y
8CONFIG_IKCONFIG=y 9CONFIG_IKCONFIG=y
9CONFIG_IKCONFIG_PROC=y 10CONFIG_IKCONFIG_PROC=y
10CONFIG_LOG_BUF_SHIFT=14 11CONFIG_LOG_BUF_SHIFT=14
11CONFIG_BLK_DEV_INITRD=y 12CONFIG_BLK_DEV_INITRD=y
12# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
13CONFIG_EXPERT=y 13CONFIG_EXPERT=y
14CONFIG_KALLSYMS_ALL=y 14CONFIG_KALLSYMS_ALL=y
15CONFIG_KALLSYMS_EXTRA_PASS=y
16CONFIG_MODULES=y 15CONFIG_MODULES=y
17CONFIG_MODULE_UNLOAD=y 16CONFIG_MODULE_UNLOAD=y
18CONFIG_MODULE_FORCE_UNLOAD=y 17CONFIG_MODULE_FORCE_UNLOAD=y
19CONFIG_MODVERSIONS=y 18CONFIG_MODVERSIONS=y
20# CONFIG_BLK_DEV_BSG is not set 19# CONFIG_BLK_DEV_BSG is not set
20CONFIG_PARTITION_ADVANCED=y
21CONFIG_MAC_PARTITION=y
21# CONFIG_PPC_CHRP is not set 22# CONFIG_PPC_CHRP is not set
22# CONFIG_PPC_PMAC is not set 23# CONFIG_PPC_PMAC is not set
23CONFIG_PPC_86xx=y 24CONFIG_PPC_86xx=y
@@ -26,11 +27,8 @@ CONFIG_SBC8641D=y
26CONFIG_MPC8610_HPCD=y 27CONFIG_MPC8610_HPCD=y
27CONFIG_GEF_SBC610=y 28CONFIG_GEF_SBC610=y
28CONFIG_HIGHMEM=y 29CONFIG_HIGHMEM=y
29CONFIG_NO_HZ=y
30CONFIG_HIGH_RES_TIMERS=y
31CONFIG_HZ_1000=y 30CONFIG_HZ_1000=y
32CONFIG_BINFMT_MISC=m 31CONFIG_BINFMT_MISC=m
33CONFIG_SPARSE_IRQ=y
34CONFIG_PCI=y 32CONFIG_PCI=y
35CONFIG_NET=y 33CONFIG_NET=y
36CONFIG_PACKET=y 34CONFIG_PACKET=y
@@ -48,12 +46,9 @@ CONFIG_IP_PNP_DHCP=y
48CONFIG_IP_PNP_BOOTP=y 46CONFIG_IP_PNP_BOOTP=y
49CONFIG_IP_PNP_RARP=y 47CONFIG_IP_PNP_RARP=y
50CONFIG_NET_IPIP=y 48CONFIG_NET_IPIP=y
51CONFIG_NET_IPGRE=y
52CONFIG_NET_IPGRE_BROADCAST=y
53CONFIG_IP_MROUTE=y 49CONFIG_IP_MROUTE=y
54CONFIG_IP_PIMSM_V1=y 50CONFIG_IP_PIMSM_V1=y
55CONFIG_IP_PIMSM_V2=y 51CONFIG_IP_PIMSM_V2=y
56CONFIG_ARPD=y
57# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 52# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
58# CONFIG_INET_XFRM_MODE_TUNNEL is not set 53# CONFIG_INET_XFRM_MODE_TUNNEL is not set
59# CONFIG_INET_XFRM_MODE_BEET is not set 54# CONFIG_INET_XFRM_MODE_BEET is not set
@@ -61,28 +56,23 @@ CONFIG_ARPD=y
61CONFIG_IPV6=y 56CONFIG_IPV6=y
62CONFIG_IP_SCTP=m 57CONFIG_IP_SCTP=m
63CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 58CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
64CONFIG_PROC_DEVICETREE=y
65CONFIG_BLK_DEV_LOOP=y 59CONFIG_BLK_DEV_LOOP=y
66CONFIG_BLK_DEV_NBD=y 60CONFIG_BLK_DEV_NBD=y
67CONFIG_BLK_DEV_RAM=y 61CONFIG_BLK_DEV_RAM=y
68CONFIG_BLK_DEV_RAM_SIZE=131072 62CONFIG_BLK_DEV_RAM_SIZE=131072
69CONFIG_MISC_DEVICES=y
70CONFIG_EEPROM_LEGACY=y 63CONFIG_EEPROM_LEGACY=y
71CONFIG_BLK_DEV_SD=y 64CONFIG_BLK_DEV_SD=y
72CONFIG_CHR_DEV_ST=y 65CONFIG_CHR_DEV_ST=y
73CONFIG_BLK_DEV_SR=y 66CONFIG_BLK_DEV_SR=y
74CONFIG_CHR_DEV_SG=y 67CONFIG_CHR_DEV_SG=y
75CONFIG_SCSI_MULTI_LUN=y
76CONFIG_SCSI_LOGGING=y 68CONFIG_SCSI_LOGGING=y
77CONFIG_ATA=y 69CONFIG_ATA=y
78CONFIG_SATA_AHCI=y 70CONFIG_SATA_AHCI=y
79CONFIG_PATA_ALI=y 71CONFIG_PATA_ALI=y
80CONFIG_NETDEVICES=y 72CONFIG_NETDEVICES=y
81CONFIG_DUMMY=y 73CONFIG_DUMMY=y
82CONFIG_VITESSE_PHY=y
83CONFIG_NET_ETHERNET=y
84CONFIG_MII=y
85CONFIG_GIANFAR=y 74CONFIG_GIANFAR=y
75CONFIG_VITESSE_PHY=y
86CONFIG_INPUT_FF_MEMLESS=m 76CONFIG_INPUT_FF_MEMLESS=m
87# CONFIG_INPUT_MOUSEDEV is not set 77# CONFIG_INPUT_MOUSEDEV is not set
88# CONFIG_INPUT_KEYBOARD is not set 78# CONFIG_INPUT_KEYBOARD is not set
@@ -102,7 +92,6 @@ CONFIG_NVRAM=y
102CONFIG_I2C=y 92CONFIG_I2C=y
103CONFIG_I2C_MPC=y 93CONFIG_I2C_MPC=y
104# CONFIG_HWMON is not set 94# CONFIG_HWMON is not set
105CONFIG_VIDEO_OUTPUT_CONTROL=y
106CONFIG_SOUND=y 95CONFIG_SOUND=y
107CONFIG_SND=y 96CONFIG_SND=y
108CONFIG_SND_MIXER_OSS=y 97CONFIG_SND_MIXER_OSS=y
@@ -123,7 +112,6 @@ CONFIG_HID_MONTEREY=y
123CONFIG_HID_PANTHERLORD=y 112CONFIG_HID_PANTHERLORD=y
124CONFIG_HID_PETALYNX=y 113CONFIG_HID_PETALYNX=y
125CONFIG_HID_SAMSUNG=y 114CONFIG_HID_SAMSUNG=y
126CONFIG_HID_SONY=y
127CONFIG_HID_SUNPLUS=y 115CONFIG_HID_SUNPLUS=y
128CONFIG_USB=y 116CONFIG_USB=y
129CONFIG_USB_MON=y 117CONFIG_USB_MON=y
@@ -137,7 +125,6 @@ CONFIG_RTC_DRV_CMOS=y
137CONFIG_EXT2_FS=y 125CONFIG_EXT2_FS=y
138CONFIG_EXT3_FS=y 126CONFIG_EXT3_FS=y
139# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 127# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
140CONFIG_INOTIFY=y
141CONFIG_ISO9660_FS=m 128CONFIG_ISO9660_FS=m
142CONFIG_JOLIET=y 129CONFIG_JOLIET=y
143CONFIG_ZISOFS=y 130CONFIG_ZISOFS=y
@@ -145,9 +132,6 @@ CONFIG_UDF_FS=m
145CONFIG_MSDOS_FS=m 132CONFIG_MSDOS_FS=m
146CONFIG_VFAT_FS=y 133CONFIG_VFAT_FS=y
147CONFIG_NTFS_FS=y 134CONFIG_NTFS_FS=y
148CONFIG_NLS_CODEPAGE_437=y
149CONFIG_NLS_CODEPAGE_850=y
150CONFIG_NLS_ISO8859_1=y
151CONFIG_PROC_KCORE=y 135CONFIG_PROC_KCORE=y
152CONFIG_TMPFS=y 136CONFIG_TMPFS=y
153CONFIG_ADFS_FS=m 137CONFIG_ADFS_FS=m
@@ -164,18 +148,15 @@ CONFIG_QNX4FS_FS=m
164CONFIG_SYSV_FS=m 148CONFIG_SYSV_FS=m
165CONFIG_UFS_FS=m 149CONFIG_UFS_FS=m
166CONFIG_NFS_FS=y 150CONFIG_NFS_FS=y
167CONFIG_NFS_V3=y
168CONFIG_NFS_V4=y 151CONFIG_NFS_V4=y
169CONFIG_ROOT_NFS=y 152CONFIG_ROOT_NFS=y
170CONFIG_NFSD=y 153CONFIG_NFSD=y
171CONFIG_PARTITION_ADVANCED=y 154CONFIG_NLS_CODEPAGE_437=y
172CONFIG_MAC_PARTITION=y 155CONFIG_NLS_CODEPAGE_850=y
156CONFIG_NLS_ISO8859_1=y
173CONFIG_CRC_T10DIF=y 157CONFIG_CRC_T10DIF=y
174CONFIG_DEBUG_KERNEL=y
175CONFIG_DETECT_HUNG_TASK=y
176CONFIG_DEBUG_INFO=y 158CONFIG_DEBUG_INFO=y
177# CONFIG_RCU_CPU_STALL_DETECTOR is not set 159CONFIG_DETECT_HUNG_TASK=y
178CONFIG_SYSCTL_SYSCALL_CHECK=y
179CONFIG_CRYPTO_PCBC=m 160CONFIG_CRYPTO_PCBC=m
180CONFIG_CRYPTO_HMAC=y 161CONFIG_CRYPTO_HMAC=y
181# CONFIG_CRYPTO_ANSI_CPRNG is not set 162# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
index 3f47d00a10c0..2a10f98d4ee5 100644
--- a/arch/powerpc/configs/mpc885_ads_defconfig
+++ b/arch/powerpc/configs/mpc885_ads_defconfig
@@ -1,23 +1,19 @@
1CONFIG_PPC_8xx=y 1CONFIG_PPC_8xx=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 7CONFIG_EXPERT=y
8# CONFIG_SYSCTL_SYSCALL is not set
9# CONFIG_ELF_CORE is not set 8# CONFIG_ELF_CORE is not set
10# CONFIG_BASE_FULL is not set 9# CONFIG_BASE_FULL is not set
11# CONFIG_FUTEX is not set 10# CONFIG_FUTEX is not set
12# CONFIG_VM_EVENT_COUNTERS is not set 11# CONFIG_VM_EVENT_COUNTERS is not set
13# CONFIG_BLK_DEV_BSG is not set 12# CONFIG_BLK_DEV_BSG is not set
13CONFIG_PARTITION_ADVANCED=y
14# CONFIG_IOSCHED_CFQ is not set 14# CONFIG_IOSCHED_CFQ is not set
15CONFIG_8xx_COPYBACK=y 15CONFIG_8xx_COPYBACK=y
16CONFIG_NO_HZ=y
17CONFIG_HIGH_RES_TIMERS=y
18CONFIG_HZ_100=y 16CONFIG_HZ_100=y
19CONFIG_8XX_MINIMAL_FPEMU=y
20CONFIG_SPARSE_IRQ=y
21# CONFIG_SECCOMP is not set 17# CONFIG_SECCOMP is not set
22CONFIG_NET=y 18CONFIG_NET=y
23CONFIG_PACKET=y 19CONFIG_PACKET=y
@@ -34,7 +30,6 @@ CONFIG_SYN_COOKIES=y
34CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
35# CONFIG_FW_LOADER is not set 31# CONFIG_FW_LOADER is not set
36CONFIG_MTD=y 32CONFIG_MTD=y
37CONFIG_MTD_CHAR=y
38CONFIG_MTD_BLOCK=y 33CONFIG_MTD_BLOCK=y
39CONFIG_MTD_JEDECPROBE=y 34CONFIG_MTD_JEDECPROBE=y
40CONFIG_MTD_CFI_ADV_OPTIONS=y 35CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -46,22 +41,17 @@ CONFIG_MTD_CFI_GEOMETRY=y
46CONFIG_MTD_CFI_I4=y 41CONFIG_MTD_CFI_I4=y
47CONFIG_MTD_CFI_AMDSTD=y 42CONFIG_MTD_CFI_AMDSTD=y
48CONFIG_MTD_PHYSMAP_OF=y 43CONFIG_MTD_PHYSMAP_OF=y
49CONFIG_PROC_DEVICETREE=y
50# CONFIG_BLK_DEV is not set 44# CONFIG_BLK_DEV is not set
51# CONFIG_MISC_DEVICES is not set
52CONFIG_NETDEVICES=y 45CONFIG_NETDEVICES=y
53CONFIG_DAVICOM_PHY=y
54CONFIG_NET_ETHERNET=y
55CONFIG_FS_ENET=y 46CONFIG_FS_ENET=y
56# CONFIG_FS_ENET_HAS_SCC is not set 47# CONFIG_FS_ENET_HAS_SCC is not set
57# CONFIG_NETDEV_1000 is not set 48CONFIG_DAVICOM_PHY=y
58# CONFIG_NETDEV_10000 is not set
59# CONFIG_INPUT is not set 49# CONFIG_INPUT is not set
60# CONFIG_SERIO is not set 50# CONFIG_SERIO is not set
61# CONFIG_VT is not set 51# CONFIG_VT is not set
52# CONFIG_LEGACY_PTYS is not set
62CONFIG_SERIAL_CPM=y 53CONFIG_SERIAL_CPM=y
63CONFIG_SERIAL_CPM_CONSOLE=y 54CONFIG_SERIAL_CPM_CONSOLE=y
64# CONFIG_LEGACY_PTYS is not set
65CONFIG_GEN_RTC=y 55CONFIG_GEN_RTC=y
66# CONFIG_HWMON is not set 56# CONFIG_HWMON is not set
67# CONFIG_USB_SUPPORT is not set 57# CONFIG_USB_SUPPORT is not set
@@ -69,13 +59,8 @@ CONFIG_GEN_RTC=y
69CONFIG_TMPFS=y 59CONFIG_TMPFS=y
70CONFIG_CRAMFS=y 60CONFIG_CRAMFS=y
71CONFIG_NFS_FS=y 61CONFIG_NFS_FS=y
72CONFIG_NFS_V3=y
73CONFIG_ROOT_NFS=y 62CONFIG_ROOT_NFS=y
74CONFIG_PARTITION_ADVANCED=y 63CONFIG_CRC32_SLICEBY4=y
75# CONFIG_CRC32 is not set 64CONFIG_DEBUG_INFO=y
76CONFIG_MAGIC_SYSRQ=y 65CONFIG_MAGIC_SYSRQ=y
77CONFIG_DEBUG_KERNEL=y
78CONFIG_DETECT_HUNG_TASK=y 66CONFIG_DETECT_HUNG_TASK=y
79CONFIG_DEBUG_INFO=y
80# CONFIG_RCU_CPU_STALL_DETECTOR is not set
81CONFIG_CRC32_SLICEBY4=y
diff --git a/arch/powerpc/configs/mvme5100_defconfig b/arch/powerpc/configs/mvme5100_defconfig
index 93c7752e2dbb..525a2cb500a7 100644
--- a/arch/powerpc/configs/mvme5100_defconfig
+++ b/arch/powerpc/configs/mvme5100_defconfig
@@ -61,7 +61,6 @@ CONFIG_IP_NF_ARPFILTER=m
61CONFIG_IP_NF_ARP_MANGLE=m 61CONFIG_IP_NF_ARP_MANGLE=m
62CONFIG_LAPB=m 62CONFIG_LAPB=m
63CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 63CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
64CONFIG_PROC_DEVICETREE=y
65CONFIG_BLK_DEV_LOOP=y 64CONFIG_BLK_DEV_LOOP=y
66CONFIG_BLK_DEV_RAM=y 65CONFIG_BLK_DEV_RAM=y
67CONFIG_BLK_DEV_RAM_COUNT=2 66CONFIG_BLK_DEV_RAM_COUNT=2
@@ -88,13 +87,10 @@ CONFIG_I2C=y
88CONFIG_I2C_CHARDEV=y 87CONFIG_I2C_CHARDEV=y
89CONFIG_I2C_MPC=y 88CONFIG_I2C_MPC=y
90# CONFIG_HWMON is not set 89# CONFIG_HWMON is not set
91CONFIG_VIDEO_OUTPUT_CONTROL=m
92# CONFIG_VGA_CONSOLE is not set 90# CONFIG_VGA_CONSOLE is not set
93# CONFIG_HID is not set 91# CONFIG_HID is not set
94# CONFIG_USB_SUPPORT is not set 92# CONFIG_USB_SUPPORT is not set
95# CONFIG_IOMMU_SUPPORT is not set 93# CONFIG_IOMMU_SUPPORT is not set
96CONFIG_VME_BUS=m
97CONFIG_VME_CA91CX42=m
98CONFIG_EXT2_FS=m 94CONFIG_EXT2_FS=m
99CONFIG_EXT3_FS=m 95CONFIG_EXT3_FS=m
100# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 96# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
@@ -122,11 +118,6 @@ CONFIG_NLS_UTF8=m
122CONFIG_CRC_CCITT=m 118CONFIG_CRC_CCITT=m
123CONFIG_CRC_T10DIF=y 119CONFIG_CRC_T10DIF=y
124CONFIG_XZ_DEC=y 120CONFIG_XZ_DEC=y
125CONFIG_XZ_DEC_X86=y
126CONFIG_XZ_DEC_IA64=y
127CONFIG_XZ_DEC_ARM=y
128CONFIG_XZ_DEC_ARMTHUMB=y
129CONFIG_XZ_DEC_SPARC=y
130CONFIG_MAGIC_SYSRQ=y 121CONFIG_MAGIC_SYSRQ=y
131CONFIG_DEBUG_KERNEL=y 122CONFIG_DEBUG_KERNEL=y
132CONFIG_DETECT_HUNG_TASK=y 123CONFIG_DETECT_HUNG_TASK=y
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig
index 3e72c8c06a0d..8f94782eb907 100644
--- a/arch/powerpc/configs/pasemi_defconfig
+++ b/arch/powerpc/configs/pasemi_defconfig
@@ -54,7 +54,6 @@ CONFIG_MTD_SLRAM=y
54CONFIG_MTD_PHRAM=y 54CONFIG_MTD_PHRAM=y
55CONFIG_MTD_NAND=y 55CONFIG_MTD_NAND=y
56CONFIG_MTD_NAND_PASEMI=y 56CONFIG_MTD_NAND_PASEMI=y
57CONFIG_PROC_DEVICETREE=y
58CONFIG_BLK_DEV_LOOP=y 57CONFIG_BLK_DEV_LOOP=y
59CONFIG_BLK_DEV_RAM=y 58CONFIG_BLK_DEV_RAM=y
60CONFIG_BLK_DEV_RAM_SIZE=16384 59CONFIG_BLK_DEV_RAM_SIZE=16384
@@ -69,7 +68,6 @@ CONFIG_BLK_DEV_SR=y
69CONFIG_BLK_DEV_SR_VENDOR=y 68CONFIG_BLK_DEV_SR_VENDOR=y
70CONFIG_CHR_DEV_SG=y 69CONFIG_CHR_DEV_SG=y
71CONFIG_CHR_DEV_SCH=y 70CONFIG_CHR_DEV_SCH=y
72CONFIG_SCSI_MULTI_LUN=y
73CONFIG_SCSI_CONSTANTS=y 71CONFIG_SCSI_CONSTANTS=y
74CONFIG_SCSI_LOGGING=y 72CONFIG_SCSI_LOGGING=y
75CONFIG_ATA=y 73CONFIG_ATA=y
@@ -134,7 +132,6 @@ CONFIG_HID_NTRIG=y
134CONFIG_HID_PANTHERLORD=y 132CONFIG_HID_PANTHERLORD=y
135CONFIG_HID_PETALYNX=y 133CONFIG_HID_PETALYNX=y
136CONFIG_HID_SAMSUNG=y 134CONFIG_HID_SAMSUNG=y
137CONFIG_HID_SONY=y
138CONFIG_HID_SUNPLUS=y 135CONFIG_HID_SUNPLUS=y
139CONFIG_HID_GREENASIA=y 136CONFIG_HID_GREENASIA=y
140CONFIG_HID_SMARTJOYPLUS=y 137CONFIG_HID_SMARTJOYPLUS=y
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 0351b5ffdfef..ea8705ffcd76 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -1,19 +1,20 @@
1CONFIG_ALTIVEC=y 1CONFIG_ALTIVEC=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_NO_HZ=y
6CONFIG_HIGH_RES_TIMERS=y
6CONFIG_IKCONFIG=y 7CONFIG_IKCONFIG=y
7CONFIG_IKCONFIG_PROC=y 8CONFIG_IKCONFIG_PROC=y
8CONFIG_LOG_BUF_SHIFT=14 9CONFIG_LOG_BUF_SHIFT=14
9CONFIG_BLK_DEV_INITRD=y 10CONFIG_BLK_DEV_INITRD=y
10# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
11# CONFIG_COMPAT_BRK is not set 11# CONFIG_COMPAT_BRK is not set
12CONFIG_PROFILING=y 12CONFIG_PROFILING=y
13CONFIG_OPROFILE=y 13CONFIG_OPROFILE=y
14CONFIG_MODULES=y 14CONFIG_MODULES=y
15CONFIG_MODULE_UNLOAD=y 15CONFIG_MODULE_UNLOAD=y
16CONFIG_MODULE_FORCE_UNLOAD=y 16CONFIG_MODULE_FORCE_UNLOAD=y
17CONFIG_PARTITION_ADVANCED=y
17# CONFIG_PPC_CHRP is not set 18# CONFIG_PPC_CHRP is not set
18CONFIG_CPU_FREQ=y 19CONFIG_CPU_FREQ=y
19CONFIG_CPU_FREQ_GOV_POWERSAVE=y 20CONFIG_CPU_FREQ_GOV_POWERSAVE=y
@@ -21,13 +22,9 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
21CONFIG_CPU_FREQ_PMAC=y 22CONFIG_CPU_FREQ_PMAC=y
22CONFIG_PPC601_SYNC_FIX=y 23CONFIG_PPC601_SYNC_FIX=y
23CONFIG_HIGHMEM=y 24CONFIG_HIGHMEM=y
24CONFIG_NO_HZ=y
25CONFIG_HIGH_RES_TIMERS=y
26CONFIG_BINFMT_MISC=m 25CONFIG_BINFMT_MISC=m
27# CONFIG_MIGRATION is not set
28CONFIG_PM=y
29CONFIG_PM_DEBUG=y
30CONFIG_HIBERNATION=y 26CONFIG_HIBERNATION=y
27CONFIG_PM_DEBUG=y
31CONFIG_APM_EMULATION=y 28CONFIG_APM_EMULATION=y
32CONFIG_PCCARD=m 29CONFIG_PCCARD=m
33CONFIG_YENTA=m 30CONFIG_YENTA=m
@@ -46,7 +43,6 @@ CONFIG_INET_ESP=y
46# CONFIG_INET_LRO is not set 43# CONFIG_INET_LRO is not set
47# CONFIG_IPV6 is not set 44# CONFIG_IPV6 is not set
48CONFIG_NETFILTER=y 45CONFIG_NETFILTER=y
49CONFIG_NETFILTER_NETLINK_QUEUE=m
50CONFIG_NF_CONNTRACK=m 46CONFIG_NF_CONNTRACK=m
51CONFIG_NF_CONNTRACK_FTP=m 47CONFIG_NF_CONNTRACK_FTP=m
52CONFIG_NF_CONNTRACK_IRC=m 48CONFIG_NF_CONNTRACK_IRC=m
@@ -84,18 +80,11 @@ CONFIG_NETFILTER_XT_MATCH_TIME=m
84CONFIG_NETFILTER_XT_MATCH_U32=m 80CONFIG_NETFILTER_XT_MATCH_U32=m
85CONFIG_NF_CONNTRACK_IPV4=m 81CONFIG_NF_CONNTRACK_IPV4=m
86CONFIG_IP_NF_IPTABLES=m 82CONFIG_IP_NF_IPTABLES=m
87CONFIG_IP_NF_MATCH_ADDRTYPE=m
88CONFIG_IP_NF_MATCH_AH=m 83CONFIG_IP_NF_MATCH_AH=m
89CONFIG_IP_NF_MATCH_ECN=m 84CONFIG_IP_NF_MATCH_ECN=m
90CONFIG_IP_NF_MATCH_TTL=m 85CONFIG_IP_NF_MATCH_TTL=m
91CONFIG_IP_NF_FILTER=m 86CONFIG_IP_NF_FILTER=m
92CONFIG_IP_NF_TARGET_REJECT=m 87CONFIG_IP_NF_TARGET_REJECT=m
93CONFIG_IP_NF_TARGET_LOG=m
94CONFIG_IP_NF_TARGET_ULOG=m
95CONFIG_NF_NAT=m
96CONFIG_IP_NF_TARGET_MASQUERADE=m
97CONFIG_IP_NF_TARGET_NETMAP=m
98CONFIG_IP_NF_TARGET_REDIRECT=m
99CONFIG_IP_NF_MANGLE=m 88CONFIG_IP_NF_MANGLE=m
100CONFIG_IP_NF_TARGET_ECN=m 89CONFIG_IP_NF_TARGET_ECN=m
101CONFIG_IP_NF_TARGET_TTL=m 90CONFIG_IP_NF_TARGET_TTL=m
@@ -112,8 +101,6 @@ CONFIG_IRDA_CACHE_LAST_LSAP=y
112CONFIG_IRDA_FAST_RR=y 101CONFIG_IRDA_FAST_RR=y
113CONFIG_IRTTY_SIR=m 102CONFIG_IRTTY_SIR=m
114CONFIG_BT=m 103CONFIG_BT=m
115CONFIG_BT_L2CAP=y
116CONFIG_BT_SCO=y
117CONFIG_BT_RFCOMM=m 104CONFIG_BT_RFCOMM=m
118CONFIG_BT_RFCOMM_TTY=y 105CONFIG_BT_RFCOMM_TTY=y
119CONFIG_BT_BNEP=m 106CONFIG_BT_BNEP=m
@@ -128,10 +115,8 @@ CONFIG_MAC80211_LEDS=y
128CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 115CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
129# CONFIG_STANDALONE is not set 116# CONFIG_STANDALONE is not set
130CONFIG_CONNECTOR=y 117CONFIG_CONNECTOR=y
131CONFIG_PROC_DEVICETREE=y
132CONFIG_MAC_FLOPPY=m 118CONFIG_MAC_FLOPPY=m
133CONFIG_BLK_DEV_LOOP=y 119CONFIG_BLK_DEV_LOOP=y
134CONFIG_BLK_DEV_UB=m
135CONFIG_BLK_DEV_RAM=y 120CONFIG_BLK_DEV_RAM=y
136CONFIG_IDE=y 121CONFIG_IDE=y
137CONFIG_BLK_DEV_IDECS=m 122CONFIG_BLK_DEV_IDECS=m
@@ -152,7 +137,6 @@ CONFIG_SCSI_FC_ATTRS=y
152CONFIG_SCSI_AIC7XXX=m 137CONFIG_SCSI_AIC7XXX=m
153CONFIG_AIC7XXX_CMDS_PER_DEVICE=253 138CONFIG_AIC7XXX_CMDS_PER_DEVICE=253
154CONFIG_AIC7XXX_RESET_DELAY_MS=15000 139CONFIG_AIC7XXX_RESET_DELAY_MS=15000
155CONFIG_SCSI_AIC7XXX_OLD=m
156CONFIG_SCSI_SYM53C8XX_2=y 140CONFIG_SCSI_SYM53C8XX_2=y
157CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 141CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
158CONFIG_SCSI_MESH=y 142CONFIG_SCSI_MESH=y
@@ -170,12 +154,6 @@ CONFIG_DM_CRYPT=m
170CONFIG_DM_SNAPSHOT=m 154CONFIG_DM_SNAPSHOT=m
171CONFIG_DM_MIRROR=m 155CONFIG_DM_MIRROR=m
172CONFIG_DM_ZERO=m 156CONFIG_DM_ZERO=m
173CONFIG_IEEE1394=m
174CONFIG_IEEE1394_OHCI1394=m
175CONFIG_IEEE1394_SBP2=m
176CONFIG_IEEE1394_RAWIO=m
177CONFIG_IEEE1394_VIDEO1394=m
178CONFIG_IEEE1394_DV1394=m
179CONFIG_ADB=y 157CONFIG_ADB=y
180CONFIG_ADB_CUDA=y 158CONFIG_ADB_CUDA=y
181CONFIG_ADB_PMU=y 159CONFIG_ADB_PMU=y
@@ -193,27 +171,22 @@ CONFIG_PMAC_RACKMETER=m
193CONFIG_NETDEVICES=y 171CONFIG_NETDEVICES=y
194CONFIG_DUMMY=m 172CONFIG_DUMMY=m
195CONFIG_TUN=m 173CONFIG_TUN=m
196CONFIG_NET_ETHERNET=y 174CONFIG_PCNET32=y
197CONFIG_MACE=y 175CONFIG_MACE=y
198CONFIG_BMAC=y 176CONFIG_BMAC=y
199CONFIG_SUNGEM=y 177CONFIG_SUNGEM=y
200CONFIG_NET_PCI=y
201CONFIG_PCNET32=y
202CONFIG_PRISM54=m
203CONFIG_B43=m
204CONFIG_B43LEGACY=m
205CONFIG_HERMES=m
206CONFIG_APPLE_AIRPORT=m
207CONFIG_PCMCIA_HERMES=m
208CONFIG_P54_COMMON=m
209CONFIG_USB_USBNET=m
210# CONFIG_USB_NET_CDC_SUBSET is not set
211CONFIG_PPP=y 178CONFIG_PPP=y
179CONFIG_PPP_BSDCOMP=m
180CONFIG_PPP_DEFLATE=y
212CONFIG_PPP_MULTILINK=y 181CONFIG_PPP_MULTILINK=y
213CONFIG_PPP_ASYNC=y 182CONFIG_PPP_ASYNC=y
214CONFIG_PPP_SYNC_TTY=m 183CONFIG_PPP_SYNC_TTY=m
215CONFIG_PPP_DEFLATE=y 184CONFIG_USB_USBNET=m
216CONFIG_PPP_BSDCOMP=m 185# CONFIG_USB_NET_CDC_SUBSET is not set
186CONFIG_PRISM54=m
187CONFIG_B43=m
188CONFIG_B43LEGACY=m
189CONFIG_P54_COMMON=m
217CONFIG_INPUT_EVDEV=y 190CONFIG_INPUT_EVDEV=y
218# CONFIG_KEYBOARD_ATKBD is not set 191# CONFIG_KEYBOARD_ATKBD is not set
219# CONFIG_MOUSE_PS2 is not set 192# CONFIG_MOUSE_PS2 is not set
@@ -226,7 +199,6 @@ CONFIG_SERIAL_PMACZILOG_TTYS=y
226CONFIG_NVRAM=y 199CONFIG_NVRAM=y
227CONFIG_GEN_RTC=y 200CONFIG_GEN_RTC=y
228CONFIG_I2C_CHARDEV=m 201CONFIG_I2C_CHARDEV=m
229CONFIG_POWER_SUPPLY=y
230CONFIG_APM_POWER=y 202CONFIG_APM_POWER=y
231CONFIG_BATTERY_PMU=y 203CONFIG_BATTERY_PMU=y
232CONFIG_HWMON=m 204CONFIG_HWMON=m
@@ -253,7 +225,6 @@ CONFIG_FB_ATY=y
253CONFIG_FB_ATY_CT=y 225CONFIG_FB_ATY_CT=y
254CONFIG_FB_ATY_GX=y 226CONFIG_FB_ATY_GX=y
255CONFIG_FB_3DFX=y 227CONFIG_FB_3DFX=y
256CONFIG_DISPLAY_SUPPORT=y
257# CONFIG_VGA_CONSOLE is not set 228# CONFIG_VGA_CONSOLE is not set
258CONFIG_FRAMEBUFFER_CONSOLE=y 229CONFIG_FRAMEBUFFER_CONSOLE=y
259CONFIG_LOGO=y 230CONFIG_LOGO=y
@@ -314,7 +285,6 @@ CONFIG_EXT3_FS=y
314# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 285# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
315CONFIG_EXT3_FS_POSIX_ACL=y 286CONFIG_EXT3_FS_POSIX_ACL=y
316CONFIG_EXT4_FS=y 287CONFIG_EXT4_FS=y
317CONFIG_INOTIFY=y
318CONFIG_AUTOFS4_FS=m 288CONFIG_AUTOFS4_FS=m
319CONFIG_FUSE_FS=m 289CONFIG_FUSE_FS=m
320CONFIG_ISO9660_FS=y 290CONFIG_ISO9660_FS=y
@@ -328,34 +298,27 @@ CONFIG_TMPFS=y
328CONFIG_HFS_FS=m 298CONFIG_HFS_FS=m
329CONFIG_HFSPLUS_FS=m 299CONFIG_HFSPLUS_FS=m
330CONFIG_NFS_FS=y 300CONFIG_NFS_FS=y
331CONFIG_NFS_V3=y
332CONFIG_NFS_V3_ACL=y 301CONFIG_NFS_V3_ACL=y
333CONFIG_NFS_V4=y 302CONFIG_NFS_V4=y
334CONFIG_NFSD=m 303CONFIG_NFSD=m
335CONFIG_NFSD_V3_ACL=y 304CONFIG_NFSD_V3_ACL=y
336CONFIG_NFSD_V4=y 305CONFIG_NFSD_V4=y
337CONFIG_SMB_FS=m
338CONFIG_PARTITION_ADVANCED=y
339CONFIG_NLS_CODEPAGE_437=m 306CONFIG_NLS_CODEPAGE_437=m
340CONFIG_NLS_ISO8859_1=m 307CONFIG_NLS_ISO8859_1=m
341CONFIG_CRC_T10DIF=y 308CONFIG_CRC_T10DIF=y
342CONFIG_LIBCRC32C=m 309CONFIG_LIBCRC32C=m
343CONFIG_MAGIC_SYSRQ=y
344CONFIG_DEBUG_FS=y 310CONFIG_DEBUG_FS=y
311CONFIG_MAGIC_SYSRQ=y
345CONFIG_DEBUG_KERNEL=y 312CONFIG_DEBUG_KERNEL=y
346CONFIG_DETECT_HUNG_TASK=y 313CONFIG_DETECT_HUNG_TASK=y
347# CONFIG_RCU_CPU_STALL_DETECTOR is not set
348CONFIG_LATENCYTOP=y 314CONFIG_LATENCYTOP=y
349CONFIG_SYSCTL_SYSCALL_CHECK=y
350CONFIG_XMON=y 315CONFIG_XMON=y
351CONFIG_XMON_DEFAULT=y 316CONFIG_XMON_DEFAULT=y
352CONFIG_BOOTX_TEXT=y 317CONFIG_BOOTX_TEXT=y
353CONFIG_PPC_EARLY_DEBUG=y 318CONFIG_PPC_EARLY_DEBUG=y
354CONFIG_PPC_EARLY_DEBUG_BOOTX=y
355CONFIG_CRYPTO_NULL=m 319CONFIG_CRYPTO_NULL=m
356CONFIG_CRYPTO_PCBC=m 320CONFIG_CRYPTO_PCBC=m
357CONFIG_CRYPTO_MD4=m 321CONFIG_CRYPTO_MD4=m
358CONFIG_CRYPTO_SHA256=m
359CONFIG_CRYPTO_SHA512=m 322CONFIG_CRYPTO_SHA512=m
360CONFIG_CRYPTO_TGR192=m 323CONFIG_CRYPTO_TGR192=m
361CONFIG_CRYPTO_WP512=m 324CONFIG_CRYPTO_WP512=m
diff --git a/arch/powerpc/configs/ppc40x_defconfig b/arch/powerpc/configs/ppc40x_defconfig
index 52908c7897d9..a43bf6ea10fb 100644
--- a/arch/powerpc/configs/ppc40x_defconfig
+++ b/arch/powerpc/configs/ppc40x_defconfig
@@ -1,13 +1,10 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 7CONFIG_KALLSYMS_ALL=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11CONFIG_MODULES=y 8CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
13# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
@@ -18,7 +15,6 @@ CONFIG_HOTFOOT=y
18CONFIG_KILAUEA=y 15CONFIG_KILAUEA=y
19CONFIG_MAKALU=y 16CONFIG_MAKALU=y
20CONFIG_XILINX_VIRTEX_GENERIC_BOARD=y 17CONFIG_XILINX_VIRTEX_GENERIC_BOARD=y
21CONFIG_SPARSE_IRQ=y
22CONFIG_NET=y 18CONFIG_NET=y
23CONFIG_PACKET=y 19CONFIG_PACKET=y
24CONFIG_UNIX=y 20CONFIG_UNIX=y
@@ -34,8 +30,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
34CONFIG_CONNECTOR=y 30CONFIG_CONNECTOR=y
35CONFIG_MTD=y 31CONFIG_MTD=y
36CONFIG_MTD_CMDLINE_PARTS=y 32CONFIG_MTD_CMDLINE_PARTS=y
37CONFIG_MTD_OF_PARTS=y
38CONFIG_MTD_CHAR=y
39CONFIG_MTD_BLOCK=m 33CONFIG_MTD_BLOCK=m
40CONFIG_MTD_CFI=y 34CONFIG_MTD_CFI=y
41CONFIG_MTD_JEDECPROBE=y 35CONFIG_MTD_JEDECPROBE=y
@@ -43,13 +37,10 @@ CONFIG_MTD_CFI_AMDSTD=y
43CONFIG_MTD_PHYSMAP_OF=y 37CONFIG_MTD_PHYSMAP_OF=y
44CONFIG_MTD_UBI=m 38CONFIG_MTD_UBI=m
45CONFIG_MTD_UBI_GLUEBI=m 39CONFIG_MTD_UBI_GLUEBI=m
46CONFIG_PROC_DEVICETREE=y
47CONFIG_BLK_DEV_RAM=y 40CONFIG_BLK_DEV_RAM=y
48CONFIG_BLK_DEV_RAM_SIZE=35000 41CONFIG_BLK_DEV_RAM_SIZE=35000
49CONFIG_XILINX_SYSACE=m 42CONFIG_XILINX_SYSACE=m
50CONFIG_NETDEVICES=y 43CONFIG_NETDEVICES=y
51CONFIG_ETHERNET=y
52CONFIG_NET_VENDOR_IBM=y
53CONFIG_IBM_EMAC=y 44CONFIG_IBM_EMAC=y
54# CONFIG_INPUT is not set 45# CONFIG_INPUT is not set
55CONFIG_SERIO=m 46CONFIG_SERIO=m
@@ -73,13 +64,11 @@ CONFIG_I2C_IBM_IIC=m
73CONFIG_GPIO_XILINX=y 64CONFIG_GPIO_XILINX=y
74# CONFIG_HWMON is not set 65# CONFIG_HWMON is not set
75CONFIG_THERMAL=y 66CONFIG_THERMAL=y
76CONFIG_VIDEO_OUTPUT_CONTROL=m
77CONFIG_FB=m 67CONFIG_FB=m
78CONFIG_FB_XILINX=m 68CONFIG_FB_XILINX=m
79CONFIG_EXT2_FS=y 69CONFIG_EXT2_FS=y
80CONFIG_EXT3_FS=m 70CONFIG_EXT3_FS=m
81# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 71# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
82CONFIG_INOTIFY=y
83CONFIG_VFAT_FS=m 72CONFIG_VFAT_FS=m
84CONFIG_PROC_KCORE=y 73CONFIG_PROC_KCORE=y
85CONFIG_TMPFS=y 74CONFIG_TMPFS=y
@@ -87,16 +76,12 @@ CONFIG_JFFS2_FS=m
87CONFIG_UBIFS_FS=m 76CONFIG_UBIFS_FS=m
88CONFIG_CRAMFS=y 77CONFIG_CRAMFS=y
89CONFIG_NFS_FS=y 78CONFIG_NFS_FS=y
90CONFIG_NFS_V3=y
91CONFIG_ROOT_NFS=y 79CONFIG_ROOT_NFS=y
92CONFIG_NLS_CODEPAGE_437=m 80CONFIG_NLS_CODEPAGE_437=m
93CONFIG_NLS_ISO8859_1=m 81CONFIG_NLS_ISO8859_1=m
94CONFIG_MAGIC_SYSRQ=y
95CONFIG_DEBUG_FS=y 82CONFIG_DEBUG_FS=y
96CONFIG_DEBUG_KERNEL=y 83CONFIG_MAGIC_SYSRQ=y
97CONFIG_DETECT_HUNG_TASK=y 84CONFIG_DETECT_HUNG_TASK=y
98# CONFIG_RCU_CPU_STALL_DETECTOR is not set
99CONFIG_SYSCTL_SYSCALL_CHECK=y
100CONFIG_CRYPTO_CBC=y 85CONFIG_CRYPTO_CBC=y
101CONFIG_CRYPTO_ECB=y 86CONFIG_CRYPTO_ECB=y
102CONFIG_CRYPTO_PCBC=y 87CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig
index 924e10df1844..bbc7f76d52c8 100644
--- a/arch/powerpc/configs/ppc44x_defconfig
+++ b/arch/powerpc/configs/ppc44x_defconfig
@@ -1,13 +1,10 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 7CONFIG_KALLSYMS_ALL=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11CONFIG_MODULES=y 8CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
13# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
@@ -28,7 +25,6 @@ CONFIG_YOSEMITE=y
28CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y 25CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y
29CONFIG_PPC4xx_GPIO=y 26CONFIG_PPC4xx_GPIO=y
30CONFIG_MATH_EMULATION=y 27CONFIG_MATH_EMULATION=y
31CONFIG_SPARSE_IRQ=y
32CONFIG_NET=y 28CONFIG_NET=y
33CONFIG_PACKET=y 29CONFIG_PACKET=y
34CONFIG_UNIX=y 30CONFIG_UNIX=y
@@ -44,8 +40,6 @@ CONFIG_BRIDGE=m
44CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
45CONFIG_CONNECTOR=y 41CONFIG_CONNECTOR=y
46CONFIG_MTD=y 42CONFIG_MTD=y
47CONFIG_MTD_OF_PARTS=y
48CONFIG_MTD_CHAR=y
49CONFIG_MTD_BLOCK=y 43CONFIG_MTD_BLOCK=y
50CONFIG_MTD_CFI=y 44CONFIG_MTD_CFI=y
51CONFIG_MTD_JEDECPROBE=y 45CONFIG_MTD_JEDECPROBE=y
@@ -55,7 +49,6 @@ CONFIG_MTD_NAND=m
55CONFIG_MTD_NAND_NDFC=m 49CONFIG_MTD_NAND_NDFC=m
56CONFIG_MTD_UBI=m 50CONFIG_MTD_UBI=m
57CONFIG_MTD_UBI_GLUEBI=m 51CONFIG_MTD_UBI_GLUEBI=m
58CONFIG_PROC_DEVICETREE=y
59CONFIG_BLK_DEV_RAM=y 52CONFIG_BLK_DEV_RAM=y
60CONFIG_BLK_DEV_RAM_SIZE=35000 53CONFIG_BLK_DEV_RAM_SIZE=35000
61CONFIG_XILINX_SYSACE=m 54CONFIG_XILINX_SYSACE=m
@@ -64,8 +57,6 @@ CONFIG_BLK_DEV_SD=m
64# CONFIG_SCSI_LOWLEVEL is not set 57# CONFIG_SCSI_LOWLEVEL is not set
65CONFIG_NETDEVICES=y 58CONFIG_NETDEVICES=y
66CONFIG_TUN=m 59CONFIG_TUN=m
67CONFIG_ETHERNET=y
68CONFIG_NET_VENDOR_IBM=y
69CONFIG_IBM_EMAC=y 60CONFIG_IBM_EMAC=y
70# CONFIG_INPUT is not set 61# CONFIG_INPUT is not set
71CONFIG_SERIO=m 62CONFIG_SERIO=m
@@ -105,23 +96,18 @@ CONFIG_PROC_KCORE=y
105CONFIG_TMPFS=y 96CONFIG_TMPFS=y
106CONFIG_JFFS2_FS=y 97CONFIG_JFFS2_FS=y
107CONFIG_UBIFS_FS=m 98CONFIG_UBIFS_FS=m
108CONFIG_UBIFS_FS_XATTR=y
109CONFIG_LOGFS=m 99CONFIG_LOGFS=m
110CONFIG_CRAMFS=y 100CONFIG_CRAMFS=y
111CONFIG_SQUASHFS=m 101CONFIG_SQUASHFS=m
112CONFIG_SQUASHFS_XATTR=y 102CONFIG_SQUASHFS_XATTR=y
113CONFIG_SQUASHFS_LZO=y 103CONFIG_SQUASHFS_LZO=y
114CONFIG_NFS_FS=y 104CONFIG_NFS_FS=y
115CONFIG_NFS_V3=y
116CONFIG_ROOT_NFS=y 105CONFIG_ROOT_NFS=y
117CONFIG_NLS_CODEPAGE_437=m 106CONFIG_NLS_CODEPAGE_437=m
118CONFIG_NLS_ISO8859_1=m 107CONFIG_NLS_ISO8859_1=m
119CONFIG_CRC_T10DIF=m 108CONFIG_CRC_T10DIF=m
120CONFIG_MAGIC_SYSRQ=y 109CONFIG_MAGIC_SYSRQ=y
121CONFIG_DEBUG_KERNEL=y
122CONFIG_DETECT_HUNG_TASK=y 110CONFIG_DETECT_HUNG_TASK=y
123# CONFIG_RCU_CPU_STALL_DETECTOR is not set
124CONFIG_SYSCTL_SYSCALL_CHECK=y
125CONFIG_CRYPTO_ECB=y 111CONFIG_CRYPTO_ECB=y
126CONFIG_CRYPTO_PCBC=y 112CONFIG_CRYPTO_PCBC=y
127# CONFIG_CRYPTO_ANSI_CPRNG is not set 113# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 5830d735c5c3..3315c9f0828a 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -1,6 +1,4 @@
1CONFIG_PPC64=y 1CONFIG_PPC64=y
2CONFIG_ALTIVEC=y
3CONFIG_VSX=y
4CONFIG_SMP=y 2CONFIG_SMP=y
5CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
6CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
@@ -42,10 +40,8 @@ CONFIG_PPC_CELLEB=y
42CONFIG_PPC_CELL_QPACE=y 40CONFIG_PPC_CELL_QPACE=y
43CONFIG_RTAS_FLASH=m 41CONFIG_RTAS_FLASH=m
44CONFIG_IBMEBUS=y 42CONFIG_IBMEBUS=y
45CONFIG_CPU_FREQ=y
46CONFIG_CPU_FREQ_GOV_POWERSAVE=y
47CONFIG_CPU_FREQ_GOV_USERSPACE=y
48CONFIG_CPU_FREQ_PMAC64=y 43CONFIG_CPU_FREQ_PMAC64=y
44CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
49CONFIG_HZ_100=y 45CONFIG_HZ_100=y
50CONFIG_BINFMT_MISC=m 46CONFIG_BINFMT_MISC=m
51CONFIG_PPC_TRANSACTIONAL_MEM=y 47CONFIG_PPC_TRANSACTIONAL_MEM=y
@@ -53,6 +49,7 @@ CONFIG_KEXEC=y
53CONFIG_CRASH_DUMP=y 49CONFIG_CRASH_DUMP=y
54CONFIG_IRQ_ALL_CPUS=y 50CONFIG_IRQ_ALL_CPUS=y
55CONFIG_MEMORY_HOTREMOVE=y 51CONFIG_MEMORY_HOTREMOVE=y
52CONFIG_KSM=y
56CONFIG_SCHED_SMT=y 53CONFIG_SCHED_SMT=y
57CONFIG_PCCARD=y 54CONFIG_PCCARD=y
58CONFIG_ELECTRA_CF=y 55CONFIG_ELECTRA_CF=y
@@ -82,7 +79,6 @@ CONFIG_BPF_JIT=y
82CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 79CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
83CONFIG_DEVTMPFS=y 80CONFIG_DEVTMPFS=y
84CONFIG_DEVTMPFS_MOUNT=y 81CONFIG_DEVTMPFS_MOUNT=y
85CONFIG_PROC_DEVICETREE=y
86CONFIG_BLK_DEV_FD=y 82CONFIG_BLK_DEV_FD=y
87CONFIG_BLK_DEV_LOOP=y 83CONFIG_BLK_DEV_LOOP=y
88CONFIG_BLK_DEV_NBD=m 84CONFIG_BLK_DEV_NBD=m
@@ -101,7 +97,6 @@ CONFIG_CHR_DEV_ST=y
101CONFIG_BLK_DEV_SR=y 97CONFIG_BLK_DEV_SR=y
102CONFIG_BLK_DEV_SR_VENDOR=y 98CONFIG_BLK_DEV_SR_VENDOR=y
103CONFIG_CHR_DEV_SG=y 99CONFIG_CHR_DEV_SG=y
104CONFIG_SCSI_MULTI_LUN=y
105CONFIG_SCSI_CONSTANTS=y 100CONFIG_SCSI_CONSTANTS=y
106CONFIG_SCSI_FC_ATTRS=y 101CONFIG_SCSI_FC_ATTRS=y
107CONFIG_SCSI_CXGB3_ISCSI=m 102CONFIG_SCSI_CXGB3_ISCSI=m
@@ -122,6 +117,7 @@ CONFIG_SCSI_DH=m
122CONFIG_SCSI_DH_RDAC=m 117CONFIG_SCSI_DH_RDAC=m
123CONFIG_SCSI_DH_ALUA=m 118CONFIG_SCSI_DH_ALUA=m
124CONFIG_ATA=y 119CONFIG_ATA=y
120CONFIG_SATA_AHCI=y
125CONFIG_SATA_SIL24=y 121CONFIG_SATA_SIL24=y
126CONFIG_SATA_MV=y 122CONFIG_SATA_MV=y
127CONFIG_SATA_SVW=y 123CONFIG_SATA_SVW=y
@@ -145,7 +141,6 @@ CONFIG_DM_MULTIPATH_ST=m
145CONFIG_DM_UEVENT=y 141CONFIG_DM_UEVENT=y
146CONFIG_ADB_PMU=y 142CONFIG_ADB_PMU=y
147CONFIG_PMAC_SMU=y 143CONFIG_PMAC_SMU=y
148CONFIG_THERM_PM72=y
149CONFIG_WINDFARM=y 144CONFIG_WINDFARM=y
150CONFIG_WINDFARM_PM81=y 145CONFIG_WINDFARM_PM81=y
151CONFIG_WINDFARM_PM91=y 146CONFIG_WINDFARM_PM91=y
@@ -209,7 +204,6 @@ CONFIG_RAW_DRIVER=y
209CONFIG_I2C_CHARDEV=y 204CONFIG_I2C_CHARDEV=y
210CONFIG_I2C_AMD8111=y 205CONFIG_I2C_AMD8111=y
211CONFIG_I2C_PASEMI=y 206CONFIG_I2C_PASEMI=y
212CONFIG_VIDEO_OUTPUT_CONTROL=m
213CONFIG_FB=y 207CONFIG_FB=y
214CONFIG_FIRMWARE_EDID=y 208CONFIG_FIRMWARE_EDID=y
215CONFIG_FB_OF=y 209CONFIG_FB_OF=y
@@ -296,6 +290,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
296CONFIG_NILFS2_FS=m 290CONFIG_NILFS2_FS=m
297CONFIG_AUTOFS4_FS=m 291CONFIG_AUTOFS4_FS=m
298CONFIG_FUSE_FS=m 292CONFIG_FUSE_FS=m
293CONFIG_OVERLAY_FS=m
299CONFIG_ISO9660_FS=y 294CONFIG_ISO9660_FS=y
300CONFIG_UDF_FS=m 295CONFIG_UDF_FS=m
301CONFIG_MSDOS_FS=y 296CONFIG_MSDOS_FS=y
@@ -326,7 +321,6 @@ CONFIG_NLS_CODEPAGE_437=y
326CONFIG_NLS_ASCII=y 321CONFIG_NLS_ASCII=y
327CONFIG_NLS_ISO8859_1=y 322CONFIG_NLS_ISO8859_1=y
328CONFIG_NLS_UTF8=y 323CONFIG_NLS_UTF8=y
329CONFIG_CRC_T10DIF=y
330CONFIG_MAGIC_SYSRQ=y 324CONFIG_MAGIC_SYSRQ=y
331CONFIG_DEBUG_KERNEL=y 325CONFIG_DEBUG_KERNEL=y
332CONFIG_DEBUG_STACK_USAGE=y 326CONFIG_DEBUG_STACK_USAGE=y
@@ -362,4 +356,4 @@ CONFIG_CRYPTO_DEV_NX=y
362CONFIG_CRYPTO_DEV_NX_ENCRYPT=m 356CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
363CONFIG_VIRTUALIZATION=y 357CONFIG_VIRTUALIZATION=y
364CONFIG_KVM_BOOK3S_64=m 358CONFIG_KVM_BOOK3S_64=m
365CONFIG_KVM_BOOK3S_64_HV=y 359CONFIG_KVM_BOOK3S_64_HV=m
diff --git a/arch/powerpc/configs/ppc64e_defconfig b/arch/powerpc/configs/ppc64e_defconfig
index 67885b2d70aa..ddf9773458cf 100644
--- a/arch/powerpc/configs/ppc64e_defconfig
+++ b/arch/powerpc/configs/ppc64e_defconfig
@@ -22,7 +22,6 @@ CONFIG_MODVERSIONS=y
22CONFIG_MODULE_SRCVERSION_ALL=y 22CONFIG_MODULE_SRCVERSION_ALL=y
23CONFIG_PARTITION_ADVANCED=y 23CONFIG_PARTITION_ADVANCED=y
24CONFIG_MAC_PARTITION=y 24CONFIG_MAC_PARTITION=y
25CONFIG_EFI_PARTITION=y
26CONFIG_CORENET_GENERIC=y 25CONFIG_CORENET_GENERIC=y
27CONFIG_CPU_FREQ=y 26CONFIG_CPU_FREQ=y
28CONFIG_CPU_FREQ_GOV_POWERSAVE=y 27CONFIG_CPU_FREQ_GOV_POWERSAVE=y
@@ -55,7 +54,6 @@ CONFIG_BRIDGE=m
55CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 54CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
56CONFIG_DEVTMPFS=y 55CONFIG_DEVTMPFS=y
57CONFIG_DEVTMPFS_MOUNT=y 56CONFIG_DEVTMPFS_MOUNT=y
58CONFIG_PROC_DEVICETREE=y
59CONFIG_BLK_DEV_FD=y 57CONFIG_BLK_DEV_FD=y
60CONFIG_BLK_DEV_LOOP=y 58CONFIG_BLK_DEV_LOOP=y
61CONFIG_BLK_DEV_NBD=m 59CONFIG_BLK_DEV_NBD=m
@@ -70,7 +68,6 @@ CONFIG_CHR_DEV_ST=y
70CONFIG_BLK_DEV_SR=y 68CONFIG_BLK_DEV_SR=y
71CONFIG_BLK_DEV_SR_VENDOR=y 69CONFIG_BLK_DEV_SR_VENDOR=y
72CONFIG_CHR_DEV_SG=y 70CONFIG_CHR_DEV_SG=y
73CONFIG_SCSI_MULTI_LUN=y
74CONFIG_SCSI_CONSTANTS=y 71CONFIG_SCSI_CONSTANTS=y
75CONFIG_SCSI_FC_ATTRS=y 72CONFIG_SCSI_FC_ATTRS=y
76CONFIG_SCSI_SRP_ATTRS=y 73CONFIG_SCSI_SRP_ATTRS=y
@@ -131,7 +128,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
131CONFIG_RAW_DRIVER=y 128CONFIG_RAW_DRIVER=y
132CONFIG_I2C_CHARDEV=y 129CONFIG_I2C_CHARDEV=y
133CONFIG_I2C_AMD8111=y 130CONFIG_I2C_AMD8111=y
134CONFIG_VIDEO_OUTPUT_CONTROL=m
135CONFIG_FB=y 131CONFIG_FB=y
136CONFIG_FIRMWARE_EDID=y 132CONFIG_FIRMWARE_EDID=y
137CONFIG_FB_OF=y 133CONFIG_FB_OF=y
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index ad6d6b5af7d7..e5d2c3dc07f1 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -1,26 +1,22 @@
1CONFIG_FSL_EMB_PERFMON=y 1CONFIG_FSL_EMB_PERFMON=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_AUDIT=y
6CONFIG_NO_HZ=y
7CONFIG_HIGH_RES_TIMERS=y
6CONFIG_BSD_PROCESS_ACCT=y 8CONFIG_BSD_PROCESS_ACCT=y
7CONFIG_TASKSTATS=y 9CONFIG_TASKSTATS=y
8CONFIG_TASK_DELAY_ACCT=y 10CONFIG_TASK_DELAY_ACCT=y
9CONFIG_TASK_XACCT=y 11CONFIG_TASK_XACCT=y
10CONFIG_TASK_IO_ACCOUNTING=y 12CONFIG_TASK_IO_ACCOUNTING=y
11CONFIG_AUDIT=y
12CONFIG_CGROUPS=y 13CONFIG_CGROUPS=y
13CONFIG_CGROUP_DEVICE=y 14CONFIG_CGROUP_DEVICE=y
14CONFIG_CGROUP_CPUACCT=y 15CONFIG_CGROUP_CPUACCT=y
15CONFIG_RESOURCE_COUNTERS=y
16CONFIG_CGROUP_SCHED=y 16CONFIG_CGROUP_SCHED=y
17CONFIG_RT_GROUP_SCHED=y 17CONFIG_RT_GROUP_SCHED=y
18CONFIG_UTS_NS=y
19CONFIG_IPC_NS=y
20CONFIG_USER_NS=y 18CONFIG_USER_NS=y
21CONFIG_PID_NS=y
22CONFIG_BLK_DEV_INITRD=y 19CONFIG_BLK_DEV_INITRD=y
23CONFIG_KALLSYMS_EXTRA_PASS=y
24# CONFIG_COMPAT_BRK is not set 20# CONFIG_COMPAT_BRK is not set
25CONFIG_PROFILING=y 21CONFIG_PROFILING=y
26CONFIG_OPROFILE=m 22CONFIG_OPROFILE=m
@@ -29,10 +25,19 @@ CONFIG_MODULES=y
29CONFIG_MODULE_UNLOAD=y 25CONFIG_MODULE_UNLOAD=y
30CONFIG_MODULE_SRCVERSION_ALL=y 26CONFIG_MODULE_SRCVERSION_ALL=y
31CONFIG_BLK_DEV_INTEGRITY=y 27CONFIG_BLK_DEV_INTEGRITY=y
28CONFIG_PARTITION_ADVANCED=y
29CONFIG_OSF_PARTITION=y
30CONFIG_AMIGA_PARTITION=y
31CONFIG_BSD_DISKLABEL=y
32CONFIG_MINIX_SUBPARTITION=y
33CONFIG_SOLARIS_X86_PARTITION=y
34CONFIG_UNIXWARE_DISKLABEL=y
35CONFIG_SGI_PARTITION=y
36CONFIG_SUN_PARTITION=y
37CONFIG_KARMA_PARTITION=y
32CONFIG_PPC_MPC52xx=y 38CONFIG_PPC_MPC52xx=y
33CONFIG_PPC_EFIKA=y 39CONFIG_PPC_EFIKA=y
34CONFIG_PPC_MPC5200_BUGFIX=y 40CONFIG_PPC_MPC5200_BUGFIX=y
35CONFIG_PPC_MPC5200_GPIO=y
36CONFIG_PPC_82xx=y 41CONFIG_PPC_82xx=y
37CONFIG_MPC8272_ADS=y 42CONFIG_MPC8272_ADS=y
38CONFIG_PQ2FADS=y 43CONFIG_PQ2FADS=y
@@ -56,7 +61,6 @@ CONFIG_SBC8641D=y
56CONFIG_MPC8610_HPCD=y 61CONFIG_MPC8610_HPCD=y
57CONFIG_GEF_SBC610=y 62CONFIG_GEF_SBC610=y
58CONFIG_CPU_FREQ=y 63CONFIG_CPU_FREQ=y
59CONFIG_CPU_FREQ_DEBUG=y
60CONFIG_CPU_FREQ_STAT=m 64CONFIG_CPU_FREQ_STAT=m
61CONFIG_CPU_FREQ_STAT_DETAILS=y 65CONFIG_CPU_FREQ_STAT_DETAILS=y
62CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y 66CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
@@ -69,19 +73,13 @@ CONFIG_TAU=y
69CONFIG_TAU_AVERAGE=y 73CONFIG_TAU_AVERAGE=y
70CONFIG_QUICC_ENGINE=y 74CONFIG_QUICC_ENGINE=y
71CONFIG_QE_GPIO=y 75CONFIG_QE_GPIO=y
72CONFIG_PPC_BESTCOMM=y
73CONFIG_GPIO_MPC8XXX=y
74CONFIG_MCU_MPC8349EMITX=y 76CONFIG_MCU_MPC8349EMITX=y
75CONFIG_HIGHMEM=y 77CONFIG_HIGHMEM=y
76CONFIG_NO_HZ=y
77CONFIG_HIGH_RES_TIMERS=y
78CONFIG_HZ_1000=y 78CONFIG_HZ_1000=y
79CONFIG_PREEMPT_VOLUNTARY=y 79CONFIG_PREEMPT_VOLUNTARY=y
80CONFIG_BINFMT_MISC=y 80CONFIG_BINFMT_MISC=y
81# CONFIG_MIGRATION is not set
82CONFIG_PM=y
83CONFIG_PM_DEBUG=y
84CONFIG_HIBERNATION=y 81CONFIG_HIBERNATION=y
82CONFIG_PM_DEBUG=y
85CONFIG_ISA=y 83CONFIG_ISA=y
86CONFIG_PCIEPORTBUS=y 84CONFIG_PCIEPORTBUS=y
87CONFIG_PCI_MSI=y 85CONFIG_PCI_MSI=y
@@ -106,8 +104,6 @@ CONFIG_IP_MULTIPLE_TABLES=y
106CONFIG_IP_ROUTE_MULTIPATH=y 104CONFIG_IP_ROUTE_MULTIPATH=y
107CONFIG_IP_ROUTE_VERBOSE=y 105CONFIG_IP_ROUTE_VERBOSE=y
108CONFIG_NET_IPIP=m 106CONFIG_NET_IPIP=m
109CONFIG_NET_IPGRE=m
110CONFIG_NET_IPGRE_BROADCAST=y
111CONFIG_IP_MROUTE=y 107CONFIG_IP_MROUTE=y
112CONFIG_IP_PIMSM_V1=y 108CONFIG_IP_PIMSM_V1=y
113CONFIG_IP_PIMSM_V2=y 109CONFIG_IP_PIMSM_V2=y
@@ -128,7 +124,6 @@ CONFIG_TCP_CONG_VENO=m
128CONFIG_TCP_CONG_YEAH=m 124CONFIG_TCP_CONG_YEAH=m
129CONFIG_TCP_CONG_ILLINOIS=m 125CONFIG_TCP_CONG_ILLINOIS=m
130CONFIG_TCP_MD5SIG=y 126CONFIG_TCP_MD5SIG=y
131CONFIG_IPV6_PRIVACY=y
132CONFIG_IPV6_ROUTER_PREF=y 127CONFIG_IPV6_ROUTER_PREF=y
133CONFIG_IPV6_ROUTE_INFO=y 128CONFIG_IPV6_ROUTE_INFO=y
134CONFIG_IPV6_OPTIMISTIC_DAD=y 129CONFIG_IPV6_OPTIMISTIC_DAD=y
@@ -144,7 +139,6 @@ CONFIG_IPV6_MROUTE=y
144CONFIG_IPV6_PIMSM_V2=y 139CONFIG_IPV6_PIMSM_V2=y
145CONFIG_NETLABEL=y 140CONFIG_NETLABEL=y
146CONFIG_NETFILTER=y 141CONFIG_NETFILTER=y
147CONFIG_NETFILTER_NETLINK_QUEUE=m
148CONFIG_NF_CONNTRACK=m 142CONFIG_NF_CONNTRACK=m
149CONFIG_NF_CONNTRACK_SECMARK=y 143CONFIG_NF_CONNTRACK_SECMARK=y
150CONFIG_NF_CONNTRACK_EVENTS=y 144CONFIG_NF_CONNTRACK_EVENTS=y
@@ -159,7 +153,6 @@ CONFIG_NF_CONNTRACK_SANE=m
159CONFIG_NF_CONNTRACK_SIP=m 153CONFIG_NF_CONNTRACK_SIP=m
160CONFIG_NF_CONNTRACK_TFTP=m 154CONFIG_NF_CONNTRACK_TFTP=m
161CONFIG_NF_CT_NETLINK=m 155CONFIG_NF_CT_NETLINK=m
162CONFIG_NETFILTER_TPROXY=m
163CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 156CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
164CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 157CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
165CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m 158CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
@@ -204,21 +197,12 @@ CONFIG_NETFILTER_XT_MATCH_TIME=m
204CONFIG_NETFILTER_XT_MATCH_U32=m 197CONFIG_NETFILTER_XT_MATCH_U32=m
205CONFIG_NF_CONNTRACK_IPV4=m 198CONFIG_NF_CONNTRACK_IPV4=m
206# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set 199# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
207CONFIG_IP_NF_QUEUE=m
208CONFIG_IP_NF_IPTABLES=m 200CONFIG_IP_NF_IPTABLES=m
209CONFIG_IP_NF_MATCH_ADDRTYPE=m
210CONFIG_IP_NF_MATCH_AH=m 201CONFIG_IP_NF_MATCH_AH=m
211CONFIG_IP_NF_MATCH_ECN=m 202CONFIG_IP_NF_MATCH_ECN=m
212CONFIG_IP_NF_MATCH_TTL=m 203CONFIG_IP_NF_MATCH_TTL=m
213CONFIG_IP_NF_FILTER=m 204CONFIG_IP_NF_FILTER=m
214CONFIG_IP_NF_TARGET_REJECT=m 205CONFIG_IP_NF_TARGET_REJECT=m
215CONFIG_IP_NF_TARGET_LOG=m
216CONFIG_IP_NF_TARGET_ULOG=m
217CONFIG_NF_NAT=m
218CONFIG_IP_NF_TARGET_MASQUERADE=m
219CONFIG_IP_NF_TARGET_NETMAP=m
220CONFIG_IP_NF_TARGET_REDIRECT=m
221CONFIG_NF_NAT_SNMP_BASIC=m
222CONFIG_IP_NF_MANGLE=m 206CONFIG_IP_NF_MANGLE=m
223CONFIG_IP_NF_TARGET_CLUSTERIP=m 207CONFIG_IP_NF_TARGET_CLUSTERIP=m
224CONFIG_IP_NF_TARGET_ECN=m 208CONFIG_IP_NF_TARGET_ECN=m
@@ -229,7 +213,6 @@ CONFIG_IP_NF_ARPTABLES=m
229CONFIG_IP_NF_ARPFILTER=m 213CONFIG_IP_NF_ARPFILTER=m
230CONFIG_IP_NF_ARP_MANGLE=m 214CONFIG_IP_NF_ARP_MANGLE=m
231CONFIG_NF_CONNTRACK_IPV6=m 215CONFIG_NF_CONNTRACK_IPV6=m
232CONFIG_IP6_NF_QUEUE=m
233CONFIG_IP6_NF_IPTABLES=m 216CONFIG_IP6_NF_IPTABLES=m
234CONFIG_IP6_NF_MATCH_AH=m 217CONFIG_IP6_NF_MATCH_AH=m
235CONFIG_IP6_NF_MATCH_EUI64=m 218CONFIG_IP6_NF_MATCH_EUI64=m
@@ -240,7 +223,6 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
240CONFIG_IP6_NF_MATCH_MH=m 223CONFIG_IP6_NF_MATCH_MH=m
241CONFIG_IP6_NF_MATCH_RT=m 224CONFIG_IP6_NF_MATCH_RT=m
242CONFIG_IP6_NF_TARGET_HL=m 225CONFIG_IP6_NF_TARGET_HL=m
243CONFIG_IP6_NF_TARGET_LOG=m
244CONFIG_IP6_NF_FILTER=m 226CONFIG_IP6_NF_FILTER=m
245CONFIG_IP6_NF_TARGET_REJECT=m 227CONFIG_IP6_NF_TARGET_REJECT=m
246CONFIG_IP6_NF_MANGLE=m 228CONFIG_IP6_NF_MANGLE=m
@@ -266,7 +248,6 @@ CONFIG_BRIDGE_EBT_MARK_T=m
266CONFIG_BRIDGE_EBT_REDIRECT=m 248CONFIG_BRIDGE_EBT_REDIRECT=m
267CONFIG_BRIDGE_EBT_SNAT=m 249CONFIG_BRIDGE_EBT_SNAT=m
268CONFIG_BRIDGE_EBT_LOG=m 250CONFIG_BRIDGE_EBT_LOG=m
269CONFIG_BRIDGE_EBT_ULOG=m
270CONFIG_BRIDGE_EBT_NFLOG=m 251CONFIG_BRIDGE_EBT_NFLOG=m
271CONFIG_IP_DCCP=m 252CONFIG_IP_DCCP=m
272CONFIG_NET_DCCPPROBE=m 253CONFIG_NET_DCCPPROBE=m
@@ -284,8 +265,6 @@ CONFIG_ATALK=m
284CONFIG_DEV_APPLETALK=m 265CONFIG_DEV_APPLETALK=m
285CONFIG_IPDDP=m 266CONFIG_IPDDP=m
286CONFIG_IPDDP_ENCAP=y 267CONFIG_IPDDP_ENCAP=y
287CONFIG_IPDDP_DECAP=y
288CONFIG_WAN_ROUTER=m
289CONFIG_NET_SCHED=y 268CONFIG_NET_SCHED=y
290CONFIG_NET_SCH_CBQ=m 269CONFIG_NET_SCH_CBQ=m
291CONFIG_NET_SCH_HTB=m 270CONFIG_NET_SCH_HTB=m
@@ -349,8 +328,6 @@ CONFIG_VLSI_FIR=m
349CONFIG_VIA_FIR=m 328CONFIG_VIA_FIR=m
350CONFIG_MCS_FIR=m 329CONFIG_MCS_FIR=m
351CONFIG_BT=m 330CONFIG_BT=m
352CONFIG_BT_L2CAP=y
353CONFIG_BT_SCO=y
354CONFIG_BT_RFCOMM=m 331CONFIG_BT_RFCOMM=m
355CONFIG_BT_RFCOMM_TTY=y 332CONFIG_BT_RFCOMM_TTY=y
356CONFIG_BT_BNEP=m 333CONFIG_BT_BNEP=m
@@ -380,7 +357,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
380# CONFIG_FIRMWARE_IN_KERNEL is not set 357# CONFIG_FIRMWARE_IN_KERNEL is not set
381CONFIG_DEBUG_DEVRES=y 358CONFIG_DEBUG_DEVRES=y
382CONFIG_CONNECTOR=y 359CONFIG_CONNECTOR=y
383CONFIG_PROC_DEVICETREE=y
384CONFIG_PARPORT=m 360CONFIG_PARPORT=m
385CONFIG_PARPORT_PC=m 361CONFIG_PARPORT_PC=m
386CONFIG_PARPORT_SERIAL=m 362CONFIG_PARPORT_SERIAL=m
@@ -396,7 +372,6 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
396CONFIG_CDROM_PKTCDVD=m 372CONFIG_CDROM_PKTCDVD=m
397CONFIG_VIRTIO_BLK=m 373CONFIG_VIRTIO_BLK=m
398CONFIG_BLK_DEV_HD=y 374CONFIG_BLK_DEV_HD=y
399CONFIG_MISC_DEVICES=y
400CONFIG_ENCLOSURE_SERVICES=m 375CONFIG_ENCLOSURE_SERVICES=m
401CONFIG_SENSORS_TSL2550=m 376CONFIG_SENSORS_TSL2550=m
402CONFIG_EEPROM_AT24=m 377CONFIG_EEPROM_AT24=m
@@ -419,7 +394,6 @@ CONFIG_BLK_DEV_SR_VENDOR=y
419CONFIG_CHR_DEV_SG=y 394CONFIG_CHR_DEV_SG=y
420CONFIG_CHR_DEV_SCH=m 395CONFIG_CHR_DEV_SCH=m
421CONFIG_SCSI_ENCLOSURE=m 396CONFIG_SCSI_ENCLOSURE=m
422CONFIG_SCSI_MULTI_LUN=y
423CONFIG_SCSI_CONSTANTS=y 397CONFIG_SCSI_CONSTANTS=y
424CONFIG_SCSI_LOGGING=y 398CONFIG_SCSI_LOGGING=y
425CONFIG_SCSI_SCAN_ASYNC=y 399CONFIG_SCSI_SCAN_ASYNC=y
@@ -436,8 +410,8 @@ CONFIG_ATA=y
436# CONFIG_SATA_PMP is not set 410# CONFIG_SATA_PMP is not set
437CONFIG_SATA_FSL=m 411CONFIG_SATA_FSL=m
438CONFIG_PDC_ADMA=m 412CONFIG_PDC_ADMA=m
439CONFIG_PATA_MPC52xx=m
440CONFIG_ATA_PIIX=m 413CONFIG_ATA_PIIX=m
414CONFIG_PATA_MPC52xx=m
441CONFIG_PATA_OPTIDMA=m 415CONFIG_PATA_OPTIDMA=m
442CONFIG_PATA_SCH=m 416CONFIG_PATA_SCH=m
443CONFIG_PATA_VIA=m 417CONFIG_PATA_VIA=m
@@ -479,37 +453,44 @@ CONFIG_THERM_WINDTUNNEL=m
479CONFIG_THERM_ADT746X=m 453CONFIG_THERM_ADT746X=m
480CONFIG_WINDFARM=y 454CONFIG_WINDFARM=y
481CONFIG_PMAC_RACKMETER=m 455CONFIG_PMAC_RACKMETER=m
456CONFIG_SENSORS_AMS=m
482CONFIG_NETDEVICES=y 457CONFIG_NETDEVICES=y
483CONFIG_IFB=m
484CONFIG_DUMMY=m
485CONFIG_BONDING=m 458CONFIG_BONDING=m
486CONFIG_MACVLAN=m 459CONFIG_DUMMY=m
487CONFIG_EQUALIZER=m 460CONFIG_EQUALIZER=m
461CONFIG_NET_FC=y
462CONFIG_IFB=m
463CONFIG_MACVLAN=m
464CONFIG_NETCONSOLE=m
488CONFIG_TUN=m 465CONFIG_TUN=m
489CONFIG_VETH=m 466CONFIG_VETH=m
490CONFIG_NET_SB1000=m 467CONFIG_VIRTIO_NET=m
491CONFIG_MARVELL_PHY=m 468CONFIG_ATM_TCP=m
492CONFIG_DAVICOM_PHY=m 469CONFIG_ATM_LANAI=m
493CONFIG_QSEMI_PHY=m 470CONFIG_ATM_ENI=m
494CONFIG_LXT_PHY=m 471CONFIG_ATM_NICSTAR=m
495CONFIG_CICADA_PHY=m 472CONFIG_ATM_IDT77252=m
496CONFIG_VITESSE_PHY=m 473CONFIG_ATM_HE=m
497CONFIG_SMSC_PHY=m
498CONFIG_BROADCOM_PHY=m
499CONFIG_ICPLUS_PHY=m
500CONFIG_REALTEK_PHY=m
501CONFIG_NET_ETHERNET=y
502CONFIG_MACE=m
503CONFIG_BMAC=m
504CONFIG_HAPPYMEAL=m
505CONFIG_SUNGEM=m
506CONFIG_CASSINI=m
507CONFIG_NET_VENDOR_3COM=y
508CONFIG_EL3=m 474CONFIG_EL3=m
475CONFIG_PCMCIA_3C574=m
476CONFIG_PCMCIA_3C589=m
509CONFIG_VORTEX=m 477CONFIG_VORTEX=m
510CONFIG_TYPHOON=m 478CONFIG_TYPHOON=m
511CONFIG_NET_VENDOR_SMC=y 479CONFIG_ADAPTEC_STARFIRE=m
512CONFIG_ULTRA=m 480CONFIG_ACENIC=m
481CONFIG_AMD8111_ETH=m
482CONFIG_PCNET32=m
483CONFIG_PCMCIA_NMCLAN=m
484CONFIG_MACE=m
485CONFIG_BMAC=m
486CONFIG_ATL1=m
487CONFIG_B44=m
488CONFIG_BNX2=m
489CONFIG_TIGON3=m
490CONFIG_BNX2X=m
491CONFIG_CHELSIO_T1=m
492CONFIG_CHELSIO_T1_1G=y
493CONFIG_CHELSIO_T3=m
513CONFIG_NET_TULIP=y 494CONFIG_NET_TULIP=y
514CONFIG_DE2104X=m 495CONFIG_DE2104X=m
515CONFIG_TULIP=m 496CONFIG_TULIP=m
@@ -519,69 +500,84 @@ CONFIG_WINBOND_840=m
519CONFIG_DM9102=m 500CONFIG_DM9102=m
520CONFIG_ULI526X=m 501CONFIG_ULI526X=m
521CONFIG_PCMCIA_XIRCOM=m 502CONFIG_PCMCIA_XIRCOM=m
522CONFIG_NET_ISA=y 503CONFIG_DL2K=m
523CONFIG_EWRK3=m 504CONFIG_SUNDANCE=m
524CONFIG_NE2000=m 505CONFIG_S2IO=m
525CONFIG_NET_PCI=y 506CONFIG_FEC_MPC52xx=m
526CONFIG_PCNET32=m 507CONFIG_GIANFAR=m
527CONFIG_AMD8111_ETH=m 508CONFIG_PCMCIA_FMVJ18X=m
528CONFIG_ADAPTEC_STARFIRE=m
529CONFIG_B44=m
530CONFIG_FORCEDETH=m
531CONFIG_E100=m 509CONFIG_E100=m
510CONFIG_E1000=m
511CONFIG_E1000E=m
512CONFIG_IGB=m
513CONFIG_IXGB=m
514CONFIG_IXGBE=m
515CONFIG_IP1000=m
516CONFIG_MV643XX_ETH=m
517CONFIG_SKGE=m
518CONFIG_SKY2=m
519CONFIG_MYRI10GE=m
532CONFIG_FEALNX=m 520CONFIG_FEALNX=m
533CONFIG_NATSEMI=m 521CONFIG_NATSEMI=m
522CONFIG_NS83820=m
523CONFIG_PCMCIA_AXNET=m
524CONFIG_NE2000=m
534CONFIG_NE2K_PCI=m 525CONFIG_NE2K_PCI=m
526CONFIG_PCMCIA_PCNET=m
527CONFIG_ULTRA=m
528CONFIG_FORCEDETH=m
529CONFIG_HAMACHI=m
530CONFIG_YELLOWFIN=m
531CONFIG_QLA3XXX=m
532CONFIG_QLGE=m
533CONFIG_NETXEN_NIC=m
535CONFIG_8139CP=m 534CONFIG_8139CP=m
536CONFIG_8139TOO=m 535CONFIG_8139TOO=m
537# CONFIG_8139TOO_PIO is not set 536# CONFIG_8139TOO_PIO is not set
538CONFIG_8139TOO_8129=y 537CONFIG_8139TOO_8129=y
538CONFIG_R8169=m
539CONFIG_R6040=m 539CONFIG_R6040=m
540CONFIG_SC92031=m
540CONFIG_SIS900=m 541CONFIG_SIS900=m
542CONFIG_SIS190=m
543CONFIG_SFC=m
544CONFIG_PCMCIA_SMC91C92=m
541CONFIG_EPIC100=m 545CONFIG_EPIC100=m
542CONFIG_SUNDANCE=m 546CONFIG_HAPPYMEAL=m
547CONFIG_SUNGEM=m
548CONFIG_CASSINI=m
549CONFIG_NIU=m
550CONFIG_TEHUTI=m
543CONFIG_TLAN=m 551CONFIG_TLAN=m
544CONFIG_VIA_RHINE=m 552CONFIG_VIA_RHINE=m
545CONFIG_VIA_RHINE_MMIO=y 553CONFIG_VIA_RHINE_MMIO=y
546CONFIG_SC92031=m
547CONFIG_NET_POCKET=y
548CONFIG_DE600=m
549CONFIG_DE620=m
550CONFIG_FEC_MPC52xx=m
551CONFIG_ACENIC=m
552CONFIG_DL2K=m
553CONFIG_E1000=m
554CONFIG_E1000E=m
555CONFIG_IP1000=m
556CONFIG_IGB=m
557CONFIG_NS83820=m
558CONFIG_HAMACHI=m
559CONFIG_YELLOWFIN=m
560CONFIG_R8169=m
561CONFIG_R8169_VLAN=y
562CONFIG_SIS190=m
563CONFIG_SKGE=m
564CONFIG_SKY2=m
565CONFIG_VIA_VELOCITY=m 554CONFIG_VIA_VELOCITY=m
566CONFIG_TIGON3=m 555CONFIG_PCMCIA_XIRC2PS=m
567CONFIG_BNX2=m 556CONFIG_FDDI=y
568CONFIG_GIANFAR=m 557CONFIG_SKFP=m
569CONFIG_MV643XX_ETH=m 558CONFIG_NET_SB1000=m
570CONFIG_QLA3XXX=m 559CONFIG_MARVELL_PHY=m
571CONFIG_ATL1=m 560CONFIG_DAVICOM_PHY=m
572CONFIG_CHELSIO_T1=m 561CONFIG_QSEMI_PHY=m
573CONFIG_CHELSIO_T1_1G=y 562CONFIG_LXT_PHY=m
574CONFIG_CHELSIO_T3=m 563CONFIG_CICADA_PHY=m
575CONFIG_IXGBE=m 564CONFIG_VITESSE_PHY=m
576CONFIG_IXGB=m 565CONFIG_SMSC_PHY=m
577CONFIG_S2IO=m 566CONFIG_BROADCOM_PHY=m
578CONFIG_MYRI10GE=m 567CONFIG_ICPLUS_PHY=m
579CONFIG_NETXEN_NIC=m 568CONFIG_REALTEK_PHY=m
580CONFIG_NIU=m 569CONFIG_PLIP=m
581CONFIG_TEHUTI=m 570CONFIG_PPP_DEFLATE=m
582CONFIG_BNX2X=m 571CONFIG_PPP_FILTER=y
583CONFIG_QLGE=m 572CONFIG_PPP_MPPE=m
584CONFIG_SFC=m 573CONFIG_PPP_MULTILINK=y
574CONFIG_PPPOATM=m
575CONFIG_PPPOE=m
576CONFIG_PPP_ASYNC=m
577CONFIG_PPP_SYNC_TTY=m
578CONFIG_SLIP=m
579CONFIG_SLIP_COMPRESSED=y
580CONFIG_SLIP_SMART=y
585CONFIG_USB_CATC=m 581CONFIG_USB_CATC=m
586CONFIG_USB_KAWETH=m 582CONFIG_USB_KAWETH=m
587CONFIG_USB_PEGASUS=m 583CONFIG_USB_PEGASUS=m
@@ -597,39 +593,6 @@ CONFIG_USB_ALI_M5632=y
597CONFIG_USB_AN2720=y 593CONFIG_USB_AN2720=y
598CONFIG_USB_EPSON2888=y 594CONFIG_USB_EPSON2888=y
599CONFIG_USB_KC2190=y 595CONFIG_USB_KC2190=y
600CONFIG_NET_PCMCIA=y
601CONFIG_PCMCIA_3C589=m
602CONFIG_PCMCIA_3C574=m
603CONFIG_PCMCIA_FMVJ18X=m
604CONFIG_PCMCIA_PCNET=m
605CONFIG_PCMCIA_NMCLAN=m
606CONFIG_PCMCIA_SMC91C92=m
607CONFIG_PCMCIA_XIRC2PS=m
608CONFIG_PCMCIA_AXNET=m
609CONFIG_ATM_TCP=m
610CONFIG_ATM_LANAI=m
611CONFIG_ATM_ENI=m
612CONFIG_ATM_NICSTAR=m
613CONFIG_ATM_IDT77252=m
614CONFIG_ATM_HE=m
615CONFIG_FDDI=y
616CONFIG_SKFP=m
617CONFIG_PLIP=m
618CONFIG_PPP_MULTILINK=y
619CONFIG_PPP_FILTER=y
620CONFIG_PPP_ASYNC=m
621CONFIG_PPP_SYNC_TTY=m
622CONFIG_PPP_DEFLATE=m
623CONFIG_PPP_MPPE=m
624CONFIG_PPPOE=m
625CONFIG_PPPOATM=m
626CONFIG_SLIP=m
627CONFIG_SLIP_COMPRESSED=y
628CONFIG_SLIP_SMART=y
629CONFIG_NET_FC=y
630CONFIG_NETCONSOLE=m
631CONFIG_NETCONSOLE_DYNAMIC=y
632CONFIG_VIRTIO_NET=m
633# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 596# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
634CONFIG_INPUT_JOYDEV=m 597CONFIG_INPUT_JOYDEV=m
635CONFIG_INPUT_EVDEV=y 598CONFIG_INPUT_EVDEV=y
@@ -670,10 +633,8 @@ CONFIG_TABLET_USB_ACECAD=m
670CONFIG_TABLET_USB_AIPTEK=m 633CONFIG_TABLET_USB_AIPTEK=m
671CONFIG_TABLET_USB_GTCO=m 634CONFIG_TABLET_USB_GTCO=m
672CONFIG_TABLET_USB_KBTAB=m 635CONFIG_TABLET_USB_KBTAB=m
673CONFIG_TABLET_USB_WACOM=m
674CONFIG_INPUT_MISC=y 636CONFIG_INPUT_MISC=y
675CONFIG_INPUT_PCSPKR=m 637CONFIG_INPUT_PCSPKR=m
676CONFIG_INPUT_ATI_REMOTE=m
677CONFIG_INPUT_ATI_REMOTE2=m 638CONFIG_INPUT_ATI_REMOTE2=m
678CONFIG_INPUT_KEYSPAN_REMOTE=m 639CONFIG_INPUT_KEYSPAN_REMOTE=m
679CONFIG_INPUT_POWERMATE=m 640CONFIG_INPUT_POWERMATE=m
@@ -685,16 +646,16 @@ CONFIG_GAMEPORT_NS558=m
685CONFIG_GAMEPORT_L4=m 646CONFIG_GAMEPORT_L4=m
686CONFIG_GAMEPORT_EMU10K1=m 647CONFIG_GAMEPORT_EMU10K1=m
687CONFIG_GAMEPORT_FM801=m 648CONFIG_GAMEPORT_FM801=m
688CONFIG_VT_HW_CONSOLE_BINDING=y 649# CONFIG_LEGACY_PTYS is not set
689# CONFIG_DEVKMEM is not set
690CONFIG_SERIAL_NONSTANDARD=y 650CONFIG_SERIAL_NONSTANDARD=y
691CONFIG_ROCKETPORT=m 651CONFIG_ROCKETPORT=m
692CONFIG_CYCLADES=m 652CONFIG_CYCLADES=m
693CONFIG_SYNCLINK=m 653CONFIG_SYNCLINK=m
694CONFIG_SYNCLINKMP=m 654CONFIG_SYNCLINKMP=m
695CONFIG_SYNCLINK_GT=m 655CONFIG_SYNCLINK_GT=m
696CONFIG_N_HDLC=m
697CONFIG_NOZOMI=m 656CONFIG_NOZOMI=m
657CONFIG_N_HDLC=m
658# CONFIG_DEVKMEM is not set
698CONFIG_SERIAL_8250=y 659CONFIG_SERIAL_8250=y
699CONFIG_SERIAL_8250_CONSOLE=y 660CONFIG_SERIAL_8250_CONSOLE=y
700CONFIG_SERIAL_8250_CS=m 661CONFIG_SERIAL_8250_CS=m
@@ -711,8 +672,6 @@ CONFIG_SERIAL_MPC52xx_CONSOLE=y
711CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 672CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
712CONFIG_SERIAL_JSM=m 673CONFIG_SERIAL_JSM=m
713CONFIG_SERIAL_OF_PLATFORM=y 674CONFIG_SERIAL_OF_PLATFORM=y
714# CONFIG_LEGACY_PTYS is not set
715CONFIG_BRIQ_PANEL=m
716CONFIG_PRINTER=m 675CONFIG_PRINTER=m
717CONFIG_LP_CONSOLE=y 676CONFIG_LP_CONSOLE=y
718CONFIG_PPDEV=m 677CONFIG_PPDEV=m
@@ -735,6 +694,7 @@ CONFIG_I2C_TINY_USB=m
735CONFIG_I2C_PCA_ISA=m 694CONFIG_I2C_PCA_ISA=m
736CONFIG_I2C_STUB=m 695CONFIG_I2C_STUB=m
737CONFIG_GPIO_SYSFS=y 696CONFIG_GPIO_SYSFS=y
697CONFIG_GPIO_MPC8XXX=y
738CONFIG_W1=m 698CONFIG_W1=m
739CONFIG_W1_MASTER_DS2490=m 699CONFIG_W1_MASTER_DS2490=m
740CONFIG_W1_MASTER_DS2482=m 700CONFIG_W1_MASTER_DS2482=m
@@ -754,15 +714,13 @@ CONFIG_SENSORS_ADM1029=m
754CONFIG_SENSORS_ADM1031=m 714CONFIG_SENSORS_ADM1031=m
755CONFIG_SENSORS_ADM9240=m 715CONFIG_SENSORS_ADM9240=m
756CONFIG_SENSORS_ADT7470=m 716CONFIG_SENSORS_ADT7470=m
757CONFIG_SENSORS_AMS=m
758CONFIG_SENSORS_ATXP1=m 717CONFIG_SENSORS_ATXP1=m
759CONFIG_SENSORS_DS1621=m 718CONFIG_SENSORS_DS1621=m
760CONFIG_SENSORS_F71805F=m
761CONFIG_SENSORS_F71882FG=m
762CONFIG_SENSORS_F75375S=m 719CONFIG_SENSORS_F75375S=m
763CONFIG_SENSORS_GL518SM=m 720CONFIG_SENSORS_GL518SM=m
764CONFIG_SENSORS_GL520SM=m 721CONFIG_SENSORS_GL520SM=m
765CONFIG_SENSORS_IT87=m 722CONFIG_SENSORS_MAX1619=m
723CONFIG_SENSORS_MAX6650=m
766CONFIG_SENSORS_LM63=m 724CONFIG_SENSORS_LM63=m
767CONFIG_SENSORS_LM75=m 725CONFIG_SENSORS_LM75=m
768CONFIG_SENSORS_LM77=m 726CONFIG_SENSORS_LM77=m
@@ -774,20 +732,12 @@ CONFIG_SENSORS_LM87=m
774CONFIG_SENSORS_LM90=m 732CONFIG_SENSORS_LM90=m
775CONFIG_SENSORS_LM92=m 733CONFIG_SENSORS_LM92=m
776CONFIG_SENSORS_LM93=m 734CONFIG_SENSORS_LM93=m
777CONFIG_SENSORS_MAX1619=m
778CONFIG_SENSORS_MAX6650=m
779CONFIG_SENSORS_PC87360=m
780CONFIG_SENSORS_PC87427=m
781CONFIG_SENSORS_PCF8591=m 735CONFIG_SENSORS_PCF8591=m
782CONFIG_SENSORS_SIS5595=m 736CONFIG_SENSORS_SIS5595=m
783CONFIG_SENSORS_DME1737=m
784CONFIG_SENSORS_SMSC47M1=m
785CONFIG_SENSORS_SMSC47M192=m 737CONFIG_SENSORS_SMSC47M192=m
786CONFIG_SENSORS_SMSC47B397=m
787CONFIG_SENSORS_ADS7828=m 738CONFIG_SENSORS_ADS7828=m
788CONFIG_SENSORS_THMC50=m 739CONFIG_SENSORS_THMC50=m
789CONFIG_SENSORS_VIA686A=m 740CONFIG_SENSORS_VIA686A=m
790CONFIG_SENSORS_VT1211=m
791CONFIG_SENSORS_VT8231=m 741CONFIG_SENSORS_VT8231=m
792CONFIG_SENSORS_W83781D=m 742CONFIG_SENSORS_W83781D=m
793CONFIG_SENSORS_W83791D=m 743CONFIG_SENSORS_W83791D=m
@@ -795,8 +745,6 @@ CONFIG_SENSORS_W83792D=m
795CONFIG_SENSORS_W83793=m 745CONFIG_SENSORS_W83793=m
796CONFIG_SENSORS_W83L785TS=m 746CONFIG_SENSORS_W83L785TS=m
797CONFIG_SENSORS_W83L786NG=m 747CONFIG_SENSORS_W83L786NG=m
798CONFIG_SENSORS_W83627HF=m
799CONFIG_SENSORS_W83627EHF=m
800CONFIG_THERMAL=y 748CONFIG_THERMAL=y
801CONFIG_WATCHDOG=y 749CONFIG_WATCHDOG=y
802CONFIG_SOFT_WATCHDOG=m 750CONFIG_SOFT_WATCHDOG=m
@@ -815,7 +763,6 @@ CONFIG_DRM_MGA=m
815CONFIG_DRM_SIS=m 763CONFIG_DRM_SIS=m
816CONFIG_DRM_VIA=m 764CONFIG_DRM_VIA=m
817CONFIG_DRM_SAVAGE=m 765CONFIG_DRM_SAVAGE=m
818CONFIG_VIDEO_OUTPUT_CONTROL=m
819CONFIG_FB=y 766CONFIG_FB=y
820CONFIG_FB_CIRRUS=m 767CONFIG_FB_CIRRUS=m
821CONFIG_FB_OF=y 768CONFIG_FB_OF=y
@@ -850,10 +797,8 @@ CONFIG_FB_TRIDENT=m
850CONFIG_FB_SM501=m 797CONFIG_FB_SM501=m
851CONFIG_FB_IBM_GXT4500=y 798CONFIG_FB_IBM_GXT4500=y
852CONFIG_LCD_PLATFORM=m 799CONFIG_LCD_PLATFORM=m
853CONFIG_DISPLAY_SUPPORT=m
854CONFIG_VGACON_SOFT_SCROLLBACK=y 800CONFIG_VGACON_SOFT_SCROLLBACK=y
855CONFIG_FRAMEBUFFER_CONSOLE=y 801CONFIG_FRAMEBUFFER_CONSOLE=y
856CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
857CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y 802CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
858CONFIG_LOGO=y 803CONFIG_LOGO=y
859# CONFIG_LOGO_LINUX_MONO is not set 804# CONFIG_LOGO_LINUX_MONO is not set
@@ -897,7 +842,6 @@ CONFIG_SND_CMIPCI=m
897CONFIG_SND_OXYGEN=m 842CONFIG_SND_OXYGEN=m
898CONFIG_SND_CS4281=m 843CONFIG_SND_CS4281=m
899CONFIG_SND_CS46XX=m 844CONFIG_SND_CS46XX=m
900CONFIG_SND_CS5530=m
901CONFIG_SND_DARLA20=m 845CONFIG_SND_DARLA20=m
902CONFIG_SND_GINA20=m 846CONFIG_SND_GINA20=m
903CONFIG_SND_LAYLA20=m 847CONFIG_SND_LAYLA20=m
@@ -919,7 +863,6 @@ CONFIG_SND_ES1968=m
919CONFIG_SND_FM801=m 863CONFIG_SND_FM801=m
920CONFIG_SND_HDSP=m 864CONFIG_SND_HDSP=m
921CONFIG_SND_HDSPM=m 865CONFIG_SND_HDSPM=m
922CONFIG_SND_HIFIER=m
923CONFIG_SND_ICE1712=m 866CONFIG_SND_ICE1712=m
924CONFIG_SND_ICE1724=m 867CONFIG_SND_ICE1724=m
925CONFIG_SND_KORG1212=m 868CONFIG_SND_KORG1212=m
@@ -949,8 +892,6 @@ CONFIG_SND_USB_CAIAQ=m
949CONFIG_SND_USB_CAIAQ_INPUT=y 892CONFIG_SND_USB_CAIAQ_INPUT=y
950# CONFIG_SND_PCMCIA is not set 893# CONFIG_SND_PCMCIA is not set
951CONFIG_HIDRAW=y 894CONFIG_HIDRAW=y
952CONFIG_HID_PID=y
953CONFIG_USB_HIDDEV=y
954CONFIG_HID_GYRATION=y 895CONFIG_HID_GYRATION=y
955CONFIG_LOGITECH_FF=y 896CONFIG_LOGITECH_FF=y
956CONFIG_LOGIRUMBLEPAD2_FF=y 897CONFIG_LOGIRUMBLEPAD2_FF=y
@@ -960,12 +901,12 @@ CONFIG_HID_PETALYNX=y
960CONFIG_HID_SAMSUNG=y 901CONFIG_HID_SAMSUNG=y
961CONFIG_HID_SONY=y 902CONFIG_HID_SONY=y
962CONFIG_HID_SUNPLUS=y 903CONFIG_HID_SUNPLUS=y
904CONFIG_HID_PID=y
905CONFIG_USB_HIDDEV=y
963CONFIG_USB=y 906CONFIG_USB=y
964CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 907CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
965# CONFIG_USB_DEVICE_CLASS is not set
966CONFIG_USB_MON=y 908CONFIG_USB_MON=y
967CONFIG_USB_EHCI_HCD=m 909CONFIG_USB_EHCI_HCD=m
968CONFIG_USB_EHCI_TT_NEWSCHED=y
969CONFIG_USB_EHCI_FSL=y 910CONFIG_USB_EHCI_FSL=y
970CONFIG_USB_OHCI_HCD=m 911CONFIG_USB_OHCI_HCD=m
971CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 912CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
@@ -1001,7 +942,6 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
1001CONFIG_USB_SERIAL_CYPRESS_M8=m 942CONFIG_USB_SERIAL_CYPRESS_M8=m
1002CONFIG_USB_SERIAL_EMPEG=m 943CONFIG_USB_SERIAL_EMPEG=m
1003CONFIG_USB_SERIAL_FTDI_SIO=m 944CONFIG_USB_SERIAL_FTDI_SIO=m
1004CONFIG_USB_SERIAL_FUNSOFT=m
1005CONFIG_USB_SERIAL_VISOR=m 945CONFIG_USB_SERIAL_VISOR=m
1006CONFIG_USB_SERIAL_IPAQ=m 946CONFIG_USB_SERIAL_IPAQ=m
1007CONFIG_USB_SERIAL_IR=m 947CONFIG_USB_SERIAL_IR=m
@@ -1016,12 +956,10 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m
1016CONFIG_USB_SERIAL_MCT_U232=m 956CONFIG_USB_SERIAL_MCT_U232=m
1017CONFIG_USB_SERIAL_MOS7720=m 957CONFIG_USB_SERIAL_MOS7720=m
1018CONFIG_USB_SERIAL_MOS7840=m 958CONFIG_USB_SERIAL_MOS7840=m
1019CONFIG_USB_SERIAL_MOTOROLA=m
1020CONFIG_USB_SERIAL_NAVMAN=m 959CONFIG_USB_SERIAL_NAVMAN=m
1021CONFIG_USB_SERIAL_PL2303=m 960CONFIG_USB_SERIAL_PL2303=m
1022CONFIG_USB_SERIAL_OTI6858=m 961CONFIG_USB_SERIAL_OTI6858=m
1023CONFIG_USB_SERIAL_SPCP8X5=m 962CONFIG_USB_SERIAL_SPCP8X5=m
1024CONFIG_USB_SERIAL_HP4X=m
1025CONFIG_USB_SERIAL_SAFE=m 963CONFIG_USB_SERIAL_SAFE=m
1026CONFIG_USB_SERIAL_SAFE_PADDED=y 964CONFIG_USB_SERIAL_SAFE_PADDED=y
1027CONFIG_USB_SERIAL_SIERRAWIRELESS=m 965CONFIG_USB_SERIAL_SIERRAWIRELESS=m
@@ -1083,12 +1021,14 @@ CONFIG_RTC_DRV_M48T35=m
1083CONFIG_RTC_DRV_M48T59=m 1021CONFIG_RTC_DRV_M48T59=m
1084CONFIG_RTC_DRV_V3020=m 1022CONFIG_RTC_DRV_V3020=m
1085CONFIG_DMADEVICES=y 1023CONFIG_DMADEVICES=y
1024CONFIG_PPC_BESTCOMM=y
1086CONFIG_AUXDISPLAY=y 1025CONFIG_AUXDISPLAY=y
1087CONFIG_KS0108=m 1026CONFIG_KS0108=m
1088CONFIG_UIO=m 1027CONFIG_UIO=m
1089CONFIG_UIO_CIF=m 1028CONFIG_UIO_CIF=m
1090CONFIG_UIO_PDRV=m
1091CONFIG_UIO_PDRV_GENIRQ=m 1029CONFIG_UIO_PDRV_GENIRQ=m
1030CONFIG_VIRTIO_PCI=m
1031CONFIG_VIRTIO_BALLOON=m
1092CONFIG_EXT2_FS=m 1032CONFIG_EXT2_FS=m
1093CONFIG_EXT2_FS_XATTR=y 1033CONFIG_EXT2_FS_XATTR=y
1094CONFIG_EXT2_FS_POSIX_ACL=y 1034CONFIG_EXT2_FS_POSIX_ACL=y
@@ -1111,12 +1051,7 @@ CONFIG_XFS_FS=m
1111CONFIG_XFS_QUOTA=y 1051CONFIG_XFS_QUOTA=y
1112CONFIG_XFS_POSIX_ACL=y 1052CONFIG_XFS_POSIX_ACL=y
1113CONFIG_GFS2_FS=m 1053CONFIG_GFS2_FS=m
1114CONFIG_OCFS2_FS=m
1115# CONFIG_OCFS2_DEBUG_MASKLOG is not set
1116CONFIG_QUOTA_NETLINK_INTERFACE=y 1054CONFIG_QUOTA_NETLINK_INTERFACE=y
1117# CONFIG_PRINT_QUOTA_WARNING is not set
1118CONFIG_QFMT_V2=y
1119CONFIG_AUTOFS_FS=m
1120CONFIG_AUTOFS4_FS=m 1055CONFIG_AUTOFS4_FS=m
1121CONFIG_FUSE_FS=m 1056CONFIG_FUSE_FS=m
1122CONFIG_ISO9660_FS=y 1057CONFIG_ISO9660_FS=y
@@ -1145,20 +1080,17 @@ CONFIG_ROMFS_FS=m
1145CONFIG_SYSV_FS=m 1080CONFIG_SYSV_FS=m
1146CONFIG_UFS_FS=m 1081CONFIG_UFS_FS=m
1147CONFIG_NFS_FS=m 1082CONFIG_NFS_FS=m
1148CONFIG_NFS_V3=y
1149CONFIG_NFS_V3_ACL=y 1083CONFIG_NFS_V3_ACL=y
1150CONFIG_NFS_V4=y 1084CONFIG_NFS_V4=m
1151CONFIG_NFSD=m 1085CONFIG_NFSD=m
1152CONFIG_NFSD_V3_ACL=y 1086CONFIG_NFSD_V3_ACL=y
1153CONFIG_NFSD_V4=y 1087CONFIG_NFSD_V4=y
1154CONFIG_RPCSEC_GSS_SPKM3=m
1155CONFIG_CIFS=m 1088CONFIG_CIFS=m
1156CONFIG_CIFS_WEAK_PW_HASH=y 1089CONFIG_CIFS_WEAK_PW_HASH=y
1157CONFIG_CIFS_UPCALL=y 1090CONFIG_CIFS_UPCALL=y
1158CONFIG_CIFS_XATTR=y 1091CONFIG_CIFS_XATTR=y
1159CONFIG_CIFS_POSIX=y 1092CONFIG_CIFS_POSIX=y
1160CONFIG_CIFS_DFS_UPCALL=y 1093CONFIG_CIFS_DFS_UPCALL=y
1161CONFIG_CIFS_EXPERIMENTAL=y
1162CONFIG_NCP_FS=m 1094CONFIG_NCP_FS=m
1163CONFIG_NCPFS_PACKET_SIGNING=y 1095CONFIG_NCPFS_PACKET_SIGNING=y
1164CONFIG_NCPFS_IOCTL_LOCKING=y 1096CONFIG_NCPFS_IOCTL_LOCKING=y
@@ -1170,17 +1102,6 @@ CONFIG_NCPFS_NLS=y
1170CONFIG_NCPFS_EXTRAS=y 1102CONFIG_NCPFS_EXTRAS=y
1171CONFIG_CODA_FS=m 1103CONFIG_CODA_FS=m
1172CONFIG_9P_FS=m 1104CONFIG_9P_FS=m
1173CONFIG_PARTITION_ADVANCED=y
1174CONFIG_OSF_PARTITION=y
1175CONFIG_AMIGA_PARTITION=y
1176CONFIG_BSD_DISKLABEL=y
1177CONFIG_MINIX_SUBPARTITION=y
1178CONFIG_SOLARIS_X86_PARTITION=y
1179CONFIG_UNIXWARE_DISKLABEL=y
1180CONFIG_SGI_PARTITION=y
1181CONFIG_SUN_PARTITION=y
1182CONFIG_KARMA_PARTITION=y
1183CONFIG_EFI_PARTITION=y
1184CONFIG_NLS_DEFAULT="utf8" 1105CONFIG_NLS_DEFAULT="utf8"
1185CONFIG_NLS_CODEPAGE_437=y 1106CONFIG_NLS_CODEPAGE_437=y
1186CONFIG_NLS_CODEPAGE_737=m 1107CONFIG_NLS_CODEPAGE_737=m
@@ -1219,29 +1140,27 @@ CONFIG_NLS_ISO8859_14=m
1219CONFIG_NLS_ISO8859_15=m 1140CONFIG_NLS_ISO8859_15=m
1220CONFIG_NLS_KOI8_R=m 1141CONFIG_NLS_KOI8_R=m
1221CONFIG_NLS_KOI8_U=m 1142CONFIG_NLS_KOI8_U=m
1222CONFIG_DLM=m 1143CONFIG_DEBUG_INFO=y
1223CONFIG_DLM_DEBUG=y
1224# CONFIG_ENABLE_WARN_DEPRECATED is not set 1144# CONFIG_ENABLE_WARN_DEPRECATED is not set
1225CONFIG_MAGIC_SYSRQ=y
1226CONFIG_UNUSED_SYMBOLS=y 1145CONFIG_UNUSED_SYMBOLS=y
1227CONFIG_HEADERS_CHECK=y 1146CONFIG_HEADERS_CHECK=y
1147CONFIG_MAGIC_SYSRQ=y
1228CONFIG_DEBUG_KERNEL=y 1148CONFIG_DEBUG_KERNEL=y
1229CONFIG_DEBUG_SHIRQ=y
1230CONFIG_TIMER_STATS=y
1231CONFIG_DEBUG_OBJECTS=y 1149CONFIG_DEBUG_OBJECTS=y
1232CONFIG_DEBUG_OBJECTS_FREE=y 1150CONFIG_DEBUG_OBJECTS_FREE=y
1233CONFIG_DEBUG_OBJECTS_TIMERS=y 1151CONFIG_DEBUG_OBJECTS_TIMERS=y
1234CONFIG_SLUB_DEBUG_ON=y 1152CONFIG_SLUB_DEBUG_ON=y
1153CONFIG_DEBUG_STACK_USAGE=y
1154CONFIG_DEBUG_VM=y
1155CONFIG_DEBUG_HIGHMEM=y
1156CONFIG_DEBUG_STACKOVERFLOW=y
1157CONFIG_DEBUG_SHIRQ=y
1158CONFIG_TIMER_STATS=y
1235CONFIG_DEBUG_RT_MUTEXES=y 1159CONFIG_DEBUG_RT_MUTEXES=y
1236CONFIG_DEBUG_SPINLOCK=y 1160CONFIG_DEBUG_SPINLOCK=y
1237CONFIG_DEBUG_MUTEXES=y 1161CONFIG_DEBUG_MUTEXES=y
1238CONFIG_DEBUG_SPINLOCK_SLEEP=y
1239CONFIG_DEBUG_HIGHMEM=y
1240CONFIG_DEBUG_INFO=y
1241CONFIG_DEBUG_VM=y
1242CONFIG_DEBUG_LIST=y 1162CONFIG_DEBUG_LIST=y
1243CONFIG_DEBUG_SG=y 1163CONFIG_DEBUG_SG=y
1244# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1245CONFIG_FAULT_INJECTION=y 1164CONFIG_FAULT_INJECTION=y
1246CONFIG_FAILSLAB=y 1165CONFIG_FAILSLAB=y
1247CONFIG_FAIL_PAGE_ALLOC=y 1166CONFIG_FAIL_PAGE_ALLOC=y
@@ -1250,17 +1169,12 @@ CONFIG_FAIL_IO_TIMEOUT=y
1250CONFIG_FAULT_INJECTION_DEBUG_FS=y 1169CONFIG_FAULT_INJECTION_DEBUG_FS=y
1251CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y 1170CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
1252CONFIG_LATENCYTOP=y 1171CONFIG_LATENCYTOP=y
1253CONFIG_SYSCTL_SYSCALL_CHECK=y
1254CONFIG_SCHED_TRACER=y 1172CONFIG_SCHED_TRACER=y
1255CONFIG_STACK_TRACER=y 1173CONFIG_STACK_TRACER=y
1256CONFIG_BLK_DEV_IO_TRACE=y 1174CONFIG_BLK_DEV_IO_TRACE=y
1257CONFIG_DEBUG_STACKOVERFLOW=y
1258CONFIG_DEBUG_STACK_USAGE=y
1259CONFIG_XMON=y 1175CONFIG_XMON=y
1260CONFIG_BOOTX_TEXT=y 1176CONFIG_BOOTX_TEXT=y
1261CONFIG_PPC_EARLY_DEBUG=y 1177CONFIG_PPC_EARLY_DEBUG=y
1262CONFIG_PPC_EARLY_DEBUG_BOOTX=y
1263CONFIG_KEYS=y
1264CONFIG_KEYS_DEBUG_PROC_KEYS=y 1178CONFIG_KEYS_DEBUG_PROC_KEYS=y
1265CONFIG_SECURITY=y 1179CONFIG_SECURITY=y
1266CONFIG_SECURITY_NETWORK=y 1180CONFIG_SECURITY_NETWORK=y
@@ -1268,9 +1182,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y
1268CONFIG_SECURITY_SELINUX=y 1182CONFIG_SECURITY_SELINUX=y
1269CONFIG_SECURITY_SELINUX_BOOTPARAM=y 1183CONFIG_SECURITY_SELINUX_BOOTPARAM=y
1270CONFIG_SECURITY_SELINUX_DISABLE=y 1184CONFIG_SECURITY_SELINUX_DISABLE=y
1271CONFIG_CRYPTO_NULL=m
1272CONFIG_CRYPTO_TEST=m 1185CONFIG_CRYPTO_TEST=m
1273CONFIG_CRYPTO_CCM=m
1274CONFIG_CRYPTO_GCM=m 1186CONFIG_CRYPTO_GCM=m
1275CONFIG_CRYPTO_CTS=m 1187CONFIG_CRYPTO_CTS=m
1276CONFIG_CRYPTO_LRW=m 1188CONFIG_CRYPTO_LRW=m
@@ -1278,14 +1190,12 @@ CONFIG_CRYPTO_PCBC=m
1278CONFIG_CRYPTO_XTS=m 1190CONFIG_CRYPTO_XTS=m
1279CONFIG_CRYPTO_HMAC=y 1191CONFIG_CRYPTO_HMAC=y
1280CONFIG_CRYPTO_XCBC=m 1192CONFIG_CRYPTO_XCBC=m
1281CONFIG_CRYPTO_MD4=m
1282CONFIG_CRYPTO_MICHAEL_MIC=m 1193CONFIG_CRYPTO_MICHAEL_MIC=m
1283CONFIG_CRYPTO_RMD128=m 1194CONFIG_CRYPTO_RMD128=m
1284CONFIG_CRYPTO_RMD160=m 1195CONFIG_CRYPTO_RMD160=m
1285CONFIG_CRYPTO_RMD256=m 1196CONFIG_CRYPTO_RMD256=m
1286CONFIG_CRYPTO_RMD320=m 1197CONFIG_CRYPTO_RMD320=m
1287CONFIG_CRYPTO_SHA1=y 1198CONFIG_CRYPTO_SHA1=y
1288CONFIG_CRYPTO_SHA256=m
1289CONFIG_CRYPTO_SHA512=m 1199CONFIG_CRYPTO_SHA512=m
1290CONFIG_CRYPTO_TGR192=m 1200CONFIG_CRYPTO_TGR192=m
1291CONFIG_CRYPTO_WP512=m 1201CONFIG_CRYPTO_WP512=m
@@ -1306,5 +1216,3 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m
1306CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y 1216CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
1307CONFIG_CRYPTO_DEV_TALITOS=m 1217CONFIG_CRYPTO_DEV_TALITOS=m
1308CONFIG_VIRTUALIZATION=y 1218CONFIG_VIRTUALIZATION=y
1309CONFIG_VIRTIO_PCI=m
1310CONFIG_VIRTIO_BALLOON=m
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig
index baad8db21b61..3e336ee8bb4a 100644
--- a/arch/powerpc/configs/pq2fads_defconfig
+++ b/arch/powerpc/configs/pq2fads_defconfig
@@ -1,20 +1,19 @@
1CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
2CONFIG_IKCONFIG=y 4CONFIG_IKCONFIG=y
3CONFIG_IKCONFIG_PROC=y 5CONFIG_IKCONFIG_PROC=y
4CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
6CONFIG_EXPERT=y 8CONFIG_EXPERT=y
7CONFIG_KALLSYMS_ALL=y 9CONFIG_KALLSYMS_ALL=y
10CONFIG_PARTITION_ADVANCED=y
8# CONFIG_PPC_CHRP is not set 11# CONFIG_PPC_CHRP is not set
9# CONFIG_PPC_PMAC is not set 12# CONFIG_PPC_PMAC is not set
10CONFIG_PPC_82xx=y 13CONFIG_PPC_82xx=y
11CONFIG_PQ2FADS=y 14CONFIG_PQ2FADS=y
12CONFIG_NO_HZ=y
13CONFIG_HIGH_RES_TIMERS=y
14CONFIG_BINFMT_MISC=y 15CONFIG_BINFMT_MISC=y
15CONFIG_SPARSE_IRQ=y
16CONFIG_PCI=y 16CONFIG_PCI=y
17# CONFIG_8260_PCI9 is not set
18CONFIG_NET=y 17CONFIG_NET=y
19CONFIG_PACKET=y 18CONFIG_PACKET=y
20CONFIG_UNIX=y 19CONFIG_UNIX=y
@@ -29,7 +28,6 @@ CONFIG_NETFILTER=y
29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30# CONFIG_FW_LOADER is not set 29# CONFIG_FW_LOADER is not set
31CONFIG_MTD=y 30CONFIG_MTD=y
32CONFIG_MTD_CHAR=y
33CONFIG_MTD_BLOCK=y 31CONFIG_MTD_BLOCK=y
34CONFIG_MTD_JEDECPROBE=y 32CONFIG_MTD_JEDECPROBE=y
35CONFIG_MTD_CFI_ADV_OPTIONS=y 33CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -41,55 +39,43 @@ CONFIG_MTD_CFI_GEOMETRY=y
41CONFIG_MTD_CFI_I4=y 39CONFIG_MTD_CFI_I4=y
42CONFIG_MTD_CFI_INTELEXT=y 40CONFIG_MTD_CFI_INTELEXT=y
43CONFIG_MTD_PHYSMAP_OF=y 41CONFIG_MTD_PHYSMAP_OF=y
44CONFIG_PROC_DEVICETREE=y
45CONFIG_BLK_DEV_LOOP=y 42CONFIG_BLK_DEV_LOOP=y
46CONFIG_IDE=y 43CONFIG_IDE=y
47CONFIG_NETDEVICES=y 44CONFIG_NETDEVICES=y
48CONFIG_TUN=y 45CONFIG_TUN=y
49CONFIG_DAVICOM_PHY=y
50CONFIG_NET_ETHERNET=y
51CONFIG_FS_ENET=y 46CONFIG_FS_ENET=y
52# CONFIG_FS_ENET_HAS_SCC is not set 47# CONFIG_FS_ENET_HAS_SCC is not set
53CONFIG_FS_ENET_MDIO_FCC=y 48CONFIG_FS_ENET_MDIO_FCC=y
49CONFIG_DAVICOM_PHY=y
54CONFIG_PPP=y 50CONFIG_PPP=y
51CONFIG_PPP_DEFLATE=y
55CONFIG_PPP_ASYNC=y 52CONFIG_PPP_ASYNC=y
56CONFIG_PPP_SYNC_TTY=y 53CONFIG_PPP_SYNC_TTY=y
57CONFIG_PPP_DEFLATE=y
58CONFIG_INPUT_EVDEV=y 54CONFIG_INPUT_EVDEV=y
59# CONFIG_SERIO_I8042 is not set
60# CONFIG_VT is not set 55# CONFIG_VT is not set
61CONFIG_SERIAL_CPM=y 56CONFIG_SERIAL_CPM=y
62CONFIG_SERIAL_CPM_CONSOLE=y 57CONFIG_SERIAL_CPM_CONSOLE=y
63# CONFIG_HWMON is not set 58# CONFIG_HWMON is not set
64CONFIG_VIDEO_OUTPUT_CONTROL=y
65# CONFIG_HID_SUPPORT is not set
66CONFIG_USB_GADGET=y 59CONFIG_USB_GADGET=y
67CONFIG_USB_GADGET_M66592=y 60CONFIG_USB_ETH=y
68CONFIG_EXT2_FS=y 61CONFIG_EXT2_FS=y
69CONFIG_EXT3_FS=y 62CONFIG_EXT3_FS=y
70# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 63# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
71CONFIG_INOTIFY=y
72CONFIG_AUTOFS4_FS=y 64CONFIG_AUTOFS4_FS=y
73CONFIG_PROC_KCORE=y 65CONFIG_PROC_KCORE=y
74CONFIG_TMPFS=y 66CONFIG_TMPFS=y
75CONFIG_CRAMFS=y 67CONFIG_CRAMFS=y
76CONFIG_NFS_FS=y 68CONFIG_NFS_FS=y
77CONFIG_NFS_V3=y
78CONFIG_NFS_V3_ACL=y 69CONFIG_NFS_V3_ACL=y
79CONFIG_ROOT_NFS=y 70CONFIG_ROOT_NFS=y
80CONFIG_PARTITION_ADVANCED=y
81CONFIG_NLS=y
82CONFIG_NLS_CODEPAGE_437=y 71CONFIG_NLS_CODEPAGE_437=y
83CONFIG_NLS_ASCII=y 72CONFIG_NLS_ASCII=y
84CONFIG_NLS_ISO8859_1=y 73CONFIG_NLS_ISO8859_1=y
85CONFIG_NLS_UTF8=y 74CONFIG_NLS_UTF8=y
75CONFIG_DEBUG_INFO=y
86CONFIG_MAGIC_SYSRQ=y 76CONFIG_MAGIC_SYSRQ=y
87CONFIG_DEBUG_KERNEL=y
88CONFIG_DETECT_HUNG_TASK=y 77CONFIG_DETECT_HUNG_TASK=y
89# CONFIG_SCHED_DEBUG is not set 78# CONFIG_SCHED_DEBUG is not set
90CONFIG_DEBUG_INFO=y
91# CONFIG_RCU_CPU_STALL_DETECTOR is not set
92CONFIG_SYSCTL_SYSCALL_CHECK=y
93CONFIG_BDI_SWITCH=y 79CONFIG_BDI_SWITCH=y
94CONFIG_CRYPTO_CBC=y 80CONFIG_CRYPTO_CBC=y
95CONFIG_CRYPTO_ECB=y 81CONFIG_CRYPTO_ECB=y
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index 879de5efb073..adc14e813a49 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -8,7 +8,6 @@ CONFIG_POSIX_MQUEUE=y
8CONFIG_FHANDLE=y 8CONFIG_FHANDLE=y
9CONFIG_HIGH_RES_TIMERS=y 9CONFIG_HIGH_RES_TIMERS=y
10CONFIG_BLK_DEV_INITRD=y 10CONFIG_BLK_DEV_INITRD=y
11CONFIG_RD_LZMA=y
12CONFIG_CC_OPTIMIZE_FOR_SIZE=y 11CONFIG_CC_OPTIMIZE_FOR_SIZE=y
13CONFIG_EMBEDDED=y 12CONFIG_EMBEDDED=y
14# CONFIG_PERF_EVENTS is not set 13# CONFIG_PERF_EVENTS is not set
@@ -22,6 +21,8 @@ CONFIG_MODULE_UNLOAD=y
22# CONFIG_PPC_PSERIES is not set 21# CONFIG_PPC_PSERIES is not set
23# CONFIG_PPC_PMAC is not set 22# CONFIG_PPC_PMAC is not set
24CONFIG_PPC_PS3=y 23CONFIG_PPC_PS3=y
24CONFIG_PS3_ADVANCED=y
25CONFIG_PS3_REPOSITORY_WRITE=y
25CONFIG_PS3_DISK=y 26CONFIG_PS3_DISK=y
26CONFIG_PS3_ROM=y 27CONFIG_PS3_ROM=y
27CONFIG_PS3_FLASH=y 28CONFIG_PS3_FLASH=y
@@ -64,11 +65,9 @@ CONFIG_BT_HCIBTUSB=m
64CONFIG_CFG80211=m 65CONFIG_CFG80211=m
65CONFIG_CFG80211_WEXT=y 66CONFIG_CFG80211_WEXT=y
66CONFIG_MAC80211=m 67CONFIG_MAC80211=m
67CONFIG_MAC80211_RC_PID=y
68# CONFIG_MAC80211_RC_MINSTREL is not set 68# CONFIG_MAC80211_RC_MINSTREL is not set
69CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 69CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
70# CONFIG_FIRMWARE_IN_KERNEL is not set 70# CONFIG_FIRMWARE_IN_KERNEL is not set
71CONFIG_PROC_DEVICETREE=y
72CONFIG_BLK_DEV_LOOP=y 71CONFIG_BLK_DEV_LOOP=y
73CONFIG_BLK_DEV_RAM=y 72CONFIG_BLK_DEV_RAM=y
74CONFIG_BLK_DEV_RAM_SIZE=65535 73CONFIG_BLK_DEV_RAM_SIZE=65535
@@ -76,7 +75,6 @@ CONFIG_SCSI=y
76CONFIG_BLK_DEV_SD=y 75CONFIG_BLK_DEV_SD=y
77CONFIG_BLK_DEV_SR=y 76CONFIG_BLK_DEV_SR=y
78CONFIG_CHR_DEV_SG=m 77CONFIG_CHR_DEV_SG=m
79CONFIG_SCSI_MULTI_LUN=y
80# CONFIG_SCSI_LOWLEVEL is not set 78# CONFIG_SCSI_LOWLEVEL is not set
81CONFIG_MD=y 79CONFIG_MD=y
82CONFIG_BLK_DEV_DM=m 80CONFIG_BLK_DEV_DM=m
@@ -107,7 +105,6 @@ CONFIG_INPUT_EVDEV=m
107# CONFIG_LEGACY_PTYS is not set 105# CONFIG_LEGACY_PTYS is not set
108# CONFIG_HW_RANDOM is not set 106# CONFIG_HW_RANDOM is not set
109# CONFIG_HWMON is not set 107# CONFIG_HWMON is not set
110CONFIG_VIDEO_OUTPUT_CONTROL=m
111CONFIG_FB=y 108CONFIG_FB=y
112CONFIG_FB_PS3=y 109CONFIG_FB_PS3=y
113# CONFIG_VGA_CONSOLE is not set 110# CONFIG_VGA_CONSOLE is not set
@@ -130,8 +127,6 @@ CONFIG_HID_TWINHAN=m
130CONFIG_HID_LOGITECH=m 127CONFIG_HID_LOGITECH=m
131CONFIG_HID_LOGITECH_DJ=m 128CONFIG_HID_LOGITECH_DJ=m
132CONFIG_HID_MICROSOFT=m 129CONFIG_HID_MICROSOFT=m
133CONFIG_HID_PS3REMOTE=m
134CONFIG_HID_SONY=m
135CONFIG_HID_SUNPLUS=m 130CONFIG_HID_SUNPLUS=m
136CONFIG_HID_SMARTJOYPLUS=m 131CONFIG_HID_SMARTJOYPLUS=m
137CONFIG_USB_HIDDEV=y 132CONFIG_USB_HIDDEV=y
@@ -169,18 +164,17 @@ CONFIG_NLS_CODEPAGE_437=y
169CONFIG_NLS_ISO8859_1=y 164CONFIG_NLS_ISO8859_1=y
170CONFIG_CRC_CCITT=m 165CONFIG_CRC_CCITT=m
171CONFIG_CRC_T10DIF=y 166CONFIG_CRC_T10DIF=y
172CONFIG_MAGIC_SYSRQ=y 167CONFIG_DEBUG_INFO=y
173CONFIG_DEBUG_FS=y 168CONFIG_DEBUG_FS=y
169CONFIG_MAGIC_SYSRQ=y
170CONFIG_DEBUG_MEMORY_INIT=y
171CONFIG_DEBUG_STACKOVERFLOW=y
174CONFIG_DETECT_HUNG_TASK=y 172CONFIG_DETECT_HUNG_TASK=y
175CONFIG_PROVE_LOCKING=y 173CONFIG_PROVE_LOCKING=y
176CONFIG_DEBUG_LOCKDEP=y 174CONFIG_DEBUG_LOCKDEP=y
177CONFIG_DEBUG_INFO=y
178CONFIG_DEBUG_MEMORY_INIT=y
179CONFIG_DEBUG_LIST=y 175CONFIG_DEBUG_LIST=y
180CONFIG_RCU_CPU_STALL_TIMEOUT=60 176CONFIG_RCU_CPU_STALL_TIMEOUT=60
181# CONFIG_FTRACE is not set 177# CONFIG_FTRACE is not set
182CONFIG_DEBUG_STACKOVERFLOW=y
183CONFIG_CRYPTO_CCM=m
184CONFIG_CRYPTO_GCM=m 178CONFIG_CRYPTO_GCM=m
185CONFIG_CRYPTO_PCBC=m 179CONFIG_CRYPTO_PCBC=m
186CONFIG_CRYPTO_MICHAEL_MIC=m 180CONFIG_CRYPTO_MICHAEL_MIC=m
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 1f97364017c7..c2e39f66b182 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -1,6 +1,4 @@
1CONFIG_PPC64=y 1CONFIG_PPC64=y
2CONFIG_ALTIVEC=y
3CONFIG_VSX=y
4CONFIG_SMP=y 2CONFIG_SMP=y
5CONFIG_NR_CPUS=2048 3CONFIG_NR_CPUS=2048
6CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
@@ -17,11 +15,18 @@ CONFIG_TASK_XACCT=y
17CONFIG_TASK_IO_ACCOUNTING=y 15CONFIG_TASK_IO_ACCOUNTING=y
18CONFIG_IKCONFIG=y 16CONFIG_IKCONFIG=y
19CONFIG_IKCONFIG_PROC=y 17CONFIG_IKCONFIG_PROC=y
18CONFIG_NUMA_BALANCING=y
19CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
20CONFIG_CGROUPS=y 20CONFIG_CGROUPS=y
21CONFIG_CGROUP_FREEZER=y 21CONFIG_CGROUP_FREEZER=y
22CONFIG_CGROUP_DEVICE=y 22CONFIG_CGROUP_DEVICE=y
23CONFIG_CPUSETS=y 23CONFIG_CPUSETS=y
24CONFIG_CGROUP_CPUACCT=y 24CONFIG_CGROUP_CPUACCT=y
25CONFIG_MEMCG=y
26CONFIG_MEMCG_SWAP=y
27CONFIG_CGROUP_PERF=y
28CONFIG_CGROUP_SCHED=y
29CONFIG_USER_NS=y
25CONFIG_BLK_DEV_INITRD=y 30CONFIG_BLK_DEV_INITRD=y
26# CONFIG_COMPAT_BRK is not set 31# CONFIG_COMPAT_BRK is not set
27CONFIG_PROFILING=y 32CONFIG_PROFILING=y
@@ -40,6 +45,7 @@ CONFIG_DTL=y
40# CONFIG_PPC_PMAC is not set 45# CONFIG_PPC_PMAC is not set
41CONFIG_RTAS_FLASH=m 46CONFIG_RTAS_FLASH=m
42CONFIG_IBMEBUS=y 47CONFIG_IBMEBUS=y
48CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
43CONFIG_HZ_100=y 49CONFIG_HZ_100=y
44CONFIG_BINFMT_MISC=m 50CONFIG_BINFMT_MISC=m
45CONFIG_PPC_TRANSACTIONAL_MEM=y 51CONFIG_PPC_TRANSACTIONAL_MEM=y
@@ -47,6 +53,8 @@ CONFIG_KEXEC=y
47CONFIG_IRQ_ALL_CPUS=y 53CONFIG_IRQ_ALL_CPUS=y
48CONFIG_MEMORY_HOTPLUG=y 54CONFIG_MEMORY_HOTPLUG=y
49CONFIG_MEMORY_HOTREMOVE=y 55CONFIG_MEMORY_HOTREMOVE=y
56CONFIG_KSM=y
57CONFIG_TRANSPARENT_HUGEPAGE=y
50CONFIG_PPC_64K_PAGES=y 58CONFIG_PPC_64K_PAGES=y
51CONFIG_PPC_SUBPAGE_PROT=y 59CONFIG_PPC_SUBPAGE_PROT=y
52CONFIG_SCHED_SMT=y 60CONFIG_SCHED_SMT=y
@@ -69,10 +77,10 @@ CONFIG_INET_IPCOMP=m
69CONFIG_NETFILTER=y 77CONFIG_NETFILTER=y
70# CONFIG_NETFILTER_ADVANCED is not set 78# CONFIG_NETFILTER_ADVANCED is not set
71CONFIG_BRIDGE=m 79CONFIG_BRIDGE=m
80CONFIG_VLAN_8021Q=m
72CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 81CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
73CONFIG_DEVTMPFS=y 82CONFIG_DEVTMPFS=y
74CONFIG_DEVTMPFS_MOUNT=y 83CONFIG_DEVTMPFS_MOUNT=y
75CONFIG_PROC_DEVICETREE=y
76CONFIG_PARPORT=m 84CONFIG_PARPORT=m
77CONFIG_PARPORT_PC=m 85CONFIG_PARPORT_PC=m
78CONFIG_BLK_DEV_FD=m 86CONFIG_BLK_DEV_FD=m
@@ -90,7 +98,6 @@ CONFIG_CHR_DEV_ST=y
90CONFIG_BLK_DEV_SR=y 98CONFIG_BLK_DEV_SR=y
91CONFIG_BLK_DEV_SR_VENDOR=y 99CONFIG_BLK_DEV_SR_VENDOR=y
92CONFIG_CHR_DEV_SG=y 100CONFIG_CHR_DEV_SG=y
93CONFIG_SCSI_MULTI_LUN=y
94CONFIG_SCSI_CONSTANTS=y 101CONFIG_SCSI_CONSTANTS=y
95CONFIG_SCSI_FC_ATTRS=y 102CONFIG_SCSI_FC_ATTRS=y
96CONFIG_SCSI_CXGB3_ISCSI=m 103CONFIG_SCSI_CXGB3_ISCSI=m
@@ -111,6 +118,7 @@ CONFIG_SCSI_DH=m
111CONFIG_SCSI_DH_RDAC=m 118CONFIG_SCSI_DH_RDAC=m
112CONFIG_SCSI_DH_ALUA=m 119CONFIG_SCSI_DH_ALUA=m
113CONFIG_ATA=y 120CONFIG_ATA=y
121CONFIG_SATA_AHCI=y
114# CONFIG_ATA_SFF is not set 122# CONFIG_ATA_SFF is not set
115CONFIG_MD=y 123CONFIG_MD=y
116CONFIG_BLK_DEV_MD=y 124CONFIG_BLK_DEV_MD=y
@@ -124,6 +132,7 @@ CONFIG_MD_FAULTY=m
124CONFIG_BLK_DEV_DM=y 132CONFIG_BLK_DEV_DM=y
125CONFIG_DM_CRYPT=m 133CONFIG_DM_CRYPT=m
126CONFIG_DM_SNAPSHOT=m 134CONFIG_DM_SNAPSHOT=m
135CONFIG_DM_THIN_PROVISIONING=m
127CONFIG_DM_MIRROR=m 136CONFIG_DM_MIRROR=m
128CONFIG_DM_ZERO=m 137CONFIG_DM_ZERO=m
129CONFIG_DM_MULTIPATH=m 138CONFIG_DM_MULTIPATH=m
@@ -132,8 +141,12 @@ CONFIG_DM_MULTIPATH_ST=m
132CONFIG_DM_UEVENT=y 141CONFIG_DM_UEVENT=y
133CONFIG_BONDING=m 142CONFIG_BONDING=m
134CONFIG_DUMMY=m 143CONFIG_DUMMY=m
144CONFIG_MACVLAN=m
145CONFIG_MACVTAP=m
146CONFIG_VXLAN=m
135CONFIG_NETCONSOLE=y 147CONFIG_NETCONSOLE=y
136CONFIG_TUN=m 148CONFIG_TUN=m
149CONFIG_VETH=m
137CONFIG_VIRTIO_NET=m 150CONFIG_VIRTIO_NET=m
138CONFIG_VHOST_NET=m 151CONFIG_VHOST_NET=m
139CONFIG_VORTEX=y 152CONFIG_VORTEX=y
@@ -166,6 +179,7 @@ CONFIG_INPUT_EVDEV=m
166CONFIG_INPUT_MISC=y 179CONFIG_INPUT_MISC=y
167CONFIG_INPUT_PCSPKR=m 180CONFIG_INPUT_PCSPKR=m
168# CONFIG_SERIO_SERPORT is not set 181# CONFIG_SERIO_SERPORT is not set
182CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
169CONFIG_SERIAL_8250=y 183CONFIG_SERIAL_8250=y
170CONFIG_SERIAL_8250_CONSOLE=y 184CONFIG_SERIAL_8250_CONSOLE=y
171CONFIG_SERIAL_ICOM=m 185CONFIG_SERIAL_ICOM=m
@@ -242,6 +256,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
242CONFIG_NILFS2_FS=m 256CONFIG_NILFS2_FS=m
243CONFIG_AUTOFS4_FS=m 257CONFIG_AUTOFS4_FS=m
244CONFIG_FUSE_FS=m 258CONFIG_FUSE_FS=m
259CONFIG_OVERLAY_FS=m
245CONFIG_ISO9660_FS=y 260CONFIG_ISO9660_FS=y
246CONFIG_UDF_FS=m 261CONFIG_UDF_FS=m
247CONFIG_MSDOS_FS=y 262CONFIG_MSDOS_FS=y
@@ -270,7 +285,6 @@ CONFIG_NLS_CODEPAGE_437=y
270CONFIG_NLS_ASCII=y 285CONFIG_NLS_ASCII=y
271CONFIG_NLS_ISO8859_1=y 286CONFIG_NLS_ISO8859_1=y
272CONFIG_NLS_UTF8=y 287CONFIG_NLS_UTF8=y
273CONFIG_CRC_T10DIF=y
274CONFIG_MAGIC_SYSRQ=y 288CONFIG_MAGIC_SYSRQ=y
275CONFIG_DEBUG_KERNEL=y 289CONFIG_DEBUG_KERNEL=y
276CONFIG_DEBUG_STACK_USAGE=y 290CONFIG_DEBUG_STACK_USAGE=y
@@ -304,7 +318,4 @@ CONFIG_CRYPTO_DEV_NX=y
304CONFIG_CRYPTO_DEV_NX_ENCRYPT=m 318CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
305CONFIG_VIRTUALIZATION=y 319CONFIG_VIRTUALIZATION=y
306CONFIG_KVM_BOOK3S_64=m 320CONFIG_KVM_BOOK3S_64=m
307CONFIG_KVM_BOOK3S_64_HV=y 321CONFIG_KVM_BOOK3S_64_HV=m
308CONFIG_TRANSPARENT_HUGEPAGE=y
309CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
310CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
diff --git a/arch/powerpc/configs/pseries_le_defconfig b/arch/powerpc/configs/pseries_le_defconfig
index ac7ca5852827..09bc96e792cd 100644
--- a/arch/powerpc/configs/pseries_le_defconfig
+++ b/arch/powerpc/configs/pseries_le_defconfig
@@ -1,6 +1,4 @@
1CONFIG_PPC64=y 1CONFIG_PPC64=y
2CONFIG_ALTIVEC=y
3CONFIG_VSX=y
4CONFIG_SMP=y 2CONFIG_SMP=y
5CONFIG_NR_CPUS=2048 3CONFIG_NR_CPUS=2048
6CONFIG_CPU_LITTLE_ENDIAN=y 4CONFIG_CPU_LITTLE_ENDIAN=y
@@ -18,11 +16,18 @@ CONFIG_TASK_XACCT=y
18CONFIG_TASK_IO_ACCOUNTING=y 16CONFIG_TASK_IO_ACCOUNTING=y
19CONFIG_IKCONFIG=y 17CONFIG_IKCONFIG=y
20CONFIG_IKCONFIG_PROC=y 18CONFIG_IKCONFIG_PROC=y
19CONFIG_NUMA_BALANCING=y
20CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
21CONFIG_CGROUPS=y 21CONFIG_CGROUPS=y
22CONFIG_CGROUP_FREEZER=y 22CONFIG_CGROUP_FREEZER=y
23CONFIG_CGROUP_DEVICE=y 23CONFIG_CGROUP_DEVICE=y
24CONFIG_CPUSETS=y 24CONFIG_CPUSETS=y
25CONFIG_CGROUP_CPUACCT=y 25CONFIG_CGROUP_CPUACCT=y
26CONFIG_MEMCG=y
27CONFIG_MEMCG_SWAP=y
28CONFIG_CGROUP_PERF=y
29CONFIG_CGROUP_SCHED=y
30CONFIG_USER_NS=y
26CONFIG_BLK_DEV_INITRD=y 31CONFIG_BLK_DEV_INITRD=y
27# CONFIG_COMPAT_BRK is not set 32# CONFIG_COMPAT_BRK is not set
28CONFIG_PROFILING=y 33CONFIG_PROFILING=y
@@ -41,6 +46,7 @@ CONFIG_DTL=y
41# CONFIG_PPC_PMAC is not set 46# CONFIG_PPC_PMAC is not set
42CONFIG_RTAS_FLASH=m 47CONFIG_RTAS_FLASH=m
43CONFIG_IBMEBUS=y 48CONFIG_IBMEBUS=y
49CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
44CONFIG_HZ_100=y 50CONFIG_HZ_100=y
45CONFIG_BINFMT_MISC=m 51CONFIG_BINFMT_MISC=m
46CONFIG_PPC_TRANSACTIONAL_MEM=y 52CONFIG_PPC_TRANSACTIONAL_MEM=y
@@ -48,6 +54,8 @@ CONFIG_KEXEC=y
48CONFIG_IRQ_ALL_CPUS=y 54CONFIG_IRQ_ALL_CPUS=y
49CONFIG_MEMORY_HOTPLUG=y 55CONFIG_MEMORY_HOTPLUG=y
50CONFIG_MEMORY_HOTREMOVE=y 56CONFIG_MEMORY_HOTREMOVE=y
57CONFIG_KSM=y
58CONFIG_TRANSPARENT_HUGEPAGE=y
51CONFIG_PPC_64K_PAGES=y 59CONFIG_PPC_64K_PAGES=y
52CONFIG_PPC_SUBPAGE_PROT=y 60CONFIG_PPC_SUBPAGE_PROT=y
53CONFIG_SCHED_SMT=y 61CONFIG_SCHED_SMT=y
@@ -70,10 +78,10 @@ CONFIG_INET_IPCOMP=m
70CONFIG_NETFILTER=y 78CONFIG_NETFILTER=y
71# CONFIG_NETFILTER_ADVANCED is not set 79# CONFIG_NETFILTER_ADVANCED is not set
72CONFIG_BRIDGE=m 80CONFIG_BRIDGE=m
81CONFIG_VLAN_8021Q=m
73CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 82CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
74CONFIG_DEVTMPFS=y 83CONFIG_DEVTMPFS=y
75CONFIG_DEVTMPFS_MOUNT=y 84CONFIG_DEVTMPFS_MOUNT=y
76CONFIG_PROC_DEVICETREE=y
77CONFIG_PARPORT=m 85CONFIG_PARPORT=m
78CONFIG_PARPORT_PC=m 86CONFIG_PARPORT_PC=m
79CONFIG_BLK_DEV_FD=m 87CONFIG_BLK_DEV_FD=m
@@ -91,7 +99,6 @@ CONFIG_CHR_DEV_ST=y
91CONFIG_BLK_DEV_SR=y 99CONFIG_BLK_DEV_SR=y
92CONFIG_BLK_DEV_SR_VENDOR=y 100CONFIG_BLK_DEV_SR_VENDOR=y
93CONFIG_CHR_DEV_SG=y 101CONFIG_CHR_DEV_SG=y
94CONFIG_SCSI_MULTI_LUN=y
95CONFIG_SCSI_CONSTANTS=y 102CONFIG_SCSI_CONSTANTS=y
96CONFIG_SCSI_FC_ATTRS=y 103CONFIG_SCSI_FC_ATTRS=y
97CONFIG_SCSI_CXGB3_ISCSI=m 104CONFIG_SCSI_CXGB3_ISCSI=m
@@ -112,6 +119,7 @@ CONFIG_SCSI_DH=m
112CONFIG_SCSI_DH_RDAC=m 119CONFIG_SCSI_DH_RDAC=m
113CONFIG_SCSI_DH_ALUA=m 120CONFIG_SCSI_DH_ALUA=m
114CONFIG_ATA=y 121CONFIG_ATA=y
122CONFIG_SATA_AHCI=y
115# CONFIG_ATA_SFF is not set 123# CONFIG_ATA_SFF is not set
116CONFIG_MD=y 124CONFIG_MD=y
117CONFIG_BLK_DEV_MD=y 125CONFIG_BLK_DEV_MD=y
@@ -125,6 +133,7 @@ CONFIG_MD_FAULTY=m
125CONFIG_BLK_DEV_DM=y 133CONFIG_BLK_DEV_DM=y
126CONFIG_DM_CRYPT=m 134CONFIG_DM_CRYPT=m
127CONFIG_DM_SNAPSHOT=m 135CONFIG_DM_SNAPSHOT=m
136CONFIG_DM_THIN_PROVISIONING=m
128CONFIG_DM_MIRROR=m 137CONFIG_DM_MIRROR=m
129CONFIG_DM_ZERO=m 138CONFIG_DM_ZERO=m
130CONFIG_DM_MULTIPATH=m 139CONFIG_DM_MULTIPATH=m
@@ -133,8 +142,12 @@ CONFIG_DM_MULTIPATH_ST=m
133CONFIG_DM_UEVENT=y 142CONFIG_DM_UEVENT=y
134CONFIG_BONDING=m 143CONFIG_BONDING=m
135CONFIG_DUMMY=m 144CONFIG_DUMMY=m
145CONFIG_MACVLAN=m
146CONFIG_MACVTAP=m
147CONFIG_VXLAN=m
136CONFIG_NETCONSOLE=y 148CONFIG_NETCONSOLE=y
137CONFIG_TUN=m 149CONFIG_TUN=m
150CONFIG_VETH=m
138CONFIG_VIRTIO_NET=m 151CONFIG_VIRTIO_NET=m
139CONFIG_VHOST_NET=m 152CONFIG_VHOST_NET=m
140CONFIG_VORTEX=y 153CONFIG_VORTEX=y
@@ -167,6 +180,7 @@ CONFIG_INPUT_EVDEV=m
167CONFIG_INPUT_MISC=y 180CONFIG_INPUT_MISC=y
168CONFIG_INPUT_PCSPKR=m 181CONFIG_INPUT_PCSPKR=m
169# CONFIG_SERIO_SERPORT is not set 182# CONFIG_SERIO_SERPORT is not set
183CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
170CONFIG_SERIAL_8250=y 184CONFIG_SERIAL_8250=y
171CONFIG_SERIAL_8250_CONSOLE=y 185CONFIG_SERIAL_8250_CONSOLE=y
172CONFIG_SERIAL_ICOM=m 186CONFIG_SERIAL_ICOM=m
@@ -243,6 +257,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
243CONFIG_NILFS2_FS=m 257CONFIG_NILFS2_FS=m
244CONFIG_AUTOFS4_FS=m 258CONFIG_AUTOFS4_FS=m
245CONFIG_FUSE_FS=m 259CONFIG_FUSE_FS=m
260CONFIG_OVERLAY_FS=m
246CONFIG_ISO9660_FS=y 261CONFIG_ISO9660_FS=y
247CONFIG_UDF_FS=m 262CONFIG_UDF_FS=m
248CONFIG_MSDOS_FS=y 263CONFIG_MSDOS_FS=y
@@ -271,7 +286,6 @@ CONFIG_NLS_CODEPAGE_437=y
271CONFIG_NLS_ASCII=y 286CONFIG_NLS_ASCII=y
272CONFIG_NLS_ISO8859_1=y 287CONFIG_NLS_ISO8859_1=y
273CONFIG_NLS_UTF8=y 288CONFIG_NLS_UTF8=y
274CONFIG_CRC_T10DIF=y
275CONFIG_MAGIC_SYSRQ=y 289CONFIG_MAGIC_SYSRQ=y
276CONFIG_DEBUG_KERNEL=y 290CONFIG_DEBUG_KERNEL=y
277CONFIG_DEBUG_STACK_USAGE=y 291CONFIG_DEBUG_STACK_USAGE=y
@@ -300,11 +314,6 @@ CONFIG_CRYPTO_TEA=m
300CONFIG_CRYPTO_TWOFISH=m 314CONFIG_CRYPTO_TWOFISH=m
301CONFIG_CRYPTO_LZO=m 315CONFIG_CRYPTO_LZO=m
302# CONFIG_CRYPTO_ANSI_CPRNG is not set 316# CONFIG_CRYPTO_ANSI_CPRNG is not set
303CONFIG_CRYPTO_DEV_NX=y
304CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
305CONFIG_VIRTUALIZATION=y 317CONFIG_VIRTUALIZATION=y
306CONFIG_KVM_BOOK3S_64=m 318CONFIG_KVM_BOOK3S_64=m
307CONFIG_KVM_BOOK3S_64_HV=y 319CONFIG_KVM_BOOK3S_64_HV=m
308CONFIG_TRANSPARENT_HUGEPAGE=y
309CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
310CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig
index 60ad2c08caa6..b5db7dffe86d 100644
--- a/arch/powerpc/configs/storcenter_defconfig
+++ b/arch/powerpc/configs/storcenter_defconfig
@@ -1,4 +1,3 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_LOG_BUF_SHIFT=14 2CONFIG_LOG_BUF_SHIFT=14
4CONFIG_EXPERT=y 3CONFIG_EXPERT=y
@@ -6,13 +5,13 @@ CONFIG_EXPERT=y
6CONFIG_MODULES=y 5CONFIG_MODULES=y
7CONFIG_MODULE_UNLOAD=y 6CONFIG_MODULE_UNLOAD=y
8# CONFIG_BLK_DEV_BSG is not set 7# CONFIG_BLK_DEV_BSG is not set
8CONFIG_PARTITION_ADVANCED=y
9# CONFIG_PPC_CHRP is not set 9# CONFIG_PPC_CHRP is not set
10# CONFIG_PPC_PMAC is not set 10# CONFIG_PPC_PMAC is not set
11CONFIG_EMBEDDED6xx=y 11CONFIG_EMBEDDED6xx=y
12CONFIG_STORCENTER=y 12CONFIG_STORCENTER=y
13CONFIG_HZ_100=y 13CONFIG_HZ_100=y
14CONFIG_BINFMT_MISC=y 14CONFIG_BINFMT_MISC=y
15CONFIG_SPARSE_IRQ=y
16CONFIG_CMDLINE_BOOL=y 15CONFIG_CMDLINE_BOOL=y
17CONFIG_CMDLINE="console=ttyS0,115200" 16CONFIG_CMDLINE="console=ttyS0,115200"
18# CONFIG_SECCOMP is not set 17# CONFIG_SECCOMP is not set
@@ -29,11 +28,8 @@ CONFIG_IP_PNP_DHCP=y
29# CONFIG_INET_LRO is not set 28# CONFIG_INET_LRO is not set
30# CONFIG_IPV6 is not set 29# CONFIG_IPV6 is not set
31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32# CONFIG_FW_LOADER is not set
33CONFIG_MTD=y 31CONFIG_MTD=y
34CONFIG_MTD_CMDLINE_PARTS=y 32CONFIG_MTD_CMDLINE_PARTS=y
35CONFIG_MTD_OF_PARTS=y
36CONFIG_MTD_CHAR=y
37CONFIG_MTD_BLOCK=y 33CONFIG_MTD_BLOCK=y
38CONFIG_FTL=y 34CONFIG_FTL=y
39CONFIG_NFTL=y 35CONFIG_NFTL=y
@@ -41,7 +37,6 @@ CONFIG_NFTL_RW=y
41CONFIG_MTD_CFI=y 37CONFIG_MTD_CFI=y
42CONFIG_MTD_CFI_AMDSTD=y 38CONFIG_MTD_CFI_AMDSTD=y
43CONFIG_MTD_PHYSMAP=y 39CONFIG_MTD_PHYSMAP=y
44CONFIG_PROC_DEVICETREE=y
45CONFIG_IDE=y 40CONFIG_IDE=y
46CONFIG_BLK_DEV_VIA82CXXX=y 41CONFIG_BLK_DEV_VIA82CXXX=y
47CONFIG_SCSI=y 42CONFIG_SCSI=y
@@ -57,7 +52,6 @@ CONFIG_MD_RAID456=y
57CONFIG_NETDEVICES=y 52CONFIG_NETDEVICES=y
58CONFIG_DUMMY=m 53CONFIG_DUMMY=m
59CONFIG_R8169=y 54CONFIG_R8169=y
60# CONFIG_NETDEV_10000 is not set
61# CONFIG_INPUT is not set 55# CONFIG_INPUT is not set
62# CONFIG_SERIO is not set 56# CONFIG_SERIO is not set
63# CONFIG_VT is not set 57# CONFIG_VT is not set
@@ -81,12 +75,10 @@ CONFIG_EXT2_FS=y
81CONFIG_EXT3_FS=y 75CONFIG_EXT3_FS=y
82# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 76# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
83CONFIG_XFS_FS=m 77CONFIG_XFS_FS=m
84CONFIG_INOTIFY=y
85CONFIG_PROC_KCORE=y 78CONFIG_PROC_KCORE=y
86CONFIG_TMPFS=y 79CONFIG_TMPFS=y
87CONFIG_JFFS2_FS=y 80CONFIG_JFFS2_FS=y
88# CONFIG_NETWORK_FILESYSTEMS is not set 81# CONFIG_NETWORK_FILESYSTEMS is not set
89CONFIG_PARTITION_ADVANCED=y
90CONFIG_NLS_DEFAULT="utf8" 82CONFIG_NLS_DEFAULT="utf8"
91CONFIG_NLS_CODEPAGE_437=y 83CONFIG_NLS_CODEPAGE_437=y
92CONFIG_NLS_ISO8859_1=y 84CONFIG_NLS_ISO8859_1=y
@@ -94,5 +86,3 @@ CONFIG_NLS_UTF8=y
94CONFIG_CRC_T10DIF=y 86CONFIG_CRC_T10DIF=y
95# CONFIG_ENABLE_WARN_DEPRECATED is not set 87# CONFIG_ENABLE_WARN_DEPRECATED is not set
96# CONFIG_ENABLE_MUST_CHECK is not set 88# CONFIG_ENABLE_MUST_CHECK is not set
97# CONFIG_RCU_CPU_STALL_DETECTOR is not set
98CONFIG_SYSCTL_SYSCALL_CHECK=y
diff --git a/arch/powerpc/configs/tqm8xx_defconfig b/arch/powerpc/configs/tqm8xx_defconfig
index 7fe277a7b422..4c973c5321c6 100644
--- a/arch/powerpc/configs/tqm8xx_defconfig
+++ b/arch/powerpc/configs/tqm8xx_defconfig
@@ -1,12 +1,10 @@
1CONFIG_PPC_8xx=y 1CONFIG_PPC_8xx=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6CONFIG_SYSFS_DEPRECATED_V2=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 7CONFIG_EXPERT=y
9# CONFIG_SYSCTL_SYSCALL is not set
10# CONFIG_ELF_CORE is not set 8# CONFIG_ELF_CORE is not set
11# CONFIG_BASE_FULL is not set 9# CONFIG_BASE_FULL is not set
12# CONFIG_FUTEX is not set 10# CONFIG_FUTEX is not set
@@ -15,15 +13,12 @@ CONFIG_MODULES=y
15CONFIG_MODULE_UNLOAD=y 13CONFIG_MODULE_UNLOAD=y
16CONFIG_MODULE_SRCVERSION_ALL=y 14CONFIG_MODULE_SRCVERSION_ALL=y
17# CONFIG_BLK_DEV_BSG is not set 15# CONFIG_BLK_DEV_BSG is not set
16CONFIG_PARTITION_ADVANCED=y
18# CONFIG_IOSCHED_CFQ is not set 17# CONFIG_IOSCHED_CFQ is not set
19CONFIG_TQM8XX=y 18CONFIG_TQM8XX=y
20CONFIG_8xx_COPYBACK=y 19CONFIG_8xx_COPYBACK=y
21# CONFIG_8xx_CPU15 is not set 20# CONFIG_8xx_CPU15 is not set
22CONFIG_NO_HZ=y
23CONFIG_HIGH_RES_TIMERS=y
24CONFIG_HZ_100=y 21CONFIG_HZ_100=y
25CONFIG_8XX_MINIMAL_FPEMU=y
26CONFIG_SPARSE_IRQ=y
27# CONFIG_SECCOMP is not set 22# CONFIG_SECCOMP is not set
28CONFIG_NET=y 23CONFIG_NET=y
29CONFIG_PACKET=y 24CONFIG_PACKET=y
@@ -40,32 +35,24 @@ CONFIG_SYN_COOKIES=y
40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 35CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
41# CONFIG_FW_LOADER is not set 36# CONFIG_FW_LOADER is not set
42CONFIG_MTD=y 37CONFIG_MTD=y
43CONFIG_MTD_CONCAT=y
44CONFIG_MTD_CMDLINE_PARTS=y 38CONFIG_MTD_CMDLINE_PARTS=y
45CONFIG_MTD_OF_PARTS=y
46CONFIG_MTD_CHAR=y
47CONFIG_MTD_BLOCK=y 39CONFIG_MTD_BLOCK=y
48CONFIG_MTD_CFI=y 40CONFIG_MTD_CFI=y
49CONFIG_MTD_CFI_INTELEXT=y 41CONFIG_MTD_CFI_INTELEXT=y
50CONFIG_MTD_CFI_AMDSTD=y 42CONFIG_MTD_CFI_AMDSTD=y
51CONFIG_MTD_PHYSMAP_OF=y 43CONFIG_MTD_PHYSMAP_OF=y
52CONFIG_PROC_DEVICETREE=y
53# CONFIG_BLK_DEV is not set 44# CONFIG_BLK_DEV is not set
54# CONFIG_MISC_DEVICES is not set
55CONFIG_NETDEVICES=y 45CONFIG_NETDEVICES=y
46CONFIG_FS_ENET=y
56CONFIG_DAVICOM_PHY=y 47CONFIG_DAVICOM_PHY=y
57CONFIG_FIXED_PHY=y 48CONFIG_FIXED_PHY=y
58CONFIG_NET_ETHERNET=y
59CONFIG_FS_ENET=y
60# CONFIG_NETDEV_1000 is not set
61# CONFIG_NETDEV_10000 is not set
62# CONFIG_WLAN is not set 49# CONFIG_WLAN is not set
63# CONFIG_INPUT is not set 50# CONFIG_INPUT is not set
64# CONFIG_SERIO is not set 51# CONFIG_SERIO is not set
65# CONFIG_VT is not set 52# CONFIG_VT is not set
53# CONFIG_LEGACY_PTYS is not set
66CONFIG_SERIAL_CPM=y 54CONFIG_SERIAL_CPM=y
67CONFIG_SERIAL_CPM_CONSOLE=y 55CONFIG_SERIAL_CPM_CONSOLE=y
68# CONFIG_LEGACY_PTYS is not set
69CONFIG_HW_RANDOM=y 56CONFIG_HW_RANDOM=y
70CONFIG_GEN_RTC=y 57CONFIG_GEN_RTC=y
71# CONFIG_HWMON is not set 58# CONFIG_HWMON is not set
@@ -74,13 +61,8 @@ CONFIG_GEN_RTC=y
74CONFIG_TMPFS=y 61CONFIG_TMPFS=y
75CONFIG_CRAMFS=y 62CONFIG_CRAMFS=y
76CONFIG_NFS_FS=y 63CONFIG_NFS_FS=y
77CONFIG_NFS_V3=y
78CONFIG_ROOT_NFS=y 64CONFIG_ROOT_NFS=y
79CONFIG_PARTITION_ADVANCED=y 65CONFIG_CRC32_SLICEBY4=y
80# CONFIG_CRC32 is not set 66CONFIG_DEBUG_INFO=y
81CONFIG_MAGIC_SYSRQ=y 67CONFIG_MAGIC_SYSRQ=y
82CONFIG_DEBUG_KERNEL=y
83CONFIG_DETECT_HUNG_TASK=y 68CONFIG_DETECT_HUNG_TASK=y
84CONFIG_DEBUG_INFO=y
85# CONFIG_RCU_CPU_STALL_DETECTOR is not set
86CONFIG_CRC32_SLICEBY4=y
diff --git a/arch/powerpc/configs/wii_defconfig b/arch/powerpc/configs/wii_defconfig
index 1e2b7d062aa4..34eaf528fa87 100644
--- a/arch/powerpc/configs/wii_defconfig
+++ b/arch/powerpc/configs/wii_defconfig
@@ -1,4 +1,3 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_LOCALVERSION="-wii" 1CONFIG_LOCALVERSION="-wii"
3# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
@@ -6,7 +5,6 @@ CONFIG_IKCONFIG=y
6CONFIG_IKCONFIG_PROC=y 5CONFIG_IKCONFIG_PROC=y
7CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
8CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
9# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
10CONFIG_EXPERT=y 8CONFIG_EXPERT=y
11# CONFIG_ELF_CORE is not set 9# CONFIG_ELF_CORE is not set
12CONFIG_PERF_EVENTS=y 10CONFIG_PERF_EVENTS=y
@@ -22,7 +20,6 @@ CONFIG_WII=y
22CONFIG_PREEMPT=y 20CONFIG_PREEMPT=y
23CONFIG_BINFMT_MISC=m 21CONFIG_BINFMT_MISC=m
24CONFIG_KEXEC=y 22CONFIG_KEXEC=y
25# CONFIG_MIGRATION is not set
26# CONFIG_SECCOMP is not set 23# CONFIG_SECCOMP is not set
27CONFIG_ADVANCED_OPTIONS=y 24CONFIG_ADVANCED_OPTIONS=y
28CONFIG_NET=y 25CONFIG_NET=y
@@ -39,7 +36,6 @@ CONFIG_IP_PNP_RARP=y
39# CONFIG_INET_DIAG is not set 36# CONFIG_INET_DIAG is not set
40# CONFIG_IPV6 is not set 37# CONFIG_IPV6 is not set
41CONFIG_BT=y 38CONFIG_BT=y
42CONFIG_BT_L2CAP=y
43CONFIG_BT_RFCOMM=y 39CONFIG_BT_RFCOMM=y
44CONFIG_BT_BNEP=y 40CONFIG_BT_BNEP=y
45CONFIG_BT_BNEP_MC_FILTER=y 41CONFIG_BT_BNEP_MC_FILTER=y
@@ -49,18 +45,12 @@ CONFIG_MAC80211=y
49CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 45CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
50# CONFIG_STANDALONE is not set 46# CONFIG_STANDALONE is not set
51# CONFIG_FIRMWARE_IN_KERNEL is not set 47# CONFIG_FIRMWARE_IN_KERNEL is not set
52CONFIG_PROC_DEVICETREE=y
53CONFIG_BLK_DEV_LOOP=y 48CONFIG_BLK_DEV_LOOP=y
54CONFIG_BLK_DEV_RAM=y 49CONFIG_BLK_DEV_RAM=y
55CONFIG_BLK_DEV_RAM_COUNT=2 50CONFIG_BLK_DEV_RAM_COUNT=2
56CONFIG_SCSI=y 51CONFIG_SCSI=y
57CONFIG_BLK_DEV_SD=y 52CONFIG_BLK_DEV_SD=y
58CONFIG_SCSI_MULTI_LUN=y
59CONFIG_NETDEVICES=y 53CONFIG_NETDEVICES=y
60CONFIG_NET_ETHERNET=y
61CONFIG_MII=y
62# CONFIG_NETDEV_1000 is not set
63# CONFIG_NETDEV_10000 is not set
64CONFIG_B43=y 54CONFIG_B43=y
65CONFIG_B43_SDIO=y 55CONFIG_B43_SDIO=y
66# CONFIG_B43_PHY_LP is not set 56# CONFIG_B43_PHY_LP is not set
@@ -78,8 +68,8 @@ CONFIG_INPUT_MISC=y
78CONFIG_INPUT_UINPUT=y 68CONFIG_INPUT_UINPUT=y
79# CONFIG_SERIO_I8042 is not set 69# CONFIG_SERIO_I8042 is not set
80# CONFIG_SERIO_SERPORT is not set 70# CONFIG_SERIO_SERPORT is not set
81# CONFIG_DEVKMEM is not set
82CONFIG_LEGACY_PTY_COUNT=64 71CONFIG_LEGACY_PTY_COUNT=64
72# CONFIG_DEVKMEM is not set
83# CONFIG_HW_RANDOM is not set 73# CONFIG_HW_RANDOM is not set
84CONFIG_NVRAM=y 74CONFIG_NVRAM=y
85CONFIG_I2C=y 75CONFIG_I2C=y
@@ -109,7 +99,6 @@ CONFIG_EXT2_FS=y
109CONFIG_EXT3_FS=y 99CONFIG_EXT3_FS=y
110# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 100# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
111# CONFIG_EXT3_FS_XATTR is not set 101# CONFIG_EXT3_FS_XATTR is not set
112CONFIG_INOTIFY=y
113CONFIG_FUSE_FS=m 102CONFIG_FUSE_FS=m
114CONFIG_ISO9660_FS=y 103CONFIG_ISO9660_FS=y
115CONFIG_JOLIET=y 104CONFIG_JOLIET=y
@@ -119,7 +108,6 @@ CONFIG_PROC_KCORE=y
119# CONFIG_PROC_PAGE_MONITOR is not set 108# CONFIG_PROC_PAGE_MONITOR is not set
120CONFIG_TMPFS=y 109CONFIG_TMPFS=y
121CONFIG_NFS_FS=y 110CONFIG_NFS_FS=y
122CONFIG_NFS_V3=y
123CONFIG_ROOT_NFS=y 111CONFIG_ROOT_NFS=y
124CONFIG_CIFS=m 112CONFIG_CIFS=m
125CONFIG_NLS_CODEPAGE_437=y 113CONFIG_NLS_CODEPAGE_437=y
@@ -127,13 +115,9 @@ CONFIG_NLS_ISO8859_1=y
127CONFIG_CRC_CCITT=y 115CONFIG_CRC_CCITT=y
128CONFIG_PRINTK_TIME=y 116CONFIG_PRINTK_TIME=y
129CONFIG_MAGIC_SYSRQ=y 117CONFIG_MAGIC_SYSRQ=y
130CONFIG_DEBUG_KERNEL=y
131CONFIG_DEBUG_SPINLOCK=y 118CONFIG_DEBUG_SPINLOCK=y
132CONFIG_DEBUG_MUTEXES=y 119CONFIG_DEBUG_MUTEXES=y
133CONFIG_DEBUG_SPINLOCK_SLEEP=y
134# CONFIG_RCU_CPU_STALL_DETECTOR is not set
135CONFIG_LATENCYTOP=y 120CONFIG_LATENCYTOP=y
136CONFIG_SYSCTL_SYSCALL_CHECK=y
137CONFIG_SCHED_TRACER=y 121CONFIG_SCHED_TRACER=y
138CONFIG_BLK_DEV_IO_TRACE=y 122CONFIG_BLK_DEV_IO_TRACE=y
139CONFIG_DMA_API_DEBUG=y 123CONFIG_DMA_API_DEBUG=y
diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index 22d5a7da9e68..5cf5a6d10685 100644
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -165,7 +165,7 @@ extern const char *powerpc_base_platform;
165#define CPU_FTR_ARCH_201 LONG_ASM_CONST(0x0000000200000000) 165#define CPU_FTR_ARCH_201 LONG_ASM_CONST(0x0000000200000000)
166#define CPU_FTR_ARCH_206 LONG_ASM_CONST(0x0000000400000000) 166#define CPU_FTR_ARCH_206 LONG_ASM_CONST(0x0000000400000000)
167#define CPU_FTR_ARCH_207S LONG_ASM_CONST(0x0000000800000000) 167#define CPU_FTR_ARCH_207S LONG_ASM_CONST(0x0000000800000000)
168#define CPU_FTR_IABR LONG_ASM_CONST(0x0000001000000000) 168/* Free LONG_ASM_CONST(0x0000001000000000) */
169#define CPU_FTR_MMCRA LONG_ASM_CONST(0x0000002000000000) 169#define CPU_FTR_MMCRA LONG_ASM_CONST(0x0000002000000000)
170#define CPU_FTR_CTRL LONG_ASM_CONST(0x0000004000000000) 170#define CPU_FTR_CTRL LONG_ASM_CONST(0x0000004000000000)
171#define CPU_FTR_SMT LONG_ASM_CONST(0x0000008000000000) 171#define CPU_FTR_SMT LONG_ASM_CONST(0x0000008000000000)
diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h
index 0652ebe117af..55abfd09e47f 100644
--- a/arch/powerpc/include/asm/eeh.h
+++ b/arch/powerpc/include/asm/eeh.h
@@ -38,8 +38,9 @@ struct device_node;
38#define EEH_FORCE_DISABLED 0x02 /* EEH disabled */ 38#define EEH_FORCE_DISABLED 0x02 /* EEH disabled */
39#define EEH_PROBE_MODE_DEV 0x04 /* From PCI device */ 39#define EEH_PROBE_MODE_DEV 0x04 /* From PCI device */
40#define EEH_PROBE_MODE_DEVTREE 0x08 /* From device tree */ 40#define EEH_PROBE_MODE_DEVTREE 0x08 /* From device tree */
41#define EEH_ENABLE_IO_FOR_LOG 0x10 /* Enable IO for log */ 41#define EEH_VALID_PE_ZERO 0x10 /* PE#0 is valid */
42#define EEH_EARLY_DUMP_LOG 0x20 /* Dump log immediately */ 42#define EEH_ENABLE_IO_FOR_LOG 0x20 /* Enable IO for log */
43#define EEH_EARLY_DUMP_LOG 0x40 /* Dump log immediately */
43 44
44/* 45/*
45 * Delay for PE reset, all in ms 46 * Delay for PE reset, all in ms
@@ -77,6 +78,7 @@ struct device_node;
77 78
78#define EEH_PE_KEEP (1 << 8) /* Keep PE on hotplug */ 79#define EEH_PE_KEEP (1 << 8) /* Keep PE on hotplug */
79#define EEH_PE_CFG_RESTRICTED (1 << 9) /* Block config on error */ 80#define EEH_PE_CFG_RESTRICTED (1 << 9) /* Block config on error */
81#define EEH_PE_REMOVED (1 << 10) /* Removed permanently */
80 82
81struct eeh_pe { 83struct eeh_pe {
82 int type; /* PE type: PHB/Bus/Device */ 84 int type; /* PE type: PHB/Bus/Device */
@@ -216,6 +218,7 @@ struct eeh_ops {
216}; 218};
217 219
218extern int eeh_subsystem_flags; 220extern int eeh_subsystem_flags;
221extern int eeh_max_freezes;
219extern struct eeh_ops *eeh_ops; 222extern struct eeh_ops *eeh_ops;
220extern raw_spinlock_t confirm_error_lock; 223extern raw_spinlock_t confirm_error_lock;
221 224
@@ -253,12 +256,6 @@ static inline void eeh_serialize_unlock(unsigned long flags)
253 raw_spin_unlock_irqrestore(&confirm_error_lock, flags); 256 raw_spin_unlock_irqrestore(&confirm_error_lock, flags);
254} 257}
255 258
256/*
257 * Max number of EEH freezes allowed before we consider the device
258 * to be permanently disabled.
259 */
260#define EEH_MAX_ALLOWED_FREEZES 5
261
262typedef void *(*eeh_traverse_func)(void *data, void *flag); 259typedef void *(*eeh_traverse_func)(void *data, void *flag);
263void eeh_set_pe_aux_size(int size); 260void eeh_set_pe_aux_size(int size);
264int eeh_phb_pe_create(struct pci_controller *phb); 261int eeh_phb_pe_create(struct pci_controller *phb);
diff --git a/arch/powerpc/include/asm/kprobes.h b/arch/powerpc/include/asm/kprobes.h
index af15d4d8d604..039b583db029 100644
--- a/arch/powerpc/include/asm/kprobes.h
+++ b/arch/powerpc/include/asm/kprobes.h
@@ -41,34 +41,59 @@ typedef ppc_opcode_t kprobe_opcode_t;
41#define MAX_INSN_SIZE 1 41#define MAX_INSN_SIZE 1
42 42
43#ifdef CONFIG_PPC64 43#ifdef CONFIG_PPC64
44#if defined(_CALL_ELF) && _CALL_ELF == 2
45/* PPC64 ABIv2 needs local entry point */
46#define kprobe_lookup_name(name, addr) \
47{ \
48 addr = (kprobe_opcode_t *)kallsyms_lookup_name(name); \
49 if (addr) \
50 addr = (kprobe_opcode_t *)ppc_function_entry(addr); \
51}
52#else
44/* 53/*
45 * 64bit powerpc uses function descriptors. 54 * 64bit powerpc ABIv1 uses function descriptors:
46 * Handle cases where: 55 * - Check for the dot variant of the symbol first.
47 * - User passes a <.symbol> or <module:.symbol> 56 * - If that fails, try looking up the symbol provided.
48 * - User passes a <symbol> or <module:symbol> 57 *
49 * - User passes a non-existent symbol, kallsyms_lookup_name 58 * This ensures we always get to the actual symbol and not the descriptor.
50 * returns 0. Don't deref the NULL pointer in that case 59 * Also handle <module:symbol> format.
51 */ 60 */
52#define kprobe_lookup_name(name, addr) \ 61#define kprobe_lookup_name(name, addr) \
53{ \ 62{ \
54 addr = (kprobe_opcode_t *)kallsyms_lookup_name(name); \ 63 char dot_name[MODULE_NAME_LEN + 1 + KSYM_NAME_LEN]; \
55 if (addr) { \ 64 char *modsym; \
56 char *colon; \ 65 bool dot_appended = false; \
57 if ((colon = strchr(name, ':')) != NULL) { \ 66 if ((modsym = strchr(name, ':')) != NULL) { \
58 colon++; \ 67 modsym++; \
59 if (*colon != '\0' && *colon != '.') \ 68 if (*modsym != '\0' && *modsym != '.') { \
60 addr = (kprobe_opcode_t *)ppc_function_entry(addr); \ 69 /* Convert to <module:.symbol> */ \
61 } else if (name[0] != '.') \ 70 strncpy(dot_name, name, modsym - name); \
62 addr = (kprobe_opcode_t *)ppc_function_entry(addr); \ 71 dot_name[modsym - name] = '.'; \
63 } else { \ 72 dot_name[modsym - name + 1] = '\0'; \
64 char dot_name[KSYM_NAME_LEN]; \ 73 strncat(dot_name, modsym, \
74 sizeof(dot_name) - (modsym - name) - 2);\
75 dot_appended = true; \
76 } else { \
77 dot_name[0] = '\0'; \
78 strncat(dot_name, name, sizeof(dot_name) - 1); \
79 } \
80 } else if (name[0] != '.') { \
65 dot_name[0] = '.'; \ 81 dot_name[0] = '.'; \
66 dot_name[1] = '\0'; \ 82 dot_name[1] = '\0'; \
67 strncat(dot_name, name, KSYM_NAME_LEN - 2); \ 83 strncat(dot_name, name, KSYM_NAME_LEN - 2); \
68 addr = (kprobe_opcode_t *)kallsyms_lookup_name(dot_name); \ 84 dot_appended = true; \
85 } else { \
86 dot_name[0] = '\0'; \
87 strncat(dot_name, name, KSYM_NAME_LEN - 1); \
88 } \
89 addr = (kprobe_opcode_t *)kallsyms_lookup_name(dot_name); \
90 if (!addr && dot_appended) { \
91 /* Let's try the original non-dot symbol lookup */ \
92 addr = (kprobe_opcode_t *)kallsyms_lookup_name(name); \
69 } \ 93 } \
70} 94}
71#endif 95#endif /* defined(_CALL_ELF) && _CALL_ELF == 2 */
96#endif /* CONFIG_PPC64 */
72 97
73#define flush_insn_slot(p) do { } while (0) 98#define flush_insn_slot(p) do { } while (0)
74#define kretprobe_blacklist_size 0 99#define kretprobe_blacklist_size 0
diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h
index eb95b675109b..9ee0a30a02ce 100644
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@ -304,7 +304,7 @@ enum OpalMessageType {
304 */ 304 */
305 OPAL_MSG_MEM_ERR, 305 OPAL_MSG_MEM_ERR,
306 OPAL_MSG_EPOW, 306 OPAL_MSG_EPOW,
307 OPAL_MSG_SHUTDOWN, 307 OPAL_MSG_SHUTDOWN, /* params[0] = 1 reboot, 0 shutdown */
308 OPAL_MSG_HMI_EVT, 308 OPAL_MSG_HMI_EVT,
309 OPAL_MSG_TYPE_MAX, 309 OPAL_MSG_TYPE_MAX,
310}; 310};
@@ -595,6 +595,14 @@ enum {
595 OPAL_PHB3_NUM_PEST_REGS = 256 595 OPAL_PHB3_NUM_PEST_REGS = 256
596}; 596};
597 597
598/* CAPI modes for PHB */
599enum {
600 OPAL_PHB_CAPI_MODE_PCIE = 0,
601 OPAL_PHB_CAPI_MODE_CAPI = 1,
602 OPAL_PHB_CAPI_MODE_SNOOP_OFF = 2,
603 OPAL_PHB_CAPI_MODE_SNOOP_ON = 3,
604};
605
598struct OpalIoPhbErrorCommon { 606struct OpalIoPhbErrorCommon {
599 __be32 version; 607 __be32 version;
600 __be32 ioType; 608 __be32 ioType;
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h
index 725247beebec..546d036fe925 100644
--- a/arch/powerpc/include/asm/pci-bridge.h
+++ b/arch/powerpc/include/asm/pci-bridge.h
@@ -119,6 +119,10 @@ extern void setup_indirect_pci(struct pci_controller* hose,
119extern int indirect_read_config(struct pci_bus *bus, unsigned int devfn, 119extern int indirect_read_config(struct pci_bus *bus, unsigned int devfn,
120 int offset, int len, u32 *val); 120 int offset, int len, u32 *val);
121 121
122extern int __indirect_read_config(struct pci_controller *hose,
123 unsigned char bus_number, unsigned int devfn,
124 int offset, int len, u32 *val);
125
122extern int indirect_write_config(struct pci_bus *bus, unsigned int devfn, 126extern int indirect_write_config(struct pci_bus *bus, unsigned int devfn,
123 int offset, int len, u32 val); 127 int offset, int len, u32 val);
124 128
diff --git a/arch/powerpc/include/asm/pgtable-ppc32.h b/arch/powerpc/include/asm/pgtable-ppc32.h
index 234e07c47803..26ce0ab0a9e4 100644
--- a/arch/powerpc/include/asm/pgtable-ppc32.h
+++ b/arch/powerpc/include/asm/pgtable-ppc32.h
@@ -178,12 +178,11 @@ static inline unsigned long pte_update(pte_t *p,
178 andc %1,%0,%5\n\ 178 andc %1,%0,%5\n\
179 or %1,%1,%6\n\ 179 or %1,%1,%6\n\
180 /* 0x200 == Extended encoding, bit 22 */ \ 180 /* 0x200 == Extended encoding, bit 22 */ \
181 /* Bit 22 has to be 1 if neither _PAGE_USER nor _PAGE_RW are set */ \ 181 /* Bit 22 has to be 1 when _PAGE_USER is unset and _PAGE_RO is set */ \
182 rlwimi %1,%1,32-2,0x200\n /* get _PAGE_USER */ \ 182 rlwimi %1,%1,32-1,0x200\n /* get _PAGE_RO */ \
183 rlwinm %3,%1,32-1,0x200\n /* get _PAGE_RW */ \ 183 rlwinm %3,%1,32-2,0x200\n /* get _PAGE_USER */ \
184 or %1,%3,%1\n\ 184 andc %1,%1,%3\n\
185 xori %1,%1,0x200\n" 185 stwcx. %1,0,%4\n\
186" stwcx. %1,0,%4\n\
187 bne- 1b" 186 bne- 1b"
188 : "=&r" (old), "=&r" (tmp), "=m" (*p), "=&r" (tmp2) 187 : "=&r" (old), "=&r" (tmp), "=m" (*p), "=&r" (tmp2)
189 : "r" (p), "r" (clr), "r" (set), "m" (*p) 188 : "r" (p), "r" (clr), "r" (set), "m" (*p)
@@ -275,7 +274,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,
275static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, 274static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
276 pte_t *ptep) 275 pte_t *ptep)
277{ 276{
278 pte_update(ptep, (_PAGE_RW | _PAGE_HWWRITE), 0); 277 pte_update(ptep, (_PAGE_RW | _PAGE_HWWRITE), _PAGE_RO);
279} 278}
280static inline void huge_ptep_set_wrprotect(struct mm_struct *mm, 279static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
281 unsigned long addr, pte_t *ptep) 280 unsigned long addr, pte_t *ptep)
@@ -286,9 +285,11 @@ static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
286 285
287static inline void __ptep_set_access_flags(pte_t *ptep, pte_t entry) 286static inline void __ptep_set_access_flags(pte_t *ptep, pte_t entry)
288{ 287{
289 unsigned long bits = pte_val(entry) & 288 unsigned long set = pte_val(entry) &
290 (_PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_RW | _PAGE_EXEC); 289 (_PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_RW | _PAGE_EXEC);
291 pte_update(ptep, 0, bits); 290 unsigned long clr = ~pte_val(entry) & _PAGE_RO;
291
292 pte_update(ptep, clr, set);
292} 293}
293 294
294#define __HAVE_ARCH_PTE_SAME 295#define __HAVE_ARCH_PTE_SAME
@@ -346,10 +347,14 @@ static inline void __ptep_set_access_flags(pte_t *ptep, pte_t entry)
346#define pte_to_pgoff(pte) (pte_val(pte) >> 3) 347#define pte_to_pgoff(pte) (pte_val(pte) >> 3)
347#define pgoff_to_pte(off) ((pte_t) { ((off) << 3) | _PAGE_FILE }) 348#define pgoff_to_pte(off) ((pte_t) { ((off) << 3) | _PAGE_FILE })
348 349
350#ifndef CONFIG_PPC_4K_PAGES
351void pgtable_cache_init(void);
352#else
349/* 353/*
350 * No page table caches to initialise 354 * No page table caches to initialise
351 */ 355 */
352#define pgtable_cache_init() do { } while (0) 356#define pgtable_cache_init() do { } while (0)
357#endif
353 358
354extern int get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep, 359extern int get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep,
355 pmd_t **pmdp); 360 pmd_t **pmdp);
diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
index a8805fee0df9..7e77f2ca5132 100644
--- a/arch/powerpc/include/asm/pgtable.h
+++ b/arch/powerpc/include/asm/pgtable.h
@@ -30,7 +30,8 @@ struct mm_struct;
30#include <asm/tlbflush.h> 30#include <asm/tlbflush.h>
31 31
32/* Generic accessors to PTE bits */ 32/* Generic accessors to PTE bits */
33static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_RW; } 33static inline int pte_write(pte_t pte)
34{ return (pte_val(pte) & (_PAGE_RW | _PAGE_RO)) != _PAGE_RO; }
34static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; } 35static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; }
35static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; } 36static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; }
36static inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE; } 37static inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE; }
@@ -115,12 +116,14 @@ static inline unsigned long pte_pfn(pte_t pte) {
115 116
116/* Generic modifiers for PTE bits */ 117/* Generic modifiers for PTE bits */
117static inline pte_t pte_wrprotect(pte_t pte) { 118static inline pte_t pte_wrprotect(pte_t pte) {
118 pte_val(pte) &= ~(_PAGE_RW | _PAGE_HWWRITE); return pte; } 119 pte_val(pte) &= ~(_PAGE_RW | _PAGE_HWWRITE);
120 pte_val(pte) |= _PAGE_RO; return pte; }
119static inline pte_t pte_mkclean(pte_t pte) { 121static inline pte_t pte_mkclean(pte_t pte) {
120 pte_val(pte) &= ~(_PAGE_DIRTY | _PAGE_HWWRITE); return pte; } 122 pte_val(pte) &= ~(_PAGE_DIRTY | _PAGE_HWWRITE); return pte; }
121static inline pte_t pte_mkold(pte_t pte) { 123static inline pte_t pte_mkold(pte_t pte) {
122 pte_val(pte) &= ~_PAGE_ACCESSED; return pte; } 124 pte_val(pte) &= ~_PAGE_ACCESSED; return pte; }
123static inline pte_t pte_mkwrite(pte_t pte) { 125static inline pte_t pte_mkwrite(pte_t pte) {
126 pte_val(pte) &= ~_PAGE_RO;
124 pte_val(pte) |= _PAGE_RW; return pte; } 127 pte_val(pte) |= _PAGE_RW; return pte; }
125static inline pte_t pte_mkdirty(pte_t pte) { 128static inline pte_t pte_mkdirty(pte_t pte) {
126 pte_val(pte) |= _PAGE_DIRTY; return pte; } 129 pte_val(pte) |= _PAGE_DIRTY; return pte; }
diff --git a/arch/powerpc/include/asm/pnv-pci.h b/arch/powerpc/include/asm/pnv-pci.h
index f09a22fa1bd7..f9b498292a5c 100644
--- a/arch/powerpc/include/asm/pnv-pci.h
+++ b/arch/powerpc/include/asm/pnv-pci.h
@@ -13,13 +13,13 @@
13#include <linux/pci.h> 13#include <linux/pci.h>
14#include <misc/cxl.h> 14#include <misc/cxl.h>
15 15
16int pnv_phb_to_cxl(struct pci_dev *dev); 16int pnv_phb_to_cxl_mode(struct pci_dev *dev, uint64_t mode);
17int pnv_cxl_ioda_msi_setup(struct pci_dev *dev, unsigned int hwirq, 17int pnv_cxl_ioda_msi_setup(struct pci_dev *dev, unsigned int hwirq,
18 unsigned int virq); 18 unsigned int virq);
19int pnv_cxl_alloc_hwirqs(struct pci_dev *dev, int num); 19int pnv_cxl_alloc_hwirqs(struct pci_dev *dev, int num);
20void pnv_cxl_release_hwirqs(struct pci_dev *dev, int hwirq, int num); 20void pnv_cxl_release_hwirqs(struct pci_dev *dev, int hwirq, int num);
21int pnv_cxl_get_irq_count(struct pci_dev *dev); 21int pnv_cxl_get_irq_count(struct pci_dev *dev);
22struct device_node *pnv_pci_to_phb_node(struct pci_dev *dev); 22struct device_node *pnv_pci_get_phb_node(struct pci_dev *dev);
23 23
24#ifdef CONFIG_CXL_BASE 24#ifdef CONFIG_CXL_BASE
25int pnv_cxl_alloc_hwirq_ranges(struct cxl_irq_ranges *irqs, 25int pnv_cxl_alloc_hwirq_ranges(struct cxl_irq_ranges *irqs,
diff --git a/arch/powerpc/include/asm/pte-8xx.h b/arch/powerpc/include/asm/pte-8xx.h
index daa4616e61c4..eb6edb44f140 100644
--- a/arch/powerpc/include/asm/pte-8xx.h
+++ b/arch/powerpc/include/asm/pte-8xx.h
@@ -46,9 +46,9 @@
46 * require a TLB exception handler change. It is assumed unused bits 46 * require a TLB exception handler change. It is assumed unused bits
47 * are always zero. 47 * are always zero.
48 */ 48 */
49#define _PAGE_RW 0x0400 /* lsb PP bits, inverted in HW */ 49#define _PAGE_RO 0x0400 /* lsb PP bits */
50#define _PAGE_USER 0x0800 /* msb PP bits */ 50#define _PAGE_USER 0x0800 /* msb PP bits */
51/* set when neither _PAGE_USER nor _PAGE_RW are set */ 51/* set when _PAGE_USER is unset and _PAGE_RO is set */
52#define _PAGE_KNLRO 0x0200 52#define _PAGE_KNLRO 0x0200
53 53
54#define _PMD_PRESENT 0x0001 54#define _PMD_PRESENT 0x0001
@@ -62,9 +62,8 @@
62#define PTE_ATOMIC_UPDATES 1 62#define PTE_ATOMIC_UPDATES 1
63 63
64/* We need to add _PAGE_SHARED to kernel pages */ 64/* We need to add _PAGE_SHARED to kernel pages */
65#define _PAGE_KERNEL_RO (_PAGE_SHARED | _PAGE_KNLRO) 65#define _PAGE_KERNEL_RO (_PAGE_SHARED | _PAGE_RO | _PAGE_KNLRO)
66#define _PAGE_KERNEL_ROX (_PAGE_EXEC | _PAGE_KNLRO) 66#define _PAGE_KERNEL_ROX (_PAGE_EXEC | _PAGE_RO | _PAGE_KNLRO)
67#define _PAGE_KERNEL_RW (_PAGE_DIRTY | _PAGE_RW | _PAGE_HWWRITE)
68 67
69#endif /* __KERNEL__ */ 68#endif /* __KERNEL__ */
70#endif /* _ASM_POWERPC_PTE_8xx_H */ 69#endif /* _ASM_POWERPC_PTE_8xx_H */
diff --git a/arch/powerpc/include/asm/pte-common.h b/arch/powerpc/include/asm/pte-common.h
index e040c3595129..2aef9b7a0eb2 100644
--- a/arch/powerpc/include/asm/pte-common.h
+++ b/arch/powerpc/include/asm/pte-common.h
@@ -34,6 +34,12 @@
34#ifndef _PAGE_PSIZE 34#ifndef _PAGE_PSIZE
35#define _PAGE_PSIZE 0 35#define _PAGE_PSIZE 0
36#endif 36#endif
37/* _PAGE_RO and _PAGE_RW shall not be defined at the same time */
38#ifndef _PAGE_RO
39#define _PAGE_RO 0
40#else
41#define _PAGE_RW 0
42#endif
37#ifndef _PMD_PRESENT_MASK 43#ifndef _PMD_PRESENT_MASK
38#define _PMD_PRESENT_MASK _PMD_PRESENT 44#define _PMD_PRESENT_MASK _PMD_PRESENT
39#endif 45#endif
@@ -42,10 +48,10 @@
42#define PMD_PAGE_SIZE(pmd) bad_call_to_PMD_PAGE_SIZE() 48#define PMD_PAGE_SIZE(pmd) bad_call_to_PMD_PAGE_SIZE()
43#endif 49#endif
44#ifndef _PAGE_KERNEL_RO 50#ifndef _PAGE_KERNEL_RO
45#define _PAGE_KERNEL_RO 0 51#define _PAGE_KERNEL_RO (_PAGE_RO)
46#endif 52#endif
47#ifndef _PAGE_KERNEL_ROX 53#ifndef _PAGE_KERNEL_ROX
48#define _PAGE_KERNEL_ROX (_PAGE_EXEC) 54#define _PAGE_KERNEL_ROX (_PAGE_EXEC | _PAGE_RO)
49#endif 55#endif
50#ifndef _PAGE_KERNEL_RW 56#ifndef _PAGE_KERNEL_RW
51#define _PAGE_KERNEL_RW (_PAGE_DIRTY | _PAGE_RW | _PAGE_HWWRITE) 57#define _PAGE_KERNEL_RW (_PAGE_DIRTY | _PAGE_RW | _PAGE_HWWRITE)
@@ -95,7 +101,7 @@ extern unsigned long bad_call_to_PMD_PAGE_SIZE(void);
95/* Mask of bits returned by pte_pgprot() */ 101/* Mask of bits returned by pte_pgprot() */
96#define PAGE_PROT_BITS (_PAGE_GUARDED | _PAGE_COHERENT | _PAGE_NO_CACHE | \ 102#define PAGE_PROT_BITS (_PAGE_GUARDED | _PAGE_COHERENT | _PAGE_NO_CACHE | \
97 _PAGE_WRITETHRU | _PAGE_ENDIAN | _PAGE_4K_PFN | \ 103 _PAGE_WRITETHRU | _PAGE_ENDIAN | _PAGE_4K_PFN | \
98 _PAGE_USER | _PAGE_ACCESSED | \ 104 _PAGE_USER | _PAGE_ACCESSED | _PAGE_RO | \
99 _PAGE_RW | _PAGE_HWWRITE | _PAGE_DIRTY | _PAGE_EXEC) 105 _PAGE_RW | _PAGE_HWWRITE | _PAGE_DIRTY | _PAGE_EXEC)
100 106
101#ifdef CONFIG_NUMA_BALANCING 107#ifdef CONFIG_NUMA_BALANCING
@@ -128,11 +134,14 @@ extern unsigned long bad_call_to_PMD_PAGE_SIZE(void);
128 */ 134 */
129#define PAGE_NONE __pgprot(_PAGE_BASE) 135#define PAGE_NONE __pgprot(_PAGE_BASE)
130#define PAGE_SHARED __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW) 136#define PAGE_SHARED __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW)
131#define PAGE_SHARED_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW | _PAGE_EXEC) 137#define PAGE_SHARED_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW | \
132#define PAGE_COPY __pgprot(_PAGE_BASE | _PAGE_USER) 138 _PAGE_EXEC)
133#define PAGE_COPY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC) 139#define PAGE_COPY __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RO)
134#define PAGE_READONLY __pgprot(_PAGE_BASE | _PAGE_USER) 140#define PAGE_COPY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RO | \
135#define PAGE_READONLY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC) 141 _PAGE_EXEC)
142#define PAGE_READONLY __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RO)
143#define PAGE_READONLY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RO | \
144 _PAGE_EXEC)
136 145
137#define __P000 PAGE_NONE 146#define __P000 PAGE_NONE
138#define __P001 PAGE_READONLY 147#define __P001 PAGE_READONLY
diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
index b390f55b0df1..2e23e92a4372 100644
--- a/arch/powerpc/include/asm/rtas.h
+++ b/arch/powerpc/include/asm/rtas.h
@@ -327,7 +327,7 @@ extern int rtas_suspend_cpu(struct rtas_suspend_me_data *data);
327extern int rtas_suspend_last_cpu(struct rtas_suspend_me_data *data); 327extern int rtas_suspend_last_cpu(struct rtas_suspend_me_data *data);
328extern int rtas_online_cpus_mask(cpumask_var_t cpus); 328extern int rtas_online_cpus_mask(cpumask_var_t cpus);
329extern int rtas_offline_cpus_mask(cpumask_var_t cpus); 329extern int rtas_offline_cpus_mask(cpumask_var_t cpus);
330extern int rtas_ibm_suspend_me(struct rtas_args *); 330extern int rtas_ibm_suspend_me(u64 handle, int *vasi_return);
331 331
332struct rtc_time; 332struct rtc_time;
333extern unsigned long rtas_get_boot_time(void); 333extern unsigned long rtas_get_boot_time(void);
diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
index 5a6614a7f0b2..d607df5081a7 100644
--- a/arch/powerpc/include/asm/smp.h
+++ b/arch/powerpc/include/asm/smp.h
@@ -64,7 +64,6 @@ DECLARE_PER_CPU(unsigned int, cpu_pvr);
64extern void migrate_irqs(void); 64extern void migrate_irqs(void);
65int generic_cpu_disable(void); 65int generic_cpu_disable(void);
66void generic_cpu_die(unsigned int cpu); 66void generic_cpu_die(unsigned int cpu);
67void generic_mach_cpu_die(void);
68void generic_set_cpu_dead(unsigned int cpu); 67void generic_set_cpu_dead(unsigned int cpu);
69void generic_set_cpu_up(unsigned int cpu); 68void generic_set_cpu_up(unsigned int cpu);
70int generic_check_cpu_restart(unsigned int cpu); 69int generic_check_cpu_restart(unsigned int cpu);
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
index 0be6c681cab1..e8abc83e699f 100644
--- a/arch/powerpc/include/asm/thread_info.h
+++ b/arch/powerpc/include/asm/thread_info.h
@@ -125,7 +125,7 @@ static inline struct thread_info *current_thread_info(void)
125#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT) 125#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
126#define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE) 126#define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
127#define _TIF_NOHZ (1<<TIF_NOHZ) 127#define _TIF_NOHZ (1<<TIF_NOHZ)
128#define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \ 128#define _TIF_SYSCALL_DOTRACE (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
129 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \ 129 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
130 _TIF_NOHZ) 130 _TIF_NOHZ)
131 131
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index e624f9646350..4717859fdd04 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -644,8 +644,19 @@ int main(void)
644 HSTATE_FIELD(HSTATE_SAVED_XIRR, saved_xirr); 644 HSTATE_FIELD(HSTATE_SAVED_XIRR, saved_xirr);
645 HSTATE_FIELD(HSTATE_HOST_IPI, host_ipi); 645 HSTATE_FIELD(HSTATE_HOST_IPI, host_ipi);
646 HSTATE_FIELD(HSTATE_PTID, ptid); 646 HSTATE_FIELD(HSTATE_PTID, ptid);
647 HSTATE_FIELD(HSTATE_MMCR, host_mmcr); 647 HSTATE_FIELD(HSTATE_MMCR0, host_mmcr[0]);
648 HSTATE_FIELD(HSTATE_PMC, host_pmc); 648 HSTATE_FIELD(HSTATE_MMCR1, host_mmcr[1]);
649 HSTATE_FIELD(HSTATE_MMCRA, host_mmcr[2]);
650 HSTATE_FIELD(HSTATE_SIAR, host_mmcr[3]);
651 HSTATE_FIELD(HSTATE_SDAR, host_mmcr[4]);
652 HSTATE_FIELD(HSTATE_MMCR2, host_mmcr[5]);
653 HSTATE_FIELD(HSTATE_SIER, host_mmcr[6]);
654 HSTATE_FIELD(HSTATE_PMC1, host_pmc[0]);
655 HSTATE_FIELD(HSTATE_PMC2, host_pmc[1]);
656 HSTATE_FIELD(HSTATE_PMC3, host_pmc[2]);
657 HSTATE_FIELD(HSTATE_PMC4, host_pmc[3]);
658 HSTATE_FIELD(HSTATE_PMC5, host_pmc[4]);
659 HSTATE_FIELD(HSTATE_PMC6, host_pmc[5]);
649 HSTATE_FIELD(HSTATE_PURR, host_purr); 660 HSTATE_FIELD(HSTATE_PURR, host_purr);
650 HSTATE_FIELD(HSTATE_SPURR, host_spurr); 661 HSTATE_FIELD(HSTATE_SPURR, host_spurr);
651 HSTATE_FIELD(HSTATE_DSCR, host_dscr); 662 HSTATE_FIELD(HSTATE_DSCR, host_dscr);
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 808405906336..f337666768a7 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -1133,6 +1133,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
1133 .icache_bsize = 32, 1133 .icache_bsize = 32,
1134 .dcache_bsize = 32, 1134 .dcache_bsize = 32,
1135 .cpu_setup = __setup_cpu_603, 1135 .cpu_setup = __setup_cpu_603,
1136 .machine_check = machine_check_generic,
1136 .num_pmcs = 4, 1137 .num_pmcs = 4,
1137 .oprofile_cpu_type = "ppc/e300", 1138 .oprofile_cpu_type = "ppc/e300",
1138 .oprofile_type = PPC_OPROFILE_FSL_EMB, 1139 .oprofile_type = PPC_OPROFILE_FSL_EMB,
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index e1b6d8e17289..3b2252e7731b 100644
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -104,6 +104,13 @@
104int eeh_subsystem_flags; 104int eeh_subsystem_flags;
105EXPORT_SYMBOL(eeh_subsystem_flags); 105EXPORT_SYMBOL(eeh_subsystem_flags);
106 106
107/*
108 * EEH allowed maximal frozen times. If one particular PE's
109 * frozen count in last hour exceeds this limit, the PE will
110 * be forced to be offline permanently.
111 */
112int eeh_max_freezes = 5;
113
107/* Platform dependent EEH operations */ 114/* Platform dependent EEH operations */
108struct eeh_ops *eeh_ops = NULL; 115struct eeh_ops *eeh_ops = NULL;
109 116
@@ -1652,8 +1659,22 @@ static int eeh_enable_dbgfs_get(void *data, u64 *val)
1652 return 0; 1659 return 0;
1653} 1660}
1654 1661
1662static int eeh_freeze_dbgfs_set(void *data, u64 val)
1663{
1664 eeh_max_freezes = val;
1665 return 0;
1666}
1667
1668static int eeh_freeze_dbgfs_get(void *data, u64 *val)
1669{
1670 *val = eeh_max_freezes;
1671 return 0;
1672}
1673
1655DEFINE_SIMPLE_ATTRIBUTE(eeh_enable_dbgfs_ops, eeh_enable_dbgfs_get, 1674DEFINE_SIMPLE_ATTRIBUTE(eeh_enable_dbgfs_ops, eeh_enable_dbgfs_get,
1656 eeh_enable_dbgfs_set, "0x%llx\n"); 1675 eeh_enable_dbgfs_set, "0x%llx\n");
1676DEFINE_SIMPLE_ATTRIBUTE(eeh_freeze_dbgfs_ops, eeh_freeze_dbgfs_get,
1677 eeh_freeze_dbgfs_set, "0x%llx\n");
1657#endif 1678#endif
1658 1679
1659static int __init eeh_init_proc(void) 1680static int __init eeh_init_proc(void)
@@ -1664,6 +1685,9 @@ static int __init eeh_init_proc(void)
1664 debugfs_create_file("eeh_enable", 0600, 1685 debugfs_create_file("eeh_enable", 0600,
1665 powerpc_debugfs_root, NULL, 1686 powerpc_debugfs_root, NULL,
1666 &eeh_enable_dbgfs_ops); 1687 &eeh_enable_dbgfs_ops);
1688 debugfs_create_file("eeh_max_freezes", 0600,
1689 powerpc_debugfs_root, NULL,
1690 &eeh_freeze_dbgfs_ops);
1667#endif 1691#endif
1668 } 1692 }
1669 1693
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index b17e793ba67e..d099540c0f56 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -667,7 +667,7 @@ static void eeh_handle_normal_event(struct eeh_pe *pe)
667 667
668 eeh_pe_update_time_stamp(pe); 668 eeh_pe_update_time_stamp(pe);
669 pe->freeze_count++; 669 pe->freeze_count++;
670 if (pe->freeze_count > EEH_MAX_ALLOWED_FREEZES) 670 if (pe->freeze_count > eeh_max_freezes)
671 goto excess_failures; 671 goto excess_failures;
672 pr_warn("EEH: This PCI device has failed %d times in the last hour\n", 672 pr_warn("EEH: This PCI device has failed %d times in the last hour\n",
673 pe->freeze_count); 673 pe->freeze_count);
@@ -806,7 +806,7 @@ perm_error:
806 eeh_pe_dev_traverse(pe, eeh_report_failure, NULL); 806 eeh_pe_dev_traverse(pe, eeh_report_failure, NULL);
807 807
808 /* Mark the PE to be removed permanently */ 808 /* Mark the PE to be removed permanently */
809 pe->freeze_count = EEH_MAX_ALLOWED_FREEZES + 1; 809 eeh_pe_state_mark(pe, EEH_PE_REMOVED);
810 810
811 /* 811 /*
812 * Shut down the device drivers for good. We mark 812 * Shut down the device drivers for good. We mark
diff --git a/arch/powerpc/kernel/eeh_pe.c b/arch/powerpc/kernel/eeh_pe.c
index 5a63e2b0f65b..1e4946c36f9e 100644
--- a/arch/powerpc/kernel/eeh_pe.c
+++ b/arch/powerpc/kernel/eeh_pe.c
@@ -239,10 +239,18 @@ static void *__eeh_pe_get(void *data, void *flag)
239 if (pe->type & EEH_PE_PHB) 239 if (pe->type & EEH_PE_PHB)
240 return NULL; 240 return NULL;
241 241
242 /* We prefer PE address */ 242 /*
243 if (edev->pe_config_addr && 243 * We prefer PE address. For most cases, we should
244 (edev->pe_config_addr == pe->addr)) 244 * have non-zero PE address
245 */
246 if (eeh_has_flag(EEH_VALID_PE_ZERO)) {
247 if (edev->pe_config_addr == pe->addr)
248 return pe;
249 } else {
250 if (edev->pe_config_addr &&
251 (edev->pe_config_addr == pe->addr))
245 return pe; 252 return pe;
253 }
246 254
247 /* Try BDF address */ 255 /* Try BDF address */
248 if (edev->config_addr && 256 if (edev->config_addr &&
@@ -518,8 +526,7 @@ static void *__eeh_pe_state_mark(void *data, void *flag)
518 struct pci_dev *pdev; 526 struct pci_dev *pdev;
519 527
520 /* Keep the state of permanently removed PE intact */ 528 /* Keep the state of permanently removed PE intact */
521 if ((pe->freeze_count > EEH_MAX_ALLOWED_FREEZES) && 529 if (pe->state & EEH_PE_REMOVED)
522 (state & (EEH_PE_ISOLATED | EEH_PE_RECOVERING)))
523 return NULL; 530 return NULL;
524 531
525 pe->state |= state; 532 pe->state |= state;
@@ -592,8 +599,7 @@ static void *__eeh_pe_state_clear(void *data, void *flag)
592 struct pci_dev *pdev; 599 struct pci_dev *pdev;
593 600
594 /* Keep the state of permanently removed PE intact */ 601 /* Keep the state of permanently removed PE intact */
595 if ((pe->freeze_count > EEH_MAX_ALLOWED_FREEZES) && 602 if (pe->state & EEH_PE_REMOVED)
596 (state & EEH_PE_ISOLATED))
597 return NULL; 603 return NULL;
598 604
599 pe->state &= ~state; 605 pe->state &= ~state;
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 10a093579191..46fc0f4d8982 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -33,9 +33,6 @@
33#include <asm/ftrace.h> 33#include <asm/ftrace.h>
34#include <asm/ptrace.h> 34#include <asm/ptrace.h>
35 35
36#undef SHOW_SYSCALLS
37#undef SHOW_SYSCALLS_TASK
38
39/* 36/*
40 * MSR_KERNEL is > 0x10000 on 4xx/Book-E since it include MSR_CE. 37 * MSR_KERNEL is > 0x10000 on 4xx/Book-E since it include MSR_CE.
41 */ 38 */
@@ -307,9 +304,6 @@ _GLOBAL(DoSyscall)
307 lwz r11,_CCR(r1) /* Clear SO bit in CR */ 304 lwz r11,_CCR(r1) /* Clear SO bit in CR */
308 rlwinm r11,r11,0,4,2 305 rlwinm r11,r11,0,4,2
309 stw r11,_CCR(r1) 306 stw r11,_CCR(r1)
310#ifdef SHOW_SYSCALLS
311 bl do_show_syscall
312#endif /* SHOW_SYSCALLS */
313#ifdef CONFIG_TRACE_IRQFLAGS 307#ifdef CONFIG_TRACE_IRQFLAGS
314 /* Return from syscalls can (and generally will) hard enable 308 /* Return from syscalls can (and generally will) hard enable
315 * interrupts. You aren't supposed to call a syscall with 309 * interrupts. You aren't supposed to call a syscall with
@@ -337,7 +331,7 @@ _GLOBAL(DoSyscall)
337#endif /* CONFIG_TRACE_IRQFLAGS */ 331#endif /* CONFIG_TRACE_IRQFLAGS */
338 CURRENT_THREAD_INFO(r10, r1) 332 CURRENT_THREAD_INFO(r10, r1)
339 lwz r11,TI_FLAGS(r10) 333 lwz r11,TI_FLAGS(r10)
340 andi. r11,r11,_TIF_SYSCALL_T_OR_A 334 andi. r11,r11,_TIF_SYSCALL_DOTRACE
341 bne- syscall_dotrace 335 bne- syscall_dotrace
342syscall_dotrace_cont: 336syscall_dotrace_cont:
343 cmplwi 0,r0,NR_syscalls 337 cmplwi 0,r0,NR_syscalls
@@ -352,9 +346,6 @@ syscall_dotrace_cont:
352 blrl /* Call handler */ 346 blrl /* Call handler */
353 .globl ret_from_syscall 347 .globl ret_from_syscall
354ret_from_syscall: 348ret_from_syscall:
355#ifdef SHOW_SYSCALLS
356 bl do_show_syscall_exit
357#endif
358 mr r6,r3 349 mr r6,r3
359 CURRENT_THREAD_INFO(r12, r1) 350 CURRENT_THREAD_INFO(r12, r1)
360 /* disable interrupts so current_thread_info()->flags can't change */ 351 /* disable interrupts so current_thread_info()->flags can't change */
@@ -364,7 +355,7 @@ ret_from_syscall:
364 MTMSRD(r10) 355 MTMSRD(r10)
365 lwz r9,TI_FLAGS(r12) 356 lwz r9,TI_FLAGS(r12)
366 li r8,-_LAST_ERRNO 357 li r8,-_LAST_ERRNO
367 andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK) 358 andi. r0,r9,(_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK)
368 bne- syscall_exit_work 359 bne- syscall_exit_work
369 cmplw 0,r3,r8 360 cmplw 0,r3,r8
370 blt+ syscall_exit_cont 361 blt+ syscall_exit_cont
@@ -501,7 +492,7 @@ syscall_exit_work:
501 subi r12,r12,TI_FLAGS 492 subi r12,r12,TI_FLAGS
502 493
5034: /* Anything which requires enabling interrupts? */ 4944: /* Anything which requires enabling interrupts? */
504 andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP) 495 andi. r0,r9,(_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP)
505 beq ret_from_except 496 beq ret_from_except
506 497
507 /* Re-enable interrupts. There is no need to trace that with 498 /* Re-enable interrupts. There is no need to trace that with
@@ -523,74 +514,6 @@ syscall_exit_work:
523 bl do_syscall_trace_leave 514 bl do_syscall_trace_leave
524 b ret_from_except_full 515 b ret_from_except_full
525 516
526#ifdef SHOW_SYSCALLS
527do_show_syscall:
528#ifdef SHOW_SYSCALLS_TASK
529 lis r11,show_syscalls_task@ha
530 lwz r11,show_syscalls_task@l(r11)
531 cmp 0,r2,r11
532 bnelr
533#endif
534 stw r31,GPR31(r1)
535 mflr r31
536 lis r3,7f@ha
537 addi r3,r3,7f@l
538 lwz r4,GPR0(r1)
539 lwz r5,GPR3(r1)
540 lwz r6,GPR4(r1)
541 lwz r7,GPR5(r1)
542 lwz r8,GPR6(r1)
543 lwz r9,GPR7(r1)
544 bl printk
545 lis r3,77f@ha
546 addi r3,r3,77f@l
547 lwz r4,GPR8(r1)
548 mr r5,r2
549 bl printk
550 lwz r0,GPR0(r1)
551 lwz r3,GPR3(r1)
552 lwz r4,GPR4(r1)
553 lwz r5,GPR5(r1)
554 lwz r6,GPR6(r1)
555 lwz r7,GPR7(r1)
556 lwz r8,GPR8(r1)
557 mtlr r31
558 lwz r31,GPR31(r1)
559 blr
560
561do_show_syscall_exit:
562#ifdef SHOW_SYSCALLS_TASK
563 lis r11,show_syscalls_task@ha
564 lwz r11,show_syscalls_task@l(r11)
565 cmp 0,r2,r11
566 bnelr
567#endif
568 stw r31,GPR31(r1)
569 mflr r31
570 stw r3,RESULT(r1) /* Save result */
571 mr r4,r3
572 lis r3,79f@ha
573 addi r3,r3,79f@l
574 bl printk
575 lwz r3,RESULT(r1)
576 mtlr r31
577 lwz r31,GPR31(r1)
578 blr
579
5807: .string "syscall %d(%x, %x, %x, %x, %x, "
58177: .string "%x), current=%p\n"
58279: .string " -> %x\n"
583 .align 2,0
584
585#ifdef SHOW_SYSCALLS_TASK
586 .data
587 .globl show_syscalls_task
588show_syscalls_task:
589 .long -1
590 .text
591#endif
592#endif /* SHOW_SYSCALLS */
593
594/* 517/*
595 * The fork/clone functions need to copy the full register set into 518 * The fork/clone functions need to copy the full register set into
596 * the child process. Therefore we need to save all the nonvolatile 519 * the child process. Therefore we need to save all the nonvolatile
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 194e46dcf08d..d180caf2d6de 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -49,8 +49,6 @@ exception_marker:
49 .section ".text" 49 .section ".text"
50 .align 7 50 .align 7
51 51
52#undef SHOW_SYSCALLS
53
54 .globl system_call_common 52 .globl system_call_common
55system_call_common: 53system_call_common:
56 andi. r10,r12,MSR_PR 54 andi. r10,r12,MSR_PR
@@ -142,16 +140,9 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR)
142 li r10,1 140 li r10,1
143 std r10,SOFTE(r1) 141 std r10,SOFTE(r1)
144 142
145#ifdef SHOW_SYSCALLS
146 bl do_show_syscall
147 REST_GPR(0,r1)
148 REST_4GPRS(3,r1)
149 REST_2GPRS(7,r1)
150 addi r9,r1,STACK_FRAME_OVERHEAD
151#endif
152 CURRENT_THREAD_INFO(r11, r1) 143 CURRENT_THREAD_INFO(r11, r1)
153 ld r10,TI_FLAGS(r11) 144 ld r10,TI_FLAGS(r11)
154 andi. r11,r10,_TIF_SYSCALL_T_OR_A 145 andi. r11,r10,_TIF_SYSCALL_DOTRACE
155 bne syscall_dotrace 146 bne syscall_dotrace
156.Lsyscall_dotrace_cont: 147.Lsyscall_dotrace_cont:
157 cmpldi 0,r0,NR_syscalls 148 cmpldi 0,r0,NR_syscalls
@@ -178,12 +169,8 @@ system_call: /* label this so stack traces look sane */
178 mtctr r12 169 mtctr r12
179 bctrl /* Call handler */ 170 bctrl /* Call handler */
180 171
181syscall_exit: 172.Lsyscall_exit:
182 std r3,RESULT(r1) 173 std r3,RESULT(r1)
183#ifdef SHOW_SYSCALLS
184 bl do_show_syscall_exit
185 ld r3,RESULT(r1)
186#endif
187 CURRENT_THREAD_INFO(r12, r1) 174 CURRENT_THREAD_INFO(r12, r1)
188 175
189 ld r8,_MSR(r1) 176 ld r8,_MSR(r1)
@@ -214,7 +201,7 @@ syscall_exit:
214 201
215 ld r9,TI_FLAGS(r12) 202 ld r9,TI_FLAGS(r12)
216 li r11,-_LAST_ERRNO 203 li r11,-_LAST_ERRNO
217 andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK) 204 andi. r0,r9,(_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK)
218 bne- syscall_exit_work 205 bne- syscall_exit_work
219 cmpld r3,r11 206 cmpld r3,r11
220 ld r5,_CCR(r1) 207 ld r5,_CCR(r1)
@@ -270,7 +257,7 @@ syscall_dotrace:
270 257
271syscall_enosys: 258syscall_enosys:
272 li r3,-ENOSYS 259 li r3,-ENOSYS
273 b syscall_exit 260 b .Lsyscall_exit
274 261
275syscall_exit_work: 262syscall_exit_work:
276#ifdef CONFIG_PPC_BOOK3S 263#ifdef CONFIG_PPC_BOOK3S
@@ -307,7 +294,7 @@ syscall_exit_work:
307 294
3084: /* Anything else left to do? */ 2954: /* Anything else left to do? */
309 SET_DEFAULT_THREAD_PPR(r3, r10) /* Set thread.ppr = 3 */ 296 SET_DEFAULT_THREAD_PPR(r3, r10) /* Set thread.ppr = 3 */
310 andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP) 297 andi. r0,r9,(_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP)
311 beq ret_from_except_lite 298 beq ret_from_except_lite
312 299
313 /* Re-enable interrupts */ 300 /* Re-enable interrupts */
@@ -347,33 +334,33 @@ _GLOBAL(save_nvgprs)
347_GLOBAL(ppc_fork) 334_GLOBAL(ppc_fork)
348 bl save_nvgprs 335 bl save_nvgprs
349 bl sys_fork 336 bl sys_fork
350 b syscall_exit 337 b .Lsyscall_exit
351 338
352_GLOBAL(ppc_vfork) 339_GLOBAL(ppc_vfork)
353 bl save_nvgprs 340 bl save_nvgprs
354 bl sys_vfork 341 bl sys_vfork
355 b syscall_exit 342 b .Lsyscall_exit
356 343
357_GLOBAL(ppc_clone) 344_GLOBAL(ppc_clone)
358 bl save_nvgprs 345 bl save_nvgprs
359 bl sys_clone 346 bl sys_clone
360 b syscall_exit 347 b .Lsyscall_exit
361 348
362_GLOBAL(ppc32_swapcontext) 349_GLOBAL(ppc32_swapcontext)
363 bl save_nvgprs 350 bl save_nvgprs
364 bl compat_sys_swapcontext 351 bl compat_sys_swapcontext
365 b syscall_exit 352 b .Lsyscall_exit
366 353
367_GLOBAL(ppc64_swapcontext) 354_GLOBAL(ppc64_swapcontext)
368 bl save_nvgprs 355 bl save_nvgprs
369 bl sys_swapcontext 356 bl sys_swapcontext
370 b syscall_exit 357 b .Lsyscall_exit
371 358
372_GLOBAL(ret_from_fork) 359_GLOBAL(ret_from_fork)
373 bl schedule_tail 360 bl schedule_tail
374 REST_NVGPRS(r1) 361 REST_NVGPRS(r1)
375 li r3,0 362 li r3,0
376 b syscall_exit 363 b .Lsyscall_exit
377 364
378_GLOBAL(ret_from_kernel_thread) 365_GLOBAL(ret_from_kernel_thread)
379 bl schedule_tail 366 bl schedule_tail
@@ -385,7 +372,7 @@ _GLOBAL(ret_from_kernel_thread)
385#endif 372#endif
386 blrl 373 blrl
387 li r3,0 374 li r3,0
388 b syscall_exit 375 b .Lsyscall_exit
389 376
390/* 377/*
391 * This routine switches between two different tasks. The process 378 * This routine switches between two different tasks. The process
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index d99aac0d69f1..9b53fe139bf6 100644
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -319,36 +319,29 @@ InstructionTLBMiss:
319 * pin the first 8MB of kernel memory */ 319 * pin the first 8MB of kernel memory */
320 andis. r11, r10, 0x8000 /* Address >= 0x80000000 */ 320 andis. r11, r10, 0x8000 /* Address >= 0x80000000 */
321#endif 321#endif
322 mfspr r11, SPRN_M_TW /* Get level 1 table base address */ 322 mfspr r11, SPRN_M_TW /* Get level 1 table */
323#ifdef CONFIG_MODULES 323#ifdef CONFIG_MODULES
324 beq 3f 324 beq 3f
325 lis r11, (swapper_pg_dir-PAGE_OFFSET)@h 325 lis r11, (swapper_pg_dir-PAGE_OFFSET)@ha
326 ori r11, r11, (swapper_pg_dir-PAGE_OFFSET)@l
3273: 3263:
328#endif 327#endif
329 /* Extract level 1 index */ 328 /* Insert level 1 index */
330 rlwinm r10, r10, 32 - ((PAGE_SHIFT - 2) << 1), (PAGE_SHIFT - 2) << 1, 29 329 rlwimi r11, r10, 32 - ((PAGE_SHIFT - 2) << 1), (PAGE_SHIFT - 2) << 1, 29
331 lwzx r11, r10, r11 /* Get the level 1 entry */ 330 lwz r11, (swapper_pg_dir-PAGE_OFFSET)@l(r11) /* Get the level 1 entry */
332 rlwinm. r10, r11,0,0,19 /* Extract page descriptor page address */ 331
333 beq 2f /* If zero, don't try to find a pte */ 332 /* Load the MI_TWC with the attributes for this "segment." */
334
335 /* We have a pte table, so load the MI_TWC with the attributes
336 * for this "segment."
337 */
338 MTSPR_CPU6(SPRN_MI_TWC, r11, r3) /* Set segment attributes */ 333 MTSPR_CPU6(SPRN_MI_TWC, r11, r3) /* Set segment attributes */
339 mfspr r11, SPRN_SRR0 /* Get effective address of fault */ 334 rlwinm r11, r11,0,0,19 /* Extract page descriptor page address */
340 /* Extract level 2 index */ 335 /* Extract level 2 index */
341 rlwinm r11, r11, 32 - (PAGE_SHIFT - 2), 32 - PAGE_SHIFT, 29 336 rlwinm r10, r10, 32 - (PAGE_SHIFT - 2), 32 - PAGE_SHIFT, 29
342 lwzx r10, r10, r11 /* Get the pte */ 337 lwzx r10, r10, r11 /* Get the pte */
343 338
344#ifdef CONFIG_SWAP 339#ifdef CONFIG_SWAP
345 andi. r11, r10, _PAGE_ACCESSED | _PAGE_PRESENT 340 rlwinm r11, r10, 32-5, _PAGE_PRESENT
346 cmpwi cr0, r11, _PAGE_ACCESSED | _PAGE_PRESENT 341 and r11, r11, r10
347 li r11, RPN_PATTERN 342 rlwimi r10, r11, 0, _PAGE_PRESENT
348 bne- cr0, 2f
349#else
350 li r11, RPN_PATTERN
351#endif 343#endif
344 li r11, RPN_PATTERN
352 /* The Linux PTE won't go exactly into the MMU TLB. 345 /* The Linux PTE won't go exactly into the MMU TLB.
353 * Software indicator bits 21 and 28 must be clear. 346 * Software indicator bits 21 and 28 must be clear.
354 * Software indicator bits 24, 25, 26, and 27 must be 347 * Software indicator bits 24, 25, 26, and 27 must be
@@ -366,21 +359,6 @@ InstructionTLBMiss:
366 mfspr r10, SPRN_SPRG_SCRATCH2 359 mfspr r10, SPRN_SPRG_SCRATCH2
367 EXCEPTION_EPILOG_0 360 EXCEPTION_EPILOG_0
368 rfi 361 rfi
3692:
370 mfspr r10, SPRN_SRR1
371 /* clear all error bits as TLB Miss
372 * sets a few unconditionally
373 */
374 rlwinm r10, r10, 0, 0xffff
375 mtspr SPRN_SRR1, r10
376
377 /* Restore registers */
378#ifdef CONFIG_8xx_CPU6
379 mfspr r3, SPRN_DAR
380 mtspr SPRN_DAR, r11 /* Tag DAR */
381#endif
382 mfspr r10, SPRN_SPRG_SCRATCH2
383 b InstructionTLBError1
384 362
385 . = 0x1200 363 . = 0x1200
386DataStoreTLBMiss: 364DataStoreTLBMiss:
@@ -395,20 +373,16 @@ DataStoreTLBMiss:
395 * kernel page tables. 373 * kernel page tables.
396 */ 374 */
397 andis. r11, r10, 0x8000 375 andis. r11, r10, 0x8000
398 mfspr r11, SPRN_M_TW /* Get level 1 table base address */ 376 mfspr r11, SPRN_M_TW /* Get level 1 table */
399 beq 3f 377 beq 3f
400 lis r11, (swapper_pg_dir-PAGE_OFFSET)@h 378 lis r11, (swapper_pg_dir-PAGE_OFFSET)@ha
401 ori r11, r11, (swapper_pg_dir-PAGE_OFFSET)@l
4023: 3793:
403 /* Extract level 1 index */ 380 /* Insert level 1 index */
404 rlwinm r10, r10, 32 - ((PAGE_SHIFT - 2) << 1), (PAGE_SHIFT - 2) << 1, 29 381 rlwimi r11, r10, 32 - ((PAGE_SHIFT - 2) << 1), (PAGE_SHIFT - 2) << 1, 29
405 lwzx r11, r10, r11 /* Get the level 1 entry */ 382 lwz r11, (swapper_pg_dir-PAGE_OFFSET)@l(r11) /* Get the level 1 entry */
406 rlwinm. r10, r11,0,0,19 /* Extract page descriptor page address */
407 beq 2f /* If zero, don't try to find a pte */
408 383
409 /* We have a pte table, so load fetch the pte from the table. 384 /* We have a pte table, so load fetch the pte from the table.
410 */ 385 */
411 mfspr r10, SPRN_MD_EPN /* Get address of fault */
412 /* Extract level 2 index */ 386 /* Extract level 2 index */
413 rlwinm r10, r10, 32 - (PAGE_SHIFT - 2), 32 - PAGE_SHIFT, 29 387 rlwinm r10, r10, 32 - (PAGE_SHIFT - 2), 32 - PAGE_SHIFT, 29
414 rlwimi r10, r11, 0, 0, 32 - PAGE_SHIFT - 1 /* Add level 2 base */ 388 rlwimi r10, r11, 0, 0, 32 - PAGE_SHIFT - 1 /* Add level 2 base */
@@ -441,16 +415,13 @@ DataStoreTLBMiss:
441 and r11, r11, r10 415 and r11, r11, r10
442 rlwimi r10, r11, 0, _PAGE_PRESENT 416 rlwimi r10, r11, 0, _PAGE_PRESENT
443#endif 417#endif
444 /* invert RW */
445 xori r10, r10, _PAGE_RW
446
447 /* The Linux PTE won't go exactly into the MMU TLB. 418 /* The Linux PTE won't go exactly into the MMU TLB.
448 * Software indicator bits 22 and 28 must be clear. 419 * Software indicator bits 22 and 28 must be clear.
449 * Software indicator bits 24, 25, 26, and 27 must be 420 * Software indicator bits 24, 25, 26, and 27 must be
450 * set. All other Linux PTE bits control the behavior 421 * set. All other Linux PTE bits control the behavior
451 * of the MMU. 422 * of the MMU.
452 */ 423 */
4532: li r11, RPN_PATTERN 424 li r11, RPN_PATTERN
454 rlwimi r10, r11, 0, 24, 28 /* Set 24-27, clear 28 */ 425 rlwimi r10, r11, 0, 24, 28 /* Set 24-27, clear 28 */
455 MTSPR_CPU6(SPRN_MD_RPN, r10, r3) /* Update TLB entry */ 426 MTSPR_CPU6(SPRN_MD_RPN, r10, r3) /* Update TLB entry */
456 427
@@ -469,10 +440,7 @@ DataStoreTLBMiss:
469 */ 440 */
470 . = 0x1300 441 . = 0x1300
471InstructionTLBError: 442InstructionTLBError:
472 EXCEPTION_PROLOG_0 443 EXCEPTION_PROLOG
473InstructionTLBError1:
474 EXCEPTION_PROLOG_1
475 EXCEPTION_PROLOG_2
476 mr r4,r12 444 mr r4,r12
477 mr r5,r9 445 mr r5,r9
478 andis. r10,r5,0x4000 446 andis. r10,r5,0x4000
@@ -532,30 +500,21 @@ DARFixed:/* Return from dcbx instruction bug workaround */
532 /* define if you don't want to use self modifying code */ 500 /* define if you don't want to use self modifying code */
533#define NO_SELF_MODIFYING_CODE 501#define NO_SELF_MODIFYING_CODE
534FixupDAR:/* Entry point for dcbx workaround. */ 502FixupDAR:/* Entry point for dcbx workaround. */
535#ifdef CONFIG_8xx_CPU6
536 mtspr SPRN_DAR, r3
537#endif
538 mtspr SPRN_SPRG_SCRATCH2, r10 503 mtspr SPRN_SPRG_SCRATCH2, r10
539 /* fetch instruction from memory. */ 504 /* fetch instruction from memory. */
540 mfspr r10, SPRN_SRR0 505 mfspr r10, SPRN_SRR0
541 andis. r11, r10, 0x8000 /* Address >= 0x80000000 */ 506 andis. r11, r10, 0x8000 /* Address >= 0x80000000 */
542 mfspr r11, SPRN_M_TW /* Get level 1 table base address */ 507 mfspr r11, SPRN_M_TW /* Get level 1 table */
543 beq- 3f /* Branch if user space */ 508 beq 3f
544 lis r11, (swapper_pg_dir-PAGE_OFFSET)@h 509 lis r11, (swapper_pg_dir-PAGE_OFFSET)@ha
545 ori r11, r11, (swapper_pg_dir-PAGE_OFFSET)@l 510 /* Insert level 1 index */
546 /* Extract level 1 index */ 5113: rlwimi r11, r10, 32 - ((PAGE_SHIFT - 2) << 1), (PAGE_SHIFT - 2) << 1, 29
5473: rlwinm r10, r10, 32 - ((PAGE_SHIFT - 2) << 1), (PAGE_SHIFT - 2) << 1, 29 512 lwz r11, (swapper_pg_dir-PAGE_OFFSET)@l(r11) /* Get the level 1 entry */
548 lwzx r11, r10, r11 /* Get the level 1 entry */ 513 rlwinm r11, r11,0,0,19 /* Extract page descriptor page address */
549 rlwinm r10, r11,0,0,19 /* Extract page descriptor page address */ 514 /* Insert level 2 index */
550 mfspr r11, SPRN_SRR0 /* Get effective address of fault */ 515 rlwimi r11, r10, 32 - (PAGE_SHIFT - 2), 32 - PAGE_SHIFT, 29
551 /* Extract level 2 index */ 516 lwz r11, 0(r11) /* Get the pte */
552 rlwinm r11, r11, 32 - (PAGE_SHIFT - 2), 32 - PAGE_SHIFT, 29
553 lwzx r11, r10, r11 /* Get the pte */
554#ifdef CONFIG_8xx_CPU6
555 mfspr r3, SPRN_DAR
556#endif
557 /* concat physical page address(r11) and page offset(r10) */ 517 /* concat physical page address(r11) and page offset(r10) */
558 mfspr r10, SPRN_SRR0
559 rlwimi r11, r10, 0, 32 - PAGE_SHIFT, 31 518 rlwimi r11, r10, 0, 32 - PAGE_SHIFT, 31
560 lwz r11,0(r11) 519 lwz r11,0(r11)
561/* Check if it really is a dcbx instruction. */ 520/* Check if it really is a dcbx instruction. */
@@ -705,8 +664,7 @@ start_here:
705 * init's THREAD like the context switch code does, but this is 664 * init's THREAD like the context switch code does, but this is
706 * easier......until someone changes init's static structures. 665 * easier......until someone changes init's static structures.
707 */ 666 */
708 lis r6, swapper_pg_dir@h 667 lis r6, swapper_pg_dir@ha
709 ori r6, r6, swapper_pg_dir@l
710 tophys(r6,r6) 668 tophys(r6,r6)
711#ifdef CONFIG_8xx_CPU6 669#ifdef CONFIG_8xx_CPU6
712 lis r4, cpu6_errata_word@h 670 lis r4, cpu6_errata_word@h
@@ -885,23 +843,28 @@ _GLOBAL(set_context)
885 stw r4, 0x4(r5) 843 stw r4, 0x4(r5)
886#endif 844#endif
887 845
846 /* Register M_TW will contain base address of level 1 table minus the
847 * lower part of the kernel PGDIR base address, so that all accesses to
848 * level 1 table are done relative to lower part of kernel PGDIR base
849 * address.
850 */
851 li r5, (swapper_pg_dir-PAGE_OFFSET)@l
852 sub r4, r4, r5
853 tophys (r4, r4)
888#ifdef CONFIG_8xx_CPU6 854#ifdef CONFIG_8xx_CPU6
889 lis r6, cpu6_errata_word@h 855 lis r6, cpu6_errata_word@h
890 ori r6, r6, cpu6_errata_word@l 856 ori r6, r6, cpu6_errata_word@l
891 tophys (r4, r4)
892 li r7, 0x3f80 857 li r7, 0x3f80
893 stw r7, 12(r6) 858 stw r7, 12(r6)
894 lwz r7, 12(r6) 859 lwz r7, 12(r6)
895 mtspr SPRN_M_TW, r4 /* Update MMU base address */ 860#endif
861 mtspr SPRN_M_TW, r4 /* Update pointeur to level 1 table */
862#ifdef CONFIG_8xx_CPU6
896 li r7, 0x3380 863 li r7, 0x3380
897 stw r7, 12(r6) 864 stw r7, 12(r6)
898 lwz r7, 12(r6) 865 lwz r7, 12(r6)
899 mtspr SPRN_M_CASID, r3 /* Update context */
900#else
901 mtspr SPRN_M_CASID,r3 /* Update context */
902 tophys (r4, r4)
903 mtspr SPRN_M_TW, r4 /* and pgd */
904#endif 866#endif
867 mtspr SPRN_M_CASID, r3 /* Update context */
905 SYNC 868 SYNC
906 blr 869 blr
907 870
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c
index d6e195e8cd4c..5a23b69f8129 100644
--- a/arch/powerpc/kernel/paca.c
+++ b/arch/powerpc/kernel/paca.c
@@ -115,6 +115,14 @@ static struct slb_shadow * __init init_slb_shadow(int cpu)
115{ 115{
116 struct slb_shadow *s = &slb_shadow[cpu]; 116 struct slb_shadow *s = &slb_shadow[cpu];
117 117
118 /*
119 * When we come through here to initialise boot_paca, the slb_shadow
120 * buffers are not allocated yet. That's OK, we'll get one later in
121 * boot, but make sure we don't corrupt memory at 0.
122 */
123 if (!slb_shadow)
124 return NULL;
125
118 s->persistent = cpu_to_be32(SLB_NUM_BOLTED); 126 s->persistent = cpu_to_be32(SLB_NUM_BOLTED);
119 s->buffer_length = cpu_to_be32(sizeof(*s)); 127 s->buffer_length = cpu_to_be32(sizeof(*s));
120 128
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
index 1f61fab59d9b..83df3075d3df 100644
--- a/arch/powerpc/kernel/pci_dn.c
+++ b/arch/powerpc/kernel/pci_dn.c
@@ -147,10 +147,8 @@ void pci_devs_phb_init_dynamic(struct pci_controller *phb)
147 /* PHB nodes themselves must not match */ 147 /* PHB nodes themselves must not match */
148 update_dn_pci_info(dn, phb); 148 update_dn_pci_info(dn, phb);
149 pdn = dn->data; 149 pdn = dn->data;
150 if (pdn) { 150 if (pdn)
151 pdn->devfn = pdn->busno = -1; 151 pdn->devfn = pdn->busno = -1;
152 pdn->phb = phb;
153 }
154 152
155 /* Update dn->phb ptrs for new phb and children devices */ 153 /* Update dn->phb ptrs for new phb and children devices */
156 traverse_pci_devices(dn, update_dn_pci_info, phb); 154 traverse_pci_devices(dn, update_dn_pci_info, phb);
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 6a799b3cc6b4..b8e15c678960 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -652,9 +652,6 @@ void __init early_init_devtree(void *params)
652 if (!early_init_dt_verify(params)) 652 if (!early_init_dt_verify(params))
653 panic("BUG: Failed verifying flat device tree, bad version?"); 653 panic("BUG: Failed verifying flat device tree, bad version?");
654 654
655 /* Setup flat device-tree pointer */
656 initial_boot_params = params;
657
658#ifdef CONFIG_PPC_RTAS 655#ifdef CONFIG_PPC_RTAS
659 /* Some machines might need RTAS info for debugging, grab it now. */ 656 /* Some machines might need RTAS info for debugging, grab it now. */
660 of_scan_flat_dt(early_init_dt_scan_rtas, NULL); 657 of_scan_flat_dt(early_init_dt_scan_rtas, NULL);
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 4af905e81ab0..21c45a2d0706 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -897,7 +897,7 @@ int rtas_offline_cpus_mask(cpumask_var_t cpus)
897} 897}
898EXPORT_SYMBOL(rtas_offline_cpus_mask); 898EXPORT_SYMBOL(rtas_offline_cpus_mask);
899 899
900int rtas_ibm_suspend_me(struct rtas_args *args) 900int rtas_ibm_suspend_me(u64 handle, int *vasi_return)
901{ 901{
902 long state; 902 long state;
903 long rc; 903 long rc;
@@ -911,8 +911,7 @@ int rtas_ibm_suspend_me(struct rtas_args *args)
911 return -ENOSYS; 911 return -ENOSYS;
912 912
913 /* Make sure the state is valid */ 913 /* Make sure the state is valid */
914 rc = plpar_hcall(H_VASI_STATE, retbuf, 914 rc = plpar_hcall(H_VASI_STATE, retbuf, handle);
915 ((u64)args->args[0] << 32) | args->args[1]);
916 915
917 state = retbuf[0]; 916 state = retbuf[0];
918 917
@@ -920,12 +919,12 @@ int rtas_ibm_suspend_me(struct rtas_args *args)
920 printk(KERN_ERR "rtas_ibm_suspend_me: vasi_state returned %ld\n",rc); 919 printk(KERN_ERR "rtas_ibm_suspend_me: vasi_state returned %ld\n",rc);
921 return rc; 920 return rc;
922 } else if (state == H_VASI_ENABLED) { 921 } else if (state == H_VASI_ENABLED) {
923 args->args[args->nargs] = RTAS_NOT_SUSPENDABLE; 922 *vasi_return = RTAS_NOT_SUSPENDABLE;
924 return 0; 923 return 0;
925 } else if (state != H_VASI_SUSPENDING) { 924 } else if (state != H_VASI_SUSPENDING) {
926 printk(KERN_ERR "rtas_ibm_suspend_me: vasi_state returned state %ld\n", 925 printk(KERN_ERR "rtas_ibm_suspend_me: vasi_state returned state %ld\n",
927 state); 926 state);
928 args->args[args->nargs] = -1; 927 *vasi_return = -1;
929 return 0; 928 return 0;
930 } 929 }
931 930
@@ -973,7 +972,7 @@ out:
973 return atomic_read(&data.error); 972 return atomic_read(&data.error);
974} 973}
975#else /* CONFIG_PPC_PSERIES */ 974#else /* CONFIG_PPC_PSERIES */
976int rtas_ibm_suspend_me(struct rtas_args *args) 975int rtas_ibm_suspend_me(u64 handle, int *vasi_return)
977{ 976{
978 return -ENOSYS; 977 return -ENOSYS;
979} 978}
@@ -1053,7 +1052,16 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)
1053 1052
1054 /* Need to handle ibm,suspend_me call specially */ 1053 /* Need to handle ibm,suspend_me call specially */
1055 if (token == ibm_suspend_me_token) { 1054 if (token == ibm_suspend_me_token) {
1056 rc = rtas_ibm_suspend_me(&args); 1055
1056 /*
1057 * rtas_ibm_suspend_me assumes args are in cpu endian, or at least the
1058 * hcall within it requires it.
1059 */
1060 int vasi_rc = 0;
1061 u64 handle = ((u64)be32_to_cpu(args.args[0]) << 32)
1062 | be32_to_cpu(args.args[1]);
1063 rc = rtas_ibm_suspend_me(handle, &vasi_rc);
1064 args.rets[0] = cpu_to_be32(vasi_rc);
1057 if (rc) 1065 if (rc)
1058 return rc; 1066 return rc;
1059 goto copy_return; 1067 goto copy_return;
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 8b2d2dc8ef10..6e19afa35a15 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -434,20 +434,6 @@ void generic_cpu_die(unsigned int cpu)
434 printk(KERN_ERR "CPU%d didn't die...\n", cpu); 434 printk(KERN_ERR "CPU%d didn't die...\n", cpu);
435} 435}
436 436
437void generic_mach_cpu_die(void)
438{
439 unsigned int cpu;
440
441 local_irq_disable();
442 idle_task_exit();
443 cpu = smp_processor_id();
444 printk(KERN_DEBUG "CPU%d offline\n", cpu);
445 __this_cpu_write(cpu_state, CPU_DEAD);
446 smp_wmb();
447 while (__this_cpu_read(cpu_state) != CPU_UP_PREPARE)
448 cpu_relax();
449}
450
451void generic_set_cpu_dead(unsigned int cpu) 437void generic_set_cpu_dead(unsigned int cpu)
452{ 438{
453 per_cpu(cpu_state, cpu) = CPU_DEAD; 439 per_cpu(cpu_state, cpu) = CPU_DEAD;
diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
index cd9be9aa016d..b2702e87db0d 100644
--- a/arch/powerpc/kernel/syscalls.c
+++ b/arch/powerpc/kernel/syscalls.c
@@ -121,17 +121,3 @@ long ppc_fadvise64_64(int fd, int advice, u32 offset_high, u32 offset_low,
121 return sys_fadvise64(fd, (u64)offset_high << 32 | offset_low, 121 return sys_fadvise64(fd, (u64)offset_high << 32 | offset_low,
122 (u64)len_high << 32 | len_low, advice); 122 (u64)len_high << 32 | len_low, advice);
123} 123}
124
125void do_show_syscall(unsigned long r3, unsigned long r4, unsigned long r5,
126 unsigned long r6, unsigned long r7, unsigned long r8,
127 struct pt_regs *regs)
128{
129 printk("syscall %ld(%lx, %lx, %lx, %lx, %lx, %lx) regs=%p current=%p"
130 " cpu=%d\n", regs->gpr[0], r3, r4, r5, r6, r7, r8, regs,
131 current, smp_processor_id());
132}
133
134void do_show_syscall_exit(unsigned long r3)
135{
136 printk(" -> %lx, current=%p cpu=%d\n", r3, current, smp_processor_id());
137}
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index e6595b72269b..19e4744b6eba 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -1707,21 +1707,6 @@ void altivec_assist_exception(struct pt_regs *regs)
1707} 1707}
1708#endif /* CONFIG_ALTIVEC */ 1708#endif /* CONFIG_ALTIVEC */
1709 1709
1710#ifdef CONFIG_VSX
1711void vsx_assist_exception(struct pt_regs *regs)
1712{
1713 if (!user_mode(regs)) {
1714 printk(KERN_EMERG "VSX assist exception in kernel mode"
1715 " at %lx\n", regs->nip);
1716 die("Kernel VSX assist exception", regs, SIGILL);
1717 }
1718
1719 flush_vsx_to_thread(current);
1720 printk(KERN_INFO "VSX assist not supported at %lx\n", regs->nip);
1721 _exception(SIGILL, regs, ILL_ILLOPC, regs->nip);
1722}
1723#endif /* CONFIG_VSX */
1724
1725#ifdef CONFIG_FSL_BOOKE 1710#ifdef CONFIG_FSL_BOOKE
1726void CacheLockingException(struct pt_regs *regs, unsigned long address, 1711void CacheLockingException(struct pt_regs *regs, unsigned long address,
1727 unsigned long error_code) 1712 unsigned long error_code)
diff --git a/arch/powerpc/kvm/book3s_hv_interrupts.S b/arch/powerpc/kvm/book3s_hv_interrupts.S
index 36540a99d178..0fdc4a28970b 100644
--- a/arch/powerpc/kvm/book3s_hv_interrupts.S
+++ b/arch/powerpc/kvm/book3s_hv_interrupts.S
@@ -93,15 +93,15 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)
93 mfspr r5, SPRN_MMCR1 93 mfspr r5, SPRN_MMCR1
94 mfspr r9, SPRN_SIAR 94 mfspr r9, SPRN_SIAR
95 mfspr r10, SPRN_SDAR 95 mfspr r10, SPRN_SDAR
96 std r7, HSTATE_MMCR(r13) 96 std r7, HSTATE_MMCR0(r13)
97 std r5, HSTATE_MMCR + 8(r13) 97 std r5, HSTATE_MMCR1(r13)
98 std r6, HSTATE_MMCR + 16(r13) 98 std r6, HSTATE_MMCRA(r13)
99 std r9, HSTATE_MMCR + 24(r13) 99 std r9, HSTATE_SIAR(r13)
100 std r10, HSTATE_MMCR + 32(r13) 100 std r10, HSTATE_SDAR(r13)
101BEGIN_FTR_SECTION 101BEGIN_FTR_SECTION
102 mfspr r9, SPRN_SIER 102 mfspr r9, SPRN_SIER
103 std r8, HSTATE_MMCR + 40(r13) 103 std r8, HSTATE_MMCR2(r13)
104 std r9, HSTATE_MMCR + 48(r13) 104 std r9, HSTATE_SIER(r13)
105END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) 105END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)
106 mfspr r3, SPRN_PMC1 106 mfspr r3, SPRN_PMC1
107 mfspr r5, SPRN_PMC2 107 mfspr r5, SPRN_PMC2
@@ -109,12 +109,12 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)
109 mfspr r7, SPRN_PMC4 109 mfspr r7, SPRN_PMC4
110 mfspr r8, SPRN_PMC5 110 mfspr r8, SPRN_PMC5
111 mfspr r9, SPRN_PMC6 111 mfspr r9, SPRN_PMC6
112 stw r3, HSTATE_PMC(r13) 112 stw r3, HSTATE_PMC1(r13)
113 stw r5, HSTATE_PMC + 4(r13) 113 stw r5, HSTATE_PMC2(r13)
114 stw r6, HSTATE_PMC + 8(r13) 114 stw r6, HSTATE_PMC3(r13)
115 stw r7, HSTATE_PMC + 12(r13) 115 stw r7, HSTATE_PMC4(r13)
116 stw r8, HSTATE_PMC + 16(r13) 116 stw r8, HSTATE_PMC5(r13)
117 stw r9, HSTATE_PMC + 20(r13) 117 stw r9, HSTATE_PMC6(r13)
11831: 11831:
119 119
120 /* 120 /*
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index 10554df13852..bb94e6f20c81 100644
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -83,35 +83,35 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_207S)
83 cmpwi r4, 0 83 cmpwi r4, 0
84 beq 23f /* skip if not */ 84 beq 23f /* skip if not */
85BEGIN_FTR_SECTION 85BEGIN_FTR_SECTION
86 ld r3, HSTATE_MMCR(r13) 86 ld r3, HSTATE_MMCR0(r13)
87 andi. r4, r3, MMCR0_PMAO_SYNC | MMCR0_PMAO 87 andi. r4, r3, MMCR0_PMAO_SYNC | MMCR0_PMAO
88 cmpwi r4, MMCR0_PMAO 88 cmpwi r4, MMCR0_PMAO
89 beql kvmppc_fix_pmao 89 beql kvmppc_fix_pmao
90END_FTR_SECTION_IFSET(CPU_FTR_PMAO_BUG) 90END_FTR_SECTION_IFSET(CPU_FTR_PMAO_BUG)
91 lwz r3, HSTATE_PMC(r13) 91 lwz r3, HSTATE_PMC1(r13)
92 lwz r4, HSTATE_PMC + 4(r13) 92 lwz r4, HSTATE_PMC2(r13)
93 lwz r5, HSTATE_PMC + 8(r13) 93 lwz r5, HSTATE_PMC3(r13)
94 lwz r6, HSTATE_PMC + 12(r13) 94 lwz r6, HSTATE_PMC4(r13)
95 lwz r8, HSTATE_PMC + 16(r13) 95 lwz r8, HSTATE_PMC5(r13)
96 lwz r9, HSTATE_PMC + 20(r13) 96 lwz r9, HSTATE_PMC6(r13)
97 mtspr SPRN_PMC1, r3 97 mtspr SPRN_PMC1, r3
98 mtspr SPRN_PMC2, r4 98 mtspr SPRN_PMC2, r4
99 mtspr SPRN_PMC3, r5 99 mtspr SPRN_PMC3, r5
100 mtspr SPRN_PMC4, r6 100 mtspr SPRN_PMC4, r6
101 mtspr SPRN_PMC5, r8 101 mtspr SPRN_PMC5, r8
102 mtspr SPRN_PMC6, r9 102 mtspr SPRN_PMC6, r9
103 ld r3, HSTATE_MMCR(r13) 103 ld r3, HSTATE_MMCR0(r13)
104 ld r4, HSTATE_MMCR + 8(r13) 104 ld r4, HSTATE_MMCR1(r13)
105 ld r5, HSTATE_MMCR + 16(r13) 105 ld r5, HSTATE_MMCRA(r13)
106 ld r6, HSTATE_MMCR + 24(r13) 106 ld r6, HSTATE_SIAR(r13)
107 ld r7, HSTATE_MMCR + 32(r13) 107 ld r7, HSTATE_SDAR(r13)
108 mtspr SPRN_MMCR1, r4 108 mtspr SPRN_MMCR1, r4
109 mtspr SPRN_MMCRA, r5 109 mtspr SPRN_MMCRA, r5
110 mtspr SPRN_SIAR, r6 110 mtspr SPRN_SIAR, r6
111 mtspr SPRN_SDAR, r7 111 mtspr SPRN_SDAR, r7
112BEGIN_FTR_SECTION 112BEGIN_FTR_SECTION
113 ld r8, HSTATE_MMCR + 40(r13) 113 ld r8, HSTATE_MMCR2(r13)
114 ld r9, HSTATE_MMCR + 48(r13) 114 ld r9, HSTATE_SIER(r13)
115 mtspr SPRN_MMCR2, r8 115 mtspr SPRN_MMCR2, r8
116 mtspr SPRN_SIER, r9 116 mtspr SPRN_SIER, r9
117END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) 117END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 597562f69b2d..7902802a19a5 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -9,33 +9,30 @@ ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC)
9CFLAGS_REMOVE_code-patching.o = -pg 9CFLAGS_REMOVE_code-patching.o = -pg
10CFLAGS_REMOVE_feature-fixups.o = -pg 10CFLAGS_REMOVE_feature-fixups.o = -pg
11 11
12obj-y := string.o alloc.o \ 12obj-y += string.o alloc.o crtsavres.o ppc_ksyms.o code-patching.o \
13 crtsavres.o ppc_ksyms.o 13 feature-fixups.o
14
14obj-$(CONFIG_PPC32) += div64.o copy_32.o 15obj-$(CONFIG_PPC32) += div64.o copy_32.o
15 16
16obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \ 17obj64-y += copypage_64.o copyuser_64.o usercopy_64.o mem_64.o hweight_64.o \
17 usercopy_64.o mem_64.o string.o \ 18 copyuser_power7.o string_64.o copypage_power7.o memcpy_power7.o \
18 hweight_64.o \ 19 memcpy_64.o memcmp_64.o
19 copyuser_power7.o string_64.o copypage_power7.o 20
21obj64-$(CONFIG_SMP) += locks.o
22obj64-$(CONFIG_ALTIVEC) += vmx-helper.o
23
20ifeq ($(CONFIG_GENERIC_CSUM),) 24ifeq ($(CONFIG_GENERIC_CSUM),)
21obj-y += checksum_$(CONFIG_WORD_SIZE).o 25obj-y += checksum_$(CONFIG_WORD_SIZE).o
22obj-$(CONFIG_PPC64) += checksum_wrappers_64.o 26obj-$(CONFIG_PPC64) += checksum_wrappers_64.o
23endif 27endif
24 28
25obj-$(CONFIG_PPC64) += memcpy_power7.o memcpy_64.o
26
27obj-$(CONFIG_PPC_EMULATE_SSTEP) += sstep.o ldstfp.o 29obj-$(CONFIG_PPC_EMULATE_SSTEP) += sstep.o ldstfp.o
28 30
29ifeq ($(CONFIG_PPC64),y)
30obj-$(CONFIG_SMP) += locks.o
31obj-$(CONFIG_ALTIVEC) += vmx-helper.o
32endif
33
34obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o 31obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
35 32
36obj-y += code-patching.o
37obj-y += feature-fixups.o
38obj-$(CONFIG_FTR_FIXUP_SELFTEST) += feature-fixups-test.o 33obj-$(CONFIG_FTR_FIXUP_SELFTEST) += feature-fixups-test.o
39 34
40obj-$(CONFIG_ALTIVEC) += xor_vmx.o 35obj-$(CONFIG_ALTIVEC) += xor_vmx.o
41CFLAGS_xor_vmx.o += -maltivec -mabi=altivec 36CFLAGS_xor_vmx.o += -maltivec -mabi=altivec
37
38obj-$(CONFIG_PPC64) += $(obj64-y)
diff --git a/arch/powerpc/lib/memcmp_64.S b/arch/powerpc/lib/memcmp_64.S
new file mode 100644
index 000000000000..8953d2382a65
--- /dev/null
+++ b/arch/powerpc/lib/memcmp_64.S
@@ -0,0 +1,233 @@
1/*
2 * Author: Anton Blanchard <anton@au.ibm.com>
3 * Copyright 2015 IBM Corporation.
4 *
5 * This program is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU General Public License
7 * as published by the Free Software Foundation; either version
8 * 2 of the License, or (at your option) any later version.
9 */
10#include <asm/ppc_asm.h>
11
12#define off8 r6
13#define off16 r7
14#define off24 r8
15
16#define rA r9
17#define rB r10
18#define rC r11
19#define rD r27
20#define rE r28
21#define rF r29
22#define rG r30
23#define rH r31
24
25#ifdef __LITTLE_ENDIAN__
26#define LD ldbrx
27#else
28#define LD ldx
29#endif
30
31_GLOBAL(memcmp)
32 cmpdi cr1,r5,0
33
34 /* Use the short loop if both strings are not 8B aligned */
35 or r6,r3,r4
36 andi. r6,r6,7
37
38 /* Use the short loop if length is less than 32B */
39 cmpdi cr6,r5,31
40
41 beq cr1,.Lzero
42 bne .Lshort
43 bgt cr6,.Llong
44
45.Lshort:
46 mtctr r5
47
481: lbz rA,0(r3)
49 lbz rB,0(r4)
50 subf. rC,rB,rA
51 bne .Lnon_zero
52 bdz .Lzero
53
54 lbz rA,1(r3)
55 lbz rB,1(r4)
56 subf. rC,rB,rA
57 bne .Lnon_zero
58 bdz .Lzero
59
60 lbz rA,2(r3)
61 lbz rB,2(r4)
62 subf. rC,rB,rA
63 bne .Lnon_zero
64 bdz .Lzero
65
66 lbz rA,3(r3)
67 lbz rB,3(r4)
68 subf. rC,rB,rA
69 bne .Lnon_zero
70
71 addi r3,r3,4
72 addi r4,r4,4
73
74 bdnz 1b
75
76.Lzero:
77 li r3,0
78 blr
79
80.Lnon_zero:
81 mr r3,rC
82 blr
83
84.Llong:
85 li off8,8
86 li off16,16
87 li off24,24
88
89 std r31,-8(r1)
90 std r30,-16(r1)
91 std r29,-24(r1)
92 std r28,-32(r1)
93 std r27,-40(r1)
94
95 srdi r0,r5,5
96 mtctr r0
97 andi. r5,r5,31
98
99 LD rA,0,r3
100 LD rB,0,r4
101
102 LD rC,off8,r3
103 LD rD,off8,r4
104
105 LD rE,off16,r3
106 LD rF,off16,r4
107
108 LD rG,off24,r3
109 LD rH,off24,r4
110 cmpld cr0,rA,rB
111
112 addi r3,r3,32
113 addi r4,r4,32
114
115 bdz .Lfirst32
116
117 LD rA,0,r3
118 LD rB,0,r4
119 cmpld cr1,rC,rD
120
121 LD rC,off8,r3
122 LD rD,off8,r4
123 cmpld cr6,rE,rF
124
125 LD rE,off16,r3
126 LD rF,off16,r4
127 cmpld cr7,rG,rH
128 bne cr0,.LcmpAB
129
130 LD rG,off24,r3
131 LD rH,off24,r4
132 cmpld cr0,rA,rB
133 bne cr1,.LcmpCD
134
135 addi r3,r3,32
136 addi r4,r4,32
137
138 bdz .Lsecond32
139
140 .balign 16
141
1421: LD rA,0,r3
143 LD rB,0,r4
144 cmpld cr1,rC,rD
145 bne cr6,.LcmpEF
146
147 LD rC,off8,r3
148 LD rD,off8,r4
149 cmpld cr6,rE,rF
150 bne cr7,.LcmpGH
151
152 LD rE,off16,r3
153 LD rF,off16,r4
154 cmpld cr7,rG,rH
155 bne cr0,.LcmpAB
156
157 LD rG,off24,r3
158 LD rH,off24,r4
159 cmpld cr0,rA,rB
160 bne cr1,.LcmpCD
161
162 addi r3,r3,32
163 addi r4,r4,32
164
165 bdnz 1b
166
167.Lsecond32:
168 cmpld cr1,rC,rD
169 bne cr6,.LcmpEF
170
171 cmpld cr6,rE,rF
172 bne cr7,.LcmpGH
173
174 cmpld cr7,rG,rH
175 bne cr0,.LcmpAB
176
177 bne cr1,.LcmpCD
178 bne cr6,.LcmpEF
179 bne cr7,.LcmpGH
180
181.Ltail:
182 ld r31,-8(r1)
183 ld r30,-16(r1)
184 ld r29,-24(r1)
185 ld r28,-32(r1)
186 ld r27,-40(r1)
187
188 cmpdi r5,0
189 beq .Lzero
190 b .Lshort
191
192.Lfirst32:
193 cmpld cr1,rC,rD
194 cmpld cr6,rE,rF
195 cmpld cr7,rG,rH
196
197 bne cr0,.LcmpAB
198 bne cr1,.LcmpCD
199 bne cr6,.LcmpEF
200 bne cr7,.LcmpGH
201
202 b .Ltail
203
204.LcmpAB:
205 li r3,1
206 bgt cr0,.Lout
207 li r3,-1
208 b .Lout
209
210.LcmpCD:
211 li r3,1
212 bgt cr1,.Lout
213 li r3,-1
214 b .Lout
215
216.LcmpEF:
217 li r3,1
218 bgt cr6,.Lout
219 li r3,-1
220 b .Lout
221
222.LcmpGH:
223 li r3,1
224 bgt cr7,.Lout
225 li r3,-1
226
227.Lout:
228 ld r31,-8(r1)
229 ld r30,-16(r1)
230 ld r29,-24(r1)
231 ld r28,-32(r1)
232 ld r27,-40(r1)
233 blr
diff --git a/arch/powerpc/lib/string.S b/arch/powerpc/lib/string.S
index 1b5a0a09d609..c80fb49ce607 100644
--- a/arch/powerpc/lib/string.S
+++ b/arch/powerpc/lib/string.S
@@ -93,6 +93,7 @@ _GLOBAL(strlen)
93 subf r3,r3,r4 93 subf r3,r3,r4
94 blr 94 blr
95 95
96#ifdef CONFIG_PPC32
96_GLOBAL(memcmp) 97_GLOBAL(memcmp)
97 PPC_LCMPI 0,r5,0 98 PPC_LCMPI 0,r5,0
98 beq- 2f 99 beq- 2f
@@ -106,6 +107,7 @@ _GLOBAL(memcmp)
106 blr 107 blr
1072: li r3,0 1082: li r3,0
108 blr 109 blr
110#endif
109 111
110_GLOBAL(memchr) 112_GLOBAL(memchr)
111 PPC_LCMPI 0,r5,0 113 PPC_LCMPI 0,r5,0
diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c
index 94cd728166d3..b46912fee7cd 100644
--- a/arch/powerpc/mm/fsl_booke_mmu.c
+++ b/arch/powerpc/mm/fsl_booke_mmu.c
@@ -67,8 +67,6 @@ struct tlbcamrange {
67 phys_addr_t phys; 67 phys_addr_t phys;
68} tlbcam_addrs[NUM_TLBCAMS]; 68} tlbcam_addrs[NUM_TLBCAMS];
69 69
70extern unsigned int tlbcam_index;
71
72unsigned long tlbcam_sz(int idx) 70unsigned long tlbcam_sz(int idx)
73{ 71{
74 return tlbcam_addrs[idx].limit - tlbcam_addrs[idx].start + 1; 72 return tlbcam_addrs[idx].limit - tlbcam_addrs[idx].start + 1;
diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c
index 9cba6cba2e50..986afbc22c76 100644
--- a/arch/powerpc/mm/mmu_context_nohash.c
+++ b/arch/powerpc/mm/mmu_context_nohash.c
@@ -52,12 +52,15 @@
52#include <asm/mmu_context.h> 52#include <asm/mmu_context.h>
53#include <asm/tlbflush.h> 53#include <asm/tlbflush.h>
54 54
55#include "mmu_decl.h"
56
55static unsigned int first_context, last_context; 57static unsigned int first_context, last_context;
56static unsigned int next_context, nr_free_contexts; 58static unsigned int next_context, nr_free_contexts;
57static unsigned long *context_map; 59static unsigned long *context_map;
58static unsigned long *stale_map[NR_CPUS]; 60static unsigned long *stale_map[NR_CPUS];
59static struct mm_struct **context_mm; 61static struct mm_struct **context_mm;
60static DEFINE_RAW_SPINLOCK(context_lock); 62static DEFINE_RAW_SPINLOCK(context_lock);
63static bool no_selective_tlbil;
61 64
62#define CTX_MAP_SIZE \ 65#define CTX_MAP_SIZE \
63 (sizeof(unsigned long) * (last_context / BITS_PER_LONG + 1)) 66 (sizeof(unsigned long) * (last_context / BITS_PER_LONG + 1))
@@ -133,6 +136,38 @@ static unsigned int steal_context_smp(unsigned int id)
133} 136}
134#endif /* CONFIG_SMP */ 137#endif /* CONFIG_SMP */
135 138
139static unsigned int steal_all_contexts(void)
140{
141 struct mm_struct *mm;
142 int cpu = smp_processor_id();
143 unsigned int id;
144
145 for (id = first_context; id <= last_context; id++) {
146 /* Pick up the victim mm */
147 mm = context_mm[id];
148
149 pr_hardcont(" | steal %d from 0x%p", id, mm);
150
151 /* Mark this mm as having no context anymore */
152 mm->context.id = MMU_NO_CONTEXT;
153 if (id != first_context) {
154 context_mm[id] = NULL;
155 __clear_bit(id, context_map);
156#ifdef DEBUG_MAP_CONSISTENCY
157 mm->context.active = 0;
158#endif
159 }
160 __clear_bit(id, stale_map[cpu]);
161 }
162
163 /* Flush the TLB for all contexts (not to be used on SMP) */
164 _tlbil_all();
165
166 nr_free_contexts = last_context - first_context;
167
168 return first_context;
169}
170
136/* Note that this will also be called on SMP if all other CPUs are 171/* Note that this will also be called on SMP if all other CPUs are
137 * offlined, which means that it may be called for cpu != 0. For 172 * offlined, which means that it may be called for cpu != 0. For
138 * this to work, we somewhat assume that CPUs that are onlined 173 * this to work, we somewhat assume that CPUs that are onlined
@@ -241,7 +276,10 @@ void switch_mmu_context(struct mm_struct *prev, struct mm_struct *next)
241 goto stolen; 276 goto stolen;
242 } 277 }
243#endif /* CONFIG_SMP */ 278#endif /* CONFIG_SMP */
244 id = steal_context_up(id); 279 if (no_selective_tlbil)
280 id = steal_all_contexts();
281 else
282 id = steal_context_up(id);
245 goto stolen; 283 goto stolen;
246 } 284 }
247 nr_free_contexts--; 285 nr_free_contexts--;
@@ -407,12 +445,15 @@ void __init mmu_context_init(void)
407 if (mmu_has_feature(MMU_FTR_TYPE_8xx)) { 445 if (mmu_has_feature(MMU_FTR_TYPE_8xx)) {
408 first_context = 0; 446 first_context = 0;
409 last_context = 15; 447 last_context = 15;
448 no_selective_tlbil = true;
410 } else if (mmu_has_feature(MMU_FTR_TYPE_47x)) { 449 } else if (mmu_has_feature(MMU_FTR_TYPE_47x)) {
411 first_context = 1; 450 first_context = 1;
412 last_context = 65535; 451 last_context = 65535;
452 no_selective_tlbil = false;
413 } else { 453 } else {
414 first_context = 1; 454 first_context = 1;
415 last_context = 255; 455 last_context = 255;
456 no_selective_tlbil = false;
416 } 457 }
417 458
418#ifdef DEBUG_CLAMP_LAST_CONTEXT 459#ifdef DEBUG_CLAMP_LAST_CONTEXT
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index 50fad3801f30..03b1a3b0fbd5 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -63,7 +63,6 @@ void setbat(int index, unsigned long virt, phys_addr_t phys,
63#endif /* HAVE_BATS */ 63#endif /* HAVE_BATS */
64 64
65#ifdef HAVE_TLBCAM 65#ifdef HAVE_TLBCAM
66extern unsigned int tlbcam_index;
67extern phys_addr_t v_mapped_by_tlbcam(unsigned long va); 66extern phys_addr_t v_mapped_by_tlbcam(unsigned long va);
68extern unsigned long p_mapped_by_tlbcam(phys_addr_t pa); 67extern unsigned long p_mapped_by_tlbcam(phys_addr_t pa);
69#else /* !HAVE_TLBCAM */ 68#else /* !HAVE_TLBCAM */
@@ -73,13 +72,25 @@ extern unsigned long p_mapped_by_tlbcam(phys_addr_t pa);
73 72
74#define PGDIR_ORDER (32 + PGD_T_LOG2 - PGDIR_SHIFT) 73#define PGDIR_ORDER (32 + PGD_T_LOG2 - PGDIR_SHIFT)
75 74
75#ifndef CONFIG_PPC_4K_PAGES
76static struct kmem_cache *pgtable_cache;
77
78void pgtable_cache_init(void)
79{
80 pgtable_cache = kmem_cache_create("PGDIR cache", 1 << PGDIR_ORDER,
81 1 << PGDIR_ORDER, 0, NULL);
82 if (pgtable_cache == NULL)
83 panic("Couldn't allocate pgtable caches");
84}
85#endif
86
76pgd_t *pgd_alloc(struct mm_struct *mm) 87pgd_t *pgd_alloc(struct mm_struct *mm)
77{ 88{
78 pgd_t *ret; 89 pgd_t *ret;
79 90
80 /* pgdir take page or two with 4K pages and a page fraction otherwise */ 91 /* pgdir take page or two with 4K pages and a page fraction otherwise */
81#ifndef CONFIG_PPC_4K_PAGES 92#ifndef CONFIG_PPC_4K_PAGES
82 ret = kzalloc(1 << PGDIR_ORDER, GFP_KERNEL); 93 ret = kmem_cache_alloc(pgtable_cache, GFP_KERNEL | __GFP_ZERO);
83#else 94#else
84 ret = (pgd_t *)__get_free_pages(GFP_KERNEL|__GFP_ZERO, 95 ret = (pgd_t *)__get_free_pages(GFP_KERNEL|__GFP_ZERO,
85 PGDIR_ORDER - PAGE_SHIFT); 96 PGDIR_ORDER - PAGE_SHIFT);
@@ -90,7 +101,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
90void pgd_free(struct mm_struct *mm, pgd_t *pgd) 101void pgd_free(struct mm_struct *mm, pgd_t *pgd)
91{ 102{
92#ifndef CONFIG_PPC_4K_PAGES 103#ifndef CONFIG_PPC_4K_PAGES
93 kfree((void *)pgd); 104 kmem_cache_free(pgtable_cache, (void *)pgd);
94#else 105#else
95 free_pages((unsigned long)pgd, PGDIR_ORDER - PAGE_SHIFT); 106 free_pages((unsigned long)pgd, PGDIR_ORDER - PAGE_SHIFT);
96#endif 107#endif
@@ -147,7 +158,7 @@ void __iomem *
147ioremap_prot(phys_addr_t addr, unsigned long size, unsigned long flags) 158ioremap_prot(phys_addr_t addr, unsigned long size, unsigned long flags)
148{ 159{
149 /* writeable implies dirty for kernel addresses */ 160 /* writeable implies dirty for kernel addresses */
150 if (flags & _PAGE_RW) 161 if ((flags & (_PAGE_RW | _PAGE_RO)) != _PAGE_RO)
151 flags |= _PAGE_DIRTY | _PAGE_HWWRITE; 162 flags |= _PAGE_DIRTY | _PAGE_HWWRITE;
152 163
153 /* we don't want to let _PAGE_USER and _PAGE_EXEC leak out */ 164 /* we don't want to let _PAGE_USER and _PAGE_EXEC leak out */
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
index ded0ea1afde4..0f432a702870 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
@@ -645,35 +645,6 @@ void slice_set_user_psize(struct mm_struct *mm, unsigned int psize)
645 spin_unlock_irqrestore(&slice_convert_lock, flags); 645 spin_unlock_irqrestore(&slice_convert_lock, flags);
646} 646}
647 647
648void slice_set_psize(struct mm_struct *mm, unsigned long address,
649 unsigned int psize)
650{
651 unsigned char *hpsizes;
652 unsigned long i, flags;
653 u64 *lpsizes;
654
655 spin_lock_irqsave(&slice_convert_lock, flags);
656 if (address < SLICE_LOW_TOP) {
657 i = GET_LOW_SLICE_INDEX(address);
658 lpsizes = &mm->context.low_slices_psize;
659 *lpsizes = (*lpsizes & ~(0xful << (i * 4))) |
660 ((unsigned long) psize << (i * 4));
661 } else {
662 int index, mask_index;
663 i = GET_HIGH_SLICE_INDEX(address);
664 hpsizes = mm->context.high_slices_psize;
665 mask_index = i & 0x1;
666 index = i >> 1;
667 hpsizes[index] = (hpsizes[index] &
668 ~(0xf << (mask_index * 4))) |
669 (((unsigned long)psize) << (mask_index * 4));
670 }
671
672 spin_unlock_irqrestore(&slice_convert_lock, flags);
673
674 copro_flush_all_slbs(mm);
675}
676
677void slice_set_range_psize(struct mm_struct *mm, unsigned long start, 648void slice_set_range_psize(struct mm_struct *mm, unsigned long start,
678 unsigned long len, unsigned int psize) 649 unsigned long len, unsigned int psize)
679{ 650{
diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c
index f38ea4df6a85..cbd3d069897f 100644
--- a/arch/powerpc/mm/tlb_nohash.c
+++ b/arch/powerpc/mm/tlb_nohash.c
@@ -284,8 +284,15 @@ void __flush_tlb_page(struct mm_struct *mm, unsigned long vmaddr,
284 struct cpumask *cpu_mask; 284 struct cpumask *cpu_mask;
285 unsigned int pid; 285 unsigned int pid;
286 286
287 /*
288 * This function as well as __local_flush_tlb_page() must only be called
289 * for user contexts.
290 */
291 if (unlikely(WARN_ON(!mm)))
292 return;
293
287 preempt_disable(); 294 preempt_disable();
288 pid = mm ? mm->context.id : 0; 295 pid = mm->context.id;
289 if (unlikely(pid == MMU_NO_CONTEXT)) 296 if (unlikely(pid == MMU_NO_CONTEXT))
290 goto bail; 297 goto bail;
291 cpu_mask = mm_cpumask(mm); 298 cpu_mask = mm_cpumask(mm);
diff --git a/arch/powerpc/perf/core-fsl-emb.c b/arch/powerpc/perf/core-fsl-emb.c
index 4acaea01fe03..5d747b4cb8ee 100644
--- a/arch/powerpc/perf/core-fsl-emb.c
+++ b/arch/powerpc/perf/core-fsl-emb.c
@@ -330,9 +330,11 @@ static int fsl_emb_pmu_add(struct perf_event *event, int flags)
330 } 330 }
331 local64_set(&event->hw.prev_count, val); 331 local64_set(&event->hw.prev_count, val);
332 332
333 if (!(flags & PERF_EF_START)) { 333 if (unlikely(!(flags & PERF_EF_START))) {
334 event->hw.state = PERF_HES_STOPPED | PERF_HES_UPTODATE; 334 event->hw.state = PERF_HES_STOPPED | PERF_HES_UPTODATE;
335 val = 0; 335 val = 0;
336 } else {
337 event->hw.state &= ~(PERF_HES_STOPPED | PERF_HES_UPTODATE);
336 } 338 }
337 339
338 write_pmc(i, val); 340 write_pmc(i, val);
@@ -389,6 +391,7 @@ static void fsl_emb_pmu_del(struct perf_event *event, int flags)
389static void fsl_emb_pmu_start(struct perf_event *event, int ef_flags) 391static void fsl_emb_pmu_start(struct perf_event *event, int ef_flags)
390{ 392{
391 unsigned long flags; 393 unsigned long flags;
394 unsigned long val;
392 s64 left; 395 s64 left;
393 396
394 if (event->hw.idx < 0 || !event->hw.sample_period) 397 if (event->hw.idx < 0 || !event->hw.sample_period)
@@ -405,7 +408,10 @@ static void fsl_emb_pmu_start(struct perf_event *event, int ef_flags)
405 408
406 event->hw.state = 0; 409 event->hw.state = 0;
407 left = local64_read(&event->hw.period_left); 410 left = local64_read(&event->hw.period_left);
408 write_pmc(event->hw.idx, left); 411 val = 0;
412 if (left < 0x80000000L)
413 val = 0x80000000L - left;
414 write_pmc(event->hw.idx, val);
409 415
410 perf_event_update_userpage(event); 416 perf_event_update_userpage(event);
411 perf_pmu_enable(event->pmu); 417 perf_pmu_enable(event->pmu);
diff --git a/arch/powerpc/perf/hv-24x7-catalog.h b/arch/powerpc/perf/hv-24x7-catalog.h
index 21b19dd86d9c..69e2e1faf902 100644
--- a/arch/powerpc/perf/hv-24x7-catalog.h
+++ b/arch/powerpc/perf/hv-24x7-catalog.h
@@ -30,4 +30,29 @@ struct hv_24x7_catalog_page_0 {
30 __u8 reserved6[2]; 30 __u8 reserved6[2];
31} __packed; 31} __packed;
32 32
33struct hv_24x7_event_data {
34 __be16 length; /* in bytes, must be a multiple of 16 */
35 __u8 reserved1[2];
36 __u8 domain; /* Chip = 1, Core = 2 */
37 __u8 reserved2[1];
38 __be16 event_group_record_offs; /* in bytes, must be 8 byte aligned */
39 __be16 event_group_record_len; /* in bytes */
40
41 /* in bytes, offset from event_group_record */
42 __be16 event_counter_offs;
43
44 /* verified_state, unverified_state, caveat_state, broken_state, ... */
45 __be32 flags;
46
47 __be16 primary_group_ix;
48 __be16 group_count;
49 __be16 event_name_len;
50 __u8 remainder[];
51 /* __u8 event_name[event_name_len - 2]; */
52 /* __be16 event_description_len; */
53 /* __u8 event_desc[event_description_len - 2]; */
54 /* __be16 detailed_desc_len; */
55 /* __u8 detailed_desc[detailed_desc_len - 2]; */
56} __packed;
57
33#endif 58#endif
diff --git a/arch/powerpc/perf/hv-24x7-domains.h b/arch/powerpc/perf/hv-24x7-domains.h
new file mode 100644
index 000000000000..49c1efd50045
--- /dev/null
+++ b/arch/powerpc/perf/hv-24x7-domains.h
@@ -0,0 +1,28 @@
1
2/*
3 * DOMAIN(name, num, index_kind, is_physical)
4 *
5 * @name: An all caps token, suitable for use in generating an enum
6 * member and appending to an event name in sysfs.
7 *
8 * @num: The number corresponding to the domain as given in
9 * documentation. We assume the catalog domain and the hcall
10 * domain have the same numbering (so far they do), but this
11 * may need to be changed in the future.
12 *
13 * @index_kind: A stringifiable token describing the meaning of the index
14 * within the given domain. Must fit the parsing rules of the
15 * perf sysfs api.
16 *
17 * @is_physical: True if the domain is physical, false otherwise (if virtual).
18 *
19 * Note: The terms PHYS_CHIP, PHYS_CORE, VCPU correspond to physical chip,
20 * physical core and virtual processor in 24x7 Counters specifications.
21 */
22
23DOMAIN(PHYS_CHIP, 0x01, chip, true)
24DOMAIN(PHYS_CORE, 0x02, core, true)
25DOMAIN(VCPU_HOME_CORE, 0x03, vcpu, false)
26DOMAIN(VCPU_HOME_CHIP, 0x04, vcpu, false)
27DOMAIN(VCPU_HOME_NODE, 0x05, vcpu, false)
28DOMAIN(VCPU_REMOTE_NODE, 0x06, vcpu, false)
diff --git a/arch/powerpc/perf/hv-24x7.c b/arch/powerpc/perf/hv-24x7.c
index f162d0b8eea3..9445a824819e 100644
--- a/arch/powerpc/perf/hv-24x7.c
+++ b/arch/powerpc/perf/hv-24x7.c
@@ -13,16 +13,66 @@
13#define pr_fmt(fmt) "hv-24x7: " fmt 13#define pr_fmt(fmt) "hv-24x7: " fmt
14 14
15#include <linux/perf_event.h> 15#include <linux/perf_event.h>
16#include <linux/rbtree.h>
16#include <linux/module.h> 17#include <linux/module.h>
17#include <linux/slab.h> 18#include <linux/slab.h>
19#include <linux/vmalloc.h>
20
18#include <asm/firmware.h> 21#include <asm/firmware.h>
19#include <asm/hvcall.h> 22#include <asm/hvcall.h>
20#include <asm/io.h> 23#include <asm/io.h>
24#include <linux/byteorder/generic.h>
21 25
22#include "hv-24x7.h" 26#include "hv-24x7.h"
23#include "hv-24x7-catalog.h" 27#include "hv-24x7-catalog.h"
24#include "hv-common.h" 28#include "hv-common.h"
25 29
30static const char *event_domain_suffix(unsigned domain)
31{
32 switch (domain) {
33#define DOMAIN(n, v, x, c) \
34 case HV_PERF_DOMAIN_##n: \
35 return "__" #n;
36#include "hv-24x7-domains.h"
37#undef DOMAIN
38 default:
39 WARN(1, "unknown domain %d\n", domain);
40 return "__UNKNOWN_DOMAIN_SUFFIX";
41 }
42}
43
44static bool domain_is_valid(unsigned domain)
45{
46 switch (domain) {
47#define DOMAIN(n, v, x, c) \
48 case HV_PERF_DOMAIN_##n: \
49 /* fall through */
50#include "hv-24x7-domains.h"
51#undef DOMAIN
52 return true;
53 default:
54 return false;
55 }
56}
57
58static bool is_physical_domain(unsigned domain)
59{
60 switch (domain) {
61#define DOMAIN(n, v, x, c) \
62 case HV_PERF_DOMAIN_##n: \
63 return c;
64#include "hv-24x7-domains.h"
65#undef DOMAIN
66 default:
67 return false;
68 }
69}
70
71static bool catalog_entry_domain_is_valid(unsigned domain)
72{
73 return is_physical_domain(domain);
74}
75
26/* 76/*
27 * TODO: Merging events: 77 * TODO: Merging events:
28 * - Think of the hcall as an interface to a 4d array of counters: 78 * - Think of the hcall as an interface to a 4d array of counters:
@@ -44,13 +94,14 @@
44 94
45/* 95/*
46 * Example usage: 96 * Example usage:
47 * perf stat -e 'hv_24x7/domain=2,offset=8,starting_index=0,lpar=0xffffffff/' 97 * perf stat -e 'hv_24x7/domain=2,offset=8,vcpu=0,lpar=0xffffffff/'
48 */ 98 */
49 99
50/* u3 0-6, one of HV_24X7_PERF_DOMAIN */ 100/* u3 0-6, one of HV_24X7_PERF_DOMAIN */
51EVENT_DEFINE_RANGE_FORMAT(domain, config, 0, 3); 101EVENT_DEFINE_RANGE_FORMAT(domain, config, 0, 3);
52/* u16 */ 102/* u16 */
53EVENT_DEFINE_RANGE_FORMAT(starting_index, config, 16, 31); 103EVENT_DEFINE_RANGE_FORMAT(core, config, 16, 31);
104EVENT_DEFINE_RANGE_FORMAT(vcpu, config, 16, 31);
54/* u32, see "data_offset" */ 105/* u32, see "data_offset" */
55EVENT_DEFINE_RANGE_FORMAT(offset, config, 32, 63); 106EVENT_DEFINE_RANGE_FORMAT(offset, config, 32, 63);
56/* u16 */ 107/* u16 */
@@ -63,7 +114,8 @@ EVENT_DEFINE_RANGE(reserved3, config2, 0, 63);
63static struct attribute *format_attrs[] = { 114static struct attribute *format_attrs[] = {
64 &format_attr_domain.attr, 115 &format_attr_domain.attr,
65 &format_attr_offset.attr, 116 &format_attr_offset.attr,
66 &format_attr_starting_index.attr, 117 &format_attr_core.attr,
118 &format_attr_vcpu.attr,
67 &format_attr_lpar.attr, 119 &format_attr_lpar.attr,
68 NULL, 120 NULL,
69}; 121};
@@ -73,8 +125,115 @@ static struct attribute_group format_group = {
73 .attrs = format_attrs, 125 .attrs = format_attrs,
74}; 126};
75 127
128static struct attribute_group event_group = {
129 .name = "events",
130 /* .attrs is set in init */
131};
132
133static struct attribute_group event_desc_group = {
134 .name = "event_descs",
135 /* .attrs is set in init */
136};
137
138static struct attribute_group event_long_desc_group = {
139 .name = "event_long_descs",
140 /* .attrs is set in init */
141};
142
76static struct kmem_cache *hv_page_cache; 143static struct kmem_cache *hv_page_cache;
77 144
145static char *event_name(struct hv_24x7_event_data *ev, int *len)
146{
147 *len = be16_to_cpu(ev->event_name_len) - 2;
148 return (char *)ev->remainder;
149}
150
151static char *event_desc(struct hv_24x7_event_data *ev, int *len)
152{
153 unsigned nl = be16_to_cpu(ev->event_name_len);
154 __be16 *desc_len = (__be16 *)(ev->remainder + nl - 2);
155 *len = be16_to_cpu(*desc_len) - 2;
156 return (char *)ev->remainder + nl;
157}
158
159static char *event_long_desc(struct hv_24x7_event_data *ev, int *len)
160{
161 unsigned nl = be16_to_cpu(ev->event_name_len);
162 __be16 *desc_len_ = (__be16 *)(ev->remainder + nl - 2);
163 unsigned desc_len = be16_to_cpu(*desc_len_);
164 __be16 *long_desc_len = (__be16 *)(ev->remainder + nl + desc_len - 2);
165 *len = be16_to_cpu(*long_desc_len) - 2;
166 return (char *)ev->remainder + nl + desc_len;
167}
168
169static bool event_fixed_portion_is_within(struct hv_24x7_event_data *ev,
170 void *end)
171{
172 void *start = ev;
173
174 return (start + offsetof(struct hv_24x7_event_data, remainder)) < end;
175}
176
177/*
178 * Things we don't check:
179 * - padding for desc, name, and long/detailed desc is required to be '\0'
180 * bytes.
181 *
182 * Return NULL if we pass end,
183 * Otherwise return the address of the byte just following the event.
184 */
185static void *event_end(struct hv_24x7_event_data *ev, void *end)
186{
187 void *start = ev;
188 __be16 *dl_, *ldl_;
189 unsigned dl, ldl;
190 unsigned nl = be16_to_cpu(ev->event_name_len);
191
192 if (nl < 2) {
193 pr_debug("%s: name length too short: %d", __func__, nl);
194 return NULL;
195 }
196
197 if (start + nl > end) {
198 pr_debug("%s: start=%p + nl=%u > end=%p",
199 __func__, start, nl, end);
200 return NULL;
201 }
202
203 dl_ = (__be16 *)(ev->remainder + nl - 2);
204 if (!IS_ALIGNED((uintptr_t)dl_, 2))
205 pr_warn("desc len not aligned %p", dl_);
206 dl = be16_to_cpu(*dl_);
207 if (dl < 2) {
208 pr_debug("%s: desc len too short: %d", __func__, dl);
209 return NULL;
210 }
211
212 if (start + nl + dl > end) {
213 pr_debug("%s: (start=%p + nl=%u + dl=%u)=%p > end=%p",
214 __func__, start, nl, dl, start + nl + dl, end);
215 return NULL;
216 }
217
218 ldl_ = (__be16 *)(ev->remainder + nl + dl - 2);
219 if (!IS_ALIGNED((uintptr_t)ldl_, 2))
220 pr_warn("long desc len not aligned %p", ldl_);
221 ldl = be16_to_cpu(*ldl_);
222 if (ldl < 2) {
223 pr_debug("%s: long desc len too short (ldl=%u)",
224 __func__, ldl);
225 return NULL;
226 }
227
228 if (start + nl + dl + ldl > end) {
229 pr_debug("%s: start=%p + nl=%u + dl=%u + ldl=%u > end=%p",
230 __func__, start, nl, dl, ldl, end);
231 return NULL;
232 }
233
234 return start + nl + dl + ldl;
235}
236
78static unsigned long h_get_24x7_catalog_page_(unsigned long phys_4096, 237static unsigned long h_get_24x7_catalog_page_(unsigned long phys_4096,
79 unsigned long version, 238 unsigned long version,
80 unsigned long index) 239 unsigned long index)
@@ -97,6 +256,609 @@ static unsigned long h_get_24x7_catalog_page(char page[],
97 version, index); 256 version, index);
98} 257}
99 258
259static unsigned core_domains[] = {
260 HV_PERF_DOMAIN_PHYS_CORE,
261 HV_PERF_DOMAIN_VCPU_HOME_CORE,
262 HV_PERF_DOMAIN_VCPU_HOME_CHIP,
263 HV_PERF_DOMAIN_VCPU_HOME_NODE,
264 HV_PERF_DOMAIN_VCPU_REMOTE_NODE,
265};
266/* chip event data always yeilds a single event, core yeilds multiple */
267#define MAX_EVENTS_PER_EVENT_DATA ARRAY_SIZE(core_domains)
268
269static char *event_fmt(struct hv_24x7_event_data *event, unsigned domain)
270{
271 const char *sindex;
272 const char *lpar;
273
274 if (is_physical_domain(domain)) {
275 lpar = "0x0";
276 sindex = "core";
277 } else {
278 lpar = "?";
279 sindex = "vcpu";
280 }
281
282 return kasprintf(GFP_KERNEL,
283 "domain=0x%x,offset=0x%x,%s=?,lpar=%s",
284 domain,
285 be16_to_cpu(event->event_counter_offs) +
286 be16_to_cpu(event->event_group_record_offs),
287 sindex,
288 lpar);
289}
290
291/* Avoid trusting fw to NUL terminate strings */
292static char *memdup_to_str(char *maybe_str, int max_len, gfp_t gfp)
293{
294 return kasprintf(gfp, "%.*s", max_len, maybe_str);
295}
296
297static ssize_t device_show_string(struct device *dev,
298 struct device_attribute *attr, char *buf)
299{
300 struct dev_ext_attribute *d;
301
302 d = container_of(attr, struct dev_ext_attribute, attr);
303 return sprintf(buf, "%s\n", (char *)d->var);
304}
305
306static struct attribute *device_str_attr_create_(char *name, char *str)
307{
308 struct dev_ext_attribute *attr = kzalloc(sizeof(*attr), GFP_KERNEL);
309
310 if (!attr)
311 return NULL;
312
313 attr->var = str;
314 attr->attr.attr.name = name;
315 attr->attr.attr.mode = 0444;
316 attr->attr.show = device_show_string;
317 return &attr->attr.attr;
318}
319
320static struct attribute *device_str_attr_create(char *name, int name_max,
321 int name_nonce,
322 char *str, size_t str_max)
323{
324 char *n;
325 char *s = memdup_to_str(str, str_max, GFP_KERNEL);
326 struct attribute *a;
327
328 if (!s)
329 return NULL;
330
331 if (!name_nonce)
332 n = kasprintf(GFP_KERNEL, "%.*s", name_max, name);
333 else
334 n = kasprintf(GFP_KERNEL, "%.*s__%d", name_max, name,
335 name_nonce);
336 if (!n)
337 goto out_s;
338
339 a = device_str_attr_create_(n, s);
340 if (!a)
341 goto out_n;
342
343 return a;
344out_n:
345 kfree(n);
346out_s:
347 kfree(s);
348 return NULL;
349}
350
351static void device_str_attr_destroy(struct attribute *attr)
352{
353 struct dev_ext_attribute *d;
354
355 d = container_of(attr, struct dev_ext_attribute, attr.attr);
356 kfree(d->var);
357 kfree(d->attr.attr.name);
358 kfree(d);
359}
360
361static struct attribute *event_to_attr(unsigned ix,
362 struct hv_24x7_event_data *event,
363 unsigned domain,
364 int nonce)
365{
366 int event_name_len;
367 char *ev_name, *a_ev_name, *val;
368 const char *ev_suffix;
369 struct attribute *attr;
370
371 if (!domain_is_valid(domain)) {
372 pr_warn("catalog event %u has invalid domain %u\n",
373 ix, domain);
374 return NULL;
375 }
376
377 val = event_fmt(event, domain);
378 if (!val)
379 return NULL;
380
381 ev_suffix = event_domain_suffix(domain);
382 ev_name = event_name(event, &event_name_len);
383 if (!nonce)
384 a_ev_name = kasprintf(GFP_KERNEL, "%.*s%s",
385 (int)event_name_len, ev_name, ev_suffix);
386 else
387 a_ev_name = kasprintf(GFP_KERNEL, "%.*s%s__%d",
388 (int)event_name_len, ev_name, ev_suffix, nonce);
389
390
391 if (!a_ev_name)
392 goto out_val;
393
394 attr = device_str_attr_create_(a_ev_name, val);
395 if (!attr)
396 goto out_name;
397
398 return attr;
399out_name:
400 kfree(a_ev_name);
401out_val:
402 kfree(val);
403 return NULL;
404}
405
406static struct attribute *event_to_desc_attr(struct hv_24x7_event_data *event,
407 int nonce)
408{
409 int nl, dl;
410 char *name = event_name(event, &nl);
411 char *desc = event_desc(event, &dl);
412
413 /* If there isn't a description, don't create the sysfs file */
414 if (!dl)
415 return NULL;
416
417 return device_str_attr_create(name, nl, nonce, desc, dl);
418}
419
420static struct attribute *
421event_to_long_desc_attr(struct hv_24x7_event_data *event, int nonce)
422{
423 int nl, dl;
424 char *name = event_name(event, &nl);
425 char *desc = event_long_desc(event, &dl);
426
427 /* If there isn't a description, don't create the sysfs file */
428 if (!dl)
429 return NULL;
430
431 return device_str_attr_create(name, nl, nonce, desc, dl);
432}
433
434static ssize_t event_data_to_attrs(unsigned ix, struct attribute **attrs,
435 struct hv_24x7_event_data *event, int nonce)
436{
437 unsigned i;
438
439 switch (event->domain) {
440 case HV_PERF_DOMAIN_PHYS_CHIP:
441 *attrs = event_to_attr(ix, event, event->domain, nonce);
442 return 1;
443 case HV_PERF_DOMAIN_PHYS_CORE:
444 for (i = 0; i < ARRAY_SIZE(core_domains); i++) {
445 attrs[i] = event_to_attr(ix, event, core_domains[i],
446 nonce);
447 if (!attrs[i]) {
448 pr_warn("catalog event %u: individual attr %u "
449 "creation failure\n", ix, i);
450 for (; i; i--)
451 device_str_attr_destroy(attrs[i - 1]);
452 return -1;
453 }
454 }
455 return i;
456 default:
457 pr_warn("catalog event %u: domain %u is not allowed in the "
458 "catalog\n", ix, event->domain);
459 return -1;
460 }
461}
462
463static size_t event_to_attr_ct(struct hv_24x7_event_data *event)
464{
465 switch (event->domain) {
466 case HV_PERF_DOMAIN_PHYS_CHIP:
467 return 1;
468 case HV_PERF_DOMAIN_PHYS_CORE:
469 return ARRAY_SIZE(core_domains);
470 default:
471 return 0;
472 }
473}
474
475static unsigned long vmalloc_to_phys(void *v)
476{
477 struct page *p = vmalloc_to_page(v);
478
479 BUG_ON(!p);
480 return page_to_phys(p) + offset_in_page(v);
481}
482
483/* */
484struct event_uniq {
485 struct rb_node node;
486 const char *name;
487 int nl;
488 unsigned ct;
489 unsigned domain;
490};
491
492static int memord(const void *d1, size_t s1, const void *d2, size_t s2)
493{
494 if (s1 < s2)
495 return 1;
496 if (s2 > s1)
497 return -1;
498
499 return memcmp(d1, d2, s1);
500}
501
502static int ev_uniq_ord(const void *v1, size_t s1, unsigned d1, const void *v2,
503 size_t s2, unsigned d2)
504{
505 int r = memord(v1, s1, v2, s2);
506
507 if (r)
508 return r;
509 if (d1 > d2)
510 return 1;
511 if (d2 > d1)
512 return -1;
513 return 0;
514}
515
516static int event_uniq_add(struct rb_root *root, const char *name, int nl,
517 unsigned domain)
518{
519 struct rb_node **new = &(root->rb_node), *parent = NULL;
520 struct event_uniq *data;
521
522 /* Figure out where to put new node */
523 while (*new) {
524 struct event_uniq *it;
525 int result;
526
527 it = container_of(*new, struct event_uniq, node);
528 result = ev_uniq_ord(name, nl, domain, it->name, it->nl,
529 it->domain);
530
531 parent = *new;
532 if (result < 0)
533 new = &((*new)->rb_left);
534 else if (result > 0)
535 new = &((*new)->rb_right);
536 else {
537 it->ct++;
538 pr_info("found a duplicate event %.*s, ct=%u\n", nl,
539 name, it->ct);
540 return it->ct;
541 }
542 }
543
544 data = kmalloc(sizeof(*data), GFP_KERNEL);
545 if (!data)
546 return -ENOMEM;
547
548 *data = (struct event_uniq) {
549 .name = name,
550 .nl = nl,
551 .ct = 0,
552 .domain = domain,
553 };
554
555 /* Add new node and rebalance tree. */
556 rb_link_node(&data->node, parent, new);
557 rb_insert_color(&data->node, root);
558
559 /* data->ct */
560 return 0;
561}
562
563static void event_uniq_destroy(struct rb_root *root)
564{
565 /*
566 * the strings we point to are in the giant block of memory filled by
567 * the catalog, and are freed separately.
568 */
569 struct event_uniq *pos, *n;
570
571 rbtree_postorder_for_each_entry_safe(pos, n, root, node)
572 kfree(pos);
573}
574
575
576/*
577 * ensure the event structure's sizes are self consistent and don't cause us to
578 * read outside of the event
579 *
580 * On success, return the event length in bytes.
581 * Otherwise, return -1 (and print as appropriate).
582 */
583static ssize_t catalog_event_len_validate(struct hv_24x7_event_data *event,
584 size_t event_idx,
585 size_t event_data_bytes,
586 size_t event_entry_count,
587 size_t offset, void *end)
588{
589 ssize_t ev_len;
590 void *ev_end, *calc_ev_end;
591
592 if (offset >= event_data_bytes)
593 return -1;
594
595 if (event_idx >= event_entry_count) {
596 pr_devel("catalog event data has %zu bytes of padding after last event\n",
597 event_data_bytes - offset);
598 return -1;
599 }
600
601 if (!event_fixed_portion_is_within(event, end)) {
602 pr_warn("event %zu fixed portion is not within range\n",
603 event_idx);
604 return -1;
605 }
606
607 ev_len = be16_to_cpu(event->length);
608
609 if (ev_len % 16)
610 pr_info("event %zu has length %zu not divisible by 16: event=%pK\n",
611 event_idx, ev_len, event);
612
613 ev_end = (__u8 *)event + ev_len;
614 if (ev_end > end) {
615 pr_warn("event %zu has .length=%zu, ends after buffer end: ev_end=%pK > end=%pK, offset=%zu\n",
616 event_idx, ev_len, ev_end, end,
617 offset);
618 return -1;
619 }
620
621 calc_ev_end = event_end(event, end);
622 if (!calc_ev_end) {
623 pr_warn("event %zu has a calculated length which exceeds buffer length %zu: event=%pK end=%pK, offset=%zu\n",
624 event_idx, event_data_bytes, event, end,
625 offset);
626 return -1;
627 }
628
629 if (calc_ev_end > ev_end) {
630 pr_warn("event %zu exceeds it's own length: event=%pK, end=%pK, offset=%zu, calc_ev_end=%pK\n",
631 event_idx, event, ev_end, offset, calc_ev_end);
632 return -1;
633 }
634
635 return ev_len;
636}
637
638#define MAX_4K (SIZE_MAX / 4096)
639
640static void create_events_from_catalog(struct attribute ***events_,
641 struct attribute ***event_descs_,
642 struct attribute ***event_long_descs_)
643{
644 unsigned long hret;
645 size_t catalog_len, catalog_page_len, event_entry_count,
646 event_data_len, event_data_offs,
647 event_data_bytes, junk_events, event_idx, event_attr_ct, i,
648 attr_max, event_idx_last, desc_ct, long_desc_ct;
649 ssize_t ct, ev_len;
650 uint32_t catalog_version_num;
651 struct attribute **events, **event_descs, **event_long_descs;
652 struct hv_24x7_catalog_page_0 *page_0 =
653 kmem_cache_alloc(hv_page_cache, GFP_KERNEL);
654 void *page = page_0;
655 void *event_data, *end;
656 struct hv_24x7_event_data *event;
657 struct rb_root ev_uniq = RB_ROOT;
658
659 if (!page)
660 goto e_out;
661
662 hret = h_get_24x7_catalog_page(page, 0, 0);
663 if (hret)
664 goto e_free;
665
666 catalog_version_num = be64_to_cpu(page_0->version);
667 catalog_page_len = be32_to_cpu(page_0->length);
668
669 if (MAX_4K < catalog_page_len) {
670 pr_err("invalid page count: %zu\n", catalog_page_len);
671 goto e_free;
672 }
673
674 catalog_len = catalog_page_len * 4096;
675
676 event_entry_count = be16_to_cpu(page_0->event_entry_count);
677 event_data_offs = be16_to_cpu(page_0->event_data_offs);
678 event_data_len = be16_to_cpu(page_0->event_data_len);
679
680 pr_devel("cv %zu cl %zu eec %zu edo %zu edl %zu\n",
681 (size_t)catalog_version_num, catalog_len,
682 event_entry_count, event_data_offs, event_data_len);
683
684 if ((MAX_4K < event_data_len)
685 || (MAX_4K < event_data_offs)
686 || (MAX_4K - event_data_offs < event_data_len)) {
687 pr_err("invalid event data offs %zu and/or len %zu\n",
688 event_data_offs, event_data_len);
689 goto e_free;
690 }
691
692 if ((event_data_offs + event_data_len) > catalog_page_len) {
693 pr_err("event data %zu-%zu does not fit inside catalog 0-%zu\n",
694 event_data_offs,
695 event_data_offs + event_data_len,
696 catalog_page_len);
697 goto e_free;
698 }
699
700 if (SIZE_MAX / MAX_EVENTS_PER_EVENT_DATA - 1 < event_entry_count) {
701 pr_err("event_entry_count %zu is invalid\n",
702 event_entry_count);
703 goto e_free;
704 }
705
706 event_data_bytes = event_data_len * 4096;
707
708 /*
709 * event data can span several pages, events can cross between these
710 * pages. Use vmalloc to make this easier.
711 */
712 event_data = vmalloc(event_data_bytes);
713 if (!event_data) {
714 pr_err("could not allocate event data\n");
715 goto e_free;
716 }
717
718 end = event_data + event_data_bytes;
719
720 /*
721 * using vmalloc_to_phys() like this only works if PAGE_SIZE is
722 * divisible by 4096
723 */
724 BUILD_BUG_ON(PAGE_SIZE % 4096);
725
726 for (i = 0; i < event_data_len; i++) {
727 hret = h_get_24x7_catalog_page_(
728 vmalloc_to_phys(event_data + i * 4096),
729 catalog_version_num,
730 i + event_data_offs);
731 if (hret) {
732 pr_err("failed to get event data in page %zu\n",
733 i + event_data_offs);
734 goto e_event_data;
735 }
736 }
737
738 /*
739 * scan the catalog to determine the number of attributes we need, and
740 * verify it at the same time.
741 */
742 for (junk_events = 0, event = event_data, event_idx = 0, attr_max = 0;
743 ;
744 event_idx++, event = (void *)event + ev_len) {
745 size_t offset = (void *)event - (void *)event_data;
746 char *name;
747 int nl;
748
749 ev_len = catalog_event_len_validate(event, event_idx,
750 event_data_bytes,
751 event_entry_count,
752 offset, end);
753 if (ev_len < 0)
754 break;
755
756 name = event_name(event, &nl);
757
758 if (event->event_group_record_len == 0) {
759 pr_devel("invalid event %zu (%.*s): group_record_len == 0, skipping\n",
760 event_idx, nl, name);
761 junk_events++;
762 continue;
763 }
764
765 if (!catalog_entry_domain_is_valid(event->domain)) {
766 pr_info("event %zu (%.*s) has invalid domain %d\n",
767 event_idx, nl, name, event->domain);
768 junk_events++;
769 continue;
770 }
771
772 attr_max += event_to_attr_ct(event);
773 }
774
775 event_idx_last = event_idx;
776 if (event_idx_last != event_entry_count)
777 pr_warn("event buffer ended before listed # of events were parsed (got %zu, wanted %zu, junk %zu)\n",
778 event_idx_last, event_entry_count, junk_events);
779
780 events = kmalloc_array(attr_max + 1, sizeof(*events), GFP_KERNEL);
781 if (!events)
782 goto e_event_data;
783
784 event_descs = kmalloc_array(event_idx + 1, sizeof(*event_descs),
785 GFP_KERNEL);
786 if (!event_descs)
787 goto e_event_attrs;
788
789 event_long_descs = kmalloc_array(event_idx + 1,
790 sizeof(*event_long_descs), GFP_KERNEL);
791 if (!event_long_descs)
792 goto e_event_descs;
793
794 /* Iterate over the catalog filling in the attribute vector */
795 for (junk_events = 0, event_attr_ct = 0, desc_ct = 0, long_desc_ct = 0,
796 event = event_data, event_idx = 0;
797 event_idx < event_idx_last;
798 event_idx++, ev_len = be16_to_cpu(event->length),
799 event = (void *)event + ev_len) {
800 char *name;
801 int nl;
802 int nonce;
803 /*
804 * these are the only "bad" events that are intermixed and that
805 * we can ignore without issue. make sure to skip them here
806 */
807 if (event->event_group_record_len == 0)
808 continue;
809 if (!catalog_entry_domain_is_valid(event->domain))
810 continue;
811
812 name = event_name(event, &nl);
813 nonce = event_uniq_add(&ev_uniq, name, nl, event->domain);
814 ct = event_data_to_attrs(event_idx, events + event_attr_ct,
815 event, nonce);
816 if (ct <= 0) {
817 pr_warn("event %zu (%.*s) creation failure, skipping\n",
818 event_idx, nl, name);
819 junk_events++;
820 } else {
821 event_attr_ct += ct;
822 event_descs[desc_ct] = event_to_desc_attr(event, nonce);
823 if (event_descs[desc_ct])
824 desc_ct++;
825 event_long_descs[long_desc_ct] =
826 event_to_long_desc_attr(event, nonce);
827 if (event_long_descs[long_desc_ct])
828 long_desc_ct++;
829 }
830 }
831
832 pr_info("read %zu catalog entries, created %zu event attrs (%zu failures), %zu descs\n",
833 event_idx, event_attr_ct, junk_events, desc_ct);
834
835 events[event_attr_ct] = NULL;
836 event_descs[desc_ct] = NULL;
837 event_long_descs[long_desc_ct] = NULL;
838
839 event_uniq_destroy(&ev_uniq);
840 vfree(event_data);
841 kmem_cache_free(hv_page_cache, page);
842
843 *events_ = events;
844 *event_descs_ = event_descs;
845 *event_long_descs_ = event_long_descs;
846 return;
847
848e_event_descs:
849 kfree(event_descs);
850e_event_attrs:
851 kfree(events);
852e_event_data:
853 vfree(event_data);
854e_free:
855 kmem_cache_free(hv_page_cache, page);
856e_out:
857 *events_ = NULL;
858 *event_descs_ = NULL;
859 *event_long_descs_ = NULL;
860}
861
100static ssize_t catalog_read(struct file *filp, struct kobject *kobj, 862static ssize_t catalog_read(struct file *filp, struct kobject *kobj,
101 struct bin_attribute *bin_attr, char *buf, 863 struct bin_attribute *bin_attr, char *buf,
102 loff_t offset, size_t count) 864 loff_t offset, size_t count)
@@ -207,16 +969,13 @@ static struct attribute_group if_group = {
207 969
208static const struct attribute_group *attr_groups[] = { 970static const struct attribute_group *attr_groups[] = {
209 &format_group, 971 &format_group,
972 &event_group,
973 &event_desc_group,
974 &event_long_desc_group,
210 &if_group, 975 &if_group,
211 NULL, 976 NULL,
212}; 977};
213 978
214static bool is_physical_domain(int domain)
215{
216 return domain == HV_24X7_PERF_DOMAIN_PHYSICAL_CHIP ||
217 domain == HV_24X7_PERF_DOMAIN_PHYSICAL_CORE;
218}
219
220DEFINE_PER_CPU(char, hv_24x7_reqb[4096]) __aligned(4096); 979DEFINE_PER_CPU(char, hv_24x7_reqb[4096]) __aligned(4096);
221DEFINE_PER_CPU(char, hv_24x7_resb[4096]) __aligned(4096); 980DEFINE_PER_CPU(char, hv_24x7_resb[4096]) __aligned(4096);
222 981
@@ -291,9 +1050,17 @@ out:
291static unsigned long event_24x7_request(struct perf_event *event, u64 *res, 1050static unsigned long event_24x7_request(struct perf_event *event, u64 *res,
292 bool success_expected) 1051 bool success_expected)
293{ 1052{
1053 u16 idx;
1054 unsigned domain = event_get_domain(event);
1055
1056 if (is_physical_domain(domain))
1057 idx = event_get_core(event);
1058 else
1059 idx = event_get_vcpu(event);
1060
294 return single_24x7_request(event_get_domain(event), 1061 return single_24x7_request(event_get_domain(event),
295 event_get_offset(event), 1062 event_get_offset(event),
296 event_get_starting_index(event), 1063 idx,
297 event_get_lpar(event), 1064 event_get_lpar(event),
298 res, 1065 res,
299 success_expected); 1066 success_expected);
@@ -356,7 +1123,7 @@ static int h_24x7_event_init(struct perf_event *event)
356 return -EIO; 1123 return -EIO;
357 } 1124 }
358 1125
359 /* PHYSICAL domains & other lpars require extra capabilities */ 1126 /* Physical domains & other lpars require extra capabilities */
360 if (!caps.collect_privileged && (is_physical_domain(domain) || 1127 if (!caps.collect_privileged && (is_physical_domain(domain) ||
361 (event_get_lpar(event) != event_get_lpar_max()))) { 1128 (event_get_lpar(event) != event_get_lpar_max()))) {
362 pr_devel("hv permisions disallow: is_physical_domain:%d, lpar=0x%llx\n", 1129 pr_devel("hv permisions disallow: is_physical_domain:%d, lpar=0x%llx\n",
@@ -452,6 +1219,10 @@ static int hv_24x7_init(void)
452 /* sampling not supported */ 1219 /* sampling not supported */
453 h_24x7_pmu.capabilities |= PERF_PMU_CAP_NO_INTERRUPT; 1220 h_24x7_pmu.capabilities |= PERF_PMU_CAP_NO_INTERRUPT;
454 1221
1222 create_events_from_catalog(&event_group.attrs,
1223 &event_desc_group.attrs,
1224 &event_long_desc_group.attrs);
1225
455 r = perf_pmu_register(&h_24x7_pmu, h_24x7_pmu.name, -1); 1226 r = perf_pmu_register(&h_24x7_pmu, h_24x7_pmu.name, -1);
456 if (r) 1227 if (r)
457 return r; 1228 return r;
diff --git a/arch/powerpc/perf/hv-24x7.h b/arch/powerpc/perf/hv-24x7.h
index 720ebce4b435..69cd4e690f58 100644
--- a/arch/powerpc/perf/hv-24x7.h
+++ b/arch/powerpc/perf/hv-24x7.h
@@ -3,14 +3,14 @@
3 3
4#include <linux/types.h> 4#include <linux/types.h>
5 5
6enum hv_perf_domains {
7#define DOMAIN(n, v, x, c) HV_PERF_DOMAIN_##n = v,
8#include "hv-24x7-domains.h"
9#undef DOMAIN
10};
11
6struct hv_24x7_request { 12struct hv_24x7_request {
7 /* PHYSICAL domains require enabling via phyp/hmc. */ 13 /* PHYSICAL domains require enabling via phyp/hmc. */
8#define HV_24X7_PERF_DOMAIN_PHYSICAL_CHIP 0x01
9#define HV_24X7_PERF_DOMAIN_PHYSICAL_CORE 0x02
10#define HV_24X7_PERF_DOMAIN_VIRTUAL_PROCESSOR_HOME_CORE 0x03
11#define HV_24X7_PERF_DOMAIN_VIRTUAL_PROCESSOR_HOME_CHIP 0x04
12#define HV_24X7_PERF_DOMAIN_VIRTUAL_PROCESSOR_HOME_NODE 0x05
13#define HV_24X7_PERF_DOMAIN_VIRTUAL_PROCESSOR_REMOTE_NODE 0x06
14 __u8 performance_domain; 14 __u8 performance_domain;
15 __u8 reserved[0x1]; 15 __u8 reserved[0x1];
16 16
diff --git a/arch/powerpc/perf/hv-common.c b/arch/powerpc/perf/hv-common.c
index 47e02b366f58..7dce8f109967 100644
--- a/arch/powerpc/perf/hv-common.c
+++ b/arch/powerpc/perf/hv-common.c
@@ -9,13 +9,13 @@ unsigned long hv_perf_caps_get(struct hv_perf_caps *caps)
9 unsigned long r; 9 unsigned long r;
10 struct p { 10 struct p {
11 struct hv_get_perf_counter_info_params params; 11 struct hv_get_perf_counter_info_params params;
12 struct cv_system_performance_capabilities caps; 12 struct hv_gpci_system_performance_capabilities caps;
13 } __packed __aligned(sizeof(uint64_t)); 13 } __packed __aligned(sizeof(uint64_t));
14 14
15 struct p arg = { 15 struct p arg = {
16 .params = { 16 .params = {
17 .counter_request = cpu_to_be32( 17 .counter_request = cpu_to_be32(
18 CIR_SYSTEM_PERFORMANCE_CAPABILITIES), 18 HV_GPCI_system_performance_capabilities),
19 .starting_index = cpu_to_be32(-1), 19 .starting_index = cpu_to_be32(-1),
20 .counter_info_version_in = 0, 20 .counter_info_version_in = 0,
21 } 21 }
@@ -31,9 +31,9 @@ unsigned long hv_perf_caps_get(struct hv_perf_caps *caps)
31 31
32 caps->version = arg.params.counter_info_version_out; 32 caps->version = arg.params.counter_info_version_out;
33 caps->collect_privileged = !!arg.caps.perf_collect_privileged; 33 caps->collect_privileged = !!arg.caps.perf_collect_privileged;
34 caps->ga = !!(arg.caps.capability_mask & CV_CM_GA); 34 caps->ga = !!(arg.caps.capability_mask & HV_GPCI_CM_GA);
35 caps->expanded = !!(arg.caps.capability_mask & CV_CM_EXPANDED); 35 caps->expanded = !!(arg.caps.capability_mask & HV_GPCI_CM_EXPANDED);
36 caps->lab = !!(arg.caps.capability_mask & CV_CM_LAB); 36 caps->lab = !!(arg.caps.capability_mask & HV_GPCI_CM_LAB);
37 37
38 return r; 38 return r;
39} 39}
diff --git a/arch/powerpc/perf/hv-common.h b/arch/powerpc/perf/hv-common.h
index 5d79cecbd73d..349aaba4d2d1 100644
--- a/arch/powerpc/perf/hv-common.h
+++ b/arch/powerpc/perf/hv-common.h
@@ -20,6 +20,16 @@ unsigned long hv_perf_caps_get(struct hv_perf_caps *caps);
20PMU_FORMAT_ATTR(name, #attr_var ":" #bit_start "-" #bit_end); \ 20PMU_FORMAT_ATTR(name, #attr_var ":" #bit_start "-" #bit_end); \
21EVENT_DEFINE_RANGE(name, attr_var, bit_start, bit_end) 21EVENT_DEFINE_RANGE(name, attr_var, bit_start, bit_end)
22 22
23/*
24 * The EVENT_DEFINE_RANGE_FORMAT() macro above includes helper functions
25 * for the fields (eg: event_get_starting_index()). For some fields we
26 * need the bit-range definition, but no the helper functions. Define a
27 * lite version of the above macro without the helpers and silence
28 * compiler warnings unused static functions.
29 */
30#define EVENT_DEFINE_RANGE_FORMAT_LITE(name, attr_var, bit_start, bit_end) \
31PMU_FORMAT_ATTR(name, #attr_var ":" #bit_start "-" #bit_end);
32
23#define EVENT_DEFINE_RANGE(name, attr_var, bit_start, bit_end) \ 33#define EVENT_DEFINE_RANGE(name, attr_var, bit_start, bit_end) \
24static u64 event_get_##name##_max(void) \ 34static u64 event_get_##name##_max(void) \
25{ \ 35{ \
diff --git a/arch/powerpc/perf/hv-gpci-requests.h b/arch/powerpc/perf/hv-gpci-requests.h
new file mode 100644
index 000000000000..acd17648cd18
--- /dev/null
+++ b/arch/powerpc/perf/hv-gpci-requests.h
@@ -0,0 +1,261 @@
1
2#include "req-gen/_begin.h"
3
4/*
5 * Based on the document "getPerfCountInfo v1.07"
6 */
7
8/*
9 * #define REQUEST_NAME counter_request_name
10 * #define REQUEST_NUM r_num
11 * #define REQUEST_IDX_KIND starting_index_kind
12 * #include I(REQUEST_BEGIN)
13 * REQUEST(
14 * __field(...)
15 * __field(...)
16 * __array(...)
17 * __count(...)
18 * )
19 * #include I(REQUEST_END)
20 *
21 * - starting_index_kind is one of the following, depending on the event:
22 *
23 * hw_chip_id: hardware chip id or -1 for current hw chip
24 * partition_id
25 * sibling_part_id,
26 * phys_processor_idx:
27 * 0xffffffffffffffff: or -1, which means it is irrelavant for the event
28 *
29 * __count(offset, bytes, name):
30 * a counter that should be exposed via perf
31 * __field(offset, bytes, name)
32 * a normal field
33 * __array(offset, bytes, name)
34 * an array of bytes
35 *
36 *
37 * @bytes for __count, and __field _must_ be a numeral token
38 * in decimal, not an expression and not in hex.
39 *
40 *
41 * TODO:
42 * - expose secondary index (if any counter ever uses it, only 0xA0
43 * appears to use it right now, and it doesn't have any counters)
44 * - embed versioning info
45 * - include counter descriptions
46 */
47#define REQUEST_NAME dispatch_timebase_by_processor
48#define REQUEST_NUM 0x10
49#define REQUEST_IDX_KIND "phys_processor_idx=?"
50#include I(REQUEST_BEGIN)
51REQUEST(__count(0, 8, processor_time_in_timebase_cycles)
52 __field(0x8, 4, hw_processor_id)
53 __field(0xC, 2, owning_part_id)
54 __field(0xE, 1, processor_state)
55 __field(0xF, 1, version)
56 __field(0x10, 4, hw_chip_id)
57 __field(0x14, 4, phys_module_id)
58 __field(0x18, 4, primary_affinity_domain_idx)
59 __field(0x1C, 4, secondary_affinity_domain_idx)
60 __field(0x20, 4, processor_version)
61 __field(0x24, 2, logical_processor_idx)
62 __field(0x26, 2, reserved)
63 __field(0x28, 4, processor_id_register)
64 __field(0x2C, 4, phys_processor_idx)
65)
66#include I(REQUEST_END)
67
68#define REQUEST_NAME entitled_capped_uncapped_donated_idle_timebase_by_partition
69#define REQUEST_NUM 0x20
70#define REQUEST_IDX_KIND "sibling_part_id=?"
71#include I(REQUEST_BEGIN)
72REQUEST(__field(0, 8, partition_id)
73 __count(0x8, 8, entitled_cycles)
74 __count(0x10, 8, consumed_capped_cycles)
75 __count(0x18, 8, consumed_uncapped_cycles)
76 __count(0x20, 8, cycles_donated)
77 __count(0x28, 8, purr_idle_cycles)
78)
79#include I(REQUEST_END)
80
81/*
82 * Not available for counter_info_version >= 0x8, use
83 * run_instruction_cycles_by_partition(0x100) instead.
84 */
85#define REQUEST_NAME run_instructions_run_cycles_by_partition
86#define REQUEST_NUM 0x30
87#define REQUEST_IDX_KIND "sibling_part_id=?"
88#include I(REQUEST_BEGIN)
89REQUEST(__field(0, 8, partition_id)
90 __count(0x8, 8, instructions_completed)
91 __count(0x10, 8, cycles)
92)
93#include I(REQUEST_END)
94
95#define REQUEST_NAME system_performance_capabilities
96#define REQUEST_NUM 0x40
97#define REQUEST_IDX_KIND "starting_index=0xffffffffffffffff"
98#include I(REQUEST_BEGIN)
99REQUEST(__field(0, 1, perf_collect_privileged)
100 __field(0x1, 1, capability_mask)
101 __array(0x2, 0xE, reserved)
102)
103#include I(REQUEST_END)
104
105#define REQUEST_NAME processor_bus_utilization_abc_links
106#define REQUEST_NUM 0x50
107#define REQUEST_IDX_KIND "hw_chip_id=?"
108#include I(REQUEST_BEGIN)
109REQUEST(__field(0, 4, hw_chip_id)
110 __array(0x4, 0xC, reserved1)
111 __count(0x10, 8, total_link_cycles)
112 __count(0x18, 8, idle_cycles_for_a_link)
113 __count(0x20, 8, idle_cycles_for_b_link)
114 __count(0x28, 8, idle_cycles_for_c_link)
115 __array(0x30, 0x20, reserved2)
116)
117#include I(REQUEST_END)
118
119#define REQUEST_NAME processor_bus_utilization_wxyz_links
120#define REQUEST_NUM 0x60
121#define REQUEST_IDX_KIND "hw_chip_id=?"
122#include I(REQUEST_BEGIN)
123REQUEST(__field(0, 4, hw_chip_id)
124 __array(0x4, 0xC, reserved1)
125 __count(0x10, 8, total_link_cycles)
126 __count(0x18, 8, idle_cycles_for_w_link)
127 __count(0x20, 8, idle_cycles_for_x_link)
128 __count(0x28, 8, idle_cycles_for_y_link)
129 __count(0x30, 8, idle_cycles_for_z_link)
130 __array(0x38, 0x28, reserved2)
131)
132#include I(REQUEST_END)
133
134#define REQUEST_NAME processor_bus_utilization_gx_links
135#define REQUEST_NUM 0x70
136#define REQUEST_IDX_KIND "hw_chip_id=?"
137#include I(REQUEST_BEGIN)
138REQUEST(__field(0, 4, hw_chip_id)
139 __array(0x4, 0xC, reserved1)
140 __count(0x10, 8, gx0_in_address_cycles)
141 __count(0x18, 8, gx0_in_data_cycles)
142 __count(0x20, 8, gx0_in_retries)
143 __count(0x28, 8, gx0_in_bus_cycles)
144 __count(0x30, 8, gx0_in_cycles_total)
145 __count(0x38, 8, gx0_out_address_cycles)
146 __count(0x40, 8, gx0_out_data_cycles)
147 __count(0x48, 8, gx0_out_retries)
148 __count(0x50, 8, gx0_out_bus_cycles)
149 __count(0x58, 8, gx0_out_cycles_total)
150 __count(0x60, 8, gx1_in_address_cycles)
151 __count(0x68, 8, gx1_in_data_cycles)
152 __count(0x70, 8, gx1_in_retries)
153 __count(0x78, 8, gx1_in_bus_cycles)
154 __count(0x80, 8, gx1_in_cycles_total)
155 __count(0x88, 8, gx1_out_address_cycles)
156 __count(0x90, 8, gx1_out_data_cycles)
157 __count(0x98, 8, gx1_out_retries)
158 __count(0xA0, 8, gx1_out_bus_cycles)
159 __count(0xA8, 8, gx1_out_cycles_total)
160)
161#include I(REQUEST_END)
162
163#define REQUEST_NAME processor_bus_utilization_mc_links
164#define REQUEST_NUM 0x80
165#define REQUEST_IDX_KIND "hw_chip_id=?"
166#include I(REQUEST_BEGIN)
167REQUEST(__field(0, 4, hw_chip_id)
168 __array(0x4, 0xC, reserved1)
169 __count(0x10, 8, mc0_frames)
170 __count(0x18, 8, mc0_reads)
171 __count(0x20, 8, mc0_write)
172 __count(0x28, 8, mc0_total_cycles)
173 __count(0x30, 8, mc1_frames)
174 __count(0x38, 8, mc1_reads)
175 __count(0x40, 8, mc1_writes)
176 __count(0x48, 8, mc1_total_cycles)
177)
178#include I(REQUEST_END)
179
180/* Processor_config (0x90) skipped, no counters */
181/* Current_processor_frequency (0x91) skipped, no counters */
182
183#define REQUEST_NAME processor_core_utilization
184#define REQUEST_NUM 0x94
185#define REQUEST_IDX_KIND "phys_processor_idx=?"
186#include I(REQUEST_BEGIN)
187REQUEST(__field(0, 4, phys_processor_idx)
188 __field(0x4, 4, hw_processor_id)
189 __count(0x8, 8, cycles_across_any_thread)
190 __count(0x10, 8, timebase_at_collection)
191 __count(0x18, 8, purr_cycles)
192 __count(0x20, 8, sum_of_cycles_across_all_threads)
193 __count(0x28, 8, instructions_completed)
194)
195#include I(REQUEST_END)
196
197/* Processor_core_power_mode (0x95) skipped, no counters */
198/* Affinity_domain_information_by_virtual_processor (0xA0) skipped,
199 * no counters */
200/* Affinity_domain_information_by_domain (0xB0) skipped, no counters */
201/* Affinity_domain_information_by_partition (0xB1) skipped, no counters */
202/* Physical_memory_info (0xC0) skipped, no counters */
203/* Processor_bus_topology (0xD0) skipped, no counters */
204
205#define REQUEST_NAME partition_hypervisor_queuing_times
206#define REQUEST_NUM 0xE0
207#define REQUEST_IDX_KIND "partition_id=?"
208#include I(REQUEST_BEGIN)
209REQUEST(__field(0, 2, partition_id)
210 __array(0x2, 6, reserved1)
211 __count(0x8, 8, time_waiting_for_entitlement)
212 __count(0x10, 8, times_waited_for_entitlement)
213 __count(0x18, 8, time_waiting_for_phys_processor)
214 __count(0x20, 8, times_waited_for_phys_processor)
215 __count(0x28, 8, dispatches_on_home_core)
216 __count(0x30, 8, dispatches_on_home_primary_affinity_domain)
217 __count(0x38, 8, dispatches_on_home_secondary_affinity_domain)
218 __count(0x40, 8, dispatches_off_home_secondary_affinity_domain)
219 __count(0x48, 8, dispatches_on_dedicated_processor_donating_cycles)
220)
221#include I(REQUEST_END)
222
223#define REQUEST_NAME system_hypervisor_times
224#define REQUEST_NUM 0xF0
225#define REQUEST_IDX_KIND "starting_index=0xffffffffffffffff"
226#include I(REQUEST_BEGIN)
227REQUEST(__count(0, 8, time_spent_to_dispatch_virtual_processors)
228 __count(0x8, 8, time_spent_processing_virtual_processor_timers)
229 __count(0x10, 8, time_spent_managing_partitions_over_entitlement)
230 __count(0x18, 8, time_spent_on_system_management)
231)
232#include I(REQUEST_END)
233
234#define REQUEST_NAME system_tlbie_count_and_time
235#define REQUEST_NUM 0xF4
236#define REQUEST_IDX_KIND "starting_index=0xffffffffffffffff"
237#include I(REQUEST_BEGIN)
238REQUEST(__count(0, 8, tlbie_instructions_issued)
239 /*
240 * FIXME: The spec says the offset here is 0x10, which I suspect
241 * is wrong.
242 */
243 __count(0x8, 8, time_spent_issuing_tlbies)
244)
245#include I(REQUEST_END)
246
247#define REQUEST_NAME partition_instruction_count_and_time
248#define REQUEST_NUM 0x100
249#define REQUEST_IDX_KIND "partition_id=?"
250#include I(REQUEST_BEGIN)
251REQUEST(__field(0, 2, partition_id)
252 __array(0x2, 0x6, reserved1)
253 __count(0x8, 8, instructions_performed)
254 __count(0x10, 8, time_collected)
255)
256#include I(REQUEST_END)
257
258/* set_mmcrh (0x80001000) skipped, no counters */
259/* retrieve_hpmcx (0x80002000) skipped, no counters */
260
261#include "req-gen/_end.h"
diff --git a/arch/powerpc/perf/hv-gpci.c b/arch/powerpc/perf/hv-gpci.c
index a051fe946c63..856fe6e03c2a 100644
--- a/arch/powerpc/perf/hv-gpci.c
+++ b/arch/powerpc/perf/hv-gpci.c
@@ -31,7 +31,18 @@
31/* u32 */ 31/* u32 */
32EVENT_DEFINE_RANGE_FORMAT(request, config, 0, 31); 32EVENT_DEFINE_RANGE_FORMAT(request, config, 0, 31);
33/* u32 */ 33/* u32 */
34/*
35 * Note that starting_index, phys_processor_idx, sibling_part_id,
36 * hw_chip_id, partition_id all refer to the same bit range. They
37 * are basically aliases for the starting_index. The specific alias
38 * used depends on the event. See REQUEST_IDX_KIND in hv-gpci-requests.h
39 */
34EVENT_DEFINE_RANGE_FORMAT(starting_index, config, 32, 63); 40EVENT_DEFINE_RANGE_FORMAT(starting_index, config, 32, 63);
41EVENT_DEFINE_RANGE_FORMAT_LITE(phys_processor_idx, config, 32, 63);
42EVENT_DEFINE_RANGE_FORMAT_LITE(sibling_part_id, config, 32, 63);
43EVENT_DEFINE_RANGE_FORMAT_LITE(hw_chip_id, config, 32, 63);
44EVENT_DEFINE_RANGE_FORMAT_LITE(partition_id, config, 32, 63);
45
35/* u16 */ 46/* u16 */
36EVENT_DEFINE_RANGE_FORMAT(secondary_index, config1, 0, 15); 47EVENT_DEFINE_RANGE_FORMAT(secondary_index, config1, 0, 15);
37/* u8 */ 48/* u8 */
@@ -44,6 +55,10 @@ EVENT_DEFINE_RANGE_FORMAT(offset, config1, 32, 63);
44static struct attribute *format_attrs[] = { 55static struct attribute *format_attrs[] = {
45 &format_attr_request.attr, 56 &format_attr_request.attr,
46 &format_attr_starting_index.attr, 57 &format_attr_starting_index.attr,
58 &format_attr_phys_processor_idx.attr,
59 &format_attr_sibling_part_id.attr,
60 &format_attr_hw_chip_id.attr,
61 &format_attr_partition_id.attr,
47 &format_attr_secondary_index.attr, 62 &format_attr_secondary_index.attr,
48 &format_attr_counter_info_version.attr, 63 &format_attr_counter_info_version.attr,
49 64
@@ -57,6 +72,11 @@ static struct attribute_group format_group = {
57 .attrs = format_attrs, 72 .attrs = format_attrs,
58}; 73};
59 74
75static struct attribute_group event_group = {
76 .name = "events",
77 .attrs = hv_gpci_event_attrs,
78};
79
60#define HV_CAPS_ATTR(_name, _format) \ 80#define HV_CAPS_ATTR(_name, _format) \
61static ssize_t _name##_show(struct device *dev, \ 81static ssize_t _name##_show(struct device *dev, \
62 struct device_attribute *attr, \ 82 struct device_attribute *attr, \
@@ -102,6 +122,7 @@ static struct attribute_group interface_group = {
102 122
103static const struct attribute_group *attr_groups[] = { 123static const struct attribute_group *attr_groups[] = {
104 &format_group, 124 &format_group,
125 &event_group,
105 &interface_group, 126 &interface_group,
106 NULL, 127 NULL,
107}; 128};
@@ -265,6 +286,8 @@ static int hv_gpci_init(void)
265 unsigned long hret; 286 unsigned long hret;
266 struct hv_perf_caps caps; 287 struct hv_perf_caps caps;
267 288
289 hv_gpci_assert_offsets_correct();
290
268 if (!firmware_has_feature(FW_FEATURE_LPAR)) { 291 if (!firmware_has_feature(FW_FEATURE_LPAR)) {
269 pr_debug("not a virtualized system, not enabling\n"); 292 pr_debug("not a virtualized system, not enabling\n");
270 return -ENODEV; 293 return -ENODEV;
diff --git a/arch/powerpc/perf/hv-gpci.h b/arch/powerpc/perf/hv-gpci.h
index b25f460c9cce..86ede8275961 100644
--- a/arch/powerpc/perf/hv-gpci.h
+++ b/arch/powerpc/perf/hv-gpci.h
@@ -42,32 +42,19 @@ struct hv_get_perf_counter_info_params {
42 */ 42 */
43#define COUNTER_INFO_VERSION_CURRENT 0x8 43#define COUNTER_INFO_VERSION_CURRENT 0x8
44 44
45/* 45/* capability mask masks. */
46 * These determine the counter_value[] layout and the meaning of starting_index 46enum {
47 * and secondary_index. 47 HV_GPCI_CM_GA = (1 << 7),
48 * 48 HV_GPCI_CM_EXPANDED = (1 << 6),
49 * Unless otherwise noted, @secondary_index is unused and ignored. 49 HV_GPCI_CM_LAB = (1 << 5)
50 */
51enum counter_info_requests {
52
53 /* GENERAL */
54
55 /* @starting_index: must be -1 (to refer to the current partition)
56 */
57 CIR_SYSTEM_PERFORMANCE_CAPABILITIES = 0X40,
58}; 50};
59 51
60struct cv_system_performance_capabilities { 52#define REQUEST_FILE "../hv-gpci-requests.h"
61 /* If != 0, allowed to collect data from other partitions */ 53#define NAME_LOWER hv_gpci
62 __u8 perf_collect_privileged; 54#define NAME_UPPER HV_GPCI
63 55#include "req-gen/perf.h"
64 /* These following are only valid if counter_info_version >= 0x3 */ 56#undef REQUEST_FILE
65#define CV_CM_GA (1 << 7) 57#undef NAME_LOWER
66#define CV_CM_EXPANDED (1 << 6) 58#undef NAME_UPPER
67#define CV_CM_LAB (1 << 5)
68 /* remaining bits are reserved */
69 __u8 capability_mask;
70 __u8 reserved[0xE];
71} __packed;
72 59
73#endif 60#endif
diff --git a/arch/powerpc/perf/req-gen/_begin.h b/arch/powerpc/perf/req-gen/_begin.h
new file mode 100644
index 000000000000..acfb17a55c16
--- /dev/null
+++ b/arch/powerpc/perf/req-gen/_begin.h
@@ -0,0 +1,13 @@
1/* Include paths to be used in interface defining headers */
2#ifndef POWERPC_PERF_REQ_GEN_H_
3#define POWERPC_PERF_REQ_GEN_H_
4
5#define CAT2_STR_(t, s) __stringify(t/s)
6#define CAT2_STR(t, s) CAT2_STR_(t, s)
7#define I(...) __VA_ARGS__
8
9#endif
10
11#define REQ_GEN_PREFIX req-gen
12#define REQUEST_BEGIN CAT2_STR(REQ_GEN_PREFIX, _request-begin.h)
13#define REQUEST_END CAT2_STR(REQ_GEN_PREFIX, _request-end.h)
diff --git a/arch/powerpc/perf/req-gen/_clear.h b/arch/powerpc/perf/req-gen/_clear.h
new file mode 100644
index 000000000000..422974f89573
--- /dev/null
+++ b/arch/powerpc/perf/req-gen/_clear.h
@@ -0,0 +1,5 @@
1
2#undef __field_
3#undef __count_
4#undef __array_
5#undef REQUEST_
diff --git a/arch/powerpc/perf/req-gen/_end.h b/arch/powerpc/perf/req-gen/_end.h
new file mode 100644
index 000000000000..8a406980b6bf
--- /dev/null
+++ b/arch/powerpc/perf/req-gen/_end.h
@@ -0,0 +1,4 @@
1
2#undef REQ_GEN_PREFIX
3#undef REQUEST_BEGIN
4#undef REQUEST_END
diff --git a/arch/powerpc/perf/req-gen/_request-begin.h b/arch/powerpc/perf/req-gen/_request-begin.h
new file mode 100644
index 000000000000..f6d98642cf1d
--- /dev/null
+++ b/arch/powerpc/perf/req-gen/_request-begin.h
@@ -0,0 +1,15 @@
1
2#define REQUEST(r_contents) \
3 REQUEST_(REQUEST_NAME, REQUEST_NUM, REQUEST_IDX_KIND, I(r_contents))
4
5#define __field(f_offset, f_bytes, f_name) \
6 __field_(REQUEST_NAME, REQUEST_NUM, REQUEST_IDX_KIND, \
7 f_offset, f_bytes, f_name)
8
9#define __array(f_offset, f_bytes, f_name) \
10 __array_(REQUEST_NAME, REQUEST_NUM, REQUEST_IDX_KIND, \
11 f_offset, f_bytes, f_name)
12
13#define __count(f_offset, f_bytes, f_name) \
14 __count_(REQUEST_NAME, REQUEST_NUM, REQUEST_IDX_KIND, \
15 f_offset, f_bytes, f_name)
diff --git a/arch/powerpc/perf/req-gen/_request-end.h b/arch/powerpc/perf/req-gen/_request-end.h
new file mode 100644
index 000000000000..5573be6c3588
--- /dev/null
+++ b/arch/powerpc/perf/req-gen/_request-end.h
@@ -0,0 +1,8 @@
1#undef REQUEST
2#undef __field
3#undef __array
4#undef __count
5
6#undef REQUEST_NAME
7#undef REQUEST_NUM
8#undef REQUEST_IDX_KIND
diff --git a/arch/powerpc/perf/req-gen/perf.h b/arch/powerpc/perf/req-gen/perf.h
new file mode 100644
index 000000000000..1b122469323d
--- /dev/null
+++ b/arch/powerpc/perf/req-gen/perf.h
@@ -0,0 +1,155 @@
1#ifndef LINUX_POWERPC_PERF_REQ_GEN_PERF_H_
2#define LINUX_POWERPC_PERF_REQ_GEN_PERF_H_
3
4#include <linux/perf_event.h>
5
6#ifndef REQUEST_FILE
7#error "REQUEST_FILE must be defined before including"
8#endif
9
10#ifndef NAME_LOWER
11#error "NAME_LOWER must be defined before including"
12#endif
13
14#ifndef NAME_UPPER
15#error "NAME_UPPER must be defined before including"
16#endif
17
18#define BE_TYPE_b1 __u8
19#define BE_TYPE_b2 __be16
20#define BE_TYPE_b4 __be32
21#define BE_TYPE_b8 __be64
22
23#define BYTES_TO_BE_TYPE(bytes) \
24 BE_TYPE_b##bytes
25
26#define CAT2_(a, b) a ## b
27#define CAT2(a, b) CAT2_(a, b)
28#define CAT3_(a, b, c) a ## b ## c
29#define CAT3(a, b, c) CAT3_(a, b, c)
30
31/*
32 * enumerate the request values as
33 * <NAME_UPPER>_<request name> = <request value>
34 */
35#define REQUEST_VALUE__(name_upper, r_name) name_upper ## _ ## r_name
36#define REQUEST_VALUE_(name_upper, r_name) REQUEST_VALUE__(name_upper, r_name)
37#define REQUEST_VALUE(r_name) REQUEST_VALUE_(NAME_UPPER, r_name)
38
39#include "_clear.h"
40#define REQUEST_(r_name, r_value, r_idx_1, r_fields) \
41 REQUEST_VALUE(r_name) = r_value,
42enum CAT2(NAME_LOWER, _requests) {
43#include REQUEST_FILE
44};
45
46/*
47 * For each request:
48 * struct <NAME_LOWER>_<request name> {
49 * r_fields
50 * };
51 */
52#include "_clear.h"
53#define STRUCT_NAME__(name_lower, r_name) name_lower ## _ ## r_name
54#define STRUCT_NAME_(name_lower, r_name) STRUCT_NAME__(name_lower, r_name)
55#define STRUCT_NAME(r_name) STRUCT_NAME_(NAME_LOWER, r_name)
56#define REQUEST_(r_name, r_value, r_idx_1, r_fields) \
57struct STRUCT_NAME(r_name) { \
58 r_fields \
59};
60#define __field_(r_name, r_value, r_idx_1, f_offset, f_bytes, f_name) \
61 BYTES_TO_BE_TYPE(f_bytes) f_name;
62#define __count_(r_name, r_value, r_idx_1, f_offset, f_bytes, f_name) \
63 __field_(r_name, r_value, r_idx_1, f_offset, f_bytes, f_name)
64#define __array_(r_name, r_value, r_idx_1, a_offset, a_bytes, a_name) \
65 __u8 a_name[a_bytes];
66
67#include REQUEST_FILE
68
69/*
70 * Generate a check of the field offsets
71 * <NAME_LOWER>_assert_offsets_correct()
72 */
73#include "_clear.h"
74#define REQUEST_(r_name, r_value, index, r_fields) \
75r_fields
76#define __field_(r_name, r_value, r_idx_1, f_offset, f_size, f_name) \
77 BUILD_BUG_ON(offsetof(struct STRUCT_NAME(r_name), f_name) != f_offset);
78#define __count_(r_name, r_value, r_idx_1, c_offset, c_size, c_name) \
79 __field_(r_name, r_value, r_idx_1, c_offset, c_size, c_name)
80#define __array_(r_name, r_value, r_idx_1, a_offset, a_size, a_name) \
81 __field_(r_name, r_value, r_idx_1, a_offset, a_size, a_name)
82
83static inline void CAT2(NAME_LOWER, _assert_offsets_correct)(void)
84{
85#include REQUEST_FILE
86}
87
88/*
89 * Generate event attributes:
90 * PMU_EVENT_ATTR_STRING(<request name>_<field name>,
91 * <NAME_LOWER>_event_attr_<request name>_<field name>,
92 * "request=<request value>"
93 * "starting_index=<starting index type>"
94 * "counter_info_version=CURRENT_COUNTER_INFO_VERSION"
95 * "length=<f_size>"
96 * "offset=<f_offset>")
97 *
98 * TODO: counter_info_version may need to vary, we should interperate the
99 * value to some extent
100 */
101#define EVENT_ATTR_NAME__(name, r_name, c_name) \
102 name ## _event_attr_ ## r_name ## _ ## c_name
103#define EVENT_ATTR_NAME_(name, r_name, c_name) \
104 EVENT_ATTR_NAME__(name, r_name, c_name)
105#define EVENT_ATTR_NAME(r_name, c_name) \
106 EVENT_ATTR_NAME_(NAME_LOWER, r_name, c_name)
107
108#include "_clear.h"
109#define __field_(r_name, r_value, r_idx_1, f_offset, f_size, f_name)
110#define __array_(r_name, r_value, r_idx_1, a_offset, a_size, a_name)
111#define __count_(r_name, r_value, r_idx_1, c_offset, c_size, c_name) \
112PMU_EVENT_ATTR_STRING( \
113 CAT3(r_name, _, c_name), \
114 EVENT_ATTR_NAME(r_name, c_name), \
115 "request=" __stringify(r_value) "," \
116 r_idx_1 "," \
117 "counter_info_version=" \
118 __stringify(COUNTER_INFO_VERSION_CURRENT) "," \
119 "length=" #c_size "," \
120 "offset=" #c_offset)
121#define REQUEST_(r_name, r_value, r_idx_1, r_fields) \
122 r_fields
123
124#include REQUEST_FILE
125
126/*
127 * Define event attribute array
128 * static struct attribute *hv_gpci_event_attrs[] = {
129 * &<NAME_LOWER>_event_attr_<request name>_<field name>.attr,
130 * };
131 */
132#include "_clear.h"
133#define __field_(r_name, r_value, r_idx_1, f_offset, f_size, f_name)
134#define __count_(r_name, r_value, r_idx_1, c_offset, c_size, c_name) \
135 &EVENT_ATTR_NAME(r_name, c_name).attr.attr,
136#define __array_(r_name, r_value, r_idx_1, a_offset, a_size, a_name)
137#define REQUEST_(r_name, r_value, r_idx_1, r_fields) \
138 r_fields
139
140static __maybe_unused struct attribute *hv_gpci_event_attrs[] = {
141#include REQUEST_FILE
142 NULL
143};
144
145/* cleanup */
146#include "_clear.h"
147#undef EVENT_ATTR_NAME
148#undef EVENT_ATTR_NAME_
149#undef BIT_NAME
150#undef BIT_NAME_
151#undef STRUCT_NAME
152#undef REQUEST_VALUE
153#undef REQUEST_VALUE_
154
155#endif
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index d2ac1c116454..5538e57c36c1 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -214,7 +214,6 @@ config AKEBONO
214 select ETHERNET 214 select ETHERNET
215 select NET_VENDOR_IBM 215 select NET_VENDOR_IBM
216 select IBM_EMAC_EMAC4 216 select IBM_EMAC_EMAC4
217 select IBM_EMAC_RGMII_WOL
218 select USB if USB_SUPPORT 217 select USB if USB_SUPPORT
219 select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD 218 select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
220 select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD 219 select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD
diff --git a/arch/powerpc/platforms/83xx/usb.c b/arch/powerpc/platforms/83xx/usb.c
index 1ad748bb39b4..5c31d8292d3b 100644
--- a/arch/powerpc/platforms/83xx/usb.c
+++ b/arch/powerpc/platforms/83xx/usb.c
@@ -162,8 +162,7 @@ int mpc831x_usb_cfg(void)
162 162
163 iounmap(immap); 163 iounmap(immap);
164 164
165 if (immr_node) 165 of_node_put(immr_node);
166 of_node_put(immr_node);
167 166
168 /* Map USB SOC space */ 167 /* Map USB SOC space */
169 ret = of_address_to_resource(np, 0, &res); 168 ret = of_address_to_resource(np, 0, &res);
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index f22635a71d01..2fb4b24368a6 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -241,6 +241,12 @@ config SGY_CTS1000
241 help 241 help
242 Enable this to support functionality in Servergy's CTS-1000 systems. 242 Enable this to support functionality in Servergy's CTS-1000 systems.
243 243
244config MVME2500
245 bool "Artesyn MVME2500"
246 select DEFAULT_UIMAGE
247 help
248 This option enables support for the Emerson/Artesyn MVME2500 board.
249
244endif # PPC32 250endif # PPC32
245 251
246config PPC_QEMU_E500 252config PPC_QEMU_E500
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index 730326046625..1fe7fb95175a 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -31,3 +31,4 @@ obj-$(CONFIG_XES_MPC85xx) += xes_mpc85xx.o
31obj-$(CONFIG_GE_IMP3A) += ge_imp3a.o 31obj-$(CONFIG_GE_IMP3A) += ge_imp3a.o
32obj-$(CONFIG_PPC_QEMU_E500) += qemu_e500.o 32obj-$(CONFIG_PPC_QEMU_E500) += qemu_e500.o
33obj-$(CONFIG_SGY_CTS1000) += sgy_cts1000.o 33obj-$(CONFIG_SGY_CTS1000) += sgy_cts1000.o
34obj-$(CONFIG_MVME2500) += mvme2500.o
diff --git a/arch/powerpc/platforms/85xx/mvme2500.c b/arch/powerpc/platforms/85xx/mvme2500.c
new file mode 100644
index 000000000000..1233050560ae
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/mvme2500.c
@@ -0,0 +1,74 @@
1/*
2 * Board setup routines for the Emerson/Artesyn MVME2500
3 *
4 * Copyright 2014 Elettra-Sincrotrone Trieste S.C.p.A.
5 *
6 * Based on earlier code by:
7 *
8 * Xianghua Xiao (x.xiao@freescale.com)
9 * Tom Armistead (tom.armistead@emerson.com)
10 * Copyright 2012 Emerson
11 *
12 * This program is free software; you can redistribute it and/or modify it
13 * under the terms of the GNU General Public License as published by the
14 * Free Software Foundation; either version 2 of the License, or (at your
15 * option) any later version.
16 *
17 * Author Alessio Igor Bogani <alessio.bogani@elettra.eu>
18 *
19 */
20
21#include <linux/pci.h>
22#include <asm/udbg.h>
23#include <asm/mpic.h>
24#include <sysdev/fsl_soc.h>
25#include <sysdev/fsl_pci.h>
26
27#include "mpc85xx.h"
28
29void __init mvme2500_pic_init(void)
30{
31 struct mpic *mpic = mpic_alloc(NULL, 0,
32 MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU,
33 0, 256, " OpenPIC ");
34 BUG_ON(mpic == NULL);
35 mpic_init(mpic);
36}
37
38/*
39 * Setup the architecture
40 */
41static void __init mvme2500_setup_arch(void)
42{
43 if (ppc_md.progress)
44 ppc_md.progress("mvme2500_setup_arch()", 0);
45 fsl_pci_assign_primary();
46 pr_info("MVME2500 board from Artesyn\n");
47}
48
49machine_arch_initcall(mvme2500, mpc85xx_common_publish_devices);
50
51/*
52 * Called very early, device-tree isn't unflattened
53 */
54static int __init mvme2500_probe(void)
55{
56 unsigned long root = of_get_flat_dt_root();
57
58 return of_flat_dt_is_compatible(root, "artesyn,MVME2500");
59}
60
61define_machine(mvme2500) {
62 .name = "MVME2500",
63 .probe = mvme2500_probe,
64 .setup_arch = mvme2500_setup_arch,
65 .init_IRQ = mvme2500_pic_init,
66#ifdef CONFIG_PCI
67 .pcibios_fixup_bus = fsl_pcibios_fixup_bus,
68 .pcibios_fixup_phb = fsl_pcibios_fixup_phb,
69#endif
70 .get_irq = mpic_get_irq,
71 .restart = fsl_rstcr_restart,
72 .calibrate_decr = generic_calibrate_decr,
73 .progress = udbg_progress,
74};
diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c
index c8017a7bcabd..b64e7ead752f 100644
--- a/arch/powerpc/platforms/cell/smp.c
+++ b/arch/powerpc/platforms/cell/smp.c
@@ -106,7 +106,7 @@ static int __init smp_iic_probe(void)
106{ 106{
107 iic_request_IPIs(); 107 iic_request_IPIs();
108 108
109 return cpumask_weight(cpu_possible_mask); 109 return num_possible_cpus();
110} 110}
111 111
112static void smp_cell_setup_cpu(int cpu) 112static void smp_cell_setup_cpu(int cpu)
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
index beeaf4a173e1..df4ad95f183e 100644
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -156,17 +156,6 @@ void mpc7448_hpc2_restart(char *cmd)
156 for (;;) ; /* Spin until reset happens */ 156 for (;;) ; /* Spin until reset happens */
157} 157}
158 158
159void mpc7448_hpc2_power_off(void)
160{
161 local_irq_disable();
162 for (;;) ; /* No way to shut power off with software */
163}
164
165void mpc7448_hpc2_halt(void)
166{
167 mpc7448_hpc2_power_off();
168}
169
170/* 159/*
171 * Called very early, device-tree isn't unflattened 160 * Called very early, device-tree isn't unflattened
172 */ 161 */
diff --git a/arch/powerpc/platforms/powernv/Makefile b/arch/powerpc/platforms/powernv/Makefile
index f241accc053d..6f3c5d33c3af 100644
--- a/arch/powerpc/platforms/powernv/Makefile
+++ b/arch/powerpc/platforms/powernv/Makefile
@@ -1,7 +1,7 @@
1obj-y += setup.o opal-wrappers.o opal.o opal-async.o 1obj-y += setup.o opal-wrappers.o opal.o opal-async.o
2obj-y += opal-rtc.o opal-nvram.o opal-lpc.o opal-flash.o 2obj-y += opal-rtc.o opal-nvram.o opal-lpc.o opal-flash.o
3obj-y += rng.o opal-elog.o opal-dump.o opal-sysparam.o opal-sensor.o 3obj-y += rng.o opal-elog.o opal-dump.o opal-sysparam.o opal-sensor.o
4obj-y += opal-msglog.o opal-hmi.o 4obj-y += opal-msglog.o opal-hmi.o opal-power.o
5 5
6obj-$(CONFIG_SMP) += smp.o subcore.o subcore-asm.o 6obj-$(CONFIG_SMP) += smp.o subcore.o subcore-asm.o
7obj-$(CONFIG_PCI) += pci.o pci-p5ioc2.o pci-ioda.o 7obj-$(CONFIG_PCI) += pci.o pci-p5ioc2.o pci-ioda.o
diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c
index 1d19e7917d7f..e261869adc86 100644
--- a/arch/powerpc/platforms/powernv/eeh-powernv.c
+++ b/arch/powerpc/platforms/powernv/eeh-powernv.c
@@ -68,6 +68,17 @@ static int powernv_eeh_init(void)
68 68
69 if (phb->model == PNV_PHB_MODEL_P7IOC) 69 if (phb->model == PNV_PHB_MODEL_P7IOC)
70 eeh_add_flag(EEH_ENABLE_IO_FOR_LOG); 70 eeh_add_flag(EEH_ENABLE_IO_FOR_LOG);
71
72 /*
73 * PE#0 should be regarded as valid by EEH core
74 * if it's not the reserved one. Currently, we
75 * have the reserved PE#0 and PE#127 for PHB3
76 * and P7IOC separately. So we should regard
77 * PE#0 as valid for P7IOC.
78 */
79 if (phb->ioda.reserved_pe != 0)
80 eeh_add_flag(EEH_VALID_PE_ZERO);
81
71 break; 82 break;
72 } 83 }
73 84
diff --git a/arch/powerpc/platforms/powernv/opal-power.c b/arch/powerpc/platforms/powernv/opal-power.c
new file mode 100644
index 000000000000..48bf5b080bcf
--- /dev/null
+++ b/arch/powerpc/platforms/powernv/opal-power.c
@@ -0,0 +1,65 @@
1/*
2 * PowerNV OPAL power control for graceful shutdown handling
3 *
4 * Copyright 2015 IBM Corp.
5 *
6 * This program is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU General Public License
8 * as published by the Free Software Foundation; either version
9 * 2 of the License, or (at your option) any later version.
10 */
11
12#include <linux/kernel.h>
13#include <linux/reboot.h>
14#include <linux/notifier.h>
15
16#include <asm/opal.h>
17#include <asm/machdep.h>
18
19#define SOFT_OFF 0x00
20#define SOFT_REBOOT 0x01
21
22static int opal_power_control_event(struct notifier_block *nb,
23 unsigned long msg_type, void *msg)
24{
25 struct opal_msg *power_msg = msg;
26 uint64_t type;
27
28 type = be64_to_cpu(power_msg->params[0]);
29
30 switch (type) {
31 case SOFT_REBOOT:
32 /* Fall through. The service processor is responsible for
33 * bringing the machine back up */
34 case SOFT_OFF:
35 pr_info("OPAL: poweroff requested\n");
36 orderly_poweroff(true);
37 break;
38 default:
39 pr_err("OPAL: power control type unexpected %016llx\n", type);
40 }
41
42 return 0;
43}
44
45static struct notifier_block opal_power_control_nb = {
46 .notifier_call = opal_power_control_event,
47 .next = NULL,
48 .priority = 0,
49};
50
51static int __init opal_power_control_init(void)
52{
53 int ret;
54
55 ret = opal_message_notifier_register(OPAL_MSG_SHUTDOWN,
56 &opal_power_control_nb);
57 if (ret) {
58 pr_err("%s: Can't register OPAL event notifier (%d)\n",
59 __func__, ret);
60 return ret;
61 }
62
63 return 0;
64}
65machine_subsys_initcall(powernv, opal_power_control_init);
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index f10b9ec8c1f5..18fd4e71c9c1 100644
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -208,7 +208,7 @@ static int __init opal_register_exception_handlers(void)
208 * start catching/handling HMI directly in Linux. 208 * start catching/handling HMI directly in Linux.
209 */ 209 */
210 if (!opal_check_token(OPAL_HANDLE_HMI)) { 210 if (!opal_check_token(OPAL_HANDLE_HMI)) {
211 pr_info("opal: Old firmware detected, OPAL handles HMIs.\n"); 211 pr_info("Old firmware detected, OPAL handles HMIs.\n");
212 opal_register_exception_handler( 212 opal_register_exception_handler(
213 OPAL_HYPERVISOR_MAINTENANCE_HANDLER, 213 OPAL_HYPERVISOR_MAINTENANCE_HANDLER,
214 0, glue); 214 0, glue);
@@ -667,7 +667,13 @@ static void __init opal_dump_region_init(void)
667 667
668 /* Register kernel log buffer */ 668 /* Register kernel log buffer */
669 addr = log_buf_addr_get(); 669 addr = log_buf_addr_get();
670 if (addr == NULL)
671 return;
672
670 size = log_buf_len_get(); 673 size = log_buf_len_get();
674 if (size == 0)
675 return;
676
671 rc = opal_register_dump_region(OPAL_DUMP_REGION_LOG_BUF, 677 rc = opal_register_dump_region(OPAL_DUMP_REGION_LOG_BUF,
672 __pa(addr), size); 678 __pa(addr), size);
673 /* Don't warn if this is just an older OPAL that doesn't 679 /* Don't warn if this is just an older OPAL that doesn't
@@ -695,15 +701,54 @@ static void opal_i2c_create_devs(void)
695 of_platform_device_create(np, NULL, NULL); 701 of_platform_device_create(np, NULL, NULL);
696} 702}
697 703
704static void __init opal_irq_init(struct device_node *dn)
705{
706 const __be32 *irqs;
707 int i, irqlen;
708
709 /* Get interrupt property */
710 irqs = of_get_property(opal_node, "opal-interrupts", &irqlen);
711 opal_irq_count = irqs ? (irqlen / 4) : 0;
712 pr_debug("Found %d interrupts reserved for OPAL\n", opal_irq_count);
713 if (!opal_irq_count)
714 return;
715
716 /* Install interrupt handlers */
717 opal_irqs = kzalloc(opal_irq_count * sizeof(unsigned int), GFP_KERNEL);
718 for (i = 0; irqs && i < opal_irq_count; i++, irqs++) {
719 unsigned int irq, virq;
720 int rc;
721
722 /* Get hardware and virtual IRQ */
723 irq = be32_to_cpup(irqs);
724 virq = irq_create_mapping(NULL, irq);
725 if (virq == NO_IRQ) {
726 pr_warn("Failed to map irq 0x%x\n", irq);
727 continue;
728 }
729
730 /* Install interrupt handler */
731 rc = request_irq(virq, opal_interrupt, 0, "opal", NULL);
732 if (rc) {
733 irq_dispose_mapping(virq);
734 pr_warn("Error %d requesting irq %d (0x%x)\n",
735 rc, virq, irq);
736 continue;
737 }
738
739 /* Cache IRQ */
740 opal_irqs[i] = virq;
741 }
742}
743
698static int __init opal_init(void) 744static int __init opal_init(void)
699{ 745{
700 struct device_node *np, *consoles; 746 struct device_node *np, *consoles;
701 const __be32 *irqs; 747 int rc;
702 int rc, i, irqlen;
703 748
704 opal_node = of_find_node_by_path("/ibm,opal"); 749 opal_node = of_find_node_by_path("/ibm,opal");
705 if (!opal_node) { 750 if (!opal_node) {
706 pr_warn("opal: Node not found\n"); 751 pr_warn("Device node not found\n");
707 return -ENODEV; 752 return -ENODEV;
708 } 753 }
709 754
@@ -725,24 +770,7 @@ static int __init opal_init(void)
725 opal_i2c_create_devs(); 770 opal_i2c_create_devs();
726 771
727 /* Find all OPAL interrupts and request them */ 772 /* Find all OPAL interrupts and request them */
728 irqs = of_get_property(opal_node, "opal-interrupts", &irqlen); 773 opal_irq_init(opal_node);
729 pr_debug("opal: Found %d interrupts reserved for OPAL\n",
730 irqs ? (irqlen / 4) : 0);
731 opal_irq_count = irqlen / 4;
732 opal_irqs = kzalloc(opal_irq_count * sizeof(unsigned int), GFP_KERNEL);
733 for (i = 0; irqs && i < (irqlen / 4); i++, irqs++) {
734 unsigned int hwirq = be32_to_cpup(irqs);
735 unsigned int irq = irq_create_mapping(NULL, hwirq);
736 if (irq == NO_IRQ) {
737 pr_warning("opal: Failed to map irq 0x%x\n", hwirq);
738 continue;
739 }
740 rc = request_irq(irq, opal_interrupt, 0, "opal", NULL);
741 if (rc)
742 pr_warning("opal: Error %d requesting irq %d"
743 " (0x%x)\n", rc, irq, hwirq);
744 opal_irqs[i] = irq;
745 }
746 774
747 /* Create "opal" kobject under /sys/firmware */ 775 /* Create "opal" kobject under /sys/firmware */
748 rc = opal_sysfs_init(); 776 rc = opal_sysfs_init();
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index fac88ed8a915..6c9ff2b95119 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -75,6 +75,28 @@ static void pe_level_printk(const struct pnv_ioda_pe *pe, const char *level,
75#define pe_info(pe, fmt, ...) \ 75#define pe_info(pe, fmt, ...) \
76 pe_level_printk(pe, KERN_INFO, fmt, ##__VA_ARGS__) 76 pe_level_printk(pe, KERN_INFO, fmt, ##__VA_ARGS__)
77 77
78static bool pnv_iommu_bypass_disabled __read_mostly;
79
80static int __init iommu_setup(char *str)
81{
82 if (!str)
83 return -EINVAL;
84
85 while (*str) {
86 if (!strncmp(str, "nobypass", 8)) {
87 pnv_iommu_bypass_disabled = true;
88 pr_info("PowerNV: IOMMU bypass window disabled.\n");
89 break;
90 }
91 str += strcspn(str, ",");
92 if (*str == ',')
93 str++;
94 }
95
96 return 0;
97}
98early_param("iommu", iommu_setup);
99
78/* 100/*
79 * stdcix is only supposed to be used in hypervisor real mode as per 101 * stdcix is only supposed to be used in hypervisor real mode as per
80 * the architecture spec 102 * the architecture spec
@@ -357,6 +379,9 @@ static void __init pnv_ioda_parse_m64_window(struct pnv_phb *phb)
357 phb->ioda.m64_segsize = phb->ioda.m64_size / phb->ioda.total_pe; 379 phb->ioda.m64_segsize = phb->ioda.m64_size / phb->ioda.total_pe;
358 phb->ioda.m64_base = pci_addr; 380 phb->ioda.m64_base = pci_addr;
359 381
382 pr_info(" MEM64 0x%016llx..0x%016llx -> 0x%016llx\n",
383 res->start, res->end, pci_addr);
384
360 /* Use last M64 BAR to cover M64 window */ 385 /* Use last M64 BAR to cover M64 window */
361 phb->ioda.m64_bar_idx = 15; 386 phb->ioda.m64_bar_idx = 15;
362 phb->init_m64 = pnv_ioda2_init_m64; 387 phb->init_m64 = pnv_ioda2_init_m64;
@@ -1348,7 +1373,9 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb,
1348 pnv_ioda_setup_bus_dma(pe, pe->pbus, true); 1373 pnv_ioda_setup_bus_dma(pe, pe->pbus, true);
1349 1374
1350 /* Also create a bypass window */ 1375 /* Also create a bypass window */
1351 pnv_pci_ioda2_setup_bypass_pe(phb, pe); 1376 if (!pnv_iommu_bypass_disabled)
1377 pnv_pci_ioda2_setup_bypass_pe(phb, pe);
1378
1352 return; 1379 return;
1353fail: 1380fail:
1354 if (pe->tce32_seg >= 0) 1381 if (pe->tce32_seg >= 0)
@@ -1460,15 +1487,15 @@ static void set_msi_irq_chip(struct pnv_phb *phb, unsigned int virq)
1460 1487
1461#ifdef CONFIG_CXL_BASE 1488#ifdef CONFIG_CXL_BASE
1462 1489
1463struct device_node *pnv_pci_to_phb_node(struct pci_dev *dev) 1490struct device_node *pnv_pci_get_phb_node(struct pci_dev *dev)
1464{ 1491{
1465 struct pci_controller *hose = pci_bus_to_host(dev->bus); 1492 struct pci_controller *hose = pci_bus_to_host(dev->bus);
1466 1493
1467 return hose->dn; 1494 return of_node_get(hose->dn);
1468} 1495}
1469EXPORT_SYMBOL(pnv_pci_to_phb_node); 1496EXPORT_SYMBOL(pnv_pci_get_phb_node);
1470 1497
1471int pnv_phb_to_cxl(struct pci_dev *dev) 1498int pnv_phb_to_cxl_mode(struct pci_dev *dev, uint64_t mode)
1472{ 1499{
1473 struct pci_controller *hose = pci_bus_to_host(dev->bus); 1500 struct pci_controller *hose = pci_bus_to_host(dev->bus);
1474 struct pnv_phb *phb = hose->private_data; 1501 struct pnv_phb *phb = hose->private_data;
@@ -1481,13 +1508,13 @@ int pnv_phb_to_cxl(struct pci_dev *dev)
1481 1508
1482 pe_info(pe, "Switching PHB to CXL\n"); 1509 pe_info(pe, "Switching PHB to CXL\n");
1483 1510
1484 rc = opal_pci_set_phb_cxl_mode(phb->opal_id, 1, pe->pe_number); 1511 rc = opal_pci_set_phb_cxl_mode(phb->opal_id, mode, pe->pe_number);
1485 if (rc) 1512 if (rc)
1486 dev_err(&dev->dev, "opal_pci_set_phb_cxl_mode failed: %i\n", rc); 1513 dev_err(&dev->dev, "opal_pci_set_phb_cxl_mode failed: %i\n", rc);
1487 1514
1488 return rc; 1515 return rc;
1489} 1516}
1490EXPORT_SYMBOL(pnv_phb_to_cxl); 1517EXPORT_SYMBOL(pnv_phb_to_cxl_mode);
1491 1518
1492/* Find PHB for cxl dev and allocate MSI hwirqs? 1519/* Find PHB for cxl dev and allocate MSI hwirqs?
1493 * Returns the absolute hardware IRQ number 1520 * Returns the absolute hardware IRQ number
diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c
index 4945e87f12dc..e69142f4af08 100644
--- a/arch/powerpc/platforms/powernv/pci.c
+++ b/arch/powerpc/platforms/powernv/pci.c
@@ -781,35 +781,6 @@ static void pnv_p7ioc_rc_quirk(struct pci_dev *dev)
781} 781}
782DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_IBM, 0x3b9, pnv_p7ioc_rc_quirk); 782DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_IBM, 0x3b9, pnv_p7ioc_rc_quirk);
783 783
784static int pnv_pci_probe_mode(struct pci_bus *bus)
785{
786 struct pci_controller *hose = pci_bus_to_host(bus);
787 const __be64 *tstamp;
788 u64 now, target;
789
790
791 /* We hijack this as a way to ensure we have waited long
792 * enough since the reset was lifted on the PCI bus
793 */
794 if (bus != hose->bus)
795 return PCI_PROBE_NORMAL;
796 tstamp = of_get_property(hose->dn, "reset-clear-timestamp", NULL);
797 if (!tstamp || !*tstamp)
798 return PCI_PROBE_NORMAL;
799
800 now = mftb() / tb_ticks_per_usec;
801 target = (be64_to_cpup(tstamp) / tb_ticks_per_usec)
802 + PCI_RESET_DELAY_US;
803
804 pr_devel("pci %04d: Reset target: 0x%llx now: 0x%llx\n",
805 hose->global_number, target, now);
806
807 if (now < target)
808 msleep((target - now + 999) / 1000);
809
810 return PCI_PROBE_NORMAL;
811}
812
813void __init pnv_pci_init(void) 784void __init pnv_pci_init(void)
814{ 785{
815 struct device_node *np; 786 struct device_node *np;
@@ -856,7 +827,6 @@ void __init pnv_pci_init(void)
856 ppc_md.tce_build_rm = pnv_tce_build_rm; 827 ppc_md.tce_build_rm = pnv_tce_build_rm;
857 ppc_md.tce_free_rm = pnv_tce_free_rm; 828 ppc_md.tce_free_rm = pnv_tce_free_rm;
858 ppc_md.tce_get = pnv_tce_get; 829 ppc_md.tce_get = pnv_tce_get;
859 ppc_md.pci_probe_mode = pnv_pci_probe_mode;
860 set_pci_dma_ops(&dma_iommu_ops); 830 set_pci_dma_ops(&dma_iommu_ops);
861 831
862 /* Configure MSIs */ 832 /* Configure MSIs */
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
index 0c9f643d9e2a..b0f34663b1ae 100644
--- a/arch/powerpc/platforms/ps3/mm.c
+++ b/arch/powerpc/platforms/ps3/mm.c
@@ -223,6 +223,44 @@ void ps3_mm_vas_destroy(void)
223 } 223 }
224} 224}
225 225
226static int ps3_mm_get_repository_highmem(struct mem_region *r)
227{
228 int result;
229
230 /* Assume a single highmem region. */
231
232 result = ps3_repository_read_highmem_info(0, &r->base, &r->size);
233
234 if (result)
235 goto zero_region;
236
237 if (!r->base || !r->size) {
238 result = -1;
239 goto zero_region;
240 }
241
242 r->offset = r->base - map.rm.size;
243
244 DBG("%s:%d: Found high region in repository: %llxh %llxh\n",
245 __func__, __LINE__, r->base, r->size);
246
247 return 0;
248
249zero_region:
250 DBG("%s:%d: No high region in repository.\n", __func__, __LINE__);
251
252 r->size = r->base = r->offset = 0;
253 return result;
254}
255
256static int ps3_mm_set_repository_highmem(const struct mem_region *r)
257{
258 /* Assume a single highmem region. */
259
260 return r ? ps3_repository_write_highmem_info(0, r->base, r->size) :
261 ps3_repository_write_highmem_info(0, 0, 0);
262}
263
226/** 264/**
227 * ps3_mm_region_create - create a memory region in the vas 265 * ps3_mm_region_create - create a memory region in the vas
228 * @r: pointer to a struct mem_region to accept initialized values 266 * @r: pointer to a struct mem_region to accept initialized values
@@ -291,36 +329,7 @@ static void ps3_mm_region_destroy(struct mem_region *r)
291 r->size = r->base = r->offset = 0; 329 r->size = r->base = r->offset = 0;
292 map.total = map.rm.size; 330 map.total = map.rm.size;
293 } 331 }
294} 332 ps3_mm_set_repository_highmem(NULL);
295
296static int ps3_mm_get_repository_highmem(struct mem_region *r)
297{
298 int result;
299
300 /* Assume a single highmem region. */
301
302 result = ps3_repository_read_highmem_info(0, &r->base, &r->size);
303
304 if (result)
305 goto zero_region;
306
307 if (!r->base || !r->size) {
308 result = -1;
309 goto zero_region;
310 }
311
312 r->offset = r->base - map.rm.size;
313
314 DBG("%s:%d: Found high region in repository: %llxh %llxh\n",
315 __func__, __LINE__, r->base, r->size);
316
317 return 0;
318
319zero_region:
320 DBG("%s:%d: No high region in repository.\n", __func__, __LINE__);
321
322 r->size = r->base = r->offset = 0;
323 return result;
324} 333}
325 334
326/*============================================================================*/ 335/*============================================================================*/
@@ -1210,8 +1219,12 @@ void __init ps3_mm_init(void)
1210 1219
1211 /* Check if we got the highmem region from an earlier boot step */ 1220 /* Check if we got the highmem region from an earlier boot step */
1212 1221
1213 if (ps3_mm_get_repository_highmem(&map.r1)) 1222 if (ps3_mm_get_repository_highmem(&map.r1)) {
1214 ps3_mm_region_create(&map.r1, map.total - map.rm.size); 1223 result = ps3_mm_region_create(&map.r1, map.total - map.rm.size);
1224
1225 if (!result)
1226 ps3_mm_set_repository_highmem(&map.r1);
1227 }
1215 1228
1216 /* correct map.total for the real total amount of memory we use */ 1229 /* correct map.total for the real total amount of memory we use */
1217 map.total = map.rm.size + map.r1.size; 1230 map.total = map.rm.size + map.r1.size;
diff --git a/arch/powerpc/platforms/ps3/platform.h b/arch/powerpc/platforms/ps3/platform.h
index d71329a8e325..1809cfc562ee 100644
--- a/arch/powerpc/platforms/ps3/platform.h
+++ b/arch/powerpc/platforms/ps3/platform.h
@@ -196,6 +196,7 @@ int ps3_repository_read_highmem_size(unsigned int region_index,
196int ps3_repository_read_highmem_info(unsigned int region_index, 196int ps3_repository_read_highmem_info(unsigned int region_index,
197 u64 *highmem_base, u64 *highmem_size); 197 u64 *highmem_base, u64 *highmem_size);
198 198
199#if defined (CONFIG_PS3_REPOSITORY_WRITE)
199int ps3_repository_write_highmem_region_count(unsigned int region_count); 200int ps3_repository_write_highmem_region_count(unsigned int region_count);
200int ps3_repository_write_highmem_base(unsigned int region_index, 201int ps3_repository_write_highmem_base(unsigned int region_index,
201 u64 highmem_base); 202 u64 highmem_base);
@@ -204,6 +205,18 @@ int ps3_repository_write_highmem_size(unsigned int region_index,
204int ps3_repository_write_highmem_info(unsigned int region_index, 205int ps3_repository_write_highmem_info(unsigned int region_index,
205 u64 highmem_base, u64 highmem_size); 206 u64 highmem_base, u64 highmem_size);
206int ps3_repository_delete_highmem_info(unsigned int region_index); 207int ps3_repository_delete_highmem_info(unsigned int region_index);
208#else
209static inline int ps3_repository_write_highmem_region_count(
210 unsigned int region_count) {return 0;}
211static inline int ps3_repository_write_highmem_base(unsigned int region_index,
212 u64 highmem_base) {return 0;}
213static inline int ps3_repository_write_highmem_size(unsigned int region_index,
214 u64 highmem_size) {return 0;}
215static inline int ps3_repository_write_highmem_info(unsigned int region_index,
216 u64 highmem_base, u64 highmem_size) {return 0;}
217static inline int ps3_repository_delete_highmem_info(unsigned int region_index)
218 {return 0;}
219#endif
207 220
208/* repository pme info */ 221/* repository pme info */
209 222
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
index 756b482f819a..a758a9c3bbba 100644
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
@@ -34,6 +34,16 @@ config PPC_SPLPAR
34 processors, that is, which share physical processors between 34 processors, that is, which share physical processors between
35 two or more partitions. 35 two or more partitions.
36 36
37config DTL
38 bool "Dispatch Trace Log"
39 depends on PPC_SPLPAR && DEBUG_FS
40 help
41 SPLPAR machines can log hypervisor preempt & dispatch events to a
42 kernel buffer. Saying Y here will enable logging these events,
43 which are accessible through a debugfs file.
44
45 Say N if you are unsure.
46
37config PSERIES_MSI 47config PSERIES_MSI
38 bool 48 bool
39 depends on PCI_MSI && PPC_PSERIES && EEH 49 depends on PCI_MSI && PPC_PSERIES && EEH
@@ -123,13 +133,3 @@ config HV_PERF_CTRS
123 systems. 24x7 is available on Power 8 systems. 133 systems. 24x7 is available on Power 8 systems.
124 134
125 If unsure, select Y. 135 If unsure, select Y.
126
127config DTL
128 bool "Dispatch Trace Log"
129 depends on PPC_SPLPAR && DEBUG_FS
130 help
131 SPLPAR machines can log hypervisor preempt & dispatch events to a
132 kernel buffer. Saying Y here will enable logging these events,
133 which are accessible through a debugfs file.
134
135 Say N if you are unsure.
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index f30cf4d136a4..62475440fd45 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -272,7 +272,7 @@ static int pseries_add_processor(struct device_node *np)
272 */ 272 */
273 printk(KERN_ERR "Cannot add cpu %s; this system configuration" 273 printk(KERN_ERR "Cannot add cpu %s; this system configuration"
274 " supports %d logical cpus.\n", np->full_name, 274 " supports %d logical cpus.\n", np->full_name,
275 cpumask_weight(cpu_possible_mask)); 275 num_possible_cpus());
276 goto out_unlock; 276 goto out_unlock;
277 } 277 }
278 278
diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c
index e7cb6d4a871a..90cf3dcbd9f2 100644
--- a/arch/powerpc/platforms/pseries/mobility.c
+++ b/arch/powerpc/platforms/pseries/mobility.c
@@ -316,34 +316,24 @@ void post_mobility_fixup(void)
316static ssize_t migrate_store(struct class *class, struct class_attribute *attr, 316static ssize_t migrate_store(struct class *class, struct class_attribute *attr,
317 const char *buf, size_t count) 317 const char *buf, size_t count)
318{ 318{
319 struct rtas_args args;
320 u64 streamid; 319 u64 streamid;
321 int rc; 320 int rc;
321 int vasi_rc = 0;
322 322
323 rc = kstrtou64(buf, 0, &streamid); 323 rc = kstrtou64(buf, 0, &streamid);
324 if (rc) 324 if (rc)
325 return rc; 325 return rc;
326 326
327 memset(&args, 0, sizeof(args));
328 args.token = rtas_token("ibm,suspend-me");
329 args.nargs = 2;
330 args.nret = 1;
331
332 args.args[0] = streamid >> 32 ;
333 args.args[1] = streamid & 0xffffffff;
334 args.rets = &args.args[args.nargs];
335
336 do { 327 do {
337 args.rets[0] = 0; 328 rc = rtas_ibm_suspend_me(streamid, &vasi_rc);
338 rc = rtas_ibm_suspend_me(&args); 329 if (!rc && vasi_rc == RTAS_NOT_SUSPENDABLE)
339 if (!rc && args.rets[0] == RTAS_NOT_SUSPENDABLE)
340 ssleep(1); 330 ssleep(1);
341 } while (!rc && args.rets[0] == RTAS_NOT_SUSPENDABLE); 331 } while (!rc && vasi_rc == RTAS_NOT_SUSPENDABLE);
342 332
343 if (rc) 333 if (rc)
344 return rc; 334 return rc;
345 else if (args.rets[0]) 335 if (vasi_rc)
346 return args.rets[0]; 336 return vasi_rc;
347 337
348 post_mobility_fixup(); 338 post_mobility_fixup();
349 return count; 339 return count;
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index c3b2a7e81ddb..02e4a1745516 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -89,6 +89,8 @@ static void handle_system_shutdown(char event_modifier)
89 case EPOW_SHUTDOWN_ON_UPS: 89 case EPOW_SHUTDOWN_ON_UPS:
90 pr_emerg("Loss of power reported by firmware, system is " 90 pr_emerg("Loss of power reported by firmware, system is "
91 "running on UPS/battery"); 91 "running on UPS/battery");
92 pr_emerg("Check RTAS error log for details");
93 orderly_poweroff(true);
92 break; 94 break;
93 95
94 case EPOW_SHUTDOWN_LOSS_OF_CRITICAL_FUNCTIONS: 96 case EPOW_SHUTDOWN_LOSS_OF_CRITICAL_FUNCTIONS:
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 271b67e7670c..4b74c276e427 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -68,13 +68,10 @@ static int fsl_pcie_check_link(struct pci_controller *hose)
68 u32 val = 0; 68 u32 val = 0;
69 69
70 if (hose->indirect_type & PPC_INDIRECT_TYPE_FSL_CFG_REG_LINK) { 70 if (hose->indirect_type & PPC_INDIRECT_TYPE_FSL_CFG_REG_LINK) {
71 if (hose->ops->read == fsl_indirect_read_config) { 71 if (hose->ops->read == fsl_indirect_read_config)
72 struct pci_bus bus; 72 __indirect_read_config(hose, hose->first_busno, 0,
73 bus.number = hose->first_busno; 73 PCIE_LTSSM, 4, &val);
74 bus.sysdata = hose; 74 else
75 bus.ops = hose->ops;
76 indirect_read_config(&bus, 0, PCIE_LTSSM, 4, &val);
77 } else
78 early_read_config_dword(hose, 0, 0, PCIE_LTSSM, &val); 75 early_read_config_dword(hose, 0, 0, PCIE_LTSSM, &val);
79 if (val < PCIE_LTSSM_L0) 76 if (val < PCIE_LTSSM_L0)
80 return 1; 77 return 1;
diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c
index 1f6c570d66d4..692de9dbc680 100644
--- a/arch/powerpc/sysdev/indirect_pci.c
+++ b/arch/powerpc/sysdev/indirect_pci.c
@@ -20,31 +20,31 @@
20#include <asm/pci-bridge.h> 20#include <asm/pci-bridge.h>
21#include <asm/machdep.h> 21#include <asm/machdep.h>
22 22
23int indirect_read_config(struct pci_bus *bus, unsigned int devfn, 23int __indirect_read_config(struct pci_controller *hose,
24 int offset, int len, u32 *val) 24 unsigned char bus_number, unsigned int devfn,
25 int offset, int len, u32 *val)
25{ 26{
26 struct pci_controller *hose = pci_bus_to_host(bus);
27 volatile void __iomem *cfg_data; 27 volatile void __iomem *cfg_data;
28 u8 cfg_type = 0; 28 u8 cfg_type = 0;
29 u32 bus_no, reg; 29 u32 bus_no, reg;
30 30
31 if (hose->indirect_type & PPC_INDIRECT_TYPE_NO_PCIE_LINK) { 31 if (hose->indirect_type & PPC_INDIRECT_TYPE_NO_PCIE_LINK) {
32 if (bus->number != hose->first_busno) 32 if (bus_number != hose->first_busno)
33 return PCIBIOS_DEVICE_NOT_FOUND; 33 return PCIBIOS_DEVICE_NOT_FOUND;
34 if (devfn != 0) 34 if (devfn != 0)
35 return PCIBIOS_DEVICE_NOT_FOUND; 35 return PCIBIOS_DEVICE_NOT_FOUND;
36 } 36 }
37 37
38 if (ppc_md.pci_exclude_device) 38 if (ppc_md.pci_exclude_device)
39 if (ppc_md.pci_exclude_device(hose, bus->number, devfn)) 39 if (ppc_md.pci_exclude_device(hose, bus_number, devfn))
40 return PCIBIOS_DEVICE_NOT_FOUND; 40 return PCIBIOS_DEVICE_NOT_FOUND;
41 41
42 if (hose->indirect_type & PPC_INDIRECT_TYPE_SET_CFG_TYPE) 42 if (hose->indirect_type & PPC_INDIRECT_TYPE_SET_CFG_TYPE)
43 if (bus->number != hose->first_busno) 43 if (bus_number != hose->first_busno)
44 cfg_type = 1; 44 cfg_type = 1;
45 45
46 bus_no = (bus->number == hose->first_busno) ? 46 bus_no = (bus_number == hose->first_busno) ?
47 hose->self_busno : bus->number; 47 hose->self_busno : bus_number;
48 48
49 if (hose->indirect_type & PPC_INDIRECT_TYPE_EXT_REG) 49 if (hose->indirect_type & PPC_INDIRECT_TYPE_EXT_REG)
50 reg = ((offset & 0xf00) << 16) | (offset & 0xfc); 50 reg = ((offset & 0xf00) << 16) | (offset & 0xfc);
@@ -77,6 +77,15 @@ int indirect_read_config(struct pci_bus *bus, unsigned int devfn,
77 return PCIBIOS_SUCCESSFUL; 77 return PCIBIOS_SUCCESSFUL;
78} 78}
79 79
80int indirect_read_config(struct pci_bus *bus, unsigned int devfn,
81 int offset, int len, u32 *val)
82{
83 struct pci_controller *hose = pci_bus_to_host(bus);
84
85 return __indirect_read_config(hose, bus->number, devfn, offset, len,
86 val);
87}
88
80int indirect_write_config(struct pci_bus *bus, unsigned int devfn, 89int indirect_write_config(struct pci_bus *bus, unsigned int devfn,
81 int offset, int len, u32 val) 90 int offset, int len, u32 val)
82{ 91{
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index c4648ad5c1f3..bbfbbf2025fd 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1929,7 +1929,7 @@ int __init smp_mpic_probe(void)
1929 1929
1930 DBG("smp_mpic_probe()...\n"); 1930 DBG("smp_mpic_probe()...\n");
1931 1931
1932 nr_cpus = cpumask_weight(cpu_possible_mask); 1932 nr_cpus = num_possible_cpus();
1933 1933
1934 DBG("nr_cpus: %d\n", nr_cpus); 1934 DBG("nr_cpus: %d\n", nr_cpus);
1935 1935
diff --git a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
index ed9970ff8d94..f366d2d4c079 100644
--- a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
+++ b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
@@ -145,7 +145,7 @@ static int hsta_msi_probe(struct platform_device *pdev)
145 ppc4xx_hsta_msi.address = mem->start; 145 ppc4xx_hsta_msi.address = mem->start;
146 ppc4xx_hsta_msi.data = ioremap(mem->start, resource_size(mem)); 146 ppc4xx_hsta_msi.data = ioremap(mem->start, resource_size(mem));
147 ppc4xx_hsta_msi.irq_count = irq_count; 147 ppc4xx_hsta_msi.irq_count = irq_count;
148 if (IS_ERR(ppc4xx_hsta_msi.data)) { 148 if (!ppc4xx_hsta_msi.data) {
149 dev_err(dev, "Unable to map memory\n"); 149 dev_err(dev, "Unable to map memory\n");
150 return -ENOMEM; 150 return -ENOMEM;
151 } 151 }
diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c
index 1f29cee8da7b..c2518cdb7ddb 100644
--- a/arch/powerpc/sysdev/qe_lib/qe.c
+++ b/arch/powerpc/sysdev/qe_lib/qe.c
@@ -497,7 +497,7 @@ int qe_upload_firmware(const struct qe_firmware *firmware)
497 * saved microcode information and put in the new. 497 * saved microcode information and put in the new.
498 */ 498 */
499 memset(&qe_firmware_info, 0, sizeof(qe_firmware_info)); 499 memset(&qe_firmware_info, 0, sizeof(qe_firmware_info));
500 strcpy(qe_firmware_info.id, firmware->id); 500 strlcpy(qe_firmware_info.id, firmware->id, sizeof(qe_firmware_info.id));
501 qe_firmware_info.extended_modes = firmware->extended_modes; 501 qe_firmware_info.extended_modes = firmware->extended_modes;
502 memcpy(qe_firmware_info.vtraps, firmware->vtraps, 502 memcpy(qe_firmware_info.vtraps, firmware->vtraps,
503 sizeof(firmware->vtraps)); 503 sizeof(firmware->vtraps));
@@ -583,8 +583,8 @@ struct qe_firmware_info *qe_get_firmware_info(void)
583 /* Copy the data into qe_firmware_info*/ 583 /* Copy the data into qe_firmware_info*/
584 sprop = of_get_property(fw, "id", NULL); 584 sprop = of_get_property(fw, "id", NULL);
585 if (sprop) 585 if (sprop)
586 strncpy(qe_firmware_info.id, sprop, 586 strlcpy(qe_firmware_info.id, sprop,
587 sizeof(qe_firmware_info.id) - 1); 587 sizeof(qe_firmware_info.id));
588 588
589 prop = of_find_property(fw, "extended-modes", NULL); 589 prop = of_find_property(fw, "extended-modes", NULL);
590 if (prop && (prop->length == sizeof(u64))) { 590 if (prop && (prop->length == sizeof(u64))) {
diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c
index 365249cd346b..125743b58c70 100644
--- a/arch/powerpc/sysdev/xics/xics-common.c
+++ b/arch/powerpc/sysdev/xics/xics-common.c
@@ -148,7 +148,7 @@ int __init xics_smp_probe(void)
148 /* Register all the IPIs */ 148 /* Register all the IPIs */
149 xics_request_ipi(); 149 xics_request_ipi();
150 150
151 return cpumask_weight(cpu_possible_mask); 151 return num_possible_cpus();
152} 152}
153 153
154#endif /* CONFIG_SMP */ 154#endif /* CONFIG_SMP */
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 13c6e200b24e..e599259d84fc 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -25,6 +25,7 @@
25#include <linux/irq.h> 25#include <linux/irq.h>
26#include <linux/bug.h> 26#include <linux/bug.h>
27#include <linux/nmi.h> 27#include <linux/nmi.h>
28#include <linux/ctype.h>
28 29
29#include <asm/ptrace.h> 30#include <asm/ptrace.h>
30#include <asm/string.h> 31#include <asm/string.h>
@@ -183,14 +184,6 @@ extern void xmon_leave(void);
183#define GETWORD(v) (((v)[0] << 24) + ((v)[1] << 16) + ((v)[2] << 8) + (v)[3]) 184#define GETWORD(v) (((v)[0] << 24) + ((v)[1] << 16) + ((v)[2] << 8) + (v)[3])
184#endif 185#endif
185 186
186#define isxdigit(c) (('0' <= (c) && (c) <= '9') \
187 || ('a' <= (c) && (c) <= 'f') \
188 || ('A' <= (c) && (c) <= 'F'))
189#define isalnum(c) (('0' <= (c) && (c) <= '9') \
190 || ('a' <= (c) && (c) <= 'z') \
191 || ('A' <= (c) && (c) <= 'Z'))
192#define isspace(c) (c == ' ' || c == '\t' || c == 10 || c == 13 || c == 0)
193
194static char *help_string = "\ 187static char *help_string = "\
195Commands:\n\ 188Commands:\n\
196 b show breakpoints\n\ 189 b show breakpoints\n\
@@ -2165,9 +2158,6 @@ static void dump_pacas(void)
2165} 2158}
2166#endif 2159#endif
2167 2160
2168#define isxdigit(c) (('0' <= (c) && (c) <= '9') \
2169 || ('a' <= (c) && (c) <= 'f') \
2170 || ('A' <= (c) && (c) <= 'F'))
2171static void 2161static void
2172dump(void) 2162dump(void)
2173{ 2163{
@@ -2570,7 +2560,7 @@ scanhex(unsigned long *vp)
2570 int i; 2560 int i;
2571 for (i=0; i<63; i++) { 2561 for (i=0; i<63; i++) {
2572 c = inchar(); 2562 c = inchar();
2573 if (isspace(c)) { 2563 if (isspace(c) || c == '\0') {
2574 termch = c; 2564 termch = c;
2575 break; 2565 break;
2576 } 2566 }
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-24 23:23:45 -0500