aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-02 14:09:50 -0500
committerIngo Molnar <mingo@elte.hu>2008-12-02 14:09:50 -0500
commita64d31baed104be25305e9c71585d3ea4ee9a418 (patch)
tree470e3c59ef39f38bcd69f8fef7dba8f76afbec53 /arch
parent1c39194878c09bd88ffc9c9d4c2f01c3397c7aed (diff)
parent061e41fdb5047b1fb161e89664057835935ca1d2 (diff)
Merge branch 'linus' into cpus4096
Conflicts: kernel/trace/ring_buffer.c
Diffstat (limited to 'arch')
-rw-r--r--arch/Kconfig2
-rw-r--r--arch/alpha/kernel/pci.c2
-rw-r--r--arch/alpha/kernel/smp.c6
-rw-r--r--arch/alpha/kernel/traps.c4
-rw-r--r--arch/arm/configs/corgi_defconfig2
-rw-r--r--arch/arm/mach-pxa/mioa701.c2
-rw-r--r--arch/arm/mach-pxa/mioa701_bootresume.S1
-rw-r--r--arch/arm/mach-pxa/palmtx.c150
-rw-r--r--arch/arm/mach-pxa/pcm990-baseboard.c1
-rw-r--r--arch/arm/mach-s3c2410/include/mach/spi-gpio.h1
-rw-r--r--arch/arm/plat-omap/gpio.c5
-rw-r--r--arch/arm/plat-omap/include/mach/pm.h2
-rw-r--r--arch/frv/kernel/sys_frv.c17
-rw-r--r--arch/ia64/include/asm/ptrace.h2
-rw-r--r--arch/ia64/sn/kernel/io_init.c2
-rw-r--r--arch/m32r/kernel/head.S4
-rw-r--r--arch/m32r/kernel/vmlinux.lds.S1
-rw-r--r--arch/mips/include/asm/bug.h29
-rw-r--r--arch/mips/include/asm/ptrace.h4
-rw-r--r--arch/mn10300/kernel/gdb-stub.c24
-rw-r--r--arch/parisc/include/asm/parisc-device.h4
-rw-r--r--arch/parisc/include/asm/posix_types.h3
-rw-r--r--arch/parisc/include/asm/ptrace.h2
-rw-r--r--arch/parisc/kernel/drivers.c6
-rw-r--r--arch/parisc/kernel/traps.c43
-rw-r--r--arch/powerpc/boot/dts/mpc832x_rdb.dts4
-rw-r--r--arch/powerpc/boot/dts/mpc8572ds.dts2
-rw-r--r--arch/powerpc/configs/40x/virtex_defconfig1176
-rw-r--r--arch/powerpc/configs/44x/virtex5_defconfig234
-rw-r--r--arch/powerpc/configs/52xx/cm5200_defconfig169
-rw-r--r--arch/powerpc/configs/52xx/lite5200b_defconfig206
-rw-r--r--arch/powerpc/configs/52xx/motionpro_defconfig168
-rw-r--r--arch/powerpc/configs/52xx/pcm030_defconfig182
-rw-r--r--arch/powerpc/configs/52xx/tqm5200_defconfig180
-rw-r--r--arch/powerpc/configs/86xx/gef_sbc610_defconfig2
-rw-r--r--arch/powerpc/configs/mpc5200_defconfig573
-rw-r--r--arch/powerpc/configs/ppc40x_defconfig92
-rw-r--r--arch/powerpc/configs/ppc44x_defconfig92
-rw-r--r--arch/powerpc/include/asm/mmu-hash64.h1
-rw-r--r--arch/powerpc/include/asm/ptrace.h2
-rw-r--r--arch/powerpc/kernel/cpu_setup_44x.S7
-rw-r--r--arch/powerpc/kernel/entry_64.S8
-rw-r--r--arch/powerpc/kernel/prom_parse.c7
-rw-r--r--arch/powerpc/kernel/sysfs.c2
-rw-r--r--arch/powerpc/mm/40x_mmu.c16
-rw-r--r--arch/powerpc/mm/hugetlbpage.c2
-rw-r--r--arch/powerpc/mm/numa.c122
-rw-r--r--arch/powerpc/platforms/cell/axon_msi.c36
-rw-r--r--arch/powerpc/platforms/cell/smp.c9
-rw-r--r--arch/powerpc/platforms/cell/spufs/file.c3
-rw-r--r--arch/powerpc/sysdev/bestcomm/Kconfig9
-rw-r--r--arch/powerpc/sysdev/mpic.c9
-rw-r--r--arch/powerpc/sysdev/xilinx_intc.c4
-rw-r--r--arch/s390/defconfig74
-rw-r--r--arch/s390/include/asm/pgtable.h2
-rw-r--r--arch/s390/include/asm/ptrace.h4
-rw-r--r--arch/s390/include/asm/syscall.h28
-rw-r--r--arch/s390/kernel/asm-offsets.c2
-rw-r--r--arch/s390/kernel/compat_signal.c2
-rw-r--r--arch/s390/kernel/entry.S21
-rw-r--r--arch/s390/kernel/entry64.S23
-rw-r--r--arch/s390/kernel/init_task.c2
-rw-r--r--arch/s390/kernel/ptrace.c2
-rw-r--r--arch/s390/kernel/signal.c6
-rw-r--r--arch/s390/kernel/time.c13
-rw-r--r--arch/s390/kernel/vmlinux.lds.S3
-rw-r--r--arch/sparc/include/asm/ptrace_64.h2
-rw-r--r--arch/sparc/kernel/cpu.c2
-rw-r--r--arch/sparc/kernel/head.S2
-rw-r--r--arch/sparc/kernel/smp.c4
-rw-r--r--arch/sparc/kernel/sun4d_smp.c4
-rw-r--r--arch/sparc/kernel/sun4m_smp.c2
-rw-r--r--arch/sparc/kernel/trampoline.S4
-rw-r--r--arch/sparc/kernel/vmlinux.lds.S1
-rw-r--r--arch/sparc/mm/srmmu.c14
-rw-r--r--arch/sparc64/kernel/smp.c4
-rw-r--r--arch/sparc64/mm/init.c2
-rw-r--r--arch/x86/boot/tty.c2
-rw-r--r--arch/x86/include/asm/ds.h6
-rw-r--r--arch/x86/include/asm/pci_64.h14
-rw-r--r--arch/x86/include/asm/ptrace.h2
-rw-r--r--arch/x86/kernel/Makefile2
-rw-r--r--arch/x86/kernel/apic.c2
-rw-r--r--arch/x86/kernel/cpu/cpufreq/powernow-k8.c18
-rw-r--r--arch/x86/kernel/cpu/cpufreq/powernow-k8.h17
-rw-r--r--arch/x86/kernel/ds.c88
-rw-r--r--arch/x86/kernel/i387.c2
-rw-r--r--arch/x86/kernel/io_apic.c48
-rw-r--r--arch/x86/kernel/kvmclock.c2
-rw-r--r--arch/x86/kernel/pci-calgary_64.c2
-rw-r--r--arch/x86/kernel/xsave.c2
-rw-r--r--arch/x86/oprofile/op_model_ppro.c2
-rw-r--r--arch/x86/pci/fixup.c25
-rw-r--r--arch/x86/xen/mmu.c21
-rw-r--r--arch/x86/xen/smp.c2
-rw-r--r--arch/x86/xen/xen-ops.h2
96 files changed, 3214 insertions, 904 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index 8977d99987cb..471e72dbaf8b 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -79,8 +79,6 @@ config HAVE_KRETPROBES
79# task_pt_regs() in asm/processor.h or asm/ptrace.h 79# task_pt_regs() in asm/processor.h or asm/ptrace.h
80# arch_has_single_step() if there is hardware single-step support 80# arch_has_single_step() if there is hardware single-step support
81# arch_has_block_step() if there is hardware block-step support 81# arch_has_block_step() if there is hardware block-step support
82# arch_ptrace() and not #define __ARCH_SYS_PTRACE
83# compat_arch_ptrace() and #define __ARCH_WANT_COMPAT_SYS_PTRACE
84# asm/syscall.h supplying asm-generic/syscall.h interface 82# asm/syscall.h supplying asm-generic/syscall.h interface
85# linux/regset.h user_regset interfaces 83# linux/regset.h user_regset interfaces
86# CORE_DUMP_USE_REGSET #define'd in linux/elf.h 84# CORE_DUMP_USE_REGSET #define'd in linux/elf.h
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 5cf45fc51343..ff8cb638472e 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -338,7 +338,7 @@ common_swizzle(struct pci_dev *dev, u8 *pinp)
338 return PCI_SLOT(dev->devfn); 338 return PCI_SLOT(dev->devfn);
339} 339}
340 340
341void __devinit 341void
342pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, 342pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
343 struct resource *res) 343 struct resource *res)
344{ 344{
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index e657c45d91d2..cf7da10097bb 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -121,7 +121,7 @@ wait_boot_cpu_to_stop(int cpuid)
121/* 121/*
122 * Where secondaries begin a life of C. 122 * Where secondaries begin a life of C.
123 */ 123 */
124void __init 124void __cpuinit
125smp_callin(void) 125smp_callin(void)
126{ 126{
127 int cpuid = hard_smp_processor_id(); 127 int cpuid = hard_smp_processor_id();
@@ -198,7 +198,7 @@ wait_for_txrdy (unsigned long cpumask)
198 * Send a message to a secondary's console. "START" is one such 198 * Send a message to a secondary's console. "START" is one such
199 * interesting message. ;-) 199 * interesting message. ;-)
200 */ 200 */
201static void __init 201static void __cpuinit
202send_secondary_console_msg(char *str, int cpuid) 202send_secondary_console_msg(char *str, int cpuid)
203{ 203{
204 struct percpu_struct *cpu; 204 struct percpu_struct *cpu;
@@ -289,7 +289,7 @@ recv_secondary_console_msg(void)
289/* 289/*
290 * Convince the console to have a secondary cpu begin execution. 290 * Convince the console to have a secondary cpu begin execution.
291 */ 291 */
292static int __init 292static int __cpuinit
293secondary_cpu_start(int cpuid, struct task_struct *idle) 293secondary_cpu_start(int cpuid, struct task_struct *idle)
294{ 294{
295 struct percpu_struct *cpu; 295 struct percpu_struct *cpu;
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index c778779007fc..cefc5a355ef9 100644
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -31,7 +31,7 @@
31 31
32static int opDEC_fix; 32static int opDEC_fix;
33 33
34static void __init 34static void __cpuinit
35opDEC_check(void) 35opDEC_check(void)
36{ 36{
37 __asm__ __volatile__ ( 37 __asm__ __volatile__ (
@@ -1072,7 +1072,7 @@ give_sigbus:
1072 return; 1072 return;
1073} 1073}
1074 1074
1075void __init 1075void __cpuinit
1076trap_init(void) 1076trap_init(void)
1077{ 1077{
1078 /* Tell PAL-code what global pointer we want in the kernel. */ 1078 /* Tell PAL-code what global pointer we want in the kernel. */
diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig
index f3af0b593eb0..98765438048d 100644
--- a/arch/arm/configs/corgi_defconfig
+++ b/arch/arm/configs/corgi_defconfig
@@ -179,7 +179,7 @@ CONFIG_MACH_HUSKY=y
179# CONFIG_MACH_AKITA is not set 179# CONFIG_MACH_AKITA is not set
180# CONFIG_MACH_SPITZ is not set 180# CONFIG_MACH_SPITZ is not set
181# CONFIG_MACH_BORZOI is not set 181# CONFIG_MACH_BORZOI is not set
182CONFIG_MACH_TOSA=y 182# CONFIG_MACH_TOSA is not set
183# CONFIG_ARCH_VIPER is not set 183# CONFIG_ARCH_VIPER is not set
184# CONFIG_ARCH_PXA_ESERIES is not set 184# CONFIG_ARCH_PXA_ESERIES is not set
185# CONFIG_TRIZEPS_PXA is not set 185# CONFIG_TRIZEPS_PXA is not set
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c
index 0842c531ee4d..782903fe9c6c 100644
--- a/arch/arm/mach-pxa/mioa701.c
+++ b/arch/arm/mach-pxa/mioa701.c
@@ -565,7 +565,7 @@ static int mioa701_sys_suspend(struct sys_device *sysdev, pm_message_t state)
565 u32 *mem_resume_unknown = phys_to_virt(RESUME_UNKNOWN_ADDR); 565 u32 *mem_resume_unknown = phys_to_virt(RESUME_UNKNOWN_ADDR);
566 566
567 /* Devices prepare suspend */ 567 /* Devices prepare suspend */
568 is_bt_on = gpio_get_value(GPIO83_BT_ON); 568 is_bt_on = !!gpio_get_value(GPIO83_BT_ON);
569 pxa2xx_mfp_set_lpm(GPIO83_BT_ON, 569 pxa2xx_mfp_set_lpm(GPIO83_BT_ON,
570 is_bt_on ? MFP_LPM_DRIVE_HIGH : MFP_LPM_DRIVE_LOW); 570 is_bt_on ? MFP_LPM_DRIVE_HIGH : MFP_LPM_DRIVE_LOW);
571 571
diff --git a/arch/arm/mach-pxa/mioa701_bootresume.S b/arch/arm/mach-pxa/mioa701_bootresume.S
index a647693d9856..324d25a48c85 100644
--- a/arch/arm/mach-pxa/mioa701_bootresume.S
+++ b/arch/arm/mach-pxa/mioa701_bootresume.S
@@ -24,6 +24,7 @@ ENTRY(mioa701_jumpaddr)
241: 241:
25 mov r0, #0xa0000000 @ Don't suppose memory access works 25 mov r0, #0xa0000000 @ Don't suppose memory access works
26 orr r0, r0, #0x00200000 @ even if it's supposed to 26 orr r0, r0, #0x00200000 @ even if it's supposed to
27 orr r0, r0, #0x0000b000
27 mov r1, #0 28 mov r1, #0
28 str r1, [r0] @ Early disable resume for next boot 29 str r1, [r0] @ Early disable resume for next boot
29 ldr r0, mioa701_jumpaddr @ (Murphy's Law) 30 ldr r0, mioa701_jumpaddr @ (Murphy's Law)
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
index 4447711c9fc6..a9d94f5dbec4 100644
--- a/arch/arm/mach-pxa/palmtx.c
+++ b/arch/arm/mach-pxa/palmtx.c
@@ -56,6 +56,9 @@ static unsigned long palmtx_pin_config[] __initdata = {
56 GPIO110_MMC_DAT_2, 56 GPIO110_MMC_DAT_2,
57 GPIO111_MMC_DAT_3, 57 GPIO111_MMC_DAT_3,
58 GPIO112_MMC_CMD, 58 GPIO112_MMC_CMD,
59 GPIO14_GPIO, /* SD detect */
60 GPIO114_GPIO, /* SD power */
61 GPIO115_GPIO, /* SD r/o switch */
59 62
60 /* AC97 */ 63 /* AC97 */
61 GPIO28_AC97_BITCLK, 64 GPIO28_AC97_BITCLK,
@@ -64,6 +67,7 @@ static unsigned long palmtx_pin_config[] __initdata = {
64 GPIO31_AC97_SYNC, 67 GPIO31_AC97_SYNC,
65 68
66 /* IrDA */ 69 /* IrDA */
70 GPIO40_GPIO, /* ir disable */
67 GPIO46_FICP_RXD, 71 GPIO46_FICP_RXD,
68 GPIO47_FICP_TXD, 72 GPIO47_FICP_TXD,
69 73
@@ -71,7 +75,8 @@ static unsigned long palmtx_pin_config[] __initdata = {
71 GPIO16_PWM0_OUT, 75 GPIO16_PWM0_OUT,
72 76
73 /* USB */ 77 /* USB */
74 GPIO13_GPIO, 78 GPIO13_GPIO, /* usb detect */
79 GPIO95_GPIO, /* usb power */
75 80
76 /* PCMCIA */ 81 /* PCMCIA */
77 GPIO48_nPOE, 82 GPIO48_nPOE,
@@ -84,6 +89,45 @@ static unsigned long palmtx_pin_config[] __initdata = {
84 GPIO55_nPREG, 89 GPIO55_nPREG,
85 GPIO56_nPWAIT, 90 GPIO56_nPWAIT,
86 GPIO57_nIOIS16, 91 GPIO57_nIOIS16,
92 GPIO94_GPIO, /* wifi power 1 */
93 GPIO108_GPIO, /* wifi power 2 */
94 GPIO116_GPIO, /* wifi ready */
95
96 /* MATRIX KEYPAD */
97 GPIO100_KP_MKIN_0,
98 GPIO101_KP_MKIN_1,
99 GPIO102_KP_MKIN_2,
100 GPIO97_KP_MKIN_3,
101 GPIO103_KP_MKOUT_0,
102 GPIO104_KP_MKOUT_1,
103 GPIO105_KP_MKOUT_2,
104
105 /* LCD */
106 GPIO58_LCD_LDD_0,
107 GPIO59_LCD_LDD_1,
108 GPIO60_LCD_LDD_2,
109 GPIO61_LCD_LDD_3,
110 GPIO62_LCD_LDD_4,
111 GPIO63_LCD_LDD_5,
112 GPIO64_LCD_LDD_6,
113 GPIO65_LCD_LDD_7,
114 GPIO66_LCD_LDD_8,
115 GPIO67_LCD_LDD_9,
116 GPIO68_LCD_LDD_10,
117 GPIO69_LCD_LDD_11,
118 GPIO70_LCD_LDD_12,
119 GPIO71_LCD_LDD_13,
120 GPIO72_LCD_LDD_14,
121 GPIO73_LCD_LDD_15,
122 GPIO74_LCD_FCLK,
123 GPIO75_LCD_LCLK,
124 GPIO76_LCD_PCLK,
125 GPIO77_LCD_BIAS,
126
127 /* MISC. */
128 GPIO10_GPIO, /* hotsync button */
129 GPIO12_GPIO, /* power detect */
130 GPIO107_GPIO, /* earphone detect */
87}; 131};
88 132
89/****************************************************************************** 133/******************************************************************************
@@ -95,32 +139,49 @@ static int palmtx_mci_init(struct device *dev, irq_handler_t palmtx_detect_int,
95 int err = 0; 139 int err = 0;
96 140
97 /* Setup an interrupt for detecting card insert/remove events */ 141 /* Setup an interrupt for detecting card insert/remove events */
98 err = request_irq(IRQ_GPIO_PALMTX_SD_DETECT_N, palmtx_detect_int, 142 err = gpio_request(GPIO_NR_PALMTX_SD_DETECT_N, "SD IRQ");
99 IRQF_DISABLED | IRQF_SAMPLE_RANDOM | 143 if (err)
144 goto err;
145 err = gpio_direction_input(GPIO_NR_PALMTX_SD_DETECT_N);
146 if (err)
147 goto err2;
148 err = request_irq(gpio_to_irq(GPIO_NR_PALMTX_SD_DETECT_N),
149 palmtx_detect_int, IRQF_DISABLED | IRQF_SAMPLE_RANDOM |
100 IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, 150 IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
101 "SD/MMC card detect", data); 151 "SD/MMC card detect", data);
102 if (err) { 152 if (err) {
103 printk(KERN_ERR "%s: cannot request SD/MMC card detect IRQ\n", 153 printk(KERN_ERR "%s: cannot request SD/MMC card detect IRQ\n",
104 __func__); 154 __func__);
105 return err; 155 goto err2;
106 } 156 }
107 157
108 err = gpio_request(GPIO_NR_PALMTX_SD_POWER, "SD_POWER"); 158 err = gpio_request(GPIO_NR_PALMTX_SD_POWER, "SD_POWER");
109 if (err) 159 if (err)
110 goto pwr_err; 160 goto err3;
161 err = gpio_direction_output(GPIO_NR_PALMTX_SD_POWER, 0);
162 if (err)
163 goto err4;
111 164
112 err = gpio_request(GPIO_NR_PALMTX_SD_READONLY, "SD_READONLY"); 165 err = gpio_request(GPIO_NR_PALMTX_SD_READONLY, "SD_READONLY");
113 if (err) 166 if (err)
114 goto ro_err; 167 goto err4;
168 err = gpio_direction_input(GPIO_NR_PALMTX_SD_READONLY);
169 if (err)
170 goto err5;
115 171
116 printk(KERN_DEBUG "%s: irq registered\n", __func__); 172 printk(KERN_DEBUG "%s: irq registered\n", __func__);
117 173
118 return 0; 174 return 0;
119 175
120ro_err: 176err5:
177 gpio_free(GPIO_NR_PALMTX_SD_READONLY);
178err4:
121 gpio_free(GPIO_NR_PALMTX_SD_POWER); 179 gpio_free(GPIO_NR_PALMTX_SD_POWER);
122pwr_err: 180err3:
123 free_irq(IRQ_GPIO_PALMTX_SD_DETECT_N, data); 181 free_irq(gpio_to_irq(GPIO_NR_PALMTX_SD_DETECT_N), data);
182err2:
183 gpio_free(GPIO_NR_PALMTX_SD_DETECT_N);
184err:
124 return err; 185 return err;
125} 186}
126 187
@@ -128,7 +189,8 @@ static void palmtx_mci_exit(struct device *dev, void *data)
128{ 189{
129 gpio_free(GPIO_NR_PALMTX_SD_READONLY); 190 gpio_free(GPIO_NR_PALMTX_SD_READONLY);
130 gpio_free(GPIO_NR_PALMTX_SD_POWER); 191 gpio_free(GPIO_NR_PALMTX_SD_POWER);
131 free_irq(IRQ_GPIO_PALMTX_SD_DETECT_N, data); 192 free_irq(gpio_to_irq(GPIO_NR_PALMTX_SD_DETECT_N), data);
193 gpio_free(GPIO_NR_PALMTX_SD_DETECT_N);
132} 194}
133 195
134static void palmtx_mci_power(struct device *dev, unsigned int vdd) 196static void palmtx_mci_power(struct device *dev, unsigned int vdd)
@@ -167,7 +229,6 @@ static unsigned int palmtx_matrix_keys[] = {
167 229
168 KEY(3, 0, KEY_RIGHT), 230 KEY(3, 0, KEY_RIGHT),
169 KEY(3, 2, KEY_LEFT), 231 KEY(3, 2, KEY_LEFT),
170
171}; 232};
172 233
173static struct pxa27x_keypad_platform_data palmtx_keypad_platform_data = { 234static struct pxa27x_keypad_platform_data palmtx_keypad_platform_data = {
@@ -209,11 +270,19 @@ static int palmtx_backlight_init(struct device *dev)
209 ret = gpio_request(GPIO_NR_PALMTX_BL_POWER, "BL POWER"); 270 ret = gpio_request(GPIO_NR_PALMTX_BL_POWER, "BL POWER");
210 if (ret) 271 if (ret)
211 goto err; 272 goto err;
273 ret = gpio_direction_output(GPIO_NR_PALMTX_BL_POWER, 0);
274 if (ret)
275 goto err2;
212 ret = gpio_request(GPIO_NR_PALMTX_LCD_POWER, "LCD POWER"); 276 ret = gpio_request(GPIO_NR_PALMTX_LCD_POWER, "LCD POWER");
213 if (ret) 277 if (ret)
214 goto err2; 278 goto err2;
279 ret = gpio_direction_output(GPIO_NR_PALMTX_LCD_POWER, 0);
280 if (ret)
281 goto err3;
215 282
216 return 0; 283 return 0;
284err3:
285 gpio_free(GPIO_NR_PALMTX_LCD_POWER);
217err2: 286err2:
218 gpio_free(GPIO_NR_PALMTX_BL_POWER); 287 gpio_free(GPIO_NR_PALMTX_BL_POWER);
219err: 288err:
@@ -254,6 +323,24 @@ static struct platform_device palmtx_backlight = {
254/****************************************************************************** 323/******************************************************************************
255 * IrDA 324 * IrDA
256 ******************************************************************************/ 325 ******************************************************************************/
326static int palmtx_irda_startup(struct device *dev)
327{
328 int err;
329 err = gpio_request(GPIO_NR_PALMTX_IR_DISABLE, "IR DISABLE");
330 if (err)
331 goto err;
332 err = gpio_direction_output(GPIO_NR_PALMTX_IR_DISABLE, 1);
333 if (err)
334 gpio_free(GPIO_NR_PALMTX_IR_DISABLE);
335err:
336 return err;
337}
338
339static void palmtx_irda_shutdown(struct device *dev)
340{
341 gpio_free(GPIO_NR_PALMTX_IR_DISABLE);
342}
343
257static void palmtx_irda_transceiver_mode(struct device *dev, int mode) 344static void palmtx_irda_transceiver_mode(struct device *dev, int mode)
258{ 345{
259 gpio_set_value(GPIO_NR_PALMTX_IR_DISABLE, mode & IR_OFF); 346 gpio_set_value(GPIO_NR_PALMTX_IR_DISABLE, mode & IR_OFF);
@@ -261,6 +348,8 @@ static void palmtx_irda_transceiver_mode(struct device *dev, int mode)
261} 348}
262 349
263static struct pxaficp_platform_data palmtx_ficp_platform_data = { 350static struct pxaficp_platform_data palmtx_ficp_platform_data = {
351 .startup = palmtx_irda_startup,
352 .shutdown = palmtx_irda_shutdown,
264 .transceiver_cap = IR_SIRMODE | IR_FIRMODE | IR_OFF, 353 .transceiver_cap = IR_SIRMODE | IR_FIRMODE | IR_OFF,
265 .transceiver_mode = palmtx_irda_transceiver_mode, 354 .transceiver_mode = palmtx_irda_transceiver_mode,
266}; 355};
@@ -268,17 +357,11 @@ static struct pxaficp_platform_data palmtx_ficp_platform_data = {
268/****************************************************************************** 357/******************************************************************************
269 * UDC 358 * UDC
270 ******************************************************************************/ 359 ******************************************************************************/
271static void palmtx_udc_command(int cmd)
272{
273 gpio_set_value(GPIO_NR_PALMTX_USB_POWER, !cmd);
274 udelay(50);
275 gpio_set_value(GPIO_NR_PALMTX_USB_PULLUP, !cmd);
276}
277
278static struct pxa2xx_udc_mach_info palmtx_udc_info __initdata = { 360static struct pxa2xx_udc_mach_info palmtx_udc_info __initdata = {
279 .gpio_vbus = GPIO_NR_PALMTX_USB_DETECT_N, 361 .gpio_vbus = GPIO_NR_PALMTX_USB_DETECT_N,
280 .gpio_vbus_inverted = 1, 362 .gpio_vbus_inverted = 1,
281 .udc_command = palmtx_udc_command, 363 .gpio_pullup = GPIO_NR_PALMTX_USB_POWER,
364 .gpio_pullup_inverted = 0,
282}; 365};
283 366
284/****************************************************************************** 367/******************************************************************************
@@ -290,17 +373,16 @@ static int power_supply_init(struct device *dev)
290 373
291 ret = gpio_request(GPIO_NR_PALMTX_POWER_DETECT, "CABLE_STATE_AC"); 374 ret = gpio_request(GPIO_NR_PALMTX_POWER_DETECT, "CABLE_STATE_AC");
292 if (ret) 375 if (ret)
293 goto err_cs_ac; 376 goto err1;
294 377 ret = gpio_direction_input(GPIO_NR_PALMTX_POWER_DETECT);
295 ret = gpio_request(GPIO_NR_PALMTX_USB_DETECT_N, "CABLE_STATE_USB");
296 if (ret) 378 if (ret)
297 goto err_cs_usb; 379 goto err2;
298 380
299 return 0; 381 return 0;
300 382
301err_cs_usb: 383err2:
302 gpio_free(GPIO_NR_PALMTX_POWER_DETECT); 384 gpio_free(GPIO_NR_PALMTX_POWER_DETECT);
303err_cs_ac: 385err1:
304 return ret; 386 return ret;
305} 387}
306 388
@@ -309,14 +391,8 @@ static int palmtx_is_ac_online(void)
309 return gpio_get_value(GPIO_NR_PALMTX_POWER_DETECT); 391 return gpio_get_value(GPIO_NR_PALMTX_POWER_DETECT);
310} 392}
311 393
312static int palmtx_is_usb_online(void)
313{
314 return !gpio_get_value(GPIO_NR_PALMTX_USB_DETECT_N);
315}
316
317static void power_supply_exit(struct device *dev) 394static void power_supply_exit(struct device *dev)
318{ 395{
319 gpio_free(GPIO_NR_PALMTX_USB_DETECT_N);
320 gpio_free(GPIO_NR_PALMTX_POWER_DETECT); 396 gpio_free(GPIO_NR_PALMTX_POWER_DETECT);
321} 397}
322 398
@@ -327,7 +403,6 @@ static char *palmtx_supplicants[] = {
327static struct pda_power_pdata power_supply_info = { 403static struct pda_power_pdata power_supply_info = {
328 .init = power_supply_init, 404 .init = power_supply_init,
329 .is_ac_online = palmtx_is_ac_online, 405 .is_ac_online = palmtx_is_ac_online,
330 .is_usb_online = palmtx_is_usb_online,
331 .exit = power_supply_exit, 406 .exit = power_supply_exit,
332 .supplied_to = palmtx_supplicants, 407 .supplied_to = palmtx_supplicants,
333 .num_supplicants = ARRAY_SIZE(palmtx_supplicants), 408 .num_supplicants = ARRAY_SIZE(palmtx_supplicants),
@@ -410,12 +485,23 @@ static void __init palmtx_map_io(void)
410 iotable_init(palmtx_io_desc, ARRAY_SIZE(palmtx_io_desc)); 485 iotable_init(palmtx_io_desc, ARRAY_SIZE(palmtx_io_desc));
411} 486}
412 487
488/* setup udc GPIOs initial state */
489static void __init palmtx_udc_init(void)
490{
491 if (!gpio_request(GPIO_NR_PALMTX_USB_POWER, "UDC Vbus")) {
492 gpio_direction_output(GPIO_NR_PALMTX_USB_POWER, 1);
493 gpio_free(GPIO_NR_PALMTX_USB_POWER);
494 }
495}
496
497
413static void __init palmtx_init(void) 498static void __init palmtx_init(void)
414{ 499{
415 pxa2xx_mfp_config(ARRAY_AND_SIZE(palmtx_pin_config)); 500 pxa2xx_mfp_config(ARRAY_AND_SIZE(palmtx_pin_config));
416 501
417 set_pxa_fb_info(&palmtx_lcd_screen); 502 set_pxa_fb_info(&palmtx_lcd_screen);
418 pxa_set_mci_info(&palmtx_mci_platform_data); 503 pxa_set_mci_info(&palmtx_mci_platform_data);
504 palmtx_udc_init();
419 pxa_set_udc_info(&palmtx_udc_info); 505 pxa_set_udc_info(&palmtx_udc_info);
420 pxa_set_ac97_info(NULL); 506 pxa_set_ac97_info(NULL);
421 pxa_set_ficp_info(&palmtx_ficp_platform_data); 507 pxa_set_ficp_info(&palmtx_ficp_platform_data);
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index f601425f1b1e..b36cec5c9eed 100644
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -385,6 +385,7 @@ static struct soc_camera_link iclink[] = {
385 .gpio = NR_BUILTIN_GPIO + 1, 385 .gpio = NR_BUILTIN_GPIO + 1,
386 }, { 386 }, {
387 .bus_id = 0, /* Must match with the camera ID above */ 387 .bus_id = 0, /* Must match with the camera ID above */
388 .gpio = -ENXIO,
388 } 389 }
389}; 390};
390 391
diff --git a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
index 3fe8be9ca110..980a099e209c 100644
--- a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
+++ b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
@@ -18,6 +18,7 @@ struct s3c2410_spigpio_info {
18 unsigned long pin_mosi; 18 unsigned long pin_mosi;
19 unsigned long pin_miso; 19 unsigned long pin_miso;
20 20
21 int num_chipselect;
21 int bus_num; 22 int bus_num;
22 23
23 void (*chip_select)(struct s3c2410_spigpio_info *spi, int cs); 24 void (*chip_select)(struct s3c2410_spigpio_info *spi, int cs);
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 8679fbca6bbe..424049d83fbe 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -101,6 +101,7 @@
101#define OMAP24XX_GPIO_IRQSTATUS2 0x0028 101#define OMAP24XX_GPIO_IRQSTATUS2 0x0028
102#define OMAP24XX_GPIO_IRQENABLE2 0x002c 102#define OMAP24XX_GPIO_IRQENABLE2 0x002c
103#define OMAP24XX_GPIO_IRQENABLE1 0x001c 103#define OMAP24XX_GPIO_IRQENABLE1 0x001c
104#define OMAP24XX_GPIO_WAKE_EN 0x0020
104#define OMAP24XX_GPIO_CTRL 0x0030 105#define OMAP24XX_GPIO_CTRL 0x0030
105#define OMAP24XX_GPIO_OE 0x0034 106#define OMAP24XX_GPIO_OE 0x0034
106#define OMAP24XX_GPIO_DATAIN 0x0038 107#define OMAP24XX_GPIO_DATAIN 0x0038
@@ -1551,7 +1552,7 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg)
1551#endif 1552#endif
1552#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) 1553#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
1553 case METHOD_GPIO_24XX: 1554 case METHOD_GPIO_24XX:
1554 wake_status = bank->base + OMAP24XX_GPIO_SETWKUENA; 1555 wake_status = bank->base + OMAP24XX_GPIO_WAKE_EN;
1555 wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; 1556 wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA;
1556 wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA; 1557 wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA;
1557 break; 1558 break;
@@ -1574,7 +1575,7 @@ static int omap_gpio_resume(struct sys_device *dev)
1574{ 1575{
1575 int i; 1576 int i;
1576 1577
1577 if (!cpu_is_omap24xx() && !cpu_is_omap16xx()) 1578 if (!cpu_class_is_omap2() && !cpu_is_omap16xx())
1578 return 0; 1579 return 0;
1579 1580
1580 for (i = 0; i < gpio_bank_count; i++) { 1581 for (i = 0; i < gpio_bank_count; i++) {
diff --git a/arch/arm/plat-omap/include/mach/pm.h b/arch/arm/plat-omap/include/mach/pm.h
index 768eb6e7abcf..2a9c27ad4c37 100644
--- a/arch/arm/plat-omap/include/mach/pm.h
+++ b/arch/arm/plat-omap/include/mach/pm.h
@@ -128,7 +128,7 @@ void clk_deny_idle(struct clk *clk);
128 * clk_allow_idle - Counters previous clk_deny_idle 128 * clk_allow_idle - Counters previous clk_deny_idle
129 * @clk: clock signal handle 129 * @clk: clock signal handle
130 */ 130 */
131void clk_deny_idle(struct clk *clk); 131void clk_allow_idle(struct clk *clk);
132 132
133extern void omap_pm_idle(void); 133extern void omap_pm_idle(void);
134extern void omap_pm_suspend(void); 134extern void omap_pm_suspend(void);
diff --git a/arch/frv/kernel/sys_frv.c b/arch/frv/kernel/sys_frv.c
index 49b2cf2c38f3..baadc97f8627 100644
--- a/arch/frv/kernel/sys_frv.c
+++ b/arch/frv/kernel/sys_frv.c
@@ -35,22 +35,21 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
35 int error = -EBADF; 35 int error = -EBADF;
36 struct file * file = NULL; 36 struct file * file = NULL;
37 37
38 flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
39 if (!(flags & MAP_ANONYMOUS)) {
40 file = fget(fd);
41 if (!file)
42 goto out;
43 }
44
45 /* As with sparc32, make sure the shift for mmap2 is constant 38 /* As with sparc32, make sure the shift for mmap2 is constant
46 (12), no matter what PAGE_SIZE we have.... */ 39 (12), no matter what PAGE_SIZE we have.... */
47 40
48 /* But unlike sparc32, don't just silently break if we're 41 /* But unlike sparc32, don't just silently break if we're
49 trying to map something we can't */ 42 trying to map something we can't */
50 if (pgoff & ((1<<(PAGE_SHIFT-12))-1)) 43 if (pgoff & ((1 << (PAGE_SHIFT - 12)) - 1))
51 return -EINVAL; 44 return -EINVAL;
45 pgoff >>= PAGE_SHIFT - 12;
52 46
53 pgoff >>= (PAGE_SHIFT - 12); 47 flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
48 if (!(flags & MAP_ANONYMOUS)) {
49 file = fget(fd);
50 if (!file)
51 goto out;
52 }
54 53
55 down_write(&current->mm->mmap_sem); 54 down_write(&current->mm->mmap_sem);
56 error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff); 55 error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
diff --git a/arch/ia64/include/asm/ptrace.h b/arch/ia64/include/asm/ptrace.h
index 6417c1ecb44e..14055c636adf 100644
--- a/arch/ia64/include/asm/ptrace.h
+++ b/arch/ia64/include/asm/ptrace.h
@@ -325,8 +325,6 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs)
325 #define arch_has_block_step() (1) 325 #define arch_has_block_step() (1)
326 extern void user_enable_block_step(struct task_struct *); 326 extern void user_enable_block_step(struct task_struct *);
327 327
328#define __ARCH_WANT_COMPAT_SYS_PTRACE
329
330#endif /* !__KERNEL__ */ 328#endif /* !__KERNEL__ */
331 329
332/* pt_all_user_regs is used for PTRACE_GETREGS PTRACE_SETREGS */ 330/* pt_all_user_regs is used for PTRACE_GETREGS PTRACE_SETREGS */
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index c3aa851d1ca6..4e1801bad83a 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -292,7 +292,7 @@ EXPORT_SYMBOL(sn_io_slot_fixup);
292 * sn_pci_controller_fixup() - This routine sets up a bus's resources 292 * sn_pci_controller_fixup() - This routine sets up a bus's resources
293 * consistent with the Linux PCI abstraction layer. 293 * consistent with the Linux PCI abstraction layer.
294 */ 294 */
295static void 295static void __init
296sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) 296sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
297{ 297{
298 s64 status = 0; 298 s64 status = 0;
diff --git a/arch/m32r/kernel/head.S b/arch/m32r/kernel/head.S
index 40180778a5c7..90916067b9c1 100644
--- a/arch/m32r/kernel/head.S
+++ b/arch/m32r/kernel/head.S
@@ -23,7 +23,7 @@ __INITDATA
23/* 23/*
24 * References to members of the boot_cpu_data structure. 24 * References to members of the boot_cpu_data structure.
25 */ 25 */
26 .text 26.section .text.head, "ax"
27 .global start_kernel 27 .global start_kernel
28 .global __bss_start 28 .global __bss_start
29 .global _end 29 .global _end
@@ -133,7 +133,6 @@ loop1:
133/* 133/*
134 * AP startup routine 134 * AP startup routine
135 */ 135 */
136 .text
137 .global eit_vector 136 .global eit_vector
138ENTRY(startup_AP) 137ENTRY(startup_AP)
139;; setup EVB 138;; setup EVB
@@ -230,6 +229,7 @@ ENTRY(startup_AP)
230 nop 229 nop
231#endif /* CONFIG_SMP */ 230#endif /* CONFIG_SMP */
232 231
232 .text
233ENTRY(stack_start) 233ENTRY(stack_start)
234 .long init_thread_union+8192 234 .long init_thread_union+8192
235 .long __KERNEL_DS 235 .long __KERNEL_DS
diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S
index 15a6f36c06db..9db05df20c0e 100644
--- a/arch/m32r/kernel/vmlinux.lds.S
+++ b/arch/m32r/kernel/vmlinux.lds.S
@@ -27,6 +27,7 @@ SECTIONS
27 _text = .; /* Text and read-only data */ 27 _text = .; /* Text and read-only data */
28 .boot : { *(.boot) } = 0 28 .boot : { *(.boot) } = 0
29 .text : { 29 .text : {
30 *(.text.head)
30 TEXT_TEXT 31 TEXT_TEXT
31 SCHED_TEXT 32 SCHED_TEXT
32 LOCK_TEXT 33 LOCK_TEXT
diff --git a/arch/mips/include/asm/bug.h b/arch/mips/include/asm/bug.h
index 7eb63de808bc..08ea46863fe5 100644
--- a/arch/mips/include/asm/bug.h
+++ b/arch/mips/include/asm/bug.h
@@ -7,20 +7,31 @@
7 7
8#include <asm/break.h> 8#include <asm/break.h>
9 9
10#define BUG() \ 10static inline void __noreturn BUG(void)
11do { \ 11{
12 __asm__ __volatile__("break %0" : : "i" (BRK_BUG)); \ 12 __asm__ __volatile__("break %0" : : "i" (BRK_BUG));
13} while (0) 13 /* Fool GCC into thinking the function doesn't return. */
14 while (1)
15 ;
16}
14 17
15#define HAVE_ARCH_BUG 18#define HAVE_ARCH_BUG
16 19
17#if (_MIPS_ISA > _MIPS_ISA_MIPS1) 20#if (_MIPS_ISA > _MIPS_ISA_MIPS1)
18 21
19#define BUG_ON(condition) \ 22static inline void __BUG_ON(unsigned long condition)
20do { \ 23{
21 __asm__ __volatile__("tne $0, %0, %1" \ 24 if (__builtin_constant_p(condition)) {
22 : : "r" (condition), "i" (BRK_BUG)); \ 25 if (condition)
23} while (0) 26 BUG();
27 else
28 return;
29 }
30 __asm__ __volatile__("tne $0, %0, %1"
31 : : "r" (condition), "i" (BRK_BUG));
32}
33
34#define BUG_ON(C) __BUG_ON((unsigned long)(C))
24 35
25#define HAVE_ARCH_BUG_ON 36#define HAVE_ARCH_BUG_ON
26 37
diff --git a/arch/mips/include/asm/ptrace.h b/arch/mips/include/asm/ptrace.h
index 813abd16255d..c2c8bac43307 100644
--- a/arch/mips/include/asm/ptrace.h
+++ b/arch/mips/include/asm/ptrace.h
@@ -9,10 +9,6 @@
9#ifndef _ASM_PTRACE_H 9#ifndef _ASM_PTRACE_H
10#define _ASM_PTRACE_H 10#define _ASM_PTRACE_H
11 11
12#ifdef CONFIG_64BIT
13#define __ARCH_WANT_COMPAT_SYS_PTRACE
14#endif
15
16/* 0 - 31 are integer registers, 32 - 63 are fp registers. */ 12/* 0 - 31 are integer registers, 32 - 63 are fp registers. */
17#define FPR_BASE 32 13#define FPR_BASE 32
18#define PC 64 14#define PC 64
diff --git a/arch/mn10300/kernel/gdb-stub.c b/arch/mn10300/kernel/gdb-stub.c
index 54be6afb5555..0ea7482c1522 100644
--- a/arch/mn10300/kernel/gdb-stub.c
+++ b/arch/mn10300/kernel/gdb-stub.c
@@ -522,17 +522,7 @@ static int gdbstub_single_step(struct pt_regs *regs)
522 } else { 522 } else {
523 switch (cur) { 523 switch (cur) {
524 /* Bxx (d8,PC) */ 524 /* Bxx (d8,PC) */
525 case 0xc0: 525 case 0xc0 ... 0xca:
526 case 0xc1:
527 case 0xc2:
528 case 0xc3:
529 case 0xc4:
530 case 0xc5:
531 case 0xc6:
532 case 0xc7:
533 case 0xc8:
534 case 0xc9:
535 case 0xca:
536 if (gdbstub_read_byte(pc + 1, (u8 *) &x) < 0) 526 if (gdbstub_read_byte(pc + 1, (u8 *) &x) < 0)
537 goto fault; 527 goto fault;
538 if (!__gdbstub_mark_bp(pc + 2, 0)) 528 if (!__gdbstub_mark_bp(pc + 2, 0))
@@ -543,17 +533,7 @@ static int gdbstub_single_step(struct pt_regs *regs)
543 break; 533 break;
544 534
545 /* LXX (d8,PC) */ 535 /* LXX (d8,PC) */
546 case 0xd0: 536 case 0xd0 ... 0xda:
547 case 0xd1:
548 case 0xd2:
549 case 0xd3:
550 case 0xd4:
551 case 0xd5:
552 case 0xd6:
553 case 0xd7:
554 case 0xd8:
555 case 0xd9:
556 case 0xda:
557 if (!__gdbstub_mark_bp(pc + 1, 0)) 537 if (!__gdbstub_mark_bp(pc + 1, 0))
558 goto fault; 538 goto fault;
559 if (regs->pc != regs->lar && 539 if (regs->pc != regs->lar &&
diff --git a/arch/parisc/include/asm/parisc-device.h b/arch/parisc/include/asm/parisc-device.h
index 7aa13f2add7a..9afdad6c2ffb 100644
--- a/arch/parisc/include/asm/parisc-device.h
+++ b/arch/parisc/include/asm/parisc-device.h
@@ -42,9 +42,9 @@ struct parisc_driver {
42#define to_parisc_driver(d) container_of(d, struct parisc_driver, drv) 42#define to_parisc_driver(d) container_of(d, struct parisc_driver, drv)
43#define parisc_parent(d) to_parisc_device(d->dev.parent) 43#define parisc_parent(d) to_parisc_device(d->dev.parent)
44 44
45static inline char *parisc_pathname(struct parisc_device *d) 45static inline const char *parisc_pathname(struct parisc_device *d)
46{ 46{
47 return d->dev.bus_id; 47 return dev_name(&d->dev);
48} 48}
49 49
50static inline void 50static inline void
diff --git a/arch/parisc/include/asm/posix_types.h b/arch/parisc/include/asm/posix_types.h
index bb725a6630bb..00da29a340ba 100644
--- a/arch/parisc/include/asm/posix_types.h
+++ b/arch/parisc/include/asm/posix_types.h
@@ -24,13 +24,12 @@ typedef int __kernel_daddr_t;
24typedef unsigned long __kernel_size_t; 24typedef unsigned long __kernel_size_t;
25typedef long __kernel_ssize_t; 25typedef long __kernel_ssize_t;
26typedef long __kernel_ptrdiff_t; 26typedef long __kernel_ptrdiff_t;
27typedef long __kernel_time_t;
28#else 27#else
29typedef unsigned int __kernel_size_t; 28typedef unsigned int __kernel_size_t;
30typedef int __kernel_ssize_t; 29typedef int __kernel_ssize_t;
31typedef int __kernel_ptrdiff_t; 30typedef int __kernel_ptrdiff_t;
32typedef long __kernel_time_t;
33#endif 31#endif
32typedef long __kernel_time_t;
34typedef char * __kernel_caddr_t; 33typedef char * __kernel_caddr_t;
35 34
36typedef unsigned short __kernel_uid16_t; 35typedef unsigned short __kernel_uid16_t;
diff --git a/arch/parisc/include/asm/ptrace.h b/arch/parisc/include/asm/ptrace.h
index afa5333187b4..302f68dc889c 100644
--- a/arch/parisc/include/asm/ptrace.h
+++ b/arch/parisc/include/asm/ptrace.h
@@ -47,8 +47,6 @@ struct pt_regs {
47 47
48#define task_regs(task) ((struct pt_regs *) ((char *)(task) + TASK_REGS)) 48#define task_regs(task) ((struct pt_regs *) ((char *)(task) + TASK_REGS))
49 49
50#define __ARCH_WANT_COMPAT_SYS_PTRACE
51
52struct task_struct; 50struct task_struct;
53#define arch_has_single_step() 1 51#define arch_has_single_step() 1
54void user_disable_single_step(struct task_struct *task); 52void user_disable_single_step(struct task_struct *task);
diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c
index 2ca654bd6322..884b7ce16a3b 100644
--- a/arch/parisc/kernel/drivers.c
+++ b/arch/parisc/kernel/drivers.c
@@ -43,7 +43,7 @@ struct hppa_dma_ops *hppa_dma_ops __read_mostly;
43EXPORT_SYMBOL(hppa_dma_ops); 43EXPORT_SYMBOL(hppa_dma_ops);
44 44
45static struct device root = { 45static struct device root = {
46 .bus_id = "parisc", 46 .init_name = "parisc",
47}; 47};
48 48
49static inline int check_dev(struct device *dev) 49static inline int check_dev(struct device *dev)
@@ -393,7 +393,8 @@ EXPORT_SYMBOL(print_pci_hwpath);
393static void setup_bus_id(struct parisc_device *padev) 393static void setup_bus_id(struct parisc_device *padev)
394{ 394{
395 struct hardware_path path; 395 struct hardware_path path;
396 char *output = padev->dev.bus_id; 396 char name[20];
397 char *output = name;
397 int i; 398 int i;
398 399
399 get_node_path(padev->dev.parent, &path); 400 get_node_path(padev->dev.parent, &path);
@@ -404,6 +405,7 @@ static void setup_bus_id(struct parisc_device *padev)
404 output += sprintf(output, "%u:", (unsigned char) path.bc[i]); 405 output += sprintf(output, "%u:", (unsigned char) path.bc[i]);
405 } 406 }
406 sprintf(output, "%u", (unsigned char) padev->hw_path); 407 sprintf(output, "%u", (unsigned char) padev->hw_path);
408 dev_set_name(&padev->dev, name);
407} 409}
408 410
409struct parisc_device * create_tree_node(char id, struct device *parent) 411struct parisc_device * create_tree_node(char id, struct device *parent)
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 675f1d098f05..4c771cd580ec 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -24,7 +24,6 @@
24#include <linux/init.h> 24#include <linux/init.h>
25#include <linux/interrupt.h> 25#include <linux/interrupt.h>
26#include <linux/console.h> 26#include <linux/console.h>
27#include <linux/kallsyms.h>
28#include <linux/bug.h> 27#include <linux/bug.h>
29 28
30#include <asm/assembly.h> 29#include <asm/assembly.h>
@@ -51,7 +50,7 @@
51DEFINE_SPINLOCK(pa_dbit_lock); 50DEFINE_SPINLOCK(pa_dbit_lock);
52#endif 51#endif
53 52
54void parisc_show_stack(struct task_struct *t, unsigned long *sp, 53static void parisc_show_stack(struct task_struct *task, unsigned long *sp,
55 struct pt_regs *regs); 54 struct pt_regs *regs);
56 55
57static int printbinary(char *buf, unsigned long x, int nbits) 56static int printbinary(char *buf, unsigned long x, int nbits)
@@ -121,18 +120,19 @@ static void print_fr(char *level, struct pt_regs *regs)
121 120
122void show_regs(struct pt_regs *regs) 121void show_regs(struct pt_regs *regs)
123{ 122{
124 int i; 123 int i, user;
125 char *level; 124 char *level;
126 unsigned long cr30, cr31; 125 unsigned long cr30, cr31;
127 126
128 level = user_mode(regs) ? KERN_DEBUG : KERN_CRIT; 127 user = user_mode(regs);
128 level = user ? KERN_DEBUG : KERN_CRIT;
129 129
130 print_gr(level, regs); 130 print_gr(level, regs);
131 131
132 for (i = 0; i < 8; i += 4) 132 for (i = 0; i < 8; i += 4)
133 PRINTREGS(level, regs->sr, "sr", RFMT, i); 133 PRINTREGS(level, regs->sr, "sr", RFMT, i);
134 134
135 if (user_mode(regs)) 135 if (user)
136 print_fr(level, regs); 136 print_fr(level, regs);
137 137
138 cr30 = mfctl(30); 138 cr30 = mfctl(30);
@@ -145,14 +145,18 @@ void show_regs(struct pt_regs *regs)
145 printk("%s CPU: %8d CR30: " RFMT " CR31: " RFMT "\n", 145 printk("%s CPU: %8d CR30: " RFMT " CR31: " RFMT "\n",
146 level, current_thread_info()->cpu, cr30, cr31); 146 level, current_thread_info()->cpu, cr30, cr31);
147 printk("%s ORIG_R28: " RFMT "\n", level, regs->orig_r28); 147 printk("%s ORIG_R28: " RFMT "\n", level, regs->orig_r28);
148 printk(level); 148
149 print_symbol(" IAOQ[0]: %s\n", regs->iaoq[0]); 149 if (user) {
150 printk(level); 150 printk("%s IAOQ[0]: " RFMT "\n", level, regs->iaoq[0]);
151 print_symbol(" IAOQ[1]: %s\n", regs->iaoq[1]); 151 printk("%s IAOQ[1]: " RFMT "\n", level, regs->iaoq[1]);
152 printk(level); 152 printk("%s RP(r2): " RFMT "\n", level, regs->gr[2]);
153 print_symbol(" RP(r2): %s\n", regs->gr[2]); 153 } else {
154 154 printk("%s IAOQ[0]: %pS\n", level, (void *) regs->iaoq[0]);
155 parisc_show_stack(current, NULL, regs); 155 printk("%s IAOQ[1]: %pS\n", level, (void *) regs->iaoq[1]);
156 printk("%s RP(r2): %pS\n", level, (void *) regs->gr[2]);
157
158 parisc_show_stack(current, NULL, regs);
159 }
156} 160}
157 161
158 162
@@ -173,20 +177,15 @@ static void do_show_stack(struct unwind_frame_info *info)
173 break; 177 break;
174 178
175 if (__kernel_text_address(info->ip)) { 179 if (__kernel_text_address(info->ip)) {
176 printk("%s [<" RFMT ">] ", (i&0x3)==1 ? KERN_CRIT : "", info->ip); 180 printk(KERN_CRIT " [<" RFMT ">] %pS\n",
177#ifdef CONFIG_KALLSYMS 181 info->ip, (void *) info->ip);
178 print_symbol("%s\n", info->ip);
179#else
180 if ((i & 0x03) == 0)
181 printk("\n");
182#endif
183 i++; 182 i++;
184 } 183 }
185 } 184 }
186 printk("\n"); 185 printk(KERN_CRIT "\n");
187} 186}
188 187
189void parisc_show_stack(struct task_struct *task, unsigned long *sp, 188static void parisc_show_stack(struct task_struct *task, unsigned long *sp,
190 struct pt_regs *regs) 189 struct pt_regs *regs)
191{ 190{
192 struct unwind_frame_info info; 191 struct unwind_frame_info info;
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 226ff066652b..dea30910c136 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -18,8 +18,8 @@
18 #size-cells = <1>; 18 #size-cells = <1>;
19 19
20 aliases { 20 aliases {
21 ethernet0 = &enet0; 21 ethernet0 = &enet1;
22 ethernet1 = &enet1; 22 ethernet1 = &enet0;
23 serial0 = &serial0; 23 serial0 = &serial0;
24 serial1 = &serial1; 24 serial1 = &serial1;
25 pci0 = &pci0; 25 pci0 = &pci0;
diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts
index cadd4652a695..5c69b2fafd32 100644
--- a/arch/powerpc/boot/dts/mpc8572ds.dts
+++ b/arch/powerpc/boot/dts/mpc8572ds.dts
@@ -90,7 +90,7 @@
90 compatible = "fsl,mpc8572-l2-cache-controller"; 90 compatible = "fsl,mpc8572-l2-cache-controller";
91 reg = <0x20000 0x1000>; 91 reg = <0x20000 0x1000>;
92 cache-line-size = <32>; // 32 bytes 92 cache-line-size = <32>; // 32 bytes
93 cache-size = <0x80000>; // L2, 512K 93 cache-size = <0x100000>; // L2, 1M
94 interrupt-parent = <&mpic>; 94 interrupt-parent = <&mpic>;
95 interrupts = <16 2>; 95 interrupts = <16 2>;
96 }; 96 };
diff --git a/arch/powerpc/configs/40x/virtex_defconfig b/arch/powerpc/configs/40x/virtex_defconfig
new file mode 100644
index 000000000000..9a9350ded292
--- /dev/null
+++ b/arch/powerpc/configs/40x/virtex_defconfig
@@ -0,0 +1,1176 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc4
4# Fri Nov 14 10:49:16 2008
5#
6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11# CONFIG_6xx is not set
12# CONFIG_PPC_85xx is not set
13# CONFIG_PPC_8xx is not set
14CONFIG_40x=y
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_4xx=y
18# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y
21CONFIG_WORD_SIZE=32
22# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
23CONFIG_MMU=y
24CONFIG_GENERIC_CMOS_UPDATE=y
25CONFIG_GENERIC_TIME=y
26CONFIG_GENERIC_TIME_VSYSCALL=y
27CONFIG_GENERIC_CLOCKEVENTS=y
28CONFIG_GENERIC_HARDIRQS=y
29# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
30CONFIG_IRQ_PER_CPU=y
31CONFIG_STACKTRACE_SUPPORT=y
32CONFIG_HAVE_LATENCYTOP_SUPPORT=y
33CONFIG_LOCKDEP_SUPPORT=y
34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
35CONFIG_ARCH_HAS_ILOG2_U32=y
36CONFIG_GENERIC_HWEIGHT=y
37CONFIG_GENERIC_CALIBRATE_DELAY=y
38CONFIG_GENERIC_FIND_NEXT_BIT=y
39CONFIG_GENERIC_GPIO=y
40# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
41CONFIG_PPC=y
42CONFIG_EARLY_PRINTK=y
43CONFIG_GENERIC_NVRAM=y
44CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
46CONFIG_PPC_OF=y
47CONFIG_OF=y
48CONFIG_PPC_UDBG_16550=y
49# CONFIG_GENERIC_TBSYNC is not set
50CONFIG_AUDIT_ARCH=y
51CONFIG_GENERIC_BUG=y
52# CONFIG_DEFAULT_UIMAGE is not set
53CONFIG_PPC_DCR_NATIVE=y
54# CONFIG_PPC_DCR_MMIO is not set
55CONFIG_PPC_DCR=y
56CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
57
58#
59# General setup
60#
61CONFIG_EXPERIMENTAL=y
62CONFIG_BROKEN_ON_SMP=y
63CONFIG_LOCK_KERNEL=y
64CONFIG_INIT_ENV_ARG_LIMIT=32
65CONFIG_LOCALVERSION=""
66# CONFIG_LOCALVERSION_AUTO is not set
67CONFIG_SWAP=y
68CONFIG_SYSVIPC=y
69CONFIG_SYSVIPC_SYSCTL=y
70CONFIG_POSIX_MQUEUE=y
71# CONFIG_BSD_PROCESS_ACCT is not set
72# CONFIG_TASKSTATS is not set
73# CONFIG_AUDIT is not set
74CONFIG_IKCONFIG=y
75CONFIG_IKCONFIG_PROC=y
76CONFIG_LOG_BUF_SHIFT=14
77# CONFIG_CGROUPS is not set
78# CONFIG_GROUP_SCHED is not set
79CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y
81# CONFIG_RELAY is not set
82CONFIG_NAMESPACES=y
83# CONFIG_UTS_NS is not set
84# CONFIG_IPC_NS is not set
85# CONFIG_USER_NS is not set
86# CONFIG_PID_NS is not set
87CONFIG_BLK_DEV_INITRD=y
88CONFIG_INITRAMFS_SOURCE=""
89# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
90CONFIG_SYSCTL=y
91# CONFIG_EMBEDDED is not set
92CONFIG_SYSCTL_SYSCALL=y
93CONFIG_KALLSYMS=y
94# CONFIG_KALLSYMS_ALL is not set
95# CONFIG_KALLSYMS_EXTRA_PASS is not set
96CONFIG_HOTPLUG=y
97CONFIG_PRINTK=y
98CONFIG_BUG=y
99CONFIG_ELF_CORE=y
100CONFIG_COMPAT_BRK=y
101CONFIG_BASE_FULL=y
102CONFIG_FUTEX=y
103CONFIG_ANON_INODES=y
104CONFIG_EPOLL=y
105CONFIG_SIGNALFD=y
106CONFIG_TIMERFD=y
107CONFIG_EVENTFD=y
108CONFIG_SHMEM=y
109CONFIG_AIO=y
110CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_PCI_QUIRKS=y
112CONFIG_SLAB=y
113# CONFIG_SLUB is not set
114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y
118# CONFIG_KPROBES is not set
119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
120CONFIG_HAVE_IOREMAP_PROT=y
121CONFIG_HAVE_KPROBES=y
122CONFIG_HAVE_KRETPROBES=y
123CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y
127# CONFIG_TINY_SHMEM is not set
128CONFIG_BASE_SMALL=0
129CONFIG_MODULES=y
130# CONFIG_MODULE_FORCE_LOAD is not set
131CONFIG_MODULE_UNLOAD=y
132CONFIG_MODULE_FORCE_UNLOAD=y
133CONFIG_MODVERSIONS=y
134# CONFIG_MODULE_SRCVERSION_ALL is not set
135CONFIG_KMOD=y
136CONFIG_BLOCK=y
137# CONFIG_LBD is not set
138# CONFIG_BLK_DEV_IO_TRACE is not set
139# CONFIG_LSF is not set
140# CONFIG_BLK_DEV_BSG is not set
141# CONFIG_BLK_DEV_INTEGRITY is not set
142
143#
144# IO Schedulers
145#
146CONFIG_IOSCHED_NOOP=y
147CONFIG_IOSCHED_AS=y
148CONFIG_IOSCHED_DEADLINE=y
149CONFIG_IOSCHED_CFQ=y
150# CONFIG_DEFAULT_AS is not set
151# CONFIG_DEFAULT_DEADLINE is not set
152CONFIG_DEFAULT_CFQ=y
153# CONFIG_DEFAULT_NOOP is not set
154CONFIG_DEFAULT_IOSCHED="cfq"
155CONFIG_CLASSIC_RCU=y
156# CONFIG_FREEZER is not set
157# CONFIG_PPC4xx_PCI_EXPRESS is not set
158
159#
160# Platform support
161#
162# CONFIG_PPC_CELL is not set
163# CONFIG_PPC_CELL_NATIVE is not set
164# CONFIG_PQ2ADS is not set
165# CONFIG_PPC4xx_GPIO is not set
166CONFIG_XILINX_VIRTEX=y
167# CONFIG_ACADIA is not set
168# CONFIG_EP405 is not set
169# CONFIG_HCU4 is not set
170# CONFIG_KILAUEA is not set
171# CONFIG_MAKALU is not set
172# CONFIG_WALNUT is not set
173CONFIG_XILINX_VIRTEX_GENERIC_BOARD=y
174# CONFIG_PPC40x_SIMPLE is not set
175CONFIG_XILINX_VIRTEX_II_PRO=y
176CONFIG_XILINX_VIRTEX_4_FX=y
177CONFIG_IBM405_ERR77=y
178CONFIG_IBM405_ERR51=y
179# CONFIG_IPIC is not set
180# CONFIG_MPIC is not set
181# CONFIG_MPIC_WEIRD is not set
182# CONFIG_PPC_I8259 is not set
183# CONFIG_PPC_RTAS is not set
184# CONFIG_MMIO_NVRAM is not set
185# CONFIG_PPC_MPC106 is not set
186# CONFIG_PPC_970_NAP is not set
187# CONFIG_PPC_INDIRECT_IO is not set
188# CONFIG_GENERIC_IOMAP is not set
189# CONFIG_CPU_FREQ is not set
190# CONFIG_FSL_ULI1575 is not set
191
192#
193# Kernel options
194#
195# CONFIG_HIGHMEM is not set
196# CONFIG_NO_HZ is not set
197# CONFIG_HIGH_RES_TIMERS is not set
198CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
199# CONFIG_HZ_100 is not set
200CONFIG_HZ_250=y
201# CONFIG_HZ_300 is not set
202# CONFIG_HZ_1000 is not set
203CONFIG_HZ=250
204# CONFIG_SCHED_HRTICK is not set
205# CONFIG_PREEMPT_NONE is not set
206# CONFIG_PREEMPT_VOLUNTARY is not set
207CONFIG_PREEMPT=y
208# CONFIG_PREEMPT_RCU is not set
209CONFIG_BINFMT_ELF=y
210# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
211# CONFIG_HAVE_AOUT is not set
212# CONFIG_BINFMT_MISC is not set
213CONFIG_MATH_EMULATION=y
214# CONFIG_IOMMU_HELPER is not set
215CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
216CONFIG_ARCH_HAS_WALK_MEMORY=y
217CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
218CONFIG_ARCH_FLATMEM_ENABLE=y
219CONFIG_ARCH_POPULATES_NODE_MAP=y
220CONFIG_SELECT_MEMORY_MODEL=y
221CONFIG_FLATMEM_MANUAL=y
222# CONFIG_DISCONTIGMEM_MANUAL is not set
223# CONFIG_SPARSEMEM_MANUAL is not set
224CONFIG_FLATMEM=y
225CONFIG_FLAT_NODE_MEM_MAP=y
226CONFIG_PAGEFLAGS_EXTENDED=y
227CONFIG_SPLIT_PTLOCK_CPUS=4
228CONFIG_MIGRATION=y
229CONFIG_RESOURCES_64BIT=y
230# CONFIG_PHYS_ADDR_T_64BIT is not set
231CONFIG_ZONE_DMA_FLAG=1
232CONFIG_BOUNCE=y
233CONFIG_VIRT_TO_BUS=y
234CONFIG_UNEVICTABLE_LRU=y
235CONFIG_FORCE_MAX_ZONEORDER=11
236CONFIG_PROC_DEVICETREE=y
237CONFIG_CMDLINE_BOOL=y
238CONFIG_CMDLINE=""
239CONFIG_EXTRA_TARGETS=""
240# CONFIG_PM is not set
241CONFIG_SECCOMP=y
242CONFIG_ISA_DMA_API=y
243
244#
245# Bus options
246#
247CONFIG_ZONE_DMA=y
248CONFIG_PPC_INDIRECT_PCI=y
249CONFIG_4xx_SOC=y
250CONFIG_PPC_PCI_CHOICE=y
251CONFIG_PCI=y
252CONFIG_PCI_DOMAINS=y
253CONFIG_PCI_SYSCALL=y
254# CONFIG_PCIEPORTBUS is not set
255CONFIG_ARCH_SUPPORTS_MSI=y
256# CONFIG_PCI_MSI is not set
257CONFIG_PCI_LEGACY=y
258# CONFIG_PCI_DEBUG is not set
259# CONFIG_PCCARD is not set
260# CONFIG_HOTPLUG_PCI is not set
261# CONFIG_HAS_RAPIDIO is not set
262
263#
264# Advanced setup
265#
266# CONFIG_ADVANCED_OPTIONS is not set
267
268#
269# Default settings for advanced configuration options are used
270#
271CONFIG_LOWMEM_SIZE=0x30000000
272CONFIG_PAGE_OFFSET=0xc0000000
273CONFIG_KERNEL_START=0xc0000000
274CONFIG_PHYSICAL_START=0x00000000
275CONFIG_TASK_SIZE=0xc0000000
276CONFIG_CONSISTENT_START=0xff100000
277CONFIG_CONSISTENT_SIZE=0x00200000
278CONFIG_NET=y
279
280#
281# Networking options
282#
283CONFIG_PACKET=y
284# CONFIG_PACKET_MMAP is not set
285CONFIG_UNIX=y
286CONFIG_XFRM=y
287# CONFIG_XFRM_USER is not set
288# CONFIG_XFRM_SUB_POLICY is not set
289# CONFIG_XFRM_MIGRATE is not set
290# CONFIG_XFRM_STATISTICS is not set
291# CONFIG_NET_KEY is not set
292CONFIG_INET=y
293CONFIG_IP_MULTICAST=y
294# CONFIG_IP_ADVANCED_ROUTER is not set
295CONFIG_IP_FIB_HASH=y
296CONFIG_IP_PNP=y
297CONFIG_IP_PNP_DHCP=y
298CONFIG_IP_PNP_BOOTP=y
299# CONFIG_IP_PNP_RARP is not set
300# CONFIG_NET_IPIP is not set
301# CONFIG_NET_IPGRE is not set
302# CONFIG_IP_MROUTE is not set
303# CONFIG_ARPD is not set
304# CONFIG_SYN_COOKIES is not set
305# CONFIG_INET_AH is not set
306# CONFIG_INET_ESP is not set
307# CONFIG_INET_IPCOMP is not set
308# CONFIG_INET_XFRM_TUNNEL is not set
309CONFIG_INET_TUNNEL=m
310CONFIG_INET_XFRM_MODE_TRANSPORT=y
311CONFIG_INET_XFRM_MODE_TUNNEL=y
312CONFIG_INET_XFRM_MODE_BEET=y
313# CONFIG_INET_LRO is not set
314CONFIG_INET_DIAG=y
315CONFIG_INET_TCP_DIAG=y
316# CONFIG_TCP_CONG_ADVANCED is not set
317CONFIG_TCP_CONG_CUBIC=y
318CONFIG_DEFAULT_TCP_CONG="cubic"
319# CONFIG_TCP_MD5SIG is not set
320CONFIG_IPV6=m
321# CONFIG_IPV6_PRIVACY is not set
322# CONFIG_IPV6_ROUTER_PREF is not set
323# CONFIG_IPV6_OPTIMISTIC_DAD is not set
324# CONFIG_INET6_AH is not set
325# CONFIG_INET6_ESP is not set
326# CONFIG_INET6_IPCOMP is not set
327# CONFIG_IPV6_MIP6 is not set
328# CONFIG_INET6_XFRM_TUNNEL is not set
329# CONFIG_INET6_TUNNEL is not set
330CONFIG_INET6_XFRM_MODE_TRANSPORT=m
331CONFIG_INET6_XFRM_MODE_TUNNEL=m
332CONFIG_INET6_XFRM_MODE_BEET=m
333# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
334CONFIG_IPV6_SIT=m
335CONFIG_IPV6_NDISC_NODETYPE=y
336# CONFIG_IPV6_TUNNEL is not set
337# CONFIG_IPV6_MULTIPLE_TABLES is not set
338# CONFIG_IPV6_MROUTE is not set
339# CONFIG_NETWORK_SECMARK is not set
340CONFIG_NETFILTER=y
341# CONFIG_NETFILTER_DEBUG is not set
342CONFIG_NETFILTER_ADVANCED=y
343
344#
345# Core Netfilter Configuration
346#
347# CONFIG_NETFILTER_NETLINK_QUEUE is not set
348# CONFIG_NETFILTER_NETLINK_LOG is not set
349# CONFIG_NF_CONNTRACK is not set
350CONFIG_NETFILTER_XTABLES=m
351# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
352# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
353# CONFIG_NETFILTER_XT_TARGET_MARK is not set
354# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
355# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
356# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
357# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
358# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
359# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
360# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
361# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
362# CONFIG_NETFILTER_XT_MATCH_ESP is not set
363# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
364# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
365# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
366# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
367# CONFIG_NETFILTER_XT_MATCH_MAC is not set
368# CONFIG_NETFILTER_XT_MATCH_MARK is not set
369# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
370# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
371# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
372# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
373# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
374# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
375# CONFIG_NETFILTER_XT_MATCH_REALM is not set
376# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
377# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
378# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
379# CONFIG_NETFILTER_XT_MATCH_STRING is not set
380# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
381# CONFIG_NETFILTER_XT_MATCH_TIME is not set
382# CONFIG_NETFILTER_XT_MATCH_U32 is not set
383# CONFIG_IP_VS is not set
384
385#
386# IP: Netfilter Configuration
387#
388# CONFIG_NF_DEFRAG_IPV4 is not set
389# CONFIG_IP_NF_QUEUE is not set
390CONFIG_IP_NF_IPTABLES=m
391# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
392# CONFIG_IP_NF_MATCH_AH is not set
393# CONFIG_IP_NF_MATCH_ECN is not set
394# CONFIG_IP_NF_MATCH_TTL is not set
395CONFIG_IP_NF_FILTER=m
396# CONFIG_IP_NF_TARGET_REJECT is not set
397# CONFIG_IP_NF_TARGET_LOG is not set
398# CONFIG_IP_NF_TARGET_ULOG is not set
399CONFIG_IP_NF_MANGLE=m
400# CONFIG_IP_NF_TARGET_ECN is not set
401# CONFIG_IP_NF_TARGET_TTL is not set
402# CONFIG_IP_NF_RAW is not set
403# CONFIG_IP_NF_ARPTABLES is not set
404
405#
406# IPv6: Netfilter Configuration
407#
408# CONFIG_IP6_NF_QUEUE is not set
409# CONFIG_IP6_NF_IPTABLES is not set
410# CONFIG_IP_DCCP is not set
411# CONFIG_IP_SCTP is not set
412# CONFIG_TIPC is not set
413# CONFIG_ATM is not set
414# CONFIG_BRIDGE is not set
415# CONFIG_NET_DSA is not set
416# CONFIG_VLAN_8021Q is not set
417# CONFIG_DECNET is not set
418# CONFIG_LLC2 is not set
419# CONFIG_IPX is not set
420# CONFIG_ATALK is not set
421# CONFIG_X25 is not set
422# CONFIG_LAPB is not set
423# CONFIG_ECONET is not set
424# CONFIG_WAN_ROUTER is not set
425# CONFIG_NET_SCHED is not set
426
427#
428# Network testing
429#
430# CONFIG_NET_PKTGEN is not set
431# CONFIG_HAMRADIO is not set
432# CONFIG_CAN is not set
433# CONFIG_IRDA is not set
434# CONFIG_BT is not set
435# CONFIG_AF_RXRPC is not set
436# CONFIG_PHONET is not set
437CONFIG_WIRELESS=y
438# CONFIG_CFG80211 is not set
439CONFIG_WIRELESS_OLD_REGULATORY=y
440# CONFIG_WIRELESS_EXT is not set
441# CONFIG_MAC80211 is not set
442# CONFIG_IEEE80211 is not set
443# CONFIG_RFKILL is not set
444# CONFIG_NET_9P is not set
445
446#
447# Device Drivers
448#
449
450#
451# Generic Driver Options
452#
453CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
454CONFIG_STANDALONE=y
455CONFIG_PREVENT_FIRMWARE_BUILD=y
456CONFIG_FW_LOADER=y
457CONFIG_FIRMWARE_IN_KERNEL=y
458CONFIG_EXTRA_FIRMWARE=""
459# CONFIG_DEBUG_DRIVER is not set
460# CONFIG_DEBUG_DEVRES is not set
461# CONFIG_SYS_HYPERVISOR is not set
462# CONFIG_CONNECTOR is not set
463# CONFIG_MTD is not set
464CONFIG_OF_DEVICE=y
465CONFIG_OF_GPIO=y
466# CONFIG_PARPORT is not set
467CONFIG_BLK_DEV=y
468# CONFIG_BLK_DEV_FD is not set
469# CONFIG_BLK_CPQ_DA is not set
470# CONFIG_BLK_CPQ_CISS_DA is not set
471# CONFIG_BLK_DEV_DAC960 is not set
472# CONFIG_BLK_DEV_UMEM is not set
473# CONFIG_BLK_DEV_COW_COMMON is not set
474CONFIG_BLK_DEV_LOOP=y
475# CONFIG_BLK_DEV_CRYPTOLOOP is not set
476# CONFIG_BLK_DEV_NBD is not set
477# CONFIG_BLK_DEV_SX8 is not set
478CONFIG_BLK_DEV_RAM=y
479CONFIG_BLK_DEV_RAM_COUNT=16
480CONFIG_BLK_DEV_RAM_SIZE=8192
481# CONFIG_BLK_DEV_XIP is not set
482# CONFIG_CDROM_PKTCDVD is not set
483# CONFIG_ATA_OVER_ETH is not set
484CONFIG_XILINX_SYSACE=y
485# CONFIG_BLK_DEV_HD is not set
486CONFIG_MISC_DEVICES=y
487# CONFIG_PHANTOM is not set
488# CONFIG_EEPROM_93CX6 is not set
489# CONFIG_SGI_IOC4 is not set
490# CONFIG_TIFM_CORE is not set
491# CONFIG_ENCLOSURE_SERVICES is not set
492# CONFIG_HP_ILO is not set
493# CONFIG_C2PORT is not set
494CONFIG_HAVE_IDE=y
495# CONFIG_IDE is not set
496
497#
498# SCSI device support
499#
500# CONFIG_RAID_ATTRS is not set
501# CONFIG_SCSI is not set
502# CONFIG_SCSI_DMA is not set
503# CONFIG_SCSI_NETLINK is not set
504# CONFIG_ATA is not set
505# CONFIG_MD is not set
506# CONFIG_FUSION is not set
507
508#
509# IEEE 1394 (FireWire) support
510#
511
512#
513# Enable only one of the two stacks, unless you know what you are doing
514#
515# CONFIG_FIREWIRE is not set
516# CONFIG_IEEE1394 is not set
517# CONFIG_I2O is not set
518# CONFIG_MACINTOSH_DRIVERS is not set
519CONFIG_NETDEVICES=y
520# CONFIG_DUMMY is not set
521# CONFIG_BONDING is not set
522# CONFIG_MACVLAN is not set
523# CONFIG_EQUALIZER is not set
524# CONFIG_TUN is not set
525# CONFIG_VETH is not set
526# CONFIG_ARCNET is not set
527# CONFIG_PHYLIB is not set
528CONFIG_NET_ETHERNET=y
529CONFIG_MII=y
530# CONFIG_HAPPYMEAL is not set
531# CONFIG_SUNGEM is not set
532# CONFIG_CASSINI is not set
533# CONFIG_NET_VENDOR_3COM is not set
534# CONFIG_NET_TULIP is not set
535# CONFIG_HP100 is not set
536# CONFIG_IBM_NEW_EMAC is not set
537# CONFIG_IBM_NEW_EMAC_ZMII is not set
538# CONFIG_IBM_NEW_EMAC_RGMII is not set
539# CONFIG_IBM_NEW_EMAC_TAH is not set
540# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
541# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
542# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
543# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
544# CONFIG_NET_PCI is not set
545# CONFIG_B44 is not set
546# CONFIG_ATL2 is not set
547CONFIG_NETDEV_1000=y
548# CONFIG_ACENIC is not set
549# CONFIG_DL2K is not set
550# CONFIG_E1000 is not set
551# CONFIG_E1000E is not set
552# CONFIG_IP1000 is not set
553# CONFIG_IGB is not set
554# CONFIG_NS83820 is not set
555# CONFIG_HAMACHI is not set
556# CONFIG_YELLOWFIN is not set
557# CONFIG_R8169 is not set
558# CONFIG_SIS190 is not set
559# CONFIG_SKGE is not set
560# CONFIG_SKY2 is not set
561# CONFIG_VIA_VELOCITY is not set
562# CONFIG_TIGON3 is not set
563# CONFIG_BNX2 is not set
564# CONFIG_QLA3XXX is not set
565# CONFIG_ATL1 is not set
566# CONFIG_ATL1E is not set
567# CONFIG_JME is not set
568# CONFIG_NETDEV_10000 is not set
569# CONFIG_TR is not set
570
571#
572# Wireless LAN
573#
574# CONFIG_WLAN_PRE80211 is not set
575# CONFIG_WLAN_80211 is not set
576# CONFIG_IWLWIFI_LEDS is not set
577# CONFIG_WAN is not set
578# CONFIG_FDDI is not set
579# CONFIG_HIPPI is not set
580# CONFIG_PPP is not set
581# CONFIG_SLIP is not set
582# CONFIG_NETCONSOLE is not set
583# CONFIG_NETPOLL is not set
584# CONFIG_NET_POLL_CONTROLLER is not set
585# CONFIG_ISDN is not set
586# CONFIG_PHONE is not set
587
588#
589# Input device support
590#
591CONFIG_INPUT=y
592# CONFIG_INPUT_FF_MEMLESS is not set
593# CONFIG_INPUT_POLLDEV is not set
594
595#
596# Userland interfaces
597#
598CONFIG_INPUT_MOUSEDEV=y
599CONFIG_INPUT_MOUSEDEV_PSAUX=y
600CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
601CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
602# CONFIG_INPUT_JOYDEV is not set
603# CONFIG_INPUT_EVDEV is not set
604# CONFIG_INPUT_EVBUG is not set
605
606#
607# Input Device Drivers
608#
609CONFIG_INPUT_KEYBOARD=y
610CONFIG_KEYBOARD_ATKBD=y
611# CONFIG_KEYBOARD_SUNKBD is not set
612# CONFIG_KEYBOARD_LKKBD is not set
613# CONFIG_KEYBOARD_XTKBD is not set
614# CONFIG_KEYBOARD_NEWTON is not set
615# CONFIG_KEYBOARD_STOWAWAY is not set
616# CONFIG_KEYBOARD_GPIO is not set
617CONFIG_INPUT_MOUSE=y
618CONFIG_MOUSE_PS2=y
619CONFIG_MOUSE_PS2_ALPS=y
620CONFIG_MOUSE_PS2_LOGIPS2PP=y
621CONFIG_MOUSE_PS2_SYNAPTICS=y
622CONFIG_MOUSE_PS2_LIFEBOOK=y
623CONFIG_MOUSE_PS2_TRACKPOINT=y
624# CONFIG_MOUSE_PS2_ELANTECH is not set
625# CONFIG_MOUSE_PS2_TOUCHKIT is not set
626# CONFIG_MOUSE_SERIAL is not set
627# CONFIG_MOUSE_VSXXXAA is not set
628# CONFIG_MOUSE_GPIO is not set
629# CONFIG_INPUT_JOYSTICK is not set
630# CONFIG_INPUT_TABLET is not set
631# CONFIG_INPUT_TOUCHSCREEN is not set
632# CONFIG_INPUT_MISC is not set
633
634#
635# Hardware I/O ports
636#
637CONFIG_SERIO=y
638# CONFIG_SERIO_I8042 is not set
639# CONFIG_SERIO_SERPORT is not set
640# CONFIG_SERIO_PCIPS2 is not set
641CONFIG_SERIO_LIBPS2=y
642# CONFIG_SERIO_RAW is not set
643CONFIG_SERIO_XILINX_XPS_PS2=y
644# CONFIG_GAMEPORT is not set
645
646#
647# Character devices
648#
649CONFIG_VT=y
650CONFIG_CONSOLE_TRANSLATIONS=y
651CONFIG_VT_CONSOLE=y
652CONFIG_HW_CONSOLE=y
653# CONFIG_VT_HW_CONSOLE_BINDING is not set
654CONFIG_DEVKMEM=y
655# CONFIG_SERIAL_NONSTANDARD is not set
656# CONFIG_NOZOMI is not set
657
658#
659# Serial drivers
660#
661CONFIG_SERIAL_8250=y
662CONFIG_SERIAL_8250_CONSOLE=y
663CONFIG_SERIAL_8250_PCI=y
664CONFIG_SERIAL_8250_NR_UARTS=4
665CONFIG_SERIAL_8250_RUNTIME_UARTS=4
666# CONFIG_SERIAL_8250_EXTENDED is not set
667
668#
669# Non-8250 serial port support
670#
671CONFIG_SERIAL_UARTLITE=y
672CONFIG_SERIAL_UARTLITE_CONSOLE=y
673CONFIG_SERIAL_CORE=y
674CONFIG_SERIAL_CORE_CONSOLE=y
675# CONFIG_SERIAL_JSM is not set
676# CONFIG_SERIAL_OF_PLATFORM is not set
677CONFIG_UNIX98_PTYS=y
678CONFIG_LEGACY_PTYS=y
679CONFIG_LEGACY_PTY_COUNT=256
680# CONFIG_IPMI_HANDLER is not set
681CONFIG_HW_RANDOM=m
682# CONFIG_NVRAM is not set
683# CONFIG_GEN_RTC is not set
684CONFIG_XILINX_HWICAP=y
685# CONFIG_R3964 is not set
686# CONFIG_APPLICOM is not set
687# CONFIG_RAW_DRIVER is not set
688# CONFIG_TCG_TPM is not set
689CONFIG_DEVPORT=y
690# CONFIG_I2C is not set
691# CONFIG_SPI is not set
692CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
693CONFIG_GPIOLIB=y
694# CONFIG_DEBUG_GPIO is not set
695CONFIG_GPIO_SYSFS=y
696
697#
698# Memory mapped GPIO expanders:
699#
700CONFIG_GPIO_XILINX=y
701
702#
703# I2C GPIO expanders:
704#
705
706#
707# PCI GPIO expanders:
708#
709# CONFIG_GPIO_BT8XX is not set
710
711#
712# SPI GPIO expanders:
713#
714# CONFIG_W1 is not set
715# CONFIG_POWER_SUPPLY is not set
716# CONFIG_HWMON is not set
717# CONFIG_THERMAL is not set
718# CONFIG_THERMAL_HWMON is not set
719# CONFIG_WATCHDOG is not set
720CONFIG_SSB_POSSIBLE=y
721
722#
723# Sonics Silicon Backplane
724#
725# CONFIG_SSB is not set
726
727#
728# Multifunction device drivers
729#
730# CONFIG_MFD_CORE is not set
731# CONFIG_MFD_SM501 is not set
732# CONFIG_HTC_PASIC3 is not set
733# CONFIG_MFD_TMIO is not set
734# CONFIG_REGULATOR is not set
735
736#
737# Multimedia devices
738#
739
740#
741# Multimedia core support
742#
743# CONFIG_VIDEO_DEV is not set
744# CONFIG_DVB_CORE is not set
745# CONFIG_VIDEO_MEDIA is not set
746
747#
748# Multimedia drivers
749#
750# CONFIG_DAB is not set
751
752#
753# Graphics support
754#
755# CONFIG_AGP is not set
756# CONFIG_DRM is not set
757# CONFIG_VGASTATE is not set
758# CONFIG_VIDEO_OUTPUT_CONTROL is not set
759CONFIG_FB=y
760# CONFIG_FIRMWARE_EDID is not set
761# CONFIG_FB_DDC is not set
762# CONFIG_FB_BOOT_VESA_SUPPORT is not set
763CONFIG_FB_CFB_FILLRECT=y
764CONFIG_FB_CFB_COPYAREA=y
765CONFIG_FB_CFB_IMAGEBLIT=y
766# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
767# CONFIG_FB_SYS_FILLRECT is not set
768# CONFIG_FB_SYS_COPYAREA is not set
769# CONFIG_FB_SYS_IMAGEBLIT is not set
770# CONFIG_FB_FOREIGN_ENDIAN is not set
771# CONFIG_FB_SYS_FOPS is not set
772# CONFIG_FB_SVGALIB is not set
773# CONFIG_FB_MACMODES is not set
774# CONFIG_FB_BACKLIGHT is not set
775# CONFIG_FB_MODE_HELPERS is not set
776# CONFIG_FB_TILEBLITTING is not set
777
778#
779# Frame buffer hardware drivers
780#
781# CONFIG_FB_CIRRUS is not set
782# CONFIG_FB_PM2 is not set
783# CONFIG_FB_CYBER2000 is not set
784# CONFIG_FB_OF is not set
785# CONFIG_FB_CT65550 is not set
786# CONFIG_FB_ASILIANT is not set
787# CONFIG_FB_IMSTT is not set
788# CONFIG_FB_VGA16 is not set
789# CONFIG_FB_S1D13XXX is not set
790# CONFIG_FB_NVIDIA is not set
791# CONFIG_FB_RIVA is not set
792# CONFIG_FB_MATROX is not set
793# CONFIG_FB_RADEON is not set
794# CONFIG_FB_ATY128 is not set
795# CONFIG_FB_ATY is not set
796# CONFIG_FB_S3 is not set
797# CONFIG_FB_SAVAGE is not set
798# CONFIG_FB_SIS is not set
799# CONFIG_FB_VIA is not set
800# CONFIG_FB_NEOMAGIC is not set
801# CONFIG_FB_KYRO is not set
802# CONFIG_FB_3DFX is not set
803# CONFIG_FB_VOODOO1 is not set
804# CONFIG_FB_VT8623 is not set
805# CONFIG_FB_TRIDENT is not set
806# CONFIG_FB_ARK is not set
807# CONFIG_FB_PM3 is not set
808# CONFIG_FB_CARMINE is not set
809# CONFIG_FB_IBM_GXT4500 is not set
810CONFIG_FB_XILINX=y
811# CONFIG_FB_VIRTUAL is not set
812# CONFIG_FB_METRONOME is not set
813# CONFIG_FB_MB862XX is not set
814# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
815
816#
817# Display device support
818#
819# CONFIG_DISPLAY_SUPPORT is not set
820
821#
822# Console display driver support
823#
824CONFIG_DUMMY_CONSOLE=y
825CONFIG_FRAMEBUFFER_CONSOLE=y
826# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
827# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
828CONFIG_FONTS=y
829CONFIG_FONT_8x8=y
830CONFIG_FONT_8x16=y
831# CONFIG_FONT_6x11 is not set
832# CONFIG_FONT_7x14 is not set
833# CONFIG_FONT_PEARL_8x8 is not set
834# CONFIG_FONT_ACORN_8x8 is not set
835# CONFIG_FONT_MINI_4x6 is not set
836# CONFIG_FONT_SUN8x16 is not set
837# CONFIG_FONT_SUN12x22 is not set
838# CONFIG_FONT_10x18 is not set
839CONFIG_LOGO=y
840CONFIG_LOGO_LINUX_MONO=y
841CONFIG_LOGO_LINUX_VGA16=y
842CONFIG_LOGO_LINUX_CLUT224=y
843# CONFIG_SOUND is not set
844# CONFIG_HID_SUPPORT is not set
845# CONFIG_USB_SUPPORT is not set
846# CONFIG_UWB is not set
847# CONFIG_MMC is not set
848# CONFIG_MEMSTICK is not set
849# CONFIG_NEW_LEDS is not set
850# CONFIG_ACCESSIBILITY is not set
851# CONFIG_INFINIBAND is not set
852# CONFIG_EDAC is not set
853# CONFIG_RTC_CLASS is not set
854# CONFIG_DMADEVICES is not set
855# CONFIG_UIO is not set
856# CONFIG_STAGING is not set
857CONFIG_STAGING_EXCLUDE_BUILD=y
858
859#
860# File systems
861#
862CONFIG_EXT2_FS=y
863# CONFIG_EXT2_FS_XATTR is not set
864# CONFIG_EXT2_FS_XIP is not set
865# CONFIG_EXT3_FS is not set
866# CONFIG_EXT4_FS is not set
867# CONFIG_REISERFS_FS is not set
868# CONFIG_JFS_FS is not set
869# CONFIG_FS_POSIX_ACL is not set
870CONFIG_FILE_LOCKING=y
871# CONFIG_XFS_FS is not set
872# CONFIG_OCFS2_FS is not set
873CONFIG_DNOTIFY=y
874CONFIG_INOTIFY=y
875CONFIG_INOTIFY_USER=y
876# CONFIG_QUOTA is not set
877CONFIG_AUTOFS_FS=y
878CONFIG_AUTOFS4_FS=y
879# CONFIG_FUSE_FS is not set
880
881#
882# CD-ROM/DVD Filesystems
883#
884# CONFIG_ISO9660_FS is not set
885# CONFIG_UDF_FS is not set
886
887#
888# DOS/FAT/NT Filesystems
889#
890CONFIG_FAT_FS=y
891CONFIG_MSDOS_FS=y
892CONFIG_VFAT_FS=y
893CONFIG_FAT_DEFAULT_CODEPAGE=437
894CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
895# CONFIG_NTFS_FS is not set
896
897#
898# Pseudo filesystems
899#
900CONFIG_PROC_FS=y
901# CONFIG_PROC_KCORE is not set
902CONFIG_PROC_SYSCTL=y
903CONFIG_PROC_PAGE_MONITOR=y
904CONFIG_SYSFS=y
905CONFIG_TMPFS=y
906# CONFIG_TMPFS_POSIX_ACL is not set
907# CONFIG_HUGETLB_PAGE is not set
908# CONFIG_CONFIGFS_FS is not set
909
910#
911# Miscellaneous filesystems
912#
913# CONFIG_ADFS_FS is not set
914# CONFIG_AFFS_FS is not set
915# CONFIG_HFS_FS is not set
916# CONFIG_HFSPLUS_FS is not set
917# CONFIG_BEFS_FS is not set
918# CONFIG_BFS_FS is not set
919# CONFIG_EFS_FS is not set
920CONFIG_CRAMFS=y
921# CONFIG_VXFS_FS is not set
922# CONFIG_MINIX_FS is not set
923# CONFIG_OMFS_FS is not set
924# CONFIG_HPFS_FS is not set
925# CONFIG_QNX4FS_FS is not set
926CONFIG_ROMFS_FS=y
927# CONFIG_SYSV_FS is not set
928# CONFIG_UFS_FS is not set
929CONFIG_NETWORK_FILESYSTEMS=y
930CONFIG_NFS_FS=y
931CONFIG_NFS_V3=y
932# CONFIG_NFS_V3_ACL is not set
933# CONFIG_NFS_V4 is not set
934CONFIG_ROOT_NFS=y
935# CONFIG_NFSD is not set
936CONFIG_LOCKD=y
937CONFIG_LOCKD_V4=y
938CONFIG_NFS_COMMON=y
939CONFIG_SUNRPC=y
940# CONFIG_SUNRPC_REGISTER_V4 is not set
941# CONFIG_RPCSEC_GSS_KRB5 is not set
942# CONFIG_RPCSEC_GSS_SPKM3 is not set
943# CONFIG_SMB_FS is not set
944# CONFIG_CIFS is not set
945# CONFIG_NCP_FS is not set
946# CONFIG_CODA_FS is not set
947# CONFIG_AFS_FS is not set
948
949#
950# Partition Types
951#
952# CONFIG_PARTITION_ADVANCED is not set
953CONFIG_MSDOS_PARTITION=y
954CONFIG_NLS=y
955CONFIG_NLS_DEFAULT="iso8859-1"
956CONFIG_NLS_CODEPAGE_437=y
957# CONFIG_NLS_CODEPAGE_737 is not set
958# CONFIG_NLS_CODEPAGE_775 is not set
959# CONFIG_NLS_CODEPAGE_850 is not set
960# CONFIG_NLS_CODEPAGE_852 is not set
961# CONFIG_NLS_CODEPAGE_855 is not set
962# CONFIG_NLS_CODEPAGE_857 is not set
963# CONFIG_NLS_CODEPAGE_860 is not set
964# CONFIG_NLS_CODEPAGE_861 is not set
965# CONFIG_NLS_CODEPAGE_862 is not set
966# CONFIG_NLS_CODEPAGE_863 is not set
967# CONFIG_NLS_CODEPAGE_864 is not set
968# CONFIG_NLS_CODEPAGE_865 is not set
969# CONFIG_NLS_CODEPAGE_866 is not set
970# CONFIG_NLS_CODEPAGE_869 is not set
971# CONFIG_NLS_CODEPAGE_936 is not set
972# CONFIG_NLS_CODEPAGE_950 is not set
973# CONFIG_NLS_CODEPAGE_932 is not set
974# CONFIG_NLS_CODEPAGE_949 is not set
975# CONFIG_NLS_CODEPAGE_874 is not set
976# CONFIG_NLS_ISO8859_8 is not set
977# CONFIG_NLS_CODEPAGE_1250 is not set
978# CONFIG_NLS_CODEPAGE_1251 is not set
979CONFIG_NLS_ASCII=m
980CONFIG_NLS_ISO8859_1=m
981# CONFIG_NLS_ISO8859_2 is not set
982# CONFIG_NLS_ISO8859_3 is not set
983# CONFIG_NLS_ISO8859_4 is not set
984# CONFIG_NLS_ISO8859_5 is not set
985# CONFIG_NLS_ISO8859_6 is not set
986# CONFIG_NLS_ISO8859_7 is not set
987# CONFIG_NLS_ISO8859_9 is not set
988# CONFIG_NLS_ISO8859_13 is not set
989# CONFIG_NLS_ISO8859_14 is not set
990# CONFIG_NLS_ISO8859_15 is not set
991# CONFIG_NLS_KOI8_R is not set
992# CONFIG_NLS_KOI8_U is not set
993CONFIG_NLS_UTF8=m
994# CONFIG_DLM is not set
995
996#
997# Library routines
998#
999CONFIG_BITREVERSE=y
1000CONFIG_CRC_CCITT=y
1001# CONFIG_CRC16 is not set
1002# CONFIG_CRC_T10DIF is not set
1003# CONFIG_CRC_ITU_T is not set
1004CONFIG_CRC32=y
1005# CONFIG_CRC7 is not set
1006# CONFIG_LIBCRC32C is not set
1007CONFIG_ZLIB_INFLATE=y
1008CONFIG_PLIST=y
1009CONFIG_HAS_IOMEM=y
1010CONFIG_HAS_IOPORT=y
1011CONFIG_HAS_DMA=y
1012CONFIG_HAVE_LMB=y
1013
1014#
1015# Kernel hacking
1016#
1017CONFIG_PRINTK_TIME=y
1018CONFIG_ENABLE_WARN_DEPRECATED=y
1019CONFIG_ENABLE_MUST_CHECK=y
1020CONFIG_FRAME_WARN=1024
1021# CONFIG_MAGIC_SYSRQ is not set
1022# CONFIG_UNUSED_SYMBOLS is not set
1023# CONFIG_DEBUG_FS is not set
1024# CONFIG_HEADERS_CHECK is not set
1025CONFIG_DEBUG_KERNEL=y
1026# CONFIG_DEBUG_SHIRQ is not set
1027CONFIG_DETECT_SOFTLOCKUP=y
1028# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1029CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1030CONFIG_SCHED_DEBUG=y
1031# CONFIG_SCHEDSTATS is not set
1032# CONFIG_TIMER_STATS is not set
1033# CONFIG_DEBUG_OBJECTS is not set
1034# CONFIG_DEBUG_SLAB is not set
1035# CONFIG_DEBUG_RT_MUTEXES is not set
1036# CONFIG_RT_MUTEX_TESTER is not set
1037# CONFIG_DEBUG_SPINLOCK is not set
1038# CONFIG_DEBUG_MUTEXES is not set
1039# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1040# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1041# CONFIG_DEBUG_KOBJECT is not set
1042CONFIG_DEBUG_BUGVERBOSE=y
1043CONFIG_DEBUG_INFO=y
1044# CONFIG_DEBUG_VM is not set
1045# CONFIG_DEBUG_WRITECOUNT is not set
1046CONFIG_DEBUG_MEMORY_INIT=y
1047# CONFIG_DEBUG_LIST is not set
1048# CONFIG_DEBUG_SG is not set
1049# CONFIG_BOOT_PRINTK_DELAY is not set
1050# CONFIG_RCU_TORTURE_TEST is not set
1051# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1052# CONFIG_BACKTRACE_SELF_TEST is not set
1053# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1054# CONFIG_FAULT_INJECTION is not set
1055# CONFIG_LATENCYTOP is not set
1056CONFIG_SYSCTL_SYSCALL_CHECK=y
1057CONFIG_HAVE_FUNCTION_TRACER=y
1058
1059#
1060# Tracers
1061#
1062# CONFIG_FUNCTION_TRACER is not set
1063# CONFIG_PREEMPT_TRACER is not set
1064# CONFIG_SCHED_TRACER is not set
1065# CONFIG_CONTEXT_SWITCH_TRACER is not set
1066# CONFIG_BOOT_TRACER is not set
1067# CONFIG_STACK_TRACER is not set
1068# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1069# CONFIG_SAMPLES is not set
1070CONFIG_HAVE_ARCH_KGDB=y
1071# CONFIG_KGDB is not set
1072# CONFIG_DEBUG_STACKOVERFLOW is not set
1073# CONFIG_DEBUG_STACK_USAGE is not set
1074# CONFIG_DEBUG_PAGEALLOC is not set
1075# CONFIG_CODE_PATCHING_SELFTEST is not set
1076# CONFIG_FTR_FIXUP_SELFTEST is not set
1077# CONFIG_MSI_BITMAP_SELFTEST is not set
1078# CONFIG_XMON is not set
1079# CONFIG_IRQSTACKS is not set
1080# CONFIG_BDI_SWITCH is not set
1081# CONFIG_PPC_EARLY_DEBUG is not set
1082
1083#
1084# Security options
1085#
1086# CONFIG_KEYS is not set
1087# CONFIG_SECURITY is not set
1088# CONFIG_SECURITYFS is not set
1089# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1090CONFIG_CRYPTO=y
1091
1092#
1093# Crypto core or helper
1094#
1095# CONFIG_CRYPTO_FIPS is not set
1096# CONFIG_CRYPTO_MANAGER is not set
1097# CONFIG_CRYPTO_GF128MUL is not set
1098# CONFIG_CRYPTO_NULL is not set
1099# CONFIG_CRYPTO_CRYPTD is not set
1100# CONFIG_CRYPTO_AUTHENC is not set
1101# CONFIG_CRYPTO_TEST is not set
1102
1103#
1104# Authenticated Encryption with Associated Data
1105#
1106# CONFIG_CRYPTO_CCM is not set
1107# CONFIG_CRYPTO_GCM is not set
1108# CONFIG_CRYPTO_SEQIV is not set
1109
1110#
1111# Block modes
1112#
1113# CONFIG_CRYPTO_CBC is not set
1114# CONFIG_CRYPTO_CTR is not set
1115# CONFIG_CRYPTO_CTS is not set
1116# CONFIG_CRYPTO_ECB is not set
1117# CONFIG_CRYPTO_LRW is not set
1118# CONFIG_CRYPTO_PCBC is not set
1119# CONFIG_CRYPTO_XTS is not set
1120
1121#
1122# Hash modes
1123#
1124# CONFIG_CRYPTO_HMAC is not set
1125# CONFIG_CRYPTO_XCBC is not set
1126
1127#
1128# Digest
1129#
1130# CONFIG_CRYPTO_CRC32C is not set
1131# CONFIG_CRYPTO_MD4 is not set
1132# CONFIG_CRYPTO_MD5 is not set
1133# CONFIG_CRYPTO_MICHAEL_MIC is not set
1134# CONFIG_CRYPTO_RMD128 is not set
1135# CONFIG_CRYPTO_RMD160 is not set
1136# CONFIG_CRYPTO_RMD256 is not set
1137# CONFIG_CRYPTO_RMD320 is not set
1138# CONFIG_CRYPTO_SHA1 is not set
1139# CONFIG_CRYPTO_SHA256 is not set
1140# CONFIG_CRYPTO_SHA512 is not set
1141# CONFIG_CRYPTO_TGR192 is not set
1142# CONFIG_CRYPTO_WP512 is not set
1143
1144#
1145# Ciphers
1146#
1147# CONFIG_CRYPTO_AES is not set
1148# CONFIG_CRYPTO_ANUBIS is not set
1149# CONFIG_CRYPTO_ARC4 is not set
1150# CONFIG_CRYPTO_BLOWFISH is not set
1151# CONFIG_CRYPTO_CAMELLIA is not set
1152# CONFIG_CRYPTO_CAST5 is not set
1153# CONFIG_CRYPTO_CAST6 is not set
1154# CONFIG_CRYPTO_DES is not set
1155# CONFIG_CRYPTO_FCRYPT is not set
1156# CONFIG_CRYPTO_KHAZAD is not set
1157# CONFIG_CRYPTO_SALSA20 is not set
1158# CONFIG_CRYPTO_SEED is not set
1159# CONFIG_CRYPTO_SERPENT is not set
1160# CONFIG_CRYPTO_TEA is not set
1161# CONFIG_CRYPTO_TWOFISH is not set
1162
1163#
1164# Compression
1165#
1166# CONFIG_CRYPTO_DEFLATE is not set
1167# CONFIG_CRYPTO_LZO is not set
1168
1169#
1170# Random Number Generation
1171#
1172# CONFIG_CRYPTO_ANSI_CPRNG is not set
1173CONFIG_CRYPTO_HW=y
1174# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1175# CONFIG_PPC_CLOCK is not set
1176# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/44x/virtex5_defconfig b/arch/powerpc/configs/44x/virtex5_defconfig
index 663ec512b33b..7513d360e0b0 100644
--- a/arch/powerpc/configs/44x/virtex5_defconfig
+++ b/arch/powerpc/configs/44x/virtex5_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc1 3# Linux kernel version: 2.6.28-rc4
4# Tue Aug 5 09:20:16 2008 4# Fri Nov 14 10:31:16 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,14 +22,13 @@ CONFIG_PHYS_64BIT=y
22CONFIG_NOT_COHERENT_CACHE=y 22CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y 29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y 30CONFIG_GENERIC_CLOCKEVENTS=y
31CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
34CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
35CONFIG_STACKTRACE_SUPPORT=y 34CONFIG_STACKTRACE_SUPPORT=y
@@ -40,6 +39,7 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
40CONFIG_GENERIC_HWEIGHT=y 39CONFIG_GENERIC_HWEIGHT=y
41CONFIG_GENERIC_CALIBRATE_DELAY=y 40CONFIG_GENERIC_CALIBRATE_DELAY=y
42CONFIG_GENERIC_FIND_NEXT_BIT=y 41CONFIG_GENERIC_FIND_NEXT_BIT=y
42CONFIG_GENERIC_GPIO=y
43# CONFIG_ARCH_NO_VIRT_TO_BUS is not set 43# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
@@ -93,8 +93,8 @@ CONFIG_INITRAMFS_SOURCE=""
93CONFIG_SYSCTL=y 93CONFIG_SYSCTL=y
94# CONFIG_EMBEDDED is not set 94# CONFIG_EMBEDDED is not set
95CONFIG_SYSCTL_SYSCALL=y 95CONFIG_SYSCTL_SYSCALL=y
96CONFIG_SYSCTL_SYSCALL_CHECK=y
97CONFIG_KALLSYMS=y 96CONFIG_KALLSYMS=y
97# CONFIG_KALLSYMS_ALL is not set
98# CONFIG_KALLSYMS_EXTRA_PASS is not set 98# CONFIG_KALLSYMS_EXTRA_PASS is not set
99CONFIG_HOTPLUG=y 99CONFIG_HOTPLUG=y
100CONFIG_PRINTK=y 100CONFIG_PRINTK=y
@@ -109,7 +109,9 @@ CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y 109CONFIG_TIMERFD=y
110CONFIG_EVENTFD=y 110CONFIG_EVENTFD=y
111CONFIG_SHMEM=y 111CONFIG_SHMEM=y
112CONFIG_AIO=y
112CONFIG_VM_EVENT_COUNTERS=y 113CONFIG_VM_EVENT_COUNTERS=y
114CONFIG_PCI_QUIRKS=y
113CONFIG_SLAB=y 115CONFIG_SLAB=y
114# CONFIG_SLUB is not set 116# CONFIG_SLUB is not set
115# CONFIG_SLOB is not set 117# CONFIG_SLOB is not set
@@ -122,10 +124,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
122CONFIG_HAVE_KPROBES=y 124CONFIG_HAVE_KPROBES=y
123CONFIG_HAVE_KRETPROBES=y 125CONFIG_HAVE_KRETPROBES=y
124CONFIG_HAVE_ARCH_TRACEHOOK=y 126CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_DMA_ATTRS is not set
126# CONFIG_USE_GENERIC_SMP_HELPERS is not set
127# CONFIG_HAVE_CLK is not set
128CONFIG_PROC_PAGE_MONITOR=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 127# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 128CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 129CONFIG_RT_MUTEXES=y
@@ -158,6 +156,7 @@ CONFIG_DEFAULT_CFQ=y
158# CONFIG_DEFAULT_NOOP is not set 156# CONFIG_DEFAULT_NOOP is not set
159CONFIG_DEFAULT_IOSCHED="cfq" 157CONFIG_DEFAULT_IOSCHED="cfq"
160CONFIG_CLASSIC_RCU=y 158CONFIG_CLASSIC_RCU=y
159# CONFIG_FREEZER is not set
161# CONFIG_PPC4xx_PCI_EXPRESS is not set 160# CONFIG_PPC4xx_PCI_EXPRESS is not set
162 161
163# 162#
@@ -174,9 +173,13 @@ CONFIG_CLASSIC_RCU=y
174# CONFIG_KATMAI is not set 173# CONFIG_KATMAI is not set
175# CONFIG_RAINIER is not set 174# CONFIG_RAINIER is not set
176# CONFIG_WARP is not set 175# CONFIG_WARP is not set
176# CONFIG_ARCHES is not set
177# CONFIG_CANYONLANDS is not set 177# CONFIG_CANYONLANDS is not set
178# CONFIG_GLACIER is not set
178# CONFIG_YOSEMITE is not set 179# CONFIG_YOSEMITE is not set
179CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y 180CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y
181# CONFIG_PPC44x_SIMPLE is not set
182# CONFIG_PPC4xx_GPIO is not set
180CONFIG_XILINX_VIRTEX=y 183CONFIG_XILINX_VIRTEX=y
181CONFIG_XILINX_VIRTEX_5_FXT=y 184CONFIG_XILINX_VIRTEX_5_FXT=y
182# CONFIG_IPIC is not set 185# CONFIG_IPIC is not set
@@ -196,7 +199,6 @@ CONFIG_XILINX_VIRTEX_5_FXT=y
196# Kernel options 199# Kernel options
197# 200#
198# CONFIG_HIGHMEM is not set 201# CONFIG_HIGHMEM is not set
199# CONFIG_TICK_ONESHOT is not set
200# CONFIG_NO_HZ is not set 202# CONFIG_NO_HZ is not set
201# CONFIG_HIGH_RES_TIMERS is not set 203# CONFIG_HIGH_RES_TIMERS is not set
202CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 204CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -211,6 +213,8 @@ CONFIG_HZ=250
211CONFIG_PREEMPT=y 213CONFIG_PREEMPT=y
212# CONFIG_PREEMPT_RCU is not set 214# CONFIG_PREEMPT_RCU is not set
213CONFIG_BINFMT_ELF=y 215CONFIG_BINFMT_ELF=y
216# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
217# CONFIG_HAVE_AOUT is not set
214# CONFIG_BINFMT_MISC is not set 218# CONFIG_BINFMT_MISC is not set
215CONFIG_MATH_EMULATION=y 219CONFIG_MATH_EMULATION=y
216# CONFIG_IOMMU_HELPER is not set 220# CONFIG_IOMMU_HELPER is not set
@@ -225,15 +229,15 @@ CONFIG_FLATMEM_MANUAL=y
225# CONFIG_SPARSEMEM_MANUAL is not set 229# CONFIG_SPARSEMEM_MANUAL is not set
226CONFIG_FLATMEM=y 230CONFIG_FLATMEM=y
227CONFIG_FLAT_NODE_MEM_MAP=y 231CONFIG_FLAT_NODE_MEM_MAP=y
228# CONFIG_SPARSEMEM_STATIC is not set
229# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
230CONFIG_PAGEFLAGS_EXTENDED=y 232CONFIG_PAGEFLAGS_EXTENDED=y
231CONFIG_SPLIT_PTLOCK_CPUS=4 233CONFIG_SPLIT_PTLOCK_CPUS=4
232CONFIG_MIGRATION=y 234CONFIG_MIGRATION=y
233CONFIG_RESOURCES_64BIT=y 235CONFIG_RESOURCES_64BIT=y
236CONFIG_PHYS_ADDR_T_64BIT=y
234CONFIG_ZONE_DMA_FLAG=1 237CONFIG_ZONE_DMA_FLAG=1
235CONFIG_BOUNCE=y 238CONFIG_BOUNCE=y
236CONFIG_VIRT_TO_BUS=y 239CONFIG_VIRT_TO_BUS=y
240CONFIG_UNEVICTABLE_LRU=y
237CONFIG_FORCE_MAX_ZONEORDER=11 241CONFIG_FORCE_MAX_ZONEORDER=11
238CONFIG_PROC_DEVICETREE=y 242CONFIG_PROC_DEVICETREE=y
239CONFIG_CMDLINE_BOOL=y 243CONFIG_CMDLINE_BOOL=y
@@ -256,6 +260,7 @@ CONFIG_PCI_SYSCALL=y
256CONFIG_ARCH_SUPPORTS_MSI=y 260CONFIG_ARCH_SUPPORTS_MSI=y
257# CONFIG_PCI_MSI is not set 261# CONFIG_PCI_MSI is not set
258CONFIG_PCI_LEGACY=y 262CONFIG_PCI_LEGACY=y
263# CONFIG_PCI_DEBUG is not set
259# CONFIG_PCCARD is not set 264# CONFIG_PCCARD is not set
260# CONFIG_HOTPLUG_PCI is not set 265# CONFIG_HOTPLUG_PCI is not set
261# CONFIG_HAS_RAPIDIO is not set 266# CONFIG_HAS_RAPIDIO is not set
@@ -317,7 +322,6 @@ CONFIG_INET_TCP_DIAG=y
317CONFIG_TCP_CONG_CUBIC=y 322CONFIG_TCP_CONG_CUBIC=y
318CONFIG_DEFAULT_TCP_CONG="cubic" 323CONFIG_DEFAULT_TCP_CONG="cubic"
319# CONFIG_TCP_MD5SIG is not set 324# CONFIG_TCP_MD5SIG is not set
320# CONFIG_IP_VS is not set
321CONFIG_IPV6=m 325CONFIG_IPV6=m
322# CONFIG_IPV6_PRIVACY is not set 326# CONFIG_IPV6_PRIVACY is not set
323# CONFIG_IPV6_ROUTER_PREF is not set 327# CONFIG_IPV6_ROUTER_PREF is not set
@@ -352,8 +356,8 @@ CONFIG_NETFILTER_XTABLES=m
352# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set 356# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
353# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 357# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
354# CONFIG_NETFILTER_XT_TARGET_MARK is not set 358# CONFIG_NETFILTER_XT_TARGET_MARK is not set
355# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
356# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 359# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
360# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
357# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set 361# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
358# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 362# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
359# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set 363# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
@@ -361,36 +365,38 @@ CONFIG_NETFILTER_XTABLES=m
361# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 365# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
362# CONFIG_NETFILTER_XT_MATCH_DSCP is not set 366# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
363# CONFIG_NETFILTER_XT_MATCH_ESP is not set 367# CONFIG_NETFILTER_XT_MATCH_ESP is not set
368# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
364# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set 369# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
365# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set 370# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
366# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set 371# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
367# CONFIG_NETFILTER_XT_MATCH_MAC is not set 372# CONFIG_NETFILTER_XT_MATCH_MAC is not set
368# CONFIG_NETFILTER_XT_MATCH_MARK is not set 373# CONFIG_NETFILTER_XT_MATCH_MARK is not set
374# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
369# CONFIG_NETFILTER_XT_MATCH_OWNER is not set 375# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
370# CONFIG_NETFILTER_XT_MATCH_POLICY is not set 376# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
371# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
372# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set 377# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
373# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 378# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
374# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set 379# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
375# CONFIG_NETFILTER_XT_MATCH_REALM is not set 380# CONFIG_NETFILTER_XT_MATCH_REALM is not set
381# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
376# CONFIG_NETFILTER_XT_MATCH_SCTP is not set 382# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
377# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 383# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
378# CONFIG_NETFILTER_XT_MATCH_STRING is not set 384# CONFIG_NETFILTER_XT_MATCH_STRING is not set
379# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set 385# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
380# CONFIG_NETFILTER_XT_MATCH_TIME is not set 386# CONFIG_NETFILTER_XT_MATCH_TIME is not set
381# CONFIG_NETFILTER_XT_MATCH_U32 is not set 387# CONFIG_NETFILTER_XT_MATCH_U32 is not set
382# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 388# CONFIG_IP_VS is not set
383 389
384# 390#
385# IP: Netfilter Configuration 391# IP: Netfilter Configuration
386# 392#
393# CONFIG_NF_DEFRAG_IPV4 is not set
387# CONFIG_IP_NF_QUEUE is not set 394# CONFIG_IP_NF_QUEUE is not set
388CONFIG_IP_NF_IPTABLES=m 395CONFIG_IP_NF_IPTABLES=m
389# CONFIG_IP_NF_MATCH_RECENT is not set 396# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
390# CONFIG_IP_NF_MATCH_ECN is not set
391# CONFIG_IP_NF_MATCH_AH is not set 397# CONFIG_IP_NF_MATCH_AH is not set
398# CONFIG_IP_NF_MATCH_ECN is not set
392# CONFIG_IP_NF_MATCH_TTL is not set 399# CONFIG_IP_NF_MATCH_TTL is not set
393# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
394CONFIG_IP_NF_FILTER=m 400CONFIG_IP_NF_FILTER=m
395# CONFIG_IP_NF_TARGET_REJECT is not set 401# CONFIG_IP_NF_TARGET_REJECT is not set
396# CONFIG_IP_NF_TARGET_LOG is not set 402# CONFIG_IP_NF_TARGET_LOG is not set
@@ -411,6 +417,7 @@ CONFIG_IP_NF_MANGLE=m
411# CONFIG_TIPC is not set 417# CONFIG_TIPC is not set
412# CONFIG_ATM is not set 418# CONFIG_ATM is not set
413# CONFIG_BRIDGE is not set 419# CONFIG_BRIDGE is not set
420# CONFIG_NET_DSA is not set
414# CONFIG_VLAN_8021Q is not set 421# CONFIG_VLAN_8021Q is not set
415# CONFIG_DECNET is not set 422# CONFIG_DECNET is not set
416# CONFIG_LLC2 is not set 423# CONFIG_LLC2 is not set
@@ -431,11 +438,10 @@ CONFIG_IP_NF_MANGLE=m
431# CONFIG_IRDA is not set 438# CONFIG_IRDA is not set
432# CONFIG_BT is not set 439# CONFIG_BT is not set
433# CONFIG_AF_RXRPC is not set 440# CONFIG_AF_RXRPC is not set
434 441# CONFIG_PHONET is not set
435# 442CONFIG_WIRELESS=y
436# Wireless
437#
438# CONFIG_CFG80211 is not set 443# CONFIG_CFG80211 is not set
444CONFIG_WIRELESS_OLD_REGULATORY=y
439# CONFIG_WIRELESS_EXT is not set 445# CONFIG_WIRELESS_EXT is not set
440# CONFIG_MAC80211 is not set 446# CONFIG_MAC80211 is not set
441# CONFIG_IEEE80211 is not set 447# CONFIG_IEEE80211 is not set
@@ -455,11 +461,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
455CONFIG_FW_LOADER=y 461CONFIG_FW_LOADER=y
456CONFIG_FIRMWARE_IN_KERNEL=y 462CONFIG_FIRMWARE_IN_KERNEL=y
457CONFIG_EXTRA_FIRMWARE="" 463CONFIG_EXTRA_FIRMWARE=""
464# CONFIG_DEBUG_DRIVER is not set
465# CONFIG_DEBUG_DEVRES is not set
458# CONFIG_SYS_HYPERVISOR is not set 466# CONFIG_SYS_HYPERVISOR is not set
459# CONFIG_CONNECTOR is not set 467# CONFIG_CONNECTOR is not set
460# CONFIG_MTD is not set 468# CONFIG_MTD is not set
461CONFIG_OF_DEVICE=y 469CONFIG_OF_DEVICE=y
462CONFIG_OF_I2C=y 470CONFIG_OF_GPIO=y
463# CONFIG_PARPORT is not set 471# CONFIG_PARPORT is not set
464CONFIG_BLK_DEV=y 472CONFIG_BLK_DEV=y
465# CONFIG_BLK_DEV_FD is not set 473# CONFIG_BLK_DEV_FD is not set
@@ -478,7 +486,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
478# CONFIG_BLK_DEV_XIP is not set 486# CONFIG_BLK_DEV_XIP is not set
479# CONFIG_CDROM_PKTCDVD is not set 487# CONFIG_CDROM_PKTCDVD is not set
480# CONFIG_ATA_OVER_ETH is not set 488# CONFIG_ATA_OVER_ETH is not set
481# CONFIG_XILINX_SYSACE is not set 489CONFIG_XILINX_SYSACE=y
482# CONFIG_BLK_DEV_HD is not set 490# CONFIG_BLK_DEV_HD is not set
483CONFIG_MISC_DEVICES=y 491CONFIG_MISC_DEVICES=y
484# CONFIG_PHANTOM is not set 492# CONFIG_PHANTOM is not set
@@ -487,6 +495,7 @@ CONFIG_MISC_DEVICES=y
487# CONFIG_TIFM_CORE is not set 495# CONFIG_TIFM_CORE is not set
488# CONFIG_ENCLOSURE_SERVICES is not set 496# CONFIG_ENCLOSURE_SERVICES is not set
489# CONFIG_HP_ILO is not set 497# CONFIG_HP_ILO is not set
498# CONFIG_C2PORT is not set
490CONFIG_HAVE_IDE=y 499CONFIG_HAVE_IDE=y
491# CONFIG_IDE is not set 500# CONFIG_IDE is not set
492 501
@@ -534,8 +543,12 @@ CONFIG_MII=y
534# CONFIG_IBM_NEW_EMAC_RGMII is not set 543# CONFIG_IBM_NEW_EMAC_RGMII is not set
535# CONFIG_IBM_NEW_EMAC_TAH is not set 544# CONFIG_IBM_NEW_EMAC_TAH is not set
536# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 545# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
546# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
547# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
548# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
537# CONFIG_NET_PCI is not set 549# CONFIG_NET_PCI is not set
538# CONFIG_B44 is not set 550# CONFIG_B44 is not set
551# CONFIG_ATL2 is not set
539CONFIG_NETDEV_1000=y 552CONFIG_NETDEV_1000=y
540# CONFIG_ACENIC is not set 553# CONFIG_ACENIC is not set
541# CONFIG_DL2K is not set 554# CONFIG_DL2K is not set
@@ -556,6 +569,7 @@ CONFIG_NETDEV_1000=y
556# CONFIG_QLA3XXX is not set 569# CONFIG_QLA3XXX is not set
557# CONFIG_ATL1 is not set 570# CONFIG_ATL1 is not set
558# CONFIG_ATL1E is not set 571# CONFIG_ATL1E is not set
572# CONFIG_JME is not set
559# CONFIG_NETDEV_10000 is not set 573# CONFIG_NETDEV_10000 is not set
560# CONFIG_TR is not set 574# CONFIG_TR is not set
561 575
@@ -604,6 +618,7 @@ CONFIG_KEYBOARD_ATKBD=y
604# CONFIG_KEYBOARD_XTKBD is not set 618# CONFIG_KEYBOARD_XTKBD is not set
605# CONFIG_KEYBOARD_NEWTON is not set 619# CONFIG_KEYBOARD_NEWTON is not set
606# CONFIG_KEYBOARD_STOWAWAY is not set 620# CONFIG_KEYBOARD_STOWAWAY is not set
621# CONFIG_KEYBOARD_GPIO is not set
607CONFIG_INPUT_MOUSE=y 622CONFIG_INPUT_MOUSE=y
608CONFIG_MOUSE_PS2=y 623CONFIG_MOUSE_PS2=y
609CONFIG_MOUSE_PS2_ALPS=y 624CONFIG_MOUSE_PS2_ALPS=y
@@ -611,9 +626,11 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
611CONFIG_MOUSE_PS2_SYNAPTICS=y 626CONFIG_MOUSE_PS2_SYNAPTICS=y
612CONFIG_MOUSE_PS2_LIFEBOOK=y 627CONFIG_MOUSE_PS2_LIFEBOOK=y
613CONFIG_MOUSE_PS2_TRACKPOINT=y 628CONFIG_MOUSE_PS2_TRACKPOINT=y
629# CONFIG_MOUSE_PS2_ELANTECH is not set
614# CONFIG_MOUSE_PS2_TOUCHKIT is not set 630# CONFIG_MOUSE_PS2_TOUCHKIT is not set
615# CONFIG_MOUSE_SERIAL is not set 631# CONFIG_MOUSE_SERIAL is not set
616# CONFIG_MOUSE_VSXXXAA is not set 632# CONFIG_MOUSE_VSXXXAA is not set
633# CONFIG_MOUSE_GPIO is not set
617# CONFIG_INPUT_JOYSTICK is not set 634# CONFIG_INPUT_JOYSTICK is not set
618# CONFIG_INPUT_TABLET is not set 635# CONFIG_INPUT_TABLET is not set
619# CONFIG_INPUT_TOUCHSCREEN is not set 636# CONFIG_INPUT_TOUCHSCREEN is not set
@@ -624,11 +641,11 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
624# 641#
625CONFIG_SERIO=y 642CONFIG_SERIO=y
626# CONFIG_SERIO_I8042 is not set 643# CONFIG_SERIO_I8042 is not set
627CONFIG_SERIO_SERPORT=y 644# CONFIG_SERIO_SERPORT is not set
628# CONFIG_SERIO_PCIPS2 is not set 645# CONFIG_SERIO_PCIPS2 is not set
629CONFIG_SERIO_LIBPS2=y 646CONFIG_SERIO_LIBPS2=y
630# CONFIG_SERIO_RAW is not set 647# CONFIG_SERIO_RAW is not set
631# CONFIG_SERIO_XILINX_XPS_PS2 is not set 648CONFIG_SERIO_XILINX_XPS_PS2=y
632# CONFIG_GAMEPORT is not set 649# CONFIG_GAMEPORT is not set
633 650
634# 651#
@@ -656,11 +673,12 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
656# 673#
657# Non-8250 serial port support 674# Non-8250 serial port support
658# 675#
659# CONFIG_SERIAL_UARTLITE is not set 676CONFIG_SERIAL_UARTLITE=y
677CONFIG_SERIAL_UARTLITE_CONSOLE=y
660CONFIG_SERIAL_CORE=y 678CONFIG_SERIAL_CORE=y
661CONFIG_SERIAL_CORE_CONSOLE=y 679CONFIG_SERIAL_CORE_CONSOLE=y
662# CONFIG_SERIAL_JSM is not set 680# CONFIG_SERIAL_JSM is not set
663CONFIG_SERIAL_OF_PLATFORM=y 681# CONFIG_SERIAL_OF_PLATFORM is not set
664CONFIG_UNIX98_PTYS=y 682CONFIG_UNIX98_PTYS=y
665CONFIG_LEGACY_PTYS=y 683CONFIG_LEGACY_PTYS=y
666CONFIG_LEGACY_PTY_COUNT=256 684CONFIG_LEGACY_PTY_COUNT=256
@@ -674,87 +692,41 @@ CONFIG_XILINX_HWICAP=y
674# CONFIG_RAW_DRIVER is not set 692# CONFIG_RAW_DRIVER is not set
675# CONFIG_TCG_TPM is not set 693# CONFIG_TCG_TPM is not set
676CONFIG_DEVPORT=y 694CONFIG_DEVPORT=y
677CONFIG_I2C=y 695# CONFIG_I2C is not set
678CONFIG_I2C_BOARDINFO=y 696# CONFIG_SPI is not set
679CONFIG_I2C_CHARDEV=y 697CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
680 698CONFIG_GPIOLIB=y
681# 699# CONFIG_DEBUG_GPIO is not set
682# I2C Hardware Bus support 700CONFIG_GPIO_SYSFS=y
683#
684
685#
686# PC SMBus host controller drivers
687#
688# CONFIG_I2C_ALI1535 is not set
689# CONFIG_I2C_ALI1563 is not set
690# CONFIG_I2C_ALI15X3 is not set
691# CONFIG_I2C_AMD756 is not set
692# CONFIG_I2C_AMD8111 is not set
693# CONFIG_I2C_I801 is not set
694# CONFIG_I2C_ISCH is not set
695# CONFIG_I2C_PIIX4 is not set
696# CONFIG_I2C_NFORCE2 is not set
697# CONFIG_I2C_SIS5595 is not set
698# CONFIG_I2C_SIS630 is not set
699# CONFIG_I2C_SIS96X is not set
700# CONFIG_I2C_VIA is not set
701# CONFIG_I2C_VIAPRO is not set
702 701
703# 702#
704# I2C system bus drivers (mostly embedded / system-on-chip) 703# Memory mapped GPIO expanders:
705# 704#
706# CONFIG_I2C_IBM_IIC is not set 705CONFIG_GPIO_XILINX=y
707# CONFIG_I2C_MPC is not set
708# CONFIG_I2C_OCORES is not set
709# CONFIG_I2C_SIMTEC is not set
710 706
711# 707#
712# External I2C/SMBus adapter drivers 708# I2C GPIO expanders:
713# 709#
714# CONFIG_I2C_PARPORT_LIGHT is not set
715# CONFIG_I2C_TAOS_EVM is not set
716 710
717# 711#
718# Graphics adapter I2C/DDC channel drivers 712# PCI GPIO expanders:
719# 713#
720# CONFIG_I2C_VOODOO3 is not set 714# CONFIG_GPIO_BT8XX is not set
721 715
722# 716#
723# Other I2C/SMBus bus drivers 717# SPI GPIO expanders:
724# 718#
725# CONFIG_I2C_PCA_PLATFORM is not set
726# CONFIG_I2C_STUB is not set
727
728#
729# Miscellaneous I2C Chip support
730#
731# CONFIG_DS1682 is not set
732# CONFIG_AT24 is not set
733# CONFIG_SENSORS_EEPROM is not set
734# CONFIG_SENSORS_PCF8574 is not set
735# CONFIG_PCF8575 is not set
736# CONFIG_SENSORS_PCA9539 is not set
737# CONFIG_SENSORS_PCF8591 is not set
738# CONFIG_SENSORS_MAX6875 is not set
739# CONFIG_SENSORS_TSL2550 is not set
740CONFIG_I2C_DEBUG_CORE=y
741CONFIG_I2C_DEBUG_ALGO=y
742# CONFIG_I2C_DEBUG_BUS is not set
743# CONFIG_I2C_DEBUG_CHIP is not set
744# CONFIG_SPI is not set
745CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
746# CONFIG_GPIOLIB is not set
747# CONFIG_W1 is not set 719# CONFIG_W1 is not set
748# CONFIG_POWER_SUPPLY is not set 720# CONFIG_POWER_SUPPLY is not set
749# CONFIG_HWMON is not set 721# CONFIG_HWMON is not set
750# CONFIG_THERMAL is not set 722# CONFIG_THERMAL is not set
751# CONFIG_THERMAL_HWMON is not set 723# CONFIG_THERMAL_HWMON is not set
752# CONFIG_WATCHDOG is not set 724# CONFIG_WATCHDOG is not set
725CONFIG_SSB_POSSIBLE=y
753 726
754# 727#
755# Sonics Silicon Backplane 728# Sonics Silicon Backplane
756# 729#
757CONFIG_SSB_POSSIBLE=y
758# CONFIG_SSB is not set 730# CONFIG_SSB is not set
759 731
760# 732#
@@ -763,6 +735,8 @@ CONFIG_SSB_POSSIBLE=y
763# CONFIG_MFD_CORE is not set 735# CONFIG_MFD_CORE is not set
764# CONFIG_MFD_SM501 is not set 736# CONFIG_MFD_SM501 is not set
765# CONFIG_HTC_PASIC3 is not set 737# CONFIG_HTC_PASIC3 is not set
738# CONFIG_MFD_TMIO is not set
739# CONFIG_REGULATOR is not set
766 740
767# 741#
768# Multimedia devices 742# Multimedia devices
@@ -790,6 +764,7 @@ CONFIG_SSB_POSSIBLE=y
790CONFIG_FB=y 764CONFIG_FB=y
791# CONFIG_FIRMWARE_EDID is not set 765# CONFIG_FIRMWARE_EDID is not set
792# CONFIG_FB_DDC is not set 766# CONFIG_FB_DDC is not set
767# CONFIG_FB_BOOT_VESA_SUPPORT is not set
793CONFIG_FB_CFB_FILLRECT=y 768CONFIG_FB_CFB_FILLRECT=y
794CONFIG_FB_CFB_COPYAREA=y 769CONFIG_FB_CFB_COPYAREA=y
795CONFIG_FB_CFB_IMAGEBLIT=y 770CONFIG_FB_CFB_IMAGEBLIT=y
@@ -826,6 +801,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
826# CONFIG_FB_S3 is not set 801# CONFIG_FB_S3 is not set
827# CONFIG_FB_SAVAGE is not set 802# CONFIG_FB_SAVAGE is not set
828# CONFIG_FB_SIS is not set 803# CONFIG_FB_SIS is not set
804# CONFIG_FB_VIA is not set
829# CONFIG_FB_NEOMAGIC is not set 805# CONFIG_FB_NEOMAGIC is not set
830# CONFIG_FB_KYRO is not set 806# CONFIG_FB_KYRO is not set
831# CONFIG_FB_3DFX is not set 807# CONFIG_FB_3DFX is not set
@@ -838,6 +814,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y
838# CONFIG_FB_IBM_GXT4500 is not set 814# CONFIG_FB_IBM_GXT4500 is not set
839CONFIG_FB_XILINX=y 815CONFIG_FB_XILINX=y
840# CONFIG_FB_VIRTUAL is not set 816# CONFIG_FB_VIRTUAL is not set
817# CONFIG_FB_METRONOME is not set
818# CONFIG_FB_MB862XX is not set
841# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 819# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
842 820
843# 821#
@@ -870,6 +848,7 @@ CONFIG_LOGO_LINUX_CLUT224=y
870# CONFIG_SOUND is not set 848# CONFIG_SOUND is not set
871# CONFIG_HID_SUPPORT is not set 849# CONFIG_HID_SUPPORT is not set
872# CONFIG_USB_SUPPORT is not set 850# CONFIG_USB_SUPPORT is not set
851# CONFIG_UWB is not set
873# CONFIG_MMC is not set 852# CONFIG_MMC is not set
874# CONFIG_MEMSTICK is not set 853# CONFIG_MEMSTICK is not set
875# CONFIG_NEW_LEDS is not set 854# CONFIG_NEW_LEDS is not set
@@ -879,6 +858,8 @@ CONFIG_LOGO_LINUX_CLUT224=y
879# CONFIG_RTC_CLASS is not set 858# CONFIG_RTC_CLASS is not set
880# CONFIG_DMADEVICES is not set 859# CONFIG_DMADEVICES is not set
881# CONFIG_UIO is not set 860# CONFIG_UIO is not set
861# CONFIG_STAGING is not set
862CONFIG_STAGING_EXCLUDE_BUILD=y
882 863
883# 864#
884# File systems 865# File systems
@@ -887,10 +868,11 @@ CONFIG_EXT2_FS=y
887# CONFIG_EXT2_FS_XATTR is not set 868# CONFIG_EXT2_FS_XATTR is not set
888# CONFIG_EXT2_FS_XIP is not set 869# CONFIG_EXT2_FS_XIP is not set
889# CONFIG_EXT3_FS is not set 870# CONFIG_EXT3_FS is not set
890# CONFIG_EXT4DEV_FS is not set 871# CONFIG_EXT4_FS is not set
891# CONFIG_REISERFS_FS is not set 872# CONFIG_REISERFS_FS is not set
892# CONFIG_JFS_FS is not set 873# CONFIG_JFS_FS is not set
893# CONFIG_FS_POSIX_ACL is not set 874# CONFIG_FS_POSIX_ACL is not set
875CONFIG_FILE_LOCKING=y
894# CONFIG_XFS_FS is not set 876# CONFIG_XFS_FS is not set
895# CONFIG_OCFS2_FS is not set 877# CONFIG_OCFS2_FS is not set
896CONFIG_DNOTIFY=y 878CONFIG_DNOTIFY=y
@@ -899,7 +881,7 @@ CONFIG_INOTIFY_USER=y
899# CONFIG_QUOTA is not set 881# CONFIG_QUOTA is not set
900CONFIG_AUTOFS_FS=y 882CONFIG_AUTOFS_FS=y
901CONFIG_AUTOFS4_FS=y 883CONFIG_AUTOFS4_FS=y
902CONFIG_FUSE_FS=m 884# CONFIG_FUSE_FS is not set
903 885
904# 886#
905# CD-ROM/DVD Filesystems 887# CD-ROM/DVD Filesystems
@@ -923,6 +905,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
923CONFIG_PROC_FS=y 905CONFIG_PROC_FS=y
924# CONFIG_PROC_KCORE is not set 906# CONFIG_PROC_KCORE is not set
925CONFIG_PROC_SYSCTL=y 907CONFIG_PROC_SYSCTL=y
908CONFIG_PROC_PAGE_MONITOR=y
926CONFIG_SYSFS=y 909CONFIG_SYSFS=y
927CONFIG_TMPFS=y 910CONFIG_TMPFS=y
928# CONFIG_TMPFS_POSIX_ACL is not set 911# CONFIG_TMPFS_POSIX_ACL is not set
@@ -954,19 +937,15 @@ CONFIG_NFS_V3=y
954# CONFIG_NFS_V3_ACL is not set 937# CONFIG_NFS_V3_ACL is not set
955# CONFIG_NFS_V4 is not set 938# CONFIG_NFS_V4 is not set
956CONFIG_ROOT_NFS=y 939CONFIG_ROOT_NFS=y
957CONFIG_NFSD=y 940# CONFIG_NFSD is not set
958CONFIG_NFSD_V3=y
959# CONFIG_NFSD_V3_ACL is not set
960# CONFIG_NFSD_V4 is not set
961CONFIG_LOCKD=y 941CONFIG_LOCKD=y
962CONFIG_LOCKD_V4=y 942CONFIG_LOCKD_V4=y
963CONFIG_EXPORTFS=y
964CONFIG_NFS_COMMON=y 943CONFIG_NFS_COMMON=y
965CONFIG_SUNRPC=y 944CONFIG_SUNRPC=y
945# CONFIG_SUNRPC_REGISTER_V4 is not set
966# CONFIG_RPCSEC_GSS_KRB5 is not set 946# CONFIG_RPCSEC_GSS_KRB5 is not set
967# CONFIG_RPCSEC_GSS_SPKM3 is not set 947# CONFIG_RPCSEC_GSS_SPKM3 is not set
968CONFIG_SMB_FS=y 948# CONFIG_SMB_FS is not set
969# CONFIG_SMB_NLS_DEFAULT is not set
970# CONFIG_CIFS is not set 949# CONFIG_CIFS is not set
971# CONFIG_NCP_FS is not set 950# CONFIG_NCP_FS is not set
972# CONFIG_CODA_FS is not set 951# CONFIG_CODA_FS is not set
@@ -1023,7 +1002,6 @@ CONFIG_NLS_UTF8=m
1023# Library routines 1002# Library routines
1024# 1003#
1025CONFIG_BITREVERSE=y 1004CONFIG_BITREVERSE=y
1026# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1027CONFIG_CRC_CCITT=y 1005CONFIG_CRC_CCITT=y
1028# CONFIG_CRC16 is not set 1006# CONFIG_CRC16 is not set
1029# CONFIG_CRC_T10DIF is not set 1007# CONFIG_CRC_T10DIF is not set
@@ -1041,7 +1019,7 @@ CONFIG_HAVE_LMB=y
1041# 1019#
1042# Kernel hacking 1020# Kernel hacking
1043# 1021#
1044# CONFIG_PRINTK_TIME is not set 1022CONFIG_PRINTK_TIME=y
1045CONFIG_ENABLE_WARN_DEPRECATED=y 1023CONFIG_ENABLE_WARN_DEPRECATED=y
1046CONFIG_ENABLE_MUST_CHECK=y 1024CONFIG_ENABLE_MUST_CHECK=y
1047CONFIG_FRAME_WARN=1024 1025CONFIG_FRAME_WARN=1024
@@ -1049,19 +1027,62 @@ CONFIG_FRAME_WARN=1024
1049# CONFIG_UNUSED_SYMBOLS is not set 1027# CONFIG_UNUSED_SYMBOLS is not set
1050# CONFIG_DEBUG_FS is not set 1028# CONFIG_DEBUG_FS is not set
1051# CONFIG_HEADERS_CHECK is not set 1029# CONFIG_HEADERS_CHECK is not set
1052# CONFIG_DEBUG_KERNEL is not set 1030CONFIG_DEBUG_KERNEL=y
1031# CONFIG_DEBUG_SHIRQ is not set
1032CONFIG_DETECT_SOFTLOCKUP=y
1033# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1034CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1035CONFIG_SCHED_DEBUG=y
1036# CONFIG_SCHEDSTATS is not set
1037# CONFIG_TIMER_STATS is not set
1038# CONFIG_DEBUG_OBJECTS is not set
1039# CONFIG_DEBUG_SLAB is not set
1040# CONFIG_DEBUG_RT_MUTEXES is not set
1041# CONFIG_RT_MUTEX_TESTER is not set
1042# CONFIG_DEBUG_SPINLOCK is not set
1043# CONFIG_DEBUG_MUTEXES is not set
1044# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1045# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1046# CONFIG_DEBUG_KOBJECT is not set
1053CONFIG_DEBUG_BUGVERBOSE=y 1047CONFIG_DEBUG_BUGVERBOSE=y
1048CONFIG_DEBUG_INFO=y
1049# CONFIG_DEBUG_VM is not set
1050# CONFIG_DEBUG_WRITECOUNT is not set
1054CONFIG_DEBUG_MEMORY_INIT=y 1051CONFIG_DEBUG_MEMORY_INIT=y
1052# CONFIG_DEBUG_LIST is not set
1053# CONFIG_DEBUG_SG is not set
1054# CONFIG_BOOT_PRINTK_DELAY is not set
1055# CONFIG_RCU_TORTURE_TEST is not set
1056# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1057# CONFIG_BACKTRACE_SELF_TEST is not set
1058# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1059# CONFIG_FAULT_INJECTION is not set
1055# CONFIG_LATENCYTOP is not set 1060# CONFIG_LATENCYTOP is not set
1056CONFIG_HAVE_FTRACE=y 1061CONFIG_SYSCTL_SYSCALL_CHECK=y
1057CONFIG_HAVE_DYNAMIC_FTRACE=y 1062CONFIG_HAVE_FUNCTION_TRACER=y
1058# CONFIG_FTRACE is not set 1063
1064#
1065# Tracers
1066#
1067# CONFIG_FUNCTION_TRACER is not set
1059# CONFIG_PREEMPT_TRACER is not set 1068# CONFIG_PREEMPT_TRACER is not set
1060# CONFIG_SCHED_TRACER is not set 1069# CONFIG_SCHED_TRACER is not set
1061# CONFIG_CONTEXT_SWITCH_TRACER is not set 1070# CONFIG_CONTEXT_SWITCH_TRACER is not set
1071# CONFIG_BOOT_TRACER is not set
1072# CONFIG_STACK_TRACER is not set
1073# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1062# CONFIG_SAMPLES is not set 1074# CONFIG_SAMPLES is not set
1063CONFIG_HAVE_ARCH_KGDB=y 1075CONFIG_HAVE_ARCH_KGDB=y
1076# CONFIG_KGDB is not set
1077# CONFIG_DEBUG_STACKOVERFLOW is not set
1078# CONFIG_DEBUG_STACK_USAGE is not set
1079# CONFIG_DEBUG_PAGEALLOC is not set
1080# CONFIG_CODE_PATCHING_SELFTEST is not set
1081# CONFIG_FTR_FIXUP_SELFTEST is not set
1082# CONFIG_MSI_BITMAP_SELFTEST is not set
1083# CONFIG_XMON is not set
1064# CONFIG_IRQSTACKS is not set 1084# CONFIG_IRQSTACKS is not set
1085# CONFIG_BDI_SWITCH is not set
1065# CONFIG_PPC_EARLY_DEBUG is not set 1086# CONFIG_PPC_EARLY_DEBUG is not set
1066 1087
1067# 1088#
@@ -1069,12 +1090,14 @@ CONFIG_HAVE_ARCH_KGDB=y
1069# 1090#
1070# CONFIG_KEYS is not set 1091# CONFIG_KEYS is not set
1071# CONFIG_SECURITY is not set 1092# CONFIG_SECURITY is not set
1093# CONFIG_SECURITYFS is not set
1072# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1094# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1073CONFIG_CRYPTO=y 1095CONFIG_CRYPTO=y
1074 1096
1075# 1097#
1076# Crypto core or helper 1098# Crypto core or helper
1077# 1099#
1100# CONFIG_CRYPTO_FIPS is not set
1078# CONFIG_CRYPTO_MANAGER is not set 1101# CONFIG_CRYPTO_MANAGER is not set
1079# CONFIG_CRYPTO_GF128MUL is not set 1102# CONFIG_CRYPTO_GF128MUL is not set
1080# CONFIG_CRYPTO_NULL is not set 1103# CONFIG_CRYPTO_NULL is not set
@@ -1147,6 +1170,11 @@ CONFIG_CRYPTO=y
1147# 1170#
1148# CONFIG_CRYPTO_DEFLATE is not set 1171# CONFIG_CRYPTO_DEFLATE is not set
1149# CONFIG_CRYPTO_LZO is not set 1172# CONFIG_CRYPTO_LZO is not set
1173
1174#
1175# Random Number Generation
1176#
1177# CONFIG_CRYPTO_ANSI_CPRNG is not set
1150CONFIG_CRYPTO_HW=y 1178CONFIG_CRYPTO_HW=y
1151# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1179# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1152# CONFIG_PPC_CLOCK is not set 1180# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/52xx/cm5200_defconfig b/arch/powerpc/configs/52xx/cm5200_defconfig
index c10f7395aa1b..3df627494b65 100644
--- a/arch/powerpc/configs/52xx/cm5200_defconfig
+++ b/arch/powerpc/configs/52xx/cm5200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.25 3# Linux kernel version: 2.6.28-rc4
4# Tue Apr 29 07:11:37 2008 4# Thu Nov 13 02:12:40 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
34CONFIG_STACKTRACE_SUPPORT=y 34CONFIG_STACKTRACE_SUPPORT=y
35CONFIG_HAVE_LATENCYTOP_SUPPORT=y
35CONFIG_LOCKDEP_SUPPORT=y 36CONFIG_LOCKDEP_SUPPORT=y
36CONFIG_RWSEM_XCHGADD_ALGORITHM=y 37CONFIG_RWSEM_XCHGADD_ALGORITHM=y
37CONFIG_ARCH_HAS_ILOG2_U32=y 38CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -102,6 +103,7 @@ CONFIG_SIGNALFD=y
102CONFIG_TIMERFD=y 103CONFIG_TIMERFD=y
103CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
104CONFIG_SHMEM=y 105CONFIG_SHMEM=y
106CONFIG_AIO=y
105CONFIG_VM_EVENT_COUNTERS=y 107CONFIG_VM_EVENT_COUNTERS=y
106CONFIG_SLUB_DEBUG=y 108CONFIG_SLUB_DEBUG=y
107# CONFIG_SLAB is not set 109# CONFIG_SLAB is not set
@@ -110,9 +112,13 @@ CONFIG_SLUB=y
110# CONFIG_PROFILING is not set 112# CONFIG_PROFILING is not set
111# CONFIG_MARKERS is not set 113# CONFIG_MARKERS is not set
112CONFIG_HAVE_OPROFILE=y 114CONFIG_HAVE_OPROFILE=y
115CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
116CONFIG_HAVE_IOREMAP_PROT=y
113CONFIG_HAVE_KPROBES=y 117CONFIG_HAVE_KPROBES=y
114CONFIG_HAVE_KRETPROBES=y 118CONFIG_HAVE_KRETPROBES=y
115CONFIG_PROC_PAGE_MONITOR=y 119CONFIG_HAVE_ARCH_TRACEHOOK=y
120CONFIG_HAVE_CLK=y
121# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
116CONFIG_SLABINFO=y 122CONFIG_SLABINFO=y
117CONFIG_RT_MUTEXES=y 123CONFIG_RT_MUTEXES=y
118# CONFIG_TINY_SHMEM is not set 124# CONFIG_TINY_SHMEM is not set
@@ -123,6 +129,7 @@ CONFIG_BLOCK=y
123# CONFIG_BLK_DEV_IO_TRACE is not set 129# CONFIG_BLK_DEV_IO_TRACE is not set
124# CONFIG_LSF is not set 130# CONFIG_LSF is not set
125# CONFIG_BLK_DEV_BSG is not set 131# CONFIG_BLK_DEV_BSG is not set
132# CONFIG_BLK_DEV_INTEGRITY is not set
126 133
127# 134#
128# IO Schedulers 135# IO Schedulers
@@ -137,19 +144,16 @@ CONFIG_DEFAULT_AS=y
137# CONFIG_DEFAULT_NOOP is not set 144# CONFIG_DEFAULT_NOOP is not set
138CONFIG_DEFAULT_IOSCHED="anticipatory" 145CONFIG_DEFAULT_IOSCHED="anticipatory"
139CONFIG_CLASSIC_RCU=y 146CONFIG_CLASSIC_RCU=y
147# CONFIG_FREEZER is not set
140 148
141# 149#
142# Platform support 150# Platform support
143# 151#
144CONFIG_PPC_MULTIPLATFORM=y 152CONFIG_PPC_MULTIPLATFORM=y
145# CONFIG_PPC_82xx is not set
146# CONFIG_PPC_83xx is not set
147# CONFIG_PPC_86xx is not set
148CONFIG_CLASSIC32=y 153CONFIG_CLASSIC32=y
149# CONFIG_PPC_CHRP is not set 154# CONFIG_PPC_CHRP is not set
150# CONFIG_PPC_MPC512x is not set
151# CONFIG_PPC_MPC5121 is not set
152# CONFIG_MPC5121_ADS is not set 155# CONFIG_MPC5121_ADS is not set
156# CONFIG_MPC5121_GENERIC is not set
153CONFIG_PPC_MPC52xx=y 157CONFIG_PPC_MPC52xx=y
154CONFIG_PPC_MPC5200_SIMPLE=y 158CONFIG_PPC_MPC5200_SIMPLE=y
155# CONFIG_PPC_EFIKA is not set 159# CONFIG_PPC_EFIKA is not set
@@ -159,7 +163,10 @@ CONFIG_PPC_MPC5200_SIMPLE=y
159# CONFIG_PPC_PMAC is not set 163# CONFIG_PPC_PMAC is not set
160# CONFIG_PPC_CELL is not set 164# CONFIG_PPC_CELL is not set
161# CONFIG_PPC_CELL_NATIVE is not set 165# CONFIG_PPC_CELL_NATIVE is not set
166# CONFIG_PPC_82xx is not set
162# CONFIG_PQ2ADS is not set 167# CONFIG_PQ2ADS is not set
168# CONFIG_PPC_83xx is not set
169# CONFIG_PPC_86xx is not set
163# CONFIG_EMBEDDED6xx is not set 170# CONFIG_EMBEDDED6xx is not set
164# CONFIG_IPIC is not set 171# CONFIG_IPIC is not set
165# CONFIG_MPIC is not set 172# CONFIG_MPIC is not set
@@ -183,7 +190,6 @@ CONFIG_PPC_BESTCOMM_FEC=y
183# Kernel options 190# Kernel options
184# 191#
185# CONFIG_HIGHMEM is not set 192# CONFIG_HIGHMEM is not set
186# CONFIG_TICK_ONESHOT is not set
187# CONFIG_NO_HZ is not set 193# CONFIG_NO_HZ is not set
188# CONFIG_HIGH_RES_TIMERS is not set 194# CONFIG_HIGH_RES_TIMERS is not set
189CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 195CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -197,6 +203,8 @@ CONFIG_PREEMPT_NONE=y
197# CONFIG_PREEMPT_VOLUNTARY is not set 203# CONFIG_PREEMPT_VOLUNTARY is not set
198# CONFIG_PREEMPT is not set 204# CONFIG_PREEMPT is not set
199CONFIG_BINFMT_ELF=y 205CONFIG_BINFMT_ELF=y
206# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
207# CONFIG_HAVE_AOUT is not set
200# CONFIG_BINFMT_MISC is not set 208# CONFIG_BINFMT_MISC is not set
201# CONFIG_IOMMU_HELPER is not set 209# CONFIG_IOMMU_HELPER is not set
202CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 210CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -211,19 +219,20 @@ CONFIG_FLATMEM_MANUAL=y
211# CONFIG_SPARSEMEM_MANUAL is not set 219# CONFIG_SPARSEMEM_MANUAL is not set
212CONFIG_FLATMEM=y 220CONFIG_FLATMEM=y
213CONFIG_FLAT_NODE_MEM_MAP=y 221CONFIG_FLAT_NODE_MEM_MAP=y
214# CONFIG_SPARSEMEM_STATIC is not set
215# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
216CONFIG_PAGEFLAGS_EXTENDED=y 222CONFIG_PAGEFLAGS_EXTENDED=y
217CONFIG_SPLIT_PTLOCK_CPUS=4 223CONFIG_SPLIT_PTLOCK_CPUS=4
224CONFIG_MIGRATION=y
218# CONFIG_RESOURCES_64BIT is not set 225# CONFIG_RESOURCES_64BIT is not set
226# CONFIG_PHYS_ADDR_T_64BIT is not set
219CONFIG_ZONE_DMA_FLAG=1 227CONFIG_ZONE_DMA_FLAG=1
220CONFIG_BOUNCE=y 228CONFIG_BOUNCE=y
221CONFIG_VIRT_TO_BUS=y 229CONFIG_VIRT_TO_BUS=y
230CONFIG_UNEVICTABLE_LRU=y
222CONFIG_FORCE_MAX_ZONEORDER=11 231CONFIG_FORCE_MAX_ZONEORDER=11
223CONFIG_PROC_DEVICETREE=y 232CONFIG_PROC_DEVICETREE=y
224# CONFIG_CMDLINE_BOOL is not set 233# CONFIG_CMDLINE_BOOL is not set
234CONFIG_EXTRA_TARGETS=""
225CONFIG_PM=y 235CONFIG_PM=y
226# CONFIG_PM_LEGACY is not set
227# CONFIG_PM_DEBUG is not set 236# CONFIG_PM_DEBUG is not set
228CONFIG_SECCOMP=y 237CONFIG_SECCOMP=y
229CONFIG_ISA_DMA_API=y 238CONFIG_ISA_DMA_API=y
@@ -233,7 +242,7 @@ CONFIG_ISA_DMA_API=y
233# 242#
234CONFIG_ZONE_DMA=y 243CONFIG_ZONE_DMA=y
235CONFIG_GENERIC_ISA_DMA=y 244CONFIG_GENERIC_ISA_DMA=y
236CONFIG_FSL_SOC=y 245CONFIG_PPC_PCI_CHOICE=y
237# CONFIG_PCI is not set 246# CONFIG_PCI is not set
238# CONFIG_PCI_DOMAINS is not set 247# CONFIG_PCI_DOMAINS is not set
239# CONFIG_PCI_SYSCALL is not set 248# CONFIG_PCI_SYSCALL is not set
@@ -254,10 +263,6 @@ CONFIG_PAGE_OFFSET=0xc0000000
254CONFIG_KERNEL_START=0xc0000000 263CONFIG_KERNEL_START=0xc0000000
255CONFIG_PHYSICAL_START=0x00000000 264CONFIG_PHYSICAL_START=0x00000000
256CONFIG_TASK_SIZE=0xc0000000 265CONFIG_TASK_SIZE=0xc0000000
257
258#
259# Networking
260#
261CONFIG_NET=y 266CONFIG_NET=y
262 267
263# 268#
@@ -308,6 +313,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
308# CONFIG_TIPC is not set 313# CONFIG_TIPC is not set
309# CONFIG_ATM is not set 314# CONFIG_ATM is not set
310# CONFIG_BRIDGE is not set 315# CONFIG_BRIDGE is not set
316# CONFIG_NET_DSA is not set
311# CONFIG_VLAN_8021Q is not set 317# CONFIG_VLAN_8021Q is not set
312# CONFIG_DECNET is not set 318# CONFIG_DECNET is not set
313# CONFIG_LLC2 is not set 319# CONFIG_LLC2 is not set
@@ -328,14 +334,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
328# CONFIG_IRDA is not set 334# CONFIG_IRDA is not set
329# CONFIG_BT is not set 335# CONFIG_BT is not set
330# CONFIG_AF_RXRPC is not set 336# CONFIG_AF_RXRPC is not set
331 337# CONFIG_PHONET is not set
332# 338# CONFIG_WIRELESS is not set
333# Wireless
334#
335# CONFIG_CFG80211 is not set
336# CONFIG_WIRELESS_EXT is not set
337# CONFIG_MAC80211 is not set
338# CONFIG_IEEE80211 is not set
339# CONFIG_RFKILL is not set 339# CONFIG_RFKILL is not set
340# CONFIG_NET_9P is not set 340# CONFIG_NET_9P is not set
341 341
@@ -446,6 +446,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
446# CONFIG_BLK_DEV_XIP is not set 446# CONFIG_BLK_DEV_XIP is not set
447# CONFIG_CDROM_PKTCDVD is not set 447# CONFIG_CDROM_PKTCDVD is not set
448# CONFIG_ATA_OVER_ETH is not set 448# CONFIG_ATA_OVER_ETH is not set
449# CONFIG_BLK_DEV_HD is not set
449# CONFIG_MISC_DEVICES is not set 450# CONFIG_MISC_DEVICES is not set
450CONFIG_HAVE_IDE=y 451CONFIG_HAVE_IDE=y
451# CONFIG_IDE is not set 452# CONFIG_IDE is not set
@@ -487,11 +488,11 @@ CONFIG_CHR_DEV_SG=y
487# CONFIG_SCSI_SAS_LIBSAS is not set 488# CONFIG_SCSI_SAS_LIBSAS is not set
488# CONFIG_SCSI_SRP_ATTRS is not set 489# CONFIG_SCSI_SRP_ATTRS is not set
489# CONFIG_SCSI_LOWLEVEL is not set 490# CONFIG_SCSI_LOWLEVEL is not set
491# CONFIG_SCSI_DH is not set
490# CONFIG_ATA is not set 492# CONFIG_ATA is not set
491# CONFIG_MD is not set 493# CONFIG_MD is not set
492# CONFIG_MACINTOSH_DRIVERS is not set 494# CONFIG_MACINTOSH_DRIVERS is not set
493CONFIG_NETDEVICES=y 495CONFIG_NETDEVICES=y
494# CONFIG_NETDEVICES_MULTIQUEUE is not set
495# CONFIG_DUMMY is not set 496# CONFIG_DUMMY is not set
496# CONFIG_BONDING is not set 497# CONFIG_BONDING is not set
497# CONFIG_MACVLAN is not set 498# CONFIG_MACVLAN is not set
@@ -521,6 +522,9 @@ CONFIG_NET_ETHERNET=y
521# CONFIG_IBM_NEW_EMAC_RGMII is not set 522# CONFIG_IBM_NEW_EMAC_RGMII is not set
522# CONFIG_IBM_NEW_EMAC_TAH is not set 523# CONFIG_IBM_NEW_EMAC_TAH is not set
523# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 524# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
525# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
526# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
527# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
524# CONFIG_B44 is not set 528# CONFIG_B44 is not set
525CONFIG_FEC_MPC52xx=y 529CONFIG_FEC_MPC52xx=y
526CONFIG_FEC_MPC52xx_MDIO=y 530CONFIG_FEC_MPC52xx_MDIO=y
@@ -532,7 +536,6 @@ CONFIG_FEC_MPC52xx_MDIO=y
532# 536#
533# CONFIG_WLAN_PRE80211 is not set 537# CONFIG_WLAN_PRE80211 is not set
534# CONFIG_WLAN_80211 is not set 538# CONFIG_WLAN_80211 is not set
535# CONFIG_IWLWIFI is not set
536# CONFIG_IWLWIFI_LEDS is not set 539# CONFIG_IWLWIFI_LEDS is not set
537 540
538# 541#
@@ -567,6 +570,7 @@ CONFIG_FEC_MPC52xx_MDIO=y
567# Character devices 570# Character devices
568# 571#
569# CONFIG_VT is not set 572# CONFIG_VT is not set
573CONFIG_DEVKMEM=y
570# CONFIG_SERIAL_NONSTANDARD is not set 574# CONFIG_SERIAL_NONSTANDARD is not set
571 575
572# 576#
@@ -596,25 +600,40 @@ CONFIG_LEGACY_PTY_COUNT=256
596CONFIG_I2C=y 600CONFIG_I2C=y
597CONFIG_I2C_BOARDINFO=y 601CONFIG_I2C_BOARDINFO=y
598CONFIG_I2C_CHARDEV=y 602CONFIG_I2C_CHARDEV=y
603CONFIG_I2C_HELPER_AUTO=y
599 604
600# 605#
601# I2C Hardware Bus support 606# I2C Hardware Bus support
602# 607#
608
609#
610# I2C system bus drivers (mostly embedded / system-on-chip)
611#
603CONFIG_I2C_MPC=y 612CONFIG_I2C_MPC=y
604# CONFIG_I2C_OCORES is not set 613# CONFIG_I2C_OCORES is not set
605# CONFIG_I2C_PARPORT_LIGHT is not set
606# CONFIG_I2C_SIMTEC is not set 614# CONFIG_I2C_SIMTEC is not set
615
616#
617# External I2C/SMBus adapter drivers
618#
619# CONFIG_I2C_PARPORT_LIGHT is not set
607# CONFIG_I2C_TAOS_EVM is not set 620# CONFIG_I2C_TAOS_EVM is not set
608# CONFIG_I2C_TINY_USB is not set 621# CONFIG_I2C_TINY_USB is not set
622
623#
624# Other I2C/SMBus bus drivers
625#
609# CONFIG_I2C_PCA_PLATFORM is not set 626# CONFIG_I2C_PCA_PLATFORM is not set
610 627
611# 628#
612# Miscellaneous I2C Chip support 629# Miscellaneous I2C Chip support
613# 630#
614# CONFIG_DS1682 is not set 631# CONFIG_DS1682 is not set
632# CONFIG_AT24 is not set
615# CONFIG_SENSORS_EEPROM is not set 633# CONFIG_SENSORS_EEPROM is not set
616# CONFIG_SENSORS_PCF8574 is not set 634# CONFIG_SENSORS_PCF8574 is not set
617# CONFIG_PCF8575 is not set 635# CONFIG_PCF8575 is not set
636# CONFIG_SENSORS_PCA9539 is not set
618# CONFIG_SENSORS_PCF8591 is not set 637# CONFIG_SENSORS_PCF8591 is not set
619# CONFIG_SENSORS_MAX6875 is not set 638# CONFIG_SENSORS_MAX6875 is not set
620# CONFIG_SENSORS_TSL2550 is not set 639# CONFIG_SENSORS_TSL2550 is not set
@@ -623,10 +642,13 @@ CONFIG_I2C_MPC=y
623# CONFIG_I2C_DEBUG_BUS is not set 642# CONFIG_I2C_DEBUG_BUS is not set
624# CONFIG_I2C_DEBUG_CHIP is not set 643# CONFIG_I2C_DEBUG_CHIP is not set
625# CONFIG_SPI is not set 644# CONFIG_SPI is not set
645CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
646# CONFIG_GPIOLIB is not set
626# CONFIG_W1 is not set 647# CONFIG_W1 is not set
627# CONFIG_POWER_SUPPLY is not set 648# CONFIG_POWER_SUPPLY is not set
628# CONFIG_HWMON is not set 649# CONFIG_HWMON is not set
629# CONFIG_THERMAL is not set 650# CONFIG_THERMAL is not set
651# CONFIG_THERMAL_HWMON is not set
630CONFIG_WATCHDOG=y 652CONFIG_WATCHDOG=y
631# CONFIG_WATCHDOG_NOWAYOUT is not set 653# CONFIG_WATCHDOG_NOWAYOUT is not set
632 654
@@ -640,24 +662,39 @@ CONFIG_WATCHDOG=y
640# USB-based Watchdog Cards 662# USB-based Watchdog Cards
641# 663#
642# CONFIG_USBPCWATCHDOG is not set 664# CONFIG_USBPCWATCHDOG is not set
665CONFIG_SSB_POSSIBLE=y
643 666
644# 667#
645# Sonics Silicon Backplane 668# Sonics Silicon Backplane
646# 669#
647CONFIG_SSB_POSSIBLE=y
648# CONFIG_SSB is not set 670# CONFIG_SSB is not set
649 671
650# 672#
651# Multifunction device drivers 673# Multifunction device drivers
652# 674#
675# CONFIG_MFD_CORE is not set
653# CONFIG_MFD_SM501 is not set 676# CONFIG_MFD_SM501 is not set
654# CONFIG_HTC_PASIC3 is not set 677# CONFIG_HTC_PASIC3 is not set
678# CONFIG_MFD_TMIO is not set
679# CONFIG_PMIC_DA903X is not set
680# CONFIG_MFD_WM8400 is not set
681# CONFIG_MFD_WM8350_I2C is not set
682# CONFIG_REGULATOR is not set
655 683
656# 684#
657# Multimedia devices 685# Multimedia devices
658# 686#
687
688#
689# Multimedia core support
690#
659# CONFIG_VIDEO_DEV is not set 691# CONFIG_VIDEO_DEV is not set
660# CONFIG_DVB_CORE is not set 692# CONFIG_DVB_CORE is not set
693# CONFIG_VIDEO_MEDIA is not set
694
695#
696# Multimedia drivers
697#
661# CONFIG_DAB is not set 698# CONFIG_DAB is not set
662 699
663# 700#
@@ -672,10 +709,6 @@ CONFIG_SSB_POSSIBLE=y
672# Display device support 709# Display device support
673# 710#
674# CONFIG_DISPLAY_SUPPORT is not set 711# CONFIG_DISPLAY_SUPPORT is not set
675
676#
677# Sound
678#
679# CONFIG_SOUND is not set 712# CONFIG_SOUND is not set
680CONFIG_USB_SUPPORT=y 713CONFIG_USB_SUPPORT=y
681CONFIG_USB_ARCH_HAS_HCD=y 714CONFIG_USB_ARCH_HAS_HCD=y
@@ -695,11 +728,16 @@ CONFIG_USB_DEVICEFS=y
695# CONFIG_USB_OTG is not set 728# CONFIG_USB_OTG is not set
696# CONFIG_USB_OTG_WHITELIST is not set 729# CONFIG_USB_OTG_WHITELIST is not set
697# CONFIG_USB_OTG_BLACKLIST_HUB is not set 730# CONFIG_USB_OTG_BLACKLIST_HUB is not set
731# CONFIG_USB_MON is not set
732# CONFIG_USB_WUSB is not set
733# CONFIG_USB_WUSB_CBAF is not set
698 734
699# 735#
700# USB Host Controller Drivers 736# USB Host Controller Drivers
701# 737#
738# CONFIG_USB_C67X00_HCD is not set
702# CONFIG_USB_ISP116X_HCD is not set 739# CONFIG_USB_ISP116X_HCD is not set
740# CONFIG_USB_ISP1760_HCD is not set
703CONFIG_USB_OHCI_HCD=y 741CONFIG_USB_OHCI_HCD=y
704CONFIG_USB_OHCI_HCD_PPC_SOC=y 742CONFIG_USB_OHCI_HCD_PPC_SOC=y
705CONFIG_USB_OHCI_HCD_PPC_OF=y 743CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -710,12 +748,16 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
710# CONFIG_USB_OHCI_LITTLE_ENDIAN is not set 748# CONFIG_USB_OHCI_LITTLE_ENDIAN is not set
711# CONFIG_USB_SL811_HCD is not set 749# CONFIG_USB_SL811_HCD is not set
712# CONFIG_USB_R8A66597_HCD is not set 750# CONFIG_USB_R8A66597_HCD is not set
751# CONFIG_USB_HWA_HCD is not set
752# CONFIG_USB_MUSB_HDRC is not set
713 753
714# 754#
715# USB Device Class drivers 755# USB Device Class drivers
716# 756#
717# CONFIG_USB_ACM is not set 757# CONFIG_USB_ACM is not set
718# CONFIG_USB_PRINTER is not set 758# CONFIG_USB_PRINTER is not set
759# CONFIG_USB_WDM is not set
760# CONFIG_USB_TMC is not set
719 761
720# 762#
721# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 763# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -744,7 +786,6 @@ CONFIG_USB_STORAGE=y
744# 786#
745# CONFIG_USB_MDC800 is not set 787# CONFIG_USB_MDC800 is not set
746# CONFIG_USB_MICROTEK is not set 788# CONFIG_USB_MICROTEK is not set
747# CONFIG_USB_MON is not set
748 789
749# 790#
750# USB port drivers 791# USB port drivers
@@ -757,7 +798,7 @@ CONFIG_USB_STORAGE=y
757# CONFIG_USB_EMI62 is not set 798# CONFIG_USB_EMI62 is not set
758# CONFIG_USB_EMI26 is not set 799# CONFIG_USB_EMI26 is not set
759# CONFIG_USB_ADUTUX is not set 800# CONFIG_USB_ADUTUX is not set
760# CONFIG_USB_AUERSWALD is not set 801# CONFIG_USB_SEVSEG is not set
761# CONFIG_USB_RIO500 is not set 802# CONFIG_USB_RIO500 is not set
762# CONFIG_USB_LEGOTOWER is not set 803# CONFIG_USB_LEGOTOWER is not set
763# CONFIG_USB_LCD is not set 804# CONFIG_USB_LCD is not set
@@ -773,14 +814,19 @@ CONFIG_USB_STORAGE=y
773# CONFIG_USB_TRANCEVIBRATOR is not set 814# CONFIG_USB_TRANCEVIBRATOR is not set
774# CONFIG_USB_IOWARRIOR is not set 815# CONFIG_USB_IOWARRIOR is not set
775# CONFIG_USB_TEST is not set 816# CONFIG_USB_TEST is not set
817# CONFIG_USB_ISIGHTFW is not set
818# CONFIG_USB_VST is not set
776# CONFIG_USB_GADGET is not set 819# CONFIG_USB_GADGET is not set
777# CONFIG_MMC is not set 820# CONFIG_MMC is not set
778# CONFIG_MEMSTICK is not set 821# CONFIG_MEMSTICK is not set
779# CONFIG_NEW_LEDS is not set 822# CONFIG_NEW_LEDS is not set
823# CONFIG_ACCESSIBILITY is not set
780# CONFIG_EDAC is not set 824# CONFIG_EDAC is not set
781# CONFIG_RTC_CLASS is not set 825# CONFIG_RTC_CLASS is not set
782# CONFIG_DMADEVICES is not set 826# CONFIG_DMADEVICES is not set
783# CONFIG_UIO is not set 827# CONFIG_UIO is not set
828# CONFIG_STAGING is not set
829CONFIG_STAGING_EXCLUDE_BUILD=y
784 830
785# 831#
786# File systems 832# File systems
@@ -792,12 +838,13 @@ CONFIG_EXT3_FS=y
792CONFIG_EXT3_FS_XATTR=y 838CONFIG_EXT3_FS_XATTR=y
793# CONFIG_EXT3_FS_POSIX_ACL is not set 839# CONFIG_EXT3_FS_POSIX_ACL is not set
794# CONFIG_EXT3_FS_SECURITY is not set 840# CONFIG_EXT3_FS_SECURITY is not set
795# CONFIG_EXT4DEV_FS is not set 841# CONFIG_EXT4_FS is not set
796CONFIG_JBD=y 842CONFIG_JBD=y
797CONFIG_FS_MBCACHE=y 843CONFIG_FS_MBCACHE=y
798# CONFIG_REISERFS_FS is not set 844# CONFIG_REISERFS_FS is not set
799# CONFIG_JFS_FS is not set 845# CONFIG_JFS_FS is not set
800# CONFIG_FS_POSIX_ACL is not set 846# CONFIG_FS_POSIX_ACL is not set
847CONFIG_FILE_LOCKING=y
801# CONFIG_XFS_FS is not set 848# CONFIG_XFS_FS is not set
802# CONFIG_OCFS2_FS is not set 849# CONFIG_OCFS2_FS is not set
803CONFIG_DNOTIFY=y 850CONFIG_DNOTIFY=y
@@ -830,6 +877,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
830CONFIG_PROC_FS=y 877CONFIG_PROC_FS=y
831CONFIG_PROC_KCORE=y 878CONFIG_PROC_KCORE=y
832CONFIG_PROC_SYSCTL=y 879CONFIG_PROC_SYSCTL=y
880CONFIG_PROC_PAGE_MONITOR=y
833CONFIG_SYSFS=y 881CONFIG_SYSFS=y
834CONFIG_TMPFS=y 882CONFIG_TMPFS=y
835# CONFIG_TMPFS_POSIX_ACL is not set 883# CONFIG_TMPFS_POSIX_ACL is not set
@@ -860,6 +908,7 @@ CONFIG_JFFS2_RTIME=y
860CONFIG_CRAMFS=y 908CONFIG_CRAMFS=y
861# CONFIG_VXFS_FS is not set 909# CONFIG_VXFS_FS is not set
862# CONFIG_MINIX_FS is not set 910# CONFIG_MINIX_FS is not set
911# CONFIG_OMFS_FS is not set
863# CONFIG_HPFS_FS is not set 912# CONFIG_HPFS_FS is not set
864# CONFIG_QNX4FS_FS is not set 913# CONFIG_QNX4FS_FS is not set
865# CONFIG_ROMFS_FS is not set 914# CONFIG_ROMFS_FS is not set
@@ -870,14 +919,14 @@ CONFIG_NFS_FS=y
870CONFIG_NFS_V3=y 919CONFIG_NFS_V3=y
871# CONFIG_NFS_V3_ACL is not set 920# CONFIG_NFS_V3_ACL is not set
872CONFIG_NFS_V4=y 921CONFIG_NFS_V4=y
873# CONFIG_NFSD is not set
874CONFIG_ROOT_NFS=y 922CONFIG_ROOT_NFS=y
923# CONFIG_NFSD is not set
875CONFIG_LOCKD=y 924CONFIG_LOCKD=y
876CONFIG_LOCKD_V4=y 925CONFIG_LOCKD_V4=y
877CONFIG_NFS_COMMON=y 926CONFIG_NFS_COMMON=y
878CONFIG_SUNRPC=y 927CONFIG_SUNRPC=y
879CONFIG_SUNRPC_GSS=y 928CONFIG_SUNRPC_GSS=y
880# CONFIG_SUNRPC_BIND34 is not set 929# CONFIG_SUNRPC_REGISTER_V4 is not set
881CONFIG_RPCSEC_GSS_KRB5=y 930CONFIG_RPCSEC_GSS_KRB5=y
882# CONFIG_RPCSEC_GSS_SPKM3 is not set 931# CONFIG_RPCSEC_GSS_SPKM3 is not set
883# CONFIG_SMB_FS is not set 932# CONFIG_SMB_FS is not set
@@ -953,9 +1002,9 @@ CONFIG_NLS_ISO8859_1=y
953# Library routines 1002# Library routines
954# 1003#
955CONFIG_BITREVERSE=y 1004CONFIG_BITREVERSE=y
956# CONFIG_GENERIC_FIND_FIRST_BIT is not set
957# CONFIG_CRC_CCITT is not set 1005# CONFIG_CRC_CCITT is not set
958# CONFIG_CRC16 is not set 1006# CONFIG_CRC16 is not set
1007# CONFIG_CRC_T10DIF is not set
959# CONFIG_CRC_ITU_T is not set 1008# CONFIG_CRC_ITU_T is not set
960CONFIG_CRC32=y 1009CONFIG_CRC32=y
961# CONFIG_CRC7 is not set 1010# CONFIG_CRC7 is not set
@@ -982,9 +1031,12 @@ CONFIG_FRAME_WARN=1024
982CONFIG_DEBUG_KERNEL=y 1031CONFIG_DEBUG_KERNEL=y
983# CONFIG_DEBUG_SHIRQ is not set 1032# CONFIG_DEBUG_SHIRQ is not set
984CONFIG_DETECT_SOFTLOCKUP=y 1033CONFIG_DETECT_SOFTLOCKUP=y
1034# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1035CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
985CONFIG_SCHED_DEBUG=y 1036CONFIG_SCHED_DEBUG=y
986# CONFIG_SCHEDSTATS is not set 1037# CONFIG_SCHEDSTATS is not set
987# CONFIG_TIMER_STATS is not set 1038# CONFIG_TIMER_STATS is not set
1039# CONFIG_DEBUG_OBJECTS is not set
988# CONFIG_SLUB_DEBUG_ON is not set 1040# CONFIG_SLUB_DEBUG_ON is not set
989# CONFIG_SLUB_STATS is not set 1041# CONFIG_SLUB_STATS is not set
990# CONFIG_DEBUG_RT_MUTEXES is not set 1042# CONFIG_DEBUG_RT_MUTEXES is not set
@@ -998,16 +1050,37 @@ CONFIG_SCHED_DEBUG=y
998# CONFIG_DEBUG_INFO is not set 1050# CONFIG_DEBUG_INFO is not set
999# CONFIG_DEBUG_VM is not set 1051# CONFIG_DEBUG_VM is not set
1000# CONFIG_DEBUG_WRITECOUNT is not set 1052# CONFIG_DEBUG_WRITECOUNT is not set
1053# CONFIG_DEBUG_MEMORY_INIT is not set
1001# CONFIG_DEBUG_LIST is not set 1054# CONFIG_DEBUG_LIST is not set
1002# CONFIG_DEBUG_SG is not set 1055# CONFIG_DEBUG_SG is not set
1003# CONFIG_BOOT_PRINTK_DELAY is not set 1056# CONFIG_BOOT_PRINTK_DELAY is not set
1057# CONFIG_RCU_TORTURE_TEST is not set
1058# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1004# CONFIG_BACKTRACE_SELF_TEST is not set 1059# CONFIG_BACKTRACE_SELF_TEST is not set
1060# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1005# CONFIG_FAULT_INJECTION is not set 1061# CONFIG_FAULT_INJECTION is not set
1062# CONFIG_LATENCYTOP is not set
1063CONFIG_HAVE_FUNCTION_TRACER=y
1064
1065#
1066# Tracers
1067#
1068# CONFIG_FUNCTION_TRACER is not set
1069# CONFIG_SCHED_TRACER is not set
1070# CONFIG_CONTEXT_SWITCH_TRACER is not set
1071# CONFIG_BOOT_TRACER is not set
1072# CONFIG_STACK_TRACER is not set
1073# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1006# CONFIG_SAMPLES is not set 1074# CONFIG_SAMPLES is not set
1075CONFIG_HAVE_ARCH_KGDB=y
1076# CONFIG_KGDB is not set
1007# CONFIG_DEBUG_STACKOVERFLOW is not set 1077# CONFIG_DEBUG_STACKOVERFLOW is not set
1008# CONFIG_DEBUG_STACK_USAGE is not set 1078# CONFIG_DEBUG_STACK_USAGE is not set
1009# CONFIG_DEBUG_PAGEALLOC is not set 1079# CONFIG_DEBUG_PAGEALLOC is not set
1010# CONFIG_DEBUGGER is not set 1080# CONFIG_CODE_PATCHING_SELFTEST is not set
1081# CONFIG_FTR_FIXUP_SELFTEST is not set
1082# CONFIG_MSI_BITMAP_SELFTEST is not set
1083# CONFIG_XMON is not set
1011# CONFIG_IRQSTACKS is not set 1084# CONFIG_IRQSTACKS is not set
1012# CONFIG_BDI_SWITCH is not set 1085# CONFIG_BDI_SWITCH is not set
1013# CONFIG_BOOTX_TEXT is not set 1086# CONFIG_BOOTX_TEXT is not set
@@ -1018,14 +1091,19 @@ CONFIG_SCHED_DEBUG=y
1018# 1091#
1019# CONFIG_KEYS is not set 1092# CONFIG_KEYS is not set
1020# CONFIG_SECURITY is not set 1093# CONFIG_SECURITY is not set
1094# CONFIG_SECURITYFS is not set
1021# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1095# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1022CONFIG_CRYPTO=y 1096CONFIG_CRYPTO=y
1023 1097
1024# 1098#
1025# Crypto core or helper 1099# Crypto core or helper
1026# 1100#
1101# CONFIG_CRYPTO_FIPS is not set
1027CONFIG_CRYPTO_ALGAPI=y 1102CONFIG_CRYPTO_ALGAPI=y
1103CONFIG_CRYPTO_AEAD=y
1028CONFIG_CRYPTO_BLKCIPHER=y 1104CONFIG_CRYPTO_BLKCIPHER=y
1105CONFIG_CRYPTO_HASH=y
1106CONFIG_CRYPTO_RNG=y
1029CONFIG_CRYPTO_MANAGER=y 1107CONFIG_CRYPTO_MANAGER=y
1030# CONFIG_CRYPTO_GF128MUL is not set 1108# CONFIG_CRYPTO_GF128MUL is not set
1031# CONFIG_CRYPTO_NULL is not set 1109# CONFIG_CRYPTO_NULL is not set
@@ -1063,6 +1141,10 @@ CONFIG_CRYPTO_PCBC=y
1063# CONFIG_CRYPTO_MD4 is not set 1141# CONFIG_CRYPTO_MD4 is not set
1064CONFIG_CRYPTO_MD5=y 1142CONFIG_CRYPTO_MD5=y
1065# CONFIG_CRYPTO_MICHAEL_MIC is not set 1143# CONFIG_CRYPTO_MICHAEL_MIC is not set
1144# CONFIG_CRYPTO_RMD128 is not set
1145# CONFIG_CRYPTO_RMD160 is not set
1146# CONFIG_CRYPTO_RMD256 is not set
1147# CONFIG_CRYPTO_RMD320 is not set
1066# CONFIG_CRYPTO_SHA1 is not set 1148# CONFIG_CRYPTO_SHA1 is not set
1067# CONFIG_CRYPTO_SHA256 is not set 1149# CONFIG_CRYPTO_SHA256 is not set
1068# CONFIG_CRYPTO_SHA512 is not set 1150# CONFIG_CRYPTO_SHA512 is not set
@@ -1093,6 +1175,11 @@ CONFIG_CRYPTO_DES=y
1093# 1175#
1094# CONFIG_CRYPTO_DEFLATE is not set 1176# CONFIG_CRYPTO_DEFLATE is not set
1095# CONFIG_CRYPTO_LZO is not set 1177# CONFIG_CRYPTO_LZO is not set
1178
1179#
1180# Random Number Generation
1181#
1182# CONFIG_CRYPTO_ANSI_CPRNG is not set
1096CONFIG_CRYPTO_HW=y 1183CONFIG_CRYPTO_HW=y
1097CONFIG_PPC_CLOCK=y 1184CONFIG_PPC_CLOCK=y
1098CONFIG_PPC_LIB_RHEAP=y 1185CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/52xx/lite5200b_defconfig b/arch/powerpc/configs/52xx/lite5200b_defconfig
index 1a8a250fa11b..5b969f9c925e 100644
--- a/arch/powerpc/configs/52xx/lite5200b_defconfig
+++ b/arch/powerpc/configs/52xx/lite5200b_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.25 3# Linux kernel version: 2.6.28-rc4
4# Tue Apr 29 07:12:56 2008 4# Thu Nov 13 02:10:16 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
34CONFIG_STACKTRACE_SUPPORT=y 34CONFIG_STACKTRACE_SUPPORT=y
35CONFIG_HAVE_LATENCYTOP_SUPPORT=y
35CONFIG_LOCKDEP_SUPPORT=y 36CONFIG_LOCKDEP_SUPPORT=y
36CONFIG_RWSEM_XCHGADD_ALGORITHM=y 37CONFIG_RWSEM_XCHGADD_ALGORITHM=y
37CONFIG_ARCH_HAS_ILOG2_U32=y 38CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -103,7 +104,9 @@ CONFIG_SIGNALFD=y
103CONFIG_TIMERFD=y 104CONFIG_TIMERFD=y
104CONFIG_EVENTFD=y 105CONFIG_EVENTFD=y
105CONFIG_SHMEM=y 106CONFIG_SHMEM=y
107CONFIG_AIO=y
106CONFIG_VM_EVENT_COUNTERS=y 108CONFIG_VM_EVENT_COUNTERS=y
109CONFIG_PCI_QUIRKS=y
107CONFIG_SLUB_DEBUG=y 110CONFIG_SLUB_DEBUG=y
108# CONFIG_SLAB is not set 111# CONFIG_SLAB is not set
109CONFIG_SLUB=y 112CONFIG_SLUB=y
@@ -111,24 +114,30 @@ CONFIG_SLUB=y
111# CONFIG_PROFILING is not set 114# CONFIG_PROFILING is not set
112# CONFIG_MARKERS is not set 115# CONFIG_MARKERS is not set
113CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
118CONFIG_HAVE_IOREMAP_PROT=y
114CONFIG_HAVE_KPROBES=y 119CONFIG_HAVE_KPROBES=y
115CONFIG_HAVE_KRETPROBES=y 120CONFIG_HAVE_KRETPROBES=y
116CONFIG_PROC_PAGE_MONITOR=y 121CONFIG_HAVE_ARCH_TRACEHOOK=y
122CONFIG_HAVE_CLK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
117CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
118CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
119# CONFIG_TINY_SHMEM is not set 126# CONFIG_TINY_SHMEM is not set
120CONFIG_BASE_SMALL=0 127CONFIG_BASE_SMALL=0
121CONFIG_MODULES=y 128CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set
122CONFIG_MODULE_UNLOAD=y 130CONFIG_MODULE_UNLOAD=y
123# CONFIG_MODULE_FORCE_UNLOAD is not set 131# CONFIG_MODULE_FORCE_UNLOAD is not set
124# CONFIG_MODVERSIONS is not set 132# CONFIG_MODVERSIONS is not set
125# CONFIG_MODULE_SRCVERSION_ALL is not set 133# CONFIG_MODULE_SRCVERSION_ALL is not set
126# CONFIG_KMOD is not set 134CONFIG_KMOD=y
127CONFIG_BLOCK=y 135CONFIG_BLOCK=y
128# CONFIG_LBD is not set 136# CONFIG_LBD is not set
129# CONFIG_BLK_DEV_IO_TRACE is not set 137# CONFIG_BLK_DEV_IO_TRACE is not set
130# CONFIG_LSF is not set 138# CONFIG_LSF is not set
131# CONFIG_BLK_DEV_BSG is not set 139# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set
132 141
133# 142#
134# IO Schedulers 143# IO Schedulers
@@ -143,19 +152,16 @@ CONFIG_DEFAULT_AS=y
143# CONFIG_DEFAULT_NOOP is not set 152# CONFIG_DEFAULT_NOOP is not set
144CONFIG_DEFAULT_IOSCHED="anticipatory" 153CONFIG_DEFAULT_IOSCHED="anticipatory"
145CONFIG_CLASSIC_RCU=y 154CONFIG_CLASSIC_RCU=y
155CONFIG_FREEZER=y
146 156
147# 157#
148# Platform support 158# Platform support
149# 159#
150CONFIG_PPC_MULTIPLATFORM=y 160CONFIG_PPC_MULTIPLATFORM=y
151# CONFIG_PPC_82xx is not set
152# CONFIG_PPC_83xx is not set
153# CONFIG_PPC_86xx is not set
154CONFIG_CLASSIC32=y 161CONFIG_CLASSIC32=y
155# CONFIG_PPC_CHRP is not set 162# CONFIG_PPC_CHRP is not set
156# CONFIG_PPC_MPC512x is not set
157# CONFIG_PPC_MPC5121 is not set
158# CONFIG_MPC5121_ADS is not set 163# CONFIG_MPC5121_ADS is not set
164# CONFIG_MPC5121_GENERIC is not set
159CONFIG_PPC_MPC52xx=y 165CONFIG_PPC_MPC52xx=y
160CONFIG_PPC_MPC5200_SIMPLE=y 166CONFIG_PPC_MPC5200_SIMPLE=y
161# CONFIG_PPC_EFIKA is not set 167# CONFIG_PPC_EFIKA is not set
@@ -165,7 +171,10 @@ CONFIG_PPC_LITE5200=y
165# CONFIG_PPC_PMAC is not set 171# CONFIG_PPC_PMAC is not set
166# CONFIG_PPC_CELL is not set 172# CONFIG_PPC_CELL is not set
167# CONFIG_PPC_CELL_NATIVE is not set 173# CONFIG_PPC_CELL_NATIVE is not set
174# CONFIG_PPC_82xx is not set
168# CONFIG_PQ2ADS is not set 175# CONFIG_PQ2ADS is not set
176# CONFIG_PPC_83xx is not set
177# CONFIG_PPC_86xx is not set
169# CONFIG_EMBEDDED6xx is not set 178# CONFIG_EMBEDDED6xx is not set
170# CONFIG_IPIC is not set 179# CONFIG_IPIC is not set
171# CONFIG_MPIC is not set 180# CONFIG_MPIC is not set
@@ -198,11 +207,13 @@ CONFIG_HZ_250=y
198# CONFIG_HZ_300 is not set 207# CONFIG_HZ_300 is not set
199# CONFIG_HZ_1000 is not set 208# CONFIG_HZ_1000 is not set
200CONFIG_HZ=250 209CONFIG_HZ=250
201# CONFIG_SCHED_HRTICK is not set 210CONFIG_SCHED_HRTICK=y
202CONFIG_PREEMPT_NONE=y 211CONFIG_PREEMPT_NONE=y
203# CONFIG_PREEMPT_VOLUNTARY is not set 212# CONFIG_PREEMPT_VOLUNTARY is not set
204# CONFIG_PREEMPT is not set 213# CONFIG_PREEMPT is not set
205CONFIG_BINFMT_ELF=y 214CONFIG_BINFMT_ELF=y
215# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
216# CONFIG_HAVE_AOUT is not set
206# CONFIG_BINFMT_MISC is not set 217# CONFIG_BINFMT_MISC is not set
207# CONFIG_IOMMU_HELPER is not set 218# CONFIG_IOMMU_HELPER is not set
208CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 219CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -217,19 +228,20 @@ CONFIG_FLATMEM_MANUAL=y
217# CONFIG_SPARSEMEM_MANUAL is not set 228# CONFIG_SPARSEMEM_MANUAL is not set
218CONFIG_FLATMEM=y 229CONFIG_FLATMEM=y
219CONFIG_FLAT_NODE_MEM_MAP=y 230CONFIG_FLAT_NODE_MEM_MAP=y
220# CONFIG_SPARSEMEM_STATIC is not set
221# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
222CONFIG_PAGEFLAGS_EXTENDED=y 231CONFIG_PAGEFLAGS_EXTENDED=y
223CONFIG_SPLIT_PTLOCK_CPUS=4 232CONFIG_SPLIT_PTLOCK_CPUS=4
233CONFIG_MIGRATION=y
224# CONFIG_RESOURCES_64BIT is not set 234# CONFIG_RESOURCES_64BIT is not set
235# CONFIG_PHYS_ADDR_T_64BIT is not set
225CONFIG_ZONE_DMA_FLAG=1 236CONFIG_ZONE_DMA_FLAG=1
226CONFIG_BOUNCE=y 237CONFIG_BOUNCE=y
227CONFIG_VIRT_TO_BUS=y 238CONFIG_VIRT_TO_BUS=y
239CONFIG_UNEVICTABLE_LRU=y
228CONFIG_FORCE_MAX_ZONEORDER=11 240CONFIG_FORCE_MAX_ZONEORDER=11
229CONFIG_PROC_DEVICETREE=y 241CONFIG_PROC_DEVICETREE=y
230# CONFIG_CMDLINE_BOOL is not set 242# CONFIG_CMDLINE_BOOL is not set
243CONFIG_EXTRA_TARGETS=""
231CONFIG_PM=y 244CONFIG_PM=y
232# CONFIG_PM_LEGACY is not set
233# CONFIG_PM_DEBUG is not set 245# CONFIG_PM_DEBUG is not set
234CONFIG_PM_SLEEP=y 246CONFIG_PM_SLEEP=y
235CONFIG_SUSPEND=y 247CONFIG_SUSPEND=y
@@ -243,7 +255,7 @@ CONFIG_ISA_DMA_API=y
243CONFIG_ZONE_DMA=y 255CONFIG_ZONE_DMA=y
244CONFIG_GENERIC_ISA_DMA=y 256CONFIG_GENERIC_ISA_DMA=y
245# CONFIG_PPC_INDIRECT_PCI is not set 257# CONFIG_PPC_INDIRECT_PCI is not set
246CONFIG_FSL_SOC=y 258CONFIG_PPC_PCI_CHOICE=y
247CONFIG_PCI=y 259CONFIG_PCI=y
248CONFIG_PCI_DOMAINS=y 260CONFIG_PCI_DOMAINS=y
249CONFIG_PCI_SYSCALL=y 261CONFIG_PCI_SYSCALL=y
@@ -269,10 +281,6 @@ CONFIG_PAGE_OFFSET=0xc0000000
269CONFIG_KERNEL_START=0xc0000000 281CONFIG_KERNEL_START=0xc0000000
270CONFIG_PHYSICAL_START=0x00000000 282CONFIG_PHYSICAL_START=0x00000000
271CONFIG_TASK_SIZE=0xc0000000 283CONFIG_TASK_SIZE=0xc0000000
272
273#
274# Networking
275#
276CONFIG_NET=y 284CONFIG_NET=y
277 285
278# 286#
@@ -323,6 +331,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
323# CONFIG_TIPC is not set 331# CONFIG_TIPC is not set
324# CONFIG_ATM is not set 332# CONFIG_ATM is not set
325# CONFIG_BRIDGE is not set 333# CONFIG_BRIDGE is not set
334# CONFIG_NET_DSA is not set
326# CONFIG_VLAN_8021Q is not set 335# CONFIG_VLAN_8021Q is not set
327# CONFIG_DECNET is not set 336# CONFIG_DECNET is not set
328# CONFIG_LLC2 is not set 337# CONFIG_LLC2 is not set
@@ -343,14 +352,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
343# CONFIG_IRDA is not set 352# CONFIG_IRDA is not set
344# CONFIG_BT is not set 353# CONFIG_BT is not set
345# CONFIG_AF_RXRPC is not set 354# CONFIG_AF_RXRPC is not set
346 355# CONFIG_PHONET is not set
347# 356# CONFIG_WIRELESS is not set
348# Wireless
349#
350# CONFIG_CFG80211 is not set
351# CONFIG_WIRELESS_EXT is not set
352# CONFIG_MAC80211 is not set
353# CONFIG_IEEE80211 is not set
354# CONFIG_RFKILL is not set 357# CONFIG_RFKILL is not set
355# CONFIG_NET_9P is not set 358# CONFIG_NET_9P is not set
356 359
@@ -390,12 +393,16 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
390# CONFIG_BLK_DEV_XIP is not set 393# CONFIG_BLK_DEV_XIP is not set
391# CONFIG_CDROM_PKTCDVD is not set 394# CONFIG_CDROM_PKTCDVD is not set
392# CONFIG_ATA_OVER_ETH is not set 395# CONFIG_ATA_OVER_ETH is not set
396# CONFIG_BLK_DEV_HD is not set
393CONFIG_MISC_DEVICES=y 397CONFIG_MISC_DEVICES=y
394# CONFIG_PHANTOM is not set 398# CONFIG_PHANTOM is not set
395# CONFIG_EEPROM_93CX6 is not set 399# CONFIG_EEPROM_93CX6 is not set
396# CONFIG_SGI_IOC4 is not set 400# CONFIG_SGI_IOC4 is not set
397# CONFIG_TIFM_CORE is not set 401# CONFIG_TIFM_CORE is not set
402# CONFIG_ICS932S401 is not set
398# CONFIG_ENCLOSURE_SERVICES is not set 403# CONFIG_ENCLOSURE_SERVICES is not set
404# CONFIG_HP_ILO is not set
405# CONFIG_C2PORT is not set
399CONFIG_HAVE_IDE=y 406CONFIG_HAVE_IDE=y
400# CONFIG_IDE is not set 407# CONFIG_IDE is not set
401 408
@@ -412,7 +419,7 @@ CONFIG_SCSI_DMA=y
412# 419#
413# SCSI support type (disk, tape, CD-ROM) 420# SCSI support type (disk, tape, CD-ROM)
414# 421#
415# CONFIG_BLK_DEV_SD is not set 422CONFIG_BLK_DEV_SD=y
416# CONFIG_CHR_DEV_ST is not set 423# CONFIG_CHR_DEV_ST is not set
417# CONFIG_CHR_DEV_OSST is not set 424# CONFIG_CHR_DEV_OSST is not set
418# CONFIG_BLK_DEV_SR is not set 425# CONFIG_BLK_DEV_SR is not set
@@ -474,12 +481,12 @@ CONFIG_SCSI_LOWLEVEL=y
474# CONFIG_SCSI_NSP32 is not set 481# CONFIG_SCSI_NSP32 is not set
475# CONFIG_SCSI_DEBUG is not set 482# CONFIG_SCSI_DEBUG is not set
476# CONFIG_SCSI_SRP is not set 483# CONFIG_SCSI_SRP is not set
484# CONFIG_SCSI_DH is not set
477CONFIG_ATA=y 485CONFIG_ATA=y
478# CONFIG_ATA_NONSTANDARD is not set 486# CONFIG_ATA_NONSTANDARD is not set
479CONFIG_SATA_PMP=y 487CONFIG_SATA_PMP=y
480# CONFIG_SATA_AHCI is not set 488# CONFIG_SATA_AHCI is not set
481# CONFIG_SATA_SIL24 is not set 489# CONFIG_SATA_SIL24 is not set
482# CONFIG_SATA_FSL is not set
483CONFIG_ATA_SFF=y 490CONFIG_ATA_SFF=y
484# CONFIG_SATA_SVW is not set 491# CONFIG_SATA_SVW is not set
485# CONFIG_ATA_PIIX is not set 492# CONFIG_ATA_PIIX is not set
@@ -535,18 +542,22 @@ CONFIG_PATA_MPC52xx=y
535# CONFIG_PATA_VIA is not set 542# CONFIG_PATA_VIA is not set
536# CONFIG_PATA_WINBOND is not set 543# CONFIG_PATA_WINBOND is not set
537# CONFIG_PATA_PLATFORM is not set 544# CONFIG_PATA_PLATFORM is not set
545# CONFIG_PATA_SCH is not set
538# CONFIG_MD is not set 546# CONFIG_MD is not set
539# CONFIG_FUSION is not set 547# CONFIG_FUSION is not set
540 548
541# 549#
542# IEEE 1394 (FireWire) support 550# IEEE 1394 (FireWire) support
543# 551#
552
553#
554# Enable only one of the two stacks, unless you know what you are doing
555#
544# CONFIG_FIREWIRE is not set 556# CONFIG_FIREWIRE is not set
545# CONFIG_IEEE1394 is not set 557# CONFIG_IEEE1394 is not set
546# CONFIG_I2O is not set 558# CONFIG_I2O is not set
547# CONFIG_MACINTOSH_DRIVERS is not set 559# CONFIG_MACINTOSH_DRIVERS is not set
548CONFIG_NETDEVICES=y 560CONFIG_NETDEVICES=y
549# CONFIG_NETDEVICES_MULTIQUEUE is not set
550# CONFIG_DUMMY is not set 561# CONFIG_DUMMY is not set
551# CONFIG_BONDING is not set 562# CONFIG_BONDING is not set
552# CONFIG_MACVLAN is not set 563# CONFIG_MACVLAN is not set
@@ -583,16 +594,19 @@ CONFIG_NET_ETHERNET=y
583# CONFIG_IBM_NEW_EMAC_RGMII is not set 594# CONFIG_IBM_NEW_EMAC_RGMII is not set
584# CONFIG_IBM_NEW_EMAC_TAH is not set 595# CONFIG_IBM_NEW_EMAC_TAH is not set
585# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 596# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
597# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
598# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
599# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
586# CONFIG_NET_PCI is not set 600# CONFIG_NET_PCI is not set
587# CONFIG_B44 is not set 601# CONFIG_B44 is not set
588CONFIG_FEC_MPC52xx=y 602CONFIG_FEC_MPC52xx=y
589CONFIG_FEC_MPC52xx_MDIO=y 603CONFIG_FEC_MPC52xx_MDIO=y
604# CONFIG_ATL2 is not set
590CONFIG_NETDEV_1000=y 605CONFIG_NETDEV_1000=y
591# CONFIG_ACENIC is not set 606# CONFIG_ACENIC is not set
592# CONFIG_DL2K is not set 607# CONFIG_DL2K is not set
593# CONFIG_E1000 is not set 608# CONFIG_E1000 is not set
594# CONFIG_E1000E is not set 609# CONFIG_E1000E is not set
595# CONFIG_E1000E_ENABLED is not set
596# CONFIG_IP1000 is not set 610# CONFIG_IP1000 is not set
597# CONFIG_IGB is not set 611# CONFIG_IGB is not set
598# CONFIG_NS83820 is not set 612# CONFIG_NS83820 is not set
@@ -605,22 +619,27 @@ CONFIG_NETDEV_1000=y
605# CONFIG_VIA_VELOCITY is not set 619# CONFIG_VIA_VELOCITY is not set
606# CONFIG_TIGON3 is not set 620# CONFIG_TIGON3 is not set
607# CONFIG_BNX2 is not set 621# CONFIG_BNX2 is not set
608# CONFIG_GIANFAR is not set
609# CONFIG_MV643XX_ETH is not set 622# CONFIG_MV643XX_ETH is not set
610# CONFIG_QLA3XXX is not set 623# CONFIG_QLA3XXX is not set
611# CONFIG_ATL1 is not set 624# CONFIG_ATL1 is not set
625# CONFIG_ATL1E is not set
626# CONFIG_JME is not set
612CONFIG_NETDEV_10000=y 627CONFIG_NETDEV_10000=y
613# CONFIG_CHELSIO_T1 is not set 628# CONFIG_CHELSIO_T1 is not set
614# CONFIG_CHELSIO_T3 is not set 629# CONFIG_CHELSIO_T3 is not set
630# CONFIG_ENIC is not set
615# CONFIG_IXGBE is not set 631# CONFIG_IXGBE is not set
616# CONFIG_IXGB is not set 632# CONFIG_IXGB is not set
617# CONFIG_S2IO is not set 633# CONFIG_S2IO is not set
618# CONFIG_MYRI10GE is not set 634# CONFIG_MYRI10GE is not set
619# CONFIG_NETXEN_NIC is not set 635# CONFIG_NETXEN_NIC is not set
620# CONFIG_NIU is not set 636# CONFIG_NIU is not set
637# CONFIG_MLX4_EN is not set
621# CONFIG_MLX4_CORE is not set 638# CONFIG_MLX4_CORE is not set
622# CONFIG_TEHUTI is not set 639# CONFIG_TEHUTI is not set
623# CONFIG_BNX2X is not set 640# CONFIG_BNX2X is not set
641# CONFIG_QLGE is not set
642# CONFIG_SFC is not set
624# CONFIG_TR is not set 643# CONFIG_TR is not set
625 644
626# 645#
@@ -628,7 +647,6 @@ CONFIG_NETDEV_10000=y
628# 647#
629# CONFIG_WLAN_PRE80211 is not set 648# CONFIG_WLAN_PRE80211 is not set
630# CONFIG_WLAN_80211 is not set 649# CONFIG_WLAN_80211 is not set
631# CONFIG_IWLWIFI is not set
632# CONFIG_IWLWIFI_LEDS is not set 650# CONFIG_IWLWIFI_LEDS is not set
633# CONFIG_WAN is not set 651# CONFIG_WAN is not set
634# CONFIG_FDDI is not set 652# CONFIG_FDDI is not set
@@ -657,6 +675,7 @@ CONFIG_NETDEV_10000=y
657# Character devices 675# Character devices
658# 676#
659# CONFIG_VT is not set 677# CONFIG_VT is not set
678CONFIG_DEVKMEM=y
660# CONFIG_SERIAL_NONSTANDARD is not set 679# CONFIG_SERIAL_NONSTANDARD is not set
661# CONFIG_NOZOMI is not set 680# CONFIG_NOZOMI is not set
662 681
@@ -691,42 +710,63 @@ CONFIG_DEVPORT=y
691CONFIG_I2C=y 710CONFIG_I2C=y
692CONFIG_I2C_BOARDINFO=y 711CONFIG_I2C_BOARDINFO=y
693CONFIG_I2C_CHARDEV=y 712CONFIG_I2C_CHARDEV=y
713CONFIG_I2C_HELPER_AUTO=y
694 714
695# 715#
696# I2C Hardware Bus support 716# I2C Hardware Bus support
697# 717#
718
719#
720# PC SMBus host controller drivers
721#
698# CONFIG_I2C_ALI1535 is not set 722# CONFIG_I2C_ALI1535 is not set
699# CONFIG_I2C_ALI1563 is not set 723# CONFIG_I2C_ALI1563 is not set
700# CONFIG_I2C_ALI15X3 is not set 724# CONFIG_I2C_ALI15X3 is not set
701# CONFIG_I2C_AMD756 is not set 725# CONFIG_I2C_AMD756 is not set
702# CONFIG_I2C_AMD8111 is not set 726# CONFIG_I2C_AMD8111 is not set
703# CONFIG_I2C_I801 is not set 727# CONFIG_I2C_I801 is not set
704# CONFIG_I2C_I810 is not set 728# CONFIG_I2C_ISCH is not set
705# CONFIG_I2C_PIIX4 is not set 729# CONFIG_I2C_PIIX4 is not set
706CONFIG_I2C_MPC=y
707# CONFIG_I2C_NFORCE2 is not set 730# CONFIG_I2C_NFORCE2 is not set
708# CONFIG_I2C_OCORES is not set
709# CONFIG_I2C_PARPORT_LIGHT is not set
710# CONFIG_I2C_PROSAVAGE is not set
711# CONFIG_I2C_SAVAGE4 is not set
712# CONFIG_I2C_SIMTEC is not set
713# CONFIG_I2C_SIS5595 is not set 731# CONFIG_I2C_SIS5595 is not set
714# CONFIG_I2C_SIS630 is not set 732# CONFIG_I2C_SIS630 is not set
715# CONFIG_I2C_SIS96X is not set 733# CONFIG_I2C_SIS96X is not set
716# CONFIG_I2C_TAOS_EVM is not set
717# CONFIG_I2C_STUB is not set
718# CONFIG_I2C_VIA is not set 734# CONFIG_I2C_VIA is not set
719# CONFIG_I2C_VIAPRO is not set 735# CONFIG_I2C_VIAPRO is not set
736
737#
738# I2C system bus drivers (mostly embedded / system-on-chip)
739#
740CONFIG_I2C_MPC=y
741# CONFIG_I2C_OCORES is not set
742# CONFIG_I2C_SIMTEC is not set
743
744#
745# External I2C/SMBus adapter drivers
746#
747# CONFIG_I2C_PARPORT_LIGHT is not set
748# CONFIG_I2C_TAOS_EVM is not set
749
750#
751# Graphics adapter I2C/DDC channel drivers
752#
720# CONFIG_I2C_VOODOO3 is not set 753# CONFIG_I2C_VOODOO3 is not set
754
755#
756# Other I2C/SMBus bus drivers
757#
721# CONFIG_I2C_PCA_PLATFORM is not set 758# CONFIG_I2C_PCA_PLATFORM is not set
759# CONFIG_I2C_STUB is not set
722 760
723# 761#
724# Miscellaneous I2C Chip support 762# Miscellaneous I2C Chip support
725# 763#
726# CONFIG_DS1682 is not set 764# CONFIG_DS1682 is not set
765# CONFIG_AT24 is not set
727# CONFIG_SENSORS_EEPROM is not set 766# CONFIG_SENSORS_EEPROM is not set
728# CONFIG_SENSORS_PCF8574 is not set 767# CONFIG_SENSORS_PCF8574 is not set
729# CONFIG_PCF8575 is not set 768# CONFIG_PCF8575 is not set
769# CONFIG_SENSORS_PCA9539 is not set
730# CONFIG_SENSORS_PCF8591 is not set 770# CONFIG_SENSORS_PCF8591 is not set
731# CONFIG_SENSORS_MAX6875 is not set 771# CONFIG_SENSORS_MAX6875 is not set
732# CONFIG_SENSORS_TSL2550 is not set 772# CONFIG_SENSORS_TSL2550 is not set
@@ -735,29 +775,47 @@ CONFIG_I2C_MPC=y
735# CONFIG_I2C_DEBUG_BUS is not set 775# CONFIG_I2C_DEBUG_BUS is not set
736# CONFIG_I2C_DEBUG_CHIP is not set 776# CONFIG_I2C_DEBUG_CHIP is not set
737# CONFIG_SPI is not set 777# CONFIG_SPI is not set
778CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
779# CONFIG_GPIOLIB is not set
738# CONFIG_W1 is not set 780# CONFIG_W1 is not set
739# CONFIG_POWER_SUPPLY is not set 781# CONFIG_POWER_SUPPLY is not set
740# CONFIG_HWMON is not set 782# CONFIG_HWMON is not set
741# CONFIG_THERMAL is not set 783# CONFIG_THERMAL is not set
784# CONFIG_THERMAL_HWMON is not set
742# CONFIG_WATCHDOG is not set 785# CONFIG_WATCHDOG is not set
786CONFIG_SSB_POSSIBLE=y
743 787
744# 788#
745# Sonics Silicon Backplane 789# Sonics Silicon Backplane
746# 790#
747CONFIG_SSB_POSSIBLE=y
748# CONFIG_SSB is not set 791# CONFIG_SSB is not set
749 792
750# 793#
751# Multifunction device drivers 794# Multifunction device drivers
752# 795#
796# CONFIG_MFD_CORE is not set
753# CONFIG_MFD_SM501 is not set 797# CONFIG_MFD_SM501 is not set
754# CONFIG_HTC_PASIC3 is not set 798# CONFIG_HTC_PASIC3 is not set
799# CONFIG_MFD_TMIO is not set
800# CONFIG_PMIC_DA903X is not set
801# CONFIG_MFD_WM8400 is not set
802# CONFIG_MFD_WM8350_I2C is not set
803# CONFIG_REGULATOR is not set
755 804
756# 805#
757# Multimedia devices 806# Multimedia devices
758# 807#
808
809#
810# Multimedia core support
811#
759# CONFIG_VIDEO_DEV is not set 812# CONFIG_VIDEO_DEV is not set
760# CONFIG_DVB_CORE is not set 813# CONFIG_DVB_CORE is not set
814# CONFIG_VIDEO_MEDIA is not set
815
816#
817# Multimedia drivers
818#
761# CONFIG_DAB is not set 819# CONFIG_DAB is not set
762 820
763# 821#
@@ -774,10 +832,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
774# Display device support 832# Display device support
775# 833#
776# CONFIG_DISPLAY_SUPPORT is not set 834# CONFIG_DISPLAY_SUPPORT is not set
777
778#
779# Sound
780#
781# CONFIG_SOUND is not set 835# CONFIG_SOUND is not set
782CONFIG_USB_SUPPORT=y 836CONFIG_USB_SUPPORT=y
783CONFIG_USB_ARCH_HAS_HCD=y 837CONFIG_USB_ARCH_HAS_HCD=y
@@ -788,17 +842,25 @@ CONFIG_USB_ARCH_HAS_EHCI=y
788# CONFIG_USB_OTG_BLACKLIST_HUB is not set 842# CONFIG_USB_OTG_BLACKLIST_HUB is not set
789 843
790# 844#
845# Enable Host or Gadget support to see Inventra options
846#
847
848#
791# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 849# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
792# 850#
793# CONFIG_USB_GADGET is not set 851# CONFIG_USB_GADGET is not set
852# CONFIG_UWB is not set
794# CONFIG_MMC is not set 853# CONFIG_MMC is not set
795# CONFIG_MEMSTICK is not set 854# CONFIG_MEMSTICK is not set
796# CONFIG_NEW_LEDS is not set 855# CONFIG_NEW_LEDS is not set
856# CONFIG_ACCESSIBILITY is not set
797# CONFIG_INFINIBAND is not set 857# CONFIG_INFINIBAND is not set
798# CONFIG_EDAC is not set 858# CONFIG_EDAC is not set
799# CONFIG_RTC_CLASS is not set 859# CONFIG_RTC_CLASS is not set
800# CONFIG_DMADEVICES is not set 860# CONFIG_DMADEVICES is not set
801# CONFIG_UIO is not set 861# CONFIG_UIO is not set
862# CONFIG_STAGING is not set
863CONFIG_STAGING_EXCLUDE_BUILD=y
802 864
803# 865#
804# File systems 866# File systems
@@ -810,12 +872,13 @@ CONFIG_EXT3_FS=y
810CONFIG_EXT3_FS_XATTR=y 872CONFIG_EXT3_FS_XATTR=y
811# CONFIG_EXT3_FS_POSIX_ACL is not set 873# CONFIG_EXT3_FS_POSIX_ACL is not set
812# CONFIG_EXT3_FS_SECURITY is not set 874# CONFIG_EXT3_FS_SECURITY is not set
813# CONFIG_EXT4DEV_FS is not set 875# CONFIG_EXT4_FS is not set
814CONFIG_JBD=y 876CONFIG_JBD=y
815CONFIG_FS_MBCACHE=y 877CONFIG_FS_MBCACHE=y
816# CONFIG_REISERFS_FS is not set 878# CONFIG_REISERFS_FS is not set
817# CONFIG_JFS_FS is not set 879# CONFIG_JFS_FS is not set
818# CONFIG_FS_POSIX_ACL is not set 880# CONFIG_FS_POSIX_ACL is not set
881CONFIG_FILE_LOCKING=y
819# CONFIG_XFS_FS is not set 882# CONFIG_XFS_FS is not set
820# CONFIG_OCFS2_FS is not set 883# CONFIG_OCFS2_FS is not set
821CONFIG_DNOTIFY=y 884CONFIG_DNOTIFY=y
@@ -845,6 +908,7 @@ CONFIG_INOTIFY_USER=y
845CONFIG_PROC_FS=y 908CONFIG_PROC_FS=y
846CONFIG_PROC_KCORE=y 909CONFIG_PROC_KCORE=y
847CONFIG_PROC_SYSCTL=y 910CONFIG_PROC_SYSCTL=y
911CONFIG_PROC_PAGE_MONITOR=y
848CONFIG_SYSFS=y 912CONFIG_SYSFS=y
849CONFIG_TMPFS=y 913CONFIG_TMPFS=y
850# CONFIG_TMPFS_POSIX_ACL is not set 914# CONFIG_TMPFS_POSIX_ACL is not set
@@ -864,6 +928,7 @@ CONFIG_TMPFS=y
864# CONFIG_CRAMFS is not set 928# CONFIG_CRAMFS is not set
865# CONFIG_VXFS_FS is not set 929# CONFIG_VXFS_FS is not set
866# CONFIG_MINIX_FS is not set 930# CONFIG_MINIX_FS is not set
931# CONFIG_OMFS_FS is not set
867# CONFIG_HPFS_FS is not set 932# CONFIG_HPFS_FS is not set
868# CONFIG_QNX4FS_FS is not set 933# CONFIG_QNX4FS_FS is not set
869# CONFIG_ROMFS_FS is not set 934# CONFIG_ROMFS_FS is not set
@@ -874,14 +939,14 @@ CONFIG_NFS_FS=y
874CONFIG_NFS_V3=y 939CONFIG_NFS_V3=y
875# CONFIG_NFS_V3_ACL is not set 940# CONFIG_NFS_V3_ACL is not set
876CONFIG_NFS_V4=y 941CONFIG_NFS_V4=y
877# CONFIG_NFSD is not set
878CONFIG_ROOT_NFS=y 942CONFIG_ROOT_NFS=y
943# CONFIG_NFSD is not set
879CONFIG_LOCKD=y 944CONFIG_LOCKD=y
880CONFIG_LOCKD_V4=y 945CONFIG_LOCKD_V4=y
881CONFIG_NFS_COMMON=y 946CONFIG_NFS_COMMON=y
882CONFIG_SUNRPC=y 947CONFIG_SUNRPC=y
883CONFIG_SUNRPC_GSS=y 948CONFIG_SUNRPC_GSS=y
884# CONFIG_SUNRPC_BIND34 is not set 949# CONFIG_SUNRPC_REGISTER_V4 is not set
885CONFIG_RPCSEC_GSS_KRB5=y 950CONFIG_RPCSEC_GSS_KRB5=y
886# CONFIG_RPCSEC_GSS_SPKM3 is not set 951# CONFIG_RPCSEC_GSS_SPKM3 is not set
887# CONFIG_SMB_FS is not set 952# CONFIG_SMB_FS is not set
@@ -902,9 +967,9 @@ CONFIG_MSDOS_PARTITION=y
902# Library routines 967# Library routines
903# 968#
904CONFIG_BITREVERSE=y 969CONFIG_BITREVERSE=y
905# CONFIG_GENERIC_FIND_FIRST_BIT is not set
906# CONFIG_CRC_CCITT is not set 970# CONFIG_CRC_CCITT is not set
907# CONFIG_CRC16 is not set 971# CONFIG_CRC16 is not set
972# CONFIG_CRC_T10DIF is not set
908# CONFIG_CRC_ITU_T is not set 973# CONFIG_CRC_ITU_T is not set
909CONFIG_CRC32=y 974CONFIG_CRC32=y
910# CONFIG_CRC7 is not set 975# CONFIG_CRC7 is not set
@@ -929,9 +994,12 @@ CONFIG_FRAME_WARN=1024
929CONFIG_DEBUG_KERNEL=y 994CONFIG_DEBUG_KERNEL=y
930# CONFIG_DEBUG_SHIRQ is not set 995# CONFIG_DEBUG_SHIRQ is not set
931CONFIG_DETECT_SOFTLOCKUP=y 996CONFIG_DETECT_SOFTLOCKUP=y
997# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
998CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
932CONFIG_SCHED_DEBUG=y 999CONFIG_SCHED_DEBUG=y
933# CONFIG_SCHEDSTATS is not set 1000# CONFIG_SCHEDSTATS is not set
934# CONFIG_TIMER_STATS is not set 1001# CONFIG_TIMER_STATS is not set
1002# CONFIG_DEBUG_OBJECTS is not set
935# CONFIG_SLUB_DEBUG_ON is not set 1003# CONFIG_SLUB_DEBUG_ON is not set
936# CONFIG_SLUB_STATS is not set 1004# CONFIG_SLUB_STATS is not set
937# CONFIG_DEBUG_RT_MUTEXES is not set 1005# CONFIG_DEBUG_RT_MUTEXES is not set
@@ -945,17 +1013,37 @@ CONFIG_SCHED_DEBUG=y
945CONFIG_DEBUG_INFO=y 1013CONFIG_DEBUG_INFO=y
946# CONFIG_DEBUG_VM is not set 1014# CONFIG_DEBUG_VM is not set
947# CONFIG_DEBUG_WRITECOUNT is not set 1015# CONFIG_DEBUG_WRITECOUNT is not set
1016# CONFIG_DEBUG_MEMORY_INIT is not set
948# CONFIG_DEBUG_LIST is not set 1017# CONFIG_DEBUG_LIST is not set
949# CONFIG_DEBUG_SG is not set 1018# CONFIG_DEBUG_SG is not set
950# CONFIG_BOOT_PRINTK_DELAY is not set 1019# CONFIG_BOOT_PRINTK_DELAY is not set
951# CONFIG_RCU_TORTURE_TEST is not set 1020# CONFIG_RCU_TORTURE_TEST is not set
1021# CONFIG_RCU_CPU_STALL_DETECTOR is not set
952# CONFIG_BACKTRACE_SELF_TEST is not set 1022# CONFIG_BACKTRACE_SELF_TEST is not set
1023# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
953# CONFIG_FAULT_INJECTION is not set 1024# CONFIG_FAULT_INJECTION is not set
1025# CONFIG_LATENCYTOP is not set
1026CONFIG_HAVE_FUNCTION_TRACER=y
1027
1028#
1029# Tracers
1030#
1031# CONFIG_FUNCTION_TRACER is not set
1032# CONFIG_SCHED_TRACER is not set
1033# CONFIG_CONTEXT_SWITCH_TRACER is not set
1034# CONFIG_BOOT_TRACER is not set
1035# CONFIG_STACK_TRACER is not set
1036# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
954# CONFIG_SAMPLES is not set 1037# CONFIG_SAMPLES is not set
1038CONFIG_HAVE_ARCH_KGDB=y
1039# CONFIG_KGDB is not set
955# CONFIG_DEBUG_STACKOVERFLOW is not set 1040# CONFIG_DEBUG_STACKOVERFLOW is not set
956# CONFIG_DEBUG_STACK_USAGE is not set 1041# CONFIG_DEBUG_STACK_USAGE is not set
957# CONFIG_DEBUG_PAGEALLOC is not set 1042# CONFIG_DEBUG_PAGEALLOC is not set
958# CONFIG_DEBUGGER is not set 1043# CONFIG_CODE_PATCHING_SELFTEST is not set
1044# CONFIG_FTR_FIXUP_SELFTEST is not set
1045# CONFIG_MSI_BITMAP_SELFTEST is not set
1046# CONFIG_XMON is not set
959# CONFIG_IRQSTACKS is not set 1047# CONFIG_IRQSTACKS is not set
960# CONFIG_BDI_SWITCH is not set 1048# CONFIG_BDI_SWITCH is not set
961# CONFIG_BOOTX_TEXT is not set 1049# CONFIG_BOOTX_TEXT is not set
@@ -966,14 +1054,19 @@ CONFIG_DEBUG_INFO=y
966# 1054#
967# CONFIG_KEYS is not set 1055# CONFIG_KEYS is not set
968# CONFIG_SECURITY is not set 1056# CONFIG_SECURITY is not set
1057# CONFIG_SECURITYFS is not set
969# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1058# CONFIG_SECURITY_FILE_CAPABILITIES is not set
970CONFIG_CRYPTO=y 1059CONFIG_CRYPTO=y
971 1060
972# 1061#
973# Crypto core or helper 1062# Crypto core or helper
974# 1063#
1064# CONFIG_CRYPTO_FIPS is not set
975CONFIG_CRYPTO_ALGAPI=y 1065CONFIG_CRYPTO_ALGAPI=y
1066CONFIG_CRYPTO_AEAD=y
976CONFIG_CRYPTO_BLKCIPHER=y 1067CONFIG_CRYPTO_BLKCIPHER=y
1068CONFIG_CRYPTO_HASH=y
1069CONFIG_CRYPTO_RNG=y
977CONFIG_CRYPTO_MANAGER=y 1070CONFIG_CRYPTO_MANAGER=y
978# CONFIG_CRYPTO_GF128MUL is not set 1071# CONFIG_CRYPTO_GF128MUL is not set
979# CONFIG_CRYPTO_NULL is not set 1072# CONFIG_CRYPTO_NULL is not set
@@ -1012,6 +1105,10 @@ CONFIG_CRYPTO_CBC=y
1012# CONFIG_CRYPTO_MD4 is not set 1105# CONFIG_CRYPTO_MD4 is not set
1013CONFIG_CRYPTO_MD5=y 1106CONFIG_CRYPTO_MD5=y
1014# CONFIG_CRYPTO_MICHAEL_MIC is not set 1107# CONFIG_CRYPTO_MICHAEL_MIC is not set
1108# CONFIG_CRYPTO_RMD128 is not set
1109# CONFIG_CRYPTO_RMD160 is not set
1110# CONFIG_CRYPTO_RMD256 is not set
1111# CONFIG_CRYPTO_RMD320 is not set
1015# CONFIG_CRYPTO_SHA1 is not set 1112# CONFIG_CRYPTO_SHA1 is not set
1016# CONFIG_CRYPTO_SHA256 is not set 1113# CONFIG_CRYPTO_SHA256 is not set
1017# CONFIG_CRYPTO_SHA512 is not set 1114# CONFIG_CRYPTO_SHA512 is not set
@@ -1042,6 +1139,11 @@ CONFIG_CRYPTO_DES=y
1042# 1139#
1043# CONFIG_CRYPTO_DEFLATE is not set 1140# CONFIG_CRYPTO_DEFLATE is not set
1044# CONFIG_CRYPTO_LZO is not set 1141# CONFIG_CRYPTO_LZO is not set
1142
1143#
1144# Random Number Generation
1145#
1146# CONFIG_CRYPTO_ANSI_CPRNG is not set
1045CONFIG_CRYPTO_HW=y 1147CONFIG_CRYPTO_HW=y
1046# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1148# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1047CONFIG_PPC_CLOCK=y 1149CONFIG_PPC_CLOCK=y
diff --git a/arch/powerpc/configs/52xx/motionpro_defconfig b/arch/powerpc/configs/52xx/motionpro_defconfig
index 8c7ba7c6ba49..3c0d4e561726 100644
--- a/arch/powerpc/configs/52xx/motionpro_defconfig
+++ b/arch/powerpc/configs/52xx/motionpro_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.25 3# Linux kernel version: 2.6.28-rc4
4# Tue Apr 29 07:12:22 2008 4# Thu Nov 13 02:11:02 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
34CONFIG_STACKTRACE_SUPPORT=y 34CONFIG_STACKTRACE_SUPPORT=y
35CONFIG_HAVE_LATENCYTOP_SUPPORT=y
35CONFIG_LOCKDEP_SUPPORT=y 36CONFIG_LOCKDEP_SUPPORT=y
36CONFIG_RWSEM_XCHGADD_ALGORITHM=y 37CONFIG_RWSEM_XCHGADD_ALGORITHM=y
37CONFIG_ARCH_HAS_ILOG2_U32=y 38CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -102,6 +103,7 @@ CONFIG_SIGNALFD=y
102CONFIG_TIMERFD=y 103CONFIG_TIMERFD=y
103CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
104CONFIG_SHMEM=y 105CONFIG_SHMEM=y
106CONFIG_AIO=y
105CONFIG_VM_EVENT_COUNTERS=y 107CONFIG_VM_EVENT_COUNTERS=y
106CONFIG_SLUB_DEBUG=y 108CONFIG_SLUB_DEBUG=y
107# CONFIG_SLAB is not set 109# CONFIG_SLAB is not set
@@ -110,9 +112,13 @@ CONFIG_SLUB=y
110# CONFIG_PROFILING is not set 112# CONFIG_PROFILING is not set
111# CONFIG_MARKERS is not set 113# CONFIG_MARKERS is not set
112CONFIG_HAVE_OPROFILE=y 114CONFIG_HAVE_OPROFILE=y
115CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
116CONFIG_HAVE_IOREMAP_PROT=y
113CONFIG_HAVE_KPROBES=y 117CONFIG_HAVE_KPROBES=y
114CONFIG_HAVE_KRETPROBES=y 118CONFIG_HAVE_KRETPROBES=y
115CONFIG_PROC_PAGE_MONITOR=y 119CONFIG_HAVE_ARCH_TRACEHOOK=y
120CONFIG_HAVE_CLK=y
121# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
116CONFIG_SLABINFO=y 122CONFIG_SLABINFO=y
117CONFIG_RT_MUTEXES=y 123CONFIG_RT_MUTEXES=y
118# CONFIG_TINY_SHMEM is not set 124# CONFIG_TINY_SHMEM is not set
@@ -123,6 +129,7 @@ CONFIG_BLOCK=y
123# CONFIG_BLK_DEV_IO_TRACE is not set 129# CONFIG_BLK_DEV_IO_TRACE is not set
124# CONFIG_LSF is not set 130# CONFIG_LSF is not set
125# CONFIG_BLK_DEV_BSG is not set 131# CONFIG_BLK_DEV_BSG is not set
132# CONFIG_BLK_DEV_INTEGRITY is not set
126 133
127# 134#
128# IO Schedulers 135# IO Schedulers
@@ -137,19 +144,16 @@ CONFIG_DEFAULT_AS=y
137# CONFIG_DEFAULT_NOOP is not set 144# CONFIG_DEFAULT_NOOP is not set
138CONFIG_DEFAULT_IOSCHED="anticipatory" 145CONFIG_DEFAULT_IOSCHED="anticipatory"
139CONFIG_CLASSIC_RCU=y 146CONFIG_CLASSIC_RCU=y
147# CONFIG_FREEZER is not set
140 148
141# 149#
142# Platform support 150# Platform support
143# 151#
144CONFIG_PPC_MULTIPLATFORM=y 152CONFIG_PPC_MULTIPLATFORM=y
145# CONFIG_PPC_82xx is not set
146# CONFIG_PPC_83xx is not set
147# CONFIG_PPC_86xx is not set
148CONFIG_CLASSIC32=y 153CONFIG_CLASSIC32=y
149# CONFIG_PPC_CHRP is not set 154# CONFIG_PPC_CHRP is not set
150# CONFIG_PPC_MPC512x is not set
151# CONFIG_PPC_MPC5121 is not set
152# CONFIG_MPC5121_ADS is not set 155# CONFIG_MPC5121_ADS is not set
156# CONFIG_MPC5121_GENERIC is not set
153CONFIG_PPC_MPC52xx=y 157CONFIG_PPC_MPC52xx=y
154CONFIG_PPC_MPC5200_SIMPLE=y 158CONFIG_PPC_MPC5200_SIMPLE=y
155# CONFIG_PPC_EFIKA is not set 159# CONFIG_PPC_EFIKA is not set
@@ -159,7 +163,10 @@ CONFIG_PPC_MPC5200_SIMPLE=y
159# CONFIG_PPC_PMAC is not set 163# CONFIG_PPC_PMAC is not set
160# CONFIG_PPC_CELL is not set 164# CONFIG_PPC_CELL is not set
161# CONFIG_PPC_CELL_NATIVE is not set 165# CONFIG_PPC_CELL_NATIVE is not set
166# CONFIG_PPC_82xx is not set
162# CONFIG_PQ2ADS is not set 167# CONFIG_PQ2ADS is not set
168# CONFIG_PPC_83xx is not set
169# CONFIG_PPC_86xx is not set
163# CONFIG_EMBEDDED6xx is not set 170# CONFIG_EMBEDDED6xx is not set
164# CONFIG_IPIC is not set 171# CONFIG_IPIC is not set
165# CONFIG_MPIC is not set 172# CONFIG_MPIC is not set
@@ -183,7 +190,6 @@ CONFIG_PPC_BESTCOMM_FEC=y
183# Kernel options 190# Kernel options
184# 191#
185# CONFIG_HIGHMEM is not set 192# CONFIG_HIGHMEM is not set
186# CONFIG_TICK_ONESHOT is not set
187# CONFIG_NO_HZ is not set 193# CONFIG_NO_HZ is not set
188# CONFIG_HIGH_RES_TIMERS is not set 194# CONFIG_HIGH_RES_TIMERS is not set
189CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 195CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -197,6 +203,8 @@ CONFIG_PREEMPT_NONE=y
197# CONFIG_PREEMPT_VOLUNTARY is not set 203# CONFIG_PREEMPT_VOLUNTARY is not set
198# CONFIG_PREEMPT is not set 204# CONFIG_PREEMPT is not set
199CONFIG_BINFMT_ELF=y 205CONFIG_BINFMT_ELF=y
206# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
207# CONFIG_HAVE_AOUT is not set
200# CONFIG_BINFMT_MISC is not set 208# CONFIG_BINFMT_MISC is not set
201# CONFIG_IOMMU_HELPER is not set 209# CONFIG_IOMMU_HELPER is not set
202CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 210CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -211,19 +219,20 @@ CONFIG_FLATMEM_MANUAL=y
211# CONFIG_SPARSEMEM_MANUAL is not set 219# CONFIG_SPARSEMEM_MANUAL is not set
212CONFIG_FLATMEM=y 220CONFIG_FLATMEM=y
213CONFIG_FLAT_NODE_MEM_MAP=y 221CONFIG_FLAT_NODE_MEM_MAP=y
214# CONFIG_SPARSEMEM_STATIC is not set
215# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
216CONFIG_PAGEFLAGS_EXTENDED=y 222CONFIG_PAGEFLAGS_EXTENDED=y
217CONFIG_SPLIT_PTLOCK_CPUS=4 223CONFIG_SPLIT_PTLOCK_CPUS=4
224CONFIG_MIGRATION=y
218# CONFIG_RESOURCES_64BIT is not set 225# CONFIG_RESOURCES_64BIT is not set
226# CONFIG_PHYS_ADDR_T_64BIT is not set
219CONFIG_ZONE_DMA_FLAG=1 227CONFIG_ZONE_DMA_FLAG=1
220CONFIG_BOUNCE=y 228CONFIG_BOUNCE=y
221CONFIG_VIRT_TO_BUS=y 229CONFIG_VIRT_TO_BUS=y
230CONFIG_UNEVICTABLE_LRU=y
222CONFIG_FORCE_MAX_ZONEORDER=11 231CONFIG_FORCE_MAX_ZONEORDER=11
223CONFIG_PROC_DEVICETREE=y 232CONFIG_PROC_DEVICETREE=y
224# CONFIG_CMDLINE_BOOL is not set 233# CONFIG_CMDLINE_BOOL is not set
234CONFIG_EXTRA_TARGETS=""
225CONFIG_PM=y 235CONFIG_PM=y
226# CONFIG_PM_LEGACY is not set
227# CONFIG_PM_DEBUG is not set 236# CONFIG_PM_DEBUG is not set
228CONFIG_SECCOMP=y 237CONFIG_SECCOMP=y
229CONFIG_ISA_DMA_API=y 238CONFIG_ISA_DMA_API=y
@@ -233,7 +242,7 @@ CONFIG_ISA_DMA_API=y
233# 242#
234CONFIG_ZONE_DMA=y 243CONFIG_ZONE_DMA=y
235CONFIG_GENERIC_ISA_DMA=y 244CONFIG_GENERIC_ISA_DMA=y
236CONFIG_FSL_SOC=y 245CONFIG_PPC_PCI_CHOICE=y
237# CONFIG_PCI is not set 246# CONFIG_PCI is not set
238# CONFIG_PCI_DOMAINS is not set 247# CONFIG_PCI_DOMAINS is not set
239# CONFIG_PCI_SYSCALL is not set 248# CONFIG_PCI_SYSCALL is not set
@@ -254,10 +263,6 @@ CONFIG_PAGE_OFFSET=0xc0000000
254CONFIG_KERNEL_START=0xc0000000 263CONFIG_KERNEL_START=0xc0000000
255CONFIG_PHYSICAL_START=0x00000000 264CONFIG_PHYSICAL_START=0x00000000
256CONFIG_TASK_SIZE=0xc0000000 265CONFIG_TASK_SIZE=0xc0000000
257
258#
259# Networking
260#
261CONFIG_NET=y 266CONFIG_NET=y
262 267
263# 268#
@@ -308,6 +313,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
308# CONFIG_TIPC is not set 313# CONFIG_TIPC is not set
309# CONFIG_ATM is not set 314# CONFIG_ATM is not set
310# CONFIG_BRIDGE is not set 315# CONFIG_BRIDGE is not set
316# CONFIG_NET_DSA is not set
311# CONFIG_VLAN_8021Q is not set 317# CONFIG_VLAN_8021Q is not set
312# CONFIG_DECNET is not set 318# CONFIG_DECNET is not set
313# CONFIG_LLC2 is not set 319# CONFIG_LLC2 is not set
@@ -328,14 +334,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
328# CONFIG_IRDA is not set 334# CONFIG_IRDA is not set
329# CONFIG_BT is not set 335# CONFIG_BT is not set
330# CONFIG_AF_RXRPC is not set 336# CONFIG_AF_RXRPC is not set
331 337# CONFIG_PHONET is not set
332# 338# CONFIG_WIRELESS is not set
333# Wireless
334#
335# CONFIG_CFG80211 is not set
336# CONFIG_WIRELESS_EXT is not set
337# CONFIG_MAC80211 is not set
338# CONFIG_IEEE80211 is not set
339# CONFIG_RFKILL is not set 339# CONFIG_RFKILL is not set
340# CONFIG_NET_9P is not set 340# CONFIG_NET_9P is not set
341 341
@@ -445,9 +445,12 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
445# CONFIG_BLK_DEV_XIP is not set 445# CONFIG_BLK_DEV_XIP is not set
446# CONFIG_CDROM_PKTCDVD is not set 446# CONFIG_CDROM_PKTCDVD is not set
447# CONFIG_ATA_OVER_ETH is not set 447# CONFIG_ATA_OVER_ETH is not set
448# CONFIG_BLK_DEV_HD is not set
448CONFIG_MISC_DEVICES=y 449CONFIG_MISC_DEVICES=y
449# CONFIG_EEPROM_93CX6 is not set 450# CONFIG_EEPROM_93CX6 is not set
451# CONFIG_ICS932S401 is not set
450# CONFIG_ENCLOSURE_SERVICES is not set 452# CONFIG_ENCLOSURE_SERVICES is not set
453# CONFIG_C2PORT is not set
451CONFIG_HAVE_IDE=y 454CONFIG_HAVE_IDE=y
452# CONFIG_IDE is not set 455# CONFIG_IDE is not set
453 456
@@ -490,10 +493,10 @@ CONFIG_CHR_DEV_SG=y
490CONFIG_SCSI_LOWLEVEL=y 493CONFIG_SCSI_LOWLEVEL=y
491# CONFIG_ISCSI_TCP is not set 494# CONFIG_ISCSI_TCP is not set
492# CONFIG_SCSI_DEBUG is not set 495# CONFIG_SCSI_DEBUG is not set
496# CONFIG_SCSI_DH is not set
493CONFIG_ATA=y 497CONFIG_ATA=y
494# CONFIG_ATA_NONSTANDARD is not set 498# CONFIG_ATA_NONSTANDARD is not set
495CONFIG_SATA_PMP=y 499CONFIG_SATA_PMP=y
496# CONFIG_SATA_FSL is not set
497CONFIG_ATA_SFF=y 500CONFIG_ATA_SFF=y
498# CONFIG_SATA_MV is not set 501# CONFIG_SATA_MV is not set
499CONFIG_PATA_MPC52xx=y 502CONFIG_PATA_MPC52xx=y
@@ -501,7 +504,6 @@ CONFIG_PATA_MPC52xx=y
501# CONFIG_MD is not set 504# CONFIG_MD is not set
502# CONFIG_MACINTOSH_DRIVERS is not set 505# CONFIG_MACINTOSH_DRIVERS is not set
503CONFIG_NETDEVICES=y 506CONFIG_NETDEVICES=y
504# CONFIG_NETDEVICES_MULTIQUEUE is not set
505# CONFIG_DUMMY is not set 507# CONFIG_DUMMY is not set
506# CONFIG_BONDING is not set 508# CONFIG_BONDING is not set
507# CONFIG_MACVLAN is not set 509# CONFIG_MACVLAN is not set
@@ -531,6 +533,9 @@ CONFIG_MII=y
531# CONFIG_IBM_NEW_EMAC_RGMII is not set 533# CONFIG_IBM_NEW_EMAC_RGMII is not set
532# CONFIG_IBM_NEW_EMAC_TAH is not set 534# CONFIG_IBM_NEW_EMAC_TAH is not set
533# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 535# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
536# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
537# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
538# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
534# CONFIG_B44 is not set 539# CONFIG_B44 is not set
535CONFIG_FEC_MPC52xx=y 540CONFIG_FEC_MPC52xx=y
536CONFIG_FEC_MPC52xx_MDIO=y 541CONFIG_FEC_MPC52xx_MDIO=y
@@ -542,7 +547,6 @@ CONFIG_FEC_MPC52xx_MDIO=y
542# 547#
543# CONFIG_WLAN_PRE80211 is not set 548# CONFIG_WLAN_PRE80211 is not set
544# CONFIG_WLAN_80211 is not set 549# CONFIG_WLAN_80211 is not set
545# CONFIG_IWLWIFI is not set
546# CONFIG_IWLWIFI_LEDS is not set 550# CONFIG_IWLWIFI_LEDS is not set
547# CONFIG_WAN is not set 551# CONFIG_WAN is not set
548# CONFIG_PPP is not set 552# CONFIG_PPP is not set
@@ -568,6 +572,7 @@ CONFIG_FEC_MPC52xx_MDIO=y
568# Character devices 572# Character devices
569# 573#
570# CONFIG_VT is not set 574# CONFIG_VT is not set
575CONFIG_DEVKMEM=y
571# CONFIG_SERIAL_NONSTANDARD is not set 576# CONFIG_SERIAL_NONSTANDARD is not set
572 577
573# 578#
@@ -596,24 +601,39 @@ CONFIG_LEGACY_PTY_COUNT=256
596CONFIG_I2C=y 601CONFIG_I2C=y
597CONFIG_I2C_BOARDINFO=y 602CONFIG_I2C_BOARDINFO=y
598CONFIG_I2C_CHARDEV=y 603CONFIG_I2C_CHARDEV=y
604CONFIG_I2C_HELPER_AUTO=y
599 605
600# 606#
601# I2C Hardware Bus support 607# I2C Hardware Bus support
602# 608#
609
610#
611# I2C system bus drivers (mostly embedded / system-on-chip)
612#
603CONFIG_I2C_MPC=y 613CONFIG_I2C_MPC=y
604# CONFIG_I2C_OCORES is not set 614# CONFIG_I2C_OCORES is not set
605# CONFIG_I2C_PARPORT_LIGHT is not set
606# CONFIG_I2C_SIMTEC is not set 615# CONFIG_I2C_SIMTEC is not set
616
617#
618# External I2C/SMBus adapter drivers
619#
620# CONFIG_I2C_PARPORT_LIGHT is not set
607# CONFIG_I2C_TAOS_EVM is not set 621# CONFIG_I2C_TAOS_EVM is not set
622
623#
624# Other I2C/SMBus bus drivers
625#
608# CONFIG_I2C_PCA_PLATFORM is not set 626# CONFIG_I2C_PCA_PLATFORM is not set
609 627
610# 628#
611# Miscellaneous I2C Chip support 629# Miscellaneous I2C Chip support
612# 630#
613# CONFIG_DS1682 is not set 631# CONFIG_DS1682 is not set
632# CONFIG_AT24 is not set
614CONFIG_SENSORS_EEPROM=y 633CONFIG_SENSORS_EEPROM=y
615# CONFIG_SENSORS_PCF8574 is not set 634# CONFIG_SENSORS_PCF8574 is not set
616# CONFIG_PCF8575 is not set 635# CONFIG_PCF8575 is not set
636# CONFIG_SENSORS_PCA9539 is not set
617# CONFIG_SENSORS_PCF8591 is not set 637# CONFIG_SENSORS_PCF8591 is not set
618# CONFIG_SENSORS_MAX6875 is not set 638# CONFIG_SENSORS_MAX6875 is not set
619# CONFIG_SENSORS_TSL2550 is not set 639# CONFIG_SENSORS_TSL2550 is not set
@@ -622,10 +642,13 @@ CONFIG_SENSORS_EEPROM=y
622# CONFIG_I2C_DEBUG_BUS is not set 642# CONFIG_I2C_DEBUG_BUS is not set
623# CONFIG_I2C_DEBUG_CHIP is not set 643# CONFIG_I2C_DEBUG_CHIP is not set
624# CONFIG_SPI is not set 644# CONFIG_SPI is not set
645CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
646# CONFIG_GPIOLIB is not set
625# CONFIG_W1 is not set 647# CONFIG_W1 is not set
626# CONFIG_POWER_SUPPLY is not set 648# CONFIG_POWER_SUPPLY is not set
627CONFIG_HWMON=y 649CONFIG_HWMON=y
628# CONFIG_HWMON_VID is not set 650# CONFIG_HWMON_VID is not set
651# CONFIG_SENSORS_AD7414 is not set
629# CONFIG_SENSORS_AD7418 is not set 652# CONFIG_SENSORS_AD7418 is not set
630# CONFIG_SENSORS_ADM1021 is not set 653# CONFIG_SENSORS_ADM1021 is not set
631# CONFIG_SENSORS_ADM1025 is not set 654# CONFIG_SENSORS_ADM1025 is not set
@@ -633,6 +656,7 @@ CONFIG_HWMON=y
633# CONFIG_SENSORS_ADM1029 is not set 656# CONFIG_SENSORS_ADM1029 is not set
634# CONFIG_SENSORS_ADM1031 is not set 657# CONFIG_SENSORS_ADM1031 is not set
635# CONFIG_SENSORS_ADM9240 is not set 658# CONFIG_SENSORS_ADM9240 is not set
659# CONFIG_SENSORS_ADT7462 is not set
636# CONFIG_SENSORS_ADT7470 is not set 660# CONFIG_SENSORS_ADT7470 is not set
637# CONFIG_SENSORS_ADT7473 is not set 661# CONFIG_SENSORS_ADT7473 is not set
638# CONFIG_SENSORS_ATXP1 is not set 662# CONFIG_SENSORS_ATXP1 is not set
@@ -675,6 +699,7 @@ CONFIG_HWMON=y
675# CONFIG_SENSORS_W83627EHF is not set 699# CONFIG_SENSORS_W83627EHF is not set
676# CONFIG_HWMON_DEBUG_CHIP is not set 700# CONFIG_HWMON_DEBUG_CHIP is not set
677# CONFIG_THERMAL is not set 701# CONFIG_THERMAL is not set
702# CONFIG_THERMAL_HWMON is not set
678CONFIG_WATCHDOG=y 703CONFIG_WATCHDOG=y
679# CONFIG_WATCHDOG_NOWAYOUT is not set 704# CONFIG_WATCHDOG_NOWAYOUT is not set
680 705
@@ -683,24 +708,39 @@ CONFIG_WATCHDOG=y
683# 708#
684# CONFIG_SOFT_WATCHDOG is not set 709# CONFIG_SOFT_WATCHDOG is not set
685# CONFIG_MPC5200_WDT is not set 710# CONFIG_MPC5200_WDT is not set
711CONFIG_SSB_POSSIBLE=y
686 712
687# 713#
688# Sonics Silicon Backplane 714# Sonics Silicon Backplane
689# 715#
690CONFIG_SSB_POSSIBLE=y
691# CONFIG_SSB is not set 716# CONFIG_SSB is not set
692 717
693# 718#
694# Multifunction device drivers 719# Multifunction device drivers
695# 720#
721# CONFIG_MFD_CORE is not set
696# CONFIG_MFD_SM501 is not set 722# CONFIG_MFD_SM501 is not set
697# CONFIG_HTC_PASIC3 is not set 723# CONFIG_HTC_PASIC3 is not set
724# CONFIG_MFD_TMIO is not set
725# CONFIG_PMIC_DA903X is not set
726# CONFIG_MFD_WM8400 is not set
727# CONFIG_MFD_WM8350_I2C is not set
728# CONFIG_REGULATOR is not set
698 729
699# 730#
700# Multimedia devices 731# Multimedia devices
701# 732#
733
734#
735# Multimedia core support
736#
702# CONFIG_VIDEO_DEV is not set 737# CONFIG_VIDEO_DEV is not set
703# CONFIG_DVB_CORE is not set 738# CONFIG_DVB_CORE is not set
739# CONFIG_VIDEO_MEDIA is not set
740
741#
742# Multimedia drivers
743#
704CONFIG_DAB=y 744CONFIG_DAB=y
705 745
706# 746#
@@ -715,10 +755,6 @@ CONFIG_DAB=y
715# Display device support 755# Display device support
716# 756#
717# CONFIG_DISPLAY_SUPPORT is not set 757# CONFIG_DISPLAY_SUPPORT is not set
718
719#
720# Sound
721#
722# CONFIG_SOUND is not set 758# CONFIG_SOUND is not set
723# CONFIG_USB_SUPPORT is not set 759# CONFIG_USB_SUPPORT is not set
724# CONFIG_MMC is not set 760# CONFIG_MMC is not set
@@ -729,6 +765,7 @@ CONFIG_LEDS_CLASS=y
729# 765#
730# LED drivers 766# LED drivers
731# 767#
768# CONFIG_LEDS_PCA955X is not set
732 769
733# 770#
734# LED Triggers 771# LED Triggers
@@ -736,7 +773,9 @@ CONFIG_LEDS_CLASS=y
736CONFIG_LEDS_TRIGGERS=y 773CONFIG_LEDS_TRIGGERS=y
737CONFIG_LEDS_TRIGGER_TIMER=y 774CONFIG_LEDS_TRIGGER_TIMER=y
738# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set 775# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
776# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
739# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set 777# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
778# CONFIG_ACCESSIBILITY is not set
740# CONFIG_EDAC is not set 779# CONFIG_EDAC is not set
741CONFIG_RTC_LIB=y 780CONFIG_RTC_LIB=y
742CONFIG_RTC_CLASS=y 781CONFIG_RTC_CLASS=y
@@ -767,6 +806,8 @@ CONFIG_RTC_DRV_DS1307=y
767# CONFIG_RTC_DRV_PCF8583 is not set 806# CONFIG_RTC_DRV_PCF8583 is not set
768# CONFIG_RTC_DRV_M41T80 is not set 807# CONFIG_RTC_DRV_M41T80 is not set
769# CONFIG_RTC_DRV_S35390A is not set 808# CONFIG_RTC_DRV_S35390A is not set
809# CONFIG_RTC_DRV_FM3130 is not set
810# CONFIG_RTC_DRV_RX8581 is not set
770 811
771# 812#
772# SPI RTC drivers 813# SPI RTC drivers
@@ -776,19 +817,25 @@ CONFIG_RTC_DRV_DS1307=y
776# Platform RTC drivers 817# Platform RTC drivers
777# 818#
778# CONFIG_RTC_DRV_CMOS is not set 819# CONFIG_RTC_DRV_CMOS is not set
820# CONFIG_RTC_DRV_DS1286 is not set
779# CONFIG_RTC_DRV_DS1511 is not set 821# CONFIG_RTC_DRV_DS1511 is not set
780# CONFIG_RTC_DRV_DS1553 is not set 822# CONFIG_RTC_DRV_DS1553 is not set
781# CONFIG_RTC_DRV_DS1742 is not set 823# CONFIG_RTC_DRV_DS1742 is not set
782# CONFIG_RTC_DRV_STK17TA8 is not set 824# CONFIG_RTC_DRV_STK17TA8 is not set
783# CONFIG_RTC_DRV_M48T86 is not set 825# CONFIG_RTC_DRV_M48T86 is not set
826# CONFIG_RTC_DRV_M48T35 is not set
784# CONFIG_RTC_DRV_M48T59 is not set 827# CONFIG_RTC_DRV_M48T59 is not set
828# CONFIG_RTC_DRV_BQ4802 is not set
785# CONFIG_RTC_DRV_V3020 is not set 829# CONFIG_RTC_DRV_V3020 is not set
786 830
787# 831#
788# on-CPU RTC drivers 832# on-CPU RTC drivers
789# 833#
834# CONFIG_RTC_DRV_PPC is not set
790# CONFIG_DMADEVICES is not set 835# CONFIG_DMADEVICES is not set
791# CONFIG_UIO is not set 836# CONFIG_UIO is not set
837# CONFIG_STAGING is not set
838CONFIG_STAGING_EXCLUDE_BUILD=y
792 839
793# 840#
794# File systems 841# File systems
@@ -800,12 +847,13 @@ CONFIG_EXT3_FS=y
800CONFIG_EXT3_FS_XATTR=y 847CONFIG_EXT3_FS_XATTR=y
801# CONFIG_EXT3_FS_POSIX_ACL is not set 848# CONFIG_EXT3_FS_POSIX_ACL is not set
802# CONFIG_EXT3_FS_SECURITY is not set 849# CONFIG_EXT3_FS_SECURITY is not set
803# CONFIG_EXT4DEV_FS is not set 850# CONFIG_EXT4_FS is not set
804CONFIG_JBD=y 851CONFIG_JBD=y
805CONFIG_FS_MBCACHE=y 852CONFIG_FS_MBCACHE=y
806# CONFIG_REISERFS_FS is not set 853# CONFIG_REISERFS_FS is not set
807# CONFIG_JFS_FS is not set 854# CONFIG_JFS_FS is not set
808# CONFIG_FS_POSIX_ACL is not set 855# CONFIG_FS_POSIX_ACL is not set
856CONFIG_FILE_LOCKING=y
809# CONFIG_XFS_FS is not set 857# CONFIG_XFS_FS is not set
810# CONFIG_OCFS2_FS is not set 858# CONFIG_OCFS2_FS is not set
811CONFIG_DNOTIFY=y 859CONFIG_DNOTIFY=y
@@ -838,6 +886,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
838CONFIG_PROC_FS=y 886CONFIG_PROC_FS=y
839CONFIG_PROC_KCORE=y 887CONFIG_PROC_KCORE=y
840CONFIG_PROC_SYSCTL=y 888CONFIG_PROC_SYSCTL=y
889CONFIG_PROC_PAGE_MONITOR=y
841CONFIG_SYSFS=y 890CONFIG_SYSFS=y
842CONFIG_TMPFS=y 891CONFIG_TMPFS=y
843# CONFIG_TMPFS_POSIX_ACL is not set 892# CONFIG_TMPFS_POSIX_ACL is not set
@@ -868,6 +917,7 @@ CONFIG_JFFS2_RTIME=y
868CONFIG_CRAMFS=y 917CONFIG_CRAMFS=y
869# CONFIG_VXFS_FS is not set 918# CONFIG_VXFS_FS is not set
870# CONFIG_MINIX_FS is not set 919# CONFIG_MINIX_FS is not set
920# CONFIG_OMFS_FS is not set
871# CONFIG_HPFS_FS is not set 921# CONFIG_HPFS_FS is not set
872# CONFIG_QNX4FS_FS is not set 922# CONFIG_QNX4FS_FS is not set
873# CONFIG_ROMFS_FS is not set 923# CONFIG_ROMFS_FS is not set
@@ -878,14 +928,14 @@ CONFIG_NFS_FS=y
878CONFIG_NFS_V3=y 928CONFIG_NFS_V3=y
879# CONFIG_NFS_V3_ACL is not set 929# CONFIG_NFS_V3_ACL is not set
880CONFIG_NFS_V4=y 930CONFIG_NFS_V4=y
881# CONFIG_NFSD is not set
882CONFIG_ROOT_NFS=y 931CONFIG_ROOT_NFS=y
932# CONFIG_NFSD is not set
883CONFIG_LOCKD=y 933CONFIG_LOCKD=y
884CONFIG_LOCKD_V4=y 934CONFIG_LOCKD_V4=y
885CONFIG_NFS_COMMON=y 935CONFIG_NFS_COMMON=y
886CONFIG_SUNRPC=y 936CONFIG_SUNRPC=y
887CONFIG_SUNRPC_GSS=y 937CONFIG_SUNRPC_GSS=y
888# CONFIG_SUNRPC_BIND34 is not set 938# CONFIG_SUNRPC_REGISTER_V4 is not set
889CONFIG_RPCSEC_GSS_KRB5=y 939CONFIG_RPCSEC_GSS_KRB5=y
890# CONFIG_RPCSEC_GSS_SPKM3 is not set 940# CONFIG_RPCSEC_GSS_SPKM3 is not set
891# CONFIG_SMB_FS is not set 941# CONFIG_SMB_FS is not set
@@ -961,9 +1011,9 @@ CONFIG_NLS_ISO8859_1=y
961# Library routines 1011# Library routines
962# 1012#
963CONFIG_BITREVERSE=y 1013CONFIG_BITREVERSE=y
964# CONFIG_GENERIC_FIND_FIRST_BIT is not set
965# CONFIG_CRC_CCITT is not set 1014# CONFIG_CRC_CCITT is not set
966# CONFIG_CRC16 is not set 1015# CONFIG_CRC16 is not set
1016# CONFIG_CRC_T10DIF is not set
967# CONFIG_CRC_ITU_T is not set 1017# CONFIG_CRC_ITU_T is not set
968CONFIG_CRC32=y 1018CONFIG_CRC32=y
969# CONFIG_CRC7 is not set 1019# CONFIG_CRC7 is not set
@@ -990,9 +1040,12 @@ CONFIG_FRAME_WARN=1024
990CONFIG_DEBUG_KERNEL=y 1040CONFIG_DEBUG_KERNEL=y
991# CONFIG_DEBUG_SHIRQ is not set 1041# CONFIG_DEBUG_SHIRQ is not set
992CONFIG_DETECT_SOFTLOCKUP=y 1042CONFIG_DETECT_SOFTLOCKUP=y
1043# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1044CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
993CONFIG_SCHED_DEBUG=y 1045CONFIG_SCHED_DEBUG=y
994# CONFIG_SCHEDSTATS is not set 1046# CONFIG_SCHEDSTATS is not set
995# CONFIG_TIMER_STATS is not set 1047# CONFIG_TIMER_STATS is not set
1048# CONFIG_DEBUG_OBJECTS is not set
996# CONFIG_SLUB_DEBUG_ON is not set 1049# CONFIG_SLUB_DEBUG_ON is not set
997# CONFIG_SLUB_STATS is not set 1050# CONFIG_SLUB_STATS is not set
998# CONFIG_DEBUG_RT_MUTEXES is not set 1051# CONFIG_DEBUG_RT_MUTEXES is not set
@@ -1006,16 +1059,37 @@ CONFIG_SCHED_DEBUG=y
1006CONFIG_DEBUG_INFO=y 1059CONFIG_DEBUG_INFO=y
1007# CONFIG_DEBUG_VM is not set 1060# CONFIG_DEBUG_VM is not set
1008# CONFIG_DEBUG_WRITECOUNT is not set 1061# CONFIG_DEBUG_WRITECOUNT is not set
1062# CONFIG_DEBUG_MEMORY_INIT is not set
1009# CONFIG_DEBUG_LIST is not set 1063# CONFIG_DEBUG_LIST is not set
1010# CONFIG_DEBUG_SG is not set 1064# CONFIG_DEBUG_SG is not set
1011# CONFIG_BOOT_PRINTK_DELAY is not set 1065# CONFIG_BOOT_PRINTK_DELAY is not set
1066# CONFIG_RCU_TORTURE_TEST is not set
1067# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1012# CONFIG_BACKTRACE_SELF_TEST is not set 1068# CONFIG_BACKTRACE_SELF_TEST is not set
1069# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1013# CONFIG_FAULT_INJECTION is not set 1070# CONFIG_FAULT_INJECTION is not set
1071# CONFIG_LATENCYTOP is not set
1072CONFIG_HAVE_FUNCTION_TRACER=y
1073
1074#
1075# Tracers
1076#
1077# CONFIG_FUNCTION_TRACER is not set
1078# CONFIG_SCHED_TRACER is not set
1079# CONFIG_CONTEXT_SWITCH_TRACER is not set
1080# CONFIG_BOOT_TRACER is not set
1081# CONFIG_STACK_TRACER is not set
1082# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1014# CONFIG_SAMPLES is not set 1083# CONFIG_SAMPLES is not set
1084CONFIG_HAVE_ARCH_KGDB=y
1085# CONFIG_KGDB is not set
1015# CONFIG_DEBUG_STACKOVERFLOW is not set 1086# CONFIG_DEBUG_STACKOVERFLOW is not set
1016# CONFIG_DEBUG_STACK_USAGE is not set 1087# CONFIG_DEBUG_STACK_USAGE is not set
1017# CONFIG_DEBUG_PAGEALLOC is not set 1088# CONFIG_DEBUG_PAGEALLOC is not set
1018# CONFIG_DEBUGGER is not set 1089# CONFIG_CODE_PATCHING_SELFTEST is not set
1090# CONFIG_FTR_FIXUP_SELFTEST is not set
1091# CONFIG_MSI_BITMAP_SELFTEST is not set
1092# CONFIG_XMON is not set
1019# CONFIG_IRQSTACKS is not set 1093# CONFIG_IRQSTACKS is not set
1020# CONFIG_BDI_SWITCH is not set 1094# CONFIG_BDI_SWITCH is not set
1021# CONFIG_BOOTX_TEXT is not set 1095# CONFIG_BOOTX_TEXT is not set
@@ -1026,14 +1100,19 @@ CONFIG_DEBUG_INFO=y
1026# 1100#
1027# CONFIG_KEYS is not set 1101# CONFIG_KEYS is not set
1028# CONFIG_SECURITY is not set 1102# CONFIG_SECURITY is not set
1103# CONFIG_SECURITYFS is not set
1029# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1104# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1030CONFIG_CRYPTO=y 1105CONFIG_CRYPTO=y
1031 1106
1032# 1107#
1033# Crypto core or helper 1108# Crypto core or helper
1034# 1109#
1110# CONFIG_CRYPTO_FIPS is not set
1035CONFIG_CRYPTO_ALGAPI=y 1111CONFIG_CRYPTO_ALGAPI=y
1112CONFIG_CRYPTO_AEAD=y
1036CONFIG_CRYPTO_BLKCIPHER=y 1113CONFIG_CRYPTO_BLKCIPHER=y
1114CONFIG_CRYPTO_HASH=y
1115CONFIG_CRYPTO_RNG=y
1037CONFIG_CRYPTO_MANAGER=y 1116CONFIG_CRYPTO_MANAGER=y
1038# CONFIG_CRYPTO_GF128MUL is not set 1117# CONFIG_CRYPTO_GF128MUL is not set
1039# CONFIG_CRYPTO_NULL is not set 1118# CONFIG_CRYPTO_NULL is not set
@@ -1071,6 +1150,10 @@ CONFIG_CRYPTO_PCBC=y
1071# CONFIG_CRYPTO_MD4 is not set 1150# CONFIG_CRYPTO_MD4 is not set
1072CONFIG_CRYPTO_MD5=y 1151CONFIG_CRYPTO_MD5=y
1073# CONFIG_CRYPTO_MICHAEL_MIC is not set 1152# CONFIG_CRYPTO_MICHAEL_MIC is not set
1153# CONFIG_CRYPTO_RMD128 is not set
1154# CONFIG_CRYPTO_RMD160 is not set
1155# CONFIG_CRYPTO_RMD256 is not set
1156# CONFIG_CRYPTO_RMD320 is not set
1074# CONFIG_CRYPTO_SHA1 is not set 1157# CONFIG_CRYPTO_SHA1 is not set
1075# CONFIG_CRYPTO_SHA256 is not set 1158# CONFIG_CRYPTO_SHA256 is not set
1076# CONFIG_CRYPTO_SHA512 is not set 1159# CONFIG_CRYPTO_SHA512 is not set
@@ -1101,6 +1184,11 @@ CONFIG_CRYPTO_DES=y
1101# 1184#
1102# CONFIG_CRYPTO_DEFLATE is not set 1185# CONFIG_CRYPTO_DEFLATE is not set
1103# CONFIG_CRYPTO_LZO is not set 1186# CONFIG_CRYPTO_LZO is not set
1187
1188#
1189# Random Number Generation
1190#
1191# CONFIG_CRYPTO_ANSI_CPRNG is not set
1104CONFIG_CRYPTO_HW=y 1192CONFIG_CRYPTO_HW=y
1105CONFIG_PPC_CLOCK=y 1193CONFIG_PPC_CLOCK=y
1106CONFIG_PPC_LIB_RHEAP=y 1194CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/52xx/pcm030_defconfig b/arch/powerpc/configs/52xx/pcm030_defconfig
index 9c0caa488b2e..9d0207783d60 100644
--- a/arch/powerpc/configs/52xx/pcm030_defconfig
+++ b/arch/powerpc/configs/52xx/pcm030_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.25 3# Linux kernel version: 2.6.28-rc4
4# Tue Apr 29 07:13:19 2008 4# Thu Nov 13 02:13:16 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
34CONFIG_STACKTRACE_SUPPORT=y 34CONFIG_STACKTRACE_SUPPORT=y
35CONFIG_HAVE_LATENCYTOP_SUPPORT=y
35CONFIG_LOCKDEP_SUPPORT=y 36CONFIG_LOCKDEP_SUPPORT=y
36CONFIG_RWSEM_XCHGADD_ALGORITHM=y 37CONFIG_RWSEM_XCHGADD_ALGORITHM=y
37CONFIG_ARCH_HAS_ILOG2_U32=y 38CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -104,7 +105,9 @@ CONFIG_SIGNALFD=y
104CONFIG_TIMERFD=y 105CONFIG_TIMERFD=y
105CONFIG_EVENTFD=y 106CONFIG_EVENTFD=y
106CONFIG_SHMEM=y 107CONFIG_SHMEM=y
108CONFIG_AIO=y
107# CONFIG_VM_EVENT_COUNTERS is not set 109# CONFIG_VM_EVENT_COUNTERS is not set
110CONFIG_PCI_QUIRKS=y
108CONFIG_SLAB=y 111CONFIG_SLAB=y
109# CONFIG_SLUB is not set 112# CONFIG_SLUB is not set
110# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
@@ -112,24 +115,30 @@ CONFIG_SLAB=y
112# CONFIG_MARKERS is not set 115# CONFIG_MARKERS is not set
113CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
114# CONFIG_KPROBES is not set 117# CONFIG_KPROBES is not set
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y
115CONFIG_HAVE_KPROBES=y 120CONFIG_HAVE_KPROBES=y
116CONFIG_HAVE_KRETPROBES=y 121CONFIG_HAVE_KRETPROBES=y
117CONFIG_PROC_PAGE_MONITOR=y 122CONFIG_HAVE_ARCH_TRACEHOOK=y
123CONFIG_HAVE_CLK=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
118CONFIG_SLABINFO=y 125CONFIG_SLABINFO=y
119CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
120# CONFIG_TINY_SHMEM is not set 127# CONFIG_TINY_SHMEM is not set
121CONFIG_BASE_SMALL=0 128CONFIG_BASE_SMALL=0
122CONFIG_MODULES=y 129CONFIG_MODULES=y
130# CONFIG_MODULE_FORCE_LOAD is not set
123CONFIG_MODULE_UNLOAD=y 131CONFIG_MODULE_UNLOAD=y
124# CONFIG_MODULE_FORCE_UNLOAD is not set 132# CONFIG_MODULE_FORCE_UNLOAD is not set
125# CONFIG_MODVERSIONS is not set 133# CONFIG_MODVERSIONS is not set
126# CONFIG_MODULE_SRCVERSION_ALL is not set 134# CONFIG_MODULE_SRCVERSION_ALL is not set
127# CONFIG_KMOD is not set 135CONFIG_KMOD=y
128CONFIG_BLOCK=y 136CONFIG_BLOCK=y
129# CONFIG_LBD is not set 137# CONFIG_LBD is not set
130# CONFIG_BLK_DEV_IO_TRACE is not set 138# CONFIG_BLK_DEV_IO_TRACE is not set
131# CONFIG_LSF is not set 139# CONFIG_LSF is not set
132# CONFIG_BLK_DEV_BSG is not set 140# CONFIG_BLK_DEV_BSG is not set
141# CONFIG_BLK_DEV_INTEGRITY is not set
133 142
134# 143#
135# IO Schedulers 144# IO Schedulers
@@ -144,19 +153,16 @@ CONFIG_IOSCHED_NOOP=y
144CONFIG_DEFAULT_NOOP=y 153CONFIG_DEFAULT_NOOP=y
145CONFIG_DEFAULT_IOSCHED="noop" 154CONFIG_DEFAULT_IOSCHED="noop"
146CONFIG_CLASSIC_RCU=y 155CONFIG_CLASSIC_RCU=y
156# CONFIG_FREEZER is not set
147 157
148# 158#
149# Platform support 159# Platform support
150# 160#
151CONFIG_PPC_MULTIPLATFORM=y 161CONFIG_PPC_MULTIPLATFORM=y
152# CONFIG_PPC_82xx is not set
153# CONFIG_PPC_83xx is not set
154# CONFIG_PPC_86xx is not set
155CONFIG_CLASSIC32=y 162CONFIG_CLASSIC32=y
156# CONFIG_PPC_CHRP is not set 163# CONFIG_PPC_CHRP is not set
157# CONFIG_PPC_MPC512x is not set
158# CONFIG_PPC_MPC5121 is not set
159# CONFIG_MPC5121_ADS is not set 164# CONFIG_MPC5121_ADS is not set
165# CONFIG_MPC5121_GENERIC is not set
160CONFIG_PPC_MPC52xx=y 166CONFIG_PPC_MPC52xx=y
161CONFIG_PPC_MPC5200_SIMPLE=y 167CONFIG_PPC_MPC5200_SIMPLE=y
162# CONFIG_PPC_EFIKA is not set 168# CONFIG_PPC_EFIKA is not set
@@ -166,7 +172,10 @@ CONFIG_PPC_MPC5200_SIMPLE=y
166# CONFIG_PPC_PMAC is not set 172# CONFIG_PPC_PMAC is not set
167# CONFIG_PPC_CELL is not set 173# CONFIG_PPC_CELL is not set
168# CONFIG_PPC_CELL_NATIVE is not set 174# CONFIG_PPC_CELL_NATIVE is not set
175# CONFIG_PPC_82xx is not set
169# CONFIG_PQ2ADS is not set 176# CONFIG_PQ2ADS is not set
177# CONFIG_PPC_83xx is not set
178# CONFIG_PPC_86xx is not set
170# CONFIG_EMBEDDED6xx is not set 179# CONFIG_EMBEDDED6xx is not set
171# CONFIG_IPIC is not set 180# CONFIG_IPIC is not set
172# CONFIG_MPIC is not set 181# CONFIG_MPIC is not set
@@ -199,12 +208,14 @@ CONFIG_HZ_100=y
199# CONFIG_HZ_300 is not set 208# CONFIG_HZ_300 is not set
200# CONFIG_HZ_1000 is not set 209# CONFIG_HZ_1000 is not set
201CONFIG_HZ=100 210CONFIG_HZ=100
202# CONFIG_SCHED_HRTICK is not set 211CONFIG_SCHED_HRTICK=y
203# CONFIG_PREEMPT_NONE is not set 212# CONFIG_PREEMPT_NONE is not set
204# CONFIG_PREEMPT_VOLUNTARY is not set 213# CONFIG_PREEMPT_VOLUNTARY is not set
205CONFIG_PREEMPT=y 214CONFIG_PREEMPT=y
206# CONFIG_PREEMPT_RCU is not set 215# CONFIG_PREEMPT_RCU is not set
207CONFIG_BINFMT_ELF=y 216CONFIG_BINFMT_ELF=y
217# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
218# CONFIG_HAVE_AOUT is not set
208# CONFIG_BINFMT_MISC is not set 219# CONFIG_BINFMT_MISC is not set
209# CONFIG_IOMMU_HELPER is not set 220# CONFIG_IOMMU_HELPER is not set
210CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 221CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -219,17 +230,19 @@ CONFIG_FLATMEM_MANUAL=y
219# CONFIG_SPARSEMEM_MANUAL is not set 230# CONFIG_SPARSEMEM_MANUAL is not set
220CONFIG_FLATMEM=y 231CONFIG_FLATMEM=y
221CONFIG_FLAT_NODE_MEM_MAP=y 232CONFIG_FLAT_NODE_MEM_MAP=y
222# CONFIG_SPARSEMEM_STATIC is not set
223# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
224CONFIG_PAGEFLAGS_EXTENDED=y 233CONFIG_PAGEFLAGS_EXTENDED=y
225CONFIG_SPLIT_PTLOCK_CPUS=4 234CONFIG_SPLIT_PTLOCK_CPUS=4
235CONFIG_MIGRATION=y
226# CONFIG_RESOURCES_64BIT is not set 236# CONFIG_RESOURCES_64BIT is not set
237# CONFIG_PHYS_ADDR_T_64BIT is not set
227CONFIG_ZONE_DMA_FLAG=1 238CONFIG_ZONE_DMA_FLAG=1
228CONFIG_BOUNCE=y 239CONFIG_BOUNCE=y
229CONFIG_VIRT_TO_BUS=y 240CONFIG_VIRT_TO_BUS=y
241CONFIG_UNEVICTABLE_LRU=y
230CONFIG_FORCE_MAX_ZONEORDER=11 242CONFIG_FORCE_MAX_ZONEORDER=11
231CONFIG_PROC_DEVICETREE=y 243CONFIG_PROC_DEVICETREE=y
232# CONFIG_CMDLINE_BOOL is not set 244# CONFIG_CMDLINE_BOOL is not set
245CONFIG_EXTRA_TARGETS=""
233# CONFIG_PM is not set 246# CONFIG_PM is not set
234# CONFIG_SECCOMP is not set 247# CONFIG_SECCOMP is not set
235CONFIG_ISA_DMA_API=y 248CONFIG_ISA_DMA_API=y
@@ -240,7 +253,7 @@ CONFIG_ISA_DMA_API=y
240CONFIG_ZONE_DMA=y 253CONFIG_ZONE_DMA=y
241CONFIG_GENERIC_ISA_DMA=y 254CONFIG_GENERIC_ISA_DMA=y
242# CONFIG_PPC_INDIRECT_PCI is not set 255# CONFIG_PPC_INDIRECT_PCI is not set
243CONFIG_FSL_SOC=y 256CONFIG_PPC_PCI_CHOICE=y
244CONFIG_PCI=y 257CONFIG_PCI=y
245CONFIG_PCI_DOMAINS=y 258CONFIG_PCI_DOMAINS=y
246CONFIG_PCI_SYSCALL=y 259CONFIG_PCI_SYSCALL=y
@@ -265,10 +278,6 @@ CONFIG_PAGE_OFFSET=0xc0000000
265CONFIG_KERNEL_START=0xc0000000 278CONFIG_KERNEL_START=0xc0000000
266CONFIG_PHYSICAL_START=0x00000000 279CONFIG_PHYSICAL_START=0x00000000
267CONFIG_TASK_SIZE=0xc0000000 280CONFIG_TASK_SIZE=0xc0000000
268
269#
270# Networking
271#
272CONFIG_NET=y 281CONFIG_NET=y
273 282
274# 283#
@@ -313,6 +322,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
313# CONFIG_TIPC is not set 322# CONFIG_TIPC is not set
314# CONFIG_ATM is not set 323# CONFIG_ATM is not set
315# CONFIG_BRIDGE is not set 324# CONFIG_BRIDGE is not set
325# CONFIG_NET_DSA is not set
316# CONFIG_VLAN_8021Q is not set 326# CONFIG_VLAN_8021Q is not set
317# CONFIG_DECNET is not set 327# CONFIG_DECNET is not set
318# CONFIG_LLC2 is not set 328# CONFIG_LLC2 is not set
@@ -333,14 +343,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
333# CONFIG_IRDA is not set 343# CONFIG_IRDA is not set
334# CONFIG_BT is not set 344# CONFIG_BT is not set
335# CONFIG_AF_RXRPC is not set 345# CONFIG_AF_RXRPC is not set
336 346# CONFIG_PHONET is not set
337# 347# CONFIG_WIRELESS is not set
338# Wireless
339#
340# CONFIG_CFG80211 is not set
341# CONFIG_WIRELESS_EXT is not set
342# CONFIG_MAC80211 is not set
343# CONFIG_IEEE80211 is not set
344# CONFIG_RFKILL is not set 348# CONFIG_RFKILL is not set
345# CONFIG_NET_9P is not set 349# CONFIG_NET_9P is not set
346 350
@@ -484,12 +488,12 @@ CONFIG_SCSI_WAIT_SCAN=m
484# CONFIG_SCSI_SAS_LIBSAS is not set 488# CONFIG_SCSI_SAS_LIBSAS is not set
485# CONFIG_SCSI_SRP_ATTRS is not set 489# CONFIG_SCSI_SRP_ATTRS is not set
486# CONFIG_SCSI_LOWLEVEL is not set 490# CONFIG_SCSI_LOWLEVEL is not set
491# CONFIG_SCSI_DH is not set
487CONFIG_ATA=m 492CONFIG_ATA=m
488# CONFIG_ATA_NONSTANDARD is not set 493# CONFIG_ATA_NONSTANDARD is not set
489CONFIG_SATA_PMP=y 494CONFIG_SATA_PMP=y
490# CONFIG_SATA_AHCI is not set 495# CONFIG_SATA_AHCI is not set
491# CONFIG_SATA_SIL24 is not set 496# CONFIG_SATA_SIL24 is not set
492# CONFIG_SATA_FSL is not set
493CONFIG_ATA_SFF=y 497CONFIG_ATA_SFF=y
494# CONFIG_SATA_SVW is not set 498# CONFIG_SATA_SVW is not set
495# CONFIG_ATA_PIIX is not set 499# CONFIG_ATA_PIIX is not set
@@ -545,18 +549,22 @@ CONFIG_PATA_MPC52xx=m
545# CONFIG_PATA_VIA is not set 549# CONFIG_PATA_VIA is not set
546# CONFIG_PATA_WINBOND is not set 550# CONFIG_PATA_WINBOND is not set
547# CONFIG_PATA_PLATFORM is not set 551# CONFIG_PATA_PLATFORM is not set
552# CONFIG_PATA_SCH is not set
548# CONFIG_MD is not set 553# CONFIG_MD is not set
549# CONFIG_FUSION is not set 554# CONFIG_FUSION is not set
550 555
551# 556#
552# IEEE 1394 (FireWire) support 557# IEEE 1394 (FireWire) support
553# 558#
559
560#
561# Enable only one of the two stacks, unless you know what you are doing
562#
554# CONFIG_FIREWIRE is not set 563# CONFIG_FIREWIRE is not set
555# CONFIG_IEEE1394 is not set 564# CONFIG_IEEE1394 is not set
556# CONFIG_I2O is not set 565# CONFIG_I2O is not set
557# CONFIG_MACINTOSH_DRIVERS is not set 566# CONFIG_MACINTOSH_DRIVERS is not set
558CONFIG_NETDEVICES=y 567CONFIG_NETDEVICES=y
559# CONFIG_NETDEVICES_MULTIQUEUE is not set
560# CONFIG_DUMMY is not set 568# CONFIG_DUMMY is not set
561# CONFIG_BONDING is not set 569# CONFIG_BONDING is not set
562# CONFIG_MACVLAN is not set 570# CONFIG_MACVLAN is not set
@@ -593,10 +601,14 @@ CONFIG_MII=y
593# CONFIG_IBM_NEW_EMAC_RGMII is not set 601# CONFIG_IBM_NEW_EMAC_RGMII is not set
594# CONFIG_IBM_NEW_EMAC_TAH is not set 602# CONFIG_IBM_NEW_EMAC_TAH is not set
595# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 603# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
604# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
605# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
606# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
596# CONFIG_NET_PCI is not set 607# CONFIG_NET_PCI is not set
597# CONFIG_B44 is not set 608# CONFIG_B44 is not set
598CONFIG_FEC_MPC52xx=y 609CONFIG_FEC_MPC52xx=y
599CONFIG_FEC_MPC52xx_MDIO=y 610CONFIG_FEC_MPC52xx_MDIO=y
611# CONFIG_ATL2 is not set
600# CONFIG_NETDEV_1000 is not set 612# CONFIG_NETDEV_1000 is not set
601# CONFIG_NETDEV_10000 is not set 613# CONFIG_NETDEV_10000 is not set
602# CONFIG_TR is not set 614# CONFIG_TR is not set
@@ -606,7 +618,6 @@ CONFIG_FEC_MPC52xx_MDIO=y
606# 618#
607# CONFIG_WLAN_PRE80211 is not set 619# CONFIG_WLAN_PRE80211 is not set
608# CONFIG_WLAN_80211 is not set 620# CONFIG_WLAN_80211 is not set
609# CONFIG_IWLWIFI is not set
610# CONFIG_IWLWIFI_LEDS is not set 621# CONFIG_IWLWIFI_LEDS is not set
611 622
612# 623#
@@ -644,6 +655,7 @@ CONFIG_FEC_MPC52xx_MDIO=y
644# Character devices 655# Character devices
645# 656#
646# CONFIG_VT is not set 657# CONFIG_VT is not set
658CONFIG_DEVKMEM=y
647# CONFIG_SERIAL_NONSTANDARD is not set 659# CONFIG_SERIAL_NONSTANDARD is not set
648# CONFIG_NOZOMI is not set 660# CONFIG_NOZOMI is not set
649 661
@@ -675,43 +687,64 @@ CONFIG_DEVPORT=y
675CONFIG_I2C=y 687CONFIG_I2C=y
676CONFIG_I2C_BOARDINFO=y 688CONFIG_I2C_BOARDINFO=y
677CONFIG_I2C_CHARDEV=y 689CONFIG_I2C_CHARDEV=y
690CONFIG_I2C_HELPER_AUTO=y
678 691
679# 692#
680# I2C Hardware Bus support 693# I2C Hardware Bus support
681# 694#
695
696#
697# PC SMBus host controller drivers
698#
682# CONFIG_I2C_ALI1535 is not set 699# CONFIG_I2C_ALI1535 is not set
683# CONFIG_I2C_ALI1563 is not set 700# CONFIG_I2C_ALI1563 is not set
684# CONFIG_I2C_ALI15X3 is not set 701# CONFIG_I2C_ALI15X3 is not set
685# CONFIG_I2C_AMD756 is not set 702# CONFIG_I2C_AMD756 is not set
686# CONFIG_I2C_AMD8111 is not set 703# CONFIG_I2C_AMD8111 is not set
687# CONFIG_I2C_I801 is not set 704# CONFIG_I2C_I801 is not set
688# CONFIG_I2C_I810 is not set 705# CONFIG_I2C_ISCH is not set
689# CONFIG_I2C_PIIX4 is not set 706# CONFIG_I2C_PIIX4 is not set
690CONFIG_I2C_MPC=y
691# CONFIG_I2C_NFORCE2 is not set 707# CONFIG_I2C_NFORCE2 is not set
692# CONFIG_I2C_OCORES is not set
693# CONFIG_I2C_PARPORT_LIGHT is not set
694# CONFIG_I2C_PROSAVAGE is not set
695# CONFIG_I2C_SAVAGE4 is not set
696# CONFIG_I2C_SIMTEC is not set
697# CONFIG_I2C_SIS5595 is not set 708# CONFIG_I2C_SIS5595 is not set
698# CONFIG_I2C_SIS630 is not set 709# CONFIG_I2C_SIS630 is not set
699# CONFIG_I2C_SIS96X is not set 710# CONFIG_I2C_SIS96X is not set
700# CONFIG_I2C_TAOS_EVM is not set
701# CONFIG_I2C_STUB is not set
702# CONFIG_I2C_TINY_USB is not set
703# CONFIG_I2C_VIA is not set 711# CONFIG_I2C_VIA is not set
704# CONFIG_I2C_VIAPRO is not set 712# CONFIG_I2C_VIAPRO is not set
713
714#
715# I2C system bus drivers (mostly embedded / system-on-chip)
716#
717CONFIG_I2C_MPC=y
718# CONFIG_I2C_OCORES is not set
719# CONFIG_I2C_SIMTEC is not set
720
721#
722# External I2C/SMBus adapter drivers
723#
724# CONFIG_I2C_PARPORT_LIGHT is not set
725# CONFIG_I2C_TAOS_EVM is not set
726# CONFIG_I2C_TINY_USB is not set
727
728#
729# Graphics adapter I2C/DDC channel drivers
730#
705# CONFIG_I2C_VOODOO3 is not set 731# CONFIG_I2C_VOODOO3 is not set
732
733#
734# Other I2C/SMBus bus drivers
735#
706# CONFIG_I2C_PCA_PLATFORM is not set 736# CONFIG_I2C_PCA_PLATFORM is not set
737# CONFIG_I2C_STUB is not set
707 738
708# 739#
709# Miscellaneous I2C Chip support 740# Miscellaneous I2C Chip support
710# 741#
711# CONFIG_DS1682 is not set 742# CONFIG_DS1682 is not set
743# CONFIG_AT24 is not set
712CONFIG_SENSORS_EEPROM=m 744CONFIG_SENSORS_EEPROM=m
713# CONFIG_SENSORS_PCF8574 is not set 745# CONFIG_SENSORS_PCF8574 is not set
714# CONFIG_PCF8575 is not set 746# CONFIG_PCF8575 is not set
747# CONFIG_SENSORS_PCA9539 is not set
715# CONFIG_SENSORS_PCF8591 is not set 748# CONFIG_SENSORS_PCF8591 is not set
716# CONFIG_SENSORS_MAX6875 is not set 749# CONFIG_SENSORS_MAX6875 is not set
717# CONFIG_SENSORS_TSL2550 is not set 750# CONFIG_SENSORS_TSL2550 is not set
@@ -720,29 +753,47 @@ CONFIG_SENSORS_EEPROM=m
720# CONFIG_I2C_DEBUG_BUS is not set 753# CONFIG_I2C_DEBUG_BUS is not set
721# CONFIG_I2C_DEBUG_CHIP is not set 754# CONFIG_I2C_DEBUG_CHIP is not set
722# CONFIG_SPI is not set 755# CONFIG_SPI is not set
756CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
757# CONFIG_GPIOLIB is not set
723# CONFIG_W1 is not set 758# CONFIG_W1 is not set
724# CONFIG_POWER_SUPPLY is not set 759# CONFIG_POWER_SUPPLY is not set
725# CONFIG_HWMON is not set 760# CONFIG_HWMON is not set
726# CONFIG_THERMAL is not set 761# CONFIG_THERMAL is not set
762# CONFIG_THERMAL_HWMON is not set
727# CONFIG_WATCHDOG is not set 763# CONFIG_WATCHDOG is not set
764CONFIG_SSB_POSSIBLE=y
728 765
729# 766#
730# Sonics Silicon Backplane 767# Sonics Silicon Backplane
731# 768#
732CONFIG_SSB_POSSIBLE=y
733# CONFIG_SSB is not set 769# CONFIG_SSB is not set
734 770
735# 771#
736# Multifunction device drivers 772# Multifunction device drivers
737# 773#
774# CONFIG_MFD_CORE is not set
738# CONFIG_MFD_SM501 is not set 775# CONFIG_MFD_SM501 is not set
739# CONFIG_HTC_PASIC3 is not set 776# CONFIG_HTC_PASIC3 is not set
777# CONFIG_MFD_TMIO is not set
778# CONFIG_PMIC_DA903X is not set
779# CONFIG_MFD_WM8400 is not set
780# CONFIG_MFD_WM8350_I2C is not set
781# CONFIG_REGULATOR is not set
740 782
741# 783#
742# Multimedia devices 784# Multimedia devices
743# 785#
786
787#
788# Multimedia core support
789#
744# CONFIG_VIDEO_DEV is not set 790# CONFIG_VIDEO_DEV is not set
745# CONFIG_DVB_CORE is not set 791# CONFIG_DVB_CORE is not set
792# CONFIG_VIDEO_MEDIA is not set
793
794#
795# Multimedia drivers
796#
746# CONFIG_DAB is not set 797# CONFIG_DAB is not set
747 798
748# 799#
@@ -759,10 +810,6 @@ CONFIG_SSB_POSSIBLE=y
759# Display device support 810# Display device support
760# 811#
761# CONFIG_DISPLAY_SUPPORT is not set 812# CONFIG_DISPLAY_SUPPORT is not set
762
763#
764# Sound
765#
766# CONFIG_SOUND is not set 813# CONFIG_SOUND is not set
767CONFIG_USB_SUPPORT=y 814CONFIG_USB_SUPPORT=y
768CONFIG_USB_ARCH_HAS_HCD=y 815CONFIG_USB_ARCH_HAS_HCD=y
@@ -781,12 +828,17 @@ CONFIG_USB_DEVICEFS=y
781# CONFIG_USB_OTG is not set 828# CONFIG_USB_OTG is not set
782# CONFIG_USB_OTG_WHITELIST is not set 829# CONFIG_USB_OTG_WHITELIST is not set
783# CONFIG_USB_OTG_BLACKLIST_HUB is not set 830# CONFIG_USB_OTG_BLACKLIST_HUB is not set
831# CONFIG_USB_MON is not set
832# CONFIG_USB_WUSB is not set
833# CONFIG_USB_WUSB_CBAF is not set
784 834
785# 835#
786# USB Host Controller Drivers 836# USB Host Controller Drivers
787# 837#
838# CONFIG_USB_C67X00_HCD is not set
788# CONFIG_USB_EHCI_HCD is not set 839# CONFIG_USB_EHCI_HCD is not set
789# CONFIG_USB_ISP116X_HCD is not set 840# CONFIG_USB_ISP116X_HCD is not set
841# CONFIG_USB_ISP1760_HCD is not set
790CONFIG_USB_OHCI_HCD=m 842CONFIG_USB_OHCI_HCD=m
791# CONFIG_USB_OHCI_HCD_PPC_SOC is not set 843# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
792CONFIG_USB_OHCI_HCD_PPC_OF=y 844CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -799,12 +851,17 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
799# CONFIG_USB_UHCI_HCD is not set 851# CONFIG_USB_UHCI_HCD is not set
800# CONFIG_USB_SL811_HCD is not set 852# CONFIG_USB_SL811_HCD is not set
801# CONFIG_USB_R8A66597_HCD is not set 853# CONFIG_USB_R8A66597_HCD is not set
854# CONFIG_USB_WHCI_HCD is not set
855# CONFIG_USB_HWA_HCD is not set
856# CONFIG_USB_MUSB_HDRC is not set
802 857
803# 858#
804# USB Device Class drivers 859# USB Device Class drivers
805# 860#
806# CONFIG_USB_ACM is not set 861# CONFIG_USB_ACM is not set
807# CONFIG_USB_PRINTER is not set 862# CONFIG_USB_PRINTER is not set
863# CONFIG_USB_WDM is not set
864# CONFIG_USB_TMC is not set
808 865
809# 866#
810# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 867# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -833,7 +890,6 @@ CONFIG_USB_STORAGE=m
833# 890#
834# CONFIG_USB_MDC800 is not set 891# CONFIG_USB_MDC800 is not set
835# CONFIG_USB_MICROTEK is not set 892# CONFIG_USB_MICROTEK is not set
836# CONFIG_USB_MON is not set
837 893
838# 894#
839# USB port drivers 895# USB port drivers
@@ -846,7 +902,7 @@ CONFIG_USB_STORAGE=m
846# CONFIG_USB_EMI62 is not set 902# CONFIG_USB_EMI62 is not set
847# CONFIG_USB_EMI26 is not set 903# CONFIG_USB_EMI26 is not set
848# CONFIG_USB_ADUTUX is not set 904# CONFIG_USB_ADUTUX is not set
849# CONFIG_USB_AUERSWALD is not set 905# CONFIG_USB_SEVSEG is not set
850# CONFIG_USB_RIO500 is not set 906# CONFIG_USB_RIO500 is not set
851# CONFIG_USB_LEGOTOWER is not set 907# CONFIG_USB_LEGOTOWER is not set
852# CONFIG_USB_LCD is not set 908# CONFIG_USB_LCD is not set
@@ -862,10 +918,14 @@ CONFIG_USB_STORAGE=m
862# CONFIG_USB_TRANCEVIBRATOR is not set 918# CONFIG_USB_TRANCEVIBRATOR is not set
863# CONFIG_USB_IOWARRIOR is not set 919# CONFIG_USB_IOWARRIOR is not set
864# CONFIG_USB_TEST is not set 920# CONFIG_USB_TEST is not set
921# CONFIG_USB_ISIGHTFW is not set
922# CONFIG_USB_VST is not set
865# CONFIG_USB_GADGET is not set 923# CONFIG_USB_GADGET is not set
924# CONFIG_UWB is not set
866# CONFIG_MMC is not set 925# CONFIG_MMC is not set
867# CONFIG_MEMSTICK is not set 926# CONFIG_MEMSTICK is not set
868# CONFIG_NEW_LEDS is not set 927# CONFIG_NEW_LEDS is not set
928# CONFIG_ACCESSIBILITY is not set
869# CONFIG_INFINIBAND is not set 929# CONFIG_INFINIBAND is not set
870# CONFIG_EDAC is not set 930# CONFIG_EDAC is not set
871CONFIG_RTC_LIB=m 931CONFIG_RTC_LIB=m
@@ -894,6 +954,8 @@ CONFIG_RTC_DRV_PCF8563=m
894# CONFIG_RTC_DRV_PCF8583 is not set 954# CONFIG_RTC_DRV_PCF8583 is not set
895# CONFIG_RTC_DRV_M41T80 is not set 955# CONFIG_RTC_DRV_M41T80 is not set
896# CONFIG_RTC_DRV_S35390A is not set 956# CONFIG_RTC_DRV_S35390A is not set
957# CONFIG_RTC_DRV_FM3130 is not set
958# CONFIG_RTC_DRV_RX8581 is not set
897 959
898# 960#
899# SPI RTC drivers 961# SPI RTC drivers
@@ -903,19 +965,25 @@ CONFIG_RTC_DRV_PCF8563=m
903# Platform RTC drivers 965# Platform RTC drivers
904# 966#
905# CONFIG_RTC_DRV_CMOS is not set 967# CONFIG_RTC_DRV_CMOS is not set
968# CONFIG_RTC_DRV_DS1286 is not set
906# CONFIG_RTC_DRV_DS1511 is not set 969# CONFIG_RTC_DRV_DS1511 is not set
907# CONFIG_RTC_DRV_DS1553 is not set 970# CONFIG_RTC_DRV_DS1553 is not set
908# CONFIG_RTC_DRV_DS1742 is not set 971# CONFIG_RTC_DRV_DS1742 is not set
909# CONFIG_RTC_DRV_STK17TA8 is not set 972# CONFIG_RTC_DRV_STK17TA8 is not set
910# CONFIG_RTC_DRV_M48T86 is not set 973# CONFIG_RTC_DRV_M48T86 is not set
974# CONFIG_RTC_DRV_M48T35 is not set
911# CONFIG_RTC_DRV_M48T59 is not set 975# CONFIG_RTC_DRV_M48T59 is not set
976# CONFIG_RTC_DRV_BQ4802 is not set
912# CONFIG_RTC_DRV_V3020 is not set 977# CONFIG_RTC_DRV_V3020 is not set
913 978
914# 979#
915# on-CPU RTC drivers 980# on-CPU RTC drivers
916# 981#
982# CONFIG_RTC_DRV_PPC is not set
917# CONFIG_DMADEVICES is not set 983# CONFIG_DMADEVICES is not set
918# CONFIG_UIO is not set 984# CONFIG_UIO is not set
985# CONFIG_STAGING is not set
986CONFIG_STAGING_EXCLUDE_BUILD=y
919 987
920# 988#
921# File systems 989# File systems
@@ -927,12 +995,13 @@ CONFIG_EXT3_FS=m
927CONFIG_EXT3_FS_XATTR=y 995CONFIG_EXT3_FS_XATTR=y
928# CONFIG_EXT3_FS_POSIX_ACL is not set 996# CONFIG_EXT3_FS_POSIX_ACL is not set
929# CONFIG_EXT3_FS_SECURITY is not set 997# CONFIG_EXT3_FS_SECURITY is not set
930# CONFIG_EXT4DEV_FS is not set 998# CONFIG_EXT4_FS is not set
931CONFIG_JBD=m 999CONFIG_JBD=m
932CONFIG_FS_MBCACHE=m 1000CONFIG_FS_MBCACHE=m
933# CONFIG_REISERFS_FS is not set 1001# CONFIG_REISERFS_FS is not set
934# CONFIG_JFS_FS is not set 1002# CONFIG_JFS_FS is not set
935# CONFIG_FS_POSIX_ACL is not set 1003# CONFIG_FS_POSIX_ACL is not set
1004CONFIG_FILE_LOCKING=y
936# CONFIG_XFS_FS is not set 1005# CONFIG_XFS_FS is not set
937# CONFIG_OCFS2_FS is not set 1006# CONFIG_OCFS2_FS is not set
938# CONFIG_DNOTIFY is not set 1007# CONFIG_DNOTIFY is not set
@@ -964,6 +1033,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
964CONFIG_PROC_FS=y 1033CONFIG_PROC_FS=y
965# CONFIG_PROC_KCORE is not set 1034# CONFIG_PROC_KCORE is not set
966CONFIG_PROC_SYSCTL=y 1035CONFIG_PROC_SYSCTL=y
1036CONFIG_PROC_PAGE_MONITOR=y
967CONFIG_SYSFS=y 1037CONFIG_SYSFS=y
968CONFIG_TMPFS=y 1038CONFIG_TMPFS=y
969# CONFIG_TMPFS_POSIX_ACL is not set 1039# CONFIG_TMPFS_POSIX_ACL is not set
@@ -994,6 +1064,7 @@ CONFIG_JFFS2_RTIME=y
994# CONFIG_CRAMFS is not set 1064# CONFIG_CRAMFS is not set
995# CONFIG_VXFS_FS is not set 1065# CONFIG_VXFS_FS is not set
996# CONFIG_MINIX_FS is not set 1066# CONFIG_MINIX_FS is not set
1067# CONFIG_OMFS_FS is not set
997# CONFIG_HPFS_FS is not set 1068# CONFIG_HPFS_FS is not set
998# CONFIG_QNX4FS_FS is not set 1069# CONFIG_QNX4FS_FS is not set
999# CONFIG_ROMFS_FS is not set 1070# CONFIG_ROMFS_FS is not set
@@ -1004,13 +1075,13 @@ CONFIG_NFS_FS=y
1004CONFIG_NFS_V3=y 1075CONFIG_NFS_V3=y
1005# CONFIG_NFS_V3_ACL is not set 1076# CONFIG_NFS_V3_ACL is not set
1006# CONFIG_NFS_V4 is not set 1077# CONFIG_NFS_V4 is not set
1007# CONFIG_NFSD is not set
1008CONFIG_ROOT_NFS=y 1078CONFIG_ROOT_NFS=y
1079# CONFIG_NFSD is not set
1009CONFIG_LOCKD=y 1080CONFIG_LOCKD=y
1010CONFIG_LOCKD_V4=y 1081CONFIG_LOCKD_V4=y
1011CONFIG_NFS_COMMON=y 1082CONFIG_NFS_COMMON=y
1012CONFIG_SUNRPC=y 1083CONFIG_SUNRPC=y
1013# CONFIG_SUNRPC_BIND34 is not set 1084# CONFIG_SUNRPC_REGISTER_V4 is not set
1014# CONFIG_RPCSEC_GSS_KRB5 is not set 1085# CONFIG_RPCSEC_GSS_KRB5 is not set
1015# CONFIG_RPCSEC_GSS_SPKM3 is not set 1086# CONFIG_RPCSEC_GSS_SPKM3 is not set
1016# CONFIG_SMB_FS is not set 1087# CONFIG_SMB_FS is not set
@@ -1070,9 +1141,9 @@ CONFIG_NLS_ISO8859_1=y
1070# Library routines 1141# Library routines
1071# 1142#
1072CONFIG_BITREVERSE=y 1143CONFIG_BITREVERSE=y
1073# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1074# CONFIG_CRC_CCITT is not set 1144# CONFIG_CRC_CCITT is not set
1075# CONFIG_CRC16 is not set 1145# CONFIG_CRC16 is not set
1146# CONFIG_CRC_T10DIF is not set
1076# CONFIG_CRC_ITU_T is not set 1147# CONFIG_CRC_ITU_T is not set
1077CONFIG_CRC32=y 1148CONFIG_CRC32=y
1078# CONFIG_CRC7 is not set 1149# CONFIG_CRC7 is not set
@@ -1098,7 +1169,17 @@ CONFIG_FRAME_WARN=1024
1098# CONFIG_HEADERS_CHECK is not set 1169# CONFIG_HEADERS_CHECK is not set
1099# CONFIG_DEBUG_KERNEL is not set 1170# CONFIG_DEBUG_KERNEL is not set
1100# CONFIG_DEBUG_BUGVERBOSE is not set 1171# CONFIG_DEBUG_BUGVERBOSE is not set
1172# CONFIG_DEBUG_MEMORY_INIT is not set
1173# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1174# CONFIG_LATENCYTOP is not set
1175CONFIG_HAVE_FUNCTION_TRACER=y
1176
1177#
1178# Tracers
1179#
1180# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1101# CONFIG_SAMPLES is not set 1181# CONFIG_SAMPLES is not set
1182CONFIG_HAVE_ARCH_KGDB=y
1102# CONFIG_IRQSTACKS is not set 1183# CONFIG_IRQSTACKS is not set
1103# CONFIG_BOOTX_TEXT is not set 1184# CONFIG_BOOTX_TEXT is not set
1104# CONFIG_PPC_EARLY_DEBUG is not set 1185# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1108,6 +1189,7 @@ CONFIG_FRAME_WARN=1024
1108# 1189#
1109# CONFIG_KEYS is not set 1190# CONFIG_KEYS is not set
1110# CONFIG_SECURITY is not set 1191# CONFIG_SECURITY is not set
1192# CONFIG_SECURITYFS is not set
1111# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1193# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1112# CONFIG_CRYPTO is not set 1194# CONFIG_CRYPTO is not set
1113CONFIG_PPC_CLOCK=y 1195CONFIG_PPC_CLOCK=y
diff --git a/arch/powerpc/configs/52xx/tqm5200_defconfig b/arch/powerpc/configs/52xx/tqm5200_defconfig
index 7672bfba3566..bc190051e8d5 100644
--- a/arch/powerpc/configs/52xx/tqm5200_defconfig
+++ b/arch/powerpc/configs/52xx/tqm5200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.25 3# Linux kernel version: 2.6.28-rc4
4# Tue Apr 29 07:12:39 2008 4# Thu Nov 13 02:09:30 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
34CONFIG_STACKTRACE_SUPPORT=y 34CONFIG_STACKTRACE_SUPPORT=y
35CONFIG_HAVE_LATENCYTOP_SUPPORT=y
35CONFIG_LOCKDEP_SUPPORT=y 36CONFIG_LOCKDEP_SUPPORT=y
36CONFIG_RWSEM_XCHGADD_ALGORITHM=y 37CONFIG_RWSEM_XCHGADD_ALGORITHM=y
37CONFIG_ARCH_HAS_ILOG2_U32=y 38CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -102,6 +103,7 @@ CONFIG_SIGNALFD=y
102CONFIG_TIMERFD=y 103CONFIG_TIMERFD=y
103CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
104CONFIG_SHMEM=y 105CONFIG_SHMEM=y
106CONFIG_AIO=y
105CONFIG_VM_EVENT_COUNTERS=y 107CONFIG_VM_EVENT_COUNTERS=y
106CONFIG_SLUB_DEBUG=y 108CONFIG_SLUB_DEBUG=y
107# CONFIG_SLAB is not set 109# CONFIG_SLAB is not set
@@ -110,14 +112,19 @@ CONFIG_SLUB=y
110# CONFIG_PROFILING is not set 112# CONFIG_PROFILING is not set
111# CONFIG_MARKERS is not set 113# CONFIG_MARKERS is not set
112CONFIG_HAVE_OPROFILE=y 114CONFIG_HAVE_OPROFILE=y
115CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
116CONFIG_HAVE_IOREMAP_PROT=y
113CONFIG_HAVE_KPROBES=y 117CONFIG_HAVE_KPROBES=y
114CONFIG_HAVE_KRETPROBES=y 118CONFIG_HAVE_KRETPROBES=y
115CONFIG_PROC_PAGE_MONITOR=y 119CONFIG_HAVE_ARCH_TRACEHOOK=y
120CONFIG_HAVE_CLK=y
121# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
116CONFIG_SLABINFO=y 122CONFIG_SLABINFO=y
117CONFIG_RT_MUTEXES=y 123CONFIG_RT_MUTEXES=y
118# CONFIG_TINY_SHMEM is not set 124# CONFIG_TINY_SHMEM is not set
119CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
120CONFIG_MODULES=y 126CONFIG_MODULES=y
127# CONFIG_MODULE_FORCE_LOAD is not set
121CONFIG_MODULE_UNLOAD=y 128CONFIG_MODULE_UNLOAD=y
122# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
123CONFIG_MODVERSIONS=y 130CONFIG_MODVERSIONS=y
@@ -128,6 +135,7 @@ CONFIG_BLOCK=y
128# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
129# CONFIG_LSF is not set 136# CONFIG_LSF is not set
130# CONFIG_BLK_DEV_BSG is not set 137# CONFIG_BLK_DEV_BSG is not set
138# CONFIG_BLK_DEV_INTEGRITY is not set
131 139
132# 140#
133# IO Schedulers 141# IO Schedulers
@@ -142,19 +150,16 @@ CONFIG_DEFAULT_AS=y
142# CONFIG_DEFAULT_NOOP is not set 150# CONFIG_DEFAULT_NOOP is not set
143CONFIG_DEFAULT_IOSCHED="anticipatory" 151CONFIG_DEFAULT_IOSCHED="anticipatory"
144CONFIG_CLASSIC_RCU=y 152CONFIG_CLASSIC_RCU=y
153# CONFIG_FREEZER is not set
145 154
146# 155#
147# Platform support 156# Platform support
148# 157#
149CONFIG_PPC_MULTIPLATFORM=y 158CONFIG_PPC_MULTIPLATFORM=y
150# CONFIG_PPC_82xx is not set
151# CONFIG_PPC_83xx is not set
152# CONFIG_PPC_86xx is not set
153CONFIG_CLASSIC32=y 159CONFIG_CLASSIC32=y
154# CONFIG_PPC_CHRP is not set 160# CONFIG_PPC_CHRP is not set
155# CONFIG_PPC_MPC512x is not set
156# CONFIG_PPC_MPC5121 is not set
157# CONFIG_MPC5121_ADS is not set 161# CONFIG_MPC5121_ADS is not set
162# CONFIG_MPC5121_GENERIC is not set
158CONFIG_PPC_MPC52xx=y 163CONFIG_PPC_MPC52xx=y
159CONFIG_PPC_MPC5200_SIMPLE=y 164CONFIG_PPC_MPC5200_SIMPLE=y
160# CONFIG_PPC_EFIKA is not set 165# CONFIG_PPC_EFIKA is not set
@@ -164,7 +169,10 @@ CONFIG_PPC_MPC5200_BUGFIX=y
164# CONFIG_PPC_PMAC is not set 169# CONFIG_PPC_PMAC is not set
165# CONFIG_PPC_CELL is not set 170# CONFIG_PPC_CELL is not set
166# CONFIG_PPC_CELL_NATIVE is not set 171# CONFIG_PPC_CELL_NATIVE is not set
172# CONFIG_PPC_82xx is not set
167# CONFIG_PQ2ADS is not set 173# CONFIG_PQ2ADS is not set
174# CONFIG_PPC_83xx is not set
175# CONFIG_PPC_86xx is not set
168# CONFIG_EMBEDDED6xx is not set 176# CONFIG_EMBEDDED6xx is not set
169# CONFIG_IPIC is not set 177# CONFIG_IPIC is not set
170# CONFIG_MPIC is not set 178# CONFIG_MPIC is not set
@@ -188,7 +196,6 @@ CONFIG_PPC_BESTCOMM_FEC=y
188# Kernel options 196# Kernel options
189# 197#
190# CONFIG_HIGHMEM is not set 198# CONFIG_HIGHMEM is not set
191# CONFIG_TICK_ONESHOT is not set
192# CONFIG_NO_HZ is not set 199# CONFIG_NO_HZ is not set
193# CONFIG_HIGH_RES_TIMERS is not set 200# CONFIG_HIGH_RES_TIMERS is not set
194CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 201CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -202,6 +209,8 @@ CONFIG_PREEMPT_NONE=y
202# CONFIG_PREEMPT_VOLUNTARY is not set 209# CONFIG_PREEMPT_VOLUNTARY is not set
203# CONFIG_PREEMPT is not set 210# CONFIG_PREEMPT is not set
204CONFIG_BINFMT_ELF=y 211CONFIG_BINFMT_ELF=y
212# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
213# CONFIG_HAVE_AOUT is not set
205# CONFIG_BINFMT_MISC is not set 214# CONFIG_BINFMT_MISC is not set
206# CONFIG_IOMMU_HELPER is not set 215# CONFIG_IOMMU_HELPER is not set
207CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 216CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -216,19 +225,20 @@ CONFIG_FLATMEM_MANUAL=y
216# CONFIG_SPARSEMEM_MANUAL is not set 225# CONFIG_SPARSEMEM_MANUAL is not set
217CONFIG_FLATMEM=y 226CONFIG_FLATMEM=y
218CONFIG_FLAT_NODE_MEM_MAP=y 227CONFIG_FLAT_NODE_MEM_MAP=y
219# CONFIG_SPARSEMEM_STATIC is not set
220# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
221CONFIG_PAGEFLAGS_EXTENDED=y 228CONFIG_PAGEFLAGS_EXTENDED=y
222CONFIG_SPLIT_PTLOCK_CPUS=4 229CONFIG_SPLIT_PTLOCK_CPUS=4
230CONFIG_MIGRATION=y
223# CONFIG_RESOURCES_64BIT is not set 231# CONFIG_RESOURCES_64BIT is not set
232# CONFIG_PHYS_ADDR_T_64BIT is not set
224CONFIG_ZONE_DMA_FLAG=1 233CONFIG_ZONE_DMA_FLAG=1
225CONFIG_BOUNCE=y 234CONFIG_BOUNCE=y
226CONFIG_VIRT_TO_BUS=y 235CONFIG_VIRT_TO_BUS=y
236CONFIG_UNEVICTABLE_LRU=y
227CONFIG_FORCE_MAX_ZONEORDER=11 237CONFIG_FORCE_MAX_ZONEORDER=11
228CONFIG_PROC_DEVICETREE=y 238CONFIG_PROC_DEVICETREE=y
229# CONFIG_CMDLINE_BOOL is not set 239# CONFIG_CMDLINE_BOOL is not set
240CONFIG_EXTRA_TARGETS=""
230CONFIG_PM=y 241CONFIG_PM=y
231# CONFIG_PM_LEGACY is not set
232# CONFIG_PM_DEBUG is not set 242# CONFIG_PM_DEBUG is not set
233CONFIG_SECCOMP=y 243CONFIG_SECCOMP=y
234CONFIG_ISA_DMA_API=y 244CONFIG_ISA_DMA_API=y
@@ -238,7 +248,7 @@ CONFIG_ISA_DMA_API=y
238# 248#
239CONFIG_ZONE_DMA=y 249CONFIG_ZONE_DMA=y
240CONFIG_GENERIC_ISA_DMA=y 250CONFIG_GENERIC_ISA_DMA=y
241CONFIG_FSL_SOC=y 251CONFIG_PPC_PCI_CHOICE=y
242# CONFIG_PCI is not set 252# CONFIG_PCI is not set
243# CONFIG_PCI_DOMAINS is not set 253# CONFIG_PCI_DOMAINS is not set
244# CONFIG_PCI_SYSCALL is not set 254# CONFIG_PCI_SYSCALL is not set
@@ -259,10 +269,6 @@ CONFIG_PAGE_OFFSET=0xc0000000
259CONFIG_KERNEL_START=0xc0000000 269CONFIG_KERNEL_START=0xc0000000
260CONFIG_PHYSICAL_START=0x00000000 270CONFIG_PHYSICAL_START=0x00000000
261CONFIG_TASK_SIZE=0xc0000000 271CONFIG_TASK_SIZE=0xc0000000
262
263#
264# Networking
265#
266CONFIG_NET=y 272CONFIG_NET=y
267 273
268# 274#
@@ -313,6 +319,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
313# CONFIG_TIPC is not set 319# CONFIG_TIPC is not set
314# CONFIG_ATM is not set 320# CONFIG_ATM is not set
315# CONFIG_BRIDGE is not set 321# CONFIG_BRIDGE is not set
322# CONFIG_NET_DSA is not set
316# CONFIG_VLAN_8021Q is not set 323# CONFIG_VLAN_8021Q is not set
317# CONFIG_DECNET is not set 324# CONFIG_DECNET is not set
318# CONFIG_LLC2 is not set 325# CONFIG_LLC2 is not set
@@ -333,14 +340,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
333# CONFIG_IRDA is not set 340# CONFIG_IRDA is not set
334# CONFIG_BT is not set 341# CONFIG_BT is not set
335# CONFIG_AF_RXRPC is not set 342# CONFIG_AF_RXRPC is not set
336 343# CONFIG_PHONET is not set
337# 344# CONFIG_WIRELESS is not set
338# Wireless
339#
340# CONFIG_CFG80211 is not set
341# CONFIG_WIRELESS_EXT is not set
342# CONFIG_MAC80211 is not set
343# CONFIG_IEEE80211 is not set
344# CONFIG_RFKILL is not set 345# CONFIG_RFKILL is not set
345# CONFIG_NET_9P is not set 346# CONFIG_NET_9P is not set
346 347
@@ -451,6 +452,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
451# CONFIG_BLK_DEV_XIP is not set 452# CONFIG_BLK_DEV_XIP is not set
452# CONFIG_CDROM_PKTCDVD is not set 453# CONFIG_CDROM_PKTCDVD is not set
453# CONFIG_ATA_OVER_ETH is not set 454# CONFIG_ATA_OVER_ETH is not set
455# CONFIG_BLK_DEV_HD is not set
454# CONFIG_MISC_DEVICES is not set 456# CONFIG_MISC_DEVICES is not set
455CONFIG_HAVE_IDE=y 457CONFIG_HAVE_IDE=y
456# CONFIG_IDE is not set 458# CONFIG_IDE is not set
@@ -495,10 +497,10 @@ CONFIG_SCSI_WAIT_SCAN=m
495CONFIG_SCSI_LOWLEVEL=y 497CONFIG_SCSI_LOWLEVEL=y
496# CONFIG_ISCSI_TCP is not set 498# CONFIG_ISCSI_TCP is not set
497# CONFIG_SCSI_DEBUG is not set 499# CONFIG_SCSI_DEBUG is not set
500# CONFIG_SCSI_DH is not set
498CONFIG_ATA=y 501CONFIG_ATA=y
499# CONFIG_ATA_NONSTANDARD is not set 502# CONFIG_ATA_NONSTANDARD is not set
500CONFIG_SATA_PMP=y 503CONFIG_SATA_PMP=y
501# CONFIG_SATA_FSL is not set
502CONFIG_ATA_SFF=y 504CONFIG_ATA_SFF=y
503# CONFIG_SATA_MV is not set 505# CONFIG_SATA_MV is not set
504CONFIG_PATA_MPC52xx=y 506CONFIG_PATA_MPC52xx=y
@@ -507,7 +509,6 @@ CONFIG_PATA_PLATFORM=y
507# CONFIG_MD is not set 509# CONFIG_MD is not set
508# CONFIG_MACINTOSH_DRIVERS is not set 510# CONFIG_MACINTOSH_DRIVERS is not set
509CONFIG_NETDEVICES=y 511CONFIG_NETDEVICES=y
510# CONFIG_NETDEVICES_MULTIQUEUE is not set
511# CONFIG_DUMMY is not set 512# CONFIG_DUMMY is not set
512# CONFIG_BONDING is not set 513# CONFIG_BONDING is not set
513# CONFIG_MACVLAN is not set 514# CONFIG_MACVLAN is not set
@@ -537,6 +538,9 @@ CONFIG_NET_ETHERNET=y
537# CONFIG_IBM_NEW_EMAC_RGMII is not set 538# CONFIG_IBM_NEW_EMAC_RGMII is not set
538# CONFIG_IBM_NEW_EMAC_TAH is not set 539# CONFIG_IBM_NEW_EMAC_TAH is not set
539# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 540# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
541# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
542# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
543# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
540# CONFIG_B44 is not set 544# CONFIG_B44 is not set
541CONFIG_FEC_MPC52xx=y 545CONFIG_FEC_MPC52xx=y
542CONFIG_FEC_MPC52xx_MDIO=y 546CONFIG_FEC_MPC52xx_MDIO=y
@@ -548,7 +552,6 @@ CONFIG_FEC_MPC52xx_MDIO=y
548# 552#
549# CONFIG_WLAN_PRE80211 is not set 553# CONFIG_WLAN_PRE80211 is not set
550# CONFIG_WLAN_80211 is not set 554# CONFIG_WLAN_80211 is not set
551# CONFIG_IWLWIFI is not set
552# CONFIG_IWLWIFI_LEDS is not set 555# CONFIG_IWLWIFI_LEDS is not set
553 556
554# 557#
@@ -583,6 +586,7 @@ CONFIG_FEC_MPC52xx_MDIO=y
583# Character devices 586# Character devices
584# 587#
585# CONFIG_VT is not set 588# CONFIG_VT is not set
589CONFIG_DEVKMEM=y
586# CONFIG_SERIAL_NONSTANDARD is not set 590# CONFIG_SERIAL_NONSTANDARD is not set
587 591
588# 592#
@@ -611,26 +615,41 @@ CONFIG_LEGACY_PTY_COUNT=256
611CONFIG_I2C=y 615CONFIG_I2C=y
612CONFIG_I2C_BOARDINFO=y 616CONFIG_I2C_BOARDINFO=y
613CONFIG_I2C_CHARDEV=y 617CONFIG_I2C_CHARDEV=y
618CONFIG_I2C_HELPER_AUTO=y
614 619
615# 620#
616# I2C Hardware Bus support 621# I2C Hardware Bus support
617# 622#
623
624#
625# I2C system bus drivers (mostly embedded / system-on-chip)
626#
618CONFIG_I2C_MPC=y 627CONFIG_I2C_MPC=y
619# CONFIG_I2C_OCORES is not set 628# CONFIG_I2C_OCORES is not set
620# CONFIG_I2C_PARPORT_LIGHT is not set
621# CONFIG_I2C_SIMTEC is not set 629# CONFIG_I2C_SIMTEC is not set
630
631#
632# External I2C/SMBus adapter drivers
633#
634# CONFIG_I2C_PARPORT_LIGHT is not set
622# CONFIG_I2C_TAOS_EVM is not set 635# CONFIG_I2C_TAOS_EVM is not set
623# CONFIG_I2C_STUB is not set
624# CONFIG_I2C_TINY_USB is not set 636# CONFIG_I2C_TINY_USB is not set
637
638#
639# Other I2C/SMBus bus drivers
640#
625# CONFIG_I2C_PCA_PLATFORM is not set 641# CONFIG_I2C_PCA_PLATFORM is not set
642# CONFIG_I2C_STUB is not set
626 643
627# 644#
628# Miscellaneous I2C Chip support 645# Miscellaneous I2C Chip support
629# 646#
630# CONFIG_DS1682 is not set 647# CONFIG_DS1682 is not set
648# CONFIG_AT24 is not set
631# CONFIG_SENSORS_EEPROM is not set 649# CONFIG_SENSORS_EEPROM is not set
632# CONFIG_SENSORS_PCF8574 is not set 650# CONFIG_SENSORS_PCF8574 is not set
633# CONFIG_PCF8575 is not set 651# CONFIG_PCF8575 is not set
652# CONFIG_SENSORS_PCA9539 is not set
634# CONFIG_SENSORS_PCF8591 is not set 653# CONFIG_SENSORS_PCF8591 is not set
635# CONFIG_SENSORS_MAX6875 is not set 654# CONFIG_SENSORS_MAX6875 is not set
636# CONFIG_SENSORS_TSL2550 is not set 655# CONFIG_SENSORS_TSL2550 is not set
@@ -639,10 +658,13 @@ CONFIG_I2C_MPC=y
639# CONFIG_I2C_DEBUG_BUS is not set 658# CONFIG_I2C_DEBUG_BUS is not set
640# CONFIG_I2C_DEBUG_CHIP is not set 659# CONFIG_I2C_DEBUG_CHIP is not set
641# CONFIG_SPI is not set 660# CONFIG_SPI is not set
661CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
662# CONFIG_GPIOLIB is not set
642# CONFIG_W1 is not set 663# CONFIG_W1 is not set
643# CONFIG_POWER_SUPPLY is not set 664# CONFIG_POWER_SUPPLY is not set
644CONFIG_HWMON=y 665CONFIG_HWMON=y
645# CONFIG_HWMON_VID is not set 666# CONFIG_HWMON_VID is not set
667# CONFIG_SENSORS_AD7414 is not set
646# CONFIG_SENSORS_AD7418 is not set 668# CONFIG_SENSORS_AD7418 is not set
647# CONFIG_SENSORS_ADM1021 is not set 669# CONFIG_SENSORS_ADM1021 is not set
648# CONFIG_SENSORS_ADM1025 is not set 670# CONFIG_SENSORS_ADM1025 is not set
@@ -650,6 +672,7 @@ CONFIG_HWMON=y
650# CONFIG_SENSORS_ADM1029 is not set 672# CONFIG_SENSORS_ADM1029 is not set
651# CONFIG_SENSORS_ADM1031 is not set 673# CONFIG_SENSORS_ADM1031 is not set
652# CONFIG_SENSORS_ADM9240 is not set 674# CONFIG_SENSORS_ADM9240 is not set
675# CONFIG_SENSORS_ADT7462 is not set
653# CONFIG_SENSORS_ADT7470 is not set 676# CONFIG_SENSORS_ADT7470 is not set
654# CONFIG_SENSORS_ADT7473 is not set 677# CONFIG_SENSORS_ADT7473 is not set
655# CONFIG_SENSORS_ATXP1 is not set 678# CONFIG_SENSORS_ATXP1 is not set
@@ -692,6 +715,7 @@ CONFIG_HWMON=y
692# CONFIG_SENSORS_W83627EHF is not set 715# CONFIG_SENSORS_W83627EHF is not set
693# CONFIG_HWMON_DEBUG_CHIP is not set 716# CONFIG_HWMON_DEBUG_CHIP is not set
694# CONFIG_THERMAL is not set 717# CONFIG_THERMAL is not set
718# CONFIG_THERMAL_HWMON is not set
695CONFIG_WATCHDOG=y 719CONFIG_WATCHDOG=y
696# CONFIG_WATCHDOG_NOWAYOUT is not set 720# CONFIG_WATCHDOG_NOWAYOUT is not set
697 721
@@ -705,24 +729,39 @@ CONFIG_WATCHDOG=y
705# USB-based Watchdog Cards 729# USB-based Watchdog Cards
706# 730#
707# CONFIG_USBPCWATCHDOG is not set 731# CONFIG_USBPCWATCHDOG is not set
732CONFIG_SSB_POSSIBLE=y
708 733
709# 734#
710# Sonics Silicon Backplane 735# Sonics Silicon Backplane
711# 736#
712CONFIG_SSB_POSSIBLE=y
713# CONFIG_SSB is not set 737# CONFIG_SSB is not set
714 738
715# 739#
716# Multifunction device drivers 740# Multifunction device drivers
717# 741#
742# CONFIG_MFD_CORE is not set
718# CONFIG_MFD_SM501 is not set 743# CONFIG_MFD_SM501 is not set
719# CONFIG_HTC_PASIC3 is not set 744# CONFIG_HTC_PASIC3 is not set
745# CONFIG_MFD_TMIO is not set
746# CONFIG_PMIC_DA903X is not set
747# CONFIG_MFD_WM8400 is not set
748# CONFIG_MFD_WM8350_I2C is not set
749# CONFIG_REGULATOR is not set
720 750
721# 751#
722# Multimedia devices 752# Multimedia devices
723# 753#
754
755#
756# Multimedia core support
757#
724# CONFIG_VIDEO_DEV is not set 758# CONFIG_VIDEO_DEV is not set
725# CONFIG_DVB_CORE is not set 759# CONFIG_DVB_CORE is not set
760# CONFIG_VIDEO_MEDIA is not set
761
762#
763# Multimedia drivers
764#
726# CONFIG_DAB is not set 765# CONFIG_DAB is not set
727 766
728# 767#
@@ -737,10 +776,6 @@ CONFIG_SSB_POSSIBLE=y
737# Display device support 776# Display device support
738# 777#
739# CONFIG_DISPLAY_SUPPORT is not set 778# CONFIG_DISPLAY_SUPPORT is not set
740
741#
742# Sound
743#
744# CONFIG_SOUND is not set 779# CONFIG_SOUND is not set
745CONFIG_USB_SUPPORT=y 780CONFIG_USB_SUPPORT=y
746CONFIG_USB_ARCH_HAS_HCD=y 781CONFIG_USB_ARCH_HAS_HCD=y
@@ -760,11 +795,16 @@ CONFIG_USB_DEVICEFS=y
760# CONFIG_USB_OTG is not set 795# CONFIG_USB_OTG is not set
761# CONFIG_USB_OTG_WHITELIST is not set 796# CONFIG_USB_OTG_WHITELIST is not set
762# CONFIG_USB_OTG_BLACKLIST_HUB is not set 797# CONFIG_USB_OTG_BLACKLIST_HUB is not set
798CONFIG_USB_MON=y
799# CONFIG_USB_WUSB is not set
800# CONFIG_USB_WUSB_CBAF is not set
763 801
764# 802#
765# USB Host Controller Drivers 803# USB Host Controller Drivers
766# 804#
805# CONFIG_USB_C67X00_HCD is not set
767# CONFIG_USB_ISP116X_HCD is not set 806# CONFIG_USB_ISP116X_HCD is not set
807# CONFIG_USB_ISP1760_HCD is not set
768CONFIG_USB_OHCI_HCD=y 808CONFIG_USB_OHCI_HCD=y
769CONFIG_USB_OHCI_HCD_PPC_SOC=y 809CONFIG_USB_OHCI_HCD_PPC_SOC=y
770CONFIG_USB_OHCI_HCD_PPC_OF=y 810CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -775,12 +815,16 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
775# CONFIG_USB_OHCI_LITTLE_ENDIAN is not set 815# CONFIG_USB_OHCI_LITTLE_ENDIAN is not set
776# CONFIG_USB_SL811_HCD is not set 816# CONFIG_USB_SL811_HCD is not set
777# CONFIG_USB_R8A66597_HCD is not set 817# CONFIG_USB_R8A66597_HCD is not set
818# CONFIG_USB_HWA_HCD is not set
819# CONFIG_USB_MUSB_HDRC is not set
778 820
779# 821#
780# USB Device Class drivers 822# USB Device Class drivers
781# 823#
782# CONFIG_USB_ACM is not set 824# CONFIG_USB_ACM is not set
783# CONFIG_USB_PRINTER is not set 825# CONFIG_USB_PRINTER is not set
826# CONFIG_USB_WDM is not set
827# CONFIG_USB_TMC is not set
784 828
785# 829#
786# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 830# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -809,7 +853,6 @@ CONFIG_USB_STORAGE=y
809# 853#
810# CONFIG_USB_MDC800 is not set 854# CONFIG_USB_MDC800 is not set
811# CONFIG_USB_MICROTEK is not set 855# CONFIG_USB_MICROTEK is not set
812CONFIG_USB_MON=y
813 856
814# 857#
815# USB port drivers 858# USB port drivers
@@ -822,7 +865,7 @@ CONFIG_USB_MON=y
822# CONFIG_USB_EMI62 is not set 865# CONFIG_USB_EMI62 is not set
823# CONFIG_USB_EMI26 is not set 866# CONFIG_USB_EMI26 is not set
824# CONFIG_USB_ADUTUX is not set 867# CONFIG_USB_ADUTUX is not set
825# CONFIG_USB_AUERSWALD is not set 868# CONFIG_USB_SEVSEG is not set
826# CONFIG_USB_RIO500 is not set 869# CONFIG_USB_RIO500 is not set
827# CONFIG_USB_LEGOTOWER is not set 870# CONFIG_USB_LEGOTOWER is not set
828# CONFIG_USB_LCD is not set 871# CONFIG_USB_LCD is not set
@@ -838,10 +881,13 @@ CONFIG_USB_MON=y
838# CONFIG_USB_TRANCEVIBRATOR is not set 881# CONFIG_USB_TRANCEVIBRATOR is not set
839# CONFIG_USB_IOWARRIOR is not set 882# CONFIG_USB_IOWARRIOR is not set
840# CONFIG_USB_TEST is not set 883# CONFIG_USB_TEST is not set
884# CONFIG_USB_ISIGHTFW is not set
885# CONFIG_USB_VST is not set
841# CONFIG_USB_GADGET is not set 886# CONFIG_USB_GADGET is not set
842# CONFIG_MMC is not set 887# CONFIG_MMC is not set
843# CONFIG_MEMSTICK is not set 888# CONFIG_MEMSTICK is not set
844# CONFIG_NEW_LEDS is not set 889# CONFIG_NEW_LEDS is not set
890# CONFIG_ACCESSIBILITY is not set
845# CONFIG_EDAC is not set 891# CONFIG_EDAC is not set
846CONFIG_RTC_LIB=y 892CONFIG_RTC_LIB=y
847CONFIG_RTC_CLASS=y 893CONFIG_RTC_CLASS=y
@@ -872,6 +918,8 @@ CONFIG_RTC_DRV_DS1307=y
872# CONFIG_RTC_DRV_PCF8583 is not set 918# CONFIG_RTC_DRV_PCF8583 is not set
873# CONFIG_RTC_DRV_M41T80 is not set 919# CONFIG_RTC_DRV_M41T80 is not set
874# CONFIG_RTC_DRV_S35390A is not set 920# CONFIG_RTC_DRV_S35390A is not set
921# CONFIG_RTC_DRV_FM3130 is not set
922# CONFIG_RTC_DRV_RX8581 is not set
875 923
876# 924#
877# SPI RTC drivers 925# SPI RTC drivers
@@ -881,19 +929,25 @@ CONFIG_RTC_DRV_DS1307=y
881# Platform RTC drivers 929# Platform RTC drivers
882# 930#
883# CONFIG_RTC_DRV_CMOS is not set 931# CONFIG_RTC_DRV_CMOS is not set
932# CONFIG_RTC_DRV_DS1286 is not set
884# CONFIG_RTC_DRV_DS1511 is not set 933# CONFIG_RTC_DRV_DS1511 is not set
885# CONFIG_RTC_DRV_DS1553 is not set 934# CONFIG_RTC_DRV_DS1553 is not set
886# CONFIG_RTC_DRV_DS1742 is not set 935# CONFIG_RTC_DRV_DS1742 is not set
887# CONFIG_RTC_DRV_STK17TA8 is not set 936# CONFIG_RTC_DRV_STK17TA8 is not set
888# CONFIG_RTC_DRV_M48T86 is not set 937# CONFIG_RTC_DRV_M48T86 is not set
938# CONFIG_RTC_DRV_M48T35 is not set
889# CONFIG_RTC_DRV_M48T59 is not set 939# CONFIG_RTC_DRV_M48T59 is not set
940# CONFIG_RTC_DRV_BQ4802 is not set
890# CONFIG_RTC_DRV_V3020 is not set 941# CONFIG_RTC_DRV_V3020 is not set
891 942
892# 943#
893# on-CPU RTC drivers 944# on-CPU RTC drivers
894# 945#
946# CONFIG_RTC_DRV_PPC is not set
895# CONFIG_DMADEVICES is not set 947# CONFIG_DMADEVICES is not set
896# CONFIG_UIO is not set 948# CONFIG_UIO is not set
949# CONFIG_STAGING is not set
950CONFIG_STAGING_EXCLUDE_BUILD=y
897 951
898# 952#
899# File systems 953# File systems
@@ -905,12 +959,13 @@ CONFIG_EXT3_FS=y
905CONFIG_EXT3_FS_XATTR=y 959CONFIG_EXT3_FS_XATTR=y
906# CONFIG_EXT3_FS_POSIX_ACL is not set 960# CONFIG_EXT3_FS_POSIX_ACL is not set
907# CONFIG_EXT3_FS_SECURITY is not set 961# CONFIG_EXT3_FS_SECURITY is not set
908# CONFIG_EXT4DEV_FS is not set 962# CONFIG_EXT4_FS is not set
909CONFIG_JBD=y 963CONFIG_JBD=y
910CONFIG_FS_MBCACHE=y 964CONFIG_FS_MBCACHE=y
911# CONFIG_REISERFS_FS is not set 965# CONFIG_REISERFS_FS is not set
912# CONFIG_JFS_FS is not set 966# CONFIG_JFS_FS is not set
913# CONFIG_FS_POSIX_ACL is not set 967# CONFIG_FS_POSIX_ACL is not set
968CONFIG_FILE_LOCKING=y
914# CONFIG_XFS_FS is not set 969# CONFIG_XFS_FS is not set
915# CONFIG_OCFS2_FS is not set 970# CONFIG_OCFS2_FS is not set
916CONFIG_DNOTIFY=y 971CONFIG_DNOTIFY=y
@@ -943,6 +998,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
943CONFIG_PROC_FS=y 998CONFIG_PROC_FS=y
944CONFIG_PROC_KCORE=y 999CONFIG_PROC_KCORE=y
945CONFIG_PROC_SYSCTL=y 1000CONFIG_PROC_SYSCTL=y
1001CONFIG_PROC_PAGE_MONITOR=y
946CONFIG_SYSFS=y 1002CONFIG_SYSFS=y
947CONFIG_TMPFS=y 1003CONFIG_TMPFS=y
948# CONFIG_TMPFS_POSIX_ACL is not set 1004# CONFIG_TMPFS_POSIX_ACL is not set
@@ -973,6 +1029,7 @@ CONFIG_JFFS2_RTIME=y
973CONFIG_CRAMFS=y 1029CONFIG_CRAMFS=y
974# CONFIG_VXFS_FS is not set 1030# CONFIG_VXFS_FS is not set
975# CONFIG_MINIX_FS is not set 1031# CONFIG_MINIX_FS is not set
1032# CONFIG_OMFS_FS is not set
976# CONFIG_HPFS_FS is not set 1033# CONFIG_HPFS_FS is not set
977# CONFIG_QNX4FS_FS is not set 1034# CONFIG_QNX4FS_FS is not set
978# CONFIG_ROMFS_FS is not set 1035# CONFIG_ROMFS_FS is not set
@@ -983,14 +1040,14 @@ CONFIG_NFS_FS=y
983CONFIG_NFS_V3=y 1040CONFIG_NFS_V3=y
984# CONFIG_NFS_V3_ACL is not set 1041# CONFIG_NFS_V3_ACL is not set
985CONFIG_NFS_V4=y 1042CONFIG_NFS_V4=y
986# CONFIG_NFSD is not set
987CONFIG_ROOT_NFS=y 1043CONFIG_ROOT_NFS=y
1044# CONFIG_NFSD is not set
988CONFIG_LOCKD=y 1045CONFIG_LOCKD=y
989CONFIG_LOCKD_V4=y 1046CONFIG_LOCKD_V4=y
990CONFIG_NFS_COMMON=y 1047CONFIG_NFS_COMMON=y
991CONFIG_SUNRPC=y 1048CONFIG_SUNRPC=y
992CONFIG_SUNRPC_GSS=y 1049CONFIG_SUNRPC_GSS=y
993# CONFIG_SUNRPC_BIND34 is not set 1050# CONFIG_SUNRPC_REGISTER_V4 is not set
994CONFIG_RPCSEC_GSS_KRB5=y 1051CONFIG_RPCSEC_GSS_KRB5=y
995# CONFIG_RPCSEC_GSS_SPKM3 is not set 1052# CONFIG_RPCSEC_GSS_SPKM3 is not set
996# CONFIG_SMB_FS is not set 1053# CONFIG_SMB_FS is not set
@@ -1066,9 +1123,9 @@ CONFIG_NLS_ISO8859_1=y
1066# Library routines 1123# Library routines
1067# 1124#
1068CONFIG_BITREVERSE=y 1125CONFIG_BITREVERSE=y
1069# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1070# CONFIG_CRC_CCITT is not set 1126# CONFIG_CRC_CCITT is not set
1071# CONFIG_CRC16 is not set 1127# CONFIG_CRC16 is not set
1128# CONFIG_CRC_T10DIF is not set
1072# CONFIG_CRC_ITU_T is not set 1129# CONFIG_CRC_ITU_T is not set
1073CONFIG_CRC32=y 1130CONFIG_CRC32=y
1074# CONFIG_CRC7 is not set 1131# CONFIG_CRC7 is not set
@@ -1095,9 +1152,12 @@ CONFIG_FRAME_WARN=1024
1095CONFIG_DEBUG_KERNEL=y 1152CONFIG_DEBUG_KERNEL=y
1096# CONFIG_DEBUG_SHIRQ is not set 1153# CONFIG_DEBUG_SHIRQ is not set
1097CONFIG_DETECT_SOFTLOCKUP=y 1154CONFIG_DETECT_SOFTLOCKUP=y
1155# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1156CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1098CONFIG_SCHED_DEBUG=y 1157CONFIG_SCHED_DEBUG=y
1099# CONFIG_SCHEDSTATS is not set 1158# CONFIG_SCHEDSTATS is not set
1100# CONFIG_TIMER_STATS is not set 1159# CONFIG_TIMER_STATS is not set
1160# CONFIG_DEBUG_OBJECTS is not set
1101# CONFIG_SLUB_DEBUG_ON is not set 1161# CONFIG_SLUB_DEBUG_ON is not set
1102# CONFIG_SLUB_STATS is not set 1162# CONFIG_SLUB_STATS is not set
1103# CONFIG_DEBUG_RT_MUTEXES is not set 1163# CONFIG_DEBUG_RT_MUTEXES is not set
@@ -1111,17 +1171,37 @@ CONFIG_SCHED_DEBUG=y
1111CONFIG_DEBUG_INFO=y 1171CONFIG_DEBUG_INFO=y
1112# CONFIG_DEBUG_VM is not set 1172# CONFIG_DEBUG_VM is not set
1113# CONFIG_DEBUG_WRITECOUNT is not set 1173# CONFIG_DEBUG_WRITECOUNT is not set
1174# CONFIG_DEBUG_MEMORY_INIT is not set
1114# CONFIG_DEBUG_LIST is not set 1175# CONFIG_DEBUG_LIST is not set
1115# CONFIG_DEBUG_SG is not set 1176# CONFIG_DEBUG_SG is not set
1116# CONFIG_BOOT_PRINTK_DELAY is not set 1177# CONFIG_BOOT_PRINTK_DELAY is not set
1117# CONFIG_RCU_TORTURE_TEST is not set 1178# CONFIG_RCU_TORTURE_TEST is not set
1179# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1118# CONFIG_BACKTRACE_SELF_TEST is not set 1180# CONFIG_BACKTRACE_SELF_TEST is not set
1181# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1119# CONFIG_FAULT_INJECTION is not set 1182# CONFIG_FAULT_INJECTION is not set
1183# CONFIG_LATENCYTOP is not set
1184CONFIG_HAVE_FUNCTION_TRACER=y
1185
1186#
1187# Tracers
1188#
1189# CONFIG_FUNCTION_TRACER is not set
1190# CONFIG_SCHED_TRACER is not set
1191# CONFIG_CONTEXT_SWITCH_TRACER is not set
1192# CONFIG_BOOT_TRACER is not set
1193# CONFIG_STACK_TRACER is not set
1194# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1120# CONFIG_SAMPLES is not set 1195# CONFIG_SAMPLES is not set
1196CONFIG_HAVE_ARCH_KGDB=y
1197# CONFIG_KGDB is not set
1121# CONFIG_DEBUG_STACKOVERFLOW is not set 1198# CONFIG_DEBUG_STACKOVERFLOW is not set
1122# CONFIG_DEBUG_STACK_USAGE is not set 1199# CONFIG_DEBUG_STACK_USAGE is not set
1123# CONFIG_DEBUG_PAGEALLOC is not set 1200# CONFIG_DEBUG_PAGEALLOC is not set
1124# CONFIG_DEBUGGER is not set 1201# CONFIG_CODE_PATCHING_SELFTEST is not set
1202# CONFIG_FTR_FIXUP_SELFTEST is not set
1203# CONFIG_MSI_BITMAP_SELFTEST is not set
1204# CONFIG_XMON is not set
1125# CONFIG_IRQSTACKS is not set 1205# CONFIG_IRQSTACKS is not set
1126# CONFIG_BDI_SWITCH is not set 1206# CONFIG_BDI_SWITCH is not set
1127# CONFIG_BOOTX_TEXT is not set 1207# CONFIG_BOOTX_TEXT is not set
@@ -1132,14 +1212,19 @@ CONFIG_DEBUG_INFO=y
1132# 1212#
1133# CONFIG_KEYS is not set 1213# CONFIG_KEYS is not set
1134# CONFIG_SECURITY is not set 1214# CONFIG_SECURITY is not set
1215# CONFIG_SECURITYFS is not set
1135# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1216# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1136CONFIG_CRYPTO=y 1217CONFIG_CRYPTO=y
1137 1218
1138# 1219#
1139# Crypto core or helper 1220# Crypto core or helper
1140# 1221#
1222# CONFIG_CRYPTO_FIPS is not set
1141CONFIG_CRYPTO_ALGAPI=y 1223CONFIG_CRYPTO_ALGAPI=y
1224CONFIG_CRYPTO_AEAD=y
1142CONFIG_CRYPTO_BLKCIPHER=y 1225CONFIG_CRYPTO_BLKCIPHER=y
1226CONFIG_CRYPTO_HASH=y
1227CONFIG_CRYPTO_RNG=y
1143CONFIG_CRYPTO_MANAGER=y 1228CONFIG_CRYPTO_MANAGER=y
1144# CONFIG_CRYPTO_GF128MUL is not set 1229# CONFIG_CRYPTO_GF128MUL is not set
1145# CONFIG_CRYPTO_NULL is not set 1230# CONFIG_CRYPTO_NULL is not set
@@ -1178,6 +1263,10 @@ CONFIG_CRYPTO_PCBC=y
1178# CONFIG_CRYPTO_MD4 is not set 1263# CONFIG_CRYPTO_MD4 is not set
1179CONFIG_CRYPTO_MD5=y 1264CONFIG_CRYPTO_MD5=y
1180# CONFIG_CRYPTO_MICHAEL_MIC is not set 1265# CONFIG_CRYPTO_MICHAEL_MIC is not set
1266# CONFIG_CRYPTO_RMD128 is not set
1267# CONFIG_CRYPTO_RMD160 is not set
1268# CONFIG_CRYPTO_RMD256 is not set
1269# CONFIG_CRYPTO_RMD320 is not set
1181# CONFIG_CRYPTO_SHA1 is not set 1270# CONFIG_CRYPTO_SHA1 is not set
1182# CONFIG_CRYPTO_SHA256 is not set 1271# CONFIG_CRYPTO_SHA256 is not set
1183# CONFIG_CRYPTO_SHA512 is not set 1272# CONFIG_CRYPTO_SHA512 is not set
@@ -1208,6 +1297,11 @@ CONFIG_CRYPTO_DES=y
1208# 1297#
1209# CONFIG_CRYPTO_DEFLATE is not set 1298# CONFIG_CRYPTO_DEFLATE is not set
1210# CONFIG_CRYPTO_LZO is not set 1299# CONFIG_CRYPTO_LZO is not set
1300
1301#
1302# Random Number Generation
1303#
1304# CONFIG_CRYPTO_ANSI_CPRNG is not set
1211CONFIG_CRYPTO_HW=y 1305CONFIG_CRYPTO_HW=y
1212CONFIG_PPC_CLOCK=y 1306CONFIG_PPC_CLOCK=y
1213CONFIG_PPC_LIB_RHEAP=y 1307CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
index 2da13e00a807..07ccaf89f379 100644
--- a/arch/powerpc/configs/86xx/gef_sbc610_defconfig
+++ b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
@@ -838,7 +838,7 @@ CONFIG_PHYLIB=y
838# 838#
839# MII PHY device drivers 839# MII PHY device drivers
840# 840#
841CONFIG_MARVELL_PHY=y 841# CONFIG_MARVELL_PHY is not set
842# CONFIG_DAVICOM_PHY is not set 842# CONFIG_DAVICOM_PHY is not set
843# CONFIG_QSEMI_PHY is not set 843# CONFIG_QSEMI_PHY is not set
844# CONFIG_LXT_PHY is not set 844# CONFIG_LXT_PHY is not set
diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig
index 740c9f2b7de6..15c5604d0b26 100644
--- a/arch/powerpc/configs/mpc5200_defconfig
+++ b/arch/powerpc/configs/mpc5200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc6 3# Linux kernel version: 2.6.28-rc4
4# Fri Jan 18 14:19:54 2008 4# Thu Nov 13 02:09:07 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,14 +22,18 @@ CONFIG_PPC_STD_MMU_32=y
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y 29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y 30CONFIG_GENERIC_CLOCKEVENTS=y
31CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
32CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
34CONFIG_STACKTRACE_SUPPORT=y
35CONFIG_HAVE_LATENCYTOP_SUPPORT=y
36CONFIG_LOCKDEP_SUPPORT=y
33CONFIG_RWSEM_XCHGADD_ALGORITHM=y 37CONFIG_RWSEM_XCHGADD_ALGORITHM=y
34CONFIG_ARCH_HAS_ILOG2_U32=y 38CONFIG_ARCH_HAS_ILOG2_U32=y
35CONFIG_GENERIC_HWEIGHT=y 39CONFIG_GENERIC_HWEIGHT=y
@@ -47,7 +51,8 @@ CONFIG_OF=y
47# CONFIG_GENERIC_TBSYNC is not set 51# CONFIG_GENERIC_TBSYNC is not set
48CONFIG_AUDIT_ARCH=y 52CONFIG_AUDIT_ARCH=y
49CONFIG_GENERIC_BUG=y 53CONFIG_GENERIC_BUG=y
50# CONFIG_DEFAULT_UIMAGE is not set 54CONFIG_DEFAULT_UIMAGE=y
55CONFIG_ARCH_SUSPEND_POSSIBLE=y
51# CONFIG_PPC_DCR_NATIVE is not set 56# CONFIG_PPC_DCR_NATIVE is not set
52# CONFIG_PPC_DCR_MMIO is not set 57# CONFIG_PPC_DCR_MMIO is not set
53CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 58CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -66,17 +71,15 @@ CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 71# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 72# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 73# CONFIG_TASKSTATS is not set
69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set 74# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 75# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 76CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
75CONFIG_FAIR_GROUP_SCHED=y 78# CONFIG_GROUP_SCHED is not set
76CONFIG_FAIR_USER_SCHED=y
77# CONFIG_FAIR_CGROUP_SCHED is not set
78CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y
79# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
80CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
81CONFIG_INITRAMFS_SOURCE="" 84CONFIG_INITRAMFS_SOURCE=""
82# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -88,32 +91,49 @@ CONFIG_HOTPLUG=y
88CONFIG_PRINTK=y 91CONFIG_PRINTK=y
89CONFIG_BUG=y 92CONFIG_BUG=y
90CONFIG_ELF_CORE=y 93CONFIG_ELF_CORE=y
94CONFIG_COMPAT_BRK=y
91CONFIG_BASE_FULL=y 95CONFIG_BASE_FULL=y
92CONFIG_FUTEX=y 96CONFIG_FUTEX=y
93CONFIG_ANON_INODES=y 97CONFIG_ANON_INODES=y
94# CONFIG_EPOLL is not set 98# CONFIG_EPOLL is not set
95CONFIG_SIGNALFD=y 99CONFIG_SIGNALFD=y
100CONFIG_TIMERFD=y
96CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
97CONFIG_SHMEM=y 102CONFIG_SHMEM=y
103CONFIG_AIO=y
98CONFIG_VM_EVENT_COUNTERS=y 104CONFIG_VM_EVENT_COUNTERS=y
105CONFIG_PCI_QUIRKS=y
99CONFIG_SLUB_DEBUG=y 106CONFIG_SLUB_DEBUG=y
100# CONFIG_SLAB is not set 107# CONFIG_SLAB is not set
101CONFIG_SLUB=y 108CONFIG_SLUB=y
102# CONFIG_SLOB is not set 109# CONFIG_SLOB is not set
110# CONFIG_PROFILING is not set
111# CONFIG_MARKERS is not set
112CONFIG_HAVE_OPROFILE=y
113CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
114CONFIG_HAVE_IOREMAP_PROT=y
115CONFIG_HAVE_KPROBES=y
116CONFIG_HAVE_KRETPROBES=y
117CONFIG_HAVE_ARCH_TRACEHOOK=y
118CONFIG_HAVE_CLK=y
119# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
120CONFIG_SLABINFO=y
103CONFIG_RT_MUTEXES=y 121CONFIG_RT_MUTEXES=y
104# CONFIG_TINY_SHMEM is not set 122# CONFIG_TINY_SHMEM is not set
105CONFIG_BASE_SMALL=0 123CONFIG_BASE_SMALL=0
106CONFIG_MODULES=y 124CONFIG_MODULES=y
125# CONFIG_MODULE_FORCE_LOAD is not set
107CONFIG_MODULE_UNLOAD=y 126CONFIG_MODULE_UNLOAD=y
108# CONFIG_MODULE_FORCE_UNLOAD is not set 127# CONFIG_MODULE_FORCE_UNLOAD is not set
109# CONFIG_MODVERSIONS is not set 128# CONFIG_MODVERSIONS is not set
110# CONFIG_MODULE_SRCVERSION_ALL is not set 129# CONFIG_MODULE_SRCVERSION_ALL is not set
111# CONFIG_KMOD is not set 130CONFIG_KMOD=y
112CONFIG_BLOCK=y 131CONFIG_BLOCK=y
113# CONFIG_LBD is not set 132# CONFIG_LBD is not set
114# CONFIG_BLK_DEV_IO_TRACE is not set 133# CONFIG_BLK_DEV_IO_TRACE is not set
115# CONFIG_LSF is not set 134# CONFIG_LSF is not set
116# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
136# CONFIG_BLK_DEV_INTEGRITY is not set
117 137
118# 138#
119# IO Schedulers 139# IO Schedulers
@@ -127,29 +147,34 @@ CONFIG_DEFAULT_AS=y
127# CONFIG_DEFAULT_CFQ is not set 147# CONFIG_DEFAULT_CFQ is not set
128# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
129CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
150CONFIG_CLASSIC_RCU=y
151CONFIG_FREEZER=y
130 152
131# 153#
132# Platform support 154# Platform support
133# 155#
134CONFIG_PPC_MULTIPLATFORM=y 156CONFIG_PPC_MULTIPLATFORM=y
135# CONFIG_PPC_82xx is not set
136# CONFIG_PPC_83xx is not set
137# CONFIG_PPC_86xx is not set
138CONFIG_CLASSIC32=y 157CONFIG_CLASSIC32=y
139# CONFIG_PPC_CHRP is not set 158# CONFIG_PPC_CHRP is not set
159# CONFIG_MPC5121_ADS is not set
160# CONFIG_MPC5121_GENERIC is not set
140CONFIG_PPC_MPC52xx=y 161CONFIG_PPC_MPC52xx=y
141CONFIG_PPC_MPC5200=y
142CONFIG_PPC_MPC5200_BUGFIX=y
143CONFIG_PPC_MPC5200_SIMPLE=y 162CONFIG_PPC_MPC5200_SIMPLE=y
144CONFIG_PPC_EFIKA=y 163CONFIG_PPC_EFIKA=y
145CONFIG_PPC_LITE5200=y 164CONFIG_PPC_LITE5200=y
165CONFIG_PPC_MPC5200_BUGFIX=y
166# CONFIG_PPC_MPC5200_GPIO is not set
146# CONFIG_PPC_PMAC is not set 167# CONFIG_PPC_PMAC is not set
147# CONFIG_PPC_CELL is not set 168# CONFIG_PPC_CELL is not set
148# CONFIG_PPC_CELL_NATIVE is not set 169# CONFIG_PPC_CELL_NATIVE is not set
170# CONFIG_PPC_82xx is not set
149# CONFIG_PQ2ADS is not set 171# CONFIG_PQ2ADS is not set
172# CONFIG_PPC_83xx is not set
173# CONFIG_PPC_86xx is not set
150# CONFIG_EMBEDDED6xx is not set 174# CONFIG_EMBEDDED6xx is not set
151CONFIG_PPC_NATIVE=y 175CONFIG_PPC_NATIVE=y
152# CONFIG_UDBG_RTAS_CONSOLE is not set 176# CONFIG_UDBG_RTAS_CONSOLE is not set
177# CONFIG_IPIC is not set
153# CONFIG_MPIC is not set 178# CONFIG_MPIC is not set
154# CONFIG_MPIC_WEIRD is not set 179# CONFIG_MPIC_WEIRD is not set
155# CONFIG_PPC_I8259 is not set 180# CONFIG_PPC_I8259 is not set
@@ -163,7 +188,6 @@ CONFIG_RTAS_PROC=y
163# CONFIG_GENERIC_IOMAP is not set 188# CONFIG_GENERIC_IOMAP is not set
164# CONFIG_CPU_FREQ is not set 189# CONFIG_CPU_FREQ is not set
165# CONFIG_TAU is not set 190# CONFIG_TAU is not set
166# CONFIG_CPM2 is not set
167# CONFIG_FSL_ULI1575 is not set 191# CONFIG_FSL_ULI1575 is not set
168CONFIG_PPC_BESTCOMM=y 192CONFIG_PPC_BESTCOMM=y
169CONFIG_PPC_BESTCOMM_ATA=y 193CONFIG_PPC_BESTCOMM_ATA=y
@@ -183,12 +207,18 @@ CONFIG_HZ_250=y
183# CONFIG_HZ_300 is not set 207# CONFIG_HZ_300 is not set
184# CONFIG_HZ_1000 is not set 208# CONFIG_HZ_1000 is not set
185CONFIG_HZ=250 209CONFIG_HZ=250
210CONFIG_SCHED_HRTICK=y
186CONFIG_PREEMPT_NONE=y 211CONFIG_PREEMPT_NONE=y
187# CONFIG_PREEMPT_VOLUNTARY is not set 212# CONFIG_PREEMPT_VOLUNTARY is not set
188# CONFIG_PREEMPT is not set 213# CONFIG_PREEMPT is not set
189CONFIG_BINFMT_ELF=y 214CONFIG_BINFMT_ELF=y
215# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
216# CONFIG_HAVE_AOUT is not set
190# CONFIG_BINFMT_MISC is not set 217# CONFIG_BINFMT_MISC is not set
218# CONFIG_IOMMU_HELPER is not set
191CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 219CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
220CONFIG_ARCH_HAS_WALK_MEMORY=y
221CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
192# CONFIG_KEXEC is not set 222# CONFIG_KEXEC is not set
193CONFIG_ARCH_FLATMEM_ENABLE=y 223CONFIG_ARCH_FLATMEM_ENABLE=y
194CONFIG_ARCH_POPULATES_NODE_MAP=y 224CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -198,26 +228,25 @@ CONFIG_FLATMEM_MANUAL=y
198# CONFIG_SPARSEMEM_MANUAL is not set 228# CONFIG_SPARSEMEM_MANUAL is not set
199CONFIG_FLATMEM=y 229CONFIG_FLATMEM=y
200CONFIG_FLAT_NODE_MEM_MAP=y 230CONFIG_FLAT_NODE_MEM_MAP=y
201# CONFIG_SPARSEMEM_STATIC is not set 231CONFIG_PAGEFLAGS_EXTENDED=y
202# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
203CONFIG_SPLIT_PTLOCK_CPUS=4 232CONFIG_SPLIT_PTLOCK_CPUS=4
233CONFIG_MIGRATION=y
204# CONFIG_RESOURCES_64BIT is not set 234# CONFIG_RESOURCES_64BIT is not set
235# CONFIG_PHYS_ADDR_T_64BIT is not set
205CONFIG_ZONE_DMA_FLAG=1 236CONFIG_ZONE_DMA_FLAG=1
206CONFIG_BOUNCE=y 237CONFIG_BOUNCE=y
207CONFIG_VIRT_TO_BUS=y 238CONFIG_VIRT_TO_BUS=y
239CONFIG_UNEVICTABLE_LRU=y
240CONFIG_FORCE_MAX_ZONEORDER=11
208CONFIG_PROC_DEVICETREE=y 241CONFIG_PROC_DEVICETREE=y
209# CONFIG_CMDLINE_BOOL is not set 242# CONFIG_CMDLINE_BOOL is not set
243CONFIG_EXTRA_TARGETS=""
210CONFIG_PM=y 244CONFIG_PM=y
211# CONFIG_PM_LEGACY is not set
212# CONFIG_PM_DEBUG is not set 245# CONFIG_PM_DEBUG is not set
213CONFIG_PM_SLEEP=y 246CONFIG_PM_SLEEP=y
214CONFIG_SUSPEND_UP_POSSIBLE=y
215CONFIG_SUSPEND=y 247CONFIG_SUSPEND=y
216CONFIG_HIBERNATION_UP_POSSIBLE=y 248CONFIG_SUSPEND_FREEZER=y
217# CONFIG_HIBERNATION is not set
218CONFIG_SECCOMP=y 249CONFIG_SECCOMP=y
219CONFIG_WANT_DEVICE_TREE=y
220CONFIG_DEVICE_TREE=""
221CONFIG_ISA_DMA_API=y 250CONFIG_ISA_DMA_API=y
222 251
223# 252#
@@ -226,7 +255,7 @@ CONFIG_ISA_DMA_API=y
226CONFIG_ZONE_DMA=y 255CONFIG_ZONE_DMA=y
227CONFIG_GENERIC_ISA_DMA=y 256CONFIG_GENERIC_ISA_DMA=y
228# CONFIG_PPC_INDIRECT_PCI is not set 257# CONFIG_PPC_INDIRECT_PCI is not set
229CONFIG_FSL_SOC=y 258CONFIG_PPC_PCI_CHOICE=y
230CONFIG_PCI=y 259CONFIG_PCI=y
231CONFIG_PCI_DOMAINS=y 260CONFIG_PCI_DOMAINS=y
232CONFIG_PCI_SYSCALL=y 261CONFIG_PCI_SYSCALL=y
@@ -237,6 +266,7 @@ CONFIG_PCI_LEGACY=y
237# CONFIG_PCI_DEBUG is not set 266# CONFIG_PCI_DEBUG is not set
238# CONFIG_PCCARD is not set 267# CONFIG_PCCARD is not set
239# CONFIG_HOTPLUG_PCI is not set 268# CONFIG_HOTPLUG_PCI is not set
269# CONFIG_HAS_RAPIDIO is not set
240 270
241# 271#
242# Advanced setup 272# Advanced setup
@@ -246,15 +276,11 @@ CONFIG_PCI_LEGACY=y
246# 276#
247# Default settings for advanced configuration options are used 277# Default settings for advanced configuration options are used
248# 278#
249CONFIG_HIGHMEM_START=0xfe000000
250CONFIG_LOWMEM_SIZE=0x30000000 279CONFIG_LOWMEM_SIZE=0x30000000
280CONFIG_PAGE_OFFSET=0xc0000000
251CONFIG_KERNEL_START=0xc0000000 281CONFIG_KERNEL_START=0xc0000000
282CONFIG_PHYSICAL_START=0x00000000
252CONFIG_TASK_SIZE=0xc0000000 283CONFIG_TASK_SIZE=0xc0000000
253CONFIG_BOOT_LOAD=0x00800000
254
255#
256# Networking
257#
258CONFIG_NET=y 284CONFIG_NET=y
259 285
260# 286#
@@ -267,6 +293,7 @@ CONFIG_XFRM=y
267CONFIG_XFRM_USER=m 293CONFIG_XFRM_USER=m
268# CONFIG_XFRM_SUB_POLICY is not set 294# CONFIG_XFRM_SUB_POLICY is not set
269# CONFIG_XFRM_MIGRATE is not set 295# CONFIG_XFRM_MIGRATE is not set
296# CONFIG_XFRM_STATISTICS is not set
270# CONFIG_NET_KEY is not set 297# CONFIG_NET_KEY is not set
271CONFIG_INET=y 298CONFIG_INET=y
272CONFIG_IP_MULTICAST=y 299CONFIG_IP_MULTICAST=y
@@ -297,8 +324,6 @@ CONFIG_TCP_CONG_CUBIC=y
297CONFIG_DEFAULT_TCP_CONG="cubic" 324CONFIG_DEFAULT_TCP_CONG="cubic"
298# CONFIG_TCP_MD5SIG is not set 325# CONFIG_TCP_MD5SIG is not set
299# CONFIG_IPV6 is not set 326# CONFIG_IPV6 is not set
300# CONFIG_INET6_XFRM_TUNNEL is not set
301# CONFIG_INET6_TUNNEL is not set
302# CONFIG_NETWORK_SECMARK is not set 327# CONFIG_NETWORK_SECMARK is not set
303# CONFIG_NETFILTER is not set 328# CONFIG_NETFILTER is not set
304# CONFIG_IP_DCCP is not set 329# CONFIG_IP_DCCP is not set
@@ -306,6 +331,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
306# CONFIG_TIPC is not set 331# CONFIG_TIPC is not set
307# CONFIG_ATM is not set 332# CONFIG_ATM is not set
308# CONFIG_BRIDGE is not set 333# CONFIG_BRIDGE is not set
334# CONFIG_NET_DSA is not set
309# CONFIG_VLAN_8021Q is not set 335# CONFIG_VLAN_8021Q is not set
310# CONFIG_DECNET is not set 336# CONFIG_DECNET is not set
311# CONFIG_LLC2 is not set 337# CONFIG_LLC2 is not set
@@ -322,17 +348,12 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
322# 348#
323# CONFIG_NET_PKTGEN is not set 349# CONFIG_NET_PKTGEN is not set
324# CONFIG_HAMRADIO is not set 350# CONFIG_HAMRADIO is not set
351# CONFIG_CAN is not set
325# CONFIG_IRDA is not set 352# CONFIG_IRDA is not set
326# CONFIG_BT is not set 353# CONFIG_BT is not set
327# CONFIG_AF_RXRPC is not set 354# CONFIG_AF_RXRPC is not set
328 355# CONFIG_PHONET is not set
329# 356# CONFIG_WIRELESS is not set
330# Wireless
331#
332# CONFIG_CFG80211 is not set
333# CONFIG_WIRELESS_EXT is not set
334# CONFIG_MAC80211 is not set
335# CONFIG_IEEE80211 is not set
336# CONFIG_RFKILL is not set 357# CONFIG_RFKILL is not set
337# CONFIG_NET_9P is not set 358# CONFIG_NET_9P is not set
338 359
@@ -357,6 +378,8 @@ CONFIG_MTD_CONCAT=y
357CONFIG_MTD_PARTITIONS=y 378CONFIG_MTD_PARTITIONS=y
358# CONFIG_MTD_REDBOOT_PARTS is not set 379# CONFIG_MTD_REDBOOT_PARTS is not set
359CONFIG_MTD_CMDLINE_PARTS=y 380CONFIG_MTD_CMDLINE_PARTS=y
381# CONFIG_MTD_OF_PARTS is not set
382# CONFIG_MTD_AR7_PARTS is not set
360 383
361# 384#
362# User Modules And Translation Layers 385# User Modules And Translation Layers
@@ -428,6 +451,7 @@ CONFIG_MTD_PHYSMAP_OF=y
428# 451#
429# CONFIG_MTD_UBI is not set 452# CONFIG_MTD_UBI is not set
430CONFIG_OF_DEVICE=y 453CONFIG_OF_DEVICE=y
454CONFIG_OF_I2C=y
431# CONFIG_PARPORT is not set 455# CONFIG_PARPORT is not set
432CONFIG_BLK_DEV=y 456CONFIG_BLK_DEV=y
433# CONFIG_BLK_DEV_FD is not set 457# CONFIG_BLK_DEV_FD is not set
@@ -444,14 +468,20 @@ CONFIG_BLK_DEV_LOOP=y
444CONFIG_BLK_DEV_RAM=y 468CONFIG_BLK_DEV_RAM=y
445CONFIG_BLK_DEV_RAM_COUNT=16 469CONFIG_BLK_DEV_RAM_COUNT=16
446CONFIG_BLK_DEV_RAM_SIZE=32768 470CONFIG_BLK_DEV_RAM_SIZE=32768
447CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 471# CONFIG_BLK_DEV_XIP is not set
448# CONFIG_CDROM_PKTCDVD is not set 472# CONFIG_CDROM_PKTCDVD is not set
449# CONFIG_ATA_OVER_ETH is not set 473# CONFIG_ATA_OVER_ETH is not set
474# CONFIG_BLK_DEV_HD is not set
450CONFIG_MISC_DEVICES=y 475CONFIG_MISC_DEVICES=y
451# CONFIG_PHANTOM is not set 476# CONFIG_PHANTOM is not set
452# CONFIG_EEPROM_93CX6 is not set 477# CONFIG_EEPROM_93CX6 is not set
453# CONFIG_SGI_IOC4 is not set 478# CONFIG_SGI_IOC4 is not set
454# CONFIG_TIFM_CORE is not set 479# CONFIG_TIFM_CORE is not set
480# CONFIG_ICS932S401 is not set
481# CONFIG_ENCLOSURE_SERVICES is not set
482# CONFIG_HP_ILO is not set
483# CONFIG_C2PORT is not set
484CONFIG_HAVE_IDE=y
455# CONFIG_IDE is not set 485# CONFIG_IDE is not set
456 486
457# 487#
@@ -516,6 +546,7 @@ CONFIG_SCSI_LOWLEVEL=y
516# CONFIG_SCSI_IPS is not set 546# CONFIG_SCSI_IPS is not set
517# CONFIG_SCSI_INITIO is not set 547# CONFIG_SCSI_INITIO is not set
518# CONFIG_SCSI_INIA100 is not set 548# CONFIG_SCSI_INIA100 is not set
549# CONFIG_SCSI_MVSAS is not set
519# CONFIG_SCSI_STEX is not set 550# CONFIG_SCSI_STEX is not set
520# CONFIG_SCSI_SYM53C8XX_2 is not set 551# CONFIG_SCSI_SYM53C8XX_2 is not set
521# CONFIG_SCSI_IPR is not set 552# CONFIG_SCSI_IPR is not set
@@ -528,9 +559,13 @@ CONFIG_SCSI_LOWLEVEL=y
528# CONFIG_SCSI_NSP32 is not set 559# CONFIG_SCSI_NSP32 is not set
529# CONFIG_SCSI_DEBUG is not set 560# CONFIG_SCSI_DEBUG is not set
530# CONFIG_SCSI_SRP is not set 561# CONFIG_SCSI_SRP is not set
562# CONFIG_SCSI_DH is not set
531CONFIG_ATA=y 563CONFIG_ATA=y
532# CONFIG_ATA_NONSTANDARD is not set 564# CONFIG_ATA_NONSTANDARD is not set
565CONFIG_SATA_PMP=y
533# CONFIG_SATA_AHCI is not set 566# CONFIG_SATA_AHCI is not set
567# CONFIG_SATA_SIL24 is not set
568CONFIG_ATA_SFF=y
534# CONFIG_SATA_SVW is not set 569# CONFIG_SATA_SVW is not set
535# CONFIG_ATA_PIIX is not set 570# CONFIG_ATA_PIIX is not set
536# CONFIG_SATA_MV is not set 571# CONFIG_SATA_MV is not set
@@ -540,7 +575,6 @@ CONFIG_ATA=y
540# CONFIG_SATA_PROMISE is not set 575# CONFIG_SATA_PROMISE is not set
541# CONFIG_SATA_SX4 is not set 576# CONFIG_SATA_SX4 is not set
542# CONFIG_SATA_SIL is not set 577# CONFIG_SATA_SIL is not set
543# CONFIG_SATA_SIL24 is not set
544# CONFIG_SATA_SIS is not set 578# CONFIG_SATA_SIS is not set
545# CONFIG_SATA_ULI is not set 579# CONFIG_SATA_ULI is not set
546# CONFIG_SATA_VIA is not set 580# CONFIG_SATA_VIA is not set
@@ -570,6 +604,7 @@ CONFIG_PATA_MPC52xx=y
570# CONFIG_PATA_MPIIX is not set 604# CONFIG_PATA_MPIIX is not set
571# CONFIG_PATA_OLDPIIX is not set 605# CONFIG_PATA_OLDPIIX is not set
572# CONFIG_PATA_NETCELL is not set 606# CONFIG_PATA_NETCELL is not set
607# CONFIG_PATA_NINJA32 is not set
573# CONFIG_PATA_NS87410 is not set 608# CONFIG_PATA_NS87410 is not set
574# CONFIG_PATA_NS87415 is not set 609# CONFIG_PATA_NS87415 is not set
575# CONFIG_PATA_OPTI is not set 610# CONFIG_PATA_OPTI is not set
@@ -586,25 +621,28 @@ CONFIG_PATA_MPC52xx=y
586# CONFIG_PATA_WINBOND is not set 621# CONFIG_PATA_WINBOND is not set
587CONFIG_PATA_PLATFORM=y 622CONFIG_PATA_PLATFORM=y
588# CONFIG_PATA_OF_PLATFORM is not set 623# CONFIG_PATA_OF_PLATFORM is not set
624# CONFIG_PATA_SCH is not set
589# CONFIG_MD is not set 625# CONFIG_MD is not set
590# CONFIG_FUSION is not set 626# CONFIG_FUSION is not set
591 627
592# 628#
593# IEEE 1394 (FireWire) support 629# IEEE 1394 (FireWire) support
594# 630#
631
632#
633# Enable only one of the two stacks, unless you know what you are doing
634#
595# CONFIG_FIREWIRE is not set 635# CONFIG_FIREWIRE is not set
596# CONFIG_IEEE1394 is not set 636# CONFIG_IEEE1394 is not set
597# CONFIG_I2O is not set 637# CONFIG_I2O is not set
598# CONFIG_MACINTOSH_DRIVERS is not set 638# CONFIG_MACINTOSH_DRIVERS is not set
599CONFIG_NETDEVICES=y 639CONFIG_NETDEVICES=y
600# CONFIG_NETDEVICES_MULTIQUEUE is not set
601# CONFIG_DUMMY is not set 640# CONFIG_DUMMY is not set
602# CONFIG_BONDING is not set 641# CONFIG_BONDING is not set
603# CONFIG_MACVLAN is not set 642# CONFIG_MACVLAN is not set
604# CONFIG_EQUALIZER is not set 643# CONFIG_EQUALIZER is not set
605# CONFIG_TUN is not set 644# CONFIG_TUN is not set
606# CONFIG_VETH is not set 645# CONFIG_VETH is not set
607# CONFIG_IP1000 is not set
608# CONFIG_ARCNET is not set 646# CONFIG_ARCNET is not set
609CONFIG_PHYLIB=y 647CONFIG_PHYLIB=y
610 648
@@ -620,6 +658,7 @@ CONFIG_PHYLIB=y
620# CONFIG_SMSC_PHY is not set 658# CONFIG_SMSC_PHY is not set
621# CONFIG_BROADCOM_PHY is not set 659# CONFIG_BROADCOM_PHY is not set
622# CONFIG_ICPLUS_PHY is not set 660# CONFIG_ICPLUS_PHY is not set
661# CONFIG_REALTEK_PHY is not set
623# CONFIG_FIXED_PHY is not set 662# CONFIG_FIXED_PHY is not set
624# CONFIG_MDIO_BITBANG is not set 663# CONFIG_MDIO_BITBANG is not set
625CONFIG_NET_ETHERNET=y 664CONFIG_NET_ETHERNET=y
@@ -634,10 +673,14 @@ CONFIG_NET_ETHERNET=y
634# CONFIG_IBM_NEW_EMAC_RGMII is not set 673# CONFIG_IBM_NEW_EMAC_RGMII is not set
635# CONFIG_IBM_NEW_EMAC_TAH is not set 674# CONFIG_IBM_NEW_EMAC_TAH is not set
636# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 675# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
676# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
677# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
678# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
637# CONFIG_NET_PCI is not set 679# CONFIG_NET_PCI is not set
638# CONFIG_B44 is not set 680# CONFIG_B44 is not set
639CONFIG_FEC_MPC52xx=y 681CONFIG_FEC_MPC52xx=y
640CONFIG_FEC_MPC52xx_MDIO=y 682CONFIG_FEC_MPC52xx_MDIO=y
683# CONFIG_ATL2 is not set
641# CONFIG_NETDEV_1000 is not set 684# CONFIG_NETDEV_1000 is not set
642# CONFIG_NETDEV_10000 is not set 685# CONFIG_NETDEV_10000 is not set
643# CONFIG_TR is not set 686# CONFIG_TR is not set
@@ -647,6 +690,7 @@ CONFIG_FEC_MPC52xx_MDIO=y
647# 690#
648# CONFIG_WLAN_PRE80211 is not set 691# CONFIG_WLAN_PRE80211 is not set
649# CONFIG_WLAN_80211 is not set 692# CONFIG_WLAN_80211 is not set
693# CONFIG_IWLWIFI_LEDS is not set
650 694
651# 695#
652# USB Network Adapters 696# USB Network Adapters
@@ -662,7 +706,6 @@ CONFIG_FEC_MPC52xx_MDIO=y
662# CONFIG_PPP is not set 706# CONFIG_PPP is not set
663# CONFIG_SLIP is not set 707# CONFIG_SLIP is not set
664# CONFIG_NET_FC is not set 708# CONFIG_NET_FC is not set
665# CONFIG_SHAPER is not set
666# CONFIG_NETCONSOLE is not set 709# CONFIG_NETCONSOLE is not set
667# CONFIG_NETPOLL is not set 710# CONFIG_NETPOLL is not set
668# CONFIG_NET_POLL_CONTROLLER is not set 711# CONFIG_NET_POLL_CONTROLLER is not set
@@ -672,7 +715,30 @@ CONFIG_FEC_MPC52xx_MDIO=y
672# 715#
673# Input device support 716# Input device support
674# 717#
675# CONFIG_INPUT is not set 718CONFIG_INPUT=y
719# CONFIG_INPUT_FF_MEMLESS is not set
720# CONFIG_INPUT_POLLDEV is not set
721
722#
723# Userland interfaces
724#
725CONFIG_INPUT_MOUSEDEV=y
726CONFIG_INPUT_MOUSEDEV_PSAUX=y
727CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
728CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
729# CONFIG_INPUT_JOYDEV is not set
730# CONFIG_INPUT_EVDEV is not set
731# CONFIG_INPUT_EVBUG is not set
732
733#
734# Input Device Drivers
735#
736# CONFIG_INPUT_KEYBOARD is not set
737# CONFIG_INPUT_MOUSE is not set
738# CONFIG_INPUT_JOYSTICK is not set
739# CONFIG_INPUT_TABLET is not set
740# CONFIG_INPUT_TOUCHSCREEN is not set
741# CONFIG_INPUT_MISC is not set
676 742
677# 743#
678# Hardware I/O ports 744# Hardware I/O ports
@@ -683,8 +749,14 @@ CONFIG_FEC_MPC52xx_MDIO=y
683# 749#
684# Character devices 750# Character devices
685# 751#
686# CONFIG_VT is not set 752CONFIG_VT=y
753CONFIG_CONSOLE_TRANSLATIONS=y
754CONFIG_VT_CONSOLE=y
755CONFIG_HW_CONSOLE=y
756# CONFIG_VT_HW_CONSOLE_BINDING is not set
757CONFIG_DEVKMEM=y
687# CONFIG_SERIAL_NONSTANDARD is not set 758# CONFIG_SERIAL_NONSTANDARD is not set
759# CONFIG_NOZOMI is not set
688 760
689# 761#
690# Serial drivers 762# Serial drivers
@@ -718,16 +790,15 @@ CONFIG_DEVPORT=y
718CONFIG_I2C=y 790CONFIG_I2C=y
719CONFIG_I2C_BOARDINFO=y 791CONFIG_I2C_BOARDINFO=y
720CONFIG_I2C_CHARDEV=y 792CONFIG_I2C_CHARDEV=y
793CONFIG_I2C_HELPER_AUTO=y
794CONFIG_I2C_ALGOBIT=y
721 795
722# 796#
723# I2C Algorithms 797# I2C Hardware Bus support
724# 798#
725# CONFIG_I2C_ALGOBIT is not set
726# CONFIG_I2C_ALGOPCF is not set
727# CONFIG_I2C_ALGOPCA is not set
728 799
729# 800#
730# I2C Hardware Bus support 801# PC SMBus host controller drivers
731# 802#
732# CONFIG_I2C_ALI1535 is not set 803# CONFIG_I2C_ALI1535 is not set
733# CONFIG_I2C_ALI1563 is not set 804# CONFIG_I2C_ALI1563 is not set
@@ -735,52 +806,64 @@ CONFIG_I2C_CHARDEV=y
735# CONFIG_I2C_AMD756 is not set 806# CONFIG_I2C_AMD756 is not set
736# CONFIG_I2C_AMD8111 is not set 807# CONFIG_I2C_AMD8111 is not set
737# CONFIG_I2C_I801 is not set 808# CONFIG_I2C_I801 is not set
738# CONFIG_I2C_I810 is not set 809# CONFIG_I2C_ISCH is not set
739# CONFIG_I2C_PIIX4 is not set 810# CONFIG_I2C_PIIX4 is not set
740CONFIG_I2C_MPC=y
741# CONFIG_I2C_NFORCE2 is not set 811# CONFIG_I2C_NFORCE2 is not set
742# CONFIG_I2C_OCORES is not set
743# CONFIG_I2C_PARPORT_LIGHT is not set
744# CONFIG_I2C_PROSAVAGE is not set
745# CONFIG_I2C_SAVAGE4 is not set
746# CONFIG_I2C_SIMTEC is not set
747# CONFIG_I2C_SIS5595 is not set 812# CONFIG_I2C_SIS5595 is not set
748# CONFIG_I2C_SIS630 is not set 813# CONFIG_I2C_SIS630 is not set
749# CONFIG_I2C_SIS96X is not set 814# CONFIG_I2C_SIS96X is not set
750# CONFIG_I2C_TAOS_EVM is not set
751# CONFIG_I2C_STUB is not set
752# CONFIG_I2C_TINY_USB is not set
753# CONFIG_I2C_VIA is not set 815# CONFIG_I2C_VIA is not set
754# CONFIG_I2C_VIAPRO is not set 816# CONFIG_I2C_VIAPRO is not set
817
818#
819# I2C system bus drivers (mostly embedded / system-on-chip)
820#
821CONFIG_I2C_MPC=y
822# CONFIG_I2C_OCORES is not set
823# CONFIG_I2C_SIMTEC is not set
824
825#
826# External I2C/SMBus adapter drivers
827#
828# CONFIG_I2C_PARPORT_LIGHT is not set
829# CONFIG_I2C_TAOS_EVM is not set
830# CONFIG_I2C_TINY_USB is not set
831
832#
833# Graphics adapter I2C/DDC channel drivers
834#
755# CONFIG_I2C_VOODOO3 is not set 835# CONFIG_I2C_VOODOO3 is not set
756 836
757# 837#
838# Other I2C/SMBus bus drivers
839#
840# CONFIG_I2C_PCA_PLATFORM is not set
841# CONFIG_I2C_STUB is not set
842
843#
758# Miscellaneous I2C Chip support 844# Miscellaneous I2C Chip support
759# 845#
760# CONFIG_SENSORS_DS1337 is not set
761# CONFIG_SENSORS_DS1374 is not set
762# CONFIG_DS1682 is not set 846# CONFIG_DS1682 is not set
847# CONFIG_AT24 is not set
763# CONFIG_SENSORS_EEPROM is not set 848# CONFIG_SENSORS_EEPROM is not set
764# CONFIG_SENSORS_PCF8574 is not set 849# CONFIG_SENSORS_PCF8574 is not set
850# CONFIG_PCF8575 is not set
765# CONFIG_SENSORS_PCA9539 is not set 851# CONFIG_SENSORS_PCA9539 is not set
766# CONFIG_SENSORS_PCF8591 is not set 852# CONFIG_SENSORS_PCF8591 is not set
767# CONFIG_SENSORS_M41T00 is not set
768# CONFIG_SENSORS_MAX6875 is not set 853# CONFIG_SENSORS_MAX6875 is not set
769# CONFIG_SENSORS_TSL2550 is not set 854# CONFIG_SENSORS_TSL2550 is not set
770# CONFIG_I2C_DEBUG_CORE is not set 855# CONFIG_I2C_DEBUG_CORE is not set
771# CONFIG_I2C_DEBUG_ALGO is not set 856# CONFIG_I2C_DEBUG_ALGO is not set
772# CONFIG_I2C_DEBUG_BUS is not set 857# CONFIG_I2C_DEBUG_BUS is not set
773# CONFIG_I2C_DEBUG_CHIP is not set 858# CONFIG_I2C_DEBUG_CHIP is not set
774
775#
776# SPI support
777#
778# CONFIG_SPI is not set 859# CONFIG_SPI is not set
779# CONFIG_SPI_MASTER is not set 860CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
861# CONFIG_GPIOLIB is not set
780# CONFIG_W1 is not set 862# CONFIG_W1 is not set
781# CONFIG_POWER_SUPPLY is not set 863# CONFIG_POWER_SUPPLY is not set
782CONFIG_HWMON=y 864CONFIG_HWMON=y
783# CONFIG_HWMON_VID is not set 865# CONFIG_HWMON_VID is not set
866# CONFIG_SENSORS_AD7414 is not set
784# CONFIG_SENSORS_AD7418 is not set 867# CONFIG_SENSORS_AD7418 is not set
785# CONFIG_SENSORS_ADM1021 is not set 868# CONFIG_SENSORS_ADM1021 is not set
786# CONFIG_SENSORS_ADM1025 is not set 869# CONFIG_SENSORS_ADM1025 is not set
@@ -788,7 +871,9 @@ CONFIG_HWMON=y
788# CONFIG_SENSORS_ADM1029 is not set 871# CONFIG_SENSORS_ADM1029 is not set
789# CONFIG_SENSORS_ADM1031 is not set 872# CONFIG_SENSORS_ADM1031 is not set
790# CONFIG_SENSORS_ADM9240 is not set 873# CONFIG_SENSORS_ADM9240 is not set
874# CONFIG_SENSORS_ADT7462 is not set
791# CONFIG_SENSORS_ADT7470 is not set 875# CONFIG_SENSORS_ADT7470 is not set
876# CONFIG_SENSORS_ADT7473 is not set
792# CONFIG_SENSORS_ATXP1 is not set 877# CONFIG_SENSORS_ATXP1 is not set
793# CONFIG_SENSORS_DS1621 is not set 878# CONFIG_SENSORS_DS1621 is not set
794# CONFIG_SENSORS_I5K_AMB is not set 879# CONFIG_SENSORS_I5K_AMB is not set
@@ -818,6 +903,7 @@ CONFIG_HWMON=y
818# CONFIG_SENSORS_SMSC47M1 is not set 903# CONFIG_SENSORS_SMSC47M1 is not set
819# CONFIG_SENSORS_SMSC47M192 is not set 904# CONFIG_SENSORS_SMSC47M192 is not set
820# CONFIG_SENSORS_SMSC47B397 is not set 905# CONFIG_SENSORS_SMSC47B397 is not set
906# CONFIG_SENSORS_ADS7828 is not set
821# CONFIG_SENSORS_THMC50 is not set 907# CONFIG_SENSORS_THMC50 is not set
822# CONFIG_SENSORS_VIA686A is not set 908# CONFIG_SENSORS_VIA686A is not set
823# CONFIG_SENSORS_VT1211 is not set 909# CONFIG_SENSORS_VT1211 is not set
@@ -827,9 +913,12 @@ CONFIG_HWMON=y
827# CONFIG_SENSORS_W83792D is not set 913# CONFIG_SENSORS_W83792D is not set
828# CONFIG_SENSORS_W83793 is not set 914# CONFIG_SENSORS_W83793 is not set
829# CONFIG_SENSORS_W83L785TS is not set 915# CONFIG_SENSORS_W83L785TS is not set
916# CONFIG_SENSORS_W83L786NG is not set
830# CONFIG_SENSORS_W83627HF is not set 917# CONFIG_SENSORS_W83627HF is not set
831# CONFIG_SENSORS_W83627EHF is not set 918# CONFIG_SENSORS_W83627EHF is not set
832# CONFIG_HWMON_DEBUG_CHIP is not set 919# CONFIG_HWMON_DEBUG_CHIP is not set
920# CONFIG_THERMAL is not set
921# CONFIG_THERMAL_HWMON is not set
833CONFIG_WATCHDOG=y 922CONFIG_WATCHDOG=y
834# CONFIG_WATCHDOG_NOWAYOUT is not set 923# CONFIG_WATCHDOG_NOWAYOUT is not set
835 924
@@ -837,6 +926,7 @@ CONFIG_WATCHDOG=y
837# Watchdog Device Drivers 926# Watchdog Device Drivers
838# 927#
839# CONFIG_SOFT_WATCHDOG is not set 928# CONFIG_SOFT_WATCHDOG is not set
929# CONFIG_ALIM7101_WDT is not set
840# CONFIG_MPC5200_WDT is not set 930# CONFIG_MPC5200_WDT is not set
841# CONFIG_WATCHDOG_RTAS is not set 931# CONFIG_WATCHDOG_RTAS is not set
842 932
@@ -850,23 +940,39 @@ CONFIG_WATCHDOG=y
850# USB-based Watchdog Cards 940# USB-based Watchdog Cards
851# 941#
852# CONFIG_USBPCWATCHDOG is not set 942# CONFIG_USBPCWATCHDOG is not set
943CONFIG_SSB_POSSIBLE=y
853 944
854# 945#
855# Sonics Silicon Backplane 946# Sonics Silicon Backplane
856# 947#
857CONFIG_SSB_POSSIBLE=y
858# CONFIG_SSB is not set 948# CONFIG_SSB is not set
859 949
860# 950#
861# Multifunction device drivers 951# Multifunction device drivers
862# 952#
953# CONFIG_MFD_CORE is not set
863# CONFIG_MFD_SM501 is not set 954# CONFIG_MFD_SM501 is not set
955# CONFIG_HTC_PASIC3 is not set
956# CONFIG_MFD_TMIO is not set
957# CONFIG_PMIC_DA903X is not set
958# CONFIG_MFD_WM8400 is not set
959# CONFIG_MFD_WM8350_I2C is not set
960# CONFIG_REGULATOR is not set
864 961
865# 962#
866# Multimedia devices 963# Multimedia devices
867# 964#
965
966#
967# Multimedia core support
968#
868# CONFIG_VIDEO_DEV is not set 969# CONFIG_VIDEO_DEV is not set
869# CONFIG_DVB_CORE is not set 970# CONFIG_DVB_CORE is not set
971# CONFIG_VIDEO_MEDIA is not set
972
973#
974# Multimedia drivers
975#
870CONFIG_DAB=y 976CONFIG_DAB=y
871# CONFIG_USB_DABUSB is not set 977# CONFIG_USB_DABUSB is not set
872 978
@@ -874,11 +980,78 @@ CONFIG_DAB=y
874# Graphics support 980# Graphics support
875# 981#
876# CONFIG_AGP is not set 982# CONFIG_AGP is not set
877# CONFIG_DRM is not set 983CONFIG_DRM=y
984# CONFIG_DRM_TDFX is not set
985# CONFIG_DRM_R128 is not set
986# CONFIG_DRM_RADEON is not set
987# CONFIG_DRM_MGA is not set
988# CONFIG_DRM_VIA is not set
989# CONFIG_DRM_SAVAGE is not set
878# CONFIG_VGASTATE is not set 990# CONFIG_VGASTATE is not set
879CONFIG_VIDEO_OUTPUT_CONTROL=m 991CONFIG_VIDEO_OUTPUT_CONTROL=y
880# CONFIG_FB is not set 992CONFIG_FB=y
881# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 993# CONFIG_FIRMWARE_EDID is not set
994CONFIG_FB_DDC=y
995# CONFIG_FB_BOOT_VESA_SUPPORT is not set
996CONFIG_FB_CFB_FILLRECT=y
997CONFIG_FB_CFB_COPYAREA=y
998CONFIG_FB_CFB_IMAGEBLIT=y
999# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
1000# CONFIG_FB_SYS_FILLRECT is not set
1001# CONFIG_FB_SYS_COPYAREA is not set
1002# CONFIG_FB_SYS_IMAGEBLIT is not set
1003# CONFIG_FB_FOREIGN_ENDIAN is not set
1004# CONFIG_FB_SYS_FOPS is not set
1005# CONFIG_FB_SVGALIB is not set
1006CONFIG_FB_MACMODES=y
1007CONFIG_FB_BACKLIGHT=y
1008CONFIG_FB_MODE_HELPERS=y
1009# CONFIG_FB_TILEBLITTING is not set
1010
1011#
1012# Frame buffer hardware drivers
1013#
1014# CONFIG_FB_CIRRUS is not set
1015# CONFIG_FB_PM2 is not set
1016# CONFIG_FB_CYBER2000 is not set
1017# CONFIG_FB_OF is not set
1018# CONFIG_FB_CT65550 is not set
1019# CONFIG_FB_ASILIANT is not set
1020# CONFIG_FB_IMSTT is not set
1021# CONFIG_FB_VGA16 is not set
1022# CONFIG_FB_S1D13XXX is not set
1023# CONFIG_FB_NVIDIA is not set
1024# CONFIG_FB_RIVA is not set
1025# CONFIG_FB_MATROX is not set
1026CONFIG_FB_RADEON=y
1027CONFIG_FB_RADEON_I2C=y
1028CONFIG_FB_RADEON_BACKLIGHT=y
1029# CONFIG_FB_RADEON_DEBUG is not set
1030# CONFIG_FB_ATY128 is not set
1031# CONFIG_FB_ATY is not set
1032# CONFIG_FB_S3 is not set
1033# CONFIG_FB_SAVAGE is not set
1034# CONFIG_FB_SIS is not set
1035# CONFIG_FB_VIA is not set
1036# CONFIG_FB_NEOMAGIC is not set
1037# CONFIG_FB_KYRO is not set
1038# CONFIG_FB_3DFX is not set
1039# CONFIG_FB_VOODOO1 is not set
1040# CONFIG_FB_VT8623 is not set
1041# CONFIG_FB_TRIDENT is not set
1042# CONFIG_FB_ARK is not set
1043# CONFIG_FB_PM3 is not set
1044# CONFIG_FB_CARMINE is not set
1045# CONFIG_FB_IBM_GXT4500 is not set
1046# CONFIG_FB_VIRTUAL is not set
1047# CONFIG_FB_METRONOME is not set
1048# CONFIG_FB_MB862XX is not set
1049CONFIG_BACKLIGHT_LCD_SUPPORT=y
1050CONFIG_LCD_CLASS_DEVICE=m
1051# CONFIG_LCD_ILI9320 is not set
1052# CONFIG_LCD_PLATFORM is not set
1053CONFIG_BACKLIGHT_CLASS_DEVICE=y
1054# CONFIG_BACKLIGHT_CORGI is not set
882 1055
883# 1056#
884# Display device support 1057# Display device support
@@ -886,15 +1059,64 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
886# CONFIG_DISPLAY_SUPPORT is not set 1059# CONFIG_DISPLAY_SUPPORT is not set
887 1060
888# 1061#
889# Sound 1062# Console display driver support
890# 1063#
1064# CONFIG_VGA_CONSOLE is not set
1065CONFIG_DUMMY_CONSOLE=y
1066CONFIG_FRAMEBUFFER_CONSOLE=y
1067# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
1068# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
1069# CONFIG_FONTS is not set
1070CONFIG_FONT_8x8=y
1071CONFIG_FONT_8x16=y
1072CONFIG_LOGO=y
1073CONFIG_LOGO_LINUX_MONO=y
1074CONFIG_LOGO_LINUX_VGA16=y
1075CONFIG_LOGO_LINUX_CLUT224=y
891# CONFIG_SOUND is not set 1076# CONFIG_SOUND is not set
1077CONFIG_HID_SUPPORT=y
1078CONFIG_HID=y
1079# CONFIG_HID_DEBUG is not set
1080# CONFIG_HIDRAW is not set
1081
1082#
1083# USB Input Devices
1084#
1085CONFIG_USB_HID=y
1086# CONFIG_HID_PID is not set
1087# CONFIG_USB_HIDDEV is not set
1088
1089#
1090# Special HID drivers
1091#
1092CONFIG_HID_COMPAT=y
1093CONFIG_HID_A4TECH=y
1094# CONFIG_HID_APPLE is not set
1095CONFIG_HID_BELKIN=y
1096CONFIG_HID_BRIGHT=y
1097CONFIG_HID_CHERRY=y
1098# CONFIG_HID_CHICONY is not set
1099CONFIG_HID_CYPRESS=y
1100CONFIG_HID_DELL=y
1101CONFIG_HID_EZKEY=y
1102# CONFIG_HID_GYRATION is not set
1103# CONFIG_HID_LOGITECH is not set
1104# CONFIG_HID_MICROSOFT is not set
1105# CONFIG_HID_MONTEREY is not set
1106# CONFIG_HID_PANTHERLORD is not set
1107# CONFIG_HID_PETALYNX is not set
1108# CONFIG_HID_SAMSUNG is not set
1109# CONFIG_HID_SONY is not set
1110# CONFIG_HID_SUNPLUS is not set
1111# CONFIG_THRUSTMASTER_FF is not set
1112# CONFIG_ZEROPLUS_FF is not set
892CONFIG_USB_SUPPORT=y 1113CONFIG_USB_SUPPORT=y
893CONFIG_USB_ARCH_HAS_HCD=y 1114CONFIG_USB_ARCH_HAS_HCD=y
894CONFIG_USB_ARCH_HAS_OHCI=y 1115CONFIG_USB_ARCH_HAS_OHCI=y
895CONFIG_USB_ARCH_HAS_EHCI=y 1116CONFIG_USB_ARCH_HAS_EHCI=y
896CONFIG_USB=y 1117CONFIG_USB=y
897# CONFIG_USB_DEBUG is not set 1118# CONFIG_USB_DEBUG is not set
1119# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
898 1120
899# 1121#
900# Miscellaneous USB options 1122# Miscellaneous USB options
@@ -903,14 +1125,20 @@ CONFIG_USB_DEVICEFS=y
903# CONFIG_USB_DEVICE_CLASS is not set 1125# CONFIG_USB_DEVICE_CLASS is not set
904# CONFIG_USB_DYNAMIC_MINORS is not set 1126# CONFIG_USB_DYNAMIC_MINORS is not set
905# CONFIG_USB_SUSPEND is not set 1127# CONFIG_USB_SUSPEND is not set
906# CONFIG_USB_PERSIST is not set
907# CONFIG_USB_OTG is not set 1128# CONFIG_USB_OTG is not set
1129# CONFIG_USB_OTG_WHITELIST is not set
1130# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1131CONFIG_USB_MON=y
1132# CONFIG_USB_WUSB is not set
1133# CONFIG_USB_WUSB_CBAF is not set
908 1134
909# 1135#
910# USB Host Controller Drivers 1136# USB Host Controller Drivers
911# 1137#
1138# CONFIG_USB_C67X00_HCD is not set
912# CONFIG_USB_EHCI_HCD is not set 1139# CONFIG_USB_EHCI_HCD is not set
913# CONFIG_USB_ISP116X_HCD is not set 1140# CONFIG_USB_ISP116X_HCD is not set
1141# CONFIG_USB_ISP1760_HCD is not set
914CONFIG_USB_OHCI_HCD=y 1142CONFIG_USB_OHCI_HCD=y
915CONFIG_USB_OHCI_HCD_PPC_SOC=y 1143CONFIG_USB_OHCI_HCD_PPC_SOC=y
916CONFIG_USB_OHCI_HCD_PPC_OF=y 1144CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -923,12 +1151,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
923# CONFIG_USB_UHCI_HCD is not set 1151# CONFIG_USB_UHCI_HCD is not set
924# CONFIG_USB_SL811_HCD is not set 1152# CONFIG_USB_SL811_HCD is not set
925# CONFIG_USB_R8A66597_HCD is not set 1153# CONFIG_USB_R8A66597_HCD is not set
1154# CONFIG_USB_WHCI_HCD is not set
1155# CONFIG_USB_HWA_HCD is not set
1156# CONFIG_USB_MUSB_HDRC is not set
926 1157
927# 1158#
928# USB Device Class drivers 1159# USB Device Class drivers
929# 1160#
930# CONFIG_USB_ACM is not set 1161# CONFIG_USB_ACM is not set
931# CONFIG_USB_PRINTER is not set 1162# CONFIG_USB_PRINTER is not set
1163# CONFIG_USB_WDM is not set
1164# CONFIG_USB_TMC is not set
932 1165
933# 1166#
934# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1167# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -948,7 +1181,9 @@ CONFIG_USB_STORAGE=y
948# CONFIG_USB_STORAGE_SDDR55 is not set 1181# CONFIG_USB_STORAGE_SDDR55 is not set
949# CONFIG_USB_STORAGE_JUMPSHOT is not set 1182# CONFIG_USB_STORAGE_JUMPSHOT is not set
950# CONFIG_USB_STORAGE_ALAUDA is not set 1183# CONFIG_USB_STORAGE_ALAUDA is not set
1184# CONFIG_USB_STORAGE_ONETOUCH is not set
951# CONFIG_USB_STORAGE_KARMA is not set 1185# CONFIG_USB_STORAGE_KARMA is not set
1186# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
952# CONFIG_USB_LIBUSUAL is not set 1187# CONFIG_USB_LIBUSUAL is not set
953 1188
954# 1189#
@@ -956,15 +1191,10 @@ CONFIG_USB_STORAGE=y
956# 1191#
957# CONFIG_USB_MDC800 is not set 1192# CONFIG_USB_MDC800 is not set
958# CONFIG_USB_MICROTEK is not set 1193# CONFIG_USB_MICROTEK is not set
959CONFIG_USB_MON=y
960 1194
961# 1195#
962# USB port drivers 1196# USB port drivers
963# 1197#
964
965#
966# USB Serial Converter support
967#
968# CONFIG_USB_SERIAL is not set 1198# CONFIG_USB_SERIAL is not set
969 1199
970# 1200#
@@ -973,7 +1203,7 @@ CONFIG_USB_MON=y
973# CONFIG_USB_EMI62 is not set 1203# CONFIG_USB_EMI62 is not set
974# CONFIG_USB_EMI26 is not set 1204# CONFIG_USB_EMI26 is not set
975# CONFIG_USB_ADUTUX is not set 1205# CONFIG_USB_ADUTUX is not set
976# CONFIG_USB_AUERSWALD is not set 1206# CONFIG_USB_SEVSEG is not set
977# CONFIG_USB_RIO500 is not set 1207# CONFIG_USB_RIO500 is not set
978# CONFIG_USB_LEGOTOWER is not set 1208# CONFIG_USB_LEGOTOWER is not set
979# CONFIG_USB_LCD is not set 1209# CONFIG_USB_LCD is not set
@@ -989,18 +1219,14 @@ CONFIG_USB_MON=y
989# CONFIG_USB_TRANCEVIBRATOR is not set 1219# CONFIG_USB_TRANCEVIBRATOR is not set
990# CONFIG_USB_IOWARRIOR is not set 1220# CONFIG_USB_IOWARRIOR is not set
991# CONFIG_USB_TEST is not set 1221# CONFIG_USB_TEST is not set
992 1222# CONFIG_USB_ISIGHTFW is not set
993# 1223# CONFIG_USB_VST is not set
994# USB DSL modem support
995#
996
997#
998# USB Gadget Support
999#
1000# CONFIG_USB_GADGET is not set 1224# CONFIG_USB_GADGET is not set
1225# CONFIG_UWB is not set
1001# CONFIG_MMC is not set 1226# CONFIG_MMC is not set
1227# CONFIG_MEMSTICK is not set
1002CONFIG_NEW_LEDS=y 1228CONFIG_NEW_LEDS=y
1003CONFIG_LEDS_CLASS=y 1229# CONFIG_LEDS_CLASS is not set
1004 1230
1005# 1231#
1006# LED drivers 1232# LED drivers
@@ -1009,17 +1235,15 @@ CONFIG_LEDS_CLASS=y
1009# 1235#
1010# LED Triggers 1236# LED Triggers
1011# 1237#
1012CONFIG_LEDS_TRIGGERS=y 1238# CONFIG_LEDS_TRIGGERS is not set
1013CONFIG_LEDS_TRIGGER_TIMER=y 1239# CONFIG_ACCESSIBILITY is not set
1014# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
1015# CONFIG_INFINIBAND is not set 1240# CONFIG_INFINIBAND is not set
1016# CONFIG_EDAC is not set 1241# CONFIG_EDAC is not set
1017# CONFIG_RTC_CLASS is not set 1242# CONFIG_RTC_CLASS is not set
1018 1243# CONFIG_DMADEVICES is not set
1019#
1020# Userspace I/O
1021#
1022# CONFIG_UIO is not set 1244# CONFIG_UIO is not set
1245# CONFIG_STAGING is not set
1246CONFIG_STAGING_EXCLUDE_BUILD=y
1023 1247
1024# 1248#
1025# File systems 1249# File systems
@@ -1031,21 +1255,19 @@ CONFIG_EXT3_FS=y
1031CONFIG_EXT3_FS_XATTR=y 1255CONFIG_EXT3_FS_XATTR=y
1032# CONFIG_EXT3_FS_POSIX_ACL is not set 1256# CONFIG_EXT3_FS_POSIX_ACL is not set
1033# CONFIG_EXT3_FS_SECURITY is not set 1257# CONFIG_EXT3_FS_SECURITY is not set
1034# CONFIG_EXT4DEV_FS is not set 1258# CONFIG_EXT4_FS is not set
1035CONFIG_JBD=y 1259CONFIG_JBD=y
1036CONFIG_FS_MBCACHE=y 1260CONFIG_FS_MBCACHE=y
1037# CONFIG_REISERFS_FS is not set 1261# CONFIG_REISERFS_FS is not set
1038# CONFIG_JFS_FS is not set 1262# CONFIG_JFS_FS is not set
1039# CONFIG_FS_POSIX_ACL is not set 1263# CONFIG_FS_POSIX_ACL is not set
1264CONFIG_FILE_LOCKING=y
1040# CONFIG_XFS_FS is not set 1265# CONFIG_XFS_FS is not set
1041# CONFIG_GFS2_FS is not set
1042# CONFIG_OCFS2_FS is not set 1266# CONFIG_OCFS2_FS is not set
1043# CONFIG_MINIX_FS is not set 1267CONFIG_DNOTIFY=y
1044# CONFIG_ROMFS_FS is not set
1045CONFIG_INOTIFY=y 1268CONFIG_INOTIFY=y
1046CONFIG_INOTIFY_USER=y 1269CONFIG_INOTIFY_USER=y
1047# CONFIG_QUOTA is not set 1270# CONFIG_QUOTA is not set
1048CONFIG_DNOTIFY=y
1049# CONFIG_AUTOFS_FS is not set 1271# CONFIG_AUTOFS_FS is not set
1050# CONFIG_AUTOFS4_FS is not set 1272# CONFIG_AUTOFS4_FS is not set
1051# CONFIG_FUSE_FS is not set 1273# CONFIG_FUSE_FS is not set
@@ -1072,6 +1294,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1072CONFIG_PROC_FS=y 1294CONFIG_PROC_FS=y
1073CONFIG_PROC_KCORE=y 1295CONFIG_PROC_KCORE=y
1074CONFIG_PROC_SYSCTL=y 1296CONFIG_PROC_SYSCTL=y
1297CONFIG_PROC_PAGE_MONITOR=y
1075CONFIG_SYSFS=y 1298CONFIG_SYSFS=y
1076CONFIG_TMPFS=y 1299CONFIG_TMPFS=y
1077# CONFIG_TMPFS_POSIX_ACL is not set 1300# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1101,8 +1324,11 @@ CONFIG_JFFS2_RTIME=y
1101# CONFIG_JFFS2_RUBIN is not set 1324# CONFIG_JFFS2_RUBIN is not set
1102CONFIG_CRAMFS=y 1325CONFIG_CRAMFS=y
1103# CONFIG_VXFS_FS is not set 1326# CONFIG_VXFS_FS is not set
1327# CONFIG_MINIX_FS is not set
1328# CONFIG_OMFS_FS is not set
1104# CONFIG_HPFS_FS is not set 1329# CONFIG_HPFS_FS is not set
1105# CONFIG_QNX4FS_FS is not set 1330# CONFIG_QNX4FS_FS is not set
1331# CONFIG_ROMFS_FS is not set
1106# CONFIG_SYSV_FS is not set 1332# CONFIG_SYSV_FS is not set
1107# CONFIG_UFS_FS is not set 1333# CONFIG_UFS_FS is not set
1108CONFIG_NETWORK_FILESYSTEMS=y 1334CONFIG_NETWORK_FILESYSTEMS=y
@@ -1110,15 +1336,14 @@ CONFIG_NFS_FS=y
1110CONFIG_NFS_V3=y 1336CONFIG_NFS_V3=y
1111# CONFIG_NFS_V3_ACL is not set 1337# CONFIG_NFS_V3_ACL is not set
1112CONFIG_NFS_V4=y 1338CONFIG_NFS_V4=y
1113# CONFIG_NFS_DIRECTIO is not set
1114# CONFIG_NFSD is not set
1115CONFIG_ROOT_NFS=y 1339CONFIG_ROOT_NFS=y
1340# CONFIG_NFSD is not set
1116CONFIG_LOCKD=y 1341CONFIG_LOCKD=y
1117CONFIG_LOCKD_V4=y 1342CONFIG_LOCKD_V4=y
1118CONFIG_NFS_COMMON=y 1343CONFIG_NFS_COMMON=y
1119CONFIG_SUNRPC=y 1344CONFIG_SUNRPC=y
1120CONFIG_SUNRPC_GSS=y 1345CONFIG_SUNRPC_GSS=y
1121# CONFIG_SUNRPC_BIND34 is not set 1346# CONFIG_SUNRPC_REGISTER_V4 is not set
1122CONFIG_RPCSEC_GSS_KRB5=y 1347CONFIG_RPCSEC_GSS_KRB5=y
1123# CONFIG_RPCSEC_GSS_SPKM3 is not set 1348# CONFIG_RPCSEC_GSS_SPKM3 is not set
1124# CONFIG_SMB_FS is not set 1349# CONFIG_SMB_FS is not set
@@ -1173,7 +1398,6 @@ CONFIG_NLS_ISO8859_1=y
1173# CONFIG_NLS_KOI8_U is not set 1398# CONFIG_NLS_KOI8_U is not set
1174# CONFIG_NLS_UTF8 is not set 1399# CONFIG_NLS_UTF8 is not set
1175# CONFIG_DLM is not set 1400# CONFIG_DLM is not set
1176# CONFIG_UCC_SLOW is not set
1177 1401
1178# 1402#
1179# Library routines 1403# Library routines
@@ -1181,6 +1405,7 @@ CONFIG_NLS_ISO8859_1=y
1181CONFIG_BITREVERSE=y 1405CONFIG_BITREVERSE=y
1182# CONFIG_CRC_CCITT is not set 1406# CONFIG_CRC_CCITT is not set
1183# CONFIG_CRC16 is not set 1407# CONFIG_CRC16 is not set
1408# CONFIG_CRC_T10DIF is not set
1184# CONFIG_CRC_ITU_T is not set 1409# CONFIG_CRC_ITU_T is not set
1185CONFIG_CRC32=y 1410CONFIG_CRC32=y
1186# CONFIG_CRC7 is not set 1411# CONFIG_CRC7 is not set
@@ -1191,7 +1416,7 @@ CONFIG_PLIST=y
1191CONFIG_HAS_IOMEM=y 1416CONFIG_HAS_IOMEM=y
1192CONFIG_HAS_IOPORT=y 1417CONFIG_HAS_IOPORT=y
1193CONFIG_HAS_DMA=y 1418CONFIG_HAS_DMA=y
1194# CONFIG_INSTRUMENTATION is not set 1419CONFIG_HAVE_LMB=y
1195 1420
1196# 1421#
1197# Kernel hacking 1422# Kernel hacking
@@ -1199,6 +1424,7 @@ CONFIG_HAS_DMA=y
1199CONFIG_PRINTK_TIME=y 1424CONFIG_PRINTK_TIME=y
1200CONFIG_ENABLE_WARN_DEPRECATED=y 1425CONFIG_ENABLE_WARN_DEPRECATED=y
1201CONFIG_ENABLE_MUST_CHECK=y 1426CONFIG_ENABLE_MUST_CHECK=y
1427CONFIG_FRAME_WARN=1024
1202# CONFIG_MAGIC_SYSRQ is not set 1428# CONFIG_MAGIC_SYSRQ is not set
1203# CONFIG_UNUSED_SYMBOLS is not set 1429# CONFIG_UNUSED_SYMBOLS is not set
1204# CONFIG_DEBUG_FS is not set 1430# CONFIG_DEBUG_FS is not set
@@ -1206,10 +1432,14 @@ CONFIG_ENABLE_MUST_CHECK=y
1206CONFIG_DEBUG_KERNEL=y 1432CONFIG_DEBUG_KERNEL=y
1207# CONFIG_DEBUG_SHIRQ is not set 1433# CONFIG_DEBUG_SHIRQ is not set
1208CONFIG_DETECT_SOFTLOCKUP=y 1434CONFIG_DETECT_SOFTLOCKUP=y
1435# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1436CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1209CONFIG_SCHED_DEBUG=y 1437CONFIG_SCHED_DEBUG=y
1210# CONFIG_SCHEDSTATS is not set 1438# CONFIG_SCHEDSTATS is not set
1211# CONFIG_TIMER_STATS is not set 1439# CONFIG_TIMER_STATS is not set
1440# CONFIG_DEBUG_OBJECTS is not set
1212# CONFIG_SLUB_DEBUG_ON is not set 1441# CONFIG_SLUB_DEBUG_ON is not set
1442# CONFIG_SLUB_STATS is not set
1213# CONFIG_DEBUG_RT_MUTEXES is not set 1443# CONFIG_DEBUG_RT_MUTEXES is not set
1214# CONFIG_RT_MUTEX_TESTER is not set 1444# CONFIG_RT_MUTEX_TESTER is not set
1215# CONFIG_DEBUG_SPINLOCK is not set 1445# CONFIG_DEBUG_SPINLOCK is not set
@@ -1220,17 +1450,39 @@ CONFIG_SCHED_DEBUG=y
1220# CONFIG_DEBUG_BUGVERBOSE is not set 1450# CONFIG_DEBUG_BUGVERBOSE is not set
1221CONFIG_DEBUG_INFO=y 1451CONFIG_DEBUG_INFO=y
1222# CONFIG_DEBUG_VM is not set 1452# CONFIG_DEBUG_VM is not set
1453# CONFIG_DEBUG_WRITECOUNT is not set
1454# CONFIG_DEBUG_MEMORY_INIT is not set
1223# CONFIG_DEBUG_LIST is not set 1455# CONFIG_DEBUG_LIST is not set
1224# CONFIG_DEBUG_SG is not set 1456# CONFIG_DEBUG_SG is not set
1225CONFIG_FORCED_INLINING=y
1226# CONFIG_BOOT_PRINTK_DELAY is not set 1457# CONFIG_BOOT_PRINTK_DELAY is not set
1227# CONFIG_RCU_TORTURE_TEST is not set 1458# CONFIG_RCU_TORTURE_TEST is not set
1459# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1460# CONFIG_BACKTRACE_SELF_TEST is not set
1461# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1228# CONFIG_FAULT_INJECTION is not set 1462# CONFIG_FAULT_INJECTION is not set
1463# CONFIG_LATENCYTOP is not set
1464CONFIG_HAVE_FUNCTION_TRACER=y
1465
1466#
1467# Tracers
1468#
1469# CONFIG_FUNCTION_TRACER is not set
1470# CONFIG_SCHED_TRACER is not set
1471# CONFIG_CONTEXT_SWITCH_TRACER is not set
1472# CONFIG_BOOT_TRACER is not set
1473# CONFIG_STACK_TRACER is not set
1474# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1229# CONFIG_SAMPLES is not set 1475# CONFIG_SAMPLES is not set
1476CONFIG_HAVE_ARCH_KGDB=y
1477# CONFIG_KGDB is not set
1230# CONFIG_DEBUG_STACKOVERFLOW is not set 1478# CONFIG_DEBUG_STACKOVERFLOW is not set
1231# CONFIG_DEBUG_STACK_USAGE is not set 1479# CONFIG_DEBUG_STACK_USAGE is not set
1232# CONFIG_DEBUG_PAGEALLOC is not set 1480# CONFIG_DEBUG_PAGEALLOC is not set
1233# CONFIG_DEBUGGER is not set 1481# CONFIG_CODE_PATCHING_SELFTEST is not set
1482# CONFIG_FTR_FIXUP_SELFTEST is not set
1483# CONFIG_MSI_BITMAP_SELFTEST is not set
1484# CONFIG_XMON is not set
1485# CONFIG_IRQSTACKS is not set
1234# CONFIG_BDI_SWITCH is not set 1486# CONFIG_BDI_SWITCH is not set
1235# CONFIG_BOOTX_TEXT is not set 1487# CONFIG_BOOTX_TEXT is not set
1236# CONFIG_PPC_EARLY_DEBUG is not set 1488# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1240,47 +1492,98 @@ CONFIG_FORCED_INLINING=y
1240# 1492#
1241# CONFIG_KEYS is not set 1493# CONFIG_KEYS is not set
1242# CONFIG_SECURITY is not set 1494# CONFIG_SECURITY is not set
1495# CONFIG_SECURITYFS is not set
1243# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1496# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1244CONFIG_CRYPTO=y 1497CONFIG_CRYPTO=y
1498
1499#
1500# Crypto core or helper
1501#
1502# CONFIG_CRYPTO_FIPS is not set
1245CONFIG_CRYPTO_ALGAPI=y 1503CONFIG_CRYPTO_ALGAPI=y
1504CONFIG_CRYPTO_AEAD=y
1246CONFIG_CRYPTO_BLKCIPHER=y 1505CONFIG_CRYPTO_BLKCIPHER=y
1506CONFIG_CRYPTO_HASH=y
1507CONFIG_CRYPTO_RNG=y
1247CONFIG_CRYPTO_MANAGER=y 1508CONFIG_CRYPTO_MANAGER=y
1509# CONFIG_CRYPTO_GF128MUL is not set
1510# CONFIG_CRYPTO_NULL is not set
1511# CONFIG_CRYPTO_CRYPTD is not set
1512# CONFIG_CRYPTO_AUTHENC is not set
1513# CONFIG_CRYPTO_TEST is not set
1514
1515#
1516# Authenticated Encryption with Associated Data
1517#
1518# CONFIG_CRYPTO_CCM is not set
1519# CONFIG_CRYPTO_GCM is not set
1520# CONFIG_CRYPTO_SEQIV is not set
1521
1522#
1523# Block modes
1524#
1525CONFIG_CRYPTO_CBC=y
1526# CONFIG_CRYPTO_CTR is not set
1527# CONFIG_CRYPTO_CTS is not set
1528# CONFIG_CRYPTO_ECB is not set
1529# CONFIG_CRYPTO_LRW is not set
1530# CONFIG_CRYPTO_PCBC is not set
1531# CONFIG_CRYPTO_XTS is not set
1532
1533#
1534# Hash modes
1535#
1248# CONFIG_CRYPTO_HMAC is not set 1536# CONFIG_CRYPTO_HMAC is not set
1249# CONFIG_CRYPTO_XCBC is not set 1537# CONFIG_CRYPTO_XCBC is not set
1250# CONFIG_CRYPTO_NULL is not set 1538
1539#
1540# Digest
1541#
1542# CONFIG_CRYPTO_CRC32C is not set
1251# CONFIG_CRYPTO_MD4 is not set 1543# CONFIG_CRYPTO_MD4 is not set
1252CONFIG_CRYPTO_MD5=y 1544CONFIG_CRYPTO_MD5=y
1545# CONFIG_CRYPTO_MICHAEL_MIC is not set
1546# CONFIG_CRYPTO_RMD128 is not set
1547# CONFIG_CRYPTO_RMD160 is not set
1548# CONFIG_CRYPTO_RMD256 is not set
1549# CONFIG_CRYPTO_RMD320 is not set
1253# CONFIG_CRYPTO_SHA1 is not set 1550# CONFIG_CRYPTO_SHA1 is not set
1254# CONFIG_CRYPTO_SHA256 is not set 1551# CONFIG_CRYPTO_SHA256 is not set
1255# CONFIG_CRYPTO_SHA512 is not set 1552# CONFIG_CRYPTO_SHA512 is not set
1256# CONFIG_CRYPTO_WP512 is not set
1257# CONFIG_CRYPTO_TGR192 is not set 1553# CONFIG_CRYPTO_TGR192 is not set
1258# CONFIG_CRYPTO_GF128MUL is not set 1554# CONFIG_CRYPTO_WP512 is not set
1259# CONFIG_CRYPTO_ECB is not set 1555
1260CONFIG_CRYPTO_CBC=y 1556#
1261# CONFIG_CRYPTO_PCBC is not set 1557# Ciphers
1262# CONFIG_CRYPTO_LRW is not set 1558#
1263# CONFIG_CRYPTO_XTS is not set
1264# CONFIG_CRYPTO_CRYPTD is not set
1265CONFIG_CRYPTO_DES=y
1266# CONFIG_CRYPTO_FCRYPT is not set
1267# CONFIG_CRYPTO_BLOWFISH is not set
1268# CONFIG_CRYPTO_TWOFISH is not set
1269# CONFIG_CRYPTO_SERPENT is not set
1270# CONFIG_CRYPTO_AES is not set 1559# CONFIG_CRYPTO_AES is not set
1560# CONFIG_CRYPTO_ANUBIS is not set
1561# CONFIG_CRYPTO_ARC4 is not set
1562# CONFIG_CRYPTO_BLOWFISH is not set
1563# CONFIG_CRYPTO_CAMELLIA is not set
1271# CONFIG_CRYPTO_CAST5 is not set 1564# CONFIG_CRYPTO_CAST5 is not set
1272# CONFIG_CRYPTO_CAST6 is not set 1565# CONFIG_CRYPTO_CAST6 is not set
1273# CONFIG_CRYPTO_TEA is not set 1566CONFIG_CRYPTO_DES=y
1274# CONFIG_CRYPTO_ARC4 is not set 1567# CONFIG_CRYPTO_FCRYPT is not set
1275# CONFIG_CRYPTO_KHAZAD is not set 1568# CONFIG_CRYPTO_KHAZAD is not set
1276# CONFIG_CRYPTO_ANUBIS is not set 1569# CONFIG_CRYPTO_SALSA20 is not set
1277# CONFIG_CRYPTO_SEED is not set 1570# CONFIG_CRYPTO_SEED is not set
1571# CONFIG_CRYPTO_SERPENT is not set
1572# CONFIG_CRYPTO_TEA is not set
1573# CONFIG_CRYPTO_TWOFISH is not set
1574
1575#
1576# Compression
1577#
1278# CONFIG_CRYPTO_DEFLATE is not set 1578# CONFIG_CRYPTO_DEFLATE is not set
1279# CONFIG_CRYPTO_MICHAEL_MIC is not set 1579# CONFIG_CRYPTO_LZO is not set
1280# CONFIG_CRYPTO_CRC32C is not set 1580
1281# CONFIG_CRYPTO_CAMELLIA is not set 1581#
1282# CONFIG_CRYPTO_TEST is not set 1582# Random Number Generation
1283# CONFIG_CRYPTO_AUTHENC is not set 1583#
1584# CONFIG_CRYPTO_ANSI_CPRNG is not set
1284CONFIG_CRYPTO_HW=y 1585CONFIG_CRYPTO_HW=y
1586# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1285CONFIG_PPC_CLOCK=y 1587CONFIG_PPC_CLOCK=y
1286CONFIG_PPC_LIB_RHEAP=y 1588CONFIG_PPC_LIB_RHEAP=y
1589# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/ppc40x_defconfig b/arch/powerpc/configs/ppc40x_defconfig
index c15c91deb2ab..4256e2c4534b 100644
--- a/arch/powerpc/configs/ppc40x_defconfig
+++ b/arch/powerpc/configs/ppc40x_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.28-rc4
4# Tue Oct 28 08:56:44 2008 4# Fri Nov 14 09:54:44 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -500,15 +500,17 @@ CONFIG_BLK_DEV_RAM_SIZE=35000
500# CONFIG_BLK_DEV_XIP is not set 500# CONFIG_BLK_DEV_XIP is not set
501# CONFIG_CDROM_PKTCDVD is not set 501# CONFIG_CDROM_PKTCDVD is not set
502# CONFIG_ATA_OVER_ETH is not set 502# CONFIG_ATA_OVER_ETH is not set
503# CONFIG_XILINX_SYSACE is not set 503CONFIG_XILINX_SYSACE=m
504# CONFIG_BLK_DEV_HD is not set 504# CONFIG_BLK_DEV_HD is not set
505CONFIG_MISC_DEVICES=y 505CONFIG_MISC_DEVICES=y
506# CONFIG_PHANTOM is not set 506# CONFIG_PHANTOM is not set
507# CONFIG_EEPROM_93CX6 is not set 507# CONFIG_EEPROM_93CX6 is not set
508# CONFIG_SGI_IOC4 is not set 508# CONFIG_SGI_IOC4 is not set
509# CONFIG_TIFM_CORE is not set 509# CONFIG_TIFM_CORE is not set
510# CONFIG_ICS932S401 is not set
510# CONFIG_ENCLOSURE_SERVICES is not set 511# CONFIG_ENCLOSURE_SERVICES is not set
511# CONFIG_HP_ILO is not set 512# CONFIG_HP_ILO is not set
513# CONFIG_C2PORT is not set
512CONFIG_HAVE_IDE=y 514CONFIG_HAVE_IDE=y
513# CONFIG_IDE is not set 515# CONFIG_IDE is not set
514 516
@@ -632,7 +634,13 @@ CONFIG_NETDEV_10000=y
632# 634#
633# Hardware I/O ports 635# Hardware I/O ports
634# 636#
635# CONFIG_SERIO is not set 637CONFIG_SERIO=m
638# CONFIG_SERIO_I8042 is not set
639# CONFIG_SERIO_SERPORT is not set
640# CONFIG_SERIO_PCIPS2 is not set
641# CONFIG_SERIO_LIBPS2 is not set
642# CONFIG_SERIO_RAW is not set
643CONFIG_SERIO_XILINX_XPS_PS2=m
636# CONFIG_GAMEPORT is not set 644# CONFIG_GAMEPORT is not set
637 645
638# 646#
@@ -660,7 +668,8 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
660# 668#
661# Non-8250 serial port support 669# Non-8250 serial port support
662# 670#
663# CONFIG_SERIAL_UARTLITE is not set 671CONFIG_SERIAL_UARTLITE=y
672CONFIG_SERIAL_UARTLITE_CONSOLE=y
664CONFIG_SERIAL_CORE=y 673CONFIG_SERIAL_CORE=y
665CONFIG_SERIAL_CORE_CONSOLE=y 674CONFIG_SERIAL_CORE_CONSOLE=y
666# CONFIG_SERIAL_JSM is not set 675# CONFIG_SERIAL_JSM is not set
@@ -757,6 +766,11 @@ CONFIG_GPIOLIB=y
757# CONFIG_GPIO_SYSFS is not set 766# CONFIG_GPIO_SYSFS is not set
758 767
759# 768#
769# Memory mapped GPIO expanders:
770#
771CONFIG_GPIO_XILINX=y
772
773#
760# I2C GPIO expanders: 774# I2C GPIO expanders:
761# 775#
762# CONFIG_GPIO_MAX732X is not set 776# CONFIG_GPIO_MAX732X is not set
@@ -776,11 +790,11 @@ CONFIG_GPIOLIB=y
776# CONFIG_HWMON is not set 790# CONFIG_HWMON is not set
777CONFIG_THERMAL=y 791CONFIG_THERMAL=y
778# CONFIG_WATCHDOG is not set 792# CONFIG_WATCHDOG is not set
793CONFIG_SSB_POSSIBLE=y
779 794
780# 795#
781# Sonics Silicon Backplane 796# Sonics Silicon Backplane
782# 797#
783CONFIG_SSB_POSSIBLE=y
784# CONFIG_SSB is not set 798# CONFIG_SSB is not set
785 799
786# 800#
@@ -792,6 +806,7 @@ CONFIG_SSB_POSSIBLE=y
792# CONFIG_MFD_TMIO is not set 806# CONFIG_MFD_TMIO is not set
793# CONFIG_MFD_WM8400 is not set 807# CONFIG_MFD_WM8400 is not set
794# CONFIG_MFD_WM8350_I2C is not set 808# CONFIG_MFD_WM8350_I2C is not set
809# CONFIG_REGULATOR is not set
795 810
796# 811#
797# Multimedia devices 812# Multimedia devices
@@ -816,13 +831,65 @@ CONFIG_SSB_POSSIBLE=y
816# CONFIG_DRM is not set 831# CONFIG_DRM is not set
817# CONFIG_VGASTATE is not set 832# CONFIG_VGASTATE is not set
818CONFIG_VIDEO_OUTPUT_CONTROL=m 833CONFIG_VIDEO_OUTPUT_CONTROL=m
819# CONFIG_FB is not set 834CONFIG_FB=m
835# CONFIG_FIRMWARE_EDID is not set
836# CONFIG_FB_DDC is not set
837# CONFIG_FB_BOOT_VESA_SUPPORT is not set
838CONFIG_FB_CFB_FILLRECT=m
839CONFIG_FB_CFB_COPYAREA=m
840CONFIG_FB_CFB_IMAGEBLIT=m
841# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
842# CONFIG_FB_SYS_FILLRECT is not set
843# CONFIG_FB_SYS_COPYAREA is not set
844# CONFIG_FB_SYS_IMAGEBLIT is not set
845# CONFIG_FB_FOREIGN_ENDIAN is not set
846# CONFIG_FB_SYS_FOPS is not set
847# CONFIG_FB_SVGALIB is not set
848# CONFIG_FB_MACMODES is not set
849# CONFIG_FB_BACKLIGHT is not set
850# CONFIG_FB_MODE_HELPERS is not set
851# CONFIG_FB_TILEBLITTING is not set
852
853#
854# Frame buffer hardware drivers
855#
856# CONFIG_FB_CIRRUS is not set
857# CONFIG_FB_PM2 is not set
858# CONFIG_FB_CYBER2000 is not set
859# CONFIG_FB_VGA16 is not set
860# CONFIG_FB_UVESA is not set
861# CONFIG_FB_S1D13XXX is not set
862# CONFIG_FB_NVIDIA is not set
863# CONFIG_FB_RIVA is not set
864# CONFIG_FB_MATROX is not set
865# CONFIG_FB_RADEON is not set
866# CONFIG_FB_ATY128 is not set
867# CONFIG_FB_ATY is not set
868# CONFIG_FB_S3 is not set
869# CONFIG_FB_SAVAGE is not set
870# CONFIG_FB_SIS is not set
871# CONFIG_FB_VIA is not set
872# CONFIG_FB_NEOMAGIC is not set
873# CONFIG_FB_KYRO is not set
874# CONFIG_FB_3DFX is not set
875# CONFIG_FB_VOODOO1 is not set
876# CONFIG_FB_VT8623 is not set
877# CONFIG_FB_TRIDENT is not set
878# CONFIG_FB_ARK is not set
879# CONFIG_FB_PM3 is not set
880# CONFIG_FB_CARMINE is not set
881# CONFIG_FB_IBM_GXT4500 is not set
882CONFIG_FB_XILINX=m
883# CONFIG_FB_VIRTUAL is not set
884# CONFIG_FB_METRONOME is not set
885# CONFIG_FB_MB862XX is not set
820# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 886# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
821 887
822# 888#
823# Display device support 889# Display device support
824# 890#
825# CONFIG_DISPLAY_SUPPORT is not set 891# CONFIG_DISPLAY_SUPPORT is not set
892# CONFIG_LOGO is not set
826# CONFIG_SOUND is not set 893# CONFIG_SOUND is not set
827CONFIG_USB_SUPPORT=y 894CONFIG_USB_SUPPORT=y
828CONFIG_USB_ARCH_HAS_HCD=y 895CONFIG_USB_ARCH_HAS_HCD=y
@@ -851,6 +918,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
851# CONFIG_DMADEVICES is not set 918# CONFIG_DMADEVICES is not set
852# CONFIG_UIO is not set 919# CONFIG_UIO is not set
853# CONFIG_STAGING is not set 920# CONFIG_STAGING is not set
921CONFIG_STAGING_EXCLUDE_BUILD=y
854 922
855# 923#
856# File systems 924# File systems
@@ -1077,10 +1145,12 @@ CONFIG_DEBUG_BUGVERBOSE=y
1077# CONFIG_FAULT_INJECTION is not set 1145# CONFIG_FAULT_INJECTION is not set
1078# CONFIG_LATENCYTOP is not set 1146# CONFIG_LATENCYTOP is not set
1079CONFIG_SYSCTL_SYSCALL_CHECK=y 1147CONFIG_SYSCTL_SYSCALL_CHECK=y
1080CONFIG_NOP_TRACER=y 1148CONFIG_HAVE_FUNCTION_TRACER=y
1081CONFIG_HAVE_FTRACE=y 1149
1082CONFIG_HAVE_DYNAMIC_FTRACE=y 1150#
1083# CONFIG_FTRACE is not set 1151# Tracers
1152#
1153# CONFIG_FUNCTION_TRACER is not set
1084# CONFIG_SCHED_TRACER is not set 1154# CONFIG_SCHED_TRACER is not set
1085# CONFIG_CONTEXT_SWITCH_TRACER is not set 1155# CONFIG_CONTEXT_SWITCH_TRACER is not set
1086# CONFIG_BOOT_TRACER is not set 1156# CONFIG_BOOT_TRACER is not set
diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig
index 55edbd545b61..cfc94cfcf4cb 100644
--- a/arch/powerpc/configs/ppc44x_defconfig
+++ b/arch/powerpc/configs/ppc44x_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.28-rc4
4# Tue Oct 28 09:28:58 2008 4# Fri Nov 14 10:06:19 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -506,15 +506,17 @@ CONFIG_BLK_DEV_RAM_SIZE=35000
506# CONFIG_BLK_DEV_XIP is not set 506# CONFIG_BLK_DEV_XIP is not set
507# CONFIG_CDROM_PKTCDVD is not set 507# CONFIG_CDROM_PKTCDVD is not set
508# CONFIG_ATA_OVER_ETH is not set 508# CONFIG_ATA_OVER_ETH is not set
509# CONFIG_XILINX_SYSACE is not set 509CONFIG_XILINX_SYSACE=m
510# CONFIG_BLK_DEV_HD is not set 510# CONFIG_BLK_DEV_HD is not set
511CONFIG_MISC_DEVICES=y 511CONFIG_MISC_DEVICES=y
512# CONFIG_PHANTOM is not set 512# CONFIG_PHANTOM is not set
513# CONFIG_EEPROM_93CX6 is not set 513# CONFIG_EEPROM_93CX6 is not set
514# CONFIG_SGI_IOC4 is not set 514# CONFIG_SGI_IOC4 is not set
515# CONFIG_TIFM_CORE is not set 515# CONFIG_TIFM_CORE is not set
516# CONFIG_ICS932S401 is not set
516# CONFIG_ENCLOSURE_SERVICES is not set 517# CONFIG_ENCLOSURE_SERVICES is not set
517# CONFIG_HP_ILO is not set 518# CONFIG_HP_ILO is not set
519# CONFIG_C2PORT is not set
518CONFIG_HAVE_IDE=y 520CONFIG_HAVE_IDE=y
519# CONFIG_IDE is not set 521# CONFIG_IDE is not set
520 522
@@ -680,7 +682,13 @@ CONFIG_NETDEV_10000=y
680# 682#
681# Hardware I/O ports 683# Hardware I/O ports
682# 684#
683# CONFIG_SERIO is not set 685CONFIG_SERIO=m
686# CONFIG_SERIO_I8042 is not set
687# CONFIG_SERIO_SERPORT is not set
688# CONFIG_SERIO_PCIPS2 is not set
689# CONFIG_SERIO_LIBPS2 is not set
690# CONFIG_SERIO_RAW is not set
691CONFIG_SERIO_XILINX_XPS_PS2=m
684# CONFIG_GAMEPORT is not set 692# CONFIG_GAMEPORT is not set
685 693
686# 694#
@@ -708,7 +716,8 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
708# 716#
709# Non-8250 serial port support 717# Non-8250 serial port support
710# 718#
711# CONFIG_SERIAL_UARTLITE is not set 719CONFIG_SERIAL_UARTLITE=y
720CONFIG_SERIAL_UARTLITE_CONSOLE=y
712CONFIG_SERIAL_CORE=y 721CONFIG_SERIAL_CORE=y
713CONFIG_SERIAL_CORE_CONSOLE=y 722CONFIG_SERIAL_CORE_CONSOLE=y
714# CONFIG_SERIAL_JSM is not set 723# CONFIG_SERIAL_JSM is not set
@@ -806,6 +815,11 @@ CONFIG_GPIOLIB=y
806# CONFIG_GPIO_SYSFS is not set 815# CONFIG_GPIO_SYSFS is not set
807 816
808# 817#
818# Memory mapped GPIO expanders:
819#
820CONFIG_GPIO_XILINX=y
821
822#
809# I2C GPIO expanders: 823# I2C GPIO expanders:
810# 824#
811# CONFIG_GPIO_MAX732X is not set 825# CONFIG_GPIO_MAX732X is not set
@@ -826,11 +840,11 @@ CONFIG_GPIOLIB=y
826# CONFIG_THERMAL is not set 840# CONFIG_THERMAL is not set
827# CONFIG_THERMAL_HWMON is not set 841# CONFIG_THERMAL_HWMON is not set
828# CONFIG_WATCHDOG is not set 842# CONFIG_WATCHDOG is not set
843CONFIG_SSB_POSSIBLE=y
829 844
830# 845#
831# Sonics Silicon Backplane 846# Sonics Silicon Backplane
832# 847#
833CONFIG_SSB_POSSIBLE=y
834# CONFIG_SSB is not set 848# CONFIG_SSB is not set
835 849
836# 850#
@@ -842,6 +856,7 @@ CONFIG_SSB_POSSIBLE=y
842# CONFIG_MFD_TMIO is not set 856# CONFIG_MFD_TMIO is not set
843# CONFIG_MFD_WM8400 is not set 857# CONFIG_MFD_WM8400 is not set
844# CONFIG_MFD_WM8350_I2C is not set 858# CONFIG_MFD_WM8350_I2C is not set
859# CONFIG_REGULATOR is not set
845 860
846# 861#
847# Multimedia devices 862# Multimedia devices
@@ -866,13 +881,65 @@ CONFIG_SSB_POSSIBLE=y
866# CONFIG_DRM is not set 881# CONFIG_DRM is not set
867# CONFIG_VGASTATE is not set 882# CONFIG_VGASTATE is not set
868# CONFIG_VIDEO_OUTPUT_CONTROL is not set 883# CONFIG_VIDEO_OUTPUT_CONTROL is not set
869# CONFIG_FB is not set 884CONFIG_FB=m
885# CONFIG_FIRMWARE_EDID is not set
886# CONFIG_FB_DDC is not set
887# CONFIG_FB_BOOT_VESA_SUPPORT is not set
888CONFIG_FB_CFB_FILLRECT=m
889CONFIG_FB_CFB_COPYAREA=m
890CONFIG_FB_CFB_IMAGEBLIT=m
891# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
892# CONFIG_FB_SYS_FILLRECT is not set
893# CONFIG_FB_SYS_COPYAREA is not set
894# CONFIG_FB_SYS_IMAGEBLIT is not set
895# CONFIG_FB_FOREIGN_ENDIAN is not set
896# CONFIG_FB_SYS_FOPS is not set
897# CONFIG_FB_SVGALIB is not set
898# CONFIG_FB_MACMODES is not set
899# CONFIG_FB_BACKLIGHT is not set
900# CONFIG_FB_MODE_HELPERS is not set
901# CONFIG_FB_TILEBLITTING is not set
902
903#
904# Frame buffer hardware drivers
905#
906# CONFIG_FB_CIRRUS is not set
907# CONFIG_FB_PM2 is not set
908# CONFIG_FB_CYBER2000 is not set
909# CONFIG_FB_VGA16 is not set
910# CONFIG_FB_UVESA is not set
911# CONFIG_FB_S1D13XXX is not set
912# CONFIG_FB_NVIDIA is not set
913# CONFIG_FB_RIVA is not set
914# CONFIG_FB_MATROX is not set
915# CONFIG_FB_RADEON is not set
916# CONFIG_FB_ATY128 is not set
917# CONFIG_FB_ATY is not set
918# CONFIG_FB_S3 is not set
919# CONFIG_FB_SAVAGE is not set
920# CONFIG_FB_SIS is not set
921# CONFIG_FB_VIA is not set
922# CONFIG_FB_NEOMAGIC is not set
923# CONFIG_FB_KYRO is not set
924# CONFIG_FB_3DFX is not set
925# CONFIG_FB_VOODOO1 is not set
926# CONFIG_FB_VT8623 is not set
927# CONFIG_FB_TRIDENT is not set
928# CONFIG_FB_ARK is not set
929# CONFIG_FB_PM3 is not set
930# CONFIG_FB_CARMINE is not set
931# CONFIG_FB_IBM_GXT4500 is not set
932CONFIG_FB_XILINX=m
933# CONFIG_FB_VIRTUAL is not set
934# CONFIG_FB_METRONOME is not set
935# CONFIG_FB_MB862XX is not set
870# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 936# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
871 937
872# 938#
873# Display device support 939# Display device support
874# 940#
875# CONFIG_DISPLAY_SUPPORT is not set 941# CONFIG_DISPLAY_SUPPORT is not set
942# CONFIG_LOGO is not set
876# CONFIG_SOUND is not set 943# CONFIG_SOUND is not set
877CONFIG_USB_SUPPORT=y 944CONFIG_USB_SUPPORT=y
878CONFIG_USB_ARCH_HAS_HCD=y 945CONFIG_USB_ARCH_HAS_HCD=y
@@ -1002,6 +1069,7 @@ CONFIG_USB_STORAGE=m
1002# CONFIG_DMADEVICES is not set 1069# CONFIG_DMADEVICES is not set
1003# CONFIG_UIO is not set 1070# CONFIG_UIO is not set
1004# CONFIG_STAGING is not set 1071# CONFIG_STAGING is not set
1072CONFIG_STAGING_EXCLUDE_BUILD=y
1005 1073
1006# 1074#
1007# File systems 1075# File systems
@@ -1227,10 +1295,12 @@ CONFIG_DEBUG_BUGVERBOSE=y
1227# CONFIG_FAULT_INJECTION is not set 1295# CONFIG_FAULT_INJECTION is not set
1228# CONFIG_LATENCYTOP is not set 1296# CONFIG_LATENCYTOP is not set
1229CONFIG_SYSCTL_SYSCALL_CHECK=y 1297CONFIG_SYSCTL_SYSCALL_CHECK=y
1230CONFIG_NOP_TRACER=y 1298CONFIG_HAVE_FUNCTION_TRACER=y
1231CONFIG_HAVE_FTRACE=y 1299
1232CONFIG_HAVE_DYNAMIC_FTRACE=y 1300#
1233# CONFIG_FTRACE is not set 1301# Tracers
1302#
1303# CONFIG_FUNCTION_TRACER is not set
1234# CONFIG_SCHED_TRACER is not set 1304# CONFIG_SCHED_TRACER is not set
1235# CONFIG_CONTEXT_SWITCH_TRACER is not set 1305# CONFIG_CONTEXT_SWITCH_TRACER is not set
1236# CONFIG_BOOT_TRACER is not set 1306# CONFIG_BOOT_TRACER is not set
diff --git a/arch/powerpc/include/asm/mmu-hash64.h b/arch/powerpc/include/asm/mmu-hash64.h
index 5a441742ffba..68b752626808 100644
--- a/arch/powerpc/include/asm/mmu-hash64.h
+++ b/arch/powerpc/include/asm/mmu-hash64.h
@@ -280,7 +280,6 @@ extern int hash_huge_page(struct mm_struct *mm, unsigned long access,
280extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend, 280extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
281 unsigned long pstart, unsigned long prot, 281 unsigned long pstart, unsigned long prot,
282 int psize, int ssize); 282 int psize, int ssize);
283extern void set_huge_psize(int psize);
284extern void add_gpage(unsigned long addr, unsigned long page_size, 283extern void add_gpage(unsigned long addr, unsigned long page_size,
285 unsigned long number_of_pages); 284 unsigned long number_of_pages);
286extern void demote_segment_4k(struct mm_struct *mm, unsigned long addr); 285extern void demote_segment_4k(struct mm_struct *mm, unsigned long addr);
diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
index 280a90cc9894..c9c678fb2538 100644
--- a/arch/powerpc/include/asm/ptrace.h
+++ b/arch/powerpc/include/asm/ptrace.h
@@ -55,8 +55,6 @@ struct pt_regs {
55 55
56#ifdef __powerpc64__ 56#ifdef __powerpc64__
57 57
58#define __ARCH_WANT_COMPAT_SYS_PTRACE
59
60#define STACK_FRAME_OVERHEAD 112 /* size of minimum stack frame */ 58#define STACK_FRAME_OVERHEAD 112 /* size of minimum stack frame */
61#define STACK_FRAME_LR_SAVE 2 /* Location of LR in stack frame */ 59#define STACK_FRAME_LR_SAVE 2 /* Location of LR in stack frame */
62#define STACK_FRAME_REGS_MARKER ASM_CONST(0x7265677368657265) 60#define STACK_FRAME_REGS_MARKER ASM_CONST(0x7265677368657265)
diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S
index 80cac984d85d..31c18b52affb 100644
--- a/arch/powerpc/kernel/cpu_setup_44x.S
+++ b/arch/powerpc/kernel/cpu_setup_44x.S
@@ -34,7 +34,12 @@ _GLOBAL(__setup_cpu_440grx)
34 blr 34 blr
35_GLOBAL(__setup_cpu_460ex) 35_GLOBAL(__setup_cpu_460ex)
36_GLOBAL(__setup_cpu_460gt) 36_GLOBAL(__setup_cpu_460gt)
37 b __init_fpu_44x 37 mflr r4
38 bl __init_fpu_44x
39 bl __fixup_440A_mcheck
40 mtlr r4
41 blr
42
38_GLOBAL(__setup_cpu_440gx) 43_GLOBAL(__setup_cpu_440gx)
39_GLOBAL(__setup_cpu_440spe) 44_GLOBAL(__setup_cpu_440spe)
40 b __fixup_440A_mcheck 45 b __fixup_440A_mcheck
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index e6d52845854f..e0bcf9354286 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -57,12 +57,18 @@ system_call_common:
57 beq- 1f 57 beq- 1f
58 ld r1,PACAKSAVE(r13) 58 ld r1,PACAKSAVE(r13)
591: std r10,0(r1) 591: std r10,0(r1)
60 crclr so
61 std r11,_NIP(r1) 60 std r11,_NIP(r1)
62 std r12,_MSR(r1) 61 std r12,_MSR(r1)
63 std r0,GPR0(r1) 62 std r0,GPR0(r1)
64 std r10,GPR1(r1) 63 std r10,GPR1(r1)
65 ACCOUNT_CPU_USER_ENTRY(r10, r11) 64 ACCOUNT_CPU_USER_ENTRY(r10, r11)
65 /*
66 * This "crclr so" clears CR0.SO, which is the error indication on
67 * return from this system call. There must be no cmp instruction
68 * between it and the "mfcr r9" below, otherwise if XER.SO is set,
69 * CR0.SO will get set, causing all system calls to appear to fail.
70 */
71 crclr so
66 std r2,GPR2(r1) 72 std r2,GPR2(r1)
67 std r3,GPR3(r1) 73 std r3,GPR3(r1)
68 std r4,GPR4(r1) 74 std r4,GPR4(r1)
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index bc1fb27368af..a11d68976dc8 100644
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -250,8 +250,11 @@ int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq)
250 * parsing 250 * parsing
251 */ 251 */
252 dn = pci_device_to_OF_node(pdev); 252 dn = pci_device_to_OF_node(pdev);
253 if (dn) 253 if (dn) {
254 return of_irq_map_one(dn, 0, out_irq); 254 rc = of_irq_map_one(dn, 0, out_irq);
255 if (!rc)
256 return rc;
257 }
255 258
256 /* Ok, we don't, time to have fun. Let's start by building up an 259 /* Ok, we don't, time to have fun. Let's start by building up an
257 * interrupt spec. we assume #interrupt-cells is 1, which is standard 260 * interrupt spec. we assume #interrupt-cells is 1, which is standard
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index 86a2ffccef25..20885a38237a 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -717,9 +717,11 @@ static void unregister_cpu_online(unsigned int cpu)
717 717
718 BUG_ON(!c->hotpluggable); 718 BUG_ON(!c->hotpluggable);
719 719
720#ifdef CONFIG_PPC64
720 if (!firmware_has_feature(FW_FEATURE_ISERIES) && 721 if (!firmware_has_feature(FW_FEATURE_ISERIES) &&
721 cpu_has_feature(CPU_FTR_SMT)) 722 cpu_has_feature(CPU_FTR_SMT))
722 sysdev_remove_file(s, &attr_smt_snooze_delay); 723 sysdev_remove_file(s, &attr_smt_snooze_delay);
724#endif
723 725
724 /* PMC stuff */ 726 /* PMC stuff */
725 switch (cur_cpu_spec->pmc_type) { 727 switch (cur_cpu_spec->pmc_type) {
diff --git a/arch/powerpc/mm/40x_mmu.c b/arch/powerpc/mm/40x_mmu.c
index cecbbc76f624..29954dc28942 100644
--- a/arch/powerpc/mm/40x_mmu.c
+++ b/arch/powerpc/mm/40x_mmu.c
@@ -93,7 +93,7 @@ void __init MMU_init_hw(void)
93 93
94unsigned long __init mmu_mapin_ram(void) 94unsigned long __init mmu_mapin_ram(void)
95{ 95{
96 unsigned long v, s; 96 unsigned long v, s, mapped;
97 phys_addr_t p; 97 phys_addr_t p;
98 98
99 v = KERNELBASE; 99 v = KERNELBASE;
@@ -130,5 +130,17 @@ unsigned long __init mmu_mapin_ram(void)
130 s -= LARGE_PAGE_SIZE_4M; 130 s -= LARGE_PAGE_SIZE_4M;
131 } 131 }
132 132
133 return total_lowmem - s; 133 mapped = total_lowmem - s;
134
135 /* If the size of RAM is not an exact power of two, we may not
136 * have covered RAM in its entirety with 16 and 4 MiB
137 * pages. Consequently, restrict the top end of RAM currently
138 * allocable so that calls to the LMB to allocate PTEs for "tail"
139 * coverage with normal-sized pages (or other reasons) do not
140 * attempt to allocate outside the allowed range.
141 */
142
143 __initial_memory_limit_addr = memstart_addr + mapped;
144
145 return mapped;
134} 146}
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index a117024ab8cd..7bbf4e4ed430 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -677,7 +677,7 @@ repeat:
677 return err; 677 return err;
678} 678}
679 679
680void set_huge_psize(int psize) 680static void __init set_huge_psize(int psize)
681{ 681{
682 /* Check that it is a page size supported by the hardware and 682 /* Check that it is a page size supported by the hardware and
683 * that it fits within pagetable limits. */ 683 * that it fits within pagetable limits. */
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index eb505ad34a85..a8397bbad3d4 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -865,6 +865,67 @@ static struct notifier_block __cpuinitdata ppc64_numa_nb = {
865 .priority = 1 /* Must run before sched domains notifier. */ 865 .priority = 1 /* Must run before sched domains notifier. */
866}; 866};
867 867
868static void mark_reserved_regions_for_nid(int nid)
869{
870 struct pglist_data *node = NODE_DATA(nid);
871 int i;
872
873 for (i = 0; i < lmb.reserved.cnt; i++) {
874 unsigned long physbase = lmb.reserved.region[i].base;
875 unsigned long size = lmb.reserved.region[i].size;
876 unsigned long start_pfn = physbase >> PAGE_SHIFT;
877 unsigned long end_pfn = ((physbase + size) >> PAGE_SHIFT);
878 struct node_active_region node_ar;
879 unsigned long node_end_pfn = node->node_start_pfn +
880 node->node_spanned_pages;
881
882 /*
883 * Check to make sure that this lmb.reserved area is
884 * within the bounds of the node that we care about.
885 * Checking the nid of the start and end points is not
886 * sufficient because the reserved area could span the
887 * entire node.
888 */
889 if (end_pfn <= node->node_start_pfn ||
890 start_pfn >= node_end_pfn)
891 continue;
892
893 get_node_active_region(start_pfn, &node_ar);
894 while (start_pfn < end_pfn &&
895 node_ar.start_pfn < node_ar.end_pfn) {
896 unsigned long reserve_size = size;
897 /*
898 * if reserved region extends past active region
899 * then trim size to active region
900 */
901 if (end_pfn > node_ar.end_pfn)
902 reserve_size = (node_ar.end_pfn << PAGE_SHIFT)
903 - (start_pfn << PAGE_SHIFT);
904 dbg("reserve_bootmem %lx %lx nid=%d\n", physbase,
905 reserve_size, node_ar.nid);
906 reserve_bootmem_node(NODE_DATA(node_ar.nid), physbase,
907 reserve_size, BOOTMEM_DEFAULT);
908 /*
909 * if reserved region is contained in the active region
910 * then done.
911 */
912 if (end_pfn <= node_ar.end_pfn)
913 break;
914
915 /*
916 * reserved region extends past the active region
917 * get next active region that contains this
918 * reserved region
919 */
920 start_pfn = node_ar.end_pfn;
921 physbase = start_pfn << PAGE_SHIFT;
922 size = size - reserve_size;
923 get_node_active_region(start_pfn, &node_ar);
924 }
925 }
926}
927
928
868void __init do_init_bootmem(void) 929void __init do_init_bootmem(void)
869{ 930{
870 int nid; 931 int nid;
@@ -890,7 +951,13 @@ void __init do_init_bootmem(void)
890 951
891 get_pfn_range_for_nid(nid, &start_pfn, &end_pfn); 952 get_pfn_range_for_nid(nid, &start_pfn, &end_pfn);
892 953
893 /* Allocate the node structure node local if possible */ 954 /*
955 * Allocate the node structure node local if possible
956 *
957 * Be careful moving this around, as it relies on all
958 * previous nodes' bootmem to be initialized and have
959 * all reserved areas marked.
960 */
894 NODE_DATA(nid) = careful_allocation(nid, 961 NODE_DATA(nid) = careful_allocation(nid,
895 sizeof(struct pglist_data), 962 sizeof(struct pglist_data),
896 SMP_CACHE_BYTES, end_pfn); 963 SMP_CACHE_BYTES, end_pfn);
@@ -922,53 +989,14 @@ void __init do_init_bootmem(void)
922 start_pfn, end_pfn); 989 start_pfn, end_pfn);
923 990
924 free_bootmem_with_active_regions(nid, end_pfn); 991 free_bootmem_with_active_regions(nid, end_pfn);
925 } 992 /*
926 993 * Be very careful about moving this around. Future
927 /* Mark reserved regions */ 994 * calls to careful_allocation() depend on this getting
928 for (i = 0; i < lmb.reserved.cnt; i++) { 995 * done correctly.
929 unsigned long physbase = lmb.reserved.region[i].base; 996 */
930 unsigned long size = lmb.reserved.region[i].size; 997 mark_reserved_regions_for_nid(nid);
931 unsigned long start_pfn = physbase >> PAGE_SHIFT;
932 unsigned long end_pfn = ((physbase + size) >> PAGE_SHIFT);
933 struct node_active_region node_ar;
934
935 get_node_active_region(start_pfn, &node_ar);
936 while (start_pfn < end_pfn &&
937 node_ar.start_pfn < node_ar.end_pfn) {
938 unsigned long reserve_size = size;
939 /*
940 * if reserved region extends past active region
941 * then trim size to active region
942 */
943 if (end_pfn > node_ar.end_pfn)
944 reserve_size = (node_ar.end_pfn << PAGE_SHIFT)
945 - (start_pfn << PAGE_SHIFT);
946 dbg("reserve_bootmem %lx %lx nid=%d\n", physbase,
947 reserve_size, node_ar.nid);
948 reserve_bootmem_node(NODE_DATA(node_ar.nid), physbase,
949 reserve_size, BOOTMEM_DEFAULT);
950 /*
951 * if reserved region is contained in the active region
952 * then done.
953 */
954 if (end_pfn <= node_ar.end_pfn)
955 break;
956
957 /*
958 * reserved region extends past the active region
959 * get next active region that contains this
960 * reserved region
961 */
962 start_pfn = node_ar.end_pfn;
963 physbase = start_pfn << PAGE_SHIFT;
964 size = size - reserve_size;
965 get_node_active_region(start_pfn, &node_ar);
966 }
967
968 }
969
970 for_each_online_node(nid)
971 sparse_memory_present_with_active_regions(nid); 998 sparse_memory_present_with_active_regions(nid);
999 }
972} 1000}
973 1001
974void __init paging_init(void) 1002void __init paging_init(void)
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index 896548ba1ca1..442cf36aa172 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -95,6 +95,7 @@ static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
95 struct axon_msic *msic = get_irq_data(irq); 95 struct axon_msic *msic = get_irq_data(irq);
96 u32 write_offset, msi; 96 u32 write_offset, msi;
97 int idx; 97 int idx;
98 int retry = 0;
98 99
99 write_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG); 100 write_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG);
100 pr_debug("axon_msi: original write_offset 0x%x\n", write_offset); 101 pr_debug("axon_msi: original write_offset 0x%x\n", write_offset);
@@ -102,7 +103,7 @@ static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
102 /* write_offset doesn't wrap properly, so we have to mask it */ 103 /* write_offset doesn't wrap properly, so we have to mask it */
103 write_offset &= MSIC_FIFO_SIZE_MASK; 104 write_offset &= MSIC_FIFO_SIZE_MASK;
104 105
105 while (msic->read_offset != write_offset) { 106 while (msic->read_offset != write_offset && retry < 100) {
106 idx = msic->read_offset / sizeof(__le32); 107 idx = msic->read_offset / sizeof(__le32);
107 msi = le32_to_cpu(msic->fifo_virt[idx]); 108 msi = le32_to_cpu(msic->fifo_virt[idx]);
108 msi &= 0xFFFF; 109 msi &= 0xFFFF;
@@ -110,13 +111,37 @@ static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
110 pr_debug("axon_msi: woff %x roff %x msi %x\n", 111 pr_debug("axon_msi: woff %x roff %x msi %x\n",
111 write_offset, msic->read_offset, msi); 112 write_offset, msic->read_offset, msi);
112 113
114 if (msi < NR_IRQS && irq_map[msi].host == msic->irq_host) {
115 generic_handle_irq(msi);
116 msic->fifo_virt[idx] = cpu_to_le32(0xffffffff);
117 } else {
118 /*
119 * Reading the MSIC_WRITE_OFFSET_REG does not
120 * reliably flush the outstanding DMA to the
121 * FIFO buffer. Here we were reading stale
122 * data, so we need to retry.
123 */
124 udelay(1);
125 retry++;
126 pr_debug("axon_msi: invalid irq 0x%x!\n", msi);
127 continue;
128 }
129
130 if (retry) {
131 pr_debug("axon_msi: late irq 0x%x, retry %d\n",
132 msi, retry);
133 retry = 0;
134 }
135
113 msic->read_offset += MSIC_FIFO_ENTRY_SIZE; 136 msic->read_offset += MSIC_FIFO_ENTRY_SIZE;
114 msic->read_offset &= MSIC_FIFO_SIZE_MASK; 137 msic->read_offset &= MSIC_FIFO_SIZE_MASK;
138 }
115 139
116 if (msi < NR_IRQS && irq_map[msi].host == msic->irq_host) 140 if (retry) {
117 generic_handle_irq(msi); 141 printk(KERN_WARNING "axon_msi: irq timed out\n");
118 else 142
119 pr_debug("axon_msi: invalid irq 0x%x!\n", msi); 143 msic->read_offset += MSIC_FIFO_ENTRY_SIZE;
144 msic->read_offset &= MSIC_FIFO_SIZE_MASK;
120 } 145 }
121 146
122 desc->chip->eoi(irq); 147 desc->chip->eoi(irq);
@@ -364,6 +389,7 @@ static int axon_msi_probe(struct of_device *device,
364 dn->full_name); 389 dn->full_name);
365 goto out_free_fifo; 390 goto out_free_fifo;
366 } 391 }
392 memset(msic->fifo_virt, 0xff, MSIC_FIFO_SIZE_BYTES);
367 393
368 msic->irq_host = irq_alloc_host(dn, IRQ_HOST_MAP_NOMAP, 394 msic->irq_host = irq_alloc_host(dn, IRQ_HOST_MAP_NOMAP,
369 NR_IRQS, &msic_host_ops, 0); 395 NR_IRQS, &msic_host_ops, 0);
diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c
index c0d86e1f56ea..9046803c8276 100644
--- a/arch/powerpc/platforms/cell/smp.c
+++ b/arch/powerpc/platforms/cell/smp.c
@@ -129,10 +129,15 @@ static int __init smp_iic_probe(void)
129 return cpus_weight(cpu_possible_map); 129 return cpus_weight(cpu_possible_map);
130} 130}
131 131
132static void __devinit smp_iic_setup_cpu(int cpu) 132static void __devinit smp_cell_setup_cpu(int cpu)
133{ 133{
134 if (cpu != boot_cpuid) 134 if (cpu != boot_cpuid)
135 iic_setup_cpu(); 135 iic_setup_cpu();
136
137 /*
138 * change default DABRX to allow user watchpoints
139 */
140 mtspr(SPRN_DABRX, DABRX_KERNEL | DABRX_USER);
136} 141}
137 142
138static DEFINE_SPINLOCK(timebase_lock); 143static DEFINE_SPINLOCK(timebase_lock);
@@ -192,7 +197,7 @@ static struct smp_ops_t bpa_iic_smp_ops = {
192 .message_pass = smp_iic_message_pass, 197 .message_pass = smp_iic_message_pass,
193 .probe = smp_iic_probe, 198 .probe = smp_iic_probe,
194 .kick_cpu = smp_cell_kick_cpu, 199 .kick_cpu = smp_cell_kick_cpu,
195 .setup_cpu = smp_iic_setup_cpu, 200 .setup_cpu = smp_cell_setup_cpu,
196 .cpu_bootable = smp_cell_cpu_bootable, 201 .cpu_bootable = smp_cell_cpu_bootable,
197}; 202};
198 203
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index b73c369cc6f1..1b26071a86ca 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -390,6 +390,9 @@ static int spufs_ps_fault(struct vm_area_struct *vma,
390 if (offset >= ps_size) 390 if (offset >= ps_size)
391 return VM_FAULT_SIGBUS; 391 return VM_FAULT_SIGBUS;
392 392
393 if (fatal_signal_pending(current))
394 return VM_FAULT_SIGBUS;
395
393 /* 396 /*
394 * Because we release the mmap_sem, the context may be destroyed while 397 * Because we release the mmap_sem, the context may be destroyed while
395 * we're in spu_wait. Grab an extra reference so it isn't destroyed 398 * we're in spu_wait. Grab an extra reference so it isn't destroyed
diff --git a/arch/powerpc/sysdev/bestcomm/Kconfig b/arch/powerpc/sysdev/bestcomm/Kconfig
index 57cc56562567..0b192a1c429d 100644
--- a/arch/powerpc/sysdev/bestcomm/Kconfig
+++ b/arch/powerpc/sysdev/bestcomm/Kconfig
@@ -17,23 +17,20 @@ config PPC_BESTCOMM
17 answer Y or M. Otherwise say N. 17 answer Y or M. Otherwise say N.
18 18
19config PPC_BESTCOMM_ATA 19config PPC_BESTCOMM_ATA
20 tristate "Bestcomm ATA task support" 20 tristate
21 depends on PPC_BESTCOMM 21 depends on PPC_BESTCOMM
22 default n
23 help 22 help
24 This option enables the support for the ATA task. 23 This option enables the support for the ATA task.
25 24
26config PPC_BESTCOMM_FEC 25config PPC_BESTCOMM_FEC
27 tristate "Bestcomm FEC tasks support" 26 tristate
28 depends on PPC_BESTCOMM 27 depends on PPC_BESTCOMM
29 default n
30 help 28 help
31 This option enables the support for the FEC tasks. 29 This option enables the support for the FEC tasks.
32 30
33config PPC_BESTCOMM_GEN_BD 31config PPC_BESTCOMM_GEN_BD
34 tristate "Bestcomm GenBD tasks support" 32 tristate
35 depends on PPC_BESTCOMM 33 depends on PPC_BESTCOMM
36 default n
37 help 34 help
38 This option enables the support for the GenBD tasks. 35 This option enables the support for the GenBD tasks.
39 36
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index f6299cca7814..b24e1d085557 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1271,6 +1271,7 @@ void __init mpic_set_default_senses(struct mpic *mpic, u8 *senses, int count)
1271void __init mpic_init(struct mpic *mpic) 1271void __init mpic_init(struct mpic *mpic)
1272{ 1272{
1273 int i; 1273 int i;
1274 int cpu;
1274 1275
1275 BUG_ON(mpic->num_sources == 0); 1276 BUG_ON(mpic->num_sources == 0);
1276 1277
@@ -1313,6 +1314,11 @@ void __init mpic_init(struct mpic *mpic)
1313 1314
1314 mpic_pasemi_msi_init(mpic); 1315 mpic_pasemi_msi_init(mpic);
1315 1316
1317 if (mpic->flags & MPIC_PRIMARY)
1318 cpu = hard_smp_processor_id();
1319 else
1320 cpu = 0;
1321
1316 for (i = 0; i < mpic->num_sources; i++) { 1322 for (i = 0; i < mpic->num_sources; i++) {
1317 /* start with vector = source number, and masked */ 1323 /* start with vector = source number, and masked */
1318 u32 vecpri = MPIC_VECPRI_MASK | i | 1324 u32 vecpri = MPIC_VECPRI_MASK | i |
@@ -1323,8 +1329,7 @@ void __init mpic_init(struct mpic *mpic)
1323 continue; 1329 continue;
1324 /* init hw */ 1330 /* init hw */
1325 mpic_irq_write(i, MPIC_INFO(IRQ_VECTOR_PRI), vecpri); 1331 mpic_irq_write(i, MPIC_INFO(IRQ_VECTOR_PRI), vecpri);
1326 mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), 1332 mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), 1 << cpu);
1327 1 << hard_smp_processor_id());
1328 } 1333 }
1329 1334
1330 /* Init spurious vector */ 1335 /* Init spurious vector */
diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c
index b7aefd0d45cb..a22e1a2df1af 100644
--- a/arch/powerpc/sysdev/xilinx_intc.c
+++ b/arch/powerpc/sysdev/xilinx_intc.c
@@ -107,8 +107,8 @@ xilinx_intc_init(struct device_node *np)
107 } 107 }
108 regs = ioremap(res.start, 32); 108 regs = ioremap(res.start, 32);
109 109
110 printk(KERN_INFO "Xilinx intc at 0x%08LX mapped to 0x%p\n", 110 printk(KERN_INFO "Xilinx intc at 0x%08llx mapped to 0x%p\n",
111 res.start, regs); 111 (unsigned long long) res.start, regs);
112 112
113 /* Setup interrupt controller */ 113 /* Setup interrupt controller */
114 out_be32(regs + XINTC_IER, 0); /* disable all irqs */ 114 out_be32(regs + XINTC_IER, 0); /* disable all irqs */
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index 9b0bc2c9fba0..a0e748da9909 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc4 3# Linux kernel version: 2.6.28-rc6
4# Thu Aug 21 19:43:29 2008 4# Thu Nov 27 11:00:49 2008
5# 5#
6CONFIG_SCHED_MC=y 6CONFIG_SCHED_MC=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -45,6 +45,7 @@ CONFIG_LOG_BUF_SHIFT=17
45CONFIG_CGROUPS=y 45CONFIG_CGROUPS=y
46# CONFIG_CGROUP_DEBUG is not set 46# CONFIG_CGROUP_DEBUG is not set
47CONFIG_CGROUP_NS=y 47CONFIG_CGROUP_NS=y
48# CONFIG_CGROUP_FREEZER is not set
48# CONFIG_CGROUP_DEVICE is not set 49# CONFIG_CGROUP_DEVICE is not set
49# CONFIG_CPUSETS is not set 50# CONFIG_CPUSETS is not set
50CONFIG_GROUP_SCHED=y 51CONFIG_GROUP_SCHED=y
@@ -84,6 +85,7 @@ CONFIG_SIGNALFD=y
84CONFIG_TIMERFD=y 85CONFIG_TIMERFD=y
85CONFIG_EVENTFD=y 86CONFIG_EVENTFD=y
86CONFIG_SHMEM=y 87CONFIG_SHMEM=y
88CONFIG_AIO=y
87CONFIG_VM_EVENT_COUNTERS=y 89CONFIG_VM_EVENT_COUNTERS=y
88CONFIG_SLAB=y 90CONFIG_SLAB=y
89# CONFIG_SLUB is not set 91# CONFIG_SLUB is not set
@@ -92,16 +94,10 @@ CONFIG_SLAB=y
92# CONFIG_MARKERS is not set 94# CONFIG_MARKERS is not set
93CONFIG_HAVE_OPROFILE=y 95CONFIG_HAVE_OPROFILE=y
94CONFIG_KPROBES=y 96CONFIG_KPROBES=y
95# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
96CONFIG_KRETPROBES=y 97CONFIG_KRETPROBES=y
97# CONFIG_HAVE_IOREMAP_PROT is not set
98CONFIG_HAVE_KPROBES=y 98CONFIG_HAVE_KPROBES=y
99CONFIG_HAVE_KRETPROBES=y 99CONFIG_HAVE_KRETPROBES=y
100# CONFIG_HAVE_ARCH_TRACEHOOK is not set 100CONFIG_HAVE_ARCH_TRACEHOOK=y
101# CONFIG_HAVE_DMA_ATTRS is not set
102# CONFIG_USE_GENERIC_SMP_HELPERS is not set
103# CONFIG_HAVE_CLK is not set
104CONFIG_PROC_PAGE_MONITOR=y
105# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 101# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
106CONFIG_SLABINFO=y 102CONFIG_SLABINFO=y
107CONFIG_RT_MUTEXES=y 103CONFIG_RT_MUTEXES=y
@@ -135,6 +131,7 @@ CONFIG_DEFAULT_DEADLINE=y
135CONFIG_DEFAULT_IOSCHED="deadline" 131CONFIG_DEFAULT_IOSCHED="deadline"
136CONFIG_PREEMPT_NOTIFIERS=y 132CONFIG_PREEMPT_NOTIFIERS=y
137CONFIG_CLASSIC_RCU=y 133CONFIG_CLASSIC_RCU=y
134# CONFIG_FREEZER is not set
138 135
139# 136#
140# Base setup 137# Base setup
@@ -189,7 +186,6 @@ CONFIG_SELECT_MEMORY_MODEL=y
189CONFIG_SPARSEMEM_MANUAL=y 186CONFIG_SPARSEMEM_MANUAL=y
190CONFIG_SPARSEMEM=y 187CONFIG_SPARSEMEM=y
191CONFIG_HAVE_MEMORY_PRESENT=y 188CONFIG_HAVE_MEMORY_PRESENT=y
192# CONFIG_SPARSEMEM_STATIC is not set
193CONFIG_SPARSEMEM_EXTREME=y 189CONFIG_SPARSEMEM_EXTREME=y
194CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y 190CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
195CONFIG_SPARSEMEM_VMEMMAP=y 191CONFIG_SPARSEMEM_VMEMMAP=y
@@ -200,9 +196,11 @@ CONFIG_PAGEFLAGS_EXTENDED=y
200CONFIG_SPLIT_PTLOCK_CPUS=4 196CONFIG_SPLIT_PTLOCK_CPUS=4
201CONFIG_MIGRATION=y 197CONFIG_MIGRATION=y
202CONFIG_RESOURCES_64BIT=y 198CONFIG_RESOURCES_64BIT=y
199CONFIG_PHYS_ADDR_T_64BIT=y
203CONFIG_ZONE_DMA_FLAG=1 200CONFIG_ZONE_DMA_FLAG=1
204CONFIG_BOUNCE=y 201CONFIG_BOUNCE=y
205CONFIG_VIRT_TO_BUS=y 202CONFIG_VIRT_TO_BUS=y
203CONFIG_UNEVICTABLE_LRU=y
206 204
207# 205#
208# I/O subsystem configuration 206# I/O subsystem configuration
@@ -220,6 +218,8 @@ CONFIG_IPL=y
220CONFIG_IPL_VM=y 218CONFIG_IPL_VM=y
221CONFIG_BINFMT_ELF=y 219CONFIG_BINFMT_ELF=y
222CONFIG_COMPAT_BINFMT_ELF=y 220CONFIG_COMPAT_BINFMT_ELF=y
221# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
222# CONFIG_HAVE_AOUT is not set
223CONFIG_BINFMT_MISC=m 223CONFIG_BINFMT_MISC=m
224CONFIG_FORCE_MAX_ZONEORDER=9 224CONFIG_FORCE_MAX_ZONEORDER=9
225# CONFIG_PROCESS_DEBUG is not set 225# CONFIG_PROCESS_DEBUG is not set
@@ -255,7 +255,7 @@ CONFIG_XFRM=y
255# CONFIG_XFRM_STATISTICS is not set 255# CONFIG_XFRM_STATISTICS is not set
256CONFIG_NET_KEY=y 256CONFIG_NET_KEY=y
257# CONFIG_NET_KEY_MIGRATE is not set 257# CONFIG_NET_KEY_MIGRATE is not set
258CONFIG_IUCV=m 258CONFIG_IUCV=y
259CONFIG_AFIUCV=m 259CONFIG_AFIUCV=m
260CONFIG_INET=y 260CONFIG_INET=y
261CONFIG_IP_MULTICAST=y 261CONFIG_IP_MULTICAST=y
@@ -282,7 +282,6 @@ CONFIG_INET_TCP_DIAG=y
282CONFIG_TCP_CONG_CUBIC=y 282CONFIG_TCP_CONG_CUBIC=y
283CONFIG_DEFAULT_TCP_CONG="cubic" 283CONFIG_DEFAULT_TCP_CONG="cubic"
284# CONFIG_TCP_MD5SIG is not set 284# CONFIG_TCP_MD5SIG is not set
285# CONFIG_IP_VS is not set
286CONFIG_IPV6=y 285CONFIG_IPV6=y
287# CONFIG_IPV6_PRIVACY is not set 286# CONFIG_IPV6_PRIVACY is not set
288# CONFIG_IPV6_ROUTER_PREF is not set 287# CONFIG_IPV6_ROUTER_PREF is not set
@@ -331,10 +330,12 @@ CONFIG_NF_CONNTRACK=m
331# CONFIG_NF_CONNTRACK_TFTP is not set 330# CONFIG_NF_CONNTRACK_TFTP is not set
332# CONFIG_NF_CT_NETLINK is not set 331# CONFIG_NF_CT_NETLINK is not set
333# CONFIG_NETFILTER_XTABLES is not set 332# CONFIG_NETFILTER_XTABLES is not set
333# CONFIG_IP_VS is not set
334 334
335# 335#
336# IP: Netfilter Configuration 336# IP: Netfilter Configuration
337# 337#
338# CONFIG_NF_DEFRAG_IPV4 is not set
338# CONFIG_NF_CONNTRACK_IPV4 is not set 339# CONFIG_NF_CONNTRACK_IPV4 is not set
339# CONFIG_IP_NF_QUEUE is not set 340# CONFIG_IP_NF_QUEUE is not set
340# CONFIG_IP_NF_IPTABLES is not set 341# CONFIG_IP_NF_IPTABLES is not set
@@ -374,6 +375,7 @@ CONFIG_NET_SCH_CBQ=m
374# CONFIG_NET_SCH_HTB is not set 375# CONFIG_NET_SCH_HTB is not set
375# CONFIG_NET_SCH_HFSC is not set 376# CONFIG_NET_SCH_HFSC is not set
376CONFIG_NET_SCH_PRIO=m 377CONFIG_NET_SCH_PRIO=m
378CONFIG_NET_SCH_MULTIQ=y
377CONFIG_NET_SCH_RED=m 379CONFIG_NET_SCH_RED=m
378CONFIG_NET_SCH_SFQ=m 380CONFIG_NET_SCH_SFQ=m
379CONFIG_NET_SCH_TEQL=m 381CONFIG_NET_SCH_TEQL=m
@@ -406,6 +408,7 @@ CONFIG_NET_ACT_POLICE=y
406CONFIG_NET_ACT_NAT=m 408CONFIG_NET_ACT_NAT=m
407# CONFIG_NET_ACT_PEDIT is not set 409# CONFIG_NET_ACT_PEDIT is not set
408# CONFIG_NET_ACT_SIMP is not set 410# CONFIG_NET_ACT_SIMP is not set
411# CONFIG_NET_ACT_SKBEDIT is not set
409# CONFIG_NET_CLS_IND is not set 412# CONFIG_NET_CLS_IND is not set
410CONFIG_NET_SCH_FIFO=y 413CONFIG_NET_SCH_FIFO=y
411 414
@@ -424,6 +427,7 @@ CONFIG_CAN_BCM=m
424CONFIG_CAN_VCAN=m 427CONFIG_CAN_VCAN=m
425# CONFIG_CAN_DEBUG_DEVICES is not set 428# CONFIG_CAN_DEBUG_DEVICES is not set
426# CONFIG_AF_RXRPC is not set 429# CONFIG_AF_RXRPC is not set
430# CONFIG_PHONET is not set
427# CONFIG_RFKILL is not set 431# CONFIG_RFKILL is not set
428# CONFIG_NET_9P is not set 432# CONFIG_NET_9P is not set
429# CONFIG_PCMCIA is not set 433# CONFIG_PCMCIA is not set
@@ -473,7 +477,7 @@ CONFIG_VIRTIO_BLK=m
473CONFIG_MISC_DEVICES=y 477CONFIG_MISC_DEVICES=y
474# CONFIG_EEPROM_93CX6 is not set 478# CONFIG_EEPROM_93CX6 is not set
475# CONFIG_ENCLOSURE_SERVICES is not set 479# CONFIG_ENCLOSURE_SERVICES is not set
476# CONFIG_HAVE_IDE is not set 480# CONFIG_C2PORT is not set
477 481
478# 482#
479# SCSI device support 483# SCSI device support
@@ -525,6 +529,7 @@ CONFIG_SCSI_DH_EMC=m
525CONFIG_SCSI_DH_ALUA=m 529CONFIG_SCSI_DH_ALUA=m
526CONFIG_MD=y 530CONFIG_MD=y
527CONFIG_BLK_DEV_MD=y 531CONFIG_BLK_DEV_MD=y
532CONFIG_MD_AUTODETECT=y
528CONFIG_MD_LINEAR=m 533CONFIG_MD_LINEAR=m
529CONFIG_MD_RAID0=m 534CONFIG_MD_RAID0=m
530CONFIG_MD_RAID1=m 535CONFIG_MD_RAID1=m
@@ -555,6 +560,9 @@ CONFIG_NET_ETHERNET=y
555# CONFIG_IBM_NEW_EMAC_RGMII is not set 560# CONFIG_IBM_NEW_EMAC_RGMII is not set
556# CONFIG_IBM_NEW_EMAC_TAH is not set 561# CONFIG_IBM_NEW_EMAC_TAH is not set
557# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 562# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
563# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
564# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
565# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
558CONFIG_NETDEV_1000=y 566CONFIG_NETDEV_1000=y
559CONFIG_NETDEV_10000=y 567CONFIG_NETDEV_10000=y
560# CONFIG_TR is not set 568# CONFIG_TR is not set
@@ -632,13 +640,12 @@ CONFIG_S390_VMUR=m
632# CONFIG_THERMAL is not set 640# CONFIG_THERMAL is not set
633# CONFIG_THERMAL_HWMON is not set 641# CONFIG_THERMAL_HWMON is not set
634# CONFIG_WATCHDOG is not set 642# CONFIG_WATCHDOG is not set
635 643# CONFIG_REGULATOR is not set
636#
637# Sonics Silicon Backplane
638#
639# CONFIG_MEMSTICK is not set 644# CONFIG_MEMSTICK is not set
640# CONFIG_NEW_LEDS is not set 645# CONFIG_NEW_LEDS is not set
641CONFIG_ACCESSIBILITY=y 646CONFIG_ACCESSIBILITY=y
647# CONFIG_STAGING is not set
648CONFIG_STAGING_EXCLUDE_BUILD=y
642 649
643# 650#
644# File systems 651# File systems
@@ -650,13 +657,14 @@ CONFIG_EXT3_FS=y
650CONFIG_EXT3_FS_XATTR=y 657CONFIG_EXT3_FS_XATTR=y
651# CONFIG_EXT3_FS_POSIX_ACL is not set 658# CONFIG_EXT3_FS_POSIX_ACL is not set
652# CONFIG_EXT3_FS_SECURITY is not set 659# CONFIG_EXT3_FS_SECURITY is not set
653# CONFIG_EXT4DEV_FS is not set 660# CONFIG_EXT4_FS is not set
654CONFIG_JBD=y 661CONFIG_JBD=y
655# CONFIG_JBD_DEBUG is not set 662# CONFIG_JBD_DEBUG is not set
656CONFIG_FS_MBCACHE=y 663CONFIG_FS_MBCACHE=y
657# CONFIG_REISERFS_FS is not set 664# CONFIG_REISERFS_FS is not set
658# CONFIG_JFS_FS is not set 665# CONFIG_JFS_FS is not set
659CONFIG_FS_POSIX_ACL=y 666CONFIG_FS_POSIX_ACL=y
667CONFIG_FILE_LOCKING=y
660# CONFIG_XFS_FS is not set 668# CONFIG_XFS_FS is not set
661# CONFIG_GFS2_FS is not set 669# CONFIG_GFS2_FS is not set
662# CONFIG_OCFS2_FS is not set 670# CONFIG_OCFS2_FS is not set
@@ -688,6 +696,7 @@ CONFIG_GENERIC_ACL=y
688CONFIG_PROC_FS=y 696CONFIG_PROC_FS=y
689CONFIG_PROC_KCORE=y 697CONFIG_PROC_KCORE=y
690CONFIG_PROC_SYSCTL=y 698CONFIG_PROC_SYSCTL=y
699CONFIG_PROC_PAGE_MONITOR=y
691CONFIG_SYSFS=y 700CONFIG_SYSFS=y
692CONFIG_TMPFS=y 701CONFIG_TMPFS=y
693CONFIG_TMPFS_POSIX_ACL=y 702CONFIG_TMPFS_POSIX_ACL=y
@@ -728,6 +737,7 @@ CONFIG_LOCKD_V4=y
728CONFIG_EXPORTFS=y 737CONFIG_EXPORTFS=y
729CONFIG_NFS_COMMON=y 738CONFIG_NFS_COMMON=y
730CONFIG_SUNRPC=y 739CONFIG_SUNRPC=y
740# CONFIG_SUNRPC_REGISTER_V4 is not set
731# CONFIG_RPCSEC_GSS_KRB5 is not set 741# CONFIG_RPCSEC_GSS_KRB5 is not set
732# CONFIG_RPCSEC_GSS_SPKM3 is not set 742# CONFIG_RPCSEC_GSS_SPKM3 is not set
733# CONFIG_SMB_FS is not set 743# CONFIG_SMB_FS is not set
@@ -800,12 +810,24 @@ CONFIG_DEBUG_MEMORY_INIT=y
800# CONFIG_DEBUG_SG is not set 810# CONFIG_DEBUG_SG is not set
801# CONFIG_FRAME_POINTER is not set 811# CONFIG_FRAME_POINTER is not set
802# CONFIG_RCU_TORTURE_TEST is not set 812# CONFIG_RCU_TORTURE_TEST is not set
813# CONFIG_RCU_CPU_STALL_DETECTOR is not set
803# CONFIG_KPROBES_SANITY_TEST is not set 814# CONFIG_KPROBES_SANITY_TEST is not set
804# CONFIG_BACKTRACE_SELF_TEST is not set 815# CONFIG_BACKTRACE_SELF_TEST is not set
816# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
805# CONFIG_LKDTM is not set 817# CONFIG_LKDTM is not set
806# CONFIG_FAULT_INJECTION is not set 818# CONFIG_FAULT_INJECTION is not set
807# CONFIG_LATENCYTOP is not set 819# CONFIG_LATENCYTOP is not set
808CONFIG_SYSCTL_SYSCALL_CHECK=y 820CONFIG_SYSCTL_SYSCALL_CHECK=y
821
822#
823# Tracers
824#
825# CONFIG_IRQSOFF_TRACER is not set
826# CONFIG_PREEMPT_TRACER is not set
827# CONFIG_SCHED_TRACER is not set
828# CONFIG_CONTEXT_SWITCH_TRACER is not set
829# CONFIG_BOOT_TRACER is not set
830# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
809CONFIG_SAMPLES=y 831CONFIG_SAMPLES=y
810# CONFIG_SAMPLE_KOBJECT is not set 832# CONFIG_SAMPLE_KOBJECT is not set
811# CONFIG_SAMPLE_KPROBES is not set 833# CONFIG_SAMPLE_KPROBES is not set
@@ -816,16 +838,19 @@ CONFIG_SAMPLES=y
816# 838#
817# CONFIG_KEYS is not set 839# CONFIG_KEYS is not set
818# CONFIG_SECURITY is not set 840# CONFIG_SECURITY is not set
841# CONFIG_SECURITYFS is not set
819# CONFIG_SECURITY_FILE_CAPABILITIES is not set 842# CONFIG_SECURITY_FILE_CAPABILITIES is not set
820CONFIG_CRYPTO=y 843CONFIG_CRYPTO=y
821 844
822# 845#
823# Crypto core or helper 846# Crypto core or helper
824# 847#
848CONFIG_CRYPTO_FIPS=y
825CONFIG_CRYPTO_ALGAPI=y 849CONFIG_CRYPTO_ALGAPI=y
826CONFIG_CRYPTO_AEAD=m 850CONFIG_CRYPTO_AEAD=y
827CONFIG_CRYPTO_BLKCIPHER=y 851CONFIG_CRYPTO_BLKCIPHER=y
828CONFIG_CRYPTO_HASH=m 852CONFIG_CRYPTO_HASH=y
853CONFIG_CRYPTO_RNG=y
829CONFIG_CRYPTO_MANAGER=y 854CONFIG_CRYPTO_MANAGER=y
830CONFIG_CRYPTO_GF128MUL=m 855CONFIG_CRYPTO_GF128MUL=m
831# CONFIG_CRYPTO_NULL is not set 856# CONFIG_CRYPTO_NULL is not set
@@ -877,7 +902,7 @@ CONFIG_CRYPTO_SHA1=m
877# 902#
878# Ciphers 903# Ciphers
879# 904#
880# CONFIG_CRYPTO_AES is not set 905CONFIG_CRYPTO_AES=m
881# CONFIG_CRYPTO_ANUBIS is not set 906# CONFIG_CRYPTO_ANUBIS is not set
882# CONFIG_CRYPTO_ARC4 is not set 907# CONFIG_CRYPTO_ARC4 is not set
883# CONFIG_CRYPTO_BLOWFISH is not set 908# CONFIG_CRYPTO_BLOWFISH is not set
@@ -898,6 +923,11 @@ CONFIG_CRYPTO_SEED=m
898# 923#
899# CONFIG_CRYPTO_DEFLATE is not set 924# CONFIG_CRYPTO_DEFLATE is not set
900CONFIG_CRYPTO_LZO=m 925CONFIG_CRYPTO_LZO=m
926
927#
928# Random Number Generation
929#
930CONFIG_CRYPTO_ANSI_CPRNG=m
901CONFIG_CRYPTO_HW=y 931CONFIG_CRYPTO_HW=y
902CONFIG_ZCRYPT=m 932CONFIG_ZCRYPT=m
903# CONFIG_ZCRYPT_MONOLITHIC is not set 933# CONFIG_ZCRYPT_MONOLITHIC is not set
@@ -912,8 +942,6 @@ CONFIG_S390_PRNG=m
912# Library routines 942# Library routines
913# 943#
914CONFIG_BITREVERSE=m 944CONFIG_BITREVERSE=m
915# CONFIG_GENERIC_FIND_FIRST_BIT is not set
916# CONFIG_GENERIC_FIND_NEXT_BIT is not set
917# CONFIG_CRC_CCITT is not set 945# CONFIG_CRC_CCITT is not set
918# CONFIG_CRC16 is not set 946# CONFIG_CRC16 is not set
919CONFIG_CRC_T10DIF=y 947CONFIG_CRC_T10DIF=y
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index 7fc76133b3e4..5caddd4f7bed 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -679,8 +679,6 @@ static inline void pmd_clear(pmd_t *pmd)
679 679
680static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) 680static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
681{ 681{
682 if (mm->context.has_pgste)
683 ptep_rcp_copy(ptep);
684 pte_val(*ptep) = _PAGE_TYPE_EMPTY; 682 pte_val(*ptep) = _PAGE_TYPE_EMPTY;
685 if (mm->context.noexec) 683 if (mm->context.noexec)
686 pte_val(ptep[PTRS_PER_PTE]) = _PAGE_TYPE_EMPTY; 684 pte_val(ptep[PTRS_PER_PTE]) = _PAGE_TYPE_EMPTY;
diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h
index a7226f8143fb..5396f9f12263 100644
--- a/arch/s390/include/asm/ptrace.h
+++ b/arch/s390/include/asm/ptrace.h
@@ -321,8 +321,8 @@ struct pt_regs
321 psw_t psw; 321 psw_t psw;
322 unsigned long gprs[NUM_GPRS]; 322 unsigned long gprs[NUM_GPRS];
323 unsigned long orig_gpr2; 323 unsigned long orig_gpr2;
324 unsigned short svcnr;
324 unsigned short ilc; 325 unsigned short ilc;
325 unsigned short trap;
326}; 326};
327#endif 327#endif
328 328
@@ -486,8 +486,6 @@ struct task_struct;
486extern void user_enable_single_step(struct task_struct *); 486extern void user_enable_single_step(struct task_struct *);
487extern void user_disable_single_step(struct task_struct *); 487extern void user_disable_single_step(struct task_struct *);
488 488
489#define __ARCH_WANT_COMPAT_SYS_PTRACE
490
491#define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0) 489#define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0)
492#define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN) 490#define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN)
493#define user_stack_pointer(regs)((regs)->gprs[15]) 491#define user_stack_pointer(regs)((regs)->gprs[15])
diff --git a/arch/s390/include/asm/syscall.h b/arch/s390/include/asm/syscall.h
index 6e623971fbb9..2429b87eb28d 100644
--- a/arch/s390/include/asm/syscall.h
+++ b/arch/s390/include/asm/syscall.h
@@ -17,9 +17,7 @@
17static inline long syscall_get_nr(struct task_struct *task, 17static inline long syscall_get_nr(struct task_struct *task,
18 struct pt_regs *regs) 18 struct pt_regs *regs)
19{ 19{
20 if (regs->trap != __LC_SVC_OLD_PSW) 20 return regs->svcnr ? regs->svcnr : -1;
21 return -1;
22 return regs->gprs[2];
23} 21}
24 22
25static inline void syscall_rollback(struct task_struct *task, 23static inline void syscall_rollback(struct task_struct *task,
@@ -52,18 +50,20 @@ static inline void syscall_get_arguments(struct task_struct *task,
52 unsigned int i, unsigned int n, 50 unsigned int i, unsigned int n,
53 unsigned long *args) 51 unsigned long *args)
54{ 52{
53 unsigned long mask = -1UL;
54
55 BUG_ON(i + n > 6); 55 BUG_ON(i + n > 6);
56#ifdef CONFIG_COMPAT 56#ifdef CONFIG_COMPAT
57 if (test_tsk_thread_flag(task, TIF_31BIT)) { 57 if (test_tsk_thread_flag(task, TIF_31BIT))
58 if (i + n == 6) 58 mask = 0xffffffff;
59 args[--n] = (u32) regs->args[0];
60 while (n-- > 0)
61 args[n] = (u32) regs->gprs[2 + i + n];
62 }
63#endif 59#endif
64 if (i + n == 6) 60 if (i + n == 6)
65 args[--n] = regs->args[0]; 61 args[--n] = regs->args[0] & mask;
66 memcpy(args, &regs->gprs[2 + i], n * sizeof(args[0])); 62 while (n-- > 0)
63 if (i + n > 0)
64 args[n] = regs->gprs[2 + i + n] & mask;
65 if (i == 0)
66 args[0] = regs->orig_gpr2 & mask;
67} 67}
68 68
69static inline void syscall_set_arguments(struct task_struct *task, 69static inline void syscall_set_arguments(struct task_struct *task,
@@ -74,7 +74,11 @@ static inline void syscall_set_arguments(struct task_struct *task,
74 BUG_ON(i + n > 6); 74 BUG_ON(i + n > 6);
75 if (i + n == 6) 75 if (i + n == 6)
76 regs->args[0] = args[--n]; 76 regs->args[0] = args[--n];
77 memcpy(&regs->gprs[2 + i], args, n * sizeof(args[0])); 77 while (n-- > 0)
78 if (i + n > 0)
79 regs->gprs[2 + i + n] = args[n];
80 if (i == 0)
81 regs->orig_gpr2 = args[0];
78} 82}
79 83
80#endif /* _ASM_SYSCALL_H */ 84#endif /* _ASM_SYSCALL_H */
diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c
index fa28ecae636b..3d144e6020c6 100644
--- a/arch/s390/kernel/asm-offsets.c
+++ b/arch/s390/kernel/asm-offsets.c
@@ -32,7 +32,7 @@ int main(void)
32 DEFINE(__PT_GPRS, offsetof(struct pt_regs, gprs)); 32 DEFINE(__PT_GPRS, offsetof(struct pt_regs, gprs));
33 DEFINE(__PT_ORIG_GPR2, offsetof(struct pt_regs, orig_gpr2)); 33 DEFINE(__PT_ORIG_GPR2, offsetof(struct pt_regs, orig_gpr2));
34 DEFINE(__PT_ILC, offsetof(struct pt_regs, ilc)); 34 DEFINE(__PT_ILC, offsetof(struct pt_regs, ilc));
35 DEFINE(__PT_TRAP, offsetof(struct pt_regs, trap)); 35 DEFINE(__PT_SVCNR, offsetof(struct pt_regs, svcnr));
36 DEFINE(__PT_SIZE, sizeof(struct pt_regs)); 36 DEFINE(__PT_SIZE, sizeof(struct pt_regs));
37 BLANK(); 37 BLANK();
38 DEFINE(__SF_BACKCHAIN, offsetof(struct stack_frame, back_chain)); 38 DEFINE(__SF_BACKCHAIN, offsetof(struct stack_frame, back_chain));
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
index c7f02e777af2..b537cb0e9b55 100644
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
@@ -340,7 +340,7 @@ static int restore_sigregs32(struct pt_regs *regs,_sigregs32 __user *sregs)
340 return err; 340 return err;
341 341
342 restore_fp_regs(&current->thread.fp_regs); 342 restore_fp_regs(&current->thread.fp_regs);
343 regs->trap = -1; /* disable syscall checks */ 343 regs->svcnr = 0; /* disable syscall checks */
344 return 0; 344 return 0;
345} 345}
346 346
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index 08844fc24a2e..198ea18a534d 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -46,7 +46,7 @@ SP_R14 = STACK_FRAME_OVERHEAD + __PT_GPRS + 56
46SP_R15 = STACK_FRAME_OVERHEAD + __PT_GPRS + 60 46SP_R15 = STACK_FRAME_OVERHEAD + __PT_GPRS + 60
47SP_ORIG_R2 = STACK_FRAME_OVERHEAD + __PT_ORIG_GPR2 47SP_ORIG_R2 = STACK_FRAME_OVERHEAD + __PT_ORIG_GPR2
48SP_ILC = STACK_FRAME_OVERHEAD + __PT_ILC 48SP_ILC = STACK_FRAME_OVERHEAD + __PT_ILC
49SP_TRAP = STACK_FRAME_OVERHEAD + __PT_TRAP 49SP_SVCNR = STACK_FRAME_OVERHEAD + __PT_SVCNR
50SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE 50SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE
51 51
52_TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ 52_TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \
@@ -183,11 +183,10 @@ STACK_SIZE = 1 << STACK_SHIFT
183 .macro CREATE_STACK_FRAME psworg,savearea 183 .macro CREATE_STACK_FRAME psworg,savearea
184 s %r15,BASED(.Lc_spsize) # make room for registers & psw 184 s %r15,BASED(.Lc_spsize) # make room for registers & psw
185 mvc SP_PSW(8,%r15),0(%r12) # move user PSW to stack 185 mvc SP_PSW(8,%r15),0(%r12) # move user PSW to stack
186 la %r12,\psworg
187 st %r2,SP_ORIG_R2(%r15) # store original content of gpr 2 186 st %r2,SP_ORIG_R2(%r15) # store original content of gpr 2
188 icm %r12,12,__LC_SVC_ILC 187 icm %r12,3,__LC_SVC_ILC
189 stm %r0,%r11,SP_R0(%r15) # store gprs %r0-%r11 to kernel stack 188 stm %r0,%r11,SP_R0(%r15) # store gprs %r0-%r11 to kernel stack
190 st %r12,SP_ILC(%r15) 189 st %r12,SP_SVCNR(%r15)
191 mvc SP_R12(16,%r15),\savearea # move %r12-%r15 to stack 190 mvc SP_R12(16,%r15),\savearea # move %r12-%r15 to stack
192 la %r12,0 191 la %r12,0
193 st %r12,__SF_BACKCHAIN(%r15) # clear back chain 192 st %r12,__SF_BACKCHAIN(%r15) # clear back chain
@@ -264,16 +263,17 @@ sysc_update:
264#endif 263#endif
265sysc_do_svc: 264sysc_do_svc:
266 l %r9,__LC_THREAD_INFO # load pointer to thread_info struct 265 l %r9,__LC_THREAD_INFO # load pointer to thread_info struct
267 sla %r7,2 # *4 and test for svc 0 266 ltr %r7,%r7 # test for svc 0
268 bnz BASED(sysc_nr_ok) # svc number > 0 267 bnz BASED(sysc_nr_ok) # svc number > 0
269 # svc 0: system call number in %r1 268 # svc 0: system call number in %r1
270 cl %r1,BASED(.Lnr_syscalls) 269 cl %r1,BASED(.Lnr_syscalls)
271 bnl BASED(sysc_nr_ok) 270 bnl BASED(sysc_nr_ok)
272 lr %r7,%r1 # copy svc number to %r7 271 lr %r7,%r1 # copy svc number to %r7
273 sla %r7,2 # *4
274sysc_nr_ok: 272sysc_nr_ok:
275 mvc SP_ARGS(4,%r15),SP_R7(%r15) 273 mvc SP_ARGS(4,%r15),SP_R7(%r15)
276sysc_do_restart: 274sysc_do_restart:
275 sth %r7,SP_SVCNR(%r15)
276 sll %r7,2 # svc number *4
277 l %r8,BASED(.Lsysc_table) 277 l %r8,BASED(.Lsysc_table)
278 tm __TI_flags+3(%r9),(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT) 278 tm __TI_flags+3(%r9),(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT)
279 l %r8,0(%r7,%r8) # get system call addr. 279 l %r8,0(%r7,%r8) # get system call addr.
@@ -376,7 +376,6 @@ sysc_notify_resume:
376sysc_restart: 376sysc_restart:
377 ni __TI_flags+3(%r9),255-_TIF_RESTART_SVC # clear TIF_RESTART_SVC 377 ni __TI_flags+3(%r9),255-_TIF_RESTART_SVC # clear TIF_RESTART_SVC
378 l %r7,SP_R2(%r15) # load new svc number 378 l %r7,SP_R2(%r15) # load new svc number
379 sla %r7,2
380 mvc SP_R2(4,%r15),SP_ORIG_R2(%r15) # restore first argument 379 mvc SP_R2(4,%r15),SP_ORIG_R2(%r15) # restore first argument
381 lm %r2,%r6,SP_R2(%r15) # load svc arguments 380 lm %r2,%r6,SP_R2(%r15) # load svc arguments
382 b BASED(sysc_do_restart) # restart svc 381 b BASED(sysc_do_restart) # restart svc
@@ -386,7 +385,8 @@ sysc_restart:
386# 385#
387sysc_singlestep: 386sysc_singlestep:
388 ni __TI_flags+3(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP 387 ni __TI_flags+3(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP
389 mvi SP_TRAP+1(%r15),0x28 # set trap indication to pgm check 388 mvi SP_SVCNR(%r15),0xff # set trap indication to pgm check
389 mvi SP_SVCNR+1(%r15),0xff
390 la %r2,SP_PTREGS(%r15) # address of register-save area 390 la %r2,SP_PTREGS(%r15) # address of register-save area
391 l %r1,BASED(.Lhandle_per) # load adr. of per handler 391 l %r1,BASED(.Lhandle_per) # load adr. of per handler
392 la %r14,BASED(sysc_return) # load adr. of system return 392 la %r14,BASED(sysc_return) # load adr. of system return
@@ -407,7 +407,7 @@ sysc_tracesys:
407 bnl BASED(sysc_tracenogo) 407 bnl BASED(sysc_tracenogo)
408 l %r8,BASED(.Lsysc_table) 408 l %r8,BASED(.Lsysc_table)
409 lr %r7,%r2 409 lr %r7,%r2
410 sll %r7,2 # *4 410 sll %r7,2 # svc number *4
411 l %r8,0(%r7,%r8) 411 l %r8,0(%r7,%r8)
412sysc_tracego: 412sysc_tracego:
413 lm %r3,%r6,SP_R3(%r15) 413 lm %r3,%r6,SP_R3(%r15)
@@ -586,7 +586,8 @@ pgm_svcper:
586# per was called from kernel, must be kprobes 586# per was called from kernel, must be kprobes
587# 587#
588kernel_per: 588kernel_per:
589 mvi SP_TRAP+1(%r15),0x28 # set trap indication to pgm check 589 mvi SP_SVCNR(%r15),0xff # set trap indication to pgm check
590 mvi SP_SVCNR+1(%r15),0xff
590 la %r2,SP_PTREGS(%r15) # address of register-save area 591 la %r2,SP_PTREGS(%r15) # address of register-save area
591 l %r1,BASED(.Lhandle_per) # load adr. of per handler 592 l %r1,BASED(.Lhandle_per) # load adr. of per handler
592 la %r14,BASED(sysc_restore)# load adr. of system return 593 la %r14,BASED(sysc_restore)# load adr. of system return
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 41aca06682aa..89c121ae6339 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -46,7 +46,7 @@ SP_R14 = STACK_FRAME_OVERHEAD + __PT_GPRS + 112
46SP_R15 = STACK_FRAME_OVERHEAD + __PT_GPRS + 120 46SP_R15 = STACK_FRAME_OVERHEAD + __PT_GPRS + 120
47SP_ORIG_R2 = STACK_FRAME_OVERHEAD + __PT_ORIG_GPR2 47SP_ORIG_R2 = STACK_FRAME_OVERHEAD + __PT_ORIG_GPR2
48SP_ILC = STACK_FRAME_OVERHEAD + __PT_ILC 48SP_ILC = STACK_FRAME_OVERHEAD + __PT_ILC
49SP_TRAP = STACK_FRAME_OVERHEAD + __PT_TRAP 49SP_SVCNR = STACK_FRAME_OVERHEAD + __PT_SVCNR
50SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE 50SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE
51 51
52STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER 52STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER
@@ -171,11 +171,10 @@ _TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \
171 .macro CREATE_STACK_FRAME psworg,savearea 171 .macro CREATE_STACK_FRAME psworg,savearea
172 aghi %r15,-SP_SIZE # make room for registers & psw 172 aghi %r15,-SP_SIZE # make room for registers & psw
173 mvc SP_PSW(16,%r15),0(%r12) # move user PSW to stack 173 mvc SP_PSW(16,%r15),0(%r12) # move user PSW to stack
174 la %r12,\psworg
175 stg %r2,SP_ORIG_R2(%r15) # store original content of gpr 2 174 stg %r2,SP_ORIG_R2(%r15) # store original content of gpr 2
176 icm %r12,12,__LC_SVC_ILC 175 icm %r12,3,__LC_SVC_ILC
177 stmg %r0,%r11,SP_R0(%r15) # store gprs %r0-%r11 to kernel stack 176 stmg %r0,%r11,SP_R0(%r15) # store gprs %r0-%r11 to kernel stack
178 st %r12,SP_ILC(%r15) 177 st %r12,SP_SVCNR(%r15)
179 mvc SP_R12(32,%r15),\savearea # move %r12-%r15 to stack 178 mvc SP_R12(32,%r15),\savearea # move %r12-%r15 to stack
180 la %r12,0 179 la %r12,0
181 stg %r12,__SF_BACKCHAIN(%r15) 180 stg %r12,__SF_BACKCHAIN(%r15)
@@ -250,16 +249,17 @@ sysc_update:
250#endif 249#endif
251sysc_do_svc: 250sysc_do_svc:
252 lg %r9,__LC_THREAD_INFO # load pointer to thread_info struct 251 lg %r9,__LC_THREAD_INFO # load pointer to thread_info struct
253 slag %r7,%r7,2 # *4 and test for svc 0 252 ltgr %r7,%r7 # test for svc 0
254 jnz sysc_nr_ok 253 jnz sysc_nr_ok
255 # svc 0: system call number in %r1 254 # svc 0: system call number in %r1
256 cl %r1,BASED(.Lnr_syscalls) 255 cl %r1,BASED(.Lnr_syscalls)
257 jnl sysc_nr_ok 256 jnl sysc_nr_ok
258 lgfr %r7,%r1 # clear high word in r1 257 lgfr %r7,%r1 # clear high word in r1
259 slag %r7,%r7,2 # svc 0: system call number in %r1
260sysc_nr_ok: 258sysc_nr_ok:
261 mvc SP_ARGS(8,%r15),SP_R7(%r15) 259 mvc SP_ARGS(8,%r15),SP_R7(%r15)
262sysc_do_restart: 260sysc_do_restart:
261 sth %r7,SP_SVCNR(%r15)
262 sllg %r7,%r7,2 # svc number * 4
263 larl %r10,sys_call_table 263 larl %r10,sys_call_table
264#ifdef CONFIG_COMPAT 264#ifdef CONFIG_COMPAT
265 tm __TI_flags+5(%r9),(_TIF_31BIT>>16) # running in 31 bit mode ? 265 tm __TI_flags+5(%r9),(_TIF_31BIT>>16) # running in 31 bit mode ?
@@ -363,7 +363,6 @@ sysc_notify_resume:
363sysc_restart: 363sysc_restart:
364 ni __TI_flags+7(%r9),255-_TIF_RESTART_SVC # clear TIF_RESTART_SVC 364 ni __TI_flags+7(%r9),255-_TIF_RESTART_SVC # clear TIF_RESTART_SVC
365 lg %r7,SP_R2(%r15) # load new svc number 365 lg %r7,SP_R2(%r15) # load new svc number
366 slag %r7,%r7,2 # *4
367 mvc SP_R2(8,%r15),SP_ORIG_R2(%r15) # restore first argument 366 mvc SP_R2(8,%r15),SP_ORIG_R2(%r15) # restore first argument
368 lmg %r2,%r6,SP_R2(%r15) # load svc arguments 367 lmg %r2,%r6,SP_R2(%r15) # load svc arguments
369 j sysc_do_restart # restart svc 368 j sysc_do_restart # restart svc
@@ -372,9 +371,8 @@ sysc_restart:
372# _TIF_SINGLE_STEP is set, call do_single_step 371# _TIF_SINGLE_STEP is set, call do_single_step
373# 372#
374sysc_singlestep: 373sysc_singlestep:
375 ni __TI_flags+7(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP 374 ni __TI_flags+7(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP
376 lhi %r0,__LC_PGM_OLD_PSW 375 xc SP_SVCNR(2,%r15),SP_SVCNR(%r15) # clear svc number
377 sth %r0,SP_TRAP(%r15) # set trap indication to pgm check
378 la %r2,SP_PTREGS(%r15) # address of register-save area 376 la %r2,SP_PTREGS(%r15) # address of register-save area
379 larl %r14,sysc_return # load adr. of system return 377 larl %r14,sysc_return # load adr. of system return
380 jg do_single_step # branch to do_sigtrap 378 jg do_single_step # branch to do_sigtrap
@@ -392,7 +390,7 @@ sysc_tracesys:
392 lghi %r0,NR_syscalls 390 lghi %r0,NR_syscalls
393 clgr %r0,%r2 391 clgr %r0,%r2
394 jnh sysc_tracenogo 392 jnh sysc_tracenogo
395 slag %r7,%r2,2 # *4 393 sllg %r7,%r2,2 # svc number *4
396 lgf %r8,0(%r7,%r10) 394 lgf %r8,0(%r7,%r10)
397sysc_tracego: 395sysc_tracego:
398 lmg %r3,%r6,SP_R3(%r15) 396 lmg %r3,%r6,SP_R3(%r15)
@@ -567,8 +565,7 @@ pgm_svcper:
567# per was called from kernel, must be kprobes 565# per was called from kernel, must be kprobes
568# 566#
569kernel_per: 567kernel_per:
570 lhi %r0,__LC_PGM_OLD_PSW 568 xc SP_SVCNR(2,%r15),SP_SVCNR(%r15) # clear svc number
571 sth %r0,SP_TRAP(%r15) # set trap indication to pgm check
572 la %r2,SP_PTREGS(%r15) # address of register-save area 569 la %r2,SP_PTREGS(%r15) # address of register-save area
573 larl %r14,sysc_restore # load adr. of system ret, no work 570 larl %r14,sysc_restore # load adr. of system ret, no work
574 jg do_single_step # branch to do_single_step 571 jg do_single_step # branch to do_single_step
diff --git a/arch/s390/kernel/init_task.c b/arch/s390/kernel/init_task.c
index 7ad003969251..e80716843619 100644
--- a/arch/s390/kernel/init_task.c
+++ b/arch/s390/kernel/init_task.c
@@ -26,7 +26,7 @@ EXPORT_SYMBOL(init_mm);
26/* 26/*
27 * Initial thread structure. 27 * Initial thread structure.
28 * 28 *
29 * We need to make sure that this is 8192-byte aligned due to the 29 * We need to make sure that this is THREAD_SIZE aligned due to the
30 * way process stacks are handled. This is done by having a special 30 * way process stacks are handled. This is done by having a special
31 * "init_task" linker map entry.. 31 * "init_task" linker map entry..
32 */ 32 */
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 1f31be1ecc4b..38ff2bce1203 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -657,7 +657,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
657 * debugger stored an invalid system call number. Skip 657 * debugger stored an invalid system call number. Skip
658 * the system call and the system call restart handling. 658 * the system call and the system call restart handling.
659 */ 659 */
660 regs->trap = -1; 660 regs->svcnr = 0;
661 ret = -1; 661 ret = -1;
662 } 662 }
663 663
diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c
index 4f7fc3059a8e..8e6812a22670 100644
--- a/arch/s390/kernel/signal.c
+++ b/arch/s390/kernel/signal.c
@@ -160,7 +160,7 @@ static int restore_sigregs(struct pt_regs *regs, _sigregs __user *sregs)
160 current->thread.fp_regs.fpc &= FPC_VALID_MASK; 160 current->thread.fp_regs.fpc &= FPC_VALID_MASK;
161 161
162 restore_fp_regs(&current->thread.fp_regs); 162 restore_fp_regs(&current->thread.fp_regs);
163 regs->trap = -1; /* disable syscall checks */ 163 regs->svcnr = 0; /* disable syscall checks */
164 return 0; 164 return 0;
165} 165}
166 166
@@ -445,7 +445,7 @@ void do_signal(struct pt_regs *regs)
445 oldset = &current->blocked; 445 oldset = &current->blocked;
446 446
447 /* Are we from a system call? */ 447 /* Are we from a system call? */
448 if (regs->trap == __LC_SVC_OLD_PSW) { 448 if (regs->svcnr) {
449 continue_addr = regs->psw.addr; 449 continue_addr = regs->psw.addr;
450 restart_addr = continue_addr - regs->ilc; 450 restart_addr = continue_addr - regs->ilc;
451 retval = regs->gprs[2]; 451 retval = regs->gprs[2];
@@ -462,7 +462,7 @@ void do_signal(struct pt_regs *regs)
462 case -ERESTART_RESTARTBLOCK: 462 case -ERESTART_RESTARTBLOCK:
463 regs->gprs[2] = -EINTR; 463 regs->gprs[2] = -EINTR;
464 } 464 }
465 regs->trap = -1; /* Don't deal with this again. */ 465 regs->svcnr = 0; /* Don't deal with this again. */
466 } 466 }
467 467
468 /* Get signal to deliver. When running under ptrace, at this point 468 /* Get signal to deliver. When running under ptrace, at this point
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index b94e9e3b694a..eccefbbff887 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -59,7 +59,7 @@
59 59
60static ext_int_info_t ext_int_info_cc; 60static ext_int_info_t ext_int_info_cc;
61static ext_int_info_t ext_int_etr_cc; 61static ext_int_info_t ext_int_etr_cc;
62static u64 jiffies_timer_cc; 62static u64 sched_clock_base_cc;
63 63
64static DEFINE_PER_CPU(struct clock_event_device, comparators); 64static DEFINE_PER_CPU(struct clock_event_device, comparators);
65 65
@@ -68,7 +68,7 @@ static DEFINE_PER_CPU(struct clock_event_device, comparators);
68 */ 68 */
69unsigned long long sched_clock(void) 69unsigned long long sched_clock(void)
70{ 70{
71 return ((get_clock_xt() - jiffies_timer_cc) * 125) >> 9; 71 return ((get_clock_xt() - sched_clock_base_cc) * 125) >> 9;
72} 72}
73 73
74/* 74/*
@@ -229,13 +229,10 @@ static struct clocksource clocksource_tod = {
229 */ 229 */
230void __init time_init(void) 230void __init time_init(void)
231{ 231{
232 u64 init_timer_cc; 232 sched_clock_base_cc = reset_tod_clock();
233
234 init_timer_cc = reset_tod_clock();
235 jiffies_timer_cc = init_timer_cc - jiffies_64 * CLK_TICKS_PER_JIFFY;
236 233
237 /* set xtime */ 234 /* set xtime */
238 tod_to_timeval(init_timer_cc - TOD_UNIX_EPOCH, &xtime); 235 tod_to_timeval(sched_clock_base_cc - TOD_UNIX_EPOCH, &xtime);
239 set_normalized_timespec(&wall_to_monotonic, 236 set_normalized_timespec(&wall_to_monotonic,
240 -xtime.tv_sec, -xtime.tv_nsec); 237 -xtime.tv_sec, -xtime.tv_nsec);
241 238
@@ -289,7 +286,7 @@ static unsigned long long adjust_time(unsigned long long old,
289 delta = -delta; 286 delta = -delta;
290 adjust.offset = -ticks * (1000000 / HZ); 287 adjust.offset = -ticks * (1000000 / HZ);
291 } 288 }
292 jiffies_timer_cc += delta; 289 sched_clock_base_cc += delta;
293 if (adjust.offset != 0) { 290 if (adjust.offset != 0) {
294 printk(KERN_NOTICE "etr: time adjusted by %li micro-seconds\n", 291 printk(KERN_NOTICE "etr: time adjusted by %li micro-seconds\n",
295 adjust.offset); 292 adjust.offset);
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 607bd67a18ce..d796d05c9c01 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -2,6 +2,7 @@
2 * Written by Martin Schwidefsky (schwidefsky@de.ibm.com) 2 * Written by Martin Schwidefsky (schwidefsky@de.ibm.com)
3 */ 3 */
4 4
5#include <asm/thread_info.h>
5#include <asm/page.h> 6#include <asm/page.h>
6#include <asm-generic/vmlinux.lds.h> 7#include <asm-generic/vmlinux.lds.h>
7 8
@@ -86,7 +87,7 @@ SECTIONS
86 } 87 }
87 _edata = .; /* End of data section */ 88 _edata = .; /* End of data section */
88 89
89 . = ALIGN(2 * PAGE_SIZE); /* init_task */ 90 . = ALIGN(THREAD_SIZE); /* init_task */
90 .data.init_task : { 91 .data.init_task : {
91 *(.data.init_task) 92 *(.data.init_task)
92 } 93 }
diff --git a/arch/sparc/include/asm/ptrace_64.h b/arch/sparc/include/asm/ptrace_64.h
index 3d3e9c161d8b..84e969f06afe 100644
--- a/arch/sparc/include/asm/ptrace_64.h
+++ b/arch/sparc/include/asm/ptrace_64.h
@@ -142,8 +142,6 @@ struct global_reg_snapshot {
142}; 142};
143extern struct global_reg_snapshot global_reg_snapshot[NR_CPUS]; 143extern struct global_reg_snapshot global_reg_snapshot[NR_CPUS];
144 144
145#define __ARCH_WANT_COMPAT_SYS_PTRACE
146
147#define force_successful_syscall_return() \ 145#define force_successful_syscall_return() \
148do { current_thread_info()->syscall_noerror = 1; \ 146do { current_thread_info()->syscall_noerror = 1; \
149} while (0) 147} while (0)
diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c
index e7a0edfc1a32..1fc17f59c6bf 100644
--- a/arch/sparc/kernel/cpu.c
+++ b/arch/sparc/kernel/cpu.c
@@ -126,7 +126,7 @@ char *sparc_fpu_type;
126 126
127unsigned int fsr_storage; 127unsigned int fsr_storage;
128 128
129void __init cpu_probe(void) 129void __cpuinit cpu_probe(void)
130{ 130{
131 int psr_impl, psr_vers, fpu_vers; 131 int psr_impl, psr_vers, fpu_vers;
132 int i, psr; 132 int i, psr;
diff --git a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S
index 2d325fd84579..51b40426f9c6 100644
--- a/arch/sparc/kernel/head.S
+++ b/arch/sparc/kernel/head.S
@@ -72,7 +72,7 @@ sun4e_notsup:
72 .align 4 72 .align 4
73 73
74 /* The Sparc trap table, bootloader gives us control at _start. */ 74 /* The Sparc trap table, bootloader gives us control at _start. */
75 .text 75 .section .text.head,"ax"
76 .globl start, _stext, _start, __stext 76 .globl start, _stext, _start, __stext
77 .globl trapbase 77 .globl trapbase
78_start: /* danger danger */ 78_start: /* danger danger */
diff --git a/arch/sparc/kernel/smp.c b/arch/sparc/kernel/smp.c
index 1619ec15c099..e396c1f17a92 100644
--- a/arch/sparc/kernel/smp.c
+++ b/arch/sparc/kernel/smp.c
@@ -35,7 +35,7 @@
35 35
36#include "irq.h" 36#include "irq.h"
37 37
38volatile unsigned long cpu_callin_map[NR_CPUS] __initdata = {0,}; 38volatile unsigned long cpu_callin_map[NR_CPUS] __cpuinitdata = {0,};
39unsigned char boot_cpu_id = 0; 39unsigned char boot_cpu_id = 0;
40unsigned char boot_cpu_id4 = 0; /* boot_cpu_id << 2 */ 40unsigned char boot_cpu_id4 = 0; /* boot_cpu_id << 2 */
41 41
@@ -120,7 +120,7 @@ void cpu_panic(void)
120 panic("SMP bolixed\n"); 120 panic("SMP bolixed\n");
121} 121}
122 122
123struct linux_prom_registers smp_penguin_ctable __initdata = { 0 }; 123struct linux_prom_registers smp_penguin_ctable __cpuinitdata = { 0 };
124 124
125void smp_send_reschedule(int cpu) 125void smp_send_reschedule(int cpu)
126{ 126{
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index 7a6a5e795928..16ab0cb731c5 100644
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -83,7 +83,7 @@ static inline void show_leds(int cpuid)
83 "i" (ASI_M_CTL)); 83 "i" (ASI_M_CTL));
84} 84}
85 85
86void __init smp4d_callin(void) 86void __cpuinit smp4d_callin(void)
87{ 87{
88 int cpuid = hard_smp4d_processor_id(); 88 int cpuid = hard_smp4d_processor_id();
89 extern spinlock_t sun4d_imsk_lock; 89 extern spinlock_t sun4d_imsk_lock;
@@ -386,7 +386,7 @@ void smp4d_percpu_timer_interrupt(struct pt_regs *regs)
386 386
387extern unsigned int lvl14_resolution; 387extern unsigned int lvl14_resolution;
388 388
389static void __init smp_setup_percpu_timer(void) 389static void __cpuinit smp_setup_percpu_timer(void)
390{ 390{
391 int cpu = hard_smp4d_processor_id(); 391 int cpu = hard_smp4d_processor_id();
392 392
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c
index 5fc386d08c47..4f8d60586b07 100644
--- a/arch/sparc/kernel/sun4m_smp.c
+++ b/arch/sparc/kernel/sun4m_smp.c
@@ -343,7 +343,7 @@ void smp4m_percpu_timer_interrupt(struct pt_regs *regs)
343 343
344extern unsigned int lvl14_resolution; 344extern unsigned int lvl14_resolution;
345 345
346static void __init smp_setup_percpu_timer(void) 346static void __cpuinit smp_setup_percpu_timer(void)
347{ 347{
348 int cpu = smp_processor_id(); 348 int cpu = smp_processor_id();
349 349
diff --git a/arch/sparc/kernel/trampoline.S b/arch/sparc/kernel/trampoline.S
index 356c56aebc62..5e235c52d667 100644
--- a/arch/sparc/kernel/trampoline.S
+++ b/arch/sparc/kernel/trampoline.S
@@ -18,7 +18,7 @@
18 .globl sun4m_cpu_startup, __smp4m_processor_id 18 .globl sun4m_cpu_startup, __smp4m_processor_id
19 .globl sun4d_cpu_startup, __smp4d_processor_id 19 .globl sun4d_cpu_startup, __smp4d_processor_id
20 20
21 __INIT 21 __CPUINIT
22 .align 4 22 .align 4
23 23
24/* When we start up a cpu for the first time it enters this routine. 24/* When we start up a cpu for the first time it enters this routine.
@@ -109,7 +109,7 @@ __smp4d_processor_id:
109/* CPUID in bootbus can be found at PA 0xff0140000 */ 109/* CPUID in bootbus can be found at PA 0xff0140000 */
110#define SUN4D_BOOTBUS_CPUID 0xf0140000 110#define SUN4D_BOOTBUS_CPUID 0xf0140000
111 111
112 __INIT 112 __CPUINIT
113 .align 4 113 .align 4
114 114
115sun4d_cpu_startup: 115sun4d_cpu_startup:
diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S
index b1002c607196..5b7e69a8c32f 100644
--- a/arch/sparc/kernel/vmlinux.lds.S
+++ b/arch/sparc/kernel/vmlinux.lds.S
@@ -13,6 +13,7 @@ SECTIONS
13 .text 0xf0004000 : 13 .text 0xf0004000 :
14 { 14 {
15 _text = .; 15 _text = .;
16 *(.text.head)
16 TEXT_TEXT 17 TEXT_TEXT
17 SCHED_TEXT 18 SCHED_TEXT
18 LOCK_TEXT 19 LOCK_TEXT
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index 6a5d7cabc044..dd8aa36f366c 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -1251,7 +1251,7 @@ static inline void map_kernel(void)
1251/* Paging initialization on the Sparc Reference MMU. */ 1251/* Paging initialization on the Sparc Reference MMU. */
1252extern void sparc_context_init(int); 1252extern void sparc_context_init(int);
1253 1253
1254void (*poke_srmmu)(void) __initdata = NULL; 1254void (*poke_srmmu)(void) __cpuinitdata = NULL;
1255 1255
1256extern unsigned long bootmem_init(unsigned long *pages_avail); 1256extern unsigned long bootmem_init(unsigned long *pages_avail);
1257 1257
@@ -1446,7 +1446,7 @@ static void __init init_vac_layout(void)
1446 (int)vac_cache_size, (int)vac_line_size); 1446 (int)vac_cache_size, (int)vac_line_size);
1447} 1447}
1448 1448
1449static void __init poke_hypersparc(void) 1449static void __cpuinit poke_hypersparc(void)
1450{ 1450{
1451 volatile unsigned long clear; 1451 volatile unsigned long clear;
1452 unsigned long mreg = srmmu_get_mmureg(); 1452 unsigned long mreg = srmmu_get_mmureg();
@@ -1501,7 +1501,7 @@ static void __init init_hypersparc(void)
1501 hypersparc_setup_blockops(); 1501 hypersparc_setup_blockops();
1502} 1502}
1503 1503
1504static void __init poke_cypress(void) 1504static void __cpuinit poke_cypress(void)
1505{ 1505{
1506 unsigned long mreg = srmmu_get_mmureg(); 1506 unsigned long mreg = srmmu_get_mmureg();
1507 unsigned long faddr, tagval; 1507 unsigned long faddr, tagval;
@@ -1589,7 +1589,7 @@ static void __init init_cypress_605(unsigned long mrev)
1589 init_cypress_common(); 1589 init_cypress_common();
1590} 1590}
1591 1591
1592static void __init poke_swift(void) 1592static void __cpuinit poke_swift(void)
1593{ 1593{
1594 unsigned long mreg; 1594 unsigned long mreg;
1595 1595
@@ -1771,7 +1771,7 @@ static void turbosparc_flush_tlb_page(struct vm_area_struct *vma, unsigned long
1771} 1771}
1772 1772
1773 1773
1774static void __init poke_turbosparc(void) 1774static void __cpuinit poke_turbosparc(void)
1775{ 1775{
1776 unsigned long mreg = srmmu_get_mmureg(); 1776 unsigned long mreg = srmmu_get_mmureg();
1777 unsigned long ccreg; 1777 unsigned long ccreg;
@@ -1834,7 +1834,7 @@ static void __init init_turbosparc(void)
1834 poke_srmmu = poke_turbosparc; 1834 poke_srmmu = poke_turbosparc;
1835} 1835}
1836 1836
1837static void __init poke_tsunami(void) 1837static void __cpuinit poke_tsunami(void)
1838{ 1838{
1839 unsigned long mreg = srmmu_get_mmureg(); 1839 unsigned long mreg = srmmu_get_mmureg();
1840 1840
@@ -1876,7 +1876,7 @@ static void __init init_tsunami(void)
1876 tsunami_setup_blockops(); 1876 tsunami_setup_blockops();
1877} 1877}
1878 1878
1879static void __init poke_viking(void) 1879static void __cpuinit poke_viking(void)
1880{ 1880{
1881 unsigned long mreg = srmmu_get_mmureg(); 1881 unsigned long mreg = srmmu_get_mmureg();
1882 static int smp_catch; 1882 static int smp_catch;
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index e5627118e613..f500b0618bb0 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -282,7 +282,7 @@ static unsigned long kimage_addr_to_ra(void *p)
282 return kern_base + (val - KERNBASE); 282 return kern_base + (val - KERNBASE);
283} 283}
284 284
285static void ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg) 285static void __cpuinit ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg)
286{ 286{
287 extern unsigned long sparc64_ttable_tl0; 287 extern unsigned long sparc64_ttable_tl0;
288 extern unsigned long kern_locked_tte_data; 288 extern unsigned long kern_locked_tte_data;
@@ -343,7 +343,7 @@ extern unsigned long sparc64_cpu_startup;
343 */ 343 */
344static struct thread_info *cpu_new_thread = NULL; 344static struct thread_info *cpu_new_thread = NULL;
345 345
346static int __devinit smp_boot_one_cpu(unsigned int cpu) 346static int __cpuinit smp_boot_one_cpu(unsigned int cpu)
347{ 347{
348 struct trap_per_cpu *tb = &trap_block[cpu]; 348 struct trap_per_cpu *tb = &trap_block[cpu];
349 unsigned long entry = 349 unsigned long entry =
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 3c10daf8fc01..185f34679110 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -956,7 +956,7 @@ int of_node_to_nid(struct device_node *dp)
956 return nid; 956 return nid;
957} 957}
958 958
959static void add_node_ranges(void) 959static void __init add_node_ranges(void)
960{ 960{
961 int i; 961 int i;
962 962
diff --git a/arch/x86/boot/tty.c b/arch/x86/boot/tty.c
index 0be77b39328a..7e8e8b25f5f6 100644
--- a/arch/x86/boot/tty.c
+++ b/arch/x86/boot/tty.c
@@ -74,7 +74,7 @@ static int kbd_pending(void)
74{ 74{
75 u8 pending; 75 u8 pending;
76 asm volatile("int $0x16; setnz %0" 76 asm volatile("int $0x16; setnz %0"
77 : "=rm" (pending) 77 : "=qm" (pending)
78 : "a" (0x0100)); 78 : "a" (0x0100));
79 return pending; 79 return pending;
80} 80}
diff --git a/arch/x86/include/asm/ds.h b/arch/x86/include/asm/ds.h
index 72c5a190bf48..a95008457ea4 100644
--- a/arch/x86/include/asm/ds.h
+++ b/arch/x86/include/asm/ds.h
@@ -23,12 +23,13 @@
23#ifndef _ASM_X86_DS_H 23#ifndef _ASM_X86_DS_H
24#define _ASM_X86_DS_H 24#define _ASM_X86_DS_H
25 25
26#ifdef CONFIG_X86_DS
27 26
28#include <linux/types.h> 27#include <linux/types.h>
29#include <linux/init.h> 28#include <linux/init.h>
30 29
31 30
31#ifdef CONFIG_X86_DS
32
32struct task_struct; 33struct task_struct;
33 34
34/* 35/*
@@ -232,7 +233,8 @@ extern void ds_free(struct ds_context *context);
232 233
233#else /* CONFIG_X86_DS */ 234#else /* CONFIG_X86_DS */
234 235
235#define ds_init_intel(config) do {} while (0) 236struct cpuinfo_x86;
237static inline void __cpuinit ds_init_intel(struct cpuinfo_x86 *ignored) {}
236 238
237#endif /* CONFIG_X86_DS */ 239#endif /* CONFIG_X86_DS */
238#endif /* _ASM_X86_DS_H */ 240#endif /* _ASM_X86_DS_H */
diff --git a/arch/x86/include/asm/pci_64.h b/arch/x86/include/asm/pci_64.h
index 5b28995d664e..d02d936840a3 100644
--- a/arch/x86/include/asm/pci_64.h
+++ b/arch/x86/include/asm/pci_64.h
@@ -34,8 +34,6 @@ extern void pci_iommu_alloc(void);
34 */ 34 */
35#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) 35#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
36 36
37#if defined(CONFIG_GART_IOMMU) || defined(CONFIG_CALGARY_IOMMU)
38
39#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \ 37#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \
40 dma_addr_t ADDR_NAME; 38 dma_addr_t ADDR_NAME;
41#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) \ 39#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) \
@@ -49,18 +47,6 @@ extern void pci_iommu_alloc(void);
49#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \ 47#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \
50 (((PTR)->LEN_NAME) = (VAL)) 48 (((PTR)->LEN_NAME) = (VAL))
51 49
52#else
53/* No IOMMU */
54
55#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
56#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
57#define pci_unmap_addr(PTR, ADDR_NAME) (0)
58#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0)
59#define pci_unmap_len(PTR, LEN_NAME) (0)
60#define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0)
61
62#endif
63
64#endif /* __KERNEL__ */ 50#endif /* __KERNEL__ */
65 51
66#endif /* _ASM_X86_PCI_64_H */ 52#endif /* _ASM_X86_PCI_64_H */
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
index d1531c8480b7..eefb0594b058 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
@@ -271,8 +271,6 @@ extern int do_get_thread_area(struct task_struct *p, int idx,
271extern int do_set_thread_area(struct task_struct *p, int idx, 271extern int do_set_thread_area(struct task_struct *p, int idx,
272 struct user_desc __user *info, int can_allocate); 272 struct user_desc __user *info, int can_allocate);
273 273
274#define __ARCH_WANT_COMPAT_SYS_PTRACE
275
276#endif /* __KERNEL__ */ 274#endif /* __KERNEL__ */
277 275
278#endif /* !__ASSEMBLY__ */ 276#endif /* !__ASSEMBLY__ */
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 1d8ed95da846..af2bc36ca1c4 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -46,7 +46,7 @@ obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o
46obj-y += process.o 46obj-y += process.o
47obj-y += i387.o xsave.o 47obj-y += i387.o xsave.o
48obj-y += ptrace.o 48obj-y += ptrace.o
49obj-y += ds.o 49obj-$(CONFIG_X86_DS) += ds.o
50obj-$(CONFIG_X86_32) += tls.o 50obj-$(CONFIG_X86_32) += tls.o
51obj-$(CONFIG_IA32_EMULATION) += tls.o 51obj-$(CONFIG_IA32_EMULATION) += tls.o
52obj-y += step.o 52obj-y += step.o
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index 04a7f960bbc0..16f94879b525 100644
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -1315,7 +1315,7 @@ void enable_x2apic(void)
1315 } 1315 }
1316} 1316}
1317 1317
1318void enable_IR_x2apic(void) 1318void __init enable_IR_x2apic(void)
1319{ 1319{
1320#ifdef CONFIG_INTR_REMAP 1320#ifdef CONFIG_INTR_REMAP
1321 int ret; 1321 int ret;
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
index d3dcd58b87cd..7f05f44b97e9 100644
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
@@ -115,9 +115,20 @@ static int query_current_values_with_pending_wait(struct powernow_k8_data *data)
115 u32 i = 0; 115 u32 i = 0;
116 116
117 if (cpu_family == CPU_HW_PSTATE) { 117 if (cpu_family == CPU_HW_PSTATE) {
118 rdmsr(MSR_PSTATE_STATUS, lo, hi); 118 if (data->currpstate == HW_PSTATE_INVALID) {
119 i = lo & HW_PSTATE_MASK; 119 /* read (initial) hw pstate if not yet set */
120 data->currpstate = i; 120 rdmsr(MSR_PSTATE_STATUS, lo, hi);
121 i = lo & HW_PSTATE_MASK;
122
123 /*
124 * a workaround for family 11h erratum 311 might cause
125 * an "out-of-range Pstate if the core is in Pstate-0
126 */
127 if (i >= data->numps)
128 data->currpstate = HW_PSTATE_0;
129 else
130 data->currpstate = i;
131 }
121 return 0; 132 return 0;
122 } 133 }
123 do { 134 do {
@@ -1121,6 +1132,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
1121 } 1132 }
1122 1133
1123 data->cpu = pol->cpu; 1134 data->cpu = pol->cpu;
1135 data->currpstate = HW_PSTATE_INVALID;
1124 1136
1125 if (powernow_k8_cpu_init_acpi(data)) { 1137 if (powernow_k8_cpu_init_acpi(data)) {
1126 /* 1138 /*
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.h b/arch/x86/kernel/cpu/cpufreq/powernow-k8.h
index ab48cfed4d96..65cfb5d7f77f 100644
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.h
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.h
@@ -5,6 +5,19 @@
5 * http://www.gnu.org/licenses/gpl.html 5 * http://www.gnu.org/licenses/gpl.html
6 */ 6 */
7 7
8
9enum pstate {
10 HW_PSTATE_INVALID = 0xff,
11 HW_PSTATE_0 = 0,
12 HW_PSTATE_1 = 1,
13 HW_PSTATE_2 = 2,
14 HW_PSTATE_3 = 3,
15 HW_PSTATE_4 = 4,
16 HW_PSTATE_5 = 5,
17 HW_PSTATE_6 = 6,
18 HW_PSTATE_7 = 7,
19};
20
8struct powernow_k8_data { 21struct powernow_k8_data {
9 unsigned int cpu; 22 unsigned int cpu;
10 23
@@ -23,7 +36,9 @@ struct powernow_k8_data {
23 u32 exttype; /* extended interface = 1 */ 36 u32 exttype; /* extended interface = 1 */
24 37
25 /* keep track of the current fid / vid or pstate */ 38 /* keep track of the current fid / vid or pstate */
26 u32 currvid, currfid, currpstate; 39 u32 currvid;
40 u32 currfid;
41 enum pstate currpstate;
27 42
28 /* the powernow_table includes all frequency and vid/fid pairings: 43 /* the powernow_table includes all frequency and vid/fid pairings:
29 * fid are the lower 8 bits of the index, vid are the upper 8 bits. 44 * fid are the lower 8 bits of the index, vid are the upper 8 bits.
diff --git a/arch/x86/kernel/ds.c b/arch/x86/kernel/ds.c
index d1a121443bde..a2d1176c38ee 100644
--- a/arch/x86/kernel/ds.c
+++ b/arch/x86/kernel/ds.c
@@ -21,8 +21,6 @@
21 */ 21 */
22 22
23 23
24#ifdef CONFIG_X86_DS
25
26#include <asm/ds.h> 24#include <asm/ds.h>
27 25
28#include <linux/errno.h> 26#include <linux/errno.h>
@@ -211,14 +209,15 @@ static DEFINE_PER_CPU(struct ds_context *, system_context);
211static inline struct ds_context *ds_get_context(struct task_struct *task) 209static inline struct ds_context *ds_get_context(struct task_struct *task)
212{ 210{
213 struct ds_context *context; 211 struct ds_context *context;
212 unsigned long irq;
214 213
215 spin_lock(&ds_lock); 214 spin_lock_irqsave(&ds_lock, irq);
216 215
217 context = (task ? task->thread.ds_ctx : this_system_context); 216 context = (task ? task->thread.ds_ctx : this_system_context);
218 if (context) 217 if (context)
219 context->count++; 218 context->count++;
220 219
221 spin_unlock(&ds_lock); 220 spin_unlock_irqrestore(&ds_lock, irq);
222 221
223 return context; 222 return context;
224} 223}
@@ -226,55 +225,46 @@ static inline struct ds_context *ds_get_context(struct task_struct *task)
226/* 225/*
227 * Same as ds_get_context, but allocates the context and it's DS 226 * Same as ds_get_context, but allocates the context and it's DS
228 * structure, if necessary; returns NULL; if out of memory. 227 * structure, if necessary; returns NULL; if out of memory.
229 *
230 * pre: requires ds_lock to be held
231 */ 228 */
232static inline struct ds_context *ds_alloc_context(struct task_struct *task) 229static inline struct ds_context *ds_alloc_context(struct task_struct *task)
233{ 230{
234 struct ds_context **p_context = 231 struct ds_context **p_context =
235 (task ? &task->thread.ds_ctx : &this_system_context); 232 (task ? &task->thread.ds_ctx : &this_system_context);
236 struct ds_context *context = *p_context; 233 struct ds_context *context = *p_context;
234 unsigned long irq;
237 235
238 if (!context) { 236 if (!context) {
239 spin_unlock(&ds_lock);
240
241 context = kzalloc(sizeof(*context), GFP_KERNEL); 237 context = kzalloc(sizeof(*context), GFP_KERNEL);
242 238 if (!context)
243 if (!context) {
244 spin_lock(&ds_lock);
245 return NULL; 239 return NULL;
246 }
247 240
248 context->ds = kzalloc(ds_cfg.sizeof_ds, GFP_KERNEL); 241 context->ds = kzalloc(ds_cfg.sizeof_ds, GFP_KERNEL);
249 if (!context->ds) { 242 if (!context->ds) {
250 kfree(context); 243 kfree(context);
251 spin_lock(&ds_lock);
252 return NULL; 244 return NULL;
253 } 245 }
254 246
255 spin_lock(&ds_lock); 247 spin_lock_irqsave(&ds_lock, irq);
256 /* 248
257 * Check for race - another CPU could have allocated
258 * it meanwhile:
259 */
260 if (*p_context) { 249 if (*p_context) {
261 kfree(context->ds); 250 kfree(context->ds);
262 kfree(context); 251 kfree(context);
263 return *p_context;
264 }
265 252
266 *p_context = context; 253 context = *p_context;
254 } else {
255 *p_context = context;
267 256
268 context->this = p_context; 257 context->this = p_context;
269 context->task = task; 258 context->task = task;
270 259
271 if (task) 260 if (task)
272 set_tsk_thread_flag(task, TIF_DS_AREA_MSR); 261 set_tsk_thread_flag(task, TIF_DS_AREA_MSR);
273 262
274 if (!task || (task == current)) 263 if (!task || (task == current))
275 wrmsr(MSR_IA32_DS_AREA, (unsigned long)context->ds, 0); 264 wrmsrl(MSR_IA32_DS_AREA,
276 265 (unsigned long)context->ds);
277 get_tracer(task); 266 }
267 spin_unlock_irqrestore(&ds_lock, irq);
278 } 268 }
279 269
280 context->count++; 270 context->count++;
@@ -288,10 +278,12 @@ static inline struct ds_context *ds_alloc_context(struct task_struct *task)
288 */ 278 */
289static inline void ds_put_context(struct ds_context *context) 279static inline void ds_put_context(struct ds_context *context)
290{ 280{
281 unsigned long irq;
282
291 if (!context) 283 if (!context)
292 return; 284 return;
293 285
294 spin_lock(&ds_lock); 286 spin_lock_irqsave(&ds_lock, irq);
295 287
296 if (--context->count) 288 if (--context->count)
297 goto out; 289 goto out;
@@ -313,7 +305,7 @@ static inline void ds_put_context(struct ds_context *context)
313 kfree(context->ds); 305 kfree(context->ds);
314 kfree(context); 306 kfree(context);
315 out: 307 out:
316 spin_unlock(&ds_lock); 308 spin_unlock_irqrestore(&ds_lock, irq);
317} 309}
318 310
319 311
@@ -384,6 +376,7 @@ static int ds_request(struct task_struct *task, void *base, size_t size,
384 struct ds_context *context; 376 struct ds_context *context;
385 unsigned long buffer, adj; 377 unsigned long buffer, adj;
386 const unsigned long alignment = (1 << 3); 378 const unsigned long alignment = (1 << 3);
379 unsigned long irq;
387 int error = 0; 380 int error = 0;
388 381
389 if (!ds_cfg.sizeof_ds) 382 if (!ds_cfg.sizeof_ds)
@@ -398,26 +391,27 @@ static int ds_request(struct task_struct *task, void *base, size_t size,
398 return -EOPNOTSUPP; 391 return -EOPNOTSUPP;
399 392
400 393
401 spin_lock(&ds_lock);
402
403 error = -ENOMEM;
404 context = ds_alloc_context(task); 394 context = ds_alloc_context(task);
405 if (!context) 395 if (!context)
406 goto out_unlock; 396 return -ENOMEM;
397
398 spin_lock_irqsave(&ds_lock, irq);
407 399
408 error = -EPERM; 400 error = -EPERM;
409 if (!check_tracer(task)) 401 if (!check_tracer(task))
410 goto out_unlock; 402 goto out_unlock;
411 403
404 get_tracer(task);
405
412 error = -EALREADY; 406 error = -EALREADY;
413 if (context->owner[qual] == current) 407 if (context->owner[qual] == current)
414 goto out_unlock; 408 goto out_put_tracer;
415 error = -EPERM; 409 error = -EPERM;
416 if (context->owner[qual] != NULL) 410 if (context->owner[qual] != NULL)
417 goto out_unlock; 411 goto out_put_tracer;
418 context->owner[qual] = current; 412 context->owner[qual] = current;
419 413
420 spin_unlock(&ds_lock); 414 spin_unlock_irqrestore(&ds_lock, irq);
421 415
422 416
423 error = -ENOMEM; 417 error = -ENOMEM;
@@ -465,10 +459,17 @@ static int ds_request(struct task_struct *task, void *base, size_t size,
465 out_release: 459 out_release:
466 context->owner[qual] = NULL; 460 context->owner[qual] = NULL;
467 ds_put_context(context); 461 ds_put_context(context);
462 put_tracer(task);
463 return error;
464
465 out_put_tracer:
466 spin_unlock_irqrestore(&ds_lock, irq);
467 ds_put_context(context);
468 put_tracer(task);
468 return error; 469 return error;
469 470
470 out_unlock: 471 out_unlock:
471 spin_unlock(&ds_lock); 472 spin_unlock_irqrestore(&ds_lock, irq);
472 ds_put_context(context); 473 ds_put_context(context);
473 return error; 474 return error;
474} 475}
@@ -818,13 +819,21 @@ static const struct ds_configuration ds_cfg_var = {
818 .sizeof_ds = sizeof(long) * 12, 819 .sizeof_ds = sizeof(long) * 12,
819 .sizeof_field = sizeof(long), 820 .sizeof_field = sizeof(long),
820 .sizeof_rec[ds_bts] = sizeof(long) * 3, 821 .sizeof_rec[ds_bts] = sizeof(long) * 3,
822#ifdef __i386__
821 .sizeof_rec[ds_pebs] = sizeof(long) * 10 823 .sizeof_rec[ds_pebs] = sizeof(long) * 10
824#else
825 .sizeof_rec[ds_pebs] = sizeof(long) * 18
826#endif
822}; 827};
823static const struct ds_configuration ds_cfg_64 = { 828static const struct ds_configuration ds_cfg_64 = {
824 .sizeof_ds = 8 * 12, 829 .sizeof_ds = 8 * 12,
825 .sizeof_field = 8, 830 .sizeof_field = 8,
826 .sizeof_rec[ds_bts] = 8 * 3, 831 .sizeof_rec[ds_bts] = 8 * 3,
832#ifdef __i386__
827 .sizeof_rec[ds_pebs] = 8 * 10 833 .sizeof_rec[ds_pebs] = 8 * 10
834#else
835 .sizeof_rec[ds_pebs] = 8 * 18
836#endif
828}; 837};
829 838
830static inline void 839static inline void
@@ -878,4 +887,3 @@ void ds_free(struct ds_context *context)
878 while (leftovers--) 887 while (leftovers--)
879 ds_put_context(context); 888 ds_put_context(context);
880} 889}
881#endif /* CONFIG_X86_DS */
diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
index 1f20608d4ca8..b0f61f0dcd0a 100644
--- a/arch/x86/kernel/i387.c
+++ b/arch/x86/kernel/i387.c
@@ -58,7 +58,7 @@ void __cpuinit mxcsr_feature_mask_init(void)
58 stts(); 58 stts();
59} 59}
60 60
61void __init init_thread_xstate(void) 61void __cpuinit init_thread_xstate(void)
62{ 62{
63 if (!HAVE_HWFP) { 63 if (!HAVE_HWFP) {
64 xstate_size = sizeof(struct i387_soft_struct); 64 xstate_size = sizeof(struct i387_soft_struct);
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c
index c9513e1ff28d..9043251210fb 100644
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
@@ -3608,27 +3608,7 @@ int __init io_apic_get_redir_entries (int ioapic)
3608 3608
3609int __init probe_nr_irqs(void) 3609int __init probe_nr_irqs(void)
3610{ 3610{
3611 int idx; 3611 return NR_IRQS;
3612 int nr = 0;
3613#ifndef CONFIG_XEN
3614 int nr_min = 32;
3615#else
3616 int nr_min = NR_IRQS;
3617#endif
3618
3619 for (idx = 0; idx < nr_ioapics; idx++)
3620 nr += io_apic_get_redir_entries(idx) + 1;
3621
3622 /* double it for hotplug and msi and nmi */
3623 nr <<= 1;
3624
3625 /* something wrong ? */
3626 if (nr < nr_min)
3627 nr = nr_min;
3628 if (WARN_ON(nr > NR_IRQS))
3629 nr = NR_IRQS;
3630
3631 return nr;
3632} 3612}
3633 3613
3634/* -------------------------------------------------------------------------- 3614/* --------------------------------------------------------------------------
@@ -3775,7 +3755,9 @@ int acpi_get_override_irq(int bus_irq, int *trigger, int *polarity)
3775void __init setup_ioapic_dest(void) 3755void __init setup_ioapic_dest(void)
3776{ 3756{
3777 int pin, ioapic, irq, irq_entry; 3757 int pin, ioapic, irq, irq_entry;
3758 struct irq_desc *desc;
3778 struct irq_cfg *cfg; 3759 struct irq_cfg *cfg;
3760 cpumask_t mask;
3779 3761
3780 if (skip_ioapic_setup == 1) 3762 if (skip_ioapic_setup == 1)
3781 return; 3763 return;
@@ -3792,16 +3774,30 @@ void __init setup_ioapic_dest(void)
3792 * cpu is online. 3774 * cpu is online.
3793 */ 3775 */
3794 cfg = irq_cfg(irq); 3776 cfg = irq_cfg(irq);
3795 if (!cfg->vector) 3777 if (!cfg->vector) {
3796 setup_IO_APIC_irq(ioapic, pin, irq, 3778 setup_IO_APIC_irq(ioapic, pin, irq,
3797 irq_trigger(irq_entry), 3779 irq_trigger(irq_entry),
3798 irq_polarity(irq_entry)); 3780 irq_polarity(irq_entry));
3781 continue;
3782
3783 }
3784
3785 /*
3786 * Honour affinities which have been set in early boot
3787 */
3788 desc = irq_to_desc(irq);
3789 if (desc->status &
3790 (IRQ_NO_BALANCING | IRQ_AFFINITY_SET))
3791 mask = desc->affinity;
3792 else
3793 mask = TARGET_CPUS;
3794
3799#ifdef CONFIG_INTR_REMAP 3795#ifdef CONFIG_INTR_REMAP
3800 else if (intr_remapping_enabled) 3796 if (intr_remapping_enabled)
3801 set_ir_ioapic_affinity_irq(irq, TARGET_CPUS); 3797 set_ir_ioapic_affinity_irq(irq, mask);
3802#endif
3803 else 3798 else
3804 set_ioapic_affinity_irq(irq, TARGET_CPUS); 3799#endif
3800 set_ioapic_affinity_irq(irq, mask);
3805 } 3801 }
3806 3802
3807 } 3803 }
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index 1c9cc431ea4f..e169ae9b6a62 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -128,7 +128,7 @@ static int kvm_register_clock(char *txt)
128} 128}
129 129
130#ifdef CONFIG_X86_LOCAL_APIC 130#ifdef CONFIG_X86_LOCAL_APIC
131static void __devinit kvm_setup_secondary_clock(void) 131static void __cpuinit kvm_setup_secondary_clock(void)
132{ 132{
133 /* 133 /*
134 * Now that the first cpu already had this clocksource initialized, 134 * Now that the first cpu already had this clocksource initialized,
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index e1e731d78f38..d28bbdc35e4e 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -1567,7 +1567,7 @@ static int __init calgary_parse_options(char *p)
1567 ++p; 1567 ++p;
1568 if (*p == '\0') 1568 if (*p == '\0')
1569 break; 1569 break;
1570 bridge = simple_strtol(p, &endp, 0); 1570 bridge = simple_strtoul(p, &endp, 0);
1571 if (p == endp) 1571 if (p == endp)
1572 break; 1572 break;
1573 1573
diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
index b13acb75e822..15c3e6999182 100644
--- a/arch/x86/kernel/xsave.c
+++ b/arch/x86/kernel/xsave.c
@@ -310,7 +310,7 @@ static void __init setup_xstate_init(void)
310/* 310/*
311 * Enable and initialize the xsave feature. 311 * Enable and initialize the xsave feature.
312 */ 312 */
313void __init xsave_cntxt_init(void) 313void __ref xsave_cntxt_init(void)
314{ 314{
315 unsigned int eax, ebx, ecx, edx; 315 unsigned int eax, ebx, ecx, edx;
316 316
diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
index 3f1b81a83e2e..716d26f0e5d4 100644
--- a/arch/x86/oprofile/op_model_ppro.c
+++ b/arch/x86/oprofile/op_model_ppro.c
@@ -69,7 +69,7 @@ static void ppro_setup_ctrs(struct op_msrs const * const msrs)
69 int i; 69 int i;
70 70
71 if (!reset_value) { 71 if (!reset_value) {
72 reset_value = kmalloc(sizeof(unsigned) * num_counters, 72 reset_value = kmalloc(sizeof(reset_value[0]) * num_counters,
73 GFP_ATOMIC); 73 GFP_ATOMIC);
74 if (!reset_value) 74 if (!reset_value)
75 return; 75 return;
diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index 3c27a809393b..2051dc96b8e9 100644
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -496,21 +496,24 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SIEMENS, 0x0015,
496 pci_siemens_interrupt_controller); 496 pci_siemens_interrupt_controller);
497 497
498/* 498/*
499 * Regular PCI devices have 256 bytes, but AMD Family 10h Opteron ext config 499 * Regular PCI devices have 256 bytes, but AMD Family 10h/11h CPUs have
500 * have 4096 bytes. Even if the device is capable, that doesn't mean we can 500 * 4096 bytes configuration space for each function of their processor
501 * access it. Maybe we don't have a way to generate extended config space 501 * configuration space.
502 * accesses. So check it
503 */ 502 */
504static void fam10h_pci_cfg_space_size(struct pci_dev *dev) 503static void amd_cpu_pci_cfg_space_size(struct pci_dev *dev)
505{ 504{
506 dev->cfg_size = pci_cfg_space_size_ext(dev); 505 dev->cfg_size = pci_cfg_space_size_ext(dev);
507} 506}
508 507DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1200, amd_cpu_pci_cfg_space_size);
509DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1200, fam10h_pci_cfg_space_size); 508DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1201, amd_cpu_pci_cfg_space_size);
510DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1201, fam10h_pci_cfg_space_size); 509DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1202, amd_cpu_pci_cfg_space_size);
511DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1202, fam10h_pci_cfg_space_size); 510DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1203, amd_cpu_pci_cfg_space_size);
512DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1203, fam10h_pci_cfg_space_size); 511DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1204, amd_cpu_pci_cfg_space_size);
513DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1204, fam10h_pci_cfg_space_size); 512DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1300, amd_cpu_pci_cfg_space_size);
513DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1301, amd_cpu_pci_cfg_space_size);
514DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1302, amd_cpu_pci_cfg_space_size);
515DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1303, amd_cpu_pci_cfg_space_size);
516DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1304, amd_cpu_pci_cfg_space_size);
514 517
515/* 518/*
516 * SB600: Disable BAR1 on device 14.0 to avoid HPET resources from 519 * SB600: Disable BAR1 on device 14.0 to avoid HPET resources from
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 688936044dc9..636ef4caa52d 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -661,12 +661,11 @@ void xen_set_pgd(pgd_t *ptr, pgd_t val)
661 * For 64-bit, we must skip the Xen hole in the middle of the address 661 * For 64-bit, we must skip the Xen hole in the middle of the address
662 * space, just after the big x86-64 virtual hole. 662 * space, just after the big x86-64 virtual hole.
663 */ 663 */
664static int xen_pgd_walk(struct mm_struct *mm, 664static int __xen_pgd_walk(struct mm_struct *mm, pgd_t *pgd,
665 int (*func)(struct mm_struct *mm, struct page *, 665 int (*func)(struct mm_struct *mm, struct page *,
666 enum pt_level), 666 enum pt_level),
667 unsigned long limit) 667 unsigned long limit)
668{ 668{
669 pgd_t *pgd = mm->pgd;
670 int flush = 0; 669 int flush = 0;
671 unsigned hole_low, hole_high; 670 unsigned hole_low, hole_high;
672 unsigned pgdidx_limit, pudidx_limit, pmdidx_limit; 671 unsigned pgdidx_limit, pudidx_limit, pmdidx_limit;
@@ -753,6 +752,14 @@ out:
753 return flush; 752 return flush;
754} 753}
755 754
755static int xen_pgd_walk(struct mm_struct *mm,
756 int (*func)(struct mm_struct *mm, struct page *,
757 enum pt_level),
758 unsigned long limit)
759{
760 return __xen_pgd_walk(mm, mm->pgd, func, limit);
761}
762
756/* If we're using split pte locks, then take the page's lock and 763/* If we're using split pte locks, then take the page's lock and
757 return a pointer to it. Otherwise return NULL. */ 764 return a pointer to it. Otherwise return NULL. */
758static spinlock_t *xen_pte_lock(struct page *page, struct mm_struct *mm) 765static spinlock_t *xen_pte_lock(struct page *page, struct mm_struct *mm)
@@ -854,7 +861,7 @@ static void __xen_pgd_pin(struct mm_struct *mm, pgd_t *pgd)
854 861
855 xen_mc_batch(); 862 xen_mc_batch();
856 863
857 if (xen_pgd_walk(mm, xen_pin_page, USER_LIMIT)) { 864 if (__xen_pgd_walk(mm, pgd, xen_pin_page, USER_LIMIT)) {
858 /* re-enable interrupts for flushing */ 865 /* re-enable interrupts for flushing */
859 xen_mc_issue(0); 866 xen_mc_issue(0);
860 867
@@ -998,7 +1005,7 @@ static void __xen_pgd_unpin(struct mm_struct *mm, pgd_t *pgd)
998 PT_PMD); 1005 PT_PMD);
999#endif 1006#endif
1000 1007
1001 xen_pgd_walk(mm, xen_unpin_page, USER_LIMIT); 1008 __xen_pgd_walk(mm, pgd, xen_unpin_page, USER_LIMIT);
1002 1009
1003 xen_mc_issue(0); 1010 xen_mc_issue(0);
1004} 1011}
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index d77da613b1d2..acd9b6705e02 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -362,7 +362,7 @@ static void xen_cpu_die(unsigned int cpu)
362 alternatives_smp_switch(0); 362 alternatives_smp_switch(0);
363} 363}
364 364
365static void xen_play_dead(void) 365static void __cpuinit xen_play_dead(void) /* used only with CPU_HOTPLUG */
366{ 366{
367 play_dead_common(); 367 play_dead_common();
368 HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL); 368 HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL);
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
index d7422dc2a55c..9e1afae8461f 100644
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
@@ -49,7 +49,7 @@ bool xen_vcpu_stolen(int vcpu);
49 49
50void xen_mark_init_mm_pinned(void); 50void xen_mark_init_mm_pinned(void);
51 51
52void __init xen_setup_vcpu_info_placement(void); 52void xen_setup_vcpu_info_placement(void);
53 53
54#ifdef CONFIG_SMP 54#ifdef CONFIG_SMP
55void xen_smp_init(void); 55void xen_smp_init(void);
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-07 23:44:54 -0500